OSDN Git Service
Baligh Uddin [Fri, 11 Oct 2013 16:00:10 +0000 (16:00 +0000)]
Merge "Revert "Import translations. DO NOT MERGE"" into klp-ub-dev
Baligh Uddin [Fri, 11 Oct 2013 15:59:59 +0000 (15:59 +0000)]
Revert "Import translations. DO NOT MERGE"
This reverts commit
a1dd79180a1da373b9e6f349c3f9b72e973d0e28.
Change-Id: I305fb5703b900693ca508384b1dcfba3da5f1b7c
Baligh Uddin [Fri, 11 Oct 2013 15:27:22 +0000 (08:27 -0700)]
am
cdbd8a64: (-s ours) Merge "Revert "Import translations. DO NOT MERGE"" into klp-dev
* commit '
cdbd8a64c368c9f363acc3b52067ae50e1fe2557':
Revert "Import translations. DO NOT MERGE"
Baligh Uddin [Fri, 11 Oct 2013 15:27:22 +0000 (08:27 -0700)]
am
32445d3b: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
32445d3b3e237505cf7604a532e52ec2d7d6fb19':
Import translations. DO NOT MERGE
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:18 +0000 (15:24 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-ub-dev
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:36 +0000 (01:59 -0700)]
Import translations. DO NOT MERGE
Change-Id: I232154f8f6cd3f6eeeb0749b36d4a5d3f25c4702
Auto-generated-cl: translation import
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
Sascha Haeberling [Fri, 11 Oct 2013 03:44:51 +0000 (20:44 -0700)]
am
3b9f618b: am
64cea6aa: Don\'t show a details dialog if there are no details.
* commit '
3b9f618ba95f6fb095e2be584fb52443c587dda6':
Don't show a details dialog if there are no details.
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:42:47 +0000 (19:42 -0700)]
am
886c3a5f: am
2a959b83: Merge "Don\'t initialize photo module if it\'s paused." into gb-ub-photos-carlsbad
* commit '
886c3a5fabf59d8529910f34f155fb4565d5a4d2':
Don't initialize photo module if it's paused.
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:36:33 +0000 (18:36 -0700)]
am
6cad9e09: am
36c21ca1: Merge "Check both the requestId of current item and total items in filmstrip for bottom controls." into gb-ub-photos-carlsbad
* commit '
6cad9e09bef494a3ae9f19049ad8fa501d134613':
Check both the requestId of current item and total items in filmstrip for bottom controls.
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:22:51 +0000 (18:22 -0700)]
am
bc7ecede: am
d70f0fb6: Add fling support in zoom view
* commit '
bc7ecede08af6cbd696f501301f3183bd0e4eab1':
Add fling support in zoom view
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:51:43 +0000 (17:51 -0700)]
am
8a310a39: am
8c807823: Merge "Remove display change listener for mode switch" into gb-ub-photos-carlsbad
* commit '
8a310a3975c3546be43c7ce3e2f11cf648fc59f5':
Remove display change listener for mode switch
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
Sascha Haeberling [Thu, 10 Oct 2013 22:46:55 +0000 (15:46 -0700)]
am
86ecc992: am
ada31cbe: Merge "Hide the status bar and switch into lights-out mode when popup is dimissed." into gb-ub-photos-carlsbad
* commit '
86ecc992272d4bc7d4d97057bf797bc1c5568363':
Hide the status bar and switch into lights-out mode when popup is dimissed.
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:13:28 +0000 (14:13 -0700)]
am
f51bebd5: 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
* commit '
f51bebd5be7c1438aee808a4bbb565720224654f':
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.
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:49:25 +0000 (10:49 -0700)]
am
364c8830: am
23df6752: Merge "Workaround for re-applying transform on new surface texuture" into gb-ub-photos-carlsbad
* commit '
364c88307b21d8f81d0c159ea0c852662dfdb0f0':
Workaround for re-applying transform on new surface texuture
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:39:25 +0000 (10:39 -0700)]
am
fca08fd3: am
47e437de: Merge "Update shutter recording assets." into gb-ub-photos-carlsbad
* commit '
fca08fd3f63cc49e8ea191de7c61c92cce24f6a4':
Update shutter recording assets.
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
ztenghui [Thu, 10 Oct 2013 16:15:21 +0000 (09:15 -0700)]
am
8d2bc8ef: am
d46d6f8e: Merge "Fix flash issue" into gb-ub-photos-carlsbad
* commit '
8d2bc8ef3470efc960d5ebbb8ac2f6a25a5b38f5':
Fix flash issue
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
Sascha Haeberling [Thu, 10 Oct 2013 06:04:07 +0000 (23:04 -0700)]
am
030b6a41: am
048bf4d0: Initialize GCam with GServices values.
* commit '
030b6a41b77d7e830d8499589aec7527005d4e9d':
Initialize GCam with GServices values.
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.
Ruben Brunk [Thu, 10 Oct 2013 04:07:51 +0000 (21:07 -0700)]
am
cb17c7f8: am
c14bfe6a: Merge "gcam: Add postcapture for gcam debugging." into gb-ub-photos-carlsbad
* commit '
cb17c7f81ed4a00f17b6d63b186f4829ccdd3029':
gcam: Add postcapture for gcam debugging.
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
Ruben Brunk [Thu, 10 Oct 2013 00:49:48 +0000 (17:49 -0700)]
am
c89b9122: am
b5eb1ffa: Merge "gcam: Fix preview FOV." into gb-ub-photos-carlsbad
* commit '
c89b91221152d84f6792c530cf75aebb066e58ed':
gcam: Fix preview FOV.
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:50:09 +0000 (15:50 -0700)]
am
3f552685: am
71686048: Merge "Update bottom edit control for photos inside secure and insecure mode." into gb-ub-photos-carlsbad
* commit '
3f552685349fc1b447dc09c54d66de397270da9a':
Update bottom edit control for photos inside secure and insecure mode.
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:29:12 +0000 (13:29 -0700)]
am
3cac767e: am
70d24b5b: Merge "Fix another potential issue related to video capture intent." into gb-ub-photos-carlsbad
* commit '
3cac767e2fafccd565761b7677f554d680c72de3':
Fix another potential issue related to video capture intent.
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.
Doris Liu [Wed, 9 Oct 2013 20:25:46 +0000 (13:25 -0700)]
am
7c2e7cce: am
ef4dccf6: Merge "Workaround to disable swiping for SRI during capture" into gb-ub-photos-carlsbad
* commit '
7c2e7ccef29aa272f183b90a4890e3ce5e6526f2':
Workaround to disable swiping for SRI during capture
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:11:29 +0000 (13:11 -0700)]
am
82223508: am
26862c30: Update bottom controls and action bar with a tighter bounds on data change.
* commit '
82223508f8a30bf30577cad5760db8ceff35586a':
Update bottom controls and action bar with a tighter bounds on data change.
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:21:26 +0000 (09:21 -0700)]
am
676b89ca: am
52beb04d: Merge "Fix NPE in video intent." into gb-ub-photos-carlsbad
* commit '
676b89cab6e9db1b784617fc16e97eadac7c4e2d':
Fix NPE in video intent.
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.
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:57:01 +0000 (08:57 -0700)]
am
59f24eeb: am
6939d143: Merge "Make the transition animation identical." into gb-ub-photos-carlsbad
* commit '
59f24eeb714d75658f98123928f872fe65cab0a1':
Make the transition animation identical.
Angus Kong [Wed, 9 Oct 2013 15:54:46 +0000 (08:54 -0700)]
am
6939d143: Merge "Make the transition animation identical." into gb-ub-photos-carlsbad
* commit '
6939d143cb52a012b1b9cd9a141156357367b212':
Make the transition animation identical.
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 15:44:27 +0000 (08:44 -0700)]
am
a584528f: am
6ddd31b9: Enter fullscreen if all items are removed.
* commit '
a584528f0c77d383284ba6c8cc249bcad49e2be7':
Enter fullscreen if all items are removed.
Angus Kong [Wed, 9 Oct 2013 15:42:40 +0000 (08:42 -0700)]
am
6ddd31b9: Enter fullscreen if all items are removed.
* commit '
6ddd31b9284bbbfcf891766f9d6238bfd5cde721':
Enter fullscreen if all items are removed.
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 03:02:24 +0000 (20:02 -0700)]
am
762d8cb0: am
b04dcdb5: Merge "Don\'t go into Gcam when it\'s capture intent." into gb-ub-photos-carlsbad
* commit '
762d8cb0c6e05af36893fd3eec9753e4f68b6c83':
Don't go into Gcam when it's capture intent.
Angus Kong [Wed, 9 Oct 2013 03:00:48 +0000 (20:00 -0700)]
am
b04dcdb5: Merge "Don\'t go into Gcam when it\'s capture intent." into gb-ub-photos-carlsbad
* commit '
b04dcdb5cea6ac42f8ba0d699dc45e965d104a5e':
Don't go into Gcam when it's capture intent.
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
Doris Liu [Wed, 9 Oct 2013 00:55:25 +0000 (17:55 -0700)]
am
52fab3a0: am
3179f6a4: Allow scaling beyond 1:1 in zoom view
* commit '
52fab3a022a45e1a87852c1eda650d60a8633d1a':
Allow scaling beyond 1:1 in zoom view
Doris Liu [Wed, 9 Oct 2013 00:52:38 +0000 (17:52 -0700)]
am
3179f6a4: Allow scaling beyond 1:1 in zoom view
* commit '
3179f6a49516833761be5155c4e1244ac0aa17fe':
Allow scaling beyond 1:1 in zoom view
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:06:21 +0000 (17:06 -0700)]
am
89a8a1c3: am
607634ca: Merge "Do not allow navigation to filmstrip during video recording" into gb-ub-photos-carlsbad
* commit '
89a8a1c3a85bad6b99c240364e8fad33fc7a89e2':
Do not allow navigation to filmstrip during video recording
Doris Liu [Wed, 9 Oct 2013 00:03:46 +0000 (17:03 -0700)]
am
607634ca: Merge "Do not allow navigation to filmstrip during video recording" into gb-ub-photos-carlsbad
* commit '
607634cafd9a0b626de8390d855bdabe23a4738b':
Do not allow navigation to filmstrip during video recording
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:49:25 +0000 (16:49 -0700)]
am
51d86937: am
2ca6c0f7: Merge "Update camera assets for de-blue effort" into gb-ub-photos-carlsbad
* commit '
51d86937e76b5e07f000c790818244e748403e75':
Update camera assets for de-blue effort
Mindy DelliCarpini [Tue, 8 Oct 2013 23:47:30 +0000 (16:47 -0700)]
am
2ca6c0f7: Merge "Update camera assets for de-blue effort" into gb-ub-photos-carlsbad
* commit '
2ca6c0f77ab8c70558e2ad4937d2fdd1e505b0f5':
Update camera assets for de-blue effort
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
Ed Heyl [Tue, 8 Oct 2013 23:09:29 +0000 (16:09 -0700)]
Ed Heyl [Tue, 8 Oct 2013 23:01:17 +0000 (16:01 -0700)]
merge in KFS78N (no-op)
Ed Heyl [Tue, 8 Oct 2013 22:47:46 +0000 (15:47 -0700)]
am
2c042f21: merge in KQS81M
* commit '
2c042f218280aa6ee8c8d0d83fe4830e104c6365':
Adding gcam module to Camera2 app.
Refine Filmstrip gesture/position handling.
Fix drawable location.
Improve swipe gesture in filmstrip.
Fix black screen in mode switching
Stop the MediaSaveService after unbinding.
Enable switching cameras in video mode.
Handle unexpected exceptions when loading videos.
Add back DisableCameraReceiver
Ed Heyl [Tue, 8 Oct 2013 22:42:17 +0000 (15:42 -0700)]
merge in KQS81M
OSDN Git Service
