OSDN Git Service
ztenghui [Wed, 20 Nov 2013 19:37:41 +0000 (11:37 -0800)]
am
bfe61934: am
e04982ad: The initial focus value should be true.
* commit '
bfe619349ff66c5b5cc0dc1cdc2e02b99b959ec0':
The initial focus value should be true.
Sascha Haeberling [Wed, 20 Nov 2013 19:37:40 +0000 (11:37 -0800)]
am
0fa732e0: am
63565c83: Don\'t crash when preview surface could not be set.
* commit '
0fa732e0359169b43bd448718377c3578c443ae1':
Don't crash when preview surface could not be set.
Doris Liu [Wed, 20 Nov 2013 19:37:40 +0000 (11:37 -0800)]
am
36f5e5e1: am
aa67d847: Fix SRI orientation on manta
* commit '
36f5e5e151614d379d7428aadadd1236e3b09e63':
Fix SRI orientation on manta
ztenghui [Wed, 20 Nov 2013 18:34:20 +0000 (10:34 -0800)]
am
e04982ad: The initial focus value should be true.
* commit '
e04982ad43fa3672cadf821a1bbc9c6454ce20f3':
The initial focus value should be true.
Sascha Haeberling [Wed, 20 Nov 2013 18:34:20 +0000 (10:34 -0800)]
am
63565c83: Don\'t crash when preview surface could not be set.
* commit '
63565c83f70f1bfae8fccfca24605de8e0e42431':
Don't crash when preview surface could not be set.
Doris Liu [Wed, 20 Nov 2013 18:34:20 +0000 (10:34 -0800)]
am
aa67d847: Fix SRI orientation on manta
* commit '
aa67d847edf7de3741bac6fb40cd94b8c838d0ae':
Fix SRI orientation on manta
Andy Huibers [Wed, 20 Nov 2013 06:58:40 +0000 (22:58 -0800)]
am
88d8d997: am
6ea5eab7: am
6cff6768: am
7dc6e97c: Delay onResume tasks to speed up lockscreen onResume->onPause->onResume launch sequence.
* commit '
88d8d9973e96bc5a1d58f48d642e2f4451ffd071':
Delay onResume tasks to speed up lockscreen onResume->onPause->onResume launch sequence.
Andy Huibers [Wed, 20 Nov 2013 06:54:26 +0000 (22:54 -0800)]
am
6ea5eab7: am
6cff6768: am
7dc6e97c: Delay onResume tasks to speed up lockscreen onResume->onPause->onResume launch sequence.
* commit '
6ea5eab7033edb735ee2b0793c56b3c4cd48ff11':
Delay onResume tasks to speed up lockscreen onResume->onPause->onResume launch sequence.
Andy Huibers [Wed, 20 Nov 2013 06:50:55 +0000 (22:50 -0800)]
am
6cff6768: am
7dc6e97c: Delay onResume tasks to speed up lockscreen onResume->onPause->onResume launch sequence.
* commit '
6cff67680ec985520b1a4e8fd5ddaa5f682f303d':
Delay onResume tasks to speed up lockscreen onResume->onPause->onResume launch sequence.
Andy Huibers [Wed, 20 Nov 2013 06:48:14 +0000 (22:48 -0800)]
am
7dc6e97c: Delay onResume tasks to speed up lockscreen onResume->onPause->onResume launch sequence.
* commit '
7dc6e97c508125b94fffc15c4a8f0b6c989f396c':
Delay onResume tasks to speed up lockscreen onResume->onPause->onResume launch sequence.
Andy Huibers [Tue, 19 Nov 2013 23:10:04 +0000 (15:10 -0800)]
Delay onResume tasks to speed up lockscreen
onResume->onPause->onResume launch sequence.
Bug:
11773268
Change-Id: Iea7702a0141a390e1e9b50c738f6269c03dabcc3
Baligh Uddin [Mon, 18 Nov 2013 20:46:19 +0000 (12:46 -0800)]
am
da6d9776: (-s ours) am
a46752ca: (-s ours) am
9b75b682: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
da6d9776befd7f03cd863654c03327806025f8b6':
Import translations. DO NOT MERGE
Baligh Uddin [Mon, 18 Nov 2013 20:44:37 +0000 (12:44 -0800)]
am
a46752ca: (-s ours) am
9b75b682: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
a46752caf72c57855a19b1ddec250d95b302b1f6':
Import translations. DO NOT MERGE
Baligh Uddin [Mon, 18 Nov 2013 20:42:11 +0000 (12:42 -0800)]
am
9b75b682: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
9b75b68274f42f5fe2a30ca774e2ac1bf25faf82':
Import translations. DO NOT MERGE
Baligh Uddin [Mon, 18 Nov 2013 20:39:42 +0000 (20:39 +0000)]
Merge "Import translations. DO NOT MERGE"
Baligh Uddin [Mon, 18 Nov 2013 20:39:38 +0000 (20:39 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-dev
Ruben Brunk [Mon, 18 Nov 2013 19:57:36 +0000 (11:57 -0800)]
am
d1e68328: am
47e9cc73: am
a390c5b4: am
3bf1cda5: gcam: Clean up placeholders, and add deletion robustness.
* commit '
d1e683285f4aee83bd0e363957beaa4787df952e':
gcam: Clean up placeholders, and add deletion robustness.
Ruben Brunk [Mon, 18 Nov 2013 19:53:16 +0000 (11:53 -0800)]
am
47e9cc73: am
a390c5b4: am
3bf1cda5: gcam: Clean up placeholders, and add deletion robustness.
* commit '
47e9cc73092dc6ce14d8fa2f9ec0a11a1a812fe6':
gcam: Clean up placeholders, and add deletion robustness.
Ruben Brunk [Mon, 18 Nov 2013 19:47:52 +0000 (11:47 -0800)]
am
a390c5b4: am
3bf1cda5: gcam: Clean up placeholders, and add deletion robustness.
* commit '
a390c5b4388d5280a29e24c88470621b1c3b2992':
gcam: Clean up placeholders, and add deletion robustness.
Ruben Brunk [Mon, 18 Nov 2013 19:44:31 +0000 (11:44 -0800)]
am
3bf1cda5: gcam: Clean up placeholders, and add deletion robustness.
* commit '
3bf1cda53ebd85152fa9eed3ea8c9652a944df9b':
gcam: Clean up placeholders, and add deletion robustness.
Baligh Uddin [Mon, 18 Nov 2013 19:30:36 +0000 (11:30 -0800)]
Import translations. DO NOT MERGE
Change-Id: I65442650e1136f0ff5375b403f579349c091defb
Auto-generated-cl: translation import
Baligh Uddin [Mon, 18 Nov 2013 19:30:01 +0000 (11:30 -0800)]
Import translations. DO NOT MERGE
Change-Id: I41cd8145da8f2907c6c5b20713a28f3e47791bcc
Auto-generated-cl: translation import
Ruben Brunk [Fri, 15 Nov 2013 23:30:47 +0000 (15:30 -0800)]
gcam: Clean up placeholders, and add deletion robustness.
Bug:
11708734
Change-Id: I8a017a382f12165be27afbf78e733bcc1fc0ef6f
Sascha Haeberling [Thu, 14 Nov 2013 06:18:06 +0000 (22:18 -0800)]
am
6474693c: am
8415d85c: am
1a1e24f0: am
9db4ac80: Merge "Fix issue of focus indicator staying on without being hidden" into gb-ub-photos-carlsbad
* commit '
6474693c585b6d9190d90c0954acb0a0fe21e10a':
Fix issue of focus indicator staying on without being hidden
Doris Liu [Thu, 14 Nov 2013 06:18:01 +0000 (22:18 -0800)]
am
9d94bba7: am
48fd528a: am
e8bab2cd: am
fc7b8341: Ensure view size gets updated after phone decors change.
* commit '
9d94bba7339dd8284297ab1d129a23ff0212fa86':
Ensure view size gets updated after phone decors change.
Sascha Haeberling [Thu, 14 Nov 2013 03:30:38 +0000 (19:30 -0800)]
am
8415d85c: am
1a1e24f0: am
9db4ac80: Merge "Fix issue of focus indicator staying on without being hidden" into gb-ub-photos-carlsbad
* commit '
8415d85c2f86011f8fdd07dbdac4fcd9800eb903':
Fix issue of focus indicator staying on without being hidden
Sascha Haeberling [Thu, 14 Nov 2013 03:26:19 +0000 (19:26 -0800)]
am
1a1e24f0: am
9db4ac80: Merge "Fix issue of focus indicator staying on without being hidden" into gb-ub-photos-carlsbad
* commit '
1a1e24f095e8f232406d334d6c3e0cbb8f41aae5':
Fix issue of focus indicator staying on without being hidden
Sascha Haeberling [Thu, 14 Nov 2013 03:24:01 +0000 (19:24 -0800)]
am
9db4ac80: Merge "Fix issue of focus indicator staying on without being hidden" into gb-ub-photos-carlsbad
* commit '
9db4ac802c6f635bdc56c69f20be08e054ba2926':
Fix issue of focus indicator staying on without being hidden
Sascha Haeberling [Thu, 14 Nov 2013 03:22:15 +0000 (03:22 +0000)]
Merge "Fix issue of focus indicator staying on without being hidden" into gb-ub-photos-carlsbad
Sascha Haeberling [Thu, 14 Nov 2013 03:04:21 +0000 (19:04 -0800)]
Fix issue of focus indicator staying on without being hidden
Bug:
11505806
A mix up in the previous 100% CL caused this. This CL here also
makes it more robust by making the 100% extra time time-based instead
of frame-based.
Change-Id: I52c53d4b5816570c2c805e0e8ff193de684f2a64
Ed Heyl [Thu, 14 Nov 2013 02:47:37 +0000 (18:47 -0800)]
am
86b76ca8: am
6592443c: am
aa08cd8f: merge in release branch changes (no-op).
* commit '
86b76ca83825bc303449811cdd7d6fa12822569a':
Add logging to various actions
Ensure mOpenCameraThread has been setup before dereferencing.
Doris Liu [Thu, 14 Nov 2013 02:23:28 +0000 (18:23 -0800)]
am
48fd528a: am
e8bab2cd: am
fc7b8341: Ensure view size gets updated after phone decors change.
* commit '
48fd528a68eb8477033c2402918d467e531e8168':
Ensure view size gets updated after phone decors change.
Doris Liu [Thu, 14 Nov 2013 02:19:25 +0000 (18:19 -0800)]
am
e8bab2cd: am
fc7b8341: Ensure view size gets updated after phone decors change.
* commit '
e8bab2cda4916da1a721ba67154e99a74e27aacc':
Ensure view size gets updated after phone decors change.
Doris Liu [Thu, 14 Nov 2013 02:14:40 +0000 (18:14 -0800)]
am
fc7b8341: Ensure view size gets updated after phone decors change.
* commit '
fc7b834155f3a15939b0dcfaf7140a9da21b876c':
Ensure view size gets updated after phone decors change.
Doris Liu [Thu, 14 Nov 2013 01:59:24 +0000 (17:59 -0800)]
Ensure view size gets updated after phone decors change.
Bug:
11661906
Change-Id: I63234a94b5a0bbd0cc6aa62ccd2642de09208403
Ed Heyl [Wed, 13 Nov 2013 23:30:56 +0000 (15:30 -0800)]
am
6592443c: am
aa08cd8f: merge in release branch changes (no-op).
* commit '
6592443c49d0bb2f3c0cfa7b684921a7f024d96d':
Add logging to various actions
Ensure mOpenCameraThread has been setup before dereferencing.
Ed Heyl [Wed, 13 Nov 2013 23:26:53 +0000 (15:26 -0800)]
am
aa08cd8f: merge in release branch changes (no-op).
* commit '
aa08cd8f3c6fa652fa7a5fdb904e620dbf60f043':
Add logging to various actions
Ensure mOpenCameraThread has been setup before dereferencing.
Ed Heyl [Wed, 13 Nov 2013 23:19:24 +0000 (15:19 -0800)]
merge in release branch changes (no-op).
Sascha Haeberling [Wed, 13 Nov 2013 20:23:44 +0000 (12:23 -0800)]
am
03995ce9: am
feb472b0: am
e04f9709: am
ff3a994a: Merge "Show the 100% state of the progress at least one frame." into gb-ub-photos-carlsbad
* commit '
03995ce964203036eee90a918fd515062afc4284':
Show the 100% state of the progress at least one frame.
Sascha Haeberling [Wed, 13 Nov 2013 20:18:11 +0000 (12:18 -0800)]
am
feb472b0: am
e04f9709: am
ff3a994a: Merge "Show the 100% state of the progress at least one frame." into gb-ub-photos-carlsbad
* commit '
feb472b0639bbc7c591b06e4d0380343aa4d06ea':
Show the 100% state of the progress at least one frame.
Sascha Haeberling [Wed, 13 Nov 2013 20:11:37 +0000 (12:11 -0800)]
am
e04f9709: am
ff3a994a: Merge "Show the 100% state of the progress at least one frame." into gb-ub-photos-carlsbad
* commit '
e04f97097f78f821d6453d77f74307a8ee95e73f':
Show the 100% state of the progress at least one frame.
Sascha Haeberling [Wed, 13 Nov 2013 20:06:59 +0000 (12:06 -0800)]
am
ff3a994a: Merge "Show the 100% state of the progress at least one frame." into gb-ub-photos-carlsbad
* commit '
ff3a994a2f33c493024b82023bfa910686c4d1de':
Show the 100% state of the progress at least one frame.
Sascha Haeberling [Wed, 13 Nov 2013 19:31:08 +0000 (19:31 +0000)]
Merge "Show the 100% state of the progress at least one frame." into gb-ub-photos-carlsbad
Seth Raphael [Wed, 13 Nov 2013 17:51:37 +0000 (09:51 -0800)]
am
4077c5ac: am
ef9d3aea: am
79da4498: am
9c861f7a: Merge "Add parameters and deduplicate parameter changes" into gb-ub-photos-carlsbad
* commit '
4077c5ac42d53c0a7ec1a5c18a3817fa705e284b':
Add parameters and deduplicate parameter changes
Seth Raphael [Wed, 13 Nov 2013 17:48:07 +0000 (09:48 -0800)]
am
ef9d3aea: am
79da4498: am
9c861f7a: Merge "Add parameters and deduplicate parameter changes" into gb-ub-photos-carlsbad
* commit '
ef9d3aea57c6e9438af0aad2d9bc2ed8beec02ec':
Add parameters and deduplicate parameter changes
Seth Raphael [Wed, 13 Nov 2013 17:45:31 +0000 (09:45 -0800)]
am
79da4498: am
9c861f7a: Merge "Add parameters and deduplicate parameter changes" into gb-ub-photos-carlsbad
* commit '
79da449899dca5588301ce674951ba0552094d02':
Add parameters and deduplicate parameter changes
Seth Raphael [Wed, 13 Nov 2013 17:42:13 +0000 (09:42 -0800)]
am
9c861f7a: Merge "Add parameters and deduplicate parameter changes" into gb-ub-photos-carlsbad
* commit '
9c861f7a5a033275729e69116d980ec0a0aacc35':
Add parameters and deduplicate parameter changes
Seth Raphael [Wed, 13 Nov 2013 17:37:43 +0000 (17:37 +0000)]
Merge "Add parameters and deduplicate parameter changes" into gb-ub-photos-carlsbad
Sascha Haeberling [Tue, 12 Nov 2013 23:16:08 +0000 (15:16 -0800)]
Show the 100% state of the progress at least one frame.
Bug:
11505806
Change-Id: I5fe8456ff93cd50da53e022ac2cf2dd9ac633b2f
The Android Automerger [Wed, 13 Nov 2013 01:24:44 +0000 (17:24 -0800)]
merge in klp-mr1-release history after reset to klp-dev
Seth Raphael [Tue, 12 Nov 2013 19:21:17 +0000 (11:21 -0800)]
Add parameters and deduplicate parameter changes
Bug:
11646117
Change-Id: If52182a856d7ee8143a351c7f79a76d13840c61e
Erin Dahlgren [Tue, 12 Nov 2013 21:40:20 +0000 (13:40 -0800)]
am
9483c308: am
f3dd012d: am
03cb9721: am
cc70702c: Revert parallel opening camera in photo mode.
* commit '
9483c308e4203ee91aa25ee9a393b2cd8c209180':
Revert parallel opening camera in photo mode.
Erin Dahlgren [Tue, 12 Nov 2013 21:36:38 +0000 (13:36 -0800)]
am
f3dd012d: am
03cb9721: am
cc70702c: Revert parallel opening camera in photo mode.
* commit '
f3dd012d98be5a769efd935365d0f54412a9d939':
Revert parallel opening camera in photo mode.
Erin Dahlgren [Tue, 12 Nov 2013 21:34:05 +0000 (13:34 -0800)]
am
03cb9721: am
cc70702c: Revert parallel opening camera in photo mode.
* commit '
03cb97219c10790eb0eeb37b8d0867a1798da8f7':
Revert parallel opening camera in photo mode.
Erin Dahlgren [Tue, 12 Nov 2013 21:32:13 +0000 (13:32 -0800)]
am
cc70702c: Revert parallel opening camera in photo mode.
* commit '
cc70702cc06d98f011f0d9e80b2afa12e6762c8a':
Revert parallel opening camera in photo mode.
Erin Dahlgren [Tue, 12 Nov 2013 17:39:08 +0000 (09:39 -0800)]
Revert parallel opening camera in photo mode.
Reverts:
* ag/386409
* ag/386206
* ag/385573
Bug:
11598948
Bug:
11625767
Bug:
11627454
Bug:
11255097
Change-Id: Iad28e32dbcbbce42d9ee261c961cdd5a7712ede5
Andy Huibers [Tue, 12 Nov 2013 19:25:19 +0000 (11:25 -0800)]
am
1220c57e: am
9bd8ff21: am
9b9b0db9: am
a7c84bac: Merge "Close mode menus if another control is touched" into gb-ub-photos-carlsbad
* commit '
1220c57e65a7344a24426fe6c9d161548cb52648':
Close mode menus if another control is touched
Andy Huibers [Tue, 12 Nov 2013 19:21:23 +0000 (11:21 -0800)]
am
9bd8ff21: am
9b9b0db9: am
a7c84bac: Merge "Close mode menus if another control is touched" into gb-ub-photos-carlsbad
* commit '
9bd8ff21397e4e33032599758252a6e5274ffc9d':
Close mode menus if another control is touched
Andy Huibers [Tue, 12 Nov 2013 19:16:58 +0000 (11:16 -0800)]
am
9b9b0db9: am
a7c84bac: Merge "Close mode menus if another control is touched" into gb-ub-photos-carlsbad
* commit '
9b9b0db9445a0258b77339de49170e2fc5d48048':
Close mode menus if another control is touched
Andy Huibers [Tue, 12 Nov 2013 19:14:39 +0000 (11:14 -0800)]
am
a7c84bac: Merge "Close mode menus if another control is touched" into gb-ub-photos-carlsbad
* commit '
a7c84bacfd76e5e865655bd5a9b248d64f970af1':
Close mode menus if another control is touched
Andy Huibers [Tue, 12 Nov 2013 19:10:38 +0000 (19:10 +0000)]
Merge "Close mode menus if another control is touched" into gb-ub-photos-carlsbad
ztenghui [Tue, 12 Nov 2013 18:24:31 +0000 (10:24 -0800)]
am
66c00be2: am
d8606879: am
ad98a63f: am
aae09fb1: Merge "Differentiate the InProgressData from the normal PhotoData." into gb-ub-photos-carlsbad
* commit '
66c00be2d759877fa81b850a40df18d3e50145aa':
Differentiate the InProgressData from the normal PhotoData.
ztenghui [Tue, 12 Nov 2013 18:20:56 +0000 (10:20 -0800)]
am
d8606879: am
ad98a63f: am
aae09fb1: Merge "Differentiate the InProgressData from the normal PhotoData." into gb-ub-photos-carlsbad
* commit '
d86068799bcac0667cbb1ab59f246857b3b4ac64':
Differentiate the InProgressData from the normal PhotoData.
ztenghui [Tue, 12 Nov 2013 18:17:28 +0000 (10:17 -0800)]
am
ad98a63f: am
aae09fb1: Merge "Differentiate the InProgressData from the normal PhotoData." into gb-ub-photos-carlsbad
* commit '
ad98a63ff063eecc69d552606cb066b7a863e6ac':
Differentiate the InProgressData from the normal PhotoData.
ztenghui [Tue, 12 Nov 2013 18:14:56 +0000 (10:14 -0800)]
am
aae09fb1: Merge "Differentiate the InProgressData from the normal PhotoData." into gb-ub-photos-carlsbad
* commit '
aae09fb1ab292932504233da4be5181ce74db763':
Differentiate the InProgressData from the normal PhotoData.
Ruben Brunk [Tue, 12 Nov 2013 18:14:35 +0000 (10:14 -0800)]
am
57a66517: am
03732aed: am
fe9fef97: am
baffb73c: Start gcam module directly when handling capture intent.
* commit '
57a665173bcf8ee9b85506c29843ebfca3e1f406':
Start gcam module directly when handling capture intent.
ztenghui [Tue, 12 Nov 2013 18:12:34 +0000 (18:12 +0000)]
Merge "Differentiate the InProgressData from the normal PhotoData." into gb-ub-photos-carlsbad
Ruben Brunk [Tue, 12 Nov 2013 18:10:02 +0000 (10:10 -0800)]
am
03732aed: am
fe9fef97: am
baffb73c: Start gcam module directly when handling capture intent.
* commit '
03732aedc1624ed86a707b1f06acff69c9f6278c':
Start gcam module directly when handling capture intent.
Ruben Brunk [Tue, 12 Nov 2013 18:05:35 +0000 (10:05 -0800)]
am
fe9fef97: am
baffb73c: Start gcam module directly when handling capture intent.
* commit '
fe9fef97a9c7479611ac2f4b347ec092b555cf07':
Start gcam module directly when handling capture intent.
Ruben Brunk [Tue, 12 Nov 2013 18:00:25 +0000 (10:00 -0800)]
am
baffb73c: Start gcam module directly when handling capture intent.
* commit '
baffb73ca83d9d81c379f9f3b9f46cdac7355a0d':
Start gcam module directly when handling capture intent.
ztenghui [Tue, 12 Nov 2013 17:57:14 +0000 (09:57 -0800)]
Differentiate the InProgressData from the normal PhotoData.
When we load from MediaStore, we should differentiate the data still in
progress, e.g. HDR+, which should show the progress bar and hide the action bar
items.
bug:
11634500
bug:
11598186
Change-Id: I8179d39747218c8768977d5b3ce71eadbdfb8b58
Andy Huibers [Tue, 12 Nov 2013 06:30:49 +0000 (22:30 -0800)]
Close mode menus if another control is touched
Bug:
11598901
Bug:
11635865
Change-Id: I9c6237bacef9a28de1fa238e1e7378a57abfc573
Baligh Uddin [Tue, 12 Nov 2013 04:51:27 +0000 (20:51 -0800)]
am
b5159f56: (-s ours) am
1e4591d6: (-s ours) am
292e119c: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
b5159f56d45d294efd39cc085e475a1c452c531e':
Import translations. DO NOT MERGE
ztenghui [Tue, 12 Nov 2013 04:50:48 +0000 (20:50 -0800)]
am
3a1ab872: am
65d1169f: am
d12bbb8a: am
6a42c3ae: Add a null check to fix NPE
* commit '
3a1ab872bd051bedab63aa75acbcce6bd34597f9':
Add a null check to fix NPE
Ed Heyl [Tue, 12 Nov 2013 04:50:47 +0000 (20:50 -0800)]
am
33c2b60b: am
1c9a6a14: am
2b5aa3e3: merge in release branch changes (no-op).
* commit '
33c2b60b9561487af3ecf4f5e52c1d345fd7f265':
Add GCam progress indicator.
hide preview cover on arrival of new preview data if hidden
Fix photo mode is getting stuck in a single CameraState.
Show chooser on EDIT intents that have no activity for action.
Parallelize opening the camera with view handling in photo mode.
Decouple the visibility check for system UI from action bar
Don't crash Photo Sphere on back button press in filmstrip.
Check for media service being present before capture.
Seth Raphael [Tue, 12 Nov 2013 04:50:46 +0000 (20:50 -0800)]
am
203511fd: am
2aa0d2b3: am
05f23b7d: am
cbd8267e: Add logging to various actions
* commit '
203511fd372df4e7f9c1a2e3b2822b60981e653f':
Add logging to various actions
Ruben Brunk [Tue, 12 Nov 2013 04:50:46 +0000 (20:50 -0800)]
am
eaaca513: am
6911bfca: am
56960b7e: am
36d84c1d: Merge "Ensure mOpenCameraThread has been setup before dereferencing." into gb-ub-photos-carlsbad
* commit '
eaaca5130356a9bb2e38d590b63072ed507f5f9d':
Ensure mOpenCameraThread has been setup before dereferencing.
Sascha Haeberling [Tue, 12 Nov 2013 04:50:45 +0000 (20:50 -0800)]
am
176b0992: am
aa158f2f: am
0351d05d: am
2b78c0c0: Merge "Add GCam progress indicator." into gb-ub-photos-carlsbad
* commit '
176b099253e3a0eeec3ad2665157c126629b2ae2':
Add GCam progress indicator.
Andy Huibers [Tue, 12 Nov 2013 04:50:44 +0000 (20:50 -0800)]
am
02cdd0a4: am
8bc966eb: am
c504af14: am
fccf83bd: hide preview cover on arrival of new preview data if hidden
* commit '
02cdd0a4fc53f91ba11e191527b90720e10f8929':
hide preview cover on arrival of new preview data if hidden
Erin Dahlgren [Tue, 12 Nov 2013 04:50:43 +0000 (20:50 -0800)]
am
40b6b458: am
30ac3520: am
cbe9fc1f: am
2f878d54: Merge "Fix photo mode is getting stuck in a single CameraState." into gb-ub-photos-carlsbad
* commit '
40b6b4585c7ac59667b32e3e0f275423c665c8b8':
Fix photo mode is getting stuck in a single CameraState.
Erin Dahlgren [Tue, 12 Nov 2013 04:50:43 +0000 (20:50 -0800)]
am
71e8e91d: am
570d8da0: am
5a0475e4: am
05a04924: Show chooser on EDIT intents that have no activity for action.
* commit '
71e8e91d2b4ff73c7d63241a947b03c74ecd9e8c':
Show chooser on EDIT intents that have no activity for action.
Erin Dahlgren [Tue, 12 Nov 2013 04:50:42 +0000 (20:50 -0800)]
am
1ffe5c18: am
d2aeec25: am
c8761589: am
7e6e947f: Merge "Parallelize opening the camera with view handling in photo mode." into gb-ub-photos-carlsbad
* commit '
1ffe5c18a3f219496a0d85f50aeb31f4e8643758':
Parallelize opening the camera with view handling in photo mode.
ztenghui [Tue, 12 Nov 2013 04:50:42 +0000 (20:50 -0800)]
am
e77b0b74: am
2c14fb02: am
d2b57761: am
9070def9: Merge "Decouple the visibility check for system UI from action bar" into gb-ub-photos-carlsbad
* commit '
e77b0b74c1fb085ed247697226a5d8642932e83d':
Decouple the visibility check for system UI from action bar
Baligh Uddin [Tue, 12 Nov 2013 04:50:41 +0000 (20:50 -0800)]
am
c54d55f6: (-s ours) am
fef07e22: (-s ours) am
f5d6fc67: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
c54d55f60cf80e82353a407fe61fb9b13238fb24':
Import translations. DO NOT MERGE
Sascha Haeberling [Tue, 12 Nov 2013 04:50:40 +0000 (20:50 -0800)]
am
35965b92: am
ef339df9: am
107e93ee: am
eb605b4a: Don\'t crash Photo Sphere on back button press in filmstrip.
* commit '
35965b92472f0751e3c1a3b9737b4daff05c3efd':
Don't crash Photo Sphere on back button press in filmstrip.
Ruben Brunk [Mon, 11 Nov 2013 22:13:59 +0000 (14:13 -0800)]
Start gcam module directly when handling capture intent.
Bug:
11609971
- Prior behavior for capture intents when in HDR+ mode was
to resume into the PhotoModule and switch to the GcamModule.
Following this change, we resume directly into the GcamModule.
- Fixes the bad lockscreen behavior caused by the sequence:
onResume->switch to GcamModule(queue GcamModule onPause and onResume)->
onPause->onResume, where handler queuing order could get in a
state where the GcamModule onResume is called twice in a row,
resulting in duplicate requests being queued for each capture.
Change-Id: Ibd632d74836224288270f5342e45e523e25ca429
Baligh Uddin [Mon, 11 Nov 2013 22:48:31 +0000 (14:48 -0800)]
am
1e4591d6: (-s ours) am
292e119c: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
1e4591d6be9033e82110d90a0cd1aec028084d61':
Import translations. DO NOT MERGE
Baligh Uddin [Mon, 11 Nov 2013 22:44:42 +0000 (14:44 -0800)]
am
292e119c: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
292e119c14c936c35478aad1d386a2ef5b8a0827':
Import translations. DO NOT MERGE
Baligh Uddin [Mon, 11 Nov 2013 22:42:39 +0000 (22:42 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-dev
Baligh Uddin [Mon, 11 Nov 2013 19:04:58 +0000 (11:04 -0800)]
Import translations. DO NOT MERGE
Change-Id: I5473adda29e7188a6e12ee57a1576f6ca6abadda
Auto-generated-cl: translation import
Baligh Uddin [Mon, 11 Nov 2013 19:04:17 +0000 (11:04 -0800)]
Import translations. DO NOT MERGE
Change-Id: I19829aa0316b38df602b026e39213f11ca02d4d9
Auto-generated-cl: translation import
The Android Automerger [Mon, 11 Nov 2013 18:50:34 +0000 (10:50 -0800)]
merge in klp-mr1-release history after reset to klp-dev
ztenghui [Mon, 11 Nov 2013 17:11:46 +0000 (09:11 -0800)]
am
65d1169f: am
d12bbb8a: am
6a42c3ae: Add a null check to fix NPE
* commit '
65d1169f8f100139cfbd6050094489230377cff1':
Add a null check to fix NPE
Ed Heyl [Mon, 11 Nov 2013 17:11:22 +0000 (09:11 -0800)]
am
1c9a6a14: am
2b5aa3e3: merge in release branch changes (no-op).
* commit '
1c9a6a1431c0eec8f7f08cc81429aa5e20322bfc':
Add GCam progress indicator.
hide preview cover on arrival of new preview data if hidden
Fix photo mode is getting stuck in a single CameraState.
Show chooser on EDIT intents that have no activity for action.
Parallelize opening the camera with view handling in photo mode.
Decouple the visibility check for system UI from action bar
Don't crash Photo Sphere on back button press in filmstrip.
Check for media service being present before capture.
Seth Raphael [Mon, 11 Nov 2013 17:11:21 +0000 (09:11 -0800)]
am
2aa0d2b3: am
05f23b7d: am
cbd8267e: Add logging to various actions
* commit '
2aa0d2b3ab80194be3c5b9aaab2face534a363c8':
Add logging to various actions
Ruben Brunk [Mon, 11 Nov 2013 17:11:21 +0000 (09:11 -0800)]
am
6911bfca: am
56960b7e: am
36d84c1d: Merge "Ensure mOpenCameraThread has been setup before dereferencing." into gb-ub-photos-carlsbad
* commit '
6911bfca1b8be8b1bd41f30dee77828678de3bd7':
Ensure mOpenCameraThread has been setup before dereferencing.
Sascha Haeberling [Mon, 11 Nov 2013 17:11:20 +0000 (09:11 -0800)]
am
aa158f2f: am
0351d05d: am
2b78c0c0: Merge "Add GCam progress indicator." into gb-ub-photos-carlsbad
* commit '
aa158f2fc14b8df1f0f1d36429f094153cf9b376':
Add GCam progress indicator.
Andy Huibers [Mon, 11 Nov 2013 17:11:20 +0000 (09:11 -0800)]
am
8bc966eb: am
c504af14: am
fccf83bd: hide preview cover on arrival of new preview data if hidden
* commit '
8bc966eb1879d8b9d6c8552c160762c5595bbd13':
hide preview cover on arrival of new preview data if hidden
Erin Dahlgren [Mon, 11 Nov 2013 17:11:19 +0000 (09:11 -0800)]
am
30ac3520: am
cbe9fc1f: am
2f878d54: Merge "Fix photo mode is getting stuck in a single CameraState." into gb-ub-photos-carlsbad
* commit '
30ac35202ada27aef3bbeeae03f73c49249569ee':
Fix photo mode is getting stuck in a single CameraState.
Erin Dahlgren [Mon, 11 Nov 2013 17:11:19 +0000 (09:11 -0800)]
am
570d8da0: am
5a0475e4: am
05a04924: Show chooser on EDIT intents that have no activity for action.
* commit '
570d8da0ee90cadca3b2281ad0d37078702f614f':
Show chooser on EDIT intents that have no activity for action.