OSDN Git Service

android-x86/packages-apps-Camera2.git
9 years agoRevert "Import translations. DO NOT MERGE"
Geoff Mendal [Mon, 9 Mar 2015 14:20:58 +0000 (14:20 +0000)]
Revert "Import translations. DO NOT MERGE"

This reverts commit be4ba3e3f1285ad76445fa5c56271b9940097f74.

Change-Id: I16cac16e134e88629fdd6916f096d16e65780a34

9 years agoImport translations. DO NOT MERGE
Geoff Mendal [Mon, 9 Mar 2015 14:00:30 +0000 (07:00 -0700)]
Import translations. DO NOT MERGE

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

9 years agoCaptureSession passes on message IDs instead of strings.
Sascha Haeberling [Sat, 7 Mar 2015 01:53:12 +0000 (17:53 -0800)]
CaptureSession passes on message IDs instead of strings.

  Bug: 18867164

Change-Id: Ie601a0fbaf64873c56c6a9b2767a2fa6a04a11d9

9 years agoAdded more error handling for camera access and picture storage issues.
zafir [Wed, 4 Mar 2015 22:02:47 +0000 (14:02 -0800)]
Added more error handling for camera access and picture storage issues.

Implemented onFailure() method in the OpenCallback interface and
onPictureTakingFailed() in the PictureCallback interface.
OnFailure() routes through showErrorAndFinish() in the AppController.

Bug: 19452391

Change-Id: I3c19a274cc7664f7d1834899a486c57d0585dc9a

9 years agoMerge "Fix units in video duration calculation" into ub-camera-haleakala
Alan Newberger [Fri, 6 Mar 2015 23:59:44 +0000 (23:59 +0000)]
Merge "Fix units in video duration calculation" into ub-camera-haleakala

9 years agoMerge "Fix Version Codes from L to LOLLIPOP" into ub-camera-haleakala
I-Jong Lin [Fri, 6 Mar 2015 23:52:30 +0000 (23:52 +0000)]
Merge "Fix Version Codes from L to LOLLIPOP" into ub-camera-haleakala

9 years agoFix Version Codes from L to LOLLIPOP
I-Jong Lin [Fri, 6 Mar 2015 23:48:40 +0000 (15:48 -0800)]
Fix Version Codes from L to LOLLIPOP

Just so that Intellij IDE don't barf on these files.

Change-Id: I405e41da920d15bd4b0726fb90b859a8741bfef7

9 years agoMerge "Add black-list for resolutions." into ub-camera-haleakala
Sascha Haeberling [Fri, 6 Mar 2015 23:46:27 +0000 (23:46 +0000)]
Merge "Add black-list for resolutions." into ub-camera-haleakala

9 years agoAdd black-list for resolutions.
Sascha Haeberling [Fri, 6 Mar 2015 22:02:50 +0000 (14:02 -0800)]
Add black-list for resolutions.

  Bug: 19611738

Change-Id: I5147bcd925c28e3db0e1e50c8a013cc6750fb47e

9 years agoFix units in video duration calculation
Alan Newberger [Fri, 6 Mar 2015 21:45:41 +0000 (13:45 -0800)]
Fix units in video duration calculation

Convert milliseconds coming out of media table, to seconds
for details formatting.

Bug: 19305203
Change-Id: I4fafae9b3d09d23e60906c2fb3c3f305faee1339

9 years agoMerge "Fix exif dimensions for cropped images" into ub-camera-haleakala
Puneet Lall [Fri, 6 Mar 2015 22:53:17 +0000 (22:53 +0000)]
Merge "Fix exif dimensions for cropped images" into ub-camera-haleakala

9 years agoFix exif dimensions for cropped images
Puneet Lall [Fri, 6 Mar 2015 22:46:23 +0000 (14:46 -0800)]
Fix exif dimensions for cropped images

Bug: 19323062
Change-Id: Ieb2905bc44324f2e9f7f4498fd1e1882924e4e92

9 years agoMerge "Fix flash mode by changing the setting scope to be correct." into ub-camera...
Paul Rohde [Fri, 6 Mar 2015 22:24:37 +0000 (22:24 +0000)]
Merge "Fix flash mode by changing the setting scope to be correct." into ub-camera-haleakala

9 years agoFix flash mode by changing the setting scope to be correct.
Paul Rohde [Fri, 6 Mar 2015 22:20:03 +0000 (14:20 -0800)]
Fix flash mode by changing the setting scope to be correct.

Bug: 19630464
Change-Id: I27abc70041002ff8f9134f249b70d318e05620b9

9 years agoMerge "Add support for negative rotations" into ub-camera-haleakala
Puneet Lall [Fri, 6 Mar 2015 21:46:13 +0000 (21:46 +0000)]
Merge "Add support for negative rotations" into ub-camera-haleakala

9 years agoMerge " Change interface of BurstMediaItem to provide filepath." into ub-camera-haleakala
Shashi Shekhar [Fri, 6 Mar 2015 21:40:35 +0000 (21:40 +0000)]
Merge " Change interface of BurstMediaItem to provide filepath." into ub-camera-haleakala

9 years agoFix flash mode by changing the setting scope to be correct.
Paul Rohde [Fri, 6 Mar 2015 20:50:38 +0000 (12:50 -0800)]
Fix flash mode by changing the setting scope to be correct.

Bug: 19630464

Change-Id: Id1257c23fef1152792a9fb81572768a4d91e22e5

9 years agoAdd support for negative rotations
Puneet Lall [Fri, 6 Mar 2015 20:44:48 +0000 (12:44 -0800)]
Add support for negative rotations

Bug: 19636843
Change-Id: I03a30b433942cacd4978c7788e2ae7d0046479a7

9 years ago Change interface of BurstMediaItem to provide filepath.
Shashi Shekhar [Wed, 25 Feb 2015 02:10:07 +0000 (18:10 -0800)]
 Change interface of BurstMediaItem to provide filepath.

- Instead of passing a byte array, use a file path for the burst media
item.
- Change the save operation in Stack saver to simply rename the image.
- The burst controller is now responsible for managing captured images and
implementations should free the captured images as soon as possible.

Change-Id: I6762972c68865d6ab15bd6fa20b60fb275f103f1

9 years agoMerge "Update stats." into ub-camera-haleakala
Andy Huibers [Fri, 6 Mar 2015 19:35:32 +0000 (19:35 +0000)]
Merge "Update stats." into ub-camera-haleakala

9 years agoMerge "[CaptureIntent] Fix 16x9 stretch problem on Nexus 4." into ub-camera-haleakala
Senpo Hu [Fri, 6 Mar 2015 19:24:52 +0000 (19:24 +0000)]
Merge "[CaptureIntent] Fix 16x9 stretch problem on Nexus 4." into ub-camera-haleakala

9 years agoUpdate stats.
Andy Huibers [Thu, 5 Mar 2015 06:20:07 +0000 (22:20 -0800)]
Update stats.

Bug: 18913439
Change-Id: Iadca6b527c76b55504ce21e9f37f7c29dbb71c57

9 years agoMerge "Add partial crop support to ImageBackend" into ub-camera-haleakala
Puneet Lall [Fri, 6 Mar 2015 19:11:50 +0000 (19:11 +0000)]
Merge "Add partial crop support to ImageBackend" into ub-camera-haleakala

9 years ago[CaptureIntent] Fix 16x9 stretch problem on Nexus 4.
Senpo Hu [Thu, 5 Mar 2015 01:10:00 +0000 (17:10 -0800)]
[CaptureIntent] Fix 16x9 stretch problem on Nexus 4.

2. Also, more clean up for unit tests.

Unfortunately I lump two things together is because there are some nice
things about the clean up that helps deliver the fix.

Bug: 19616722
Change-Id: I632e9f679db6e8a68179912ee4e29c1394084324

9 years agoMerge "Fix CameraCaptureSession exception handling" into ub-camera-haleakala
Puneet Lall [Fri, 6 Mar 2015 19:06:20 +0000 (19:06 +0000)]
Merge "Fix CameraCaptureSession exception handling" into ub-camera-haleakala

9 years agoFix CameraCaptureSession exception handling
Puneet Lall [Fri, 6 Mar 2015 18:51:41 +0000 (10:51 -0800)]
Fix CameraCaptureSession exception handling

Bug: 19484657
Change-Id: I475444ad5f52d790460fa3c7232f1571c432d54e

9 years agoMerge "Fix jpeg compression without rotation" into ub-camera-haleakala
Puneet Lall [Fri, 6 Mar 2015 18:03:16 +0000 (18:03 +0000)]
Merge "Fix jpeg compression without rotation" into ub-camera-haleakala

9 years agoMerge "Custom checkbox drawable for K devices" into ub-camera-haleakala
Alan Newberger [Fri, 6 Mar 2015 17:02:21 +0000 (17:02 +0000)]
Merge "Custom checkbox drawable for K devices" into ub-camera-haleakala

9 years agoCustom checkbox drawable for K devices
Alan Newberger [Thu, 5 Mar 2015 18:39:34 +0000 (10:39 -0800)]
Custom checkbox drawable for K devices

L is already taken care of in a v21 style, with the new buttonTint
property. For K, use the given assets, which happen to be in a
Material style as provided by UX.

Bug: 19083903
Change-Id: I9392edf6460a3a9c7c00e1b62cc0f61f9e2b4231

9 years agoSwitch round thumbnail to respond immedatly to thumbnails.
Paul Rohde [Thu, 5 Mar 2015 22:28:18 +0000 (14:28 -0800)]
Switch round thumbnail to respond immedatly to thumbnails.

Previous version queued thumbnail requests and would wait to show
thumbnails until the animations completed.

Bug: 19606612

Change-Id: I6c9ab8946ba39d6ac53476bf493829647b415cba

9 years agoFix jpeg compression without rotation
Puneet Lall [Fri, 6 Mar 2015 07:49:53 +0000 (23:49 -0800)]
Fix jpeg compression without rotation

Fix an incorrect precondition which had resulted in crash upon attempts
to compress images to jpeg with 0 rotation.

Bug: 19630619
Change-Id: Ic70edda6288cf88f24cd552705adaa615b6daaa5

9 years agoAdd partial crop support to ImageBackend
Puneet Lall [Fri, 6 Mar 2015 00:27:59 +0000 (16:27 -0800)]
Add partial crop support to ImageBackend

Adds functionality to crop final YUV images through the ImageBackend.

Note that thumbnails are not yet cropped correctly.

Bug: 19323062
Change-Id: I55e0ad2ce60fd963d0d3f452dc10bc7548f08b1c

9 years agoMerge "Read tiny thumbnail resolution from resources." into ub-camera-haleakala
Paul Rohde [Thu, 5 Mar 2015 22:28:42 +0000 (22:28 +0000)]
Merge "Read tiny thumbnail resolution from resources." into ub-camera-haleakala

9 years agoRead tiny thumbnail resolution from resources.
Paul Rohde [Thu, 5 Mar 2015 21:05:55 +0000 (13:05 -0800)]
Read tiny thumbnail resolution from resources.

Previous implemenation used a hardcoded pixel value. This makes the
tiny thumbnail generation work better across all devices and
ensures the resolution matches the displayed circle size.

Bug: 19621182

Change-Id: Ibfcf76bdddd476a1ad107a6541278ffedf0104d8

9 years agoFix the Camera2 build
Puneet Lall [Thu, 5 Mar 2015 22:05:49 +0000 (14:05 -0800)]
Fix the Camera2 build

Change-Id: I8747231424708aa21df1367f912cfe3ed622c04c

9 years agoMerge "Fix rotation problem with the capture indicator." into ub-camera-haleakala
Paul Rohde [Thu, 5 Mar 2015 21:54:02 +0000 (21:54 +0000)]
Merge "Fix rotation problem with the capture indicator." into ub-camera-haleakala

9 years agoMerge "Add error handling for repeating preview workaround" into ub-camera-haleakala
Puneet Lall [Thu, 5 Mar 2015 21:44:32 +0000 (21:44 +0000)]
Merge "Add error handling for repeating preview workaround" into ub-camera-haleakala

9 years agoMerge "Fixing comment syntax for RoundedThumbnailView." into ub-camera-haleakala
Sascha Haeberling [Thu, 5 Mar 2015 21:14:28 +0000 (21:14 +0000)]
Merge "Fixing comment syntax for RoundedThumbnailView." into ub-camera-haleakala

9 years agoMerge "[CaptureIntent] remove log spam." into ub-camera-haleakala
Senpo Hu [Thu, 5 Mar 2015 21:03:51 +0000 (21:03 +0000)]
Merge "[CaptureIntent] remove log spam." into ub-camera-haleakala

9 years agoMerge "Add on-the-fly cropping and rotation to jpegutil" into ub-camera-haleakala
Puneet Lall [Thu, 5 Mar 2015 21:01:03 +0000 (21:01 +0000)]
Merge "Add on-the-fly cropping and rotation to jpegutil" into ub-camera-haleakala

9 years ago[CaptureIntent] remove log spam.
Senpo Hu [Thu, 5 Mar 2015 20:55:10 +0000 (12:55 -0800)]
[CaptureIntent] remove log spam.

Bug: 19535852
Change-Id: I79d11e0de40b8952983e8af71481358bc2cf8643

9 years agoFix rotation problem with the capture indicator.
Paul Rohde [Thu, 5 Mar 2015 19:27:35 +0000 (11:27 -0800)]
Fix rotation problem with the capture indicator.

This addresses a tiny problem where taking a new picture after
rotating the device causes the indicator to temporarily rotate.

Bug: 19479623
Change-Id: I567edba32ff7e776ef7605e993db09007b956acd

9 years agoFixing comment syntax for RoundedThumbnailView.
Sascha Haeberling [Thu, 5 Mar 2015 20:23:36 +0000 (12:23 -0800)]
Fixing comment syntax for RoundedThumbnailView.

Change-Id: I167489672f0df4d9bd0f7ccc194a8c50608d5c5f

9 years agoAdd on-the-fly cropping and rotation to jpegutil
Puneet Lall [Tue, 10 Feb 2015 01:45:44 +0000 (17:45 -0800)]
Add on-the-fly cropping and rotation to jpegutil

Bug: 19323062

 * Adds another JpegUtilNative method for compression with a crop
   rectangle.
 * Improves speed of Jpeg compression with a non-zero rotation.
 * Fixes small native memory leak caused by not calling
   jpeg_destroy_compress() to free the libjpeg context.
 * Adds gunit tests for native code.

Change-Id: Id0aa5fd525fb232c4241a6b24970923f4f2c20df

9 years agoAdd error handling for repeating preview workaround
Puneet Lall [Tue, 3 Mar 2015 21:39:03 +0000 (13:39 -0800)]
Add error handling for repeating preview workaround

Adds error handling to show a dialog if the workaround for the repeating
preview (bug: 19061883) fails.

Bug: 19565931
Change-Id: Iabc3b4fdbc6977b0e1828243e80138385a3ef522

9 years agoMerge "Cache Paint objects for capture animation rendering." into ub-camera-haleakala
Paul Rohde [Thu, 5 Mar 2015 18:34:27 +0000 (18:34 +0000)]
Merge "Cache Paint objects for capture animation rendering." into ub-camera-haleakala

9 years agoCache Paint objects for capture animation rendering.
Paul Rohde [Wed, 4 Mar 2015 20:44:48 +0000 (12:44 -0800)]
Cache Paint objects for capture animation rendering.

This should help reduce the draw times for the thumbnail view by
reducing object allocation and reusing the same paint objects.

Bug: 19424945

Change-Id: Ia38a65dec4477f100a27543312b736c10ec07e40

9 years agoMerge "Add support for non-native picture sizes" into ub-camera-haleakala
Puneet Lall [Thu, 5 Mar 2015 00:52:51 +0000 (00:52 +0000)]
Merge "Add support for non-native picture sizes" into ub-camera-haleakala

9 years agoMerge "N4 16:9 Preview Workaround" into ub-camera-haleakala
I-Jong Lin [Thu, 5 Mar 2015 00:43:02 +0000 (00:43 +0000)]
Merge "N4 16:9 Preview Workaround" into ub-camera-haleakala

9 years agoN4 16:9 Preview Workaround
I-Jong Lin [Wed, 4 Mar 2015 19:39:43 +0000 (11:39 -0800)]
N4 16:9 Preview Workaround

The N4-specific fix is to trick the layout UI logic to accept a
16:9 preview coming from a 4:3 surface.  When we render the 4:3
surface, we fill in the size of the preview area.  So, if
the surface dimensions are 4:3 AND the surface actually
contains 16:9 content AND the preview view is also 16:9, then
preview will actually look correct.  To maintain this inconsistency
between the surface and the content aspect ratio, we use the
legacy layout path, and trick the UI layout into laying out
a 16:9 preview, but using a matrix transform that converts 4:3
surface into a 16:9 view.  In new and improved matrix transformation
codepath, we correctly assume that the matrix and the preview
size should be consistent.

Currently, the 0.9MP camera setting on the N4 on the front and back
camera produces a squeezed preview, but also produces a squeezed
JPEG artifact and is probably another independent N4 HAL related issue.
But it's WYSIWYG, so I guess it's correct.

Bug: 19271661
Change-Id: I213a423f891a7c216568970c7f520a6134f9ad13

9 years agoMerge "Make sure we don't start sessions on long-press if no burst is taken." into...
Sascha Haeberling [Thu, 5 Mar 2015 00:11:19 +0000 (00:11 +0000)]
Merge "Make sure we don't start sessions on long-press if no burst is taken." into ub-camera-haleakala

9 years agoAdd support for non-native picture sizes
Puneet Lall [Tue, 24 Feb 2015 01:40:14 +0000 (17:40 -0800)]
Add support for non-native picture sizes

Add a new PictureSizeCalculator which selects the most-appropriate
natively-supported picture size for any target, user-selected, picture
size.  The appropriate, centered, crop-region is passed to the
ImageBackend, but is currently ignored.  Future work is required
to crop the resulting images using these values.

Bug: 19323062
Change-Id: I65cdc97950840dde0a94c96179ade3aae17acc30

9 years agoMerge "Change the capture flash to use paint opacity." into ub-camera-haleakala
Paul Rohde [Wed, 4 Mar 2015 23:03:12 +0000 (23:03 +0000)]
Merge "Change the capture flash to use paint opacity." into ub-camera-haleakala

9 years agoMerge "[CaptureIntent] refactor state machine." into ub-camera-haleakala
Senpo Hu [Wed, 4 Mar 2015 22:37:26 +0000 (22:37 +0000)]
Merge "[CaptureIntent] refactor state machine." into ub-camera-haleakala

9 years ago[CaptureIntent] refactor state machine.
Senpo Hu [Sat, 28 Feb 2015 01:39:19 +0000 (17:39 -0800)]
[CaptureIntent] refactor state machine.

1. Change the event handling mechanism by introducing EventHandler and
   get rid of all processXXX() methods in State class.
2. Remove State.ID enum.
3. Move core classes to "stateful" package.

Refactor for unit test.
1. Extract interface for ResourceXXX class.
2. Extract interface for StateMachine.

Change-Id: I5b988959c44cf995f5a52b638bcda86d625e6795

9 years agoMerge "Enable ripple for filmstrip buttons" into ub-camera-haleakala
Alan Newberger [Wed, 4 Mar 2015 21:07:39 +0000 (21:07 +0000)]
Merge "Enable ripple for filmstrip buttons" into ub-camera-haleakala

9 years agoMake sure we don't start sessions on long-press if no burst is taken.
Sascha Haeberling [Wed, 4 Mar 2015 20:51:09 +0000 (12:51 -0800)]
Make sure we don't start sessions on long-press if no burst is taken.

  Bug: 19602850

Change-Id: Ia49e508811ca145e93d1f7e2df83100ba3fa1816

9 years agoEnable ripple for filmstrip buttons
Alan Newberger [Tue, 3 Mar 2015 19:54:49 +0000 (11:54 -0800)]
Enable ripple for filmstrip buttons

Style already specified selectableItemBackgroundBorderless, but no
ripple was visible. Swapped in an explicit ripple drawable, works
fine.

Bug: 19586511
Change-Id: I154e5b30705cb2f07b4c6824869abc05a745335e

9 years agoMerge "Decouple OneCameraManager and CameraActivity." into ub-camera-haleakala
Senpo Hu [Wed, 4 Mar 2015 20:32:52 +0000 (20:32 +0000)]
Merge "Decouple OneCameraManager and CameraActivity." into ub-camera-haleakala

9 years agoDecouple OneCameraManager and CameraActivity.
Senpo Hu [Wed, 4 Mar 2015 01:45:35 +0000 (17:45 -0800)]
Decouple OneCameraManager and CameraActivity.

1. To allow other activity (such as SettingsActivity) to
create OneCameraManager.

2. Also simplify OneCameraManager.open() and OneCameraCreator.create()
interface by introducing OneCameraCaptureSetting. From time to time,
we always need to change these interfaces if we want to pass in more
things to OneCamera. This solves the headache and also removes the
dependency between OneCameraCreator and SettingsManager.

Bug: 18523154
Change-Id: Ifb9077bb046740c600dab3b3b369a0f422dbbbeb

9 years agoMerge "[FirstRunDialog] finish when users hit back button." into ub-camera-haleakala
Senpo Hu [Wed, 4 Mar 2015 20:26:24 +0000 (20:26 +0000)]
Merge "[FirstRunDialog] finish when users hit back button." into ub-camera-haleakala

9 years ago[FirstRunDialog] finish when users hit back button.
Senpo Hu [Wed, 4 Mar 2015 20:17:12 +0000 (12:17 -0800)]
[FirstRunDialog] finish when users hit back button.

Bug: 19593942
Change-Id: I5c3d811759f4943e8fca4fc4634bc8ee3df04f58

9 years agoMerge "PhotoModule Timing Regression Fix onResume" into ub-camera-haleakala
I-Jong Lin [Wed, 4 Mar 2015 19:45:14 +0000 (19:45 +0000)]
Merge "PhotoModule Timing Regression Fix onResume" into ub-camera-haleakala

9 years agoPhotoModule Timing Regression Fix onResume
I-Jong Lin [Tue, 3 Mar 2015 23:58:28 +0000 (15:58 -0800)]
PhotoModule Timing Regression Fix onResume

Fix for an timing issue on initializing the Accessibility UI
without having a valid CameraCapabilities.   The initialization
of the Accessibility UI is moved to onCameraAvailable.

Bug: 19605317
Change-Id: Ifbbaca71141a187750890ffe66a1a62558f80f64

9 years agoChange the capture flash to use paint opacity.
Paul Rohde [Wed, 4 Mar 2015 19:01:20 +0000 (11:01 -0800)]
Change the capture flash to use paint opacity.

Performance optimization to prevent GPU thrashing that was occuring
because of custom draw in addition to layer alpha animation. This
makes this animation more performant by altering the alpha property
of the paint instead of the entire layer.

Bug: 19424945

Change-Id: Idb14b49148ce0caf9d5c19380f364e7f20339aca

9 years agoImport translations. DO NOT MERGE
Geoff Mendal [Wed, 4 Mar 2015 14:54:30 +0000 (06:54 -0800)]
Import translations. DO NOT MERGE

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

9 years agoMerge "Switch Burst to use 24 fps for N5." into ub-camera-haleakala
Shashi Shekhar [Wed, 4 Mar 2015 01:31:21 +0000 (01:31 +0000)]
Merge "Switch Burst to use 24 fps for N5." into ub-camera-haleakala

9 years agoSwitch Burst to use 24 fps for N5.
Shashi Shekhar [Tue, 3 Mar 2015 21:51:06 +0000 (13:51 -0800)]
Switch Burst to use 24 fps for N5.

Make burst use 24 fps for N5.

Change-Id: Ifeec74c3a854d6173557ee5a31626b61289a23c0

9 years agoMerge "Filter out duplicate calls to ready state listener" into ub-camera-haleakala
Puneet Lall [Tue, 3 Mar 2015 23:14:18 +0000 (23:14 +0000)]
Merge "Filter out duplicate calls to ready state listener" into ub-camera-haleakala

9 years agoFilter out duplicate calls to ready state listener
Puneet Lall [Tue, 3 Mar 2015 19:10:41 +0000 (11:10 -0800)]
Filter out duplicate calls to ready state listener

 * Adds a FilteredCallback to filter out callback invocations with
   duplicate values.
 * Simplifies ready-state calculations.

Bug: 19535852
Change-Id: I8376c13f24ff7a4f6f2d347f363746c2a6466601

9 years agoMerge "Legacy Autotransform Support to CaptureModule" into ub-camera-haleakala
I-Jong Lin [Tue, 3 Mar 2015 21:30:20 +0000 (21:30 +0000)]
Merge "Legacy Autotransform Support to CaptureModule" into ub-camera-haleakala

9 years agoMerge "Adding ability to zoom in accessibility mode using TalkBack" into ub-camera...
zafir [Tue, 3 Mar 2015 19:05:11 +0000 (19:05 +0000)]
Merge "Adding ability to zoom in accessibility mode using TalkBack" into ub-camera-haleakala

9 years agoAdding ability to zoom in accessibility mode using TalkBack
zafir [Sat, 21 Feb 2015 09:29:22 +0000 (02:29 -0700)]
Adding ability to zoom in accessibility mode using TalkBack

Bug: 18986078
Bug: 19546523
Change-Id: Ie68234a9a3a0b8b9be870cc674658194c72c84ef

9 years agoLegacy Autotransform Support to CaptureModule
I-Jong Lin [Tue, 3 Mar 2015 00:09:01 +0000 (16:09 -0800)]
Legacy Autotransform Support to CaptureModule

Added the legacy support for Capture Module to use
the combination of transformations, dynamic layout, and
transform helpers that PhotoModule uses.  It seems
to replicate that same functionality as the CaptureModuleUI,
but it's good to have that option for comparison, and to be
able to turn it on and off with one line configuration.

Bug: 19271661
Change-Id: I4ad4fa6fe3547373d6fbf77a53a1a18cd26df8ec

9 years agoMerge "Use getLayerType() instead of boolean for hardware layers." into ub-camera...
Paul Rohde [Tue, 3 Mar 2015 01:51:54 +0000 (01:51 +0000)]
Merge "Use getLayerType() instead of boolean for hardware layers." into ub-camera-haleakala

9 years agoUse getLayerType() instead of boolean for hardware layers.
Paul Rohde [Tue, 3 Mar 2015 01:31:54 +0000 (17:31 -0800)]
Use getLayerType() instead of boolean for hardware layers.

Prevent hardware layers from existing during steady states by
using getLayerType() and checking progress during each update.

Bug: 19514276
Change-Id: Ia5d9434cddd78e28aa5575bcba1cec5a91c46b2f

9 years ago[OneCamera v1] wrap RuntimeException properly.
Senpo Hu [Tue, 3 Mar 2015 00:35:22 +0000 (16:35 -0800)]
[OneCamera v1] wrap RuntimeException properly.

Bug: 19280025
Change-Id: Id23fedb018cbe188917bca76abc9a0130dd52b9e

9 years agoMerge "[CaptureIntent] trigger active focus." into ub-camera-haleakala
Senpo Hu [Tue, 3 Mar 2015 00:24:00 +0000 (00:24 +0000)]
Merge "[CaptureIntent] trigger active focus." into ub-camera-haleakala

9 years agoMerge "Turn on hardware layers for semi-transparent layers." into ub-camera-haleakala
Paul Rohde [Mon, 2 Mar 2015 23:48:14 +0000 (23:48 +0000)]
Merge "Turn on hardware layers for semi-transparent layers." into ub-camera-haleakala

9 years agoMerge "Add a shutdown mechanism to the camera lifecycle." into ub-camera-haleakala
Paul Rohde [Mon, 2 Mar 2015 23:36:42 +0000 (23:36 +0000)]
Merge "Add a shutdown mechanism to the camera lifecycle." into ub-camera-haleakala

9 years agoMerge "Futures2 async join functions." into ub-camera-haleakala
Paul Rohde [Mon, 2 Mar 2015 23:36:20 +0000 (23:36 +0000)]
Merge "Futures2 async join functions." into ub-camera-haleakala

9 years ago[CaptureIntent] trigger active focus.
Senpo Hu [Mon, 2 Mar 2015 23:14:38 +0000 (15:14 -0800)]
[CaptureIntent] trigger active focus.

Bug: 19559091
Change-Id: I8060465237c8bf14b36bece9255b1175644be04c

9 years agoTurn on hardware layers for semi-transparent layers.
Paul Rohde [Mon, 2 Mar 2015 21:47:38 +0000 (13:47 -0800)]
Turn on hardware layers for semi-transparent layers.

This tracks and enables hardware layers for the mode switcher
when the alpha values are being animated. This helps prevent large
extra draws that are causing jank when opening or closing the mode
switcher.

Bug: 19514276

Change-Id: I902be1d4470bc5ae9c82ff7329d9b9167dee5eb9

9 years agoMerge "[CaptureIntent] suppress capture indicator." into ub-camera-haleakala
Senpo Hu [Mon, 2 Mar 2015 19:42:19 +0000 (19:42 +0000)]
Merge "[CaptureIntent] suppress capture indicator." into ub-camera-haleakala

9 years agoMerge "Fix focus ring radius responses." into ub-camera-haleakala
Paul Rohde [Mon, 2 Mar 2015 19:34:14 +0000 (19:34 +0000)]
Merge "Fix focus ring radius responses." into ub-camera-haleakala

9 years ago[CaptureIntent] suppress capture indicator.
Senpo Hu [Mon, 2 Mar 2015 19:30:02 +0000 (11:30 -0800)]
[CaptureIntent] suppress capture indicator.

Bug: 19559037
Change-Id: Ie62cc6e7a5a984633c27624fc06e26a4be76d8b7

9 years agoMove JPEG quality to separate stub-able method.
Andy Huibers [Mon, 2 Mar 2015 18:32:55 +0000 (10:32 -0800)]
Move JPEG quality to separate stub-able method.

Bug: 19548882
Change-Id: I43e1fe93de63eacdc8c8a16b4f3b528e3a65728b

9 years agoImport translations. DO NOT MERGE
Geoff Mendal [Mon, 2 Mar 2015 14:55:15 +0000 (06:55 -0800)]
Import translations. DO NOT MERGE

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

9 years agoChange software jpeg encoder quality to CameraProfile.QUALITY_HIGH
Pengchong Jin [Sat, 28 Feb 2015 01:18:23 +0000 (17:18 -0800)]
Change software jpeg encoder quality to CameraProfile.QUALITY_HIGH

Bug: 19548882
Change-Id: I9bdbeb11c2614f3d3d3f60d2a940d2c368617072

9 years agoFix focus ring radius responses.
Paul Rohde [Fri, 27 Feb 2015 21:06:16 +0000 (13:06 -0800)]
Fix focus ring radius responses.

This fixes a scaling problem that was causing the focus controller
to ignore the radius changes on devices that supported providing
lens position. It also removes redundant focus indicator clearing
that was causing intermitent and jumpy animations.

Bug: 19527399

Change-Id: I0b2a734aa9dc4030430f1420cc26d75784dcbdf6

9 years agoMerge "Require USE_SCENE_MODE when HDR is turned on." into ub-camera-haleakala
Paul Rohde [Fri, 27 Feb 2015 20:34:03 +0000 (20:34 +0000)]
Merge "Require USE_SCENE_MODE when HDR is turned on." into ub-camera-haleakala

9 years agoRequire USE_SCENE_MODE when HDR is turned on.
Paul Rohde [Fri, 27 Feb 2015 19:05:57 +0000 (11:05 -0800)]
Require USE_SCENE_MODE when HDR is turned on.

Setting the scene mode to the HDR value is not enough for legacy
devices to pick up the scene mode change. USE_SCENE_MODE must
also be set at the same time for the HDR scene mode to capture
images correctly.

Bug: 18622877

Change-Id: I84c5d483ac7e50860eff28c874ac046220f35a8d

9 years ago[CaptureIntentModule] Fix preview layout race condition.
Senpo Hu [Fri, 27 Feb 2015 10:03:57 +0000 (02:03 -0800)]
[CaptureIntentModule] Fix preview layout race condition.

Bug: 19510313
Change-Id: I5bcf89eeedcf3850a632683b695ebde0bf86d643

9 years agoMerge "[CaptureIntentModule] Transition StateBackgroundWithSurfaceTexture when module...
Senpo Hu [Fri, 27 Feb 2015 01:07:02 +0000 (01:07 +0000)]
Merge "[CaptureIntentModule] Transition StateBackgroundWithSurfaceTexture when module got paused." into ub-camera-haleakala

9 years ago[CaptureIntentModule] Transition StateBackgroundWithSurfaceTexture when
Senpo Hu [Fri, 27 Feb 2015 00:54:14 +0000 (16:54 -0800)]
[CaptureIntentModule] Transition StateBackgroundWithSurfaceTexture when
module got paused.

Bug: 19522250
Change-Id: Iaea6229cb4b7329f401842565d322f041fbc6b3f

9 years agoMerge "Remove accordion" into ub-camera-haleakala
Alan Newberger [Fri, 27 Feb 2015 01:05:35 +0000 (01:05 +0000)]
Merge "Remove accordion" into ub-camera-haleakala

9 years agoMerge "Capture Intent: Initialize options status." into ub-camera-haleakala
Sascha Haeberling [Fri, 27 Feb 2015 01:02:16 +0000 (01:02 +0000)]
Merge "Capture Intent: Initialize options status." into ub-camera-haleakala

9 years agoFix build.
Andy Huibers [Fri, 27 Feb 2015 00:51:06 +0000 (16:51 -0800)]
Fix build.

Bug: 19534046
Change-Id: I95443c855527c45224a8343621a66c852873e8a2

9 years agoAllow number of Images in ImageReader to be variable.
Andy Huibers [Fri, 27 Feb 2015 00:39:20 +0000 (16:39 -0800)]
Allow number of Images in ImageReader to be variable.
Goes with ag/644111.

Bug: 19534046
Change-Id: I7c54de56cd97798f0c325260d6215e1ad8834348

9 years agoMerge "Disable ZSL for pre-MR1 L only for Nexus 5 and 6." into ub-camera-haleakala
Andy Huibers [Fri, 27 Feb 2015 00:36:04 +0000 (00:36 +0000)]
Merge "Disable ZSL for pre-MR1 L only for Nexus 5 and 6." into ub-camera-haleakala