OSDN Git Service
Sascha Haeberling [Fri, 15 Aug 2014 20:36:34 +0000 (20:36 +0000)]
am
ee5ebcf3: am
fa7b92c1: Merge "Add ability to add a ready-state changed listener to the camera." into ub-camera-glacier
* commit '
ee5ebcf3ceb89022195f5708527d56f1199963ae':
Add ability to add a ready-state changed listener to the camera.
Sascha Haeberling [Fri, 15 Aug 2014 20:26:25 +0000 (20:26 +0000)]
am
fa7b92c1: Merge "Add ability to add a ready-state changed listener to the camera." into ub-camera-glacier
* commit '
fa7b92c1ee99bc6734c06bb50445cffae94e8197':
Add ability to add a ready-state changed listener to the camera.
Sascha Haeberling [Fri, 15 Aug 2014 20:20:53 +0000 (20:20 +0000)]
Merge "Add ability to add a ready-state changed listener to the camera." into ub-camera-glacier
Sascha Haeberling [Fri, 15 Aug 2014 17:52:37 +0000 (10:52 -0700)]
Add ability to add a ready-state changed listener to the camera.
Bug:
16945820
Bug:
16948752
This enables us to hook up memory intense cameras and make sure we don't
activate the shutter button if the camera is not ready.
Change-Id: I70a31c76e063d775c844404ee9e20e583fa233e3
Andy Huibers [Fri, 15 Aug 2014 17:46:23 +0000 (17:46 +0000)]
am
94f5b240: am
064f851a: Hold touch to focus target in 3A UI debug mode.
* commit '
94f5b240d7a39e0f9da126fc57559d20a6cb6ba2':
Hold touch to focus target in 3A UI debug mode.
Andy Huibers [Fri, 15 Aug 2014 17:41:11 +0000 (17:41 +0000)]
am
064f851a: Hold touch to focus target in 3A UI debug mode.
* commit '
064f851a063c80be4e6cc3f1716ff19b605e4865':
Hold touch to focus target in 3A UI debug mode.
Andy Huibers [Fri, 15 Aug 2014 17:21:56 +0000 (10:21 -0700)]
Hold touch to focus target in 3A UI debug mode.
Bug:
17028594
Change-Id: I6d60f2a891cc8ab33c2165438295950bf46095b3
Andy Huibers [Fri, 15 Aug 2014 17:03:24 +0000 (17:03 +0000)]
am
2863604b: am
011c5cde: Merge "Consolidate properties for debugging." into ub-camera-glacier
* commit '
2863604bc1c892294bda81609d46e06e02e6bc5d':
Consolidate properties for debugging.
Andy Huibers [Fri, 15 Aug 2014 16:59:43 +0000 (16:59 +0000)]
am
011c5cde: Merge "Consolidate properties for debugging." into ub-camera-glacier
* commit '
011c5cde82df9fee23f21891ae1c3da63ebe27ae':
Consolidate properties for debugging.
Alan Newberger [Fri, 15 Aug 2014 16:43:27 +0000 (16:43 +0000)]
am
134e07ee: am
c8c6efa0: Merge "Move preference subscreens to new Activities from Dialogs" into ub-camera-glacier
* commit '
134e07ee01584a234073c379e3e6b8bb399a7c1e':
Move preference subscreens to new Activities from Dialogs
Alan Newberger [Fri, 15 Aug 2014 16:37:26 +0000 (16:37 +0000)]
am
c8c6efa0: Merge "Move preference subscreens to new Activities from Dialogs" into ub-camera-glacier
* commit '
c8c6efa020f830b54df4f06eba883ae8386d96b4':
Move preference subscreens to new Activities from Dialogs
Andy Huibers [Fri, 15 Aug 2014 16:55:11 +0000 (16:55 +0000)]
Merge "Consolidate properties for debugging." into ub-camera-glacier
Andy Huibers [Fri, 15 Aug 2014 05:24:41 +0000 (22:24 -0700)]
Consolidate properties for debugging.
Change-Id: I052492375bf176622b38382579b2189d22a05349
Baligh Uddin [Fri, 15 Aug 2014 05:56:14 +0000 (05:56 +0000)]
am
ca901d9a: (-s ours) am
31afb359: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-camera-glacier
* commit '
ca901d9a686e42fe07f6c69bd238be1c6588feea':
Import translations. DO NOT MERGE
Baligh Uddin [Fri, 15 Aug 2014 05:52:14 +0000 (05:52 +0000)]
am
417e6d55: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
* commit '
417e6d55072f48ae45ac39d586055204eb759177':
Import translations. DO NOT MERGE
Baligh Uddin [Fri, 15 Aug 2014 05:50:50 +0000 (05:50 +0000)]
am
31afb359: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-camera-glacier
* commit '
31afb359a2fb26a7491add2c4c76eeea89c93486':
Import translations. DO NOT MERGE
Alan Newberger [Fri, 15 Aug 2014 16:32:43 +0000 (16:32 +0000)]
Merge "Move preference subscreens to new Activities from Dialogs" into ub-camera-glacier
Alan Newberger [Thu, 14 Aug 2014 22:48:59 +0000 (15:48 -0700)]
Move preference subscreens to new Activities from Dialogs
Dialogs are hard to override for action bar settings. The documented
way to do navigation up is to receive menu events. So we no longer
use Dialogs, instead here we set up intents back to the same Activity,
and add an extra system to designate which subscreen to load. This uses
activity stack to do subscreen navigation, and then all screens hit the
same menu handler in the Activity which properly receives up navigation
signals via 'home'. This is not awesome but a better hack than the
Dialog one which depends on Action Bar internals; this approach only
uses public APIs.
Bug:
15756177
Change-Id: Iae2bd254e9cd5dde1d32d0997e5610f359662467
Baligh Uddin [Fri, 15 Aug 2014 05:47:42 +0000 (05:47 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-dev
Baligh Uddin [Fri, 15 Aug 2014 05:47:35 +0000 (05:47 +0000)]
Merge "Import translations. DO NOT MERGE" into ub-camera-glacier
Sascha Haeberling [Fri, 15 Aug 2014 03:20:19 +0000 (03:20 +0000)]
am
ad95f6ca: am
51163540: Move code from GoogleCamera that dumps capture request metadata.
* commit '
ad95f6ca81a9c41299d41115cb668c40d4a71a82':
Move code from GoogleCamera that dumps capture request metadata.
Sascha Haeberling [Fri, 15 Aug 2014 03:15:11 +0000 (03:15 +0000)]
am
51163540: Move code from GoogleCamera that dumps capture request metadata.
* commit '
51163540604bcb1deabfde4d83c54a86114cefd0':
Move code from GoogleCamera that dumps capture request metadata.
Sascha Haeberling [Fri, 15 Aug 2014 02:27:34 +0000 (19:27 -0700)]
Move code from GoogleCamera that dumps capture request metadata.
Bug:
16945820
Change-Id: Iff3f05b65687073a7272ed31644f34dc6187de21
Spike Sprague [Thu, 14 Aug 2014 00:05:36 +0000 (00:05 +0000)]
am
843f226d: am
39384da0: add a range check in MultiToggleImageButton\'s bitmap combine function.
* commit '
843f226d937f35bbfcd30ccc195631c0e4cd393a':
add a range check in MultiToggleImageButton's bitmap combine function.
Spike Sprague [Thu, 14 Aug 2014 00:02:45 +0000 (00:02 +0000)]
am
39384da0: add a range check in MultiToggleImageButton\'s bitmap combine function.
* commit '
39384da05ba9ced9086dba64932878ce447c6230':
add a range check in MultiToggleImageButton's bitmap combine function.
Spike Sprague [Wed, 13 Aug 2014 23:57:20 +0000 (16:57 -0700)]
add a range check in MultiToggleImageButton's bitmap combine function.
bug: overrideImageIds
Change-Id: I6e6b60ff8bb269fb25f7b788009103d9b9d02f19
Alan Newberger [Wed, 13 Aug 2014 23:39:55 +0000 (23:39 +0000)]
am
b5409cef: am
7951206e: Merge "Revert our layout from FULLSCREEN to LAYOUT_FULLSCREEN" into ub-camera-glacier
* commit '
b5409cef0e9d072a4f9776f96e0a59ccf67fe734':
Revert our layout from FULLSCREEN to LAYOUT_FULLSCREEN
Spike Sprague [Wed, 13 Aug 2014 23:36:22 +0000 (23:36 +0000)]
am
837adf5b: am
bbcf8774: Merge "Update option icon transitions" into ub-camera-glacier
* commit '
837adf5bf43d06385aad31e3b342fea801ed030e':
Update option icon transitions
Alan Newberger [Wed, 13 Aug 2014 23:34:31 +0000 (23:34 +0000)]
am
7951206e: Merge "Revert our layout from FULLSCREEN to LAYOUT_FULLSCREEN" into ub-camera-glacier
* commit '
7951206e0157586d3c5676987343dc3ca81fc40e':
Revert our layout from FULLSCREEN to LAYOUT_FULLSCREEN
Spike Sprague [Wed, 13 Aug 2014 23:31:15 +0000 (23:31 +0000)]
am
bbcf8774: Merge "Update option icon transitions" into ub-camera-glacier
* commit '
bbcf8774821a0e09a4cf6ab2472f89c83981326b':
Update option icon transitions
Spike Sprague [Wed, 13 Aug 2014 23:09:19 +0000 (23:09 +0000)]
am
1784b09d: am
955ae1f8: another tweak of the mode switch expanding circle, no more pre-white circle expansion.
* commit '
1784b09d9822ba9e79c90067265794c64c9ac78c':
another tweak of the mode switch expanding circle, no more pre-white circle expansion.
Spike Sprague [Wed, 13 Aug 2014 23:06:35 +0000 (23:06 +0000)]
am
955ae1f8: another tweak of the mode switch expanding circle, no more pre-white circle expansion.
* commit '
955ae1f8afc9c4fb0905e0baece959efac9326f6':
another tweak of the mode switch expanding circle, no more pre-white circle expansion.
Spike Sprague [Wed, 13 Aug 2014 22:55:28 +0000 (15:55 -0700)]
another tweak of the mode switch expanding circle, no more pre-white circle expansion.
bug:
16129873
Change-Id: I1f55dbd40be1801bf7bbf1f3646a8deeec5c353f
Spike Sprague [Wed, 13 Aug 2014 21:22:41 +0000 (21:22 +0000)]
am
b3656238: am
eb944322: Merge "update mode switch transition anims" into ub-camera-glacier
* commit '
b365623865dcb69f505130dbfe42a622553c4457':
update mode switch transition anims
Spike Sprague [Wed, 13 Aug 2014 21:16:42 +0000 (21:16 +0000)]
am
eb944322: Merge "update mode switch transition anims" into ub-camera-glacier
* commit '
eb9443226ee117779e2396c2f7cee9789af80cf8':
update mode switch transition anims
Sascha Haeberling [Wed, 13 Aug 2014 19:51:57 +0000 (19:51 +0000)]
am
7680cff1: am
62c367f2: Merge "Fix potential multi-threading bug where size can change before deletion." into ub-camera-glacier
* commit '
7680cff136c4cf9c1fd2b19b70f5396281023493':
Fix potential multi-threading bug where size can change before deletion.
Sascha Haeberling [Wed, 13 Aug 2014 19:46:54 +0000 (19:46 +0000)]
am
62c367f2: Merge "Fix potential multi-threading bug where size can change before deletion." into ub-camera-glacier
* commit '
62c367f2199d826646cd2c665ed358b339c4b313':
Fix potential multi-threading bug where size can change before deletion.
Sascha Haeberling [Wed, 13 Aug 2014 19:40:25 +0000 (19:40 +0000)]
am
01507b17: am
4c96752b: Merge "Don\'t try to share null data" into ub-camera-glacier
* commit '
01507b1737d6ec69e671caae1c888a0af8744100':
Don't try to share null data
Sascha Haeberling [Wed, 13 Aug 2014 19:36:44 +0000 (19:36 +0000)]
am
4c96752b: Merge "Don\'t try to share null data" into ub-camera-glacier
* commit '
4c96752bbcda3fa356ea2a028ec6a7c2fbfa06a6':
Don't try to share null data
Alan Newberger [Wed, 13 Aug 2014 17:20:48 +0000 (17:20 +0000)]
am
e497c275: am
a804e2d2: Merge "New Material icons for Camera2" into ub-camera-glacier
* commit '
e497c2754bd36e181babf96b4125bd536a5272e5':
New Material icons for Camera2
Alan Newberger [Wed, 13 Aug 2014 17:14:30 +0000 (17:14 +0000)]
am
a804e2d2: Merge "New Material icons for Camera2" into ub-camera-glacier
* commit '
a804e2d29800fd66f6db552c9cb55117888be44b':
New Material icons for Camera2
Alan Newberger [Wed, 13 Aug 2014 23:31:04 +0000 (23:31 +0000)]
Merge "Revert our layout from FULLSCREEN to LAYOUT_FULLSCREEN" into ub-camera-glacier
Alan Newberger [Wed, 13 Aug 2014 23:28:26 +0000 (16:28 -0700)]
Revert our layout from FULLSCREEN to LAYOUT_FULLSCREEN
We changed this while working on L prep, but FULLSCREEN suppresses the
action bar. Changing back to LAYOUT_FULLSCREEN addresses this.
Bug:
16986789
Change-Id: I561fe765ea5eb72b1d666a124c9810cf349ce56a
Spike Sprague [Wed, 13 Aug 2014 21:14:50 +0000 (21:14 +0000)]
Merge "update mode switch transition anims" into ub-camera-glacier
Sascha Haeberling [Wed, 13 Aug 2014 19:42:57 +0000 (19:42 +0000)]
Merge "Fix potential multi-threading bug where size can change before deletion." into ub-camera-glacier
Sascha Haeberling [Wed, 13 Aug 2014 19:02:33 +0000 (12:02 -0700)]
Fix potential multi-threading bug where size can change before deletion.
Bug:
16949503
Change-Id: I9b087cc257edfb2fe5368abaa7a73f910a6db3df
Sascha Haeberling [Wed, 13 Aug 2014 16:45:45 +0000 (16:45 +0000)]
am
280ba48b: am
59c784bf: [OC] Gcam OneCamera implementation.
* commit '
280ba48b64d92d8b8e9308d50287148732cc35d0':
[OC] Gcam OneCamera implementation.
Sascha Haeberling [Wed, 13 Aug 2014 16:40:49 +0000 (16:40 +0000)]
am
59c784bf: [OC] Gcam OneCamera implementation.
* commit '
59c784bf588b9e0994e9769001f624200e9b1027':
[OC] Gcam OneCamera implementation.
Sascha Haeberling [Tue, 5 Aug 2014 17:53:08 +0000 (10:53 -0700)]
[OC] Gcam OneCamera implementation.
Bug:
16948752
Change-Id: I0160de117c4ff7024e0d546f594b5777847d1833
Senpo Hu [Wed, 13 Aug 2014 00:23:24 +0000 (00:23 +0000)]
am
c490dd5c: am
11186318: Enable 4K video for Shamu.
* commit '
c490dd5c7b6caae2af1ef7a2006f9d3ea412e288':
Enable 4K video for Shamu.
Senpo Hu [Wed, 13 Aug 2014 00:18:49 +0000 (00:18 +0000)]
am
11186318: Enable 4K video for Shamu.
* commit '
111863182bcc4b99bdaa727304d5800fc91dfd51':
Enable 4K video for Shamu.
Senpo Hu [Fri, 8 Aug 2014 20:42:13 +0000 (13:42 -0700)]
Enable 4K video for Shamu.
- Add a new resolution setting for back camera video: "UHD 4K"
Bug:
16206549
Change-Id: I0b72f8100bc26b556099ad08e093273ccda0f25d
Spike Sprague [Wed, 13 Aug 2014 23:28:19 +0000 (23:28 +0000)]
Merge "Update option icon transitions" into ub-camera-glacier
Spike Sprague [Sat, 9 Aug 2014 01:13:56 +0000 (18:13 -0700)]
Update option icon transitions
bug:
16458864
Change-Id: Idaf4b60d357fa08635b55c1356450d3a4b2b48c2
Sascha Haeberling [Wed, 13 Aug 2014 19:32:55 +0000 (19:32 +0000)]
Merge "Don't try to share null data" into ub-camera-glacier
Sascha Haeberling [Wed, 13 Aug 2014 18:43:57 +0000 (11:43 -0700)]
Don't try to share null data
Bug:
16875556
Also add warning logs for null check cases.
Change-Id: Ic1e7e81b416d24a748b9572d63c145612b38d822
Alan Newberger [Wed, 13 Aug 2014 17:09:24 +0000 (17:09 +0000)]
Merge "New Material icons for Camera2" into ub-camera-glacier
Alan Newberger [Wed, 13 Aug 2014 17:04:39 +0000 (10:04 -0700)]
New Material icons for Camera2
This CL adds new Material icons for Camera2.
Bug:
16985499
Change-Id: I91972418f7ee9592fc7685e2c4dfd9bb73c3bcc9
Spike Sprague [Fri, 25 Jul 2014 18:40:53 +0000 (11:40 -0700)]
update mode switch transition anims
bug:
16129873
Change-Id: Ibcb2e31162dc353de250db2a7d24726b05768ab1
Alan Newberger [Tue, 12 Aug 2014 17:27:05 +0000 (17:27 +0000)]
am
2881f369: am
2307b60a: Refactor Upgrade/UpgradeAosp into SettingsUpgrader
* commit '
2881f36989b41c1f8a11dc44917ac6580c3379ba':
Refactor Upgrade/UpgradeAosp into SettingsUpgrader
Alan Newberger [Tue, 12 Aug 2014 17:20:48 +0000 (17:20 +0000)]
am
2307b60a: Refactor Upgrade/UpgradeAosp into SettingsUpgrader
* commit '
2307b60abdf0af8639d71ba53cf10fdaf8dfe7e7':
Refactor Upgrade/UpgradeAosp into SettingsUpgrader
Alan Newberger [Tue, 5 Aug 2014 16:56:17 +0000 (09:56 -0700)]
Refactor Upgrade/UpgradeAosp into SettingsUpgrader
This CL does three things:
- removes the Upgrade/UpgradeAosp classes which were bunches of statics,
in favor of a SettingsUpgrader abstract class that can be overridden
- moves 'upgrade to strings' hack logic into AppUpgrader so it only is
checked and run once, not for any of the former UpgradeSteps. logic used
to be in Upgrade and run regardless of key, when it was using detection
only meant for KEY.KEY_UPGRADE_VERSION
- adds existence checks for all hack in-place key string upgrades so they
are no-ops if the key was not persisted in the first place.
Bug:
16573087
Change-Id: Ife42f7aa4a7611ba2d143410a3450057b7464901
Baligh Uddin [Tue, 12 Aug 2014 04:55:12 +0000 (21:55 -0700)]
Import translations. DO NOT MERGE
Change-Id: I969568c49246ac278c8c68e025f1ce279a5323a5
Auto-generated-cl: translation import
Baligh Uddin [Tue, 12 Aug 2014 04:53:00 +0000 (21:53 -0700)]
Import translations. DO NOT MERGE
Change-Id: I4ed26c9802040fbd81197d0562975848ccecb0c5
Auto-generated-cl: translation import
Puneet Lall [Mon, 11 Aug 2014 21:58:15 +0000 (21:58 +0000)]
am
22b28172: am
967b7828: Implemented NDK libjpeg wrapper for YUV420 encoding.
* commit '
22b281725d5cbc75165fb1a8cbda7153d92279cc':
Implemented NDK libjpeg wrapper for YUV420 encoding.
Puneet Lall [Mon, 11 Aug 2014 21:54:00 +0000 (21:54 +0000)]
am
967b7828: Implemented NDK libjpeg wrapper for YUV420 encoding.
* commit '
967b782837a22974f565f5bbc71bef7bc05fc878':
Implemented NDK libjpeg wrapper for YUV420 encoding.
Puneet Lall [Fri, 8 Aug 2014 00:05:38 +0000 (17:05 -0700)]
Implemented NDK libjpeg wrapper for YUV420 encoding.
Bug:
16676082
Change-Id: I588b8023b401d5e713762563c9265ec3d774a678
Andy Huibers [Fri, 8 Aug 2014 22:11:14 +0000 (22:11 +0000)]
am
fd782106: am
30ffce08: [OC] Add autofocus (tap-to-focus, UI and pre-shot focus) to OneCamera.
* commit '
fd7821064bdbd3bda515d03f19b7ca6a1d42947d':
[OC] Add autofocus (tap-to-focus, UI and pre-shot focus) to OneCamera.
Andy Huibers [Fri, 8 Aug 2014 22:07:14 +0000 (22:07 +0000)]
am
30ffce08: [OC] Add autofocus (tap-to-focus, UI and pre-shot focus) to OneCamera.
* commit '
30ffce08f511fbed4cf18daa743778b541583351':
[OC] Add autofocus (tap-to-focus, UI and pre-shot focus) to OneCamera.
Andy Huibers [Thu, 31 Jul 2014 23:31:43 +0000 (16:31 -0700)]
[OC] Add autofocus (tap-to-focus, UI and pre-shot focus) to OneCamera.
Change-Id: Ic88359ad27b8e9ee0e74c8d1bd6ecb71fe3c24f0
Alan Newberger [Fri, 8 Aug 2014 02:10:22 +0000 (02:10 +0000)]
am
82acfc9b: am
e9a226f6: Merge "Route zoom value through to zoomIndex in device API" into ub-camera-glacier
* commit '
82acfc9b0db65d14c5f9028ad38445eee34ea0de':
Route zoom value through to zoomIndex in device API
Alan Newberger [Fri, 8 Aug 2014 02:03:56 +0000 (02:03 +0000)]
am
e9a226f6: Merge "Route zoom value through to zoomIndex in device API" into ub-camera-glacier
* commit '
e9a226f6c9cf7e59a57bab7e99926647fd0fc23f':
Route zoom value through to zoomIndex in device API
Sol Boucher [Fri, 8 Aug 2014 00:26:42 +0000 (00:26 +0000)]
am
3d7e6066: am
7f112487: Merge "Move display orientation calculations out of app code" into ub-camera-glacier
* commit '
3d7e6066de7683a272bbe2cdf893aa655e7de99c':
Move display orientation calculations out of app code
Sol Boucher [Fri, 8 Aug 2014 00:23:37 +0000 (00:23 +0000)]
am
7f112487: Merge "Move display orientation calculations out of app code" into ub-camera-glacier
* commit '
7f112487e7c19983fe36164494486a0a289a4831':
Move display orientation calculations out of app code
Spike Sprague [Thu, 7 Aug 2014 22:44:44 +0000 (22:44 +0000)]
am
30f0029b: am
0be64680: rollback of b/
16632474 and ag/518674
* commit '
30f0029bd5d4c3fbefbbe0b0dce357000b0cf297':
rollback of b/
16632474 and ag/518674
Spike Sprague [Thu, 7 Aug 2014 22:37:36 +0000 (22:37 +0000)]
am
0be64680: rollback of b/
16632474 and ag/518674
* commit '
0be64680fb9b5a982b1b92730236ebb85e76624a':
rollback of b/
16632474 and ag/518674
Spike Sprague [Thu, 7 Aug 2014 21:56:27 +0000 (14:56 -0700)]
rollback of b/
16632474 and ag/518674
Change-Id: I77af6135ff339240bd52881550a0f42ec996f9c4
Sol Boucher [Fri, 8 Aug 2014 00:20:57 +0000 (00:20 +0000)]
Merge "Move display orientation calculations out of app code" into ub-camera-glacier
Alan Newberger [Fri, 8 Aug 2014 01:58:08 +0000 (01:58 +0000)]
Merge "Route zoom value through to zoomIndex in device API" into ub-camera-glacier
Alan Newberger [Fri, 8 Aug 2014 01:02:07 +0000 (18:02 -0700)]
Route zoom value through to zoomIndex in device API
Current UI is wired to track zoom index, so pass that in rather
than the unfinished new zoom ratio API. This finishes the fix for
zoom in the app.
Extended TODO already there. App should continue to operate until
one big refactor moves it form working with zoom indices, to working
with zoom ratios, no breakage in between.
Bug:
16527845
Change-Id: I8d88c3d34ba9ad85b1a115cf1249548a16722a38
Alan Newberger [Wed, 6 Aug 2014 22:05:17 +0000 (22:05 +0000)]
am
0ec6e56d: am
60c02b43: Merge "fix NPE in action switch" into ub-camera-glacier
* commit '
0ec6e56da56a04aa63328e45f2c155db6e594555':
fix NPE in action switch
Alan Newberger [Wed, 6 Aug 2014 21:59:54 +0000 (21:59 +0000)]
am
60c02b43: Merge "fix NPE in action switch" into ub-camera-glacier
* commit '
60c02b437771c8fe959b233bcdcb28e4314c7489':
fix NPE in action switch
Spike Sprague [Wed, 6 Aug 2014 20:44:02 +0000 (20:44 +0000)]
am
48882a81: am
c7ab9c4a: update system ui flags for full screen on android L
* commit '
48882a812bea675dc48bfdaa4492c5ad0a45c212':
update system ui flags for full screen on android L
Spike Sprague [Wed, 6 Aug 2014 20:33:50 +0000 (20:33 +0000)]
am
c7ab9c4a: update system ui flags for full screen on android L
* commit '
c7ab9c4ab2912f2c2777f907ca4c6f845ce98cef':
update system ui flags for full screen on android L
Spike Sprague [Wed, 6 Aug 2014 19:13:00 +0000 (12:13 -0700)]
update system ui flags for full screen on android L
bug:
16632474
Change-Id: I5b555492587df103b41ad13a6893a334b8c71b68
Sascha Haeberling [Tue, 5 Aug 2014 23:18:04 +0000 (23:18 +0000)]
am
da841435: am
0024b57e: Merge "[OC] Enable flash support." into ub-camera-glacier
* commit '
da841435d5fbf1611c5e67e22e8a632f45d8c066':
[OC] Enable flash support.
Sascha Haeberling [Tue, 5 Aug 2014 23:14:06 +0000 (23:14 +0000)]
am
3fafd0cc: am
e3dfd5a4: [OC] Migrate away from android.util.Size sinc we cannot use it in K.
* commit '
3fafd0cc331ee2fa92c95a4c3a10431f76e3eabb':
[OC] Migrate away from android.util.Size sinc we cannot use it in K.
Sascha Haeberling [Tue, 5 Aug 2014 23:11:52 +0000 (23:11 +0000)]
am
0024b57e: Merge "[OC] Enable flash support." into ub-camera-glacier
* commit '
0024b57e54c674d86ff15011867a0f44029e0c48':
[OC] Enable flash support.
Sascha Haeberling [Tue, 5 Aug 2014 23:08:31 +0000 (23:08 +0000)]
am
e3dfd5a4: [OC] Migrate away from android.util.Size sinc we cannot use it in K.
* commit '
e3dfd5a433e39d76578b379fe1539864cf924cee':
[OC] Migrate away from android.util.Size sinc we cannot use it in K.
Sascha Haeberling [Tue, 5 Aug 2014 22:54:42 +0000 (15:54 -0700)]
[OC] Migrate away from android.util.Size sinc we cannot use it in K.
Bug:
16654225
Change-Id: I2c0ea6b387b8ad38d6e49c84dca8bf2bde34e249
Geoff Mendal [Tue, 5 Aug 2014 01:39:18 +0000 (01:39 +0000)]
am
69309ffd: (-s ours) am
1b9926df: (-s ours) Import translations. DO NOT MERGE
* commit '
69309ffd3c992d7e46d2602ef2efefced4d66326':
Import translations. DO NOT MERGE
Geoff Mendal [Tue, 5 Aug 2014 01:35:39 +0000 (01:35 +0000)]
am
d753c629: (-s ours) Import translations. DO NOT MERGE
* commit '
d753c629adcc8079ed9eea3efb4934135874b713':
Import translations. DO NOT MERGE
Geoff Mendal [Tue, 5 Aug 2014 01:34:24 +0000 (01:34 +0000)]
am
1b9926df: (-s ours) Import translations. DO NOT MERGE
* commit '
1b9926dfadedfe77badd2f7fb4eeeebfd3138652':
Import translations. DO NOT MERGE
Geoff Mendal [Tue, 5 Aug 2014 01:26:07 +0000 (18:26 -0700)]
Import translations. DO NOT MERGE
Change-Id: Iefb086b8135a5efef30d53c06147a6415f824fb8
Auto-generated-cl: translation import
Geoff Mendal [Tue, 5 Aug 2014 01:23:25 +0000 (18:23 -0700)]
Import translations. DO NOT MERGE
Change-Id: I311bccfefd549388b880de2138dcaf3d87d34431
Auto-generated-cl: translation import
Alan Newberger [Wed, 6 Aug 2014 21:56:23 +0000 (21:56 +0000)]
Merge "fix NPE in action switch" into ub-camera-glacier
Alan Newberger [Wed, 6 Aug 2014 21:05:31 +0000 (14:05 -0700)]
fix NPE in action switch
Recent conversion of action condition from if/else to switch
overlooked need for switch to be non-null. Fixing here.
Bug:
16847376
Change-Id: I919c585c414d0d3c4ef7fcdefccfda9118ef8104
Sascha Haeberling [Tue, 5 Aug 2014 23:09:19 +0000 (23:09 +0000)]
Merge "[OC] Enable flash support." into ub-camera-glacier
Sascha Haeberling [Thu, 31 Jul 2014 18:36:58 +0000 (11:36 -0700)]
[OC] Enable flash support.
Bug:
16654225
Also show an error and exit the app if camera could not be opened.
Change-Id: Iddccaff35b081ba98efe2aaae51d9ee10bb7726f
Sascha Haeberling [Sun, 3 Aug 2014 11:46:07 +0000 (11:46 +0000)]
am
a8e0177a: am
822b8e29: Merge "[OC] Introduce OneCameraCreator so we can dynamically create a different version." into ub-camera-glacier
* commit '
a8e0177abe80dd0fd2b9e44f455b78098bddf77d':
[OC] Introduce OneCameraCreator so we can dynamically create a different version.
OSDN Git Service
