OSDN Git Service
Spike Sprague [Thu, 14 Aug 2014 00:02:46 +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:34:29 +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:18 +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:06:40 +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:16:46 +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:46:52 +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: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:13:40 +0000 (17:13 +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:41:02 +0000 (16:41 +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:18:44 +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:20:45 +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
Puneet Lall [Mon, 11 Aug 2014 21:53:42 +0000 (21:53 +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: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:03:41 +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:23:11 +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:35:15 +0000 (22:35 +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 21:59:55 +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:33:01 +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:11:50 +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:40 +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:34:31 +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
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 04:49:27 +0000 (04:49 +0000)]
am
822b8e29: Merge "[OC] Introduce OneCameraCreator so we can dynamically create a different version." into ub-camera-glacier
* commit '
822b8e291d7141932837b1f3a9bf9bb670da9b6e':
[OC] Introduce OneCameraCreator so we can dynamically create a different version.
Sascha Haeberling [Sun, 3 Aug 2014 04:20:11 +0000 (04:20 +0000)]
am
ad87534c: Merge "Prevent monkey crash when deleting without data" into ub-camera-glacier
* commit '
ad87534c5a9e77e3d8fa09ed0b8692caf2a34937':
Prevent monkey crash when deleting without data
Alan Newberger [Fri, 1 Aug 2014 21:37:50 +0000 (21:37 +0000)]
am
517f32a7: Restore grid initialization logic to fix grid display on startup
* commit '
517f32a7cb9b154ddde61d91f1f562d2f1889984':
Restore grid initialization logic to fix grid display on startup
Alan Newberger [Fri, 1 Aug 2014 21:08:37 +0000 (14:08 -0700)]
Restore grid initialization logic to fix grid display on startup
The large settings refactor in ag/484817 not only changed settings
calls in ButtonManager.initializeGridLinesButton, it altered the
order of calls to create the button callback and to set the button
state. The prior implementation and this CL creates the callback,
and then sets state so that the callback, which controls display,
runs upon initial state setup of the button. Otherwise the grid
is not shown correctly on module startup.
Bug:
16687954
Change-Id: I482906d2d54a8545066dded3209b55ae4ad48bdb
Sascha Haeberling [Sun, 3 Aug 2014 04:44:00 +0000 (04:44 +0000)]
Merge "[OC] Introduce OneCameraCreator so we can dynamically create a different version." into ub-camera-glacier
Sascha Haeberling [Sun, 3 Aug 2014 04:15:26 +0000 (21:15 -0700)]
[OC] Introduce OneCameraCreator so we can dynamically create a different version.
Bug:
16654225
Change-Id: Iaf7d738b4405fa2e58cc5fc8af99d5ff2718f5a9
Sascha Haeberling [Sun, 3 Aug 2014 04:16:45 +0000 (04:16 +0000)]
Merge "Prevent monkey crash when deleting without data" into ub-camera-glacier
Sascha Haeberling [Thu, 31 Jul 2014 23:36:21 +0000 (23:36 +0000)]
am
57bcd92f: [OC] Refactoring the session API before intgrating GCam into OneCamera
* commit '
57bcd92f39d85427102f30be2c749c4a7bd4be96':
[OC] Refactoring the session API before intgrating GCam into OneCamera
Sascha Haeberling [Thu, 31 Jul 2014 23:05:57 +0000 (16:05 -0700)]
[OC] Refactoring the session API before intgrating GCam into OneCamera
Bug:
16654225
Change-Id: I3fe6f46847ed6424310a81722c93c63be8b807a3
Sol Boucher [Fri, 25 Jul 2014 06:59:21 +0000 (23:59 -0700)]
Move display orientation calculations out of app code
Because they're needed by every app, these are being relocated into the
portability layer. As such, the CameraUtil#getDisplayOrientation() and
CameraUtil#getJpegRotation() methods are being replaced by the API-agnostic
CameraDeviceInfo.Characteristics#getPreviewOrientation() and
CameraDeviceInfo.Characteristics#getJpegOrientation() calls, respectively.
Change-Id: I5048e6f1a5ff655e4ea260b109e7c104bbe790b0
Andy Huibers [Thu, 31 Jul 2014 18:41:15 +0000 (18:41 +0000)]
am
9a9a1086: Improved logging of foreground source type.
* commit '
9a9a1086c10ea39ae9a2a5bdeeb600c2d7f940b6':
Improved logging of foreground source type.
Andy Huibers [Thu, 31 Jul 2014 18:10:24 +0000 (11:10 -0700)]
Improved logging of foreground source type.
Change-Id: I6fdd5a52ec136f76352e006a8e95e88aac0ac1af
Sascha Haeberling [Thu, 31 Jul 2014 15:22:38 +0000 (15:22 +0000)]
am
00d8bbc9: Merge "[OC] Hook new Capture module up, behind a system property." into ub-camera-glacier
* commit '
00d8bbc97d970db9604474210554caa18935c7eb':
[OC] Hook new Capture module up, behind a system property.
Sascha Haeberling [Thu, 31 Jul 2014 15:17:32 +0000 (15:17 +0000)]
am
08b3c94a: [OC] Adds the new CaptureModule and UI.
* commit '
08b3c94a7d7aff30b5da8e99649346e37b67a5c5':
[OC] Adds the new CaptureModule and UI.
Sascha Haeberling [Thu, 31 Jul 2014 00:48:52 +0000 (17:48 -0700)]
[OC] Adds the new CaptureModule and UI.
Bug:
16654225
This is essentially a version of the GCamModule without GCam, plus a few
things we need from PhotoModule.
Some code is commented out to be added back in later as a reminder.
CLs to hook the module up will be following up.
Change-Id: I70108529f81a8b0b744dc846287ea2ac121c85da
Sascha Haeberling [Thu, 31 Jul 2014 15:21:09 +0000 (15:21 +0000)]
Merge "[OC] Hook new Capture module up, behind a system property." into ub-camera-glacier
Sascha Haeberling [Thu, 31 Jul 2014 03:17:30 +0000 (20:17 -0700)]
[OC] Hook new Capture module up, behind a system property.
Bug:
16654225
Change-Id: I6be44fefce66c09425a1bebc1942489f6af7636c
Sascha Haeberling [Wed, 30 Jul 2014 17:56:13 +0000 (17:56 +0000)]
am
ef66e813: Cleaning up unused strings.
* commit '
ef66e81388982b89c710e75a9d9ae314b1de97f9':
Cleaning up unused strings.
Sascha Haeberling [Wed, 30 Jul 2014 17:31:29 +0000 (10:31 -0700)]
Prevent monkey crash when deleting without data
Bug:
16536894
Change-Id: I960c0d8f61b2909c7020d3c259fbad8f8c33bc05
Sascha Haeberling [Wed, 30 Jul 2014 02:43:42 +0000 (19:43 -0700)]
Cleaning up unused strings.
'et' and 'ms' are deprecated and have already been removed from master:
http://ag/506364
Change-Id: I0acb1a5225f0b7c9c3dcf449b0a16bb7f77118ed
Sascha Haeberling [Wed, 30 Jul 2014 01:30:57 +0000 (01:30 +0000)]
am
f5e51ec4: [OC] Camera2-based OneCamera implementation.
* commit '
f5e51ec44934d6d687267d2aff6386f5b728dd9f':
[OC] Camera2-based OneCamera implementation.
Sascha Haeberling [Wed, 30 Jul 2014 00:28:46 +0000 (17:28 -0700)]
[OC] Camera2-based OneCamera implementation.
Bug:
16654225
Change-Id: Icc544eac762b5494e6bb6c9e768b810c44e11cd9
Sascha Haeberling [Wed, 30 Jul 2014 01:19:49 +0000 (01:19 +0000)]
am
2f001066: Merge "Put conversion from string to size into SettingsManager." into ub-camera-glacier
* commit '
2f0010669ea789c1767527e960468b157796dfd4':
Put conversion from string to size into SettingsManager.
Sascha Haeberling [Wed, 30 Jul 2014 01:19:49 +0000 (01:19 +0000)]
am
d674447d: Add empty version of SystemProperties interface.
* commit '
d674447d33e21fcaca64ee916953d8b3c0288390':
Add empty version of SystemProperties interface.
Sascha Haeberling [Wed, 30 Jul 2014 01:06:26 +0000 (01:06 +0000)]
am
ee36c5f5: Minor clean-up around the code base.
* commit '
ee36c5f591ac181a10692b2ec2b96de5251c4abb':
Minor clean-up around the code base.
Sascha Haeberling [Wed, 30 Jul 2014 01:06:26 +0000 (01:06 +0000)]
am
b0d171e8: [OC] Adding the OneCamera manager API.
* commit '
b0d171e892dffbc7ce0caf7415f96fa513c6f3fc':
[OC] Adding the OneCamera manager API.
Sascha Haeberling [Wed, 30 Jul 2014 00:32:17 +0000 (17:32 -0700)]
Add empty version of SystemProperties interface.
This is so that we can use it in Camera2 code.
Change-Id: I764adb7377b91b5b54a33535188eb6d0d5159253
Sascha Haeberling [Wed, 30 Jul 2014 00:05:43 +0000 (17:05 -0700)]
Minor clean-up around the code base.
Change-Id: I2ed422dd4e0383739ccfa85a2e1e0e49e093e51d
Sascha Haeberling [Tue, 29 Jul 2014 23:29:02 +0000 (16:29 -0700)]
[OC] Adding the OneCamera manager API.
Bug:
16654225
Change-Id: I070f36a6e6c1e756223ff69b74c3171547090f97
Sascha Haeberling [Tue, 29 Jul 2014 23:33:37 +0000 (23:33 +0000)]
am
8c34b30b: [OC] Add common abstract OneCamera class.
* commit '
8c34b30b2ae23ceb13f2912fe8b6f83c27940306':
[OC] Add common abstract OneCamera class.
Sascha Haeberling [Tue, 29 Jul 2014 23:02:52 +0000 (16:02 -0700)]
[OC] Add common abstract OneCamera class.
Bug:
16654225
Change-Id: I31c0ab4d8f4aa91447d384444258616648633de4
Sascha Haeberling [Tue, 29 Jul 2014 22:59:05 +0000 (22:59 +0000)]
am
00c122a5: [OC] Version 1 of the nterface for OneCamera.
* commit '
00c122a56f76d8ba523c324638e5083f721da01a':
[OC] Version 1 of the nterface for OneCamera.
Sascha Haeberling [Tue, 29 Jul 2014 22:46:39 +0000 (15:46 -0700)]
[OC] Version 1 of the nterface for OneCamera.
Bug:
16654225
Change-Id: Id4a6755577e327849ce60db7c5f64d76fb0a55b2
Sascha Haeberling [Tue, 29 Jul 2014 22:44:55 +0000 (22:44 +0000)]
am
c7223fa9: Merge "[OC] Adds a class with common utility functions for capture modules." into ub-camera-glacier
* commit '
c7223fa97a33c3e8e51d26566a32558d6257e9b9':
[OC] Adds a class with common utility functions for capture modules.
Sascha Haeberling [Tue, 29 Jul 2014 22:41:54 +0000 (22:41 +0000)]
Merge "[OC] Adds a class with common utility functions for capture modules." into ub-camera-glacier
Spike Sprague [Tue, 29 Jul 2014 19:04:07 +0000 (19:04 +0000)]
am
6a8aceef: AndroidManifest formatting cleanup
* commit '
6a8aceef5e9c886db04e82c913db7b8a719cdfc1':
AndroidManifest formatting cleanup
Sascha Haeberling [Tue, 29 Jul 2014 18:14:39 +0000 (11:14 -0700)]
[OC] Adds a class with common utility functions for capture modules.
Bug:
16654225
Change-Id: I7bc2eaaa928fd152d20777086abef984421cc320
Spike Sprague [Mon, 28 Jul 2014 22:15:10 +0000 (15:15 -0700)]
AndroidManifest formatting cleanup
Change-Id: I279e764987fea743aa78575748a831e31ba28c0c
Spike Sprague [Fri, 25 Jul 2014 21:21:31 +0000 (21:21 +0000)]
am
2f92712c: re-added color and background entries for gcam
* commit '
2f92712cdb0598eead6631a0b8366a592c8c19c2':
re-added color and background entries for gcam
Sascha Haeberling [Wed, 30 Jul 2014 01:12:51 +0000 (01:12 +0000)]
Merge "Put conversion from string to size into SettingsManager." into ub-camera-glacier
Sascha Haeberling [Wed, 30 Jul 2014 00:08:18 +0000 (17:08 -0700)]
Put conversion from string to size into SettingsManager.
This way we don't have to spread this logic throughout the codebase.
Change-Id: I2d534d0756a9030e6d67b479a67c86c1cf596589
Spike Sprague [Fri, 25 Jul 2014 21:11:42 +0000 (14:11 -0700)]
re-added color and background entries for gcam
bug:
16567671
Change-Id: Ifbe7bd68f0f6c47f645b420ef35d6eb6478c4a7e
Spike Sprague [Fri, 25 Jul 2014 21:03:21 +0000 (21:03 +0000)]
am
ffa2ff02: added a mutate() call when loading LayerDrawables.
* commit '
ffa2ff02c19d3b3a22e7ea700587a1c95bbf08b7':
added a mutate() call when loading LayerDrawables.
Spike Sprague [Fri, 25 Jul 2014 19:19:11 +0000 (12:19 -0700)]
added a mutate() call when loading LayerDrawables.
bug:
16566825
Change-Id: I71a3a9787b73957f9c34bf1ffa52df41c3a5f6e6
Alan Newberger [Fri, 25 Jul 2014 17:05:29 +0000 (17:05 +0000)]
am
df5989b0: Merge "Ensure default focus mode is continuous-picture" into ub-camera-glacier
* commit '
df5989b01e4075d666b7d9e59ac70876b64b8932':
Ensure default focus mode is continuous-picture
Spike Sprague [Fri, 25 Jul 2014 17:05:28 +0000 (17:05 +0000)]
am
141263e2: Merge "ripple drawable on shutter button" into ub-camera-glacier
* commit '
141263e22b53dadde54afbf416dec76812746578':
ripple drawable on shutter button
Baligh Uddin [Fri, 25 Jul 2014 17:05:27 +0000 (17:05 +0000)]
am
036400b3: (-s ours) am
21b8cb69: (-s ours) Import translations. DO NOT MERGE
* commit '
036400b3389a8f5707ce7ce14138cbf65f891e4b':
Import translations. DO NOT MERGE
Baligh Uddin [Fri, 25 Jul 2014 17:05:27 +0000 (17:05 +0000)]
am
01afd999: (-s ours) Import translations. DO NOT MERGE
* commit '
01afd9992560775e0c7420a0f86d11d625717f80':
Import translations. DO NOT MERGE
Alan Newberger [Thu, 24 Jul 2014 23:15:18 +0000 (23:15 +0000)]
Merge "Ensure default focus mode is continuous-picture" into ub-camera-glacier