OSDN Git Service
Michael Kolb [Tue, 3 Dec 2013 18:24:45 +0000 (18:24 +0000)]
am
c5da5393: am
153a52b3: am
1e5baa47: am
0f7d5488: Revert fixed focus area in CAF mode
* commit '
c5da53936350c1f5cc5e8f7f4b0dfe2ff24b0f25':
Revert fixed focus area in CAF mode
Michael Kolb [Tue, 3 Dec 2013 18:17:38 +0000 (10:17 -0800)]
am
153a52b3: am
1e5baa47: am
0f7d5488: Revert fixed focus area in CAF mode
* commit '
153a52b3517d354a101a0f10d589c88afd6974b6':
Revert fixed focus area in CAF mode
Michael Kolb [Tue, 3 Dec 2013 18:13:28 +0000 (10:13 -0800)]
am
1e5baa47: am
0f7d5488: Revert fixed focus area in CAF mode
* commit '
1e5baa473c233f7b4bd1568d5047c20533e4ce59':
Revert fixed focus area in CAF mode
Michael Kolb [Tue, 3 Dec 2013 18:10:46 +0000 (10:10 -0800)]
am
0f7d5488: Revert fixed focus area in CAF mode
* commit '
0f7d5488d33988c1ee3636fe3a7d6472bed84f00':
Revert fixed focus area in CAF mode
Alan Newberger [Tue, 3 Dec 2013 17:46:33 +0000 (17:46 +0000)]
am
0ea86760: am
69818e57: am
a3b92891: am
0d5505dd: Merge "Add another HTC picture resolution" into gb-ub-photos-carlsbad
* commit '
0ea8676082f28f7a975c4316e9bd43ae30b72ed3':
Add another HTC picture resolution
Michael Kolb [Thu, 11 Jul 2013 20:48:15 +0000 (13:48 -0700)]
Revert fixed focus area in CAF mode
Bug:
9306098
This doesn't set the faces as focus/exp areas yet, but resets the focus area to null
in CAF mode to let the HAL decide focus/exp area.
Cherrypick of Bryce CL into Carlsbad.
Change-Id: I38e31937f64ecdb23d6c79f96040c46652d1d7d0
Conflicts:
src/com/android/camera/FocusOverlayManager.java
Alan Newberger [Tue, 3 Dec 2013 17:39:12 +0000 (09:39 -0800)]
am
69818e57: am
a3b92891: am
0d5505dd: Merge "Add another HTC picture resolution" into gb-ub-photos-carlsbad
* commit '
69818e57c74f176d31ef48c7c628234c240f1412':
Add another HTC picture resolution
Alan Newberger [Tue, 3 Dec 2013 17:35:47 +0000 (09:35 -0800)]
am
a3b92891: am
0d5505dd: Merge "Add another HTC picture resolution" into gb-ub-photos-carlsbad
* commit '
a3b928919285fbe31a1201cb0b56336a3909cb4f':
Add another HTC picture resolution
Alan Newberger [Tue, 3 Dec 2013 17:31:25 +0000 (09:31 -0800)]
am
0d5505dd: Merge "Add another HTC picture resolution" into gb-ub-photos-carlsbad
* commit '
0d5505dd1a3bf297677161c4c6608c783d7a2b68':
Add another HTC picture resolution
Alan Newberger [Tue, 3 Dec 2013 17:27:25 +0000 (17:27 +0000)]
Merge "Add another HTC picture resolution" into gb-ub-photos-carlsbad
Michael Kolb [Wed, 12 Jun 2013 18:57:45 +0000 (11:57 -0700)]
Add another HTC picture resolution
patching into Carlsbad branch from Bryce
Bug:
9370319
Change-Id: I9b2c45b98c7075fda7289707f1e290fcefc084cc
Conflicts:
res/values/strings.xml
Michael Kolb [Tue, 3 Dec 2013 00:06:33 +0000 (00:06 +0000)]
am
9e71a438: am
a43545d1: am
8850f6d8: am
7993f452: Always set focus mode first before applying scene mode
* commit '
9e71a438c750d69ac1b20b4f1486745ae338e22f':
Always set focus mode first before applying scene mode
Michael Kolb [Mon, 2 Dec 2013 23:57:24 +0000 (15:57 -0800)]
am
a43545d1: am
8850f6d8: am
7993f452: Always set focus mode first before applying scene mode
* commit '
a43545d1ec655719e81d04c2d14440a1418e7178':
Always set focus mode first before applying scene mode
Michael Kolb [Mon, 2 Dec 2013 23:54:53 +0000 (15:54 -0800)]
am
8850f6d8: am
7993f452: Always set focus mode first before applying scene mode
* commit '
8850f6d8bf69f6415e7e38448f8ef33824ac67cf':
Always set focus mode first before applying scene mode
Michael Kolb [Mon, 2 Dec 2013 23:52:44 +0000 (15:52 -0800)]
am
7993f452: Always set focus mode first before applying scene mode
* commit '
7993f4521011869a794da69e4d0057fe3b0886c3':
Always set focus mode first before applying scene mode
Seth Raphael [Mon, 2 Dec 2013 23:31:13 +0000 (23:31 +0000)]
am
871fedc1: am
ff67e2a6: am
3a46bed6: am
88f9b3e7: Reduce logging of flattened Preferences
* commit '
871fedc18a1e5db6c32ea3c7fa3ed105ae032e89':
Reduce logging of flattened Preferences
Michael Kolb [Fri, 12 Jul 2013 18:36:47 +0000 (11:36 -0700)]
Always set focus mode first before applying scene mode
cherrypick from Bryce branch
Bug:
9577903
Bug:
11777611
Change-Id: I2c300e443a47c7bc0c20f6aaec6f6e4b6c238880
Seth Raphael [Thu, 28 Nov 2013 01:47:58 +0000 (17:47 -0800)]
am
ff67e2a6: am
3a46bed6: am
88f9b3e7: Reduce logging of flattened Preferences
* commit '
ff67e2a6207eaf0196b62c8afcee78c47d90a664':
Reduce logging of flattened Preferences
Seth Raphael [Thu, 28 Nov 2013 01:43:36 +0000 (17:43 -0800)]
am
3a46bed6: am
88f9b3e7: Reduce logging of flattened Preferences
* commit '
3a46bed61f9b64d2b252909563caecfd811dd691':
Reduce logging of flattened Preferences
Seth Raphael [Thu, 28 Nov 2013 01:40:56 +0000 (17:40 -0800)]
am
88f9b3e7: Reduce logging of flattened Preferences
* commit '
88f9b3e75c313d181c49ac644930627c40b2138d':
Reduce logging of flattened Preferences
Seth Raphael [Wed, 27 Nov 2013 22:29:24 +0000 (14:29 -0800)]
Reduce logging of flattened Preferences
Bug:
11901390
Change-Id: I9f2e27e769fd745be01bb2c12a7f07b45aa0b905
The Android Open Source Project [Tue, 26 Nov 2013 16:42:25 +0000 (08:42 -0800)]
Baligh Uddin [Tue, 26 Nov 2013 16:42:24 +0000 (08:42 -0800)]
am
963fc7c2: am
790c7e9a: am
7f18027e: Merge remote-tracking branch \'origin/kitkat-dev\'
* commit '
963fc7c20643f01206ebac0c8109fc5b1e14272a':
Initial empty repository
The Android Open Source Project [Tue, 26 Nov 2013 16:38:28 +0000 (08:38 -0800)]
Baligh Uddin [Tue, 26 Nov 2013 16:38:28 +0000 (08:38 -0800)]
am
790c7e9a: am
7f18027e: Merge remote-tracking branch \'origin/kitkat-dev\'
* commit '
790c7e9acb279a5ee559f239dd3a93c27a4ffac8':
Initial empty repository
The Android Open Source Project [Tue, 26 Nov 2013 00:24:12 +0000 (16:24 -0800)]
Baligh Uddin [Tue, 26 Nov 2013 00:24:12 +0000 (16:24 -0800)]
am
7f18027e: Merge remote-tracking branch \'origin/kitkat-dev\'
* commit '
7f18027e271253b4eb3ef1b36458be78b7ed5f12':
Initial empty repository
Geoff Mendal [Mon, 25 Nov 2013 21:17:33 +0000 (13:17 -0800)]
am
fbfe22e6: (-s ours) am
a08365d6: (-s ours) am
3e44cad5: (-s ours) am
adf70222: (-s ours) Import translations. DO NOT MERGE
* commit '
fbfe22e611be62d062dca552cb7262e0157d76a1':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 25 Nov 2013 21:14:48 +0000 (13:14 -0800)]
am
a08365d6: (-s ours) am
3e44cad5: (-s ours) am
adf70222: (-s ours) Import translations. DO NOT MERGE
* commit '
a08365d61aa05e68fb6ea5afc24704d6efc4f0cf':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 25 Nov 2013 21:11:21 +0000 (13:11 -0800)]
am
3e44cad5: (-s ours) am
adf70222: (-s ours) Import translations. DO NOT MERGE
* commit '
3e44cad56c566a40f2b8e78ae6a22bc9980dcca2':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 25 Nov 2013 21:11:04 +0000 (13:11 -0800)]
am
b88897d7: (-s ours) am
7b1d7e46: (-s ours) am
7191c955: (-s ours) Import translations. DO NOT MERGE
* commit '
b88897d758596209047bc525ff10ef06386eacbb':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 25 Nov 2013 21:08:34 +0000 (13:08 -0800)]
am
adf70222: (-s ours) Import translations. DO NOT MERGE
* commit '
adf70222d8c493a6880c54b8f939c541a61949bf':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 25 Nov 2013 21:07:16 +0000 (13:07 -0800)]
am
7b1d7e46: (-s ours) am
7191c955: (-s ours) Import translations. DO NOT MERGE
* commit '
7b1d7e46f9429a7bb82142da461223016361224c':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 25 Nov 2013 21:02:53 +0000 (13:02 -0800)]
am
7191c955: (-s ours) Import translations. DO NOT MERGE
* commit '
7191c9558e22e81bdbaf34411bebe92d32eacfbb':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 25 Nov 2013 19:54:56 +0000 (11:54 -0800)]
Import translations. DO NOT MERGE
Change-Id: Ie9c3ede766236f45e7fb704f7ee2ee2f6130cd6f
Auto-generated-cl: translation import
Geoff Mendal [Mon, 25 Nov 2013 19:54:26 +0000 (11:54 -0800)]
Import translations. DO NOT MERGE
Change-Id: I258a9c2191463a2d46a6524e6523c7639ee183b4
Auto-generated-cl: translation import
Geoff Mendal [Mon, 25 Nov 2013 19:53:21 +0000 (11:53 -0800)]
Import translations. DO NOT MERGE
Change-Id: I50cb348cf6e31dcb28145087c649c5106bd563d5
Auto-generated-cl: translation import
The Android Open Source Project [Mon, 25 Nov 2013 00:22:21 +0000 (16:22 -0800)]
Merge in Android 4.4
The Android Open Source Project [Sat, 23 Nov 2013 20:29:45 +0000 (12:29 -0800)]
The Android Open Source Project [Sat, 23 Nov 2013 01:44:24 +0000 (17:44 -0800)]
The Android Open Source Project [Fri, 22 Nov 2013 18:35:31 +0000 (10:35 -0800)]
Baligh Uddin [Fri, 22 Nov 2013 06:59:51 +0000 (22:59 -0800)]
am
1dd617a7: (-s ours) am
8cbdfb97: (-s ours) am
98578f40: (-s ours) am
18eb2e4e: (-s ours) Import translations. DO NOT MERGE
* commit '
1dd617a7ffde72bef08c99df44cb8dadae3129fd':
Import translations. DO NOT MERGE
Baligh Uddin [Fri, 22 Nov 2013 01:33:55 +0000 (17:33 -0800)]
am
8cbdfb97: (-s ours) am
98578f40: (-s ours) am
18eb2e4e: (-s ours) Import translations. DO NOT MERGE
* commit '
8cbdfb97cc19f19b8b4fab9b5594a11735607a97':
Import translations. DO NOT MERGE
Baligh Uddin [Fri, 22 Nov 2013 01:30:10 +0000 (17:30 -0800)]
am
98578f40: (-s ours) am
18eb2e4e: (-s ours) Import translations. DO NOT MERGE
* commit '
98578f40ad99bf6ed2c094f7eccb5682e51b71af':
Import translations. DO NOT MERGE
Baligh Uddin [Fri, 22 Nov 2013 01:23:51 +0000 (17:23 -0800)]
am
18eb2e4e: (-s ours) Import translations. DO NOT MERGE
* commit '
18eb2e4e7f35a5dfbeea6e3c64b612769bb31293':
Import translations. DO NOT MERGE
Baligh Uddin [Fri, 22 Nov 2013 00:41:27 +0000 (16:41 -0800)]
Import translations. DO NOT MERGE
Change-Id: I5bf42de7313c856550b6cc68e0ca5fa30a64c6a1
Auto-generated-cl: translation import
Baligh Uddin [Wed, 20 Nov 2013 21:24:14 +0000 (13:24 -0800)]
am
577910d0: (-s ours) am
0c7ea745: (-s ours) am
ae13f34c: (-s ours) Import translations. DO NOT MERGE
* commit '
577910d049c6c66733985c44b0602a0179327471':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 20 Nov 2013 21:19:50 +0000 (13:19 -0800)]
am
0c7ea745: (-s ours) am
ae13f34c: (-s ours) Import translations. DO NOT MERGE
* commit '
0c7ea745e591133aedbd1fc1b5df93d85a490054':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 20 Nov 2013 21:15:26 +0000 (13:15 -0800)]
am
ae13f34c: (-s ours) Import translations. DO NOT MERGE
* commit '
ae13f34c5debd5442a616bc97558815a069a84b8':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 20 Nov 2013 21:11:43 +0000 (21:11 +0000)]
Merge "Import translations. DO NOT MERGE"
Baligh Uddin [Wed, 20 Nov 2013 19:54:26 +0000 (11:54 -0800)]
Import translations. DO NOT MERGE
Change-Id: I1174d2d489bb915a9945ded601681da2a2e9777e
Auto-generated-cl: translation import
Baligh Uddin [Wed, 20 Nov 2013 19:53:49 +0000 (11:53 -0800)]
Import translations. DO NOT MERGE
Change-Id: I2db02a5ec058c2eed8d08a490aeed180095bd58d
Auto-generated-cl: translation import
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
OSDN Git Service
