OSDN Git Service
Senpo Hu [Thu, 21 Aug 2014 00:16:11 +0000 (00:16 +0000)]
Merge "Change Shamu's default video resolution setting." into ub-camera-glacier
Senpo Hu [Mon, 18 Aug 2014 23:45:45 +0000 (16:45 -0700)]
Change Shamu's default video resolution setting.
Bug:
17060480
Change-Id: I5ce8d2d2960d21856c0f13e9599d80b0edc03ec9
Sol Boucher [Wed, 20 Aug 2014 23:57:21 +0000 (23:57 +0000)]
Merge "TextureViewHelper workaround for SurfaceTexture/CameraProxy race" into ub-camera-glacier
Sol Boucher [Wed, 20 Aug 2014 22:54:25 +0000 (15:54 -0700)]
TextureViewHelper workaround for SurfaceTexture/CameraProxy race
CameraController#getCurrentCameraId() now returns the ID of the requested camera
device if called after #requestCamera() but before the camera device has
finished opening. Assuming the most recent request is for the desired API level
and device, this resolves an issue where no transformation matrix was applied on
returning from the settings activity.
Bug:
17140996
Change-Id: Ideaec0072acd8aab77b98b213f260907f84270de
Andy Huibers [Wed, 20 Aug 2014 20:49:21 +0000 (20:49 +0000)]
Merge "Add zoom to CaptureModule and OneCamera." into ub-camera-glacier
Sascha Haeberling [Wed, 20 Aug 2014 19:20:35 +0000 (12:20 -0700)]
Remove logspam
Bug:
17157295
Change-Id: I7b6b505a7d389b59ae440dde7b30da78aaefa0c0
Andy Huibers [Wed, 20 Aug 2014 07:02:19 +0000 (00:02 -0700)]
Add zoom to CaptureModule and OneCamera.
Change-Id: Ia679d79a42e20e9033409939d0ca137ffcfbc75a
Alan Newberger [Wed, 20 Aug 2014 02:09:24 +0000 (02:09 +0000)]
Merge "Update AOSP Camera product icon" into ub-camera-glacier
Alan Newberger [Wed, 20 Aug 2014 01:53:30 +0000 (18:53 -0700)]
Update AOSP Camera product icon
Final updates for the icon. Keeping naming consistent with generated
assets.
Bug:
16985499
Change-Id: I389c2479b208dec05a0b3a1f2617d13b15913dcb
Sascha Haeberling [Tue, 19 Aug 2014 22:33:31 +0000 (22:33 +0000)]
Merge "roduce debug output for android.util.Pair" into ub-camera-glacier
Sascha Haeberling [Tue, 19 Aug 2014 21:38:44 +0000 (14:38 -0700)]
roduce debug output for android.util.Pair
Bug:
16945820
Change-Id: Ia19c6fbfcaf2b1497a76e05600afc5a5b7364e50
Andy Huibers [Tue, 19 Aug 2014 20:22:44 +0000 (13:22 -0700)]
Start moving AF and 3A to separate class; improve logging.
Change-Id: Ib73415ffd5569fab8c2c3bf5ac0f35616d3ee697
Spike Sprague [Mon, 18 Aug 2014 21:11:33 +0000 (14:11 -0700)]
add functionality to enable/disable clicks on a MultiToggleImageButton
without affecting its visual state.
bug:
17014507
Change-Id: I824e07d518cce9768cf48f4c50afe079ebff4121
Alan Newberger [Tue, 19 Aug 2014 01:46:29 +0000 (01:46 +0000)]
Merge "Remove extra parent mode from array, and make PhotoModule scope string public" into ub-camera-glacier
Alan Newberger [Tue, 19 Aug 2014 01:40:47 +0000 (18:40 -0700)]
Remove extra parent mode from array, and make PhotoModule scope string public
When pruning modes, we neglected to remove one of the 'photo' parent modes.
This still worked because the last two entries were both 'photo'. Also,
making PhotoModule scope string public so it can be referred to by
other modules, to accomplish the same parent function as the array.
Bug:
17103121
Change-Id: I574e9a7c2db8bf2c86d810c930fbf510d5aa1a24
Spike Sprague [Tue, 19 Aug 2014 00:44:58 +0000 (00:44 +0000)]
Merge "tweak filmstrip show/hide background for Material Design" into ub-camera-glacier
Spike Sprague [Tue, 19 Aug 2014 00:18:49 +0000 (17:18 -0700)]
tweak filmstrip show/hide background for Material Design
bug:
17113925
Change-Id: I5d478e3e72346e4a333aa2399d339130c5ca4187
Alan Newberger [Mon, 18 Aug 2014 17:46:29 +0000 (17:46 +0000)]
Merge "Protect Camera2 functions from null CameraDeviceInfo" into ub-camera-glacier
Spike Sprague [Mon, 18 Aug 2014 17:39:31 +0000 (17:39 +0000)]
Merge "change settings to use dark theme." into ub-camera-glacier
Sascha Haeberling [Sat, 16 Aug 2014 01:45:15 +0000 (18:45 -0700)]
Fix orientation and move it to the util class so we can use it elsewhere.
Bug:
16948752
Change-Id: Ic7bf2f01176d8f6f1e1a70940c35531e1a5a1cbc
Sascha Haeberling [Sat, 16 Aug 2014 01:53:53 +0000 (18:53 -0700)]
DO NOT MERGE - Reverting accidentally merged 524943 into glacier.
We only want it in Haleakala, but it go into glacier through another CL.
Change-Id: Ie08ec3e0d1ad7637650c45bf1908a04267464935
Alan Newberger [Sat, 16 Aug 2014 01:18:12 +0000 (18:18 -0700)]
Protect Camera2 functions from null CameraDeviceInfo
When the underlying camera fails, the camera1 agent
returns null for CameraDeviceInfo. Guard against this case
where it is used in app upgrading and settings.
Bug:
16982203
Change-Id: I7e4686e508993f0d0fc03eaa9e0b5dc312016eae
Sol Boucher [Sat, 16 Aug 2014 00:23:47 +0000 (00:23 +0000)]
Merge "Move preview transform matrix code into portability library" into ub-camera-glacier
Sol Boucher [Tue, 12 Aug 2014 06:10:12 +0000 (23:10 -0700)]
Move preview transform matrix code into portability library
This allows it to be calculated differently depending on the backing camera API,
which means that camera2 preview streams can be (and are!) displayed upright.
Bug:
16875535
Change-Id: I58fa86098a8b8eddc8f864b93d1e92672c40a1de
Sol Boucher [Sat, 16 Aug 2014 00:23:35 +0000 (00:23 +0000)]
Merge "Enable seamless switching to/from camera2-backed Photo module" into ub-camera-glacier
Sol Boucher [Tue, 5 Aug 2014 06:41:38 +0000 (23:41 -0700)]
Enable seamless switching to/from camera2-backed Photo module
This supports running individual modules against the camera2 API framework while
the rest of the modules use the legacy Camera class.
Bug:
16875535
Change-Id: Ic0ae313a3dd96ba22bacc36c7b1712b183b713ff
Andy Huibers [Fri, 15 Aug 2014 21:39:05 +0000 (21:39 +0000)]
Merge "Reset 3A regions during CONTINUOUS_PICTURE passive scanning per camera2 API." into ub-camera-glacier
Andy Huibers [Fri, 15 Aug 2014 19:56:42 +0000 (12:56 -0700)]
Reset 3A regions during CONTINUOUS_PICTURE passive scanning per camera2 API.
Bug:
17028594
Change-Id: I8ce7dbd12f2b14a50068d8b034e7a80d8840f012
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:21:56 +0000 (10:21 -0700)]
Hold touch to focus target in 3A UI debug mode.
Bug:
17028594
Change-Id: I6d60f2a891cc8ab33c2165438295950bf46095b3
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
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
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
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 02:27:34 +0000 (19:27 -0700)]
Move code from GoogleCamera that dumps capture request metadata.
Bug:
16945820
Change-Id: Iff3f05b65687073a7272ed31644f34dc6187de21
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
Spike Sprague [Wed, 13 Aug 2014 21:36:53 +0000 (14:36 -0700)]
change settings to use dark theme.
bug:
16979040
Change-Id: I2e02884d2971a92d4a408712a0e952891eafb62e
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 [Tue, 5 Aug 2014 17:53:08 +0000 (10:53 -0700)]
[OC] Gcam OneCamera implementation.
Bug:
16948752
Change-Id: I0160de117c4ff7024e0d546f594b5777847d1833
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 [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 [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, 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
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 [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 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
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
Spike Sprague [Thu, 7 Aug 2014 21:56:27 +0000 (14:56 -0700)]
rollback of b/
16632474 and ag/518674
Change-Id: I77af6135ff339240bd52881550a0f42ec996f9c4
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
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:09:19 +0000 (23:09 +0000)]
Merge "[OC] Enable flash support." into ub-camera-glacier
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
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
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
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
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 [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:10:24 +0000 (11:10 -0700)]
Improved logging of foreground source type.
Change-Id: I6fdd5a52ec136f76352e006a8e95e88aac0ac1af
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 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 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: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 00:28:46 +0000 (17:28 -0700)]
[OC] Camera2-based OneCamera implementation.
Bug:
16654225
Change-Id: Icc544eac762b5494e6bb6c9e768b810c44e11cd9
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: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: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
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:02:52 +0000 (16:02 -0700)]
[OC] Add common abstract OneCamera class.
Bug:
16654225
Change-Id: I31c0ab4d8f4aa91447d384444258616648633de4
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:41:54 +0000 (22:41 +0000)]
Merge "[OC] Adds a class with common utility functions for capture modules." into ub-camera-glacier
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: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 19:19:11 +0000 (12:19 -0700)]
added a mutate() call when loading LayerDrawables.
bug:
16566825
Change-Id: I71a3a9787b73957f9c34bf1ffa52df41c3a5f6e6
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
Alan Newberger [Thu, 24 Jul 2014 22:55:37 +0000 (15:55 -0700)]
Ensure default focus mode is continuous-picture
The new Settings infrastructure created a bug where the default
focus mode was 'auto', it needs to be continuous-picture. Fixing
here. Also adding verbose logging to the focus manager, could be
helpful in the future.
Bug:
16536583
Change-Id: I80b5905524f7fdaf69097ff8d2780da9f4ee2428
Spike Sprague [Thu, 24 Jul 2014 23:15:15 +0000 (23:15 +0000)]
Merge "ripple drawable on shutter button" into ub-camera-glacier
Spike Sprague [Sat, 19 Jul 2014 00:34:03 +0000 (17:34 -0700)]
ripple drawable on shutter button
bug:
16123188
Change-Id: I390279acb7a4599f1aeba71b415f1261b9a9b97b
Baligh Uddin [Thu, 24 Jul 2014 21:48:33 +0000 (21:48 +0000)]
am
21b8cb69: (-s ours) Import translations. DO NOT MERGE
* commit '
21b8cb696c05ef5207d290f3a1ed52453e58f525':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 24 Jul 2014 10:36:34 +0000 (03:36 -0700)]
Import translations. DO NOT MERGE
Change-Id: I6bef6048568c35ef35de13ca1cfb42e663622877
Auto-generated-cl: translation import