OSDN Git Service

android-x86/packages-apps-Camera2.git
10 years agoActually remove settings
Alan Newberger [Thu, 28 Aug 2014 17:30:33 +0000 (10:30 -0700)]
Actually remove settings

Correct settings removal, which wasn't occurring during upgrades. Will
followup with scrub of preference file references -- there are likely
additional reasons this wasn't causing more crashes, i.e. certain
settings not being ported over earlier versions.

Bug: 16879376
Change-Id: I720a3181958a4201508726d0f6e06803c456f737

10 years agoMerge "Remove FeedbackHelper" into ub-camera-glacier
Alan Newberger [Wed, 27 Aug 2014 22:34:20 +0000 (22:34 +0000)]
Merge "Remove FeedbackHelper" into ub-camera-glacier

10 years agogcam: Restore naming of Gcam debug folders.
Sam Hasinoff [Wed, 27 Aug 2014 05:12:00 +0000 (22:12 -0700)]
gcam: Restore naming of Gcam debug folders.

When Gcam debugging is on, write output to per-burst folders
named SSSS_YYYYMMDD_HHMMSS_XXX, where 'SSSS' is the last 4
digits of the device serial number and 'XXX' are the
milliseconds of the timestamp.

Bug: 17204023

Change-Id: Ie1d58dc3ecb5d9dc7389d24acc4937498f00dbc9

10 years agoRemove FeedbackHelper
Alan Newberger [Wed, 27 Aug 2014 22:28:57 +0000 (15:28 -0700)]
Remove FeedbackHelper

ag/393130 has comments pointing out that startFeedback has a leak. We don't
use it anymore after Help library integration, so just remove it.

Bug: 17302992
Change-Id: I519a2b0eb7a0ce06d6fcdcbfa2c851837e9a6579

10 years agoMerge "Add setprop to enable ZSL." into ub-camera-glacier
Puneet Lall [Wed, 27 Aug 2014 22:08:30 +0000 (22:08 +0000)]
Merge "Add setprop to enable ZSL." into ub-camera-glacier

10 years agoAdd setprop to enable ZSL.
Puneet Lall [Wed, 27 Aug 2014 20:38:29 +0000 (13:38 -0700)]
Add setprop to enable ZSL.

Bug: 16961251
Change-Id: I997a47345f7c277abb43f2533fa5226e0c6a3e06

10 years agoMerge "Make sure CaptureModule (and therefore Gcam) always resumes right." into ub...
Sascha Haeberling [Wed, 27 Aug 2014 21:29:14 +0000 (21:29 +0000)]
Merge "Make sure CaptureModule (and therefore Gcam) always resumes right." into ub-camera-glacier

10 years agoMerge "fix for a doublebounce of the filmstip button on filmstip swipe out" into...
Spike Sprague [Wed, 27 Aug 2014 20:13:41 +0000 (20:13 +0000)]
Merge "fix for a doublebounce of the filmstip button on filmstip swipe out" into ub-camera-glacier

10 years agofix for a doublebounce of the filmstip button on filmstip swipe out
Spike Sprague [Wed, 27 Aug 2014 18:25:45 +0000 (11:25 -0700)]
fix for a doublebounce of the filmstip button on filmstip swipe out

bug: 17301367

Change-Id: I305618ee5012de229c9cc1fd73f0b6506d701477

10 years agoMerge "Initial ZSL implementation" into ub-camera-glacier
Puneet Lall [Wed, 27 Aug 2014 19:09:59 +0000 (19:09 +0000)]
Merge "Initial ZSL implementation" into ub-camera-glacier

10 years agoMake sure CaptureModule (and therefore Gcam) always resumes right.
Sascha Haeberling [Wed, 27 Aug 2014 19:07:58 +0000 (12:07 -0700)]
Make sure CaptureModule (and therefore Gcam) always resumes right.

  Bug: 17258531

Change-Id: I8a72fcd8f34eb95676ca939c2aff87fcac105e75

10 years agoInitial ZSL implementation
Puneet Lall [Thu, 14 Aug 2014 01:53:53 +0000 (18:53 -0700)]
Initial ZSL implementation

Bug: 16961251
Change-Id: I03c7c1813f99d460495472addc7f733e1bfa6a97

10 years agoMerge "boatload of new assets" into ub-camera-glacier
Spike Sprague [Wed, 27 Aug 2014 17:35:31 +0000 (17:35 +0000)]
Merge "boatload of new assets" into ub-camera-glacier

10 years agoMerge "Import translations. DO NOT MERGE" into ub-camera-glacier
Baligh Uddin [Wed, 27 Aug 2014 16:22:38 +0000 (16:22 +0000)]
Merge "Import translations. DO NOT MERGE" into ub-camera-glacier

10 years agoEnable location and heading to be stored in picture EXIF.
Sascha Haeberling [Wed, 27 Aug 2014 01:03:22 +0000 (18:03 -0700)]
Enable location and heading to be stored in picture EXIF.

  Bug: 17202845

Change-Id: Ic789c9a2d6078b35a09308d1b631166529f3f1bd

10 years agoImport translations. DO NOT MERGE
Baligh Uddin [Wed, 27 Aug 2014 04:39:30 +0000 (21:39 -0700)]
Import translations. DO NOT MERGE

Change-Id: I785196ae077b6f1720086a546c115f6eec7e1043
Auto-generated-cl: translation import

10 years agoShow a message to indicate that Gcam is not yet ready for quality feedback on Shamu.
Sascha Haeberling [Wed, 27 Aug 2014 04:04:52 +0000 (21:04 -0700)]
Show a message to indicate that Gcam is not yet ready for quality feedback on Shamu.

  Bug: 17204023

Change-Id: I03ac9df0e4df8f09f5a4527616add6fb12ff0fd8

10 years agoProtect video recording callback from activity/module pauses
Alan Newberger [Wed, 27 Aug 2014 01:18:48 +0000 (18:18 -0700)]
Protect video recording callback from activity/module pauses

This CL should eliminate MediaRecorder start exceptions, which
appear to be due to ending the camera or switching the module.
Storage I/O could take a while during which pauses can occur,
so we check for them and avoid starting video in that case.

Bug: 16298718
Change-Id: I9abca815400e9ce545fed96f6e31cb792860a1d0

10 years agoAdd volume key capture suppor to CaptureModule
Sascha Haeberling [Wed, 27 Aug 2014 01:20:35 +0000 (18:20 -0700)]
Add volume key capture suppor to CaptureModule

  Bug: 17289383

Change-Id: If548c4ebe5f702aca6fc9a983ac4775812ad551f

10 years agoAdd timeout to touch to focus.
Andy Huibers [Wed, 27 Aug 2014 00:32:39 +0000 (17:32 -0700)]
Add timeout to touch to focus.

Bug: 17289205
Change-Id: Ide39b4b9c86691de36149fdd15d1db41f9fed342

10 years agoMerge "more consistently apply filmstip hide animations" into ub-camera-glacier
Spike Sprague [Wed, 27 Aug 2014 00:17:45 +0000 (00:17 +0000)]
Merge "more consistently apply filmstip hide animations" into ub-camera-glacier

10 years agomore consistently apply filmstip hide animations
Spike Sprague [Wed, 27 Aug 2014 00:09:45 +0000 (17:09 -0700)]
more consistently apply filmstip hide animations

bug: 17278732
bug: 17279637

Change-Id: I2346dcd77c0afd84eb1167ad5d5df3770551c14f

10 years agoReset metering and focus areas when touch focus period ends.
Andy Huibers [Tue, 26 Aug 2014 23:21:15 +0000 (16:21 -0700)]
Reset metering and focus areas when touch focus period ends.

Bug: 17286539
Change-Id: I36e554cac3969d6d0422efd2cb169d7afb08911c

10 years agoMerge "Remove one shot callback workaround in VideoModule for L" into ub-camera-glacier
Alan Newberger [Tue, 26 Aug 2014 23:11:24 +0000 (23:11 +0000)]
Merge "Remove one shot callback workaround in VideoModule for L" into ub-camera-glacier

10 years agoMerge "In 3A debug mode, show pass/fail for active scans and show exact AF, AE region...
Andy Huibers [Tue, 26 Aug 2014 22:57:10 +0000 (22:57 +0000)]
Merge "In 3A debug mode, show pass/fail for active scans and show exact AF, AE regions." into ub-camera-glacier

10 years agoMerge "Material Ripple effect on filmstip buttons" into ub-camera-glacier
Spike Sprague [Tue, 26 Aug 2014 22:06:24 +0000 (22:06 +0000)]
Merge "Material Ripple effect on filmstip buttons" into ub-camera-glacier

10 years agoMaterial Ripple effect on filmstip buttons
Spike Sprague [Tue, 26 Aug 2014 21:59:43 +0000 (14:59 -0700)]
Material Ripple effect on filmstip buttons

bug: 17281225
Change-Id: Ic2876527a6d1fedaeb9ecdddbc8627e1c4e396b1

10 years agoIn 3A debug mode, show pass/fail for active scans and show exact AF, AE regions.
Andy Huibers [Tue, 26 Aug 2014 18:16:59 +0000 (11:16 -0700)]
In 3A debug mode, show pass/fail for active scans and show exact AF, AE regions.

Bug: 17028594
Change-Id: I9c85178926a68c5e3ce26d04107db65514d84169

10 years agoboatload of new assets
Spike Sprague [Fri, 22 Aug 2014 22:15:48 +0000 (15:15 -0700)]
boatload of new assets

also:
bug: 17255612

Change-Id: I8551e3162b8eedee9653a05abb88177e39f12be5

10 years agoMerge "photosphere: Fix TextureView transforms." into ub-camera-glacier
Ruben Brunk [Tue, 26 Aug 2014 21:00:05 +0000 (21:00 +0000)]
Merge "photosphere: Fix TextureView transforms." into ub-camera-glacier

10 years agophotosphere: Fix TextureView transforms.
Ruben Brunk [Tue, 26 Aug 2014 10:16:27 +0000 (03:16 -0700)]
photosphere: Fix TextureView transforms.

Bug: 17098224

- WAR to set the SurfaceTexture default buffer dimensions to
  the TextureView's layout dimensions to avoid bad
  scaling/translation in TextureView's HardwareLayer transform.

Change-Id: I9e7d6e6cb33d806470cb11f00d45b97218ee7c11

10 years agoRemove one shot callback workaround in VideoModule for L
Alan Newberger [Thu, 21 Aug 2014 21:42:36 +0000 (14:42 -0700)]
Remove one shot callback workaround in VideoModule for L

Since there was a framework fix for the issue, we don't need
to do an extra preview callback when entering video if on L.

Bug: 16649297
Bug: 17241994
Change-Id: I67fc67ef34a661daea6991c3b895b1c1bf6b9b85

10 years agoMerge "Enable mode options when capture is done." into ub-camera-glacier
Sascha Haeberling [Tue, 26 Aug 2014 20:36:10 +0000 (20:36 +0000)]
Merge "Enable mode options when capture is done." into ub-camera-glacier

10 years agoEnable mode options when capture is done.
Sascha Haeberling [Tue, 26 Aug 2014 19:15:41 +0000 (12:15 -0700)]
Enable mode options when capture is done.

  Bug: 17260403

Change-Id: I9e5c6c8516d5cdbb3fd303715af2a109b171c5f7

10 years agoMerge "util: Optimal preview size picks smaller-than-display size in case of tie...
Igor Murashkin [Tue, 26 Aug 2014 17:30:02 +0000 (17:30 +0000)]
Merge "util: Optimal preview size picks smaller-than-display size in case of tie" into ub-camera-glacier

10 years agoShow animated AF ring UI when lens is moving in continuous autofocus.
Andy Huibers [Tue, 26 Aug 2014 05:25:49 +0000 (22:25 -0700)]
Show animated AF ring UI when lens is moving in continuous autofocus.

Bug: 17028594
Change-Id: I0bb7c7cb3f8264304d4375f9f2b73608c8bfc1e5

10 years agoMerge "Enable Face rectangles for debugging." into ub-camera-glacier
Andy Huibers [Tue, 26 Aug 2014 01:34:46 +0000 (01:34 +0000)]
Merge "Enable Face rectangles for debugging." into ub-camera-glacier

10 years agoEnable Face rectangles for debugging.
Andy Huibers [Mon, 25 Aug 2014 22:01:25 +0000 (15:01 -0700)]
Enable Face rectangles for debugging.

Bug: 17028594

Change-Id: I57521aed991f93da1f5abdace6a72be0f1057dbe

10 years agoMerge "Fix crash on Shamu since it's no longer camera 2 FULL." into ub-camera-glacier
Sascha Haeberling [Mon, 25 Aug 2014 22:00:25 +0000 (22:00 +0000)]
Merge "Fix crash on Shamu since it's no longer camera 2 FULL." into ub-camera-glacier

10 years agoFix crash on Shamu since it's no longer camera 2 FULL.
Sascha Haeberling [Mon, 25 Aug 2014 21:37:42 +0000 (14:37 -0700)]
Fix crash on Shamu since it's no longer camera 2 FULL.

  Bug: 17258194

Shamu is no longer a FULL camera2 device. So we change our OneCamera API
to create a V2 manager for partial deviced as well (but exclude legacy).

Change-Id: Ic095a754494047bc18d6e5e729bd9dd8a915753c

10 years agoutil: Optimal preview size picks smaller-than-display size in case of tie
Igor Murashkin [Mon, 25 Aug 2014 20:21:26 +0000 (13:21 -0700)]
util: Optimal preview size picks smaller-than-display size in case of tie

This fixes the case when 1600x1200 was selected over 1280x960 on a
Nexus 5 (display size 1920x1080); both preview sizes were equally close,
but the larger one was arbitrarily winning out.

Bug: 17216523
Change-Id: I163c29d5f46ad1b8b44825424c5202eb87855048

10 years agoset actionbar background to complete transparent
Spike Sprague [Thu, 21 Aug 2014 17:16:10 +0000 (10:16 -0700)]
set actionbar background to complete transparent

bug: 17114270
Change-Id: I309c98ed1ddbc0c322129e185ca4cd2df1f73520

10 years agoMerge "Enable switching within CaptureModule to HDR+ and back." into ub-camera-glacier
Sascha Haeberling [Sat, 23 Aug 2014 01:57:51 +0000 (01:57 +0000)]
Merge "Enable switching within CaptureModule to HDR+ and back." into ub-camera-glacier

10 years agoEnable switching within CaptureModule to HDR+ and back.
Sascha Haeberling [Thu, 21 Aug 2014 17:01:00 +0000 (10:01 -0700)]
Enable switching within CaptureModule to HDR+ and back.

  Bug: 16945820

Change-Id: If92371129c5bf2a78b7623d745a8b86d218d32e1

10 years agoMerge "Switch from stepwise index-based zoom to a ratio-based scale" into ub-camera...
Sol Boucher [Sat, 23 Aug 2014 01:30:24 +0000 (01:30 +0000)]
Merge "Switch from stepwise index-based zoom to a ratio-based scale" into ub-camera-glacier

10 years agoSwitch from stepwise index-based zoom to a ratio-based scale
Sol Boucher [Wed, 20 Aug 2014 00:24:07 +0000 (17:24 -0700)]
Switch from stepwise index-based zoom to a ratio-based scale

This brings the app up to date with the removal of the deprecated zoom methods
in the portability layer's CameraSettings class.

Bug: 17016658
Change-Id: Icb9f773188f7481d9af991d71feaff86379f5525

10 years agoMerge "Import translations. DO NOT MERGE" into ub-camera-glacier
Baligh Uddin [Fri, 22 Aug 2014 17:39:45 +0000 (17:39 +0000)]
Merge "Import translations. DO NOT MERGE" into ub-camera-glacier

10 years agofilmstrip actionbar tweaks
Spike Sprague [Wed, 20 Aug 2014 01:53:41 +0000 (18:53 -0700)]
filmstrip actionbar tweaks

bug: 17114274
Change-Id: I70e7b285d27f81c87442bcc9d28ae7391d028568

10 years agoMerge "filmstrip actionbar tweaks" into ub-camera-glacier
Spike Sprague [Fri, 22 Aug 2014 17:12:09 +0000 (17:12 +0000)]
Merge "filmstrip actionbar tweaks" into ub-camera-glacier

10 years agofilmstrip actionbar tweaks
Spike Sprague [Wed, 20 Aug 2014 01:53:41 +0000 (18:53 -0700)]
filmstrip actionbar tweaks

bug: 17114274
Change-Id: I0e9b3dd37325d39f5a16d81cbfaf71b98baf7510

10 years agoMerge "Pick the preview size based on the selected picture size." into ub-camera...
Sascha Haeberling [Fri, 22 Aug 2014 00:49:21 +0000 (00:49 +0000)]
Merge "Pick the preview size based on the selected picture size." into ub-camera-glacier

10 years agoPick the preview size based on the selected picture size.
Sascha Haeberling [Thu, 21 Aug 2014 17:04:35 +0000 (10:04 -0700)]
Pick the preview size based on the selected picture size.

  Bug: 16654225

Also make this a function of the Camera device, since othe camera might
have to override the picture size.

Change-Id: Ieb6d1ffac0c3d7893416f9eae3232afde6d27240

10 years agoanimate filmstrip bottom button bar in and out
Spike Sprague [Tue, 19 Aug 2014 22:33:45 +0000 (15:33 -0700)]
animate filmstrip bottom button bar in and out
from the bottom of the screen

bug: 17114515
Change-Id: If3024f149fc0be0e48a430468c53774893946938

10 years agoMerge "Enable progress reporting for modules like HDR+." into ub-camera-glacier
Sascha Haeberling [Thu, 21 Aug 2014 00:40:31 +0000 (00:40 +0000)]
Merge "Enable progress reporting for modules like HDR+." into ub-camera-glacier

10 years agoEnable progress reporting for modules like HDR+.
Sascha Haeberling [Wed, 20 Aug 2014 23:14:29 +0000 (16:14 -0700)]
Enable progress reporting for modules like HDR+.

  Bug: 16945820

Change-Id: If6aba8ff5d2b973f4ea8112110695a84f897d881

10 years agoMerge "Change Shamu's default video resolution setting." into ub-camera-glacier
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

10 years agoChange Shamu's default video resolution setting.
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

10 years agoMerge "Add zoom to CaptureModule and OneCamera." into ub-camera-glacier
Andy Huibers [Wed, 20 Aug 2014 20:49:21 +0000 (20:49 +0000)]
Merge "Add zoom to CaptureModule and OneCamera." into ub-camera-glacier

10 years agoRemove logspam
Sascha Haeberling [Wed, 20 Aug 2014 19:20:35 +0000 (12:20 -0700)]
Remove logspam

  Bug: 17157295

Change-Id: I7b6b505a7d389b59ae440dde7b30da78aaefa0c0

10 years agoAdd zoom to CaptureModule and OneCamera.
Andy Huibers [Wed, 20 Aug 2014 07:02:19 +0000 (00:02 -0700)]
Add zoom to CaptureModule and OneCamera.

Change-Id: Ia679d79a42e20e9033409939d0ca137ffcfbc75a

10 years agoMerge "Update AOSP Camera product icon" into ub-camera-glacier
Alan Newberger [Wed, 20 Aug 2014 02:09:24 +0000 (02:09 +0000)]
Merge "Update AOSP Camera product icon" into ub-camera-glacier

10 years agoUpdate AOSP Camera product icon
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

10 years agoMerge "roduce debug output for android.util.Pair" into ub-camera-glacier
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

10 years agoroduce debug output for android.util.Pair
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

10 years agoStart moving AF and 3A to separate class; improve logging.
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

10 years agoMerge "TextureViewHelper workaround for SurfaceTexture/CameraProxy race" into ub...
Sol Boucher [Wed, 20 Aug 2014 23:57:21 +0000 (23:57 +0000)]
Merge "TextureViewHelper workaround for SurfaceTexture/CameraProxy race" into ub-camera-glacier

10 years agoTextureViewHelper workaround for SurfaceTexture/CameraProxy race
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

10 years agoImport translations. DO NOT MERGE
Baligh Uddin [Tue, 19 Aug 2014 02:42:12 +0000 (19:42 -0700)]
Import translations. DO NOT MERGE

Change-Id: I816f6a71f1c5fa754214261771e5dd4fc933949c
Auto-generated-cl: translation import

10 years agoadd functionality to enable/disable clicks on a MultiToggleImageButton
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

10 years agoMerge "Remove extra parent mode from array, and make PhotoModule scope string public...
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

10 years agoRemove extra parent mode from array, and make PhotoModule scope string public
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

10 years agoMerge "tweak filmstrip show/hide background for Material Design" into ub-camera-glacier
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

10 years agotweak filmstrip show/hide background for Material Design
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

10 years agoMerge "Protect Camera2 functions from null CameraDeviceInfo" into ub-camera-glacier
Alan Newberger [Mon, 18 Aug 2014 17:46:29 +0000 (17:46 +0000)]
Merge "Protect Camera2 functions from null CameraDeviceInfo" into ub-camera-glacier

10 years agoMerge "change settings to use dark theme." 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

10 years agoFix orientation and move it to the util class so we can use it elsewhere.
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

10 years agoDO NOT MERGE - Reverting accidentally merged 524943 into glacier.
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

10 years agoProtect Camera2 functions from null CameraDeviceInfo
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

10 years agoMerge "Move preview transform matrix code into portability library" into ub-camera...
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

10 years agoMove preview transform matrix code into portability library
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

10 years agoMerge "Enable seamless switching to/from camera2-backed Photo module" into ub-camera...
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

10 years agoEnable seamless switching to/from camera2-backed Photo module
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

10 years agoMerge "Reset 3A regions during CONTINUOUS_PICTURE passive scanning per camera2 API...
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

10 years agoReset 3A regions during CONTINUOUS_PICTURE passive scanning per camera2 API.
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

10 years agoMerge "Add ability to add a ready-state changed listener to the camera." into ub...
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

10 years agoAdd ability to add a ready-state changed listener to the camera.
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

10 years agoHold 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

10 years agoMove preference subscreens to new Activities from Dialogs
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

10 years agoMerge "Consolidate properties for debugging." into ub-camera-glacier
Andy Huibers [Fri, 15 Aug 2014 16:55:11 +0000 (16:55 +0000)]
Merge "Consolidate properties for debugging." into ub-camera-glacier

10 years agoConsolidate properties for debugging.
Andy Huibers [Fri, 15 Aug 2014 05:24:41 +0000 (22:24 -0700)]
Consolidate properties for debugging.

Change-Id: I052492375bf176622b38382579b2189d22a05349

10 years agoMerge "Move preference subscreens to new Activities from Dialogs" into ub-camera...
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

10 years agoMerge "Import translations. DO NOT MERGE" 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

10 years agoMove 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

10 years agoadd 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

10 years agochange settings to use dark theme.
Spike Sprague [Wed, 13 Aug 2014 21:36:53 +0000 (14:36 -0700)]
change settings to use dark theme.

bug: 16979040

Change-Id: I2e02884d2971a92d4a408712a0e952891eafb62e

10 years agoMerge "Revert our layout from FULLSCREEN to LAYOUT_FULLSCREEN" into ub-camera-glacier
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

10 years agoRevert our layout from FULLSCREEN to LAYOUT_FULLSCREEN
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

10 years agoMerge "update mode switch transition anims" into ub-camera-glacier
Spike Sprague [Wed, 13 Aug 2014 21:14:50 +0000 (21:14 +0000)]
Merge "update mode switch transition anims" into ub-camera-glacier

10 years agoMerge "Fix potential multi-threading bug where size can change before deletion."...
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

10 years agoFix potential multi-threading bug where size can change before deletion.
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