OSDN Git Service
Sascha Haeberling [Wed, 2 Jul 2014 18:16:26 +0000 (18:16 +0000)]
am
aa52b3d2: Prevent crash for when newData cannot be found.
* commit '
aa52b3d28a0285b71be342158386422ed53244b2':
Prevent crash for when newData cannot be found.
Sascha Haeberling [Wed, 2 Jul 2014 17:38:50 +0000 (17:38 +0000)]
am
b46c1855: New blue for clings and tutorials graphics
* commit '
b46c1855c48f1efe3268d7ba73d89032b9dfff09':
New blue for clings and tutorials graphics
Sascha Haeberling [Tue, 1 Jul 2014 19:30:30 +0000 (12:30 -0700)]
Prevent crash for when newData cannot be found.
Bug:
15842040
This should never happen, but could if e.g. there is a UI bug that
causes the 'done button on Photo Sphere / Panorama to be visible when no
actual session is active.
Change-Id: Iadd3c1786a4cb204d8a4d3222864aba2807ec36e
Sascha Haeberling [Tue, 1 Jul 2014 16:21:26 +0000 (09:21 -0700)]
New blue for clings and tutorials graphics
Bug:
15754001
Change-Id: I44f536dbd052aa896018660352732565ce792055
Spike Sprague [Mon, 30 Jun 2014 22:28:22 +0000 (22:28 +0000)]
am
9f3d01d9: volume button cancels ongoing countdown prevent volume button from doing anything during intent capture review
* commit '
9f3d01d9c5d2200882de76e309db55d74d950110':
volume button cancels ongoing countdown prevent volume button from doing anything during intent capture review
Spike Sprague [Mon, 30 Jun 2014 21:52:57 +0000 (14:52 -0700)]
volume button cancels ongoing countdown
prevent volume button from doing anything during intent capture review
bug:
15141921
Change-Id: Icf974de09eb59e92bcce4a14aaa4775e21043c13
Andy Huibers [Mon, 30 Jun 2014 20:59:24 +0000 (20:59 +0000)]
am
0b3f9d51: Clean up foregrounding stats so that they are balanced with backgrounding stats.
* commit '
0b3f9d515df7a36d6e73acd4900b2537f4e54c8d':
Clean up foregrounding stats so that they are balanced with backgrounding stats.
Andy Huibers [Mon, 30 Jun 2014 19:47:37 +0000 (12:47 -0700)]
Clean up foregrounding stats so that they are balanced with backgrounding stats.
Change-Id: Ib694e8a98822cb475b5dfb2f92a56a34e31ae5dd
Baligh Uddin [Sat, 28 Jun 2014 02:59:47 +0000 (02:59 +0000)]
Merge "Import translations. DO NOT MERGE" into ub-camera-glacier
Andy Huibers [Sat, 28 Jun 2014 00:29:23 +0000 (17:29 -0700)]
Fix build.
Change-Id: I463f525e6097f8705257c5d18a88689216e40123
Erin Dahlgren [Fri, 27 Jun 2014 21:38:48 +0000 (21:38 +0000)]
am
78e5a83a: Merge "fix Camera2 stubs for GoogleHelpHelper" into ub-camera-fishlake
* commit '
78e5a83a137a33452dd6500ddc60407bfe494bd2':
fix Camera2 stubs for GoogleHelpHelper
Erin Dahlgren [Fri, 27 Jun 2014 21:29:35 +0000 (14:29 -0700)]
resolved conflicts for merge of
deb09a7c to ub-camera-glacier
Change-Id: I98982ef41a2b2dc1175bb8f2ae9f881eb183c53d
Sascha Haeberling [Fri, 27 Jun 2014 21:00:18 +0000 (21:00 +0000)]
am
1dc99323: Updated resources to comply with GAR.
* commit '
1dc9932347ea735f8b4e06382d36af3cf65421e7':
Updated resources to comply with GAR.
Sascha Haeberling [Fri, 27 Jun 2014 00:05:58 +0000 (17:05 -0700)]
Updated resources to comply with GAR.
Bug:
15754001
Change-Id: I1236cd51ef20dfeeb3b09f473dbd1e9ccfeff971
Erin Dahlgren [Fri, 27 Jun 2014 21:07:58 +0000 (21:07 +0000)]
Merge "GoogleHelp launch edits." into ub-camera-fishlake
Erin Dahlgren [Fri, 27 Jun 2014 18:18:36 +0000 (11:18 -0700)]
GoogleHelp launch edits.
* Change Help to "Help & feedback"
* Move open source to the overflow menu in Help & feedback
* Remove send feedback
* Consolidate to one single group of settings (no General Settings and About)
* Put "Help & feedback" in the filmstrip overflow
Bug:
8426295
Change-Id: I3f0dad33b3e0c9ce150dce5c96cf7b9d7d7650da
Sam Judd [Fri, 27 Jun 2014 03:04:51 +0000 (03:04 +0000)]
am
632eaafd: Pull Glide forward.
* commit '
632eaafda53eb59b15c81ddeaf2080e6d8515f59':
Pull Glide forward.
Sam Judd [Tue, 24 Jun 2014 20:31:02 +0000 (13:31 -0700)]
Pull Glide forward.
Bug:
15669246
Change-Id: Icdcc5cb7c3ec2bbf5b970ee95ea121e10ac341d7
Sascha Haeberling [Thu, 26 Jun 2014 22:47:08 +0000 (15:47 -0700)]
resolved conflicts for merge of
b0870db3 to ub-camera-glacier
Change-Id: If06d585dbbe2d47ea92679bf63428fc2c0bca923
Baligh Uddin [Thu, 26 Jun 2014 21:20:09 +0000 (14:20 -0700)]
Import translations. DO NOT MERGE
Change-Id: I572257c9914387e5c2e0b02561d6b6c0413bf17a
Auto-generated-cl: translation import
Erin Dahlgren [Fri, 27 Jun 2014 21:34:29 +0000 (21:34 +0000)]
Merge "fix Camera2 stubs for GoogleHelpHelper" into ub-camera-fishlake
Erin Dahlgren [Fri, 27 Jun 2014 21:33:57 +0000 (14:33 -0700)]
fix Camera2 stubs for GoogleHelpHelper
Change-Id: Iba9d55c22cf3e3811072b14f1f0e74e9bd3814cf
Sascha Haeberling [Wed, 25 Jun 2014 18:27:59 +0000 (18:27 +0000)]
am
57d4f74f: Ensure focusAndCapture() is called on the main thread.
* commit '
57d4f74f9c4a122d87748d1ace36b0ec9bbd54a5':
Ensure focusAndCapture() is called on the main thread.
Sascha Haeberling [Wed, 25 Jun 2014 18:05:49 +0000 (11:05 -0700)]
Ensure focusAndCapture() is called on the main thread.
Bug:
15863231
Change-Id: Ieeb6e61e5a8a1d49832ea8ded6de2575afb0bdad
Sascha Haeberling [Wed, 25 Jun 2014 18:26:10 +0000 (18:26 +0000)]
Merge "Clean-Up formatting." into ub-camera-fishlake
Sascha Haeberling [Wed, 25 Jun 2014 18:12:22 +0000 (11:12 -0700)]
Clean-Up formatting.
Change-Id: I6278a2fe8e0bf8059021d5a247c0282c16cfd3c8
Baligh Uddin [Wed, 25 Jun 2014 02:55:14 +0000 (02:55 +0000)]
am
dc9aeb52: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-camera-fishlake
* commit '
dc9aeb524de81438e5a524890fbe9109e2afe7ab':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 25 Jun 2014 02:51:54 +0000 (02:51 +0000)]
Merge "Import translations. DO NOT MERGE" into ub-camera-glacier
Baligh Uddin [Wed, 25 Jun 2014 02:51:59 +0000 (02:51 +0000)]
Merge "Import translations. DO NOT MERGE" into ub-camera-fishlake
Andy Huibers [Thu, 19 Jun 2014 05:26:14 +0000 (22:26 -0700)]
Add metadata to capture and tap to focus events.
Bug:
15646701
Change-Id: Id290935839a81cfe86e9a503849207d828f33225
Sol Boucher [Tue, 24 Jun 2014 18:45:10 +0000 (18:45 +0000)]
Merge "Replace uses of CameraDevice#getCameraInfos() and CameraInfo" into ub-camera-glacier
Andy Huibers [Tue, 24 Jun 2014 17:46:36 +0000 (10:46 -0700)]
Fix merge conflict.
Change-Id: Ie3a66e4c362355d0dfff1597efcb9d69234266e6
Andy Huibers [Tue, 24 Jun 2014 17:38:47 +0000 (17:38 +0000)]
am
b7c7d9a0: Add metadata to capture and tap to focus events.
* commit '
b7c7d9a067cd52a27cfbaf0714a2074f972d836d':
Add metadata to capture and tap to focus events.
Andy Huibers [Tue, 24 Jun 2014 17:38:46 +0000 (17:38 +0000)]
am
03fd3baf: Merge "Add maximum zoom level and time to view events." into ub-camera-fishlake
* commit '
03fd3baf01447f30246b095f816ce337562d15f7':
Add maximum zoom level and time to view events.
Erin Dahlgren [Tue, 24 Jun 2014 17:13:01 +0000 (10:13 -0700)]
resolved conflicts for merge of
e1547937 to ub-camera-glacier
Change-Id: I15a68218f95e0f9192d91628ad972a7815e4ec73
Erin Dahlgren [Mon, 23 Jun 2014 22:17:07 +0000 (15:17 -0700)]
Hard reset HDR off if HDR+ is supported.
HDR and HDR+ should not be activatable on the same phone.
Our app depends on this assumption, so in case the app is killed
in some way to prevents us from going to gms core to get the
right information about hdr/hdr+ support, force HDR off if HDR+
at any point is supported.
Bug:
15310749
Change-Id: I450671d1218679ac8d413a01c5857030ba6ea32a
Andy Huibers [Mon, 23 Jun 2014 23:31:56 +0000 (23:31 +0000)]
Merge "Add maximum zoom level and time to view events." into ub-camera-fishlake
Sol Boucher [Thu, 19 Jun 2014 22:03:18 +0000 (15:03 -0700)]
Replace uses of CameraDevice#getCameraInfos() and CameraInfo
This API 1--specific portability library method has been removed. All
non-debugging direct uses of the Camera.CameraInfo class are also addressed by
this commit.
Change-Id: I551bb1476a26f79c101892336d0bf99e4fa823cc
Andy Huibers [Tue, 20 May 2014 22:17:06 +0000 (15:17 -0700)]
Add maximum zoom level and time to view events.
Bug:
15646701
Change-Id: I7c1de761fc10486b417a25ebc8469cebaf840a1c
Sascha Haeberling [Mon, 23 Jun 2014 20:46:18 +0000 (20:46 +0000)]
am
c37ab9dd: (-s ours) DO NOT MERGE - Remove Material from Fishlake. But not glacier.
* commit '
c37ab9dd8222db47f9aac89d4d4bb24357ab90f1':
DO NOT MERGE - Remove Material from Fishlake. But not glacier.
Sascha Haeberling [Mon, 23 Jun 2014 20:34:24 +0000 (13:34 -0700)]
DO NOT MERGE - Remove Material from Fishlake. But not glacier.
Bug:
15757384
Change-Id: I3367a96e1059ab4e0f2fc65353a13853a33767ca
Baligh Uddin [Mon, 23 Jun 2014 19:41:18 +0000 (12:41 -0700)]
Import translations. DO NOT MERGE
Change-Id: I4bc3eec56992652a44c6b128f9dd0e2297400efe
Auto-generated-cl: translation import
Baligh Uddin [Mon, 23 Jun 2014 19:39:43 +0000 (12:39 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ib47ffbe27c9f6a559677c77ad94cf6d2b2e9ed1b
Auto-generated-cl: translation import
Angus Kong [Mon, 23 Jun 2014 18:59:25 +0000 (18:59 +0000)]
Merge "Migrate to use new CameraSettings." into ub-camera-glacier
Sascha Häberling [Sat, 21 Jun 2014 00:04:02 +0000 (00:04 +0000)]
am
ecf1014c: Merge "Revert "Memory window analysis in Camera2. Bug:
13280671"" into ub-camera-fishlake
* commit '
ecf1014c0349e42cb7689eb61fb33d91aa69590e':
Revert "Memory window analysis in Camera2. Bug:
13280671"
Erin Dahlgren [Fri, 20 Jun 2014 22:10:18 +0000 (22:10 +0000)]
am
5802ea97: (-s ours) Protect settings logging with a verbose flag
* commit '
5802ea97c0bab7cf17e3567ea31ec943e812b31d':
Protect settings logging with a verbose flag
Erin Dahlgren [Fri, 20 Jun 2014 21:58:18 +0000 (14:58 -0700)]
Protect settings logging with a verbose flag
Change-Id: Icacc7c01971ed2077b9e5999e042a2b9ba031cfd
Sascha Häberling [Fri, 20 Jun 2014 23:49:20 +0000 (23:49 +0000)]
Merge "Revert "Memory window analysis in Camera2. Bug:
13280671"" into ub-camera-fishlake
Sascha Häberling [Fri, 20 Jun 2014 23:45:29 +0000 (23:45 +0000)]
Revert "Memory window analysis in Camera2. Bug:
13280671"
This seems to introduce jank in the app.
This reverts commit
b4f3483bfb5c2edcaefd0b44e84bb080e46502c8.
Change-Id: Iad87e32a411eae1e2fdf09d6829c0e006a8eb5f8
Erin Dahlgren [Fri, 20 Jun 2014 19:46:32 +0000 (19:46 +0000)]
am
28973902: (-s ours) dump default and global shared preferences
* commit '
28973902b2fb8158ece59282218938ca3e060f6b':
dump default and global shared preferences
Erin Dahlgren [Fri, 20 Jun 2014 19:30:56 +0000 (12:30 -0700)]
dump default and global shared preferences
Change-Id: Ia9f3780dc6a0725badb3214fc9388fab9007dbb5
Kevin Gabayan [Fri, 20 Jun 2014 03:37:47 +0000 (03:37 +0000)]
am
2b04dc42: Merge "Memory window analysis in Camera2. Bug:
13280671" into ub-camera-fishlake
* commit '
2b04dc42f691257742a7f73f4d9e803ea4a0d7ed':
Memory window analysis in Camera2. Bug:
13280671
Baligh Uddin [Thu, 19 Jun 2014 19:19:09 +0000 (19:19 +0000)]
am
7d0c9f68: (-s ours) am
0e343cde: (-s ours) Import translations. DO NOT MERGE
* commit '
7d0c9f68718f4d631b24d105144f252c928c7e71':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 19 Jun 2014 19:16:01 +0000 (19:16 +0000)]
am
c9feac67: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-camera-fishlake
* commit '
c9feac671fb51fa343138b1e93906e57b1ba0e64':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 19 Jun 2014 19:15:49 +0000 (19:15 +0000)]
am
0e343cde: (-s ours) Import translations. DO NOT MERGE
* commit '
0e343cde9c36a7f3d4cc192839d4938cc048159b':
Import translations. DO NOT MERGE
Kevin Gabayan [Thu, 17 Apr 2014 20:56:10 +0000 (13:56 -0700)]
Memory window analysis in Camera2.
Bug:
13280671
Change-Id: I22249e6aeb76dca2fe79e49d3bd75c089fa7936f
Angus Kong [Mon, 16 Jun 2014 23:07:28 +0000 (16:07 -0700)]
Migrate to use new CameraSettings.
Totally get rid of Camera.Parameters.
Change-Id: I147b88f77ecab52600088a10417c3eac3d7fd340
Sascha Haeberling [Thu, 19 Jun 2014 17:19:30 +0000 (10:19 -0700)]
Fixing bad manual merge to fix build.
Change-Id: I0a96593e72240de5e1ffa562704b30932fddb4f3
Kevin Gabayan [Thu, 19 Jun 2014 21:28:06 +0000 (21:28 +0000)]
Merge "Memory window analysis in Camera2. Bug:
13280671" into ub-camera-fishlake
Sascha Haeberling [Thu, 19 Jun 2014 07:38:52 +0000 (00:38 -0700)]
resolved conflicts for merge of
1bf0889d to ub-camera-glacier
Change-Id: I5281f7c362165bc5a9d0790601fd8d1b29a71d4e
Angus Kong [Thu, 19 Jun 2014 00:20:34 +0000 (17:20 -0700)]
Fix the build.
Change-Id: Id8acdcfa54721042e61e16a9c50381e61414f778
Erin Dahlgren [Fri, 13 Jun 2014 21:12:08 +0000 (14:12 -0700)]
New Settings API
Based on discussions from last week and comments on the design doc,
this api begins to implement the following:
1. Adds a "Scope" variable to api, which tells the SettingsManager
whether the setting can be stored globally (so that it is visible
to all parts of the app), or per-camera, or per-module, or per-
custom scope that the api user provides.
2. Separates keys and default values from SettingsManager,
to make it easy to add new settings/defaults from third party
modules.
3. Stores all settings as strings, to avoid upgrade errors, and
handles casting to type requested. Only String, Integer, and
boolean are supported.
4. Opens SharedPreferences files on demand, depending on scope
argument.
5. Creates a "DefaultsStore" to hold the defaults and possible
values of a setting. Then a user can request the default or
possible values of a setting at any time.
Change-Id: I03e0e1dd0955c519f54112e89716014aa963a425
Sascha Haeberling [Wed, 18 Jun 2014 16:38:06 +0000 (09:38 -0700)]
Remote shutter should focus before taking a photo.
Bug:
13929364
Change-Id: Ib6fd83186100c67aef613f93bb8f9ea780da9ceb
Baligh Uddin [Wed, 18 Jun 2014 20:33:46 +0000 (13:33 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ic51f4fc00312470d6a28b0a8347016eaf525c402
Auto-generated-cl: translation import
Sol Boucher [Tue, 17 Jun 2014 21:05:08 +0000 (14:05 -0700)]
Remove cameradevice subpackage and point references at ex library
This code is being relocated into frameworks/ex for availability to other apps.
Change-Id: Icada261ac7a795b08dd8b187dfd17077077b37c3
Baligh Uddin [Thu, 19 Jun 2014 19:13:43 +0000 (19:13 +0000)]
Merge "Import translations. DO NOT MERGE" into ub-camera-glacier
Baligh Uddin [Wed, 18 Jun 2014 20:36:04 +0000 (13:36 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ibbb0fdf0ac471f6a59db931f5b818540bb932556
Auto-generated-cl: translation import
Baligh Uddin [Thu, 19 Jun 2014 19:13:48 +0000 (19:13 +0000)]
Merge "Import translations. DO NOT MERGE" into ub-camera-fishlake
Baligh Uddin [Wed, 18 Jun 2014 20:34:33 +0000 (13:34 -0700)]
Import translations. DO NOT MERGE
Change-Id: I03bddcd1e554a1b26e0c8f9e691e0ac4d83f6feb
Auto-generated-cl: translation import
Kevin Gabayan [Tue, 17 Jun 2014 18:19:59 +0000 (18:19 +0000)]
am
09a46ccb: Merge "MotionManager for motion-aware focus unlock in Camera2. Second revision. Bug:
14222601" into ub-camera-fishlake
* commit '
09a46ccb10504579417609d2486dc28e92458bf7':
MotionManager for motion-aware focus unlock in Camera2. Second revision. Bug:
14222601
Spike Sprague [Tue, 17 Jun 2014 18:01:05 +0000 (11:01 -0700)]
Clarify filmstrip accessibility strings and comments
bug:
15600867
bug:
15595791
bug:
15586834
Change-Id: Ic20b693a85df0c76cea7b175f561a60d82b8d446
Baligh Uddin [Tue, 17 Jun 2014 14:32:01 +0000 (14:32 +0000)]
am
18179f40: (-s ours) am
e2a0db87: (-s ours) Import translations. DO NOT MERGE
* commit '
18179f40c7c4e8b893354b9b17ae6b6b1b412b8a':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 17 Jun 2014 14:29:20 +0000 (14:29 +0000)]
am
e2a0db87: (-s ours) Import translations. DO NOT MERGE
* commit '
e2a0db8780a0283fec98cf5ff5235eb4e956a0bc':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 17 Jun 2014 14:28:44 +0000 (14:28 +0000)]
am
cae93db7: (-s ours) Import translations. DO NOT MERGE
* commit '
cae93db7c84d83946a13c792ca46b32e396bf6c6':
Import translations. DO NOT MERGE
Kevin Gabayan [Tue, 17 Jun 2014 18:17:05 +0000 (18:17 +0000)]
Merge "MotionManager for motion-aware focus unlock in Camera2. Second revision. Bug:
14222601" into ub-camera-fishlake
Kevin Gabayan [Mon, 2 Jun 2014 21:48:20 +0000 (14:48 -0700)]
MotionManager for motion-aware focus unlock in Camera2. Second revision.
Bug:
14222601
Change-Id: I36637483b0d7efa2950cd93482de8f1e83bfa8aa
Baligh Uddin [Mon, 16 Jun 2014 20:15:31 +0000 (13:15 -0700)]
Import translations. DO NOT MERGE
Change-Id: I9ef9c0d484fbad4b924941b6e1aeb213d47f909c
Auto-generated-cl: translation import
Baligh Uddin [Mon, 16 Jun 2014 20:14:06 +0000 (13:14 -0700)]
Import translations. DO NOT MERGE
Change-Id: I9f900c918cdcbca9f631ef6997b102cdae44f30b
Auto-generated-cl: translation import
Baligh Uddin [Mon, 16 Jun 2014 20:13:21 +0000 (13:13 -0700)]
Import translations. DO NOT MERGE
Change-Id: I31efcdcda865c4cad85019eaba9e6c57a8a6e1bf
Auto-generated-cl: translation import
Baligh Uddin [Sun, 15 Jun 2014 13:20:13 +0000 (13:20 +0000)]
am
daebadaa: (-s ours) am
65345934: (-s ours) Import translations. DO NOT MERGE
* commit '
daebadaabddabc7ee246251b711a7a137ca6042b':
Import translations. DO NOT MERGE
Baligh Uddin [Sun, 15 Jun 2014 13:17:28 +0000 (13:17 +0000)]
am
65345934: (-s ours) Import translations. DO NOT MERGE
* commit '
653459343b06a87b6be5fe329365c37352fb182d':
Import translations. DO NOT MERGE
Baligh Uddin [Sun, 15 Jun 2014 13:17:06 +0000 (13:17 +0000)]
am
63949bb0: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-camera-fishlake
* commit '
63949bb0372b08ab12c78d2fac6f0bf224df8db6':
Import translations. DO NOT MERGE
Baligh Uddin [Fri, 13 Jun 2014 22:26:54 +0000 (15:26 -0700)]
Import translations. DO NOT MERGE
Change-Id: I65d653aa397dcf26ccb8451d087224a181c313d5
Auto-generated-cl: translation import
Baligh Uddin [Sun, 15 Jun 2014 13:13:40 +0000 (13:13 +0000)]
Merge "Import translations. DO NOT MERGE" into ub-camera-glacier
Baligh Uddin [Fri, 13 Jun 2014 22:29:29 +0000 (15:29 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ibdbe21956c33c6ed635e5472d2a6fed4360c6ef6
Auto-generated-cl: translation import
Angus Kong [Fri, 13 Jun 2014 20:55:54 +0000 (13:55 -0700)]
Don't pass empty list of areas.
Some devices won't work well if we pass in an empty list of focusing or metering
areas.
Change-Id: Iff6bfd37a7d551b12c43e88cf8d4934472837257
Kevin Gabayan [Fri, 13 Jun 2014 20:52:00 +0000 (20:52 +0000)]
am
811a814d: Merge "Revert "MotionManager for motion-aware focus unlock in Camera2 Bug:
14222601"" into ub-camera-fishlake
* commit '
811a814dc3a2221048c1b23206a9d0a4bf9b6901':
Revert "MotionManager for motion-aware focus unlock in Camera2 Bug:
14222601"
Kevin Gabayan [Fri, 13 Jun 2014 19:47:58 +0000 (19:47 +0000)]
am
bacc2584: Merge "MotionManager for motion-aware focus unlock in Camera2 Bug:
14222601" into ub-camera-fishlake
* commit '
bacc2584a7c03931643dd4c2d95d6c3f302e4a00':
MotionManager for motion-aware focus unlock in Camera2 Bug:
14222601
Erin Dahlgren [Fri, 13 Jun 2014 18:28:35 +0000 (18:28 +0000)]
am
40d67958: Adjust the GoogleHelp interface so Camera2 will build
* commit '
40d67958ecc152879a9aca554245d7e1341bb908':
Adjust the GoogleHelp interface so Camera2 will build
Erin Dahlgren [Fri, 13 Jun 2014 18:26:09 +0000 (11:26 -0700)]
Adjust the GoogleHelp interface so Camera2 will build
Change-Id: I7aea16e8e967bd671cee2b07ee7cd93865df8cc5
Erin Dahlgren [Fri, 13 Jun 2014 17:45:13 +0000 (17:45 +0000)]
am
51c55dac: Merge "GoogleHelp affordance in CameraSettingsActivity" into ub-camera-fishlake
* commit '
51c55dac6950dca94a40b3fb685fb075ca47120e':
GoogleHelp affordance in CameraSettingsActivity
Doris Liu [Fri, 13 Jun 2014 01:12:31 +0000 (18:12 -0700)]
resolved conflicts for merge of
2c8ac0ad to ub-camera-glacier
Change-Id: If25e388378acefe505c6bd8fed530eacb0bef6eb
Doris Liu [Thu, 12 Jun 2014 23:14:38 +0000 (16:14 -0700)]
Remove workaround for K-MR1 that registers redundant preview callbacks
as MR2 has already started rollout, and is expected to finish before F release.
Change-Id: Ifa37a91f5270bb820d5bfb8db03bf21a71f225ff
Kevin Gabayan [Fri, 13 Jun 2014 20:50:13 +0000 (20:50 +0000)]
Merge "Revert "MotionManager for motion-aware focus unlock in Camera2 Bug:
14222601"" into ub-camera-fishlake
Kevin Gabayan [Fri, 13 Jun 2014 20:49:48 +0000 (20:49 +0000)]
Revert "MotionManager for motion-aware focus unlock in Camera2 Bug:
14222601"
This reverts commit
ebba3288da5628c9ea7579b63139aa7b7312e137.
Change-Id: Ie82d81aa0440339aba1b762fa78caeb7f7d55312
Kevin Gabayan [Mon, 2 Jun 2014 21:48:20 +0000 (14:48 -0700)]
MotionManager for motion-aware focus unlock in Camera2
Bug:
14222601
Change-Id: Id118e12c8f789c74c8fc2e32ec208ff943b97e49
Erin Dahlgren [Fri, 13 Jun 2014 17:42:26 +0000 (17:42 +0000)]
Merge "GoogleHelp affordance in CameraSettingsActivity" into ub-camera-fishlake
Erin Dahlgren [Mon, 9 Jun 2014 21:37:34 +0000 (14:37 -0700)]
GoogleHelp affordance in CameraSettingsActivity
Uses the first Account available to launch a GoogleHelp
Activity from the CameraSettingsActivity. We remove the
affordance if the phone has no registered Accounts.
Bug:
8426295
Change-Id: I02f8f0accd76c19d42cbbd68c4043c174f13d424
Baligh Uddin [Sun, 15 Jun 2014 13:13:46 +0000 (13:13 +0000)]
Merge "Import translations. DO NOT MERGE" into ub-camera-fishlake
Baligh Uddin [Fri, 13 Jun 2014 22:27:49 +0000 (15:27 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ieb03ca010902aff60a08f74e382fa0e22bde4bd3
Auto-generated-cl: translation import
OSDN Git Service
