OSDN Git Service
Baligh Uddin [Tue, 29 Apr 2014 21:10:17 +0000 (21:10 +0000)]
am
192edd1e: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-camera-everglades
* commit '
192edd1e4aa69cfd987cb0d3d836b86c532e1175':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 29 Apr 2014 21:08:29 +0000 (21:08 +0000)]
Merge "Import translations. DO NOT MERGE" into ub-camera-everglades
Andy Huibers [Mon, 28 Apr 2014 23:35:37 +0000 (23:35 +0000)]
am
311372eb: am
eaaf2930: Add logging for failure conditions.
* commit '
311372eb258ed6f3cf28f092ab529d3ff65020bb':
Add logging for failure conditions.
Andy Huibers [Mon, 28 Apr 2014 23:32:18 +0000 (23:32 +0000)]
am
eaaf2930: Add logging for failure conditions.
* commit '
eaaf29303c48c2befe216151bf9bedc008a1b616':
Add logging for failure conditions.
Andy Huibers [Mon, 28 Apr 2014 20:18:31 +0000 (13:18 -0700)]
Add logging for failure conditions.
Bug:
14364757
Change-Id: I252b1d79b94dabdc8960c7e243c50c8d50cb1306
Angus Kong [Mon, 28 Apr 2014 22:09:01 +0000 (22:09 +0000)]
am
b65117fb: am
1b9d4fb6: Add history info for camera open failure log.
* commit '
b65117fbce9a0dc6d7568a6b7b802baf5df6ead5':
Add history info for camera open failure log.
Angus Kong [Mon, 28 Apr 2014 22:07:25 +0000 (22:07 +0000)]
am
1b9d4fb6: Add history info for camera open failure log.
* commit '
1b9d4fb6f649262e491c0fa743229b4930a87802':
Add history info for camera open failure log.
Angus Kong [Fri, 25 Apr 2014 18:41:23 +0000 (11:41 -0700)]
Add history info for camera open failure log.
bug:
14365703
Change-Id: I4b2259e12121cac5b8165f5c5dbacf9cb3a936a6
Angus Kong [Mon, 28 Apr 2014 21:44:52 +0000 (21:44 +0000)]
am
dafb9214: am
51a09680: Notify DataAdapter.Listener the changes of data.
* commit '
dafb921412409c6884e8f9d44cba3da214489ce7':
Notify DataAdapter.Listener the changes of data.
Angus Kong [Mon, 28 Apr 2014 21:43:11 +0000 (21:43 +0000)]
am
51a09680: Notify DataAdapter.Listener the changes of data.
* commit '
51a09680b57aca64db91aaea11c11ca4b86a296b':
Notify DataAdapter.Listener the changes of data.
Angus Kong [Mon, 28 Apr 2014 21:37:09 +0000 (14:37 -0700)]
Notify DataAdapter.Listener the changes of data.
The DataAdapter.Listener should be notified the changes of data due to the
metadata change.
bug:
14279339
Change-Id: Ia6b7302a6967c10a53557d6953fa7888955e13a0
Baligh Uddin [Mon, 28 Apr 2014 20:02:15 +0000 (13:02 -0700)]
Import translations. DO NOT MERGE
Change-Id: I5818776320d7d6e6dc770e05dad2776ef3fa7772
Auto-generated-cl: translation import
Doris Liu [Mon, 28 Apr 2014 13:29:49 +0000 (13:29 +0000)]
am
c7e85540: (-s ours) am
a8e77ab8: (-s ours) Merge "DO NOT MERGE - Shutter button left handed support" into gb-ub-photos-denali
* commit '
c7e85540010d43f905d94886304ea0a52be59831':
DO NOT MERGE - Shutter button left handed support
Doris Liu [Mon, 28 Apr 2014 13:29:48 +0000 (13:29 +0000)]
am
1fb5e00f: am
e5ba601d: Merge "Bring back video snapshot" into gb-ub-photos-denali
* commit '
1fb5e00f051462ebe81b3e9c923608cbb553246e':
Bring back video snapshot
Sascha Haeberling [Mon, 28 Apr 2014 13:29:48 +0000 (13:29 +0000)]
am
677a5b9b: am
df8a3327: Avoid duplicate entries in the resolutions list.
* commit '
677a5b9bc43ed30cc7b4df9db7848deb6b45e93b':
Avoid duplicate entries in the resolutions list.
Sascha Haeberling [Mon, 28 Apr 2014 13:29:47 +0000 (13:29 +0000)]
am
4f1f5ece: am
837d8524: Properly remove the settings for an unavailable camera.
* commit '
4f1f5ecea11a8f06d213ea0aa963903882c4d727':
Properly remove the settings for an unavailable camera.
Doris Liu [Mon, 28 Apr 2014 13:29:47 +0000 (13:29 +0000)]
am
8a2bd564: (-s ours) am
8afc8e2e: (-s ours) DO NOT MERGE - Refactor preview position logic
* commit '
8a2bd564ecdb5218cd7e55e27600b562f9d27f16':
DO NOT MERGE - Refactor preview position logic
Doris Liu [Mon, 28 Apr 2014 13:27:23 +0000 (13:27 +0000)]
am
a8e77ab8: (-s ours) Merge "DO NOT MERGE - Shutter button left handed support" into gb-ub-photos-denali
* commit '
a8e77ab86849156ea91758d1c1128f57ac5b7d21':
DO NOT MERGE - Shutter button left handed support
Doris Liu [Mon, 28 Apr 2014 13:27:23 +0000 (13:27 +0000)]
am
e5ba601d: Merge "Bring back video snapshot" into gb-ub-photos-denali
* commit '
e5ba601d4e3aa9419886e2ea4b3b2e5ba3d3e2e7':
Bring back video snapshot
Sascha Haeberling [Mon, 28 Apr 2014 13:27:22 +0000 (13:27 +0000)]
am
df8a3327: Avoid duplicate entries in the resolutions list.
* commit '
df8a332710bbb1f2beee90b2b91f706c49ef5701':
Avoid duplicate entries in the resolutions list.
Sascha Haeberling [Mon, 28 Apr 2014 13:27:22 +0000 (13:27 +0000)]
am
837d8524: Properly remove the settings for an unavailable camera.
* commit '
837d8524a35731ce01e2a69fde846edc21b94071':
Properly remove the settings for an unavailable camera.
Doris Liu [Mon, 28 Apr 2014 13:27:21 +0000 (13:27 +0000)]
am
8afc8e2e: (-s ours) DO NOT MERGE - Refactor preview position logic
* commit '
8afc8e2eaaa4fdeef3cf9060cc69613d37804f56':
DO NOT MERGE - Refactor preview position logic
Doris Liu [Sat, 26 Apr 2014 01:30:39 +0000 (01:30 +0000)]
Merge "DO NOT MERGE - Shutter button left handed support" into gb-ub-photos-denali
Doris Liu [Sat, 26 Apr 2014 01:11:20 +0000 (01:11 +0000)]
Merge "Bring back video snapshot" into gb-ub-photos-denali
Doris Liu [Sat, 26 Apr 2014 00:35:27 +0000 (17:35 -0700)]
Bring back video snapshot
Bug:
14220490
Change-Id: Ibf20d169aae9de4eb9c1e2151d9c7335bcf7b3a3
Doris Liu [Sat, 26 Apr 2014 00:20:12 +0000 (00:20 +0000)]
am
344320c9: Shutter button left handed support
* commit '
344320c90639f823451ddac42e8f39b74727787c':
Shutter button left handed support
Doris Liu [Tue, 22 Apr 2014 21:47:49 +0000 (14:47 -0700)]
DO NOT MERGE - Shutter button left handed support
Bug:
12823819
Change-Id: I77bdbf17557bdd9f545b98bab58acce68d01b51d
(cherry picked from commit
344320c90639f823451ddac42e8f39b74727787c)
Sascha Haeberling [Fri, 25 Apr 2014 20:04:41 +0000 (13:04 -0700)]
Avoid duplicate entries in the resolutions list.
Bug:
14277230
Dup entries indicate that a camera doesn't support at least three entries.
Change-Id: Id3c18664637ba9cf80edada924695737863cf3a7
Doris Liu [Tue, 22 Apr 2014 21:47:49 +0000 (14:47 -0700)]
Shutter button left handed support
Bug:
12823819
Change-Id: I77bdbf17557bdd9f545b98bab58acce68d01b51d
Angus Kong [Thu, 24 Apr 2014 23:32:21 +0000 (23:32 +0000)]
am
00b7b109: Use Point to back up util.Size.
* commit '
00b7b10987b38c362cc88600aad58890d531bf35':
Use Point to back up util.Size.
Angus Kong [Thu, 24 Apr 2014 22:46:52 +0000 (15:46 -0700)]
Use Point to back up util.Size.
Change-Id: I125d290ee94c9acadf77c50c6c9c0b9b24df4a88
Sascha Haeberling [Thu, 24 Apr 2014 21:26:28 +0000 (14:26 -0700)]
Properly remove the settings for an unavailable camera.
Bug:
14108948
Change-Id: I34222ab976a481e8e28ed0bbc8b773dd3d49e8bb
Angus Kong [Thu, 24 Apr 2014 04:22:42 +0000 (04:22 +0000)]
am
2c6eabec: Merge "Use util.Size to replace Camera.Size." into ub-camera-everglades
* commit '
2c6eabec7edbfa159e207449d575fa7bb64a9470':
Use util.Size to replace Camera.Size.
Angus Kong [Thu, 24 Apr 2014 04:20:31 +0000 (04:20 +0000)]
Merge "Use util.Size to replace Camera.Size." into ub-camera-everglades
Angus Kong [Wed, 23 Apr 2014 17:47:47 +0000 (10:47 -0700)]
Use util.Size to replace Camera.Size.
Change-Id: I77784d339a09f24afbf96dc5ef4ce2ac2702b356
Doris Liu [Thu, 10 Apr 2014 23:01:51 +0000 (16:01 -0700)]
DO NOT MERGE - Refactor preview position logic
Centralize the logic of laying out bottom bar and transforming
preview TextureView based on the total space to lay them out
and preview aspect ratio. The layout is updated when either condition
above has changed. Then the rect of the bottom bar and preview
rect can be queried anywhere. This way, bottom bar, mode options
layout, and any view that relies on the preview rect and bottom bar
rect can be laid out without extra layout passes.
Bug:
13795952
Change-Id: I13c38b566b5b5d8f37ec94f325554c089a86ca8e
(cherry picked from commit
28a2950939614a0c1c83787960ce1a218fb69a5e)
Doris Liu [Thu, 24 Apr 2014 02:50:37 +0000 (02:50 +0000)]
am
28a29509: Refactor preview position logic
* commit '
28a2950939614a0c1c83787960ce1a218fb69a5e':
Refactor preview position logic
Doris Liu [Thu, 10 Apr 2014 23:01:51 +0000 (16:01 -0700)]
Refactor preview position logic
Centralize the logic of laying out bottom bar and transforming
preview TextureView based on the total space to lay them out
and preview aspect ratio. The layout is updated when either condition
above has changed. Then the rect of the bottom bar and preview
rect can be queried anywhere. This way, bottom bar, mode options
layout, and any view that relies on the preview rect and bottom bar
rect can be laid out without extra layout passes.
Bug:
13795952
Change-Id: I13c38b566b5b5d8f37ec94f325554c089a86ca8e
Sascha Haeberling [Tue, 22 Apr 2014 16:11:28 +0000 (09:11 -0700)]
Remove SmartCamera (Part 1/2)
Bug:
14254411
Change-Id: I09488e8c39fce104a92659a989a275a5f72821bb
Sascha Haeberling [Tue, 22 Apr 2014 21:33:49 +0000 (21:33 +0000)]
am
420595e8: (-s ours) Merge "DO NOT MERGE - Remove SmartCamera (Part 1/2)" into ub-camera-everglades
* commit '
420595e86147a691b9d06baf2e36a533b7e7c7fa':
DO NOT MERGE - Remove SmartCamera (Part 1/2)
Angus Kong [Tue, 22 Apr 2014 21:33:49 +0000 (21:33 +0000)]
am
7539e492: The coordinatations should be relative.
* commit '
7539e49296b993be37709f45385a6286618d464d':
The coordinatations should be relative.
Sascha Haeberling [Tue, 22 Apr 2014 21:33:03 +0000 (21:33 +0000)]
Merge "DO NOT MERGE - Remove SmartCamera (Part 1/2)" into ub-camera-everglades
Sascha Haeberling [Tue, 22 Apr 2014 16:11:28 +0000 (09:11 -0700)]
DO NOT MERGE - Remove SmartCamera (Part 1/2)
Bug:
14254411
Change-Id: I09488e8c39fce104a92659a989a275a5f72821bb
Angus Kong [Tue, 22 Apr 2014 16:54:07 +0000 (09:54 -0700)]
The coordinatations should be relative.
The coordinations we got in onLayout() is relative to its parent. FilmstripView
doesn't not consider this and the layout can be wrong when it's not fullscreen.
Change-Id: Icc3d40a9cb3c805f8b3a8a4652edbfd873296fa8
Baligh Uddin [Tue, 22 Apr 2014 14:56:58 +0000 (14:56 +0000)]
am
98842a62: (-s ours) am
beeccf8d: (-s ours) Import translations. DO NOT MERGE
* commit '
98842a6267052afc13e3e4f31cbb543ff95ee320':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 22 Apr 2014 14:54:00 +0000 (14:54 +0000)]
am
beeccf8d: (-s ours) Import translations. DO NOT MERGE
* commit '
beeccf8d6193d0153a1a3f43944ebeff2c5649f7':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 22 Apr 2014 14:53:49 +0000 (14:53 +0000)]
am
e4027c46: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-camera-everglades
* commit '
e4027c4673a0639ab2a241ccb2dbb3ccdf9909d4':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 22 Apr 2014 14:51:20 +0000 (14:51 +0000)]
Merge "Import translations. DO NOT MERGE" into ub-camera-everglades
Baligh Uddin [Mon, 21 Apr 2014 21:11:18 +0000 (14:11 -0700)]
Import translations. DO NOT MERGE
Change-Id: I6a0277c0931817b9c1104b63ee108f074988111b
Auto-generated-cl: translation import
Baligh Uddin [Mon, 21 Apr 2014 21:09:58 +0000 (14:09 -0700)]
Import translations. DO NOT MERGE
Change-Id: I17b580bed7ccca78182ecff0eb47484d6ba5f0bc
Auto-generated-cl: translation import
Angus Kong [Mon, 21 Apr 2014 18:17:37 +0000 (11:17 -0700)]
Create cameradevice package for camera management.
Change-Id: I73c69a70736b0b0eb0ef069a7876cf75fee91262
Sascha Haeberling [Sat, 19 Apr 2014 06:30:34 +0000 (06:30 +0000)]
Merge "Catch potential RTE from Camera." into ub-camera-everglades
Sascha Haeberling [Fri, 18 Apr 2014 15:13:55 +0000 (08:13 -0700)]
Catch potential RTE from Camera.
I got this one on a Nexus S running CM. So maybe not a real problem in
the wild. But given the amount of errors we see in the wild about camera
not connection, we should revisit and see if any of these errors are
catchable, like this one.
Change-Id: I02421bb6a1b5256bf23c2b5fe81f11a78d02cd57
Sascha Haeberling [Fri, 18 Apr 2014 23:25:58 +0000 (23:25 +0000)]
am
e8766be4: Don\'t crash when less than two cameras are present.
* commit '
e8766be48ed4c0bd17d68a45152a34fa2c860b94':
Don't crash when less than two cameras are present.
Sascha Haeberling [Fri, 18 Apr 2014 01:47:51 +0000 (18:47 -0700)]
Don't crash when less than two cameras are present.
Bug:
14108948
Change-Id: Ib288f9fd2bd86f870df22c1fde03184f00cea219
Spike Sprague [Thu, 17 Apr 2014 18:45:19 +0000 (18:45 +0000)]
Merge "trigger remaining storage calculation during init move ic_video_disabled.png icons to res_p" into ub-camera-everglades
Spike Sprague [Thu, 17 Apr 2014 18:44:56 +0000 (18:44 +0000)]
Merge "make manual exposure compensation settings work acrss different devices bug:
13967706" into ub-camera-everglades
Sascha Haeberling [Thu, 17 Apr 2014 18:42:37 +0000 (18:42 +0000)]
Merge "Don't block the main thread on remote shutter code" into ub-camera-everglades
Spike Sprague [Sat, 12 Apr 2014 00:51:24 +0000 (17:51 -0700)]
make manual exposure compensation settings work acrss different devices
bug:
13967706
Change-Id: I2ebe579c8b7df1218546dd888b5bbfb5486e9e55
Sascha Haeberling [Thu, 17 Apr 2014 17:51:53 +0000 (10:51 -0700)]
Don't block the main thread on remote shutter code
Bug:
14135621
The current RemoreShutterBridge is doing a bunch of heavy listing,
so it shouldn't happen on the main thread.
Change-Id: Ic1a81e7dfd0a2fd5a7424058a6a27c712ed3ca51
Baligh Uddin [Thu, 17 Apr 2014 16:22:27 +0000 (16:22 +0000)]
am
d6421724: (-s ours) Import translations. DO NOT MERGE
* commit '
d64217247310efb38fc75133c896f2bd3cfe5ffb':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 17 Apr 2014 00:42:44 +0000 (17:42 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ibef54163959c4247f3f6a6db39956b17f3420392
Auto-generated-cl: translation import
Baligh Uddin [Thu, 17 Apr 2014 00:41:23 +0000 (17:41 -0700)]
Import translations. DO NOT MERGE
Change-Id: Iea2b9e573ea8ac74536e955f88b64178095e8205
Auto-generated-cl: translation import
Spike Sprague [Mon, 14 Apr 2014 23:16:27 +0000 (16:16 -0700)]
trigger remaining storage calculation during init
move ic_video_disabled.png icons to res_p
bug:
14062023
Change-Id: I93b506ce2c9f669067dc94259e63f44bc9378fea
Sascha Häberling [Wed, 16 Apr 2014 19:30:37 +0000 (19:30 +0000)]
am
ace5f7f8: Merge "Fix edge case in supported video quality selection." into gb-ub-photos-denali
* commit '
ace5f7f81899341d16bfea70c9bd4ec4b6ca2e56':
Fix edge case in supported video quality selection.
Sascha Häberling [Wed, 16 Apr 2014 18:51:59 +0000 (18:51 +0000)]
Merge "Fix edge case in supported video quality selection." into gb-ub-photos-denali
Seth Raphael [Wed, 16 Apr 2014 18:49:28 +0000 (18:49 +0000)]
am
1d891fe5: Do not crash when attempting to refocus a deleted image.
* commit '
1d891fe52f83d7be1d3a7f0b06b6fed327815c0a':
Do not crash when attempting to refocus a deleted image.
Paul Chang [Mon, 24 Mar 2014 16:05:45 +0000 (12:05 -0400)]
Fix edge case in supported video quality selection.
Bug:
14108743
If less than three distinct video quality levels are supported, it's possible
for getNextSupportedVideoQualityIndex() to return an out-of-range array index.
Instead, just return the previous supported video quality -- this appears to
be the intended behavior.
Change-Id: I089571edf6ff748ce4914f188b4ef844ecb638c2
Seth Raphael [Wed, 16 Apr 2014 18:24:07 +0000 (11:24 -0700)]
Do not crash when attempting to refocus a deleted
image.
Bug:
13546660
Change-Id: Ic260811ad2f45a44577609af0dc69a5c55c7fcfd
Seth Raphael [Wed, 16 Apr 2014 16:10:48 +0000 (16:10 +0000)]
am
92f19760: Don\'t update metadata on local data insert.
* commit '
92f197607eb6303e11f88dc65e7e23614e384615':
Don't update metadata on local data insert.
Seth Raphael [Tue, 8 Apr 2014 19:02:18 +0000 (12:02 -0700)]
Don't update metadata on local data insert.
It is possible for insert data to be called in
a loop with many items, and this will cause un-
needed lookups of meta data.
The metadata lookup is already handled but the
filmstrip lazily, so it is not necessary here.
Bug:
13875458
Change-Id: I476eb1d44fa3d089f47b8b16f9be6d3255b4759e
Doris Liu [Tue, 15 Apr 2014 19:04:09 +0000 (19:04 +0000)]
am
5dd85a13: Avoid using stale parameters to get focus mode in video
* commit '
5dd85a1399f795284c7f0e632d102b61bb82887a':
Avoid using stale parameters to get focus mode in video
Doris Liu [Tue, 15 Apr 2014 18:45:55 +0000 (11:45 -0700)]
Avoid using stale parameters to get focus mode in video
Bug:
13990664
Change-Id: If6a5b1cc9ce7d1ac67f0558a61036f228601b92b
Baligh Uddin [Mon, 14 Apr 2014 23:20:53 +0000 (23:20 +0000)]
am
fabcb7c7: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-denali
* commit '
fabcb7c74fd7f6c1494902b9504f223c5a16bb26':
Import translations. DO NOT MERGE
Baligh Uddin [Mon, 14 Apr 2014 23:17:28 +0000 (23:17 +0000)]
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-denali
Baligh Uddin [Mon, 14 Apr 2014 23:15:55 +0000 (23:15 +0000)]
Merge "Import translations. DO NOT MERGE" into ub-camera-everglades
Andy Huibers [Mon, 14 Apr 2014 22:54:26 +0000 (22:54 +0000)]
am
2d6a8abe: Merge "Set video-size key for Samsung Brand devices." into gb-ub-photos-denali
* commit '
2d6a8abe5dd22492dc098a63a33d7d9ea5888999':
Set video-size key for Samsung Brand devices.
Andy Huibers [Mon, 14 Apr 2014 22:52:06 +0000 (22:52 +0000)]
Merge "Set video-size key for Samsung Brand devices." into gb-ub-photos-denali
Sascha Haeberling [Mon, 14 Apr 2014 22:08:42 +0000 (22:08 +0000)]
am
0fed7e62: Safeguard callback receiver to prevent crashes.
* commit '
0fed7e62bfa0d8351b91d3531228a113637963a3':
Safeguard callback receiver to prevent crashes.
Andy Huibers [Mon, 14 Apr 2014 20:53:12 +0000 (13:53 -0700)]
Set video-size key for Samsung Brand devices.
Bug:
14060121
Change-Id: I5b8e5b0259a4105b8839112b13e58f2222848c7e
Sascha Haeberling [Mon, 14 Apr 2014 21:41:57 +0000 (14:41 -0700)]
Safeguard callback receiver to prevent crashes.
Bug:
13765929
It is safe to add these checks here. The receiver is only set in
the constructor, and it's only created in one place, which is
onCreate. And the parameter is the Activity itself, so it can
never be null.
This means the NPE can only happen if onCameraOpened is called after
removeCallbackReceiver is called, which is in onDestroy of the activity.
In this case it's safe to exit.
Change-Id: Ibffd6d54679b564a11b3e83319896241f2e306ad
Baligh Uddin [Mon, 14 Apr 2014 20:05:35 +0000 (13:05 -0700)]
Import translations. DO NOT MERGE
Change-Id: I69d93a38d3052400b10ac110bf2e891a1c96181d
Auto-generated-cl: translation import
Baligh Uddin [Mon, 14 Apr 2014 20:04:10 +0000 (13:04 -0700)]
Import translations. DO NOT MERGE
Change-Id: I569ed760c80fac566aed673dae4e91aae677e50f
Auto-generated-cl: translation import
Andy Huibers [Sat, 12 Apr 2014 03:47:04 +0000 (03:47 +0000)]
am
e08bc042: Check zoom enabled check and null check on zoom ratio list.
* commit '
e08bc0428d3d5695d029f0b412d98db6ff8ac956':
Check zoom enabled check and null check on zoom ratio list.
Andy Huibers [Sat, 12 Apr 2014 02:26:47 +0000 (19:26 -0700)]
Check zoom enabled check and null check on zoom ratio list.
Bug:
13987837
Change-Id: I45d3edc42a240c866f151c5e23431cd50eec7bc6
Sascha Häberling [Sat, 12 Apr 2014 03:02:30 +0000 (03:02 +0000)]
am
c6ef756c: Merge "Revert "ZoomRatios might not exist, not crash for logging."" into gb-ub-photos-denali
* commit '
c6ef756c0eb736c3e43cff13d593f5ad71d2cb7b':
Revert "ZoomRatios might not exist, not crash for logging."
Sascha Häberling [Sat, 12 Apr 2014 02:59:56 +0000 (02:59 +0000)]
Merge "Revert "ZoomRatios might not exist, not crash for logging."" into gb-ub-photos-denali
Sascha Häberling [Sat, 12 Apr 2014 02:58:12 +0000 (02:58 +0000)]
Revert "ZoomRatios might not exist, not crash for logging."
This reverts commit
de26138f7821e33cac293e9c78c23b5c4612dcd2.
Change-Id: Ia788ef858cf2bc8891a5bbbf1a538b49d583247d
Sascha Haeberling [Sat, 12 Apr 2014 01:20:58 +0000 (01:20 +0000)]
Merge "Remove an ICS workaround calling stopPreview." into ub-camera-everglades
Sascha Haeberling [Sat, 12 Apr 2014 01:15:56 +0000 (01:15 +0000)]
am
08acce5b: (-s ours) Merge "DO NOT MERGE Don\'t call stopPreview after taking a picture on the m8" into gb-ub-photos-denali
* commit '
08acce5b16beef4be30c5d0567d3452aa7e99c26':
DO NOT MERGE Don't call stopPreview after taking a picture on the m8
Sascha Haeberling [Sat, 12 Apr 2014 01:14:47 +0000 (18:14 -0700)]
Remove an ICS workaround calling stopPreview.
Bug:
13966525
Change-Id: I3592906a6220b6af228fa42ef77e5b0d6e19e7b8
Sascha Haeberling [Sat, 12 Apr 2014 01:13:52 +0000 (01:13 +0000)]
Merge "DO NOT MERGE Don't call stopPreview after taking a picture on the m8" into gb-ub-photos-denali
Sascha Haeberling [Sat, 12 Apr 2014 00:58:42 +0000 (17:58 -0700)]
DO NOT MERGE Don't call stopPreview after taking a picture on the m8
Bug:
13966525
The proper solution is to remove the stopPreview call completely,
but as we have only limited time for testing left, let's be
careful and target specific devices only.
Change-Id: I5aa90b7c72068bae5352a8396e39a2c82ac137b9
Sascha Haeberling [Sat, 12 Apr 2014 00:29:28 +0000 (00:29 +0000)]
am
9ac314fb: Merge "ZoomRatios might not exist, not crash for logging." into gb-ub-photos-denali
* commit '
9ac314fb42435a090f33e9db051ab0f203484722':
ZoomRatios might not exist, not crash for logging.
Sascha Haeberling [Sat, 12 Apr 2014 00:27:25 +0000 (00:27 +0000)]
Merge "ZoomRatios might not exist, not crash for logging." into gb-ub-photos-denali
Sascha Haeberling [Fri, 11 Apr 2014 23:59:38 +0000 (16:59 -0700)]
ZoomRatios might not exist, not crash for logging.
Bug:
13987837
Change-Id: I77b8863b60cf5311ffd326015e612dfaeb45daa2
Erin Dahlgren [Fri, 11 Apr 2014 22:18:56 +0000 (22:18 +0000)]
am
3c62221a: Update mode options with hardware spec whenever hdr setting changes.
* commit '
3c62221afd869828ba867fce15755a582f2c2334':
Update mode options with hardware spec whenever hdr setting changes.
Erin Dahlgren [Fri, 11 Apr 2014 21:44:04 +0000 (14:44 -0700)]
Update mode options with hardware spec whenever hdr setting changes.
Bug:
13965048
Change-Id: I7e718bb56cb5dc92c7583bef780d442c04644a56
Sascha Haeberling [Thu, 10 Apr 2014 22:30:55 +0000 (22:30 +0000)]
am
5209f79b: Shorten the preference string to fit
* commit '
5209f79bdaeefeb6e8f168917faa73c82d8d0290':
Shorten the preference string to fit
Sascha Haeberling [Thu, 10 Apr 2014 22:23:44 +0000 (15:23 -0700)]
Shorten the preference string to fit
Bug:
13962104
Change-Id: Ie0ba57ad1644241748c8d0406c08be1c981b8f63