OSDN Git Service
Baligh Uddin [Fri, 25 Jul 2014 16:58:08 +0000 (16:58 +0000)]
am
ba0bccbf: (-s ours) am
72b2f85f: (-s ours) Import translations. DO NOT MERGE
* commit '
ba0bccbf9124f5d6662c1421ceb965800309ffb8':
Baligh Uddin [Sun, 20 Jul 2014 02:24:56 +0000 (02:24 +0000)]
Merge "Remove deprecated locales - DO NOT MERGE" into lmp-dev
Baligh Uddin [Sat, 19 Jul 2014 20:05:21 +0000 (13:05 -0700)]
Remove deprecated locales - DO NOT MERGE
Change-Id: I10b8ab1136680b93ac3184df47f8d6c4f663e9d1
Baligh Uddin [Fri, 18 Jul 2014 02:00:49 +0000 (19:00 -0700)]
Import translations. DO NOT MERGE
Change-Id: I5e5505148539141d3ffd944794e07e4623da2ef2
Auto-generated-cl: translation import
Baligh Uddin [Thu, 17 Jul 2014 01:49:03 +0000 (18:49 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ia34a7098f9d27c72cb4cb97b2f447666e615da52
Auto-generated-cl: translation import
Baligh Uddin [Sun, 6 Jul 2014 21:37:28 +0000 (21:37 +0000)]
am
7947c9d8: (-s ours) am
a833093a: (-s ours) am
8b602ee0: (-s ours) am
cc3796fa: (-s ours) Import translations. DO NOT MERGE
* commit '
7947c9d85c830c8b8a5c577097f6564967beeff6':
Import translations. DO NOT MERGE
Baligh Uddin [Sun, 6 Jul 2014 21:30:21 +0000 (21:30 +0000)]
am
a833093a: (-s ours) am
8b602ee0: (-s ours) am
cc3796fa: (-s ours) Import translations. DO NOT MERGE
* commit '
a833093ad71bb38ba445502ddffdb9188f5d5cdb':
Import translations. DO NOT MERGE
Baligh Uddin [Sun, 6 Jul 2014 21:28:24 +0000 (21:28 +0000)]
am
c1659ce7: (-s ours) am
cd89e549: (-s ours) Import translations. DO NOT MERGE
* commit '
c1659ce75231b2f7a5d0921d363168d7093c2bfc':
Import translations. DO NOT MERGE
Baligh Uddin [Sun, 6 Jul 2014 21:28:23 +0000 (21:28 +0000)]
am
86018cbd: (-s ours) am
23d07fed: (-s ours) Import translations. DO NOT MERGE
* commit '
86018cbd26dbc6ab34f0de9fd95a88c71462e6bc':
Import translations. DO NOT MERGE
Baligh Uddin [Sun, 6 Jul 2014 21:28:22 +0000 (21:28 +0000)]
am
3be1f8f8: (-s ours) am
e8fa640f: (-s ours) Import translations. DO NOT MERGE
* commit '
3be1f8f8c76cb8823b087de98ae1e2df8420f0bf':
Import translations. DO NOT MERGE
Baligh Uddin [Sun, 6 Jul 2014 21:23:55 +0000 (21:23 +0000)]
am
8b602ee0: (-s ours) am
cc3796fa: (-s ours) Import translations. DO NOT MERGE
* commit '
8b602ee06eb668246fb43be849e6e4b047707253':
Import translations. DO NOT MERGE
Baligh Uddin [Sun, 6 Jul 2014 21:22:52 +0000 (21:22 +0000)]
am
cd89e549: (-s ours) Import translations. DO NOT MERGE
* commit '
cd89e5497d4a6aabbe8d96d5d11584c7c73ef6ea':
Import translations. DO NOT MERGE
Baligh Uddin [Sun, 6 Jul 2014 21:22:52 +0000 (21:22 +0000)]
am
23d07fed: (-s ours) Import translations. DO NOT MERGE
* commit '
23d07fedc57934972132598b1c84a8668256d1b9':
Import translations. DO NOT MERGE
Baligh Uddin [Sun, 6 Jul 2014 21:21:11 +0000 (21:21 +0000)]
am
cc3796fa: (-s ours) Import translations. DO NOT MERGE
* commit '
cc3796fa75862209529d847f7d2e1a3aa5dd5ec7':
Import translations. DO NOT MERGE
Baligh Uddin [Sun, 6 Jul 2014 14:05:41 +0000 (07:05 -0700)]
Import translations. DO NOT MERGE
Change-Id: I1416b45718317dd3a6758fe45bd738dd5e71f65d
Auto-generated-cl: translation import
Baligh Uddin [Sun, 6 Jul 2014 14:02:02 +0000 (07:02 -0700)]
Import translations. DO NOT MERGE
Change-Id: I5aec334ac3b10a0ed1d1362e2deff676d73dbddb
Auto-generated-cl: translation import
Baligh Uddin [Sun, 6 Jul 2014 14:01:30 +0000 (07:01 -0700)]
Import translations. DO NOT MERGE
Change-Id: I605c7e89993f067c6acbaeca1721a7668e50376f
Auto-generated-cl: translation import
Baligh Uddin [Mon, 30 Jun 2014 09:53:18 +0000 (02:53 -0700)]
Import translations. DO NOT MERGE
Change-Id: I9c230702e9c14397fc8738e328793efa9b8de0a7
Auto-generated-cl: translation import
Baligh Uddin [Wed, 25 Jun 2014 17:59:10 +0000 (10:59 -0700)]
Import translations. DO NOT MERGE
Change-Id: I05a11bbf99ef18a35251224313bec8ff4135f49b
Auto-generated-cl: translation import
Baligh Uddin [Mon, 23 Jun 2014 19:39:03 +0000 (12:39 -0700)]
Import translations. DO NOT MERGE
Change-Id: I6d221b8366c7a27f055fbb5ca32cfedd272d6d5c
Auto-generated-cl: translation import
Bill Yi [Thu, 19 Jun 2014 20:03:52 +0000 (20:03 +0000)]
Baligh Uddin [Wed, 18 Jun 2014 20:32:55 +0000 (13:32 -0700)]
Import translations. DO NOT MERGE
Change-Id: I93b61c1b615017ec6068f0609e172797ba5408f2
Auto-generated-cl: translation import
Baligh Uddin [Mon, 16 Jun 2014 20:12:44 +0000 (13:12 -0700)]
Import translations. DO NOT MERGE
Change-Id: Id30a10e97d1d17c40e544f10b7010151f324a60c
Auto-generated-cl: translation import
Baligh Uddin [Fri, 13 Jun 2014 22:26:08 +0000 (15:26 -0700)]
Import translations. DO NOT MERGE
Change-Id: I21c8f0ea535a5814f6ce86c61a567df39aee5c7b
Auto-generated-cl: translation import
Baligh Uddin [Mon, 9 Jun 2014 19:49:39 +0000 (12:49 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ie4fec80d0883890997238a065d30ffe2946d0412
Auto-generated-cl: translation import
Baligh Uddin [Sat, 7 Jun 2014 04:12:33 +0000 (04:12 +0000)]
Merge "Import translations. DO NOT MERGE"
The Android Automerger [Fri, 6 Jun 2014 15:41:55 +0000 (15:41 +0000)]
am
11a1ca95: merge in master-release history after reset to
e52edeeebe1a0ce82bd7e9b05b926d1301a51a2f
* commit '
11a1ca95b759da81023b0d5e8aa91f9fdccc57ea': (2378 commits)
Import translations. DO NOT MERGE
Import translations. DO NOT MERGE
LOCAL_JNI_SHARED_LIBRARIES now works for both bundled and unbundled build.
LOCAL_JNI_SHARED_LIBRARIES now works for both bundled and unbundled build.
Import translations. DO NOT MERGE
Import translations. DO NOT MERGE
Add CameraPerformanceTracker to Carlsbad to make future comparisons easy.
Import translations. DO NOT MERGE
Import translations. DO NOT MERGE
Import translations. DO NOT MERGE
Fix build dependencies
Import translations. DO NOT MERGE
Import translations. DO NOT MERGE
Build against the NDK for all archs.
Import translations. DO NOT MERGE
Import translations. DO NOT MERGE
Import translations. DO NOT MERGE
Revert "Remove deprecated locales"
Remove deprecated locales
Import translations. DO NOT MERGE
...
Baligh Uddin [Wed, 4 Jun 2014 19:30:19 +0000 (12:30 -0700)]
Import translations. DO NOT MERGE
Change-Id: I34fcb61280eea32eead210f70e5b2ffd74003482
Auto-generated-cl: translation import
Baligh Uddin [Mon, 2 Jun 2014 20:39:46 +0000 (13:39 -0700)]
Import translations. DO NOT MERGE
Change-Id: I0a3c1e4151d3f6c9f5a96be0433b03acdce8f5d6
Auto-generated-cl: translation import
Geoff Mendal [Wed, 28 May 2014 20:09:03 +0000 (13:09 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ie4dc2b76d6f38334833b22ea7fabf3860c27751b
Auto-generated-cl: translation import
Baligh Uddin [Mon, 26 May 2014 22:03:45 +0000 (15:03 -0700)]
Import translations. DO NOT MERGE
Change-Id: I5520095cf925eee15bddcbe3b3f633141fb2d5f8
Auto-generated-cl: translation import
The Android Automerger [Thu, 22 May 2014 14:22:18 +0000 (07:22 -0700)]
merge in master-release history after reset to
e52edeeebe1a0ce82bd7e9b05b926d1301a51a2f
The Android Automerger [Thu, 22 May 2014 12:50:43 +0000 (05:50 -0700)]
merge in master-release history after reset to
e52edeeebe1a0ce82bd7e9b05b926d1301a51a2f
Baligh Uddin [Thu, 22 May 2014 03:15:36 +0000 (03:15 +0000)]
am
e8fa640f: (-s ours) Import translations. DO NOT MERGE
* commit '
e8fa640f5d7fe6fed32176ef541aa78114771dec':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 21 May 2014 22:06:57 +0000 (15:06 -0700)]
Import translations. DO NOT MERGE
Change-Id: I35934d85aec95adacdc0a8be34dbb0fea9c95dee
Auto-generated-cl: translation import
The Android Automerger [Wed, 21 May 2014 12:50:37 +0000 (05:50 -0700)]
merge in master-release history after reset to
4d120b8746d5b842ca30338404ca5f7677e31b78
Baligh Uddin [Tue, 20 May 2014 19:11:53 +0000 (12:11 -0700)]
Import translations. DO NOT MERGE
Change-Id: I9e6aea58c94d2f7b13cba27d1b8b25e4a5c81837
Auto-generated-cl: translation import
The Android Automerger [Tue, 20 May 2014 12:50:29 +0000 (05:50 -0700)]
merge in master-release history after reset to
4d120b8746d5b842ca30338404ca5f7677e31b78
The Android Automerger [Mon, 19 May 2014 12:50:04 +0000 (05:50 -0700)]
merge in master-release history after reset to
4d120b8746d5b842ca30338404ca5f7677e31b78
The Android Automerger [Sun, 18 May 2014 12:50:02 +0000 (05:50 -0700)]
merge in master-release history after reset to
4d120b8746d5b842ca30338404ca5f7677e31b78
The Android Automerger [Sat, 17 May 2014 12:51:23 +0000 (05:51 -0700)]
merge in master-release history after reset to
4d120b8746d5b842ca30338404ca5f7677e31b78
The Android Automerger [Thu, 15 May 2014 12:51:07 +0000 (05:51 -0700)]
merge in master-release history after reset to
4d120b8746d5b842ca30338404ca5f7677e31b78
The Android Automerger [Wed, 14 May 2014 12:51:07 +0000 (05:51 -0700)]
merge in master-release history after reset to
4d120b8746d5b842ca30338404ca5f7677e31b78
Baligh Uddin [Tue, 13 May 2014 15:53:33 +0000 (15:53 +0000)]
Merge "Import translations. DO NOT MERGE"
The Android Automerger [Tue, 13 May 2014 12:50:42 +0000 (05:50 -0700)]
merge in master-release history after reset to
1f06cbf8c529a6416e93d2b0801902d9e8e54d81
Alan Newberger [Mon, 12 May 2014 19:42:54 +0000 (12:42 -0700)]
added '+' to ImageView id
in landscape counterpart this id is already marked with '+', looks
like a longstanding omission that is now causing build errors on master.
cherrypicking into master snapshot.
Change-Id: Iecd8c69346d396449fe1b90a5d74ccb31cf9ea3e
Baligh Uddin [Mon, 12 May 2014 19:42:58 +0000 (12:42 -0700)]
Import translations. DO NOT MERGE
Change-Id: I98eccb9715b98a5ebed2e6e7aec840af30482b81
Auto-generated-cl: translation import
The Android Automerger [Mon, 12 May 2014 12:49:58 +0000 (05:49 -0700)]
merge in master-release history after reset to
745aabad1d2fa690c31a6f43f0ba16f9ab371170
The Android Automerger [Sun, 11 May 2014 12:49:58 +0000 (05:49 -0700)]
merge in master-release history after reset to
745aabad1d2fa690c31a6f43f0ba16f9ab371170
The Android Automerger [Sat, 10 May 2014 12:50:50 +0000 (05:50 -0700)]
merge in master-release history after reset to
745aabad1d2fa690c31a6f43f0ba16f9ab371170
The Android Automerger [Thu, 8 May 2014 12:50:45 +0000 (05:50 -0700)]
merge in master-release history after reset to
745aabad1d2fa690c31a6f43f0ba16f9ab371170
The Android Automerger [Wed, 7 May 2014 16:11:24 +0000 (09:11 -0700)]
merge in master-release history after reset to
745aabad1d2fa690c31a6f43f0ba16f9ab371170
The Android Automerger [Wed, 7 May 2014 12:50:41 +0000 (05:50 -0700)]
merge in master-release history after reset to
745aabad1d2fa690c31a6f43f0ba16f9ab371170
The Android Automerger [Tue, 6 May 2014 12:50:38 +0000 (05:50 -0700)]
merge in master-release history after reset to
745aabad1d2fa690c31a6f43f0ba16f9ab371170
The Android Automerger [Mon, 5 May 2014 12:50:06 +0000 (05:50 -0700)]
merge in master-release history after reset to
745aabad1d2fa690c31a6f43f0ba16f9ab371170
The Android Automerger [Sun, 4 May 2014 12:49:58 +0000 (05:49 -0700)]
merge in master-release history after reset to
745aabad1d2fa690c31a6f43f0ba16f9ab371170
The Android Automerger [Sat, 3 May 2014 12:51:08 +0000 (05:51 -0700)]
merge in master-release history after reset to
745aabad1d2fa690c31a6f43f0ba16f9ab371170
Baligh Uddin [Thu, 1 May 2014 16:31:09 +0000 (16:31 +0000)]
Merge "Import translations. DO NOT MERGE"
The Android Automerger [Thu, 1 May 2014 12:50:44 +0000 (05:50 -0700)]
merge in master-release history after reset to
ef0a732964a6a5600ef6be3028a198f8b85a2236
Baligh Uddin [Wed, 30 Apr 2014 20:17:48 +0000 (13:17 -0700)]
Import translations. DO NOT MERGE
Change-Id: I242c05a79286e2d01bda27447ec025bddafc1c66
Auto-generated-cl: translation import
Geoff Mendal [Wed, 30 Apr 2014 18:15:01 +0000 (18:15 +0000)]
am
94ba9b8c: (-s ours) am
dc0fc0c0: (-s ours) am
3360879d: (-s ours) am
2ecb5944: (-s ours) am
be55432c: (-s ours) Import translations. DO NOT MERGE
* commit '
94ba9b8c36fc49f0522d586b3a92b8b96d6cd537':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 30 Apr 2014 18:15:01 +0000 (18:15 +0000)]
am
9ccd5016: (-s ours) am
ac917a1d: (-s ours) am
2450dd6d: (-s ours) am
ecaad7a2: (-s ours) Import translations. DO NOT MERGE
* commit '
9ccd5016088578628066bc482178220ab1b9a6c3':
Import translations. DO NOT MERGE
Michael Kolb [Wed, 30 Apr 2014 18:15:00 +0000 (18:15 +0000)]
am
a1a012a0: (-s ours) am
7fe487c4: am
240b5cab: am
d75b9aee: Fix samsung video recording
* commit '
a1a012a08ea33a0b84bee2d419ae1caba5a2259a':
Fix samsung video recording
Michael Kolb [Wed, 30 Apr 2014 18:15:00 +0000 (18:15 +0000)]
am
e4e01f79: (-s ours) am
fef79bde: am
795812fd: am
13350e5e: Fix WB indicator override
* commit '
e4e01f7966d782d63d5806bd9dd270c414b20dea':
Fix WB indicator override
Michael Kolb [Wed, 30 Apr 2014 18:15:00 +0000 (18:15 +0000)]
am
c5da5393: (-s ours) am
153a52b3: am
1e5baa47: am
0f7d5488: Revert fixed focus area in CAF mode
* commit '
c5da53936350c1f5cc5e8f7f4b0dfe2ff24b0f25':
Revert fixed focus area in CAF mode
Alan Newberger [Wed, 30 Apr 2014 18:15:00 +0000 (18:15 +0000)]
am
0ea86760: (-s ours) 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 [Wed, 30 Apr 2014 18:15:00 +0000 (18:15 +0000)]
am
9e71a438: (-s ours) 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
Seth Raphael [Wed, 30 Apr 2014 18:15:00 +0000 (18:15 +0000)]
am
871fedc1: (-s ours) am
ff67e2a6: am
3a46bed6: am
88f9b3e7: Reduce logging of flattened Preferences
* commit '
871fedc18a1e5db6c32ea3c7fa3ed105ae032e89':
Reduce logging of flattened Preferences
The Android Open Source Project [Wed, 30 Apr 2014 18:14:59 +0000 (18:14 +0000)]
Baligh Uddin [Wed, 30 Apr 2014 18:14:59 +0000 (18:14 +0000)]
am
963fc7c2: (-s ours) am
790c7e9a: am
7f18027e: Merge remote-tracking branch \'origin/kitkat-dev\'
* commit '
963fc7c20643f01206ebac0c8109fc5b1e14272a':
Initial empty repository
Geoff Mendal [Wed, 30 Apr 2014 18:14:59 +0000 (18:14 +0000)]
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 [Wed, 30 Apr 2014 18:14:59 +0000 (18:14 +0000)]
am
b88897d7: (-s ours) am
7b1d7e46: (-s ours) am
7191c955: (-s ours) Import translations. DO NOT MERGE
* commit '
b88897d758596209047bc525ff10ef06386eacbb':
Import translations. DO NOT MERGE
The Android Open Source Project [Wed, 30 Apr 2014 18:14:59 +0000 (18:14 +0000)]
Baligh Uddin [Wed, 30 Apr 2014 18:14:59 +0000 (18:14 +0000)]
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 [Wed, 30 Apr 2014 18:14:59 +0000 (18:14 +0000)]
am
577910d0: (-s ours) am
0c7ea745: (-s ours) am
ae13f34c: (-s ours) Import translations. DO NOT MERGE
* commit '
577910d049c6c66733985c44b0602a0179327471':
Import translations. DO NOT MERGE
ztenghui [Wed, 30 Apr 2014 18:14:58 +0000 (18:14 +0000)]
am
bfe61934: (-s ours) am
e04982ad: The initial focus value should be true.
* commit '
bfe619349ff66c5b5cc0dc1cdc2e02b99b959ec0':
The initial focus value should be true.
Sascha Haeberling [Wed, 30 Apr 2014 18:14:58 +0000 (18:14 +0000)]
am
0fa732e0: (-s ours) 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, 30 Apr 2014 18:14:58 +0000 (18:14 +0000)]
am
36f5e5e1: (-s ours) am
aa67d847: Fix SRI orientation on manta
* commit '
36f5e5e151614d379d7428aadadd1236e3b09e63':
Fix SRI orientation on manta
Andy Huibers [Wed, 30 Apr 2014 18:14:58 +0000 (18:14 +0000)]
am
88d8d997: (-s ours) 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.
Baligh Uddin [Wed, 30 Apr 2014 18:14:58 +0000 (18:14 +0000)]
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
Ruben Brunk [Wed, 30 Apr 2014 18:14:58 +0000 (18:14 +0000)]
am
d1e68328: (-s ours) am
47e9cc73: am
a390c5b4: am
3bf1cda5: gcam: Clean up placeholders, and add deletion robustness.
* commit '
d1e683285f4aee83bd0e363957beaa4787df952e':
gcam: Clean up placeholders, and add deletion robustness.
Sascha Haeberling [Wed, 30 Apr 2014 18:14:58 +0000 (18:14 +0000)]
am
6474693c: (-s ours) 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 [Wed, 30 Apr 2014 18:14:58 +0000 (18:14 +0000)]
am
9d94bba7: (-s ours) 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.
Ed Heyl [Wed, 30 Apr 2014 18:14:57 +0000 (18:14 +0000)]
am
86b76ca8: (-s ours) 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.
Sascha Haeberling [Wed, 30 Apr 2014 18:14:57 +0000 (18:14 +0000)]
am
03995ce9: (-s ours) 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.
Seth Raphael [Wed, 30 Apr 2014 18:14:57 +0000 (18:14 +0000)]
am
4077c5ac: (-s ours) 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
Erin Dahlgren [Wed, 30 Apr 2014 18:14:57 +0000 (18:14 +0000)]
am
9483c308: (-s ours) am
f3dd012d: am
03cb9721: am
cc70702c: Revert parallel opening camera in photo mode.
* commit '
9483c308e4203ee91aa25ee9a393b2cd8c209180':
Revert parallel opening camera in photo mode.
Andy Huibers [Wed, 30 Apr 2014 18:14:57 +0000 (18:14 +0000)]
am
1220c57e: (-s ours) am
9bd8ff21: am
9b9b0db9: am
a7c84bac: Merge "Close mode menus if another control is touched" into gb-ub-photos-carlsbad
* commit '
1220c57e65a7344a24426fe6c9d161548cb52648':
ztenghui [Wed, 30 Apr 2014 18:14:57 +0000 (18:14 +0000)]
am
66c00be2: (-s ours) am
d8606879: am
ad98a63f: am
aae09fb1: Merge "Differentiate the InProgressData from the normal PhotoData." into gb-ub-photos-carlsbad
* commit '
66c00be2d759877fa81b850a40df18d3e50145aa':
Ruben Brunk [Wed, 30 Apr 2014 18:14:57 +0000 (18:14 +0000)]
am
57a66517: (-s ours) am
03732aed: am
fe9fef97: am
baffb73c: Start gcam module directly when handling capture intent.
* commit '
57a665173bcf8ee9b85506c29843ebfca3e1f406':
Baligh Uddin [Wed, 30 Apr 2014 18:14:57 +0000 (18:14 +0000)]
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 [Wed, 30 Apr 2014 18:14:56 +0000 (18:14 +0000)]
Ed Heyl [Wed, 30 Apr 2014 18:14:56 +0000 (18:14 +0000)]
am
33c2b60b: (-s ours) 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 [Wed, 30 Apr 2014 18:14:56 +0000 (18:14 +0000)]
am
203511fd: (-s ours) am
2aa0d2b3: am
05f23b7d: am
cbd8267e: Add logging to various actions
* commit '
203511fd372df4e7f9c1a2e3b2822b60981e653f':
Ruben Brunk [Wed, 30 Apr 2014 18:14:56 +0000 (18:14 +0000)]
am
eaaca513: (-s ours) am
6911bfca: am
56960b7e: am
36d84c1d: Merge "Ensure mOpenCameraThread has been setup before dereferencing." into gb-ub-photos-carlsbad
* commit '
eaaca5130356a9bb2e38d590b63072ed507f5f9d':
Sascha Haeberling [Wed, 30 Apr 2014 18:14:56 +0000 (18:14 +0000)]
am
176b0992: (-s ours) am
aa158f2f: am
0351d05d: am
2b78c0c0: Merge "Add GCam progress indicator." into gb-ub-photos-carlsbad
* commit '
176b099253e3a0eeec3ad2665157c126629b2ae2':
Andy Huibers [Wed, 30 Apr 2014 18:14:56 +0000 (18:14 +0000)]
am
02cdd0a4: (-s ours) am
8bc966eb: am
c504af14: am
fccf83bd: hide preview cover on arrival of new preview data if hidden
* commit '
02cdd0a4fc53f91ba11e191527b90720e10f8929':
Erin Dahlgren [Wed, 30 Apr 2014 18:14:56 +0000 (18:14 +0000)]
am
40b6b458: (-s ours) am
30ac3520: am
cbe9fc1f: am
2f878d54: Merge "Fix photo mode is getting stuck in a single CameraState." into gb-ub-photos-carlsbad
* commit '
40b6b4585c7ac59667b32e3e0f275423c665c8b8':
Erin Dahlgren [Wed, 30 Apr 2014 18:14:56 +0000 (18:14 +0000)]
am
71e8e91d: (-s ours) am
570d8da0: am
5a0475e4: am
05a04924: Show chooser on EDIT intents that have no activity for action.
* commit '
71e8e91d2b4ff73c7d63241a947b03c74ecd9e8c':
Erin Dahlgren [Wed, 30 Apr 2014 18:14:55 +0000 (18:14 +0000)]
am
1ffe5c18: (-s ours) am
d2aeec25: am
c8761589: am
7e6e947f: Merge "Parallelize opening the camera with view handling in photo mode." into gb-ub-photos-carlsbad
* commit '
1ffe5c18a3f219496a0d85f50aeb31f4e8643758':
OSDN Git Service
