OSDN Git Service
Neil Fuller [Fri, 17 Oct 2014 15:14:57 +0000 (15:14 +0000)]
Merge "Remove dependencies on FloatMath"
Neil Fuller [Thu, 2 Oct 2014 15:39:12 +0000 (16:39 +0100)]
Remove dependencies on FloatMath
See frameworks/base commit
33253a4baa6279f81a73425b49dfb6abe5f5416e
for details.
Bug: https://code.google.com/p/android/issues/detail?id=36199
Change-Id: Iae56fa116b5e00e78b294073802d48478a2c9eda
Alan Newberger [Fri, 19 Sep 2014 23:37:07 +0000 (23:37 +0000)]
Merge "Add scrolling support with a mouse wheel"
Olivier Gay [Fri, 12 Sep 2014 13:28:47 +0000 (15:28 +0200)]
Add scrolling support with a mouse wheel
When a physical mouse is connected, support scroll events
from the mouse when pictures are displayed. In film strip
view (full screen or not), both vertical and horizontal
scroll events have the same bevahior: pictures are
horizontally scrolled. In full screen, pictures are flinged.
When a picture is zoomed the scroll is done either
vertically or horizontally depending on user action.
Change-Id: Idb3b12b0ff86e8a590fa7f1a54111700db84e543
Signed-off-by: Olivier Gay <ogay@logitech.com>
Bill Yi [Tue, 29 Apr 2014 18:34:24 +0000 (11:34 -0700)]
Ying Wang [Fri, 18 Apr 2014 23:56:04 +0000 (23:56 +0000)]
Merge "LOCAL_JNI_SHARED_LIBRARIES now works for both bundled and unbundled build."
Ying Wang [Fri, 18 Apr 2014 01:26:00 +0000 (18:26 -0700)]
LOCAL_JNI_SHARED_LIBRARIES now works for both bundled and unbundled build.
Change-Id: If21a4f5ddab6ae9ecb37f6e7ebebef411028b2ef
Narayan Kamath [Wed, 9 Apr 2014 14:12:47 +0000 (14:12 +0000)]
Merge "Fix build dependencies"
Kévin PETIT [Fri, 7 Feb 2014 17:04:13 +0000 (17:04 +0000)]
Fix build dependencies
Use LOCAL_SHARED_LIBRARIES instead of LDFLAGS to link with libraries.
Change-Id: I958c2f0b8b149f5311285703d55f6f6e76d577a9
Signed-off-by: Kévin PETIT <kevin.petit@arm.com>
Ying Wang [Fri, 7 Mar 2014 19:40:56 +0000 (19:40 +0000)]
am
f88a1cfc: Merge "Build against the NDK for all archs."
* commit '
f88a1cfcd8da4bf2987c7ceb904b18b1ae6e0980':
Build against the NDK for all archs.
Baligh Uddin [Thu, 20 Feb 2014 21:08:45 +0000 (21:08 +0000)]
am
d8b9e39e: (-s ours) am
9d8187cb: (-s ours) Import translations. DO NOT MERGE
* commit '
d8b9e39ee80c5e828010c1091e4e77261356b235':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 20 Feb 2014 21:05:53 +0000 (21:05 +0000)]
am
9d8187cb: (-s ours) Import translations. DO NOT MERGE
* commit '
9d8187cbdb82e36eae9a42eefda138b6d0925b1f':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 20 Feb 2014 16:42:24 +0000 (08:42 -0800)]
Import translations. DO NOT MERGE
Change-Id: I5f7c2232952457358858fc8d33d06c8c1de19efc
Auto-generated-cl: translation import
Ying Wang [Wed, 19 Feb 2014 21:46:02 +0000 (21:46 +0000)]
Merge "Build against the NDK for all archs."
Ying Wang [Wed, 19 Feb 2014 21:40:26 +0000 (13:40 -0800)]
Build against the NDK for all archs.
Change-Id: I29e85f1cef5680d13e96e10154c101f0ad9ee7c8
Baligh Uddin [Tue, 17 Dec 2013 17:39:05 +0000 (09:39 -0800)]
am
58f3e903: (-s ours) am
dae90cf8: (-s ours) Import translations. DO NOT MERGE
* commit '
58f3e903c7cfb5286b3e00dde8974cbc680e00c2':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 17 Dec 2013 17:36:52 +0000 (09:36 -0800)]
am
dae90cf8: (-s ours) Import translations. DO NOT MERGE
* commit '
dae90cf82db8125b5e741f42aacc78c7e1417aac':
Import translations. DO NOT MERGE
Baligh Uddin [Mon, 16 Dec 2013 21:03:54 +0000 (13:03 -0800)]
Import translations. DO NOT MERGE
Change-Id: I8229ddd9cd55f6561be600469f38063e70480c0f
Auto-generated-cl: translation import
Baligh Uddin [Mon, 9 Dec 2013 20:13:47 +0000 (12:13 -0800)]
am
f437ab0c: (-s ours) am
9f7b40e1: (-s ours) Import translations. DO NOT MERGE
* commit '
f437ab0ca38eea48a573060017c01a6053590e02':
Import translations. DO NOT MERGE
Baligh Uddin [Mon, 9 Dec 2013 20:10:52 +0000 (12:10 -0800)]
am
9f7b40e1: (-s ours) Import translations. DO NOT MERGE
* commit '
9f7b40e134242e2829a2bffcf71e8149130a159a':
Import translations. DO NOT MERGE
Baligh Uddin [Mon, 9 Dec 2013 20:06:04 +0000 (12:06 -0800)]
Import translations. DO NOT MERGE
Change-Id: I2b510d8650a4854a3066596e28cee9d4d196dd09
Auto-generated-cl: translation import
The Android Open Source Project [Fri, 6 Dec 2013 01:25:43 +0000 (17:25 -0800)]
The Android Open Source Project [Thu, 5 Dec 2013 20:38:22 +0000 (12:38 -0800)]
Alan Newberger [Wed, 4 Dec 2013 23:55:39 +0000 (15:55 -0800)]
am
689c1c7d: am
d8732fc2: am
f9b2d0c7: Remove TRIM support
* commit '
689c1c7d13f8d1cc01188696cee3d5c8a70e84da':
Remove TRIM support
Alan Newberger [Wed, 4 Dec 2013 23:53:53 +0000 (15:53 -0800)]
am
d8732fc2: am
f9b2d0c7: Remove TRIM support
* commit '
d8732fc2277b120a4b7b0e978f6a8c18ebc202ed':
Remove TRIM support
Alan Newberger [Wed, 4 Dec 2013 23:51:40 +0000 (15:51 -0800)]
am
f9b2d0c7: Remove TRIM support
* commit '
f9b2d0c7775b43996a9b9f51c6fc5ab266042c72':
Remove TRIM support
Alan Newberger [Wed, 4 Dec 2013 23:10:01 +0000 (15:10 -0800)]
Remove TRIM support
Remove the ability to trim a video with the quick menu action.
Bug:
11884080
Change-Id: If00cb31ad6b913012c542a809dba1a8e5d9e5b74
Geoff Mendal [Wed, 4 Dec 2013 22:05:33 +0000 (14:05 -0800)]
am
3360879d: (-s ours) am
2ecb5944: (-s ours) am
be55432c: (-s ours) Import translations. DO NOT MERGE
* commit '
3360879db7b16db9f4ac96f6fcfa403e4acf8dd9':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 4 Dec 2013 22:01:23 +0000 (14:01 -0800)]
am
2ecb5944: (-s ours) am
be55432c: (-s ours) Import translations. DO NOT MERGE
* commit '
2ecb594418aedae10d053512f54d8c0a42a494b6':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 4 Dec 2013 21:59:07 +0000 (13:59 -0800)]
am
2450dd6d: (-s ours) am
ecaad7a2: (-s ours) Import translations. DO NOT MERGE
* commit '
2450dd6d4a9568b1e264ceb5744bfb4890b4c9b7':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 4 Dec 2013 21:57:16 +0000 (13:57 -0800)]
am
be55432c: (-s ours) Import translations. DO NOT MERGE
* commit '
be55432c9d98640fbc968a4b8dc77d7994c16fe4':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 4 Dec 2013 21:56:55 +0000 (13:56 -0800)]
am
ecaad7a2: (-s ours) Import translations. DO NOT MERGE
* commit '
ecaad7a2992d27ae3aeeec359824c4bb1fef5799':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 4 Dec 2013 21:45:51 +0000 (13:45 -0800)]
Import translations. DO NOT MERGE
Change-Id: I108868d50a1376c9d638fae24f7a004733eedecb
Auto-generated-cl: translation import
Geoff Mendal [Wed, 4 Dec 2013 21:44:30 +0000 (13:44 -0800)]
Import translations. DO NOT MERGE
Change-Id: I10fe11b8f611ca054e7d0689c8d12135b0722dd4
Auto-generated-cl: translation import
Michael Kolb [Tue, 3 Dec 2013 19:20:00 +0000 (11:20 -0800)]
am
7fe487c4: am
240b5cab: am
d75b9aee: Fix samsung video recording
* commit '
7fe487c4519dd6d3f29242426a77e60e9d1a69d3':
Fix samsung video recording
Michael Kolb [Tue, 3 Dec 2013 19:20:00 +0000 (11:20 -0800)]
am
fef79bde: am
795812fd: am
13350e5e: Fix WB indicator override
* commit '
fef79bde66d01ec7976d3978978dc4584c2bc445':
Fix WB indicator override
Michael Kolb [Tue, 3 Dec 2013 19:17:21 +0000 (11:17 -0800)]
am
240b5cab: am
d75b9aee: Fix samsung video recording
* commit '
240b5cabe460ca72c43394c595615da914ccb7c1':
Fix samsung video recording
Michael Kolb [Tue, 3 Dec 2013 19:17:20 +0000 (11:17 -0800)]
am
795812fd: am
13350e5e: Fix WB indicator override
* commit '
795812fdf641e133197fbd29f5f55351f7367092':
Fix WB indicator override
Michael Kolb [Tue, 3 Dec 2013 19:15:09 +0000 (11:15 -0800)]
am
d75b9aee: Fix samsung video recording
* commit '
d75b9aee9a205d6c4d96aa8913131430a0d9a399':
Fix samsung video recording
Michael Kolb [Tue, 3 Dec 2013 19:15:08 +0000 (11:15 -0800)]
am
13350e5e: Fix WB indicator override
* commit '
13350e5e46db241b4f6d1ad3f371ac7292c12e65':
Fix WB indicator override
Michael Kolb [Thu, 30 May 2013 14:45:41 +0000 (07:45 -0700)]
Fix samsung video recording
Patching Bryce CL into Carlsbad
Bug:
9056573
Change-Id: I81fc31e24fe26bef4179bfc4428def2e8b7d94e9
Conflicts:
src/com/android/camera/VideoModule.java
Michael Kolb [Mon, 24 Jun 2013 20:22:52 +0000 (13:22 -0700)]
Fix WB indicator override
Patching into Carlsbad from Bryce.
Bug:
9372794
Change-Id: I4f23f05ca1acaef84a24034237e82001aac09f78
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
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 [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
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: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: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: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: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 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 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: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 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 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: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: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:38 +0000 (20:39 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-dev
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: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 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
OSDN Git Service
