OSDN Git Service
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
The Android Automerger [Mon, 14 Oct 2013 13:00:32 +0000 (06:00 -0700)]
merge in klp-release history after reset to klp-dev
Angus Kong [Mon, 14 Oct 2013 05:21:30 +0000 (22:21 -0700)]
am
ae169730: Merge "Ignore clicks on disabled pie menu items." into gb-ub-photos-carlsbad
* commit '
ae1697302b4ef59bbfebdf1127bc73531ce550b7':
Ignore clicks on disabled pie menu items.
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:18:24 +0000 (22:18 -0700)]
am
24d94d61: Merge "Workaround to prevent the data focus callback." into gb-ub-photos-carlsbad
* commit '
24d94d6140ee5ecdf66b28218e8dd9dfe5edfb19':
Workaround to prevent the data focus callback.
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
The Android Automerger [Mon, 14 Oct 2013 02:20:36 +0000 (19:20 -0700)]
merge in klp-release history after reset to klp-dev
Alan Newberger [Mon, 14 Oct 2013 00:10:39 +0000 (17:10 -0700)]
am
28019abc: Change keyguard camera layout to show no menu options in indicator
* commit '
28019abc86de3d96a32595e69f6c549353b2c4ec':
Change keyguard camera layout to show no menu options in indicator
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:07:48 +0000 (16:07 -0700)]
am
704530ed: Merge "Add \'disabled\' state for when Gcam is unable to take another shot." into gb-ub-photos-carlsbad
* commit '
704530edd94ba9b5990a247d4156ec18bf6ea0eb':
Add 'disabled' state for when Gcam is unable to take another shot.
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:31:12 +0000 (15:31 -0700)]
am
c937ab7f: Merge "Fix for mis-placed camera controls" into gb-ub-photos-carlsbad
* commit '
c937ab7f9bac633aa425da62348f9eb07c248450':
Fix for mis-placed camera controls
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 18:58:52 +0000 (11:58 -0700)]
am
2d5c7478: Don\'t load data when it\'s secure camera.
* commit '
2d5c74785d19f1944cab92948a6fa8233086ebc1':
Don't load data when it's secure camera.
The Android Automerger [Sun, 13 Oct 2013 13:02:18 +0000 (06:02 -0700)]
merge in klp-release history after reset to klp-dev
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 03:53:47 +0000 (20:53 -0700)]
am
f1582c9c: Adjust the position after layout change.
* commit '
f1582c9c075e9cd5790b4bbe1101c94a45ac15d2':
Adjust the position after layout change.
Angus Kong [Sun, 13 Oct 2013 01:52:33 +0000 (18:52 -0700)]
Adjust the position after layout change.
bug:
10993660
Change-Id: Ia07b8238a09e761a02fe11577b738776ab965b30
Baligh Uddin [Sat, 12 Oct 2013 13:44:48 +0000 (13:44 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-dev
Baligh Uddin [Sat, 12 Oct 2013 08:46:16 +0000 (01:46 -0700)]
Import translations. DO NOT MERGE
Change-Id: I4ff93327a41e4a0c3263e3fb32b510b19f60ab8c
Auto-generated-cl: translation import
Doris Liu [Sat, 12 Oct 2013 07:14:13 +0000 (00:14 -0700)]
am
a5002410: Merge "Correct initial orientation of camera controls" into gb-ub-photos-carlsbad
* commit '
a500241084f9e267e5f154b55e7a76a09623e6d8':
Correct initial orientation of camera controls
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:41:31 +0000 (17:41 -0700)]
am
27562534: Merge "Finish the secure camera activity when user try to play a video." into gb-ub-photos-carlsbad
* commit '
275625342769eba3e2b461e249aec83165e4e7f1':
Finish the secure camera activity when user try to play a video.
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:13:52 +0000 (17:13 -0700)]
am
87d093d6: Merge "Bring full screen window flag back to camera" into gb-ub-photos-carlsbad
* commit '
87d093d6145524b1c8f5c052dfe40c18b52e5235':
Bring full screen window flag back to camera
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 22:17:22 +0000 (15:17 -0700)]
am
3772d2f4: restore Usage Statistics
* commit '
3772d2f48ee5af8516f203f0f0519a2075042d6b':
restore Usage Statistics
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:32:30 +0000 (13:32 -0700)]
am
c13cc22b: Add strings to better describe HDR mode menus
* commit '
c13cc22ba17591111be3fae732ae0396e889820a':
Add strings to better describe HDR mode menus
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:30:57 +0000 (11:30 -0700)]
am
f0622191: Merge "gcam: Allow debugging postcapture image to be added to mediastore." into gb-ub-photos-carlsbad
* commit '
f06221914bf40b6345cacd1a5904d773c6eddcb0':
gcam: Allow debugging postcapture image to be added to mediastore.
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 [Thu, 10 Oct 2013 23:46:04 +0000 (16:46 -0700)]
Avoid unnecessary bringChildToFront() calls.
bug:
10750719
Change-Id: I831d9ecead91d64c7a0b6a665e9c842ef17d8a8a
Sameer Padala [Mon, 7 Oct 2013 20:09:34 +0000 (13:09 -0700)]
Fix build break.
ag/369626/ added a cannot_load_image string which was translated in ag/370960/
However, this translation resulted in a duplicate string since this string
already existed in translated versions of filtershow_strings.xml which was
deleted in ag/339346 but the translated versions weren't deleted. Deleting all
the translated versions of that file caused a problem because ag/362583/ added
source code that depended on a setting_wallpaper string which only existed in
the translated string files.
This change deletes the translated filtershow_strings.xml and adds the
untranslated setting_wallpaper string.
Change-Id: I1b8ac8c854c6f06abde9a71db2105c4d2dd44934
(cherry picked from commit
73a18da0f6181d882d04d648ddcbcc82047f5d71)
Baligh Uddin [Fri, 11 Oct 2013 16:32:24 +0000 (16:32 +0000)]
Merge "Revert "Revert "Import translations. DO NOT MERGE""" into klp-dev
Angus Kong [Fri, 11 Oct 2013 16:09:30 +0000 (09:09 -0700)]
am
81ef40bc: Merge "Avoid unnecessary bringChildToFront() calls." into gb-ub-photos-carlsbad
* commit '
81ef40bc4923e7014f52f03d8c7ddcf7a4344f70':
Avoid unnecessary bringChildToFront() calls.
Angus Kong [Fri, 11 Oct 2013 16:08:03 +0000 (16:08 +0000)]
Merge "Avoid unnecessary bringChildToFront() calls." into gb-ub-photos-carlsbad
Baligh Uddin [Fri, 11 Oct 2013 15:25:43 +0000 (15:25 +0000)]
Revert "Revert "Import translations. DO NOT MERGE""
This reverts commit
faa0615fd6d67fdfdbf28df099cb40a02c34c2f0.
Change-Id: I8043d94a45a975412c6f73e64628e1af3cc4d8fe
Baligh Uddin [Fri, 11 Oct 2013 15:25:02 +0000 (15:25 +0000)]
Merge "Revert "Import translations. DO NOT MERGE"" into klp-dev
Baligh Uddin [Fri, 11 Oct 2013 15:24:53 +0000 (15:24 +0000)]
Revert "Import translations. DO NOT MERGE"
This reverts commit
69e938dd6c3e49bfda29fc665b44340bf35b3e09.
Change-Id: I8a37595707a87b950c36a25003726d052ba2ab9d
Baligh Uddin [Fri, 11 Oct 2013 15:24:13 +0000 (15:24 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-dev
Baligh Uddin [Fri, 11 Oct 2013 08:59:03 +0000 (01:59 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ib699ef5577f778618a8657f9f58d317def9268ab
Auto-generated-cl: translation import
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:43:00 +0000 (20:43 -0700)]
am
64cea6aa: Don\'t show a details dialog if there are no details.
* commit '
64cea6aadb912067e31f1a158044c5efeb3e64af':
Don't show a details dialog if there are no details.
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:40:59 +0000 (19:40 -0700)]
am
2a959b83: Merge "Don\'t initialize photo module if it\'s paused." into gb-ub-photos-carlsbad
* commit '
2a959b838d9a20830d15f916a8a698f18582da5c':
Don't initialize photo module if it's paused.
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:31:16 +0000 (18:31 -0700)]
am
36c21ca1: Merge "Check both the requestId of current item and total items in filmstrip for bottom controls." into gb-ub-photos-carlsbad
* commit '
36c21ca1365c0c3832742bc0cf75d3409723254b':
Check both the requestId of current item and total items in filmstrip for bottom controls.
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, 11 Oct 2013 01:20:10 +0000 (18:20 -0700)]
am
d70f0fb6: Add fling support in zoom view
* commit '
d70f0fb68064e170fb2cf041a707ed04d68040f9':
Add fling support in zoom view
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:49:54 +0000 (17:49 -0700)]
am
8c807823: Merge "Remove display change listener for mode switch" into gb-ub-photos-carlsbad
* commit '
8c80782326d1cdc764b9a9a791b2c5525e8ef234':
Remove display change listener for mode switch
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
priya [Wed, 9 Oct 2013 18:51:11 +0000 (11:51 -0700)]
Increased time to wait in all tests.
For CameraLAtency.java got rid of the key event to get rid of geo tagging dialog on first launch of camera. That will be taken care of by pushing the shared_pref file.
Change-Id: I76a824b5690d6913630560d58739e2df5cc1c259
Sascha Haeberling [Thu, 10 Oct 2013 22:38:52 +0000 (15:38 -0700)]
am
ada31cbe: Merge "Hide the status bar and switch into lights-out mode when popup is dimissed." into gb-ub-photos-carlsbad
* commit '
ada31cbe4010e192825b7eb9b7093d4d75cf3558':
Hide the status bar and switch into lights-out mode when popup is dimissed.
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
priya [Thu, 10 Oct 2013 21:10:56 +0000 (21:10 +0000)]
Merge "Increased time to wait in all tests. For CameraLAtency.java got rid of the key event to get rid of geo tagging dialog on first launch of camera. That will be taken care of by pushing the shared_pref file." into klp-dev
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:43:13 +0000 (10:43 -0700)]
am
23df6752: Merge "Workaround for re-applying transform on new surface texuture" into gb-ub-photos-carlsbad
* commit '
23df6752f1bf0cc7d13b3aa68e87a8dde36af2d4':
Workaround for re-applying transform on new surface texuture
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
Mindy Pereira [Thu, 10 Oct 2013 17:36:00 +0000 (10:36 -0700)]
am
47e437de: Merge "Update shutter recording assets." into gb-ub-photos-carlsbad
* commit '
47e437dea0d53310eba230a54724b30004de144f':
Update shutter recording assets.
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
priya [Wed, 9 Oct 2013 18:51:11 +0000 (11:51 -0700)]
Increased time to wait in all tests.
For CameraLAtency.java got rid of the key event to get rid of geo tagging dialog on first launch of camera. That will be taken care of by pushing the shared_pref file.
Change-Id: I76a824b5690d6913630560d58739e2df5cc1c259
ztenghui [Thu, 10 Oct 2013 16:13:09 +0000 (09:13 -0700)]
am
d46d6f8e: Merge "Fix flash issue" into gb-ub-photos-carlsbad
* commit '
d46d6f8e729b0e40878b53763387604a9193385a':
Fix flash issue
ztenghui [Thu, 10 Oct 2013 16:09:22 +0000 (16:09 +0000)]
Merge "Fix flash issue" into gb-ub-photos-carlsbad
The Android Automerger [Thu, 10 Oct 2013 13:01:24 +0000 (06:01 -0700)]
merge in klp-release history after reset to klp-dev
Sascha Haeberling [Thu, 10 Oct 2013 06:02:10 +0000 (23:02 -0700)]
am
048bf4d0: Initialize GCam with GServices values.
* commit '
048bf4d0b46c4c34d8caa801c8ddc8c1ff4e79cf':
Initialize GCam with GServices values.
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:05:34 +0000 (18:05 -0700)]
am
c14bfe6a: Merge "gcam: Add postcapture for gcam debugging." into gb-ub-photos-carlsbad
* commit '
c14bfe6a287d31c8ee5c7a698a60acfdc7e7e393':
gcam: Add postcapture for gcam debugging.
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:44:54 +0000 (17:44 -0700)]
am
b5eb1ffa: Merge "gcam: Fix preview FOV." into gb-ub-photos-carlsbad
* commit '
b5eb1ffab6db3f311def4f9b28a189a991396537':
gcam: Fix preview FOV.
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:47:36 +0000 (15:47 -0700)]
am
71686048: Merge "Update bottom edit control for photos inside secure and insecure mode." into gb-ub-photos-carlsbad
* commit '
716860487554b5e214d355f88effc9b8c316d54e':
Update bottom edit control for photos inside secure and insecure mode.
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:27:17 +0000 (13:27 -0700)]
am
70d24b5b: Merge "Fix another potential issue related to video capture intent." into gb-ub-photos-carlsbad
* commit '
70d24b5b602ae56784d7f7bd6d79af7d37095553':
Fix another potential issue related to video capture intent.
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:24:12 +0000 (13:24 -0700)]
am
ef4dccf6: Merge "Workaround to disable swiping for SRI during capture" into gb-ub-photos-carlsbad
* commit '
ef4dccf65c1077b8c7f28c26c9c2038c975fd94c':
Workaround to disable swiping for SRI during capture
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 20:09:05 +0000 (13:09 -0700)]
am
26862c30: Update bottom controls and action bar with a tighter bounds on data change.
* commit '
26862c304a8163016b1f8196c715769750ba1720':
Update bottom controls and action bar with a tighter bounds on data change.
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:18:08 +0000 (09:18 -0700)]
am
52beb04d: Merge "Fix NPE in video intent." into gb-ub-photos-carlsbad
* commit '
52beb04d45ff906dfaffb1799a6d93859f1d83bd':
Fix NPE in video intent.
OSDN Git Service
