OSDN Git Service
Erin Dahlgren [Tue, 15 Oct 2013 19:35:10 +0000 (19:35 +0000)]
Merge "Do not show any bottom controls in secure camera to prevent launching out of app behavior." into gb-ub-photos-carlsbad
Erin Dahlgren [Tue, 15 Oct 2013 16:50:54 +0000 (09:50 -0700)]
Do not show any bottom controls in secure camera to prevent launching out of app behavior.
Bug:
11235651
Change-Id: Iafc0b7930c8c016bd6ab11b13d6572241c5ef074
Erin Dahlgren [Tue, 15 Oct 2013 17:57:17 +0000 (17:57 +0000)]
Merge "Prevent crash after deleting album from Gallery by checking for more null pointers." into gb-ub-photos-carlsbad
ztenghui [Tue, 15 Oct 2013 17:08:44 +0000 (17:08 +0000)]
Merge "NPE fix when we failed to open the camera" into gb-ub-photos-carlsbad
Erin Dahlgren [Tue, 15 Oct 2013 00:35:23 +0000 (17:35 -0700)]
Prevent crash after deleting album from Gallery by checking for more null pointers.
Bug:
10950130
Change-Id: I284e2016676e15c7f2ad23de71a965ab50c5d743
Mangesh Ghiware [Tue, 15 Oct 2013 05:05:16 +0000 (22:05 -0700)]
Fix Camera2 build.
Bug:
11226016
Change-Id: Ib667e52a150ffad44575ea97174f9d13de1d7b5e
Mangesh Ghiware [Tue, 15 Oct 2013 04:19:22 +0000 (21:19 -0700)]
Use Gallery intents by default.
Bug:
11226016
Change-Id: I4f6a5856dd8141930fb0fef19b9ded0b37ea1ce5
Sascha Haeberling [Tue, 15 Oct 2013 03:39:29 +0000 (03:39 +0000)]
Merge "Updating shutter button resources" into gb-ub-photos-carlsbad
Erin Dahlgren [Mon, 14 Oct 2013 23:42:13 +0000 (23:42 +0000)]
Merge "Set camera controls visibility based on whether the camera preview is centered." into gb-ub-photos-carlsbad
ztenghui [Mon, 14 Oct 2013 22:25:16 +0000 (15:25 -0700)]
NPE fix when we failed to open the camera
At the same time, some error check code never get turned on.
Remove those stale codes and make sure we check the CameraDevice for null
correctly.
We didn't intensively log the error here since they should be logged by
the CameraOpenErrorCallback already.
bug:
11215576
Change-Id: Ib1e1b9011a169607b719c833d6d5eddbd9be8a9d
Sascha Haeberling [Mon, 14 Oct 2013 22:06:29 +0000 (15:06 -0700)]
Updating shutter button resources
Bug:
11155984
Change-Id: I178938250d2f99e32c9c339f3ffdf4495c053361
Sascha Haeberling [Sun, 13 Oct 2013 16:10:02 +0000 (09:10 -0700)]
Updating button assets, follow-up to ag/373177
Bug:
11155984
Change-Id: Ib1cbf5cf53f30e45751804f6d9d25afa127df99a
Doris Liu [Mon, 14 Oct 2013 20:47:39 +0000 (20:47 +0000)]
Merge "Fix SRI upside down preview in reverse landscape and reverse portrait" into gb-ub-photos-carlsbad
Erin Dahlgren [Fri, 11 Oct 2013 01:23:45 +0000 (18:23 -0700)]
Set camera controls visibility based on whether the camera preview is centered.
Bug:
10861015
Change-Id: Ib0c4945e35cee16b73a4bba913e11d0f79a26176
ztenghui [Mon, 14 Oct 2013 20:36:51 +0000 (20:36 +0000)]
Merge "Only delete the Uri coming from onMediaSaved" into gb-ub-photos-carlsbad
ztenghui [Mon, 14 Oct 2013 18:15:44 +0000 (11:15 -0700)]
Only delete the Uri coming from onMediaSaved
The incoming Uri can be null, or a file Uri, which we don't want to delete.
The Uri from onMediaSaved has been inserted to the MediaStore and pass null
check.
bug:
11218007
Change-Id: Ie4b08cae94e22a8014ea2436f0a82eba2541a667
Doris Liu [Mon, 14 Oct 2013 19:06:20 +0000 (12:06 -0700)]
Fix SRI upside down preview in reverse landscape and reverse portrait
Also make sure preview is not upside down after device flip, and
fix camera controls jiggering during rotation
Bug:
11216647
Bug:
11174540
Change-Id: I764e5b86549fa87c2224d8e85ff06f57f0a315d1
Angus Kong [Mon, 14 Oct 2013 05:19:37 +0000 (05:19 +0000)]
Merge "Ignore clicks on disabled pie menu items." into gb-ub-photos-carlsbad
Angus Kong [Mon, 14 Oct 2013 05:16:34 +0000 (05:16 +0000)]
Merge "Workaround to prevent the data focus callback." into gb-ub-photos-carlsbad
Angus Kong [Mon, 14 Oct 2013 03:21:09 +0000 (20:21 -0700)]
Ignore clicks on disabled pie menu items.
bug:
11205671
Change-Id: I8b7c8c6b95f2cedadc064747470acd742280eb7f
Angus Kong [Mon, 14 Oct 2013 02:26:02 +0000 (19:26 -0700)]
Workaround to prevent the data focus callback.
bug:
11205669
Change-Id: I5b2d33422ec5f6fe21c81e39d24f36ec8b61ce4e
Alan Newberger [Mon, 14 Oct 2013 00:02:03 +0000 (17:02 -0700)]
Change keyguard camera layout to show no menu options in indicator
There are situations where the user selected options e.g. hdr+ are
the initial indicators to the camera, so showing autoflash on the
fake layout seems janky. additionally I sometimes see camera showing
its own default clean circle indicator layout prior to switching to
whatever indicators are active. For both these reasons it seems better
to start secure camera from lockscreen with an empty circle indicator.
I tried this CL out on my device and can confirm it feels less janky.
Bug:
11206325
Change-Id: Ia694a21e5c86f9e12a339679aa30f4b21f1fa23b
Sascha Haeberling [Sun, 13 Oct 2013 23:06:10 +0000 (23:06 +0000)]
Merge "Add 'disabled' state for when Gcam is unable to take another shot." into gb-ub-photos-carlsbad
Doris Liu [Sun, 13 Oct 2013 22:29:41 +0000 (22:29 +0000)]
Merge "Fix for mis-placed camera controls" into gb-ub-photos-carlsbad
Sascha Haeberling [Sun, 13 Oct 2013 20:29:46 +0000 (13:29 -0700)]
Add 'disabled' state for when Gcam is unable to take another shot.
Bug:
11113201
Change-Id: I887104dc79f4a7a83bb79b2d30c0289fc90c9022
Doris Liu [Sun, 13 Oct 2013 21:46:57 +0000 (14:46 -0700)]
Fix for mis-placed camera controls
Bug:
11205682
Change-Id: Ie74e906a059158db825977af898445b2b2ba5a48
Angus Kong [Sun, 13 Oct 2013 06:48:46 +0000 (23:48 -0700)]
Don't load data when it's secure camera.
bug:
11063164
Change-Id: I7e44a13f4d841d16807bd36133b588a0a8c40e49
Angus Kong [Sun, 13 Oct 2013 01:52:33 +0000 (18:52 -0700)]
Adjust the position after layout change.
bug:
10993660
Change-Id: Ia07b8238a09e761a02fe11577b738776ab965b30
Doris Liu [Sat, 12 Oct 2013 07:12:04 +0000 (07:12 +0000)]
Merge "Correct initial orientation of camera controls" into gb-ub-photos-carlsbad
Doris Liu [Sat, 12 Oct 2013 02:01:30 +0000 (19:01 -0700)]
Correct initial orientation of camera controls
Bug:
8878379
Change-Id: I3ecf190b19e91ae963e67ae2930b7388c4f92c70
ztenghui [Sat, 12 Oct 2013 00:38:05 +0000 (00:38 +0000)]
Merge "Finish the secure camera activity when user try to play a video." into gb-ub-photos-carlsbad
ztenghui [Sat, 12 Oct 2013 00:15:40 +0000 (17:15 -0700)]
Finish the secure camera activity when user try to play a video.
bug:
11190995
Change-Id: I8aa1a538496c291d34ca25d489a7eb03f0c90b53
Doris Liu [Sat, 12 Oct 2013 00:12:11 +0000 (00:12 +0000)]
Merge "Bring full screen window flag back to camera" into gb-ub-photos-carlsbad
Doris Liu [Fri, 11 Oct 2013 23:54:51 +0000 (16:54 -0700)]
Bring full screen window flag back to camera
Bug:
11027091
Change-Id: Iee41d7dd040a9b7816a4b5e99d89201dc068f362
Seth Raphael [Fri, 11 Oct 2013 21:27:59 +0000 (14:27 -0700)]
restore Usage Statistics
initialize was not being called anywhere.
Bug:
11188914
Change-Id: I9b3ae094b2d22605c368c1ac38de80090a336894
Alan Newberger [Fri, 11 Oct 2013 20:20:59 +0000 (13:20 -0700)]
Add strings to better describe HDR mode menus
Instead of one word, these strings will describe the button action i.e. 'Turn HDR on'.
Leaving existing strings to pipeline translations before implementing the migration to these strings.
Bug:
11185194
Change-Id: Ie9aca0b328b19c610af740127e1683a8d87f93d8
Ruben Brunk [Fri, 11 Oct 2013 18:29:02 +0000 (18:29 +0000)]
Merge "gcam: Allow debugging postcapture image to be added to mediastore." into gb-ub-photos-carlsbad
Angus Kong [Fri, 11 Oct 2013 16:08:03 +0000 (16:08 +0000)]
Merge "Avoid unnecessary bringChildToFront() calls." into gb-ub-photos-carlsbad
Angus Kong [Thu, 10 Oct 2013 23:46:04 +0000 (16:46 -0700)]
Avoid unnecessary bringChildToFront() calls.
bug:
10750719
Change-Id: I831d9ecead91d64c7a0b6a665e9c842ef17d8a8a
Ruben Brunk [Fri, 11 Oct 2013 01:45:53 +0000 (18:45 -0700)]
gcam: Allow debugging postcapture image to be added to mediastore.
Bug:
11010544
Change-Id: Iaa5a2d8bcc3ece583376517e006018b0c8b75587
Sascha Haeberling [Fri, 11 Oct 2013 03:12:07 +0000 (20:12 -0700)]
Don't show a details dialog if there are no details.
Bug:
11021907
Change-Id: Ie4919889f60f2035fbd6f8b99bff4415e2962ae6
Sascha Haeberling [Fri, 11 Oct 2013 02:39:23 +0000 (02:39 +0000)]
Merge "Don't initialize photo module if it's paused." into gb-ub-photos-carlsbad
Sascha Haeberling [Fri, 11 Oct 2013 02:00:41 +0000 (19:00 -0700)]
Don't initialize photo module if it's paused.
Bug:
11028614
The main visible issue with this is that we register additional
location listeners, thus draining battery as we don't unregister
them ever.
Change-Id: Ibd39171681867a12bc00abe9705f4281b9945ec1
Erin Dahlgren [Fri, 11 Oct 2013 01:30:32 +0000 (01:30 +0000)]
Merge "Check both the requestId of current item and total items in filmstrip for bottom controls." into gb-ub-photos-carlsbad
Doris Liu [Fri, 4 Oct 2013 20:22:09 +0000 (13:22 -0700)]
Add fling support in zoom view
Bug:
10679704
Change-Id: I7ab72fdf4e836495b2471c65fd57f952e863f1dd
Doris Liu [Fri, 11 Oct 2013 00:47:39 +0000 (00:47 +0000)]
Merge "Remove display change listener for mode switch" into gb-ub-photos-carlsbad
Doris Liu [Fri, 11 Oct 2013 00:20:56 +0000 (17:20 -0700)]
Remove display change listener for mode switch
Bug:
10928549
Change-Id: I333e1a47e7f5c5cadca9b0b6cfd368f455fc3670
Sascha Haeberling [Thu, 10 Oct 2013 22:30:59 +0000 (22:30 +0000)]
Merge "Hide the status bar and switch into lights-out mode when popup is dimissed." into gb-ub-photos-carlsbad
Erin Dahlgren [Thu, 10 Oct 2013 19:47:07 +0000 (12:47 -0700)]
Check both the requestId of current item and total items in filmstrip for bottom controls.
Bug:
11169201
Change-Id: I9d42b168efe62712f76165db5221757a1f20013f
Sascha Haeberling [Thu, 10 Oct 2013 06:46:20 +0000 (23:46 -0700)]
Hide the status bar and switch into lights-out mode when popup is dimissed.
Bug:
11119286
Change-Id: I912103f36d27b07cd6fcebc2dae7c2964e883cc8
Doris Liu [Thu, 10 Oct 2013 17:41:23 +0000 (17:41 +0000)]
Merge "Workaround for re-applying transform on new surface texuture" into gb-ub-photos-carlsbad
Doris Liu [Thu, 10 Oct 2013 03:51:23 +0000 (20:51 -0700)]
Workaround for re-applying transform on new surface texuture
Bug:
10981460
Change-Id: Ic7fca757f3c1171317c76cd90fad43ff5c5ae5d2
Mindy Pereira [Thu, 10 Oct 2013 17:32:56 +0000 (17:32 +0000)]
Merge "Update shutter recording assets." into gb-ub-photos-carlsbad
ztenghui [Thu, 10 Oct 2013 16:09:22 +0000 (16:09 +0000)]
Merge "Fix flash issue" into gb-ub-photos-carlsbad
Sascha Haeberling [Mon, 7 Oct 2013 00:49:51 +0000 (17:49 -0700)]
Initialize GCam with GServices values.
Bug:
11103065
Change-Id: Ic8d3c9825abdc5d79c5e4c7b0e96770ab0941036
Ruben Brunk [Thu, 10 Oct 2013 01:03:22 +0000 (01:03 +0000)]
Merge "gcam: Add postcapture for gcam debugging." into gb-ub-photos-carlsbad
Mindy Pereira [Wed, 9 Oct 2013 23:38:26 +0000 (16:38 -0700)]
Update shutter recording assets.
fixes b/
11155984 SRI pano shutter button inconsistent
Change-Id: I6b4c8419d4cd3814287edf932dcdfcc8b91e49e6
Ruben Brunk [Thu, 10 Oct 2013 00:42:21 +0000 (00:42 +0000)]
Merge "gcam: Fix preview FOV." into gb-ub-photos-carlsbad
ztenghui [Wed, 9 Oct 2013 22:59:47 +0000 (15:59 -0700)]
Fix flash issue
The flash light should show up at the same time as the control show up.
Also, when we change the flash mode, we should update the flash on screen
indicator.
bug:
11064667
Change-Id: I888d3ce76ac618a4c7b40a288ecce13555c89ab0
Ruben Brunk [Wed, 9 Oct 2013 23:01:16 +0000 (16:01 -0700)]
gcam: Fix preview FOV.
Bug:
11150965
Change-Id: Iacdcc7ad37193f5343d2c5d5de3fabecee1f05df
Erin Dahlgren [Wed, 9 Oct 2013 22:45:03 +0000 (22:45 +0000)]
Merge "Update bottom edit control for photos inside secure and insecure mode." into gb-ub-photos-carlsbad
Erin Dahlgren [Wed, 9 Oct 2013 20:55:08 +0000 (13:55 -0700)]
Update bottom edit control for photos inside secure and insecure mode.
Bug:
11067201
Change-Id: I21a775d46c26206e340c830fceafaf52e7a06ac5
ztenghui [Wed, 9 Oct 2013 20:24:27 +0000 (20:24 +0000)]
Merge "Fix another potential issue related to video capture intent." into gb-ub-photos-carlsbad
Doris Liu [Wed, 9 Oct 2013 20:22:48 +0000 (20:22 +0000)]
Merge "Workaround to disable swiping for SRI during capture" into gb-ub-photos-carlsbad
Erin Dahlgren [Wed, 9 Oct 2013 17:59:47 +0000 (10:59 -0700)]
Update bottom controls and action bar with a tighter bounds on data change.
Bug:
11087361
Change-Id: Ie319d1767eb671ca7ed4a129aa9b75c77d63b20d
Doris Liu [Wed, 9 Oct 2013 18:45:36 +0000 (11:45 -0700)]
Workaround to disable swiping for SRI during capture
Bug:
11139101
Change-Id: I2cfc9fb94259755e3db6f5d0b80287388cb846de
Ruben Brunk [Wed, 9 Oct 2013 06:31:13 +0000 (23:31 -0700)]
gcam: Add postcapture for gcam debugging.
Bug:
11010544
Change-Id: I782bf3bd52f7b37cf47291501560ba771951760a
ztenghui [Wed, 9 Oct 2013 17:52:33 +0000 (10:52 -0700)]
Fix another potential issue related to video capture intent.
We don't want to delete the Uri sent from the intent.
When we are in review mode, the mCurrentVideoUri should be from the capture
result.
bug:
11136978
Change-Id: I148135326e3516936f7d6463941c6b50dbc389db
ztenghui [Wed, 9 Oct 2013 16:15:13 +0000 (16:15 +0000)]
Merge "Fix NPE in video intent." into gb-ub-photos-carlsbad
Angus Kong [Wed, 9 Oct 2013 15:53:29 +0000 (15:53 +0000)]
Merge "Make the transition animation identical." into gb-ub-photos-carlsbad
Angus Kong [Wed, 9 Oct 2013 03:58:33 +0000 (20:58 -0700)]
Make the transition animation identical.
The animation of transition between camera preview and filmstrip should be a
special case to prevent jank.
bug:
11011577
Change-Id: If611599203e845d098cd6e4acb56d5631d085ffe
Angus Kong [Wed, 9 Oct 2013 05:34:02 +0000 (22:34 -0700)]
Enter fullscreen if all items are removed.
bug:
11066937
Change-Id: Ibf9b03adc0d00838ba23c65361aa7c783c835d90
Angus Kong [Wed, 9 Oct 2013 02:58:53 +0000 (02:58 +0000)]
Merge "Don't go into Gcam when it's capture intent." into gb-ub-photos-carlsbad
ztenghui [Wed, 9 Oct 2013 00:07:15 +0000 (17:07 -0700)]
Fix NPE in video intent.
bug:
11136978
Change-Id: I6076581131e3dcdc456d8ac8865a5cc6f84e9da4
Doris Liu [Tue, 8 Oct 2013 23:54:22 +0000 (16:54 -0700)]
Allow scaling beyond 1:1 in zoom view
Bug:
10950226
Change-Id: I38828edaf4010170f6c6db18b8c5fdeef91b4f11
Doris Liu [Wed, 9 Oct 2013 00:02:12 +0000 (00:02 +0000)]
Merge "Do not allow navigation to filmstrip during video recording" into gb-ub-photos-carlsbad
Mindy DelliCarpini [Tue, 8 Oct 2013 23:44:40 +0000 (23:44 +0000)]
Merge "Update camera assets for de-blue effort" into gb-ub-photos-carlsbad
Angus Kong [Tue, 8 Oct 2013 21:59:18 +0000 (14:59 -0700)]
Add shutter click sound in SoundClips.
bug:
11135055
Change-Id: Ib4396ada73021beff9845c49fee7c5eb8f4cc96d
Angus Kong [Tue, 8 Oct 2013 20:44:19 +0000 (13:44 -0700)]
Don't go into Gcam when it's capture intent.
bug:
11115082
Change-Id: I2532e9597f526eb7daea9753b019d5ed95f5fe6b
Doris Liu [Tue, 8 Oct 2013 18:03:37 +0000 (11:03 -0700)]
Do not allow navigation to filmstrip during video recording
Bug:
11064867
Change-Id: I168136a193008578b3ad2642cba764650bcc2487
Sascha Haeberling [Tue, 8 Oct 2013 03:27:00 +0000 (03:27 +0000)]
Merge "Increase character limit." into gb-ub-photos-carlsbad
Sascha Haeberling [Tue, 8 Oct 2013 03:09:47 +0000 (20:09 -0700)]
Increase character limit.
Bug:
10999205
Bug:
10558260
Bug:
10554875
Change-Id: Ib2add1a1b32a4a1a677d30a4bd11b0de5f6f126b
Doris Liu [Tue, 8 Oct 2013 01:39:26 +0000 (18:39 -0700)]
Correct sample factor for rotated images in zoom view
Bug:
11067085
Change-Id: I52093052393fb1b2db08f105b8a16b68c3d3c95a
ztenghui [Tue, 8 Oct 2013 00:36:59 +0000 (00:36 +0000)]
Merge "Keep the ImageData size info consistent with MediaStore and Exif" into gb-ub-photos-carlsbad
ztenghui [Mon, 7 Oct 2013 21:54:55 +0000 (14:54 -0700)]
Keep the ImageData size info consistent with MediaStore and Exif
Basically, the width and hight in the ImageData will be pre-rotation.
bug:
11067085
Change-Id: I377caf2f1d49d26b4d6823d4e72168a055d80858
Sascha Haeberling [Mon, 7 Oct 2013 20:49:01 +0000 (13:49 -0700)]
Fix missing filtershow string. DO NOT MERGE
Bug:
11116778
Change-Id: I459e0b1db241a38866a3b06be5b316dc3b300c56
Sascha Haeberling [Mon, 7 Oct 2013 01:07:07 +0000 (18:07 -0700)]
Revert CL that added broadcast receivers for shutter control.
Bug:
11006189
This was added for Gem support but causes us trouble. As it's not
essential, we'll remove it now.
Original CL was http://ag/342589
Change-Id: I9e137411cf5beb0fbdad611ee85803960feef14a
Mindy DelliCarpini [Sat, 5 Oct 2013 02:44:02 +0000 (19:44 -0700)]
Update camera assets for de-blue effort
Fixes b/
11007065 Shutter button disappears / becomes white when pressed
Change-Id: I4001df821e545317eb4436da21f8f8d255d330f3
ztenghui [Fri, 4 Oct 2013 21:13:31 +0000 (14:13 -0700)]
Don't show the option for Gcam when using front camera.
bug:
11051221
Change-Id: I802eb0bc73adb3c573a2bf62b312bc681152223d
Sascha Haeberling [Fri, 4 Oct 2013 18:38:24 +0000 (11:38 -0700)]
Update the HDR+ assets.
Bug:
11047147
Change-Id: I680d9a822876655d3c30715a9315a17b8db87763
Doris Liu [Fri, 4 Oct 2013 00:08:20 +0000 (00:08 +0000)]
Merge "Prevent picture taking via volumn key in filmstrip mode" into gb-ub-photos-carlsbad
Doris Liu [Thu, 3 Oct 2013 22:31:40 +0000 (15:31 -0700)]
Prevent picture taking via volumn key in filmstrip mode
Bug:
11045068
Change-Id: Ic823e04520fef3c2cef5341dceb9887fd62a5212
Sascha Haeberling [Thu, 3 Oct 2013 22:07:15 +0000 (22:07 +0000)]
Merge "Sync Camera2 permissions to GoogleCamera permissions." into gb-ub-photos-carlsbad
Erin Dahlgren [Thu, 3 Oct 2013 21:05:16 +0000 (21:05 +0000)]
Merge "Make space for photosphere rendering text" into gb-ub-photos-carlsbad
Sascha Haeberling [Thu, 3 Oct 2013 20:47:44 +0000 (20:47 +0000)]
Merge "Change icons and code from HQ to HDR+ mode." into gb-ub-photos-carlsbad
Angus Kong [Thu, 3 Oct 2013 20:42:15 +0000 (20:42 +0000)]
Merge "Don't allow actions on items in progress." into gb-ub-photos-carlsbad
Angus Kong [Wed, 2 Oct 2013 23:53:40 +0000 (16:53 -0700)]
Don't allow actions on items in progress.
bug:
11049529
Change-Id: Id6bd0f912f153b8b8e6b1a525a383ad8cadbe3dd
Doris Liu [Thu, 3 Oct 2013 19:38:16 +0000 (19:38 +0000)]
Merge "Leave ROI not set except in tap-to-focus scenario" into gb-ub-photos-carlsbad
Sascha Haeberling [Thu, 3 Oct 2013 19:10:48 +0000 (12:10 -0700)]
Change icons and code from HQ to HDR+ mode.
Bug:
11047147
Change-Id: Ib0ab1675788f6584d2b06b63a113468d2e775f23
Erin Dahlgren [Thu, 3 Oct 2013 18:49:30 +0000 (11:49 -0700)]
Make space for photosphere rendering text
Bug:
11005014
Change-Id: I1f92322ff5a53b8bf6752841efd3a59e366d78fb