OSDN Git Service

android-x86/packages-apps-Camera2.git
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

9 years agoCapture Intent: Initialize options status.
Sascha Haeberling [Fri, 27 Feb 2015 00:24:53 +0000 (16:24 -0800)]
Capture Intent: Initialize options status.

  Bug: 19535308

Change-Id: I7880d02514a85a6871cc5a000efd127729260733

9 years ago[CaptureIntentModule] Remove event for focus state update.
Senpo Hu [Fri, 27 Feb 2015 00:13:40 +0000 (16:13 -0800)]
[CaptureIntentModule] Remove event for focus state update.

Because now FocusStateListener is registered inside StateReadyForCapture.

Change-Id: I179232077fd37b4206cc13083c167ddccd1824ec

9 years agoRemove accordion
Alan Newberger [Thu, 26 Feb 2015 23:24:30 +0000 (15:24 -0800)]
Remove accordion

No more accordion animation.

Bug: 19535309
Change-Id: I001315e03b63de1ed228d371c849f30f5af2f17d

9 years agoCapture intent: Cancel countdown on resume.
Sascha Haeberling [Thu, 26 Feb 2015 23:53:19 +0000 (15:53 -0800)]
Capture intent: Cancel countdown on resume.

  Bug: 19521959

Change-Id: I06c9462a34718adf3b6669bbecc45a4ee82fb124

9 years agoCapture Intent: Add capture-cancel (cancel countdown) support.
Sascha Haeberling [Thu, 26 Feb 2015 23:00:26 +0000 (15:00 -0800)]
Capture Intent: Add capture-cancel (cancel countdown) support.

  Bug: 19521614

Change-Id: I624601268947d9540d379b74753b7c92898c7553

9 years ago[CaptureIntentModule] Add StateBackgroundWithSurfaceTexture.
Senpo Hu [Thu, 26 Feb 2015 22:38:04 +0000 (14:38 -0800)]
[CaptureIntentModule] Add StateBackgroundWithSurfaceTexture.

Module is in this state when first run dialog is still presented. The
module will be resumed after people finish first run dialog.

Bug: 19531554
Change-Id: Ibe878eba66ab4f235a39a6d5ba0abfdad30f5cab

9 years agoDisable ZSL for pre-MR1 L only for Nexus 5 and 6.
Andy Huibers [Thu, 26 Feb 2015 22:43:09 +0000 (14:43 -0800)]
Disable ZSL for pre-MR1 L only for Nexus 5 and 6.

Bug: 19534046
Change-Id: I6c46c5027658cc6afc6e486114149b46a2f8f4c1

9 years agoMerge "[CaptureIntentModule] Dont' dispatch startPreview call" into ub-camera-haleakala
Senpo Hu [Thu, 26 Feb 2015 22:06:59 +0000 (22:06 +0000)]
Merge "[CaptureIntentModule] Dont' dispatch startPreview call" into ub-camera-haleakala

9 years ago[CaptureIntentModule] Dont' dispatch startPreview call
Senpo Hu [Thu, 26 Feb 2015 21:57:13 +0000 (13:57 -0800)]
[CaptureIntentModule] Dont' dispatch startPreview call

it will result in race condition.

Bug: 19522251
Bug: 19522250
Change-Id: I078ed51a92ae54dd064a00e376e3e151523eb361

9 years agoCaptureIntent: Disable button before taking a picture.
Sascha Haeberling [Thu, 26 Feb 2015 21:18:42 +0000 (13:18 -0800)]
CaptureIntent: Disable button before taking a picture.

  Bug: 19521616

Change-Id: I1c071ab1eddabb759c651bec261363227629ed0e

9 years ago[CaptureIntentModule] enable flash photo.
Senpo Hu [Thu, 26 Feb 2015 20:55:46 +0000 (12:55 -0800)]
[CaptureIntentModule] enable flash photo.

Bug: 19520829
Change-Id: Id56c621f92feb4124d745716f9b101c200b20d3b

9 years agoFix build break by ag/643763
Senpo Hu [Thu, 26 Feb 2015 20:37:42 +0000 (12:37 -0800)]
Fix build break by ag/643763

Change-Id: I4e274526667ec40daa8cd3d2b6d3e8ac5a03ddea

9 years agoMerge "[CaptureIntentModule] Refactoring to help writing unit tests." into ub-camera...
Senpo Hu [Thu, 26 Feb 2015 20:26:36 +0000 (20:26 +0000)]
Merge "[CaptureIntentModule] Refactoring to help writing unit tests." into ub-camera-haleakala

9 years ago[CaptureIntentModule] Refactoring to help writing unit tests.
Senpo Hu [Thu, 26 Feb 2015 02:18:11 +0000 (18:18 -0800)]
[CaptureIntentModule] Refactoring to help writing unit tests.

Eventually I want to get rid of those processXXX methods in State class.

1. Move various callback into state class instead of having them all in
the module class.

2. Create various event class instead of using anonymous class.

Change-Id: I065ca199052be36b5b29cc0d6743bb174b128d75

9 years agoMerge "Adding reporting functionality using Feedback API for PhotoModule and CaptureM...
zafir [Wed, 25 Feb 2015 21:56:45 +0000 (21:56 +0000)]
Merge "Adding reporting functionality using Feedback API for PhotoModule and CaptureModule when captured pictures don't save to the device." into ub-camera-haleakala

9 years agoMerge "[CaptureIntent] fix review image shift issue." into ub-camera-haleakala
Senpo Hu [Wed, 25 Feb 2015 21:35:17 +0000 (21:35 +0000)]
Merge "[CaptureIntent] fix review image shift issue." into ub-camera-haleakala

9 years ago[CaptureIntent] fix review image shift issue.
Senpo Hu [Wed, 25 Feb 2015 19:28:44 +0000 (11:28 -0800)]
[CaptureIntent] fix review image shift issue.

Bug: 19510803
Change-Id: I817a00f6ed56311dbbf3e257ec23da6dc139ff14

9 years agoAdding reporting functionality using Feedback API for PhotoModule and CaptureModule...
zafir [Fri, 6 Feb 2015 03:04:38 +0000 (19:04 -0800)]
Adding reporting functionality using Feedback API for PhotoModule and CaptureModule when captured pictures don't save to the device.

Bug: 19231841
Change-Id: I7d66db1e4c273dc7ec082f40a80b349bd91a7e8b

9 years agoMerge "Log API2 preview repeat failures." into ub-camera-haleakala
Andy Huibers [Wed, 25 Feb 2015 01:22:19 +0000 (01:22 +0000)]
Merge "Log API2 preview repeat failures." into ub-camera-haleakala

9 years agoLog API2 preview repeat failures.
Andy Huibers [Tue, 24 Feb 2015 21:07:49 +0000 (13:07 -0800)]
Log API2 preview repeat failures.

Bug: 19061883
Change-Id: I45a361169e27bc22b5fe36f5d54810fe2abcf6e5

9 years agoFix preview transform issue when switching between back/front camera.
Senpo Hu [Tue, 24 Feb 2015 21:47:35 +0000 (13:47 -0800)]
Fix preview transform issue when switching between back/front camera.

Move preview related logic to StateStartingPreview.
Add more documentation.

Bug: 18726217
Change-Id: I839c243656daa40773da6631359b91808c2d98f8

9 years agoMerge "Fix resource leak when CaptureIntentModule goes to StateBackground." into...
Senpo Hu [Tue, 24 Feb 2015 20:10:37 +0000 (20:10 +0000)]
Merge "Fix resource leak when CaptureIntentModule goes to StateBackground." into ub-camera-haleakala

9 years agoFix resource leak when CaptureIntentModule goes to StateBackground.
Senpo Hu [Mon, 23 Feb 2015 20:48:05 +0000 (12:48 -0800)]
Fix resource leak when CaptureIntentModule goes to StateBackground.

Make RefCountBase more solid.

Bug: 18726217
Change-Id: Ibb5d731f8891627e832d5961f0e736aaaaff7078

9 years agoMerge "Make module scope prefix a static agent value" into ub-camera-haleakala
Alan Newberger [Tue, 24 Feb 2015 18:04:47 +0000 (18:04 +0000)]
Merge "Make module scope prefix a static agent value" into ub-camera-haleakala

9 years agoMake module scope prefix a static agent value
Alan Newberger [Tue, 24 Feb 2015 00:41:31 +0000 (16:41 -0800)]
Make module scope prefix a static agent value

This removes the multiple "PhotoModule" strings across
the codebase and allows for retrieval of a module's string
scope prefix as part of its static ModuleAgent properties
rather than as a property of the module itself.

Bug: 19482146
Change-Id: I2c36878dd070106149909f19f98bcae221b94012

9 years agoMerge "Limit ZSL images to 100ms look-back" into ub-camera-haleakala
Puneet Lall [Tue, 24 Feb 2015 17:23:11 +0000 (17:23 +0000)]
Merge "Limit ZSL images to 100ms look-back" into ub-camera-haleakala

9 years agoMerge "Refactor PreviewTransform into CaptureModule" into ub-camera-haleakala
I-Jong Lin [Tue, 24 Feb 2015 00:55:32 +0000 (00:55 +0000)]
Merge "Refactor PreviewTransform into CaptureModule" into ub-camera-haleakala

9 years agoRefactor PreviewTransform into CaptureModule
I-Jong Lin [Mon, 23 Feb 2015 20:43:53 +0000 (12:43 -0800)]
Refactor PreviewTransform into CaptureModule

Propogate the refactoring of the Preview Transformation into
CaptureModule so that we can have consistent cross-module
implementation.  Stepping stone CL on the way to fix the aspect
ratio.

Bug: 19271661

Change-Id: Ib3e09ed0c4c5cef9e94bcd0f89228c1b2990f489

9 years agoMerge "Only copy preferences files on upgrade if they previously exist" into ub-camer...
Alan Newberger [Mon, 23 Feb 2015 23:16:01 +0000 (23:16 +0000)]
Merge "Only copy preferences files on upgrade if they previously exist" into ub-camera-haleakala

9 years agoOnly copy preferences files on upgrade if they previously exist
Alan Newberger [Mon, 23 Feb 2015 22:57:36 +0000 (14:57 -0800)]
Only copy preferences files on upgrade if they previously exist

If no data exists in an old module format, there's no need to
upgrade it. This is only a partial fix to the below bug, but
will allow for fresh installs to work. Full fix requires all
modules (or rather, their scope) to be created programmatically.

Bug: 19482146
Change-Id: I50918eefc4ae9dcb472d2fc79cb1c5de710c5806

9 years agoIntroduce CaptureIntentSession and CaptureIntentSessionFactory.
Senpo Hu [Sat, 21 Feb 2015 02:10:21 +0000 (18:10 -0800)]
Introduce CaptureIntentSession and CaptureIntentSessionFactory.

The capture intent module needs its own custom CaptureSession
implementation.

This also adds two new methods in CaptureSessionManager.SessionListener
in order to allow CaptureIntentModule receive the thumbnail image
and compressed picture data byte array.

Bug: 18726217
Change-Id: If823846fa4f37d9fc7ee8becde7c95ed559b4200

9 years agoLimit ZSL images to 100ms look-back
Puneet Lall [Mon, 23 Feb 2015 19:21:11 +0000 (11:21 -0800)]
Limit ZSL images to 100ms look-back

Bug: 19244733
Change-Id: Ic537a627aeda3c32112c41d9de9026c93e277d85

9 years agoFix log tags with length greater than 20 chars
Puneet Lall [Mon, 23 Feb 2015 18:38:05 +0000 (10:38 -0800)]
Fix log tags with length greater than 20 chars

Change-Id: Ie7d3c0d47af1b53eba7015be4b958bd3f45599a1

9 years agoMerge "Add metadata to ImageSaver interface" into ub-camera-haleakala
Puneet Lall [Mon, 23 Feb 2015 18:23:16 +0000 (18:23 +0000)]
Merge "Add metadata to ImageSaver interface" into ub-camera-haleakala

9 years agoAdd metadata to ImageSaver interface
Puneet Lall [Fri, 20 Feb 2015 21:36:16 +0000 (13:36 -0800)]
Add metadata to ImageSaver interface

ImageSavers are now provided with a future to metadata
(TotalCaptureResult) for full-size images.

This change also implements a proper .equals() and .hashCode() for
ImageProxy.

Bug: 19443252
Change-Id: I16aec5edcd7ad64ea71e457d1de7976fc7e27c72

9 years agoImport translations. DO NOT MERGE
Geoff Mendal [Mon, 23 Feb 2015 14:17:08 +0000 (06:17 -0800)]
Import translations. DO NOT MERGE

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

9 years agoMerge "Reduce memory footprint of session bitmap cache." into ub-camera-haleakala
Alan Newberger [Sat, 21 Feb 2015 03:12:57 +0000 (03:12 +0000)]
Merge "Reduce memory footprint of session bitmap cache." into ub-camera-haleakala

9 years agoReduce memory footprint of session bitmap cache.
Alan Newberger [Thu, 19 Feb 2015 23:51:01 +0000 (15:51 -0800)]
Reduce memory footprint of session bitmap cache.

Convert storage bitmap cache to an LRU cache to have a fixed
upper bound on usage. Evict bitmaps after a session is complete.

Bug: 19124117
Change-Id: I4a5dd9f15c3b986601c4a92477edf9346f190de1

9 years agoCentralize logic for Camera API feature determination.
Sascha Haeberling [Thu, 19 Feb 2015 19:35:43 +0000 (11:35 -0800)]
Centralize logic for Camera API feature determination.

  Bug: 19179276

This captures camera capabilities in a centralized class and allows
them to be overridden by GServices in the field or using adb.

Since this is not it's own class it would be trivial to create another
instance for testing and pass that into CameraActivity or even to change
these values using a UI before the actual Activity is started.

Change-Id: I74262c8467f631c7b5e42b02d269d5f401d4e9e7

9 years agoMerge "Assign an initial state for the state machine." into ub-camera-haleakala
Senpo Hu [Sat, 21 Feb 2015 01:13:56 +0000 (01:13 +0000)]
Merge "Assign an initial state for the state machine." into ub-camera-haleakala

9 years agoAssign an initial state for the state machine.
Senpo Hu [Sat, 21 Feb 2015 01:02:11 +0000 (17:02 -0800)]
Assign an initial state for the state machine.

Bug: 18726217
Change-Id: I357a0565697ee7e7ec0473b8906362fc63d79c4f

9 years agoMerge "HDR Scene mode support for CaptureModule." into ub-camera-haleakala
Paul Rohde [Sat, 21 Feb 2015 00:55:01 +0000 (00:55 +0000)]
Merge "HDR Scene mode support for CaptureModule." into ub-camera-haleakala

9 years agoMerge "Instantiate CaptureIntentModule in ModulesInfo." into ub-camera-haleakala
Senpo Hu [Sat, 21 Feb 2015 00:52:43 +0000 (00:52 +0000)]
Merge "Instantiate CaptureIntentModule in ModulesInfo." into ub-camera-haleakala

9 years agoInstantiate CaptureIntentModule in ModulesInfo.
Senpo Hu [Sat, 21 Feb 2015 00:37:34 +0000 (16:37 -0800)]
Instantiate CaptureIntentModule in ModulesInfo.

Bug: 18726217
Change-Id: I93397322843a7b1258b881e19ae90a7f6fb55e3b

9 years agoHDR Scene mode support for CaptureModule.
Paul Rohde [Fri, 20 Feb 2015 19:23:17 +0000 (11:23 -0800)]
HDR Scene mode support for CaptureModule.

Bug: 18622877 N4 HDR Scene support.
Bug: 19269257 HDR+ flash setting persistance.

Change-Id: Ibac3d6513a1e14d8a2ffaf6208509133d31a8fb8

9 years agoFix build breakage due to incorrect import
Puneet Lall [Fri, 20 Feb 2015 23:52:35 +0000 (15:52 -0800)]
Fix build breakage due to incorrect import

Change-Id: I2c13c343fd83d97e3205510fd4634ae0b941cf14

9 years agoMerge "Introduce CaptureIntentModule" into ub-camera-haleakala
Senpo Hu [Fri, 20 Feb 2015 23:35:47 +0000 (23:35 +0000)]
Merge "Introduce CaptureIntentModule" into ub-camera-haleakala

9 years agoMerge "Reset the camera after detecting repeated failure" into ub-camera-haleakala
Puneet Lall [Fri, 20 Feb 2015 23:35:22 +0000 (23:35 +0000)]
Merge "Reset the camera after detecting repeated failure" into ub-camera-haleakala

9 years agoIntroduce CaptureIntentModule
Senpo Hu [Thu, 19 Feb 2015 19:43:52 +0000 (11:43 -0800)]
Introduce CaptureIntentModule

Continue with ag/618042.
===================
Improve the UX by adopting ZSL and showing fast intermediate thumbnail.

Try to implement this from scratch, this module has an
event driven and state machine design.
  * the state machine is thread safe.
  * Event is implemented with guava's Function.
  * The event processing uses Strategy pattern.

State Machine Chart:
https://docs.google.com/presentation/d/1LA30__ZNnzO6HWju1kA0geJ5LBsMs3hvdTf6_IPn9Y0/edit#slide=id.p

Bug: 18726217
Change-Id: Ie869c84bfe2f02145e5cb5c9e9af270fd82048d6

9 years agoMerge "Add captureintent.PictureDecoder." into ub-camera-haleakala
Senpo Hu [Fri, 20 Feb 2015 03:28:42 +0000 (03:28 +0000)]
Merge "Add captureintent.PictureDecoder." into ub-camera-haleakala

9 years agoMerge "Move resources allocation in CameraActivity to the front in onCreateTasks...
Senpo Hu [Fri, 20 Feb 2015 03:28:26 +0000 (03:28 +0000)]
Merge "Move resources allocation in CameraActivity to the front in onCreateTasks." into ub-camera-haleakala

9 years agoMove resources allocation in CameraActivity to the front in onCreateTasks.
Senpo Hu [Fri, 20 Feb 2015 00:31:11 +0000 (16:31 -0800)]
Move resources allocation in CameraActivity to the front in onCreateTasks.

The new capture intent module requires several resource in its
constructor. This CL addresses the need.

Bug: 18726217
Change-Id: Ic2c0966151b58b23b4ac4be882067bf9362177f7

9 years agoAdd captureintent.PictureDecoder.
Senpo Hu [Fri, 20 Feb 2015 00:13:40 +0000 (16:13 -0800)]
Add captureintent.PictureDecoder.

Extract the logic from PhotoModule so it be reused by the new capture
intent module.

Bug: 18726217
Change-Id: I7c3b2f6f556dd40bbc02d0624117bf4675e85a02

9 years agoMerge "Remove CanSwipeInFullScreen attribute." into ub-camera-haleakala
Paul Rohde [Thu, 19 Feb 2015 23:08:50 +0000 (23:08 +0000)]
Merge "Remove CanSwipeInFullScreen attribute." into ub-camera-haleakala

9 years agoReset the camera after detecting repeated failure
Puneet Lall [Thu, 19 Feb 2015 00:47:02 +0000 (16:47 -0800)]
Reset the camera after detecting repeated failure

Bug: 19061883
Change-Id: I913334e19fc248010bdeb2dab4ae1a6d05427f40

9 years agoRefactors the CaptureSession API by splitting out notifier interface.
Sascha Haeberling [Wed, 18 Feb 2015 22:46:48 +0000 (14:46 -0800)]
Refactors the CaptureSession API by splitting out notifier interface.

This will remove the need to pass in an *Impl instead of an interface
and will therefore make the capture intent refactor cleaner as well.

Change-Id: I4d3b272e9cde1548c8ef1ad235a31bf420fe4f74

9 years agoRemove CanSwipeInFullScreen attribute.
Paul Rohde [Thu, 19 Feb 2015 19:26:01 +0000 (11:26 -0800)]
Remove CanSwipeInFullScreen attribute.

This fixes the swipe guesture problem by removing the mostly
unused canSwipeInFullScreen attribute on filmstrip items and
checking existing usages to ensure they still work.

Bug: 18948437

Change-Id: I7d8c9fba4b0cf3db6fc3d60afe37d527c0732318

9 years agoMerge "Lock opacity of filmstrip items at 100% when scaling." into ub-camera-haleakala
Paul Rohde [Thu, 19 Feb 2015 17:29:40 +0000 (17:29 +0000)]
Merge "Lock opacity of filmstrip items at 100% when scaling." into ub-camera-haleakala

9 years agoFix accidental import.
Paul Rohde [Thu, 19 Feb 2015 16:46:24 +0000 (08:46 -0800)]
Fix accidental import.

Change-Id: Ia6bb08c1d1c690510faf1b8fd45b128685908821

9 years agoCreate log and guard profilers.
Paul Rohde [Wed, 21 Jan 2015 19:08:46 +0000 (11:08 -0800)]
Create log and guard profilers.

Change-Id: I824e0f65be05e3681189802610656955ba14d5bf

9 years agoLock opacity of filmstrip items at 100% when scaling.
Paul Rohde [Thu, 19 Feb 2015 00:26:28 +0000 (16:26 -0800)]
Lock opacity of filmstrip items at 100% when scaling.

Bug: 19252309
Change-Id: Ia82714649e7fac7b1cce2adc21c36832e055f9f6

9 years agoMerge "Add black buttonTint to checkbox" into ub-camera-haleakala
Alan Newberger [Thu, 19 Feb 2015 01:33:25 +0000 (01:33 +0000)]
Merge "Add black buttonTint to checkbox" into ub-camera-haleakala

9 years agoMerge "Introduce CaptureSessionFactory interface." into ub-camera-haleakala
Senpo Hu [Thu, 19 Feb 2015 01:09:28 +0000 (01:09 +0000)]
Merge "Introduce CaptureSessionFactory interface." into ub-camera-haleakala

9 years agoAdd black buttonTint to checkbox
Alan Newberger [Wed, 18 Feb 2015 22:45:43 +0000 (14:45 -0800)]
Add black buttonTint to checkbox

For API 21, add a black button tint to the checkbox to ensure it
paints black against the current light blue background.

Bug: 19083903
Change-Id: Ifdd4ddf39bcd379b5761e3d2dacb3963967fd9eb

9 years agoFix location of PreviewSizeSelector.
Paul Rohde [Wed, 18 Feb 2015 21:30:19 +0000 (13:30 -0800)]
Fix location of PreviewSizeSelector.

Change-Id: I7645ef27e46e5652a427a2a19ab9df8a3055cb40

9 years agoDisable AE precapture trigger when flash is off
Puneet Lall [Tue, 17 Feb 2015 21:12:40 +0000 (13:12 -0800)]
Disable AE precapture trigger when flash is off

Bug: 19407066
Change-Id: I9d5ec0271510fe6ff5615767fc3523ba5e287bc3

9 years agoMerge "Make sure shutter button is inactive before the preview was started." into...
Sascha Haeberling [Wed, 18 Feb 2015 19:39:34 +0000 (19:39 +0000)]
Merge "Make sure shutter button is inactive before the preview was started." into ub-camera-haleakala

9 years agoMerge "Add a PreviewSizeSelector interface." into ub-camera-haleakala
Paul Rohde [Wed, 18 Feb 2015 19:31:29 +0000 (19:31 +0000)]
Merge "Add a PreviewSizeSelector interface." into ub-camera-haleakala

9 years agoMerge "Fix resource leak" into ub-camera-haleakala
Puneet Lall [Wed, 18 Feb 2015 19:28:17 +0000 (19:28 +0000)]
Merge "Fix resource leak" into ub-camera-haleakala

9 years agoFix resource leak
Puneet Lall [Wed, 18 Feb 2015 18:58:23 +0000 (10:58 -0800)]
Fix resource leak

Bug: 19407130
Change-Id: Ia08013c1240a2e3e4b9a55d0a08be06d3f4f91b3

9 years agoMake sure ringer/sound silencing does not interfere with recording
Andy Huibers [Wed, 18 Feb 2015 18:09:00 +0000 (10:09 -0800)]
Make sure ringer/sound silencing does not interfere with recording
start and stop sounds.

Bug: 19210666

Change-Id: I16b3cb4df62b05903ad53044ac66d69efffb5f74

9 years agoAdd a PreviewSizeSelector interface.
Paul Rohde [Wed, 18 Feb 2015 17:03:29 +0000 (09:03 -0800)]
Add a PreviewSizeSelector interface.

This removes the required context object for the utility objects
in both CameraUtil and CaptureModuleUtil. Adding an interface
for PreviewSizeSelection clears the way for future work to move
the preview size selection code into a dedicated class and to have
api specific versions of preview selection code for startup
speed improvements.

Change-Id: I92e58dad23b08057eb10984c31d04947a376ac6d

9 years agoMerge "Fix NaN in LinearScale" into ub-camera-haleakala
Paul Rohde [Wed, 18 Feb 2015 00:37:21 +0000 (00:37 +0000)]
Merge "Fix NaN in LinearScale" into ub-camera-haleakala

9 years agoFix NaN in LinearScale
Paul Rohde [Wed, 18 Feb 2015 00:13:21 +0000 (16:13 -0800)]
Fix NaN in LinearScale

Change-Id: Ie3cc20f713940aba7426ce54dbb2fad32cda45bf

9 years agoN4 Capture Module Rotation/EXIF fix
I-Jong Lin [Fri, 13 Feb 2015 19:23:34 +0000 (11:23 -0800)]
N4 Capture Module Rotation/EXIF fix

Finally, have some understanding what values are supposed to be
passed to the session vs. what are supposed to be put in the EXIF
flags.  Although they are similar, they are used for slightly
different purposes.   This CL has been tested on both N5 and N4
and seems to give filmstrip behavior and forwards the correct
EXIF values.

Bug: 19378973
Change-Id: Ie8b41b6d8e03e0a5392da8f0e7b52f65383b4e4f

9 years agoIntroduce CaptureSessionFactory interface.
Senpo Hu [Tue, 17 Feb 2015 21:29:03 +0000 (13:29 -0800)]
Introduce CaptureSessionFactory interface.

Currently CaptureSessionManagerImpl always creates CaptureSessionImpl.
However, the capture intent module needs a mechanism to create its
custom CaptureSession objects.

Bug: 18726217
Change-Id: I30b3e01dc27f7c5f14d783c83bcdab76e823f0a6

9 years agoMerge "Allow for the thumbnail to be updated and refreshed." into ub-camera-haleakala
Sascha Haeberling [Tue, 17 Feb 2015 21:26:40 +0000 (21:26 +0000)]
Merge "Allow for the thumbnail to be updated and refreshed." into ub-camera-haleakala

9 years agoMerge "Add method to detect L MR1 or higher for NPF compatability." into ub-camera...
Sascha Haeberling [Tue, 17 Feb 2015 21:03:35 +0000 (21:03 +0000)]
Merge "Add method to detect L MR1 or higher for NPF compatability." into ub-camera-haleakala

9 years agoAdd method to detect L MR1 or higher for NPF compatability.
Sascha Haeberling [Tue, 17 Feb 2015 19:39:04 +0000 (11:39 -0800)]
Add method to detect L MR1 or higher for NPF compatability.

  Bug: 1939424:

Change-Id: I60470e4ddfa81004db6f3efe4ea470f89579baa5

9 years agoEnable exposure compensation in CaptureModule.
Senpo Hu [Wed, 11 Feb 2015 02:28:17 +0000 (18:28 -0800)]
Enable exposure compensation in CaptureModule.

* Expose camera exposure compensation capabilities in OneCameraCharacteristics.
* Turn off exposure compensation on Nexus 6 (API level 21).

Bug: 18523154
Change-Id: I551f19945f5a64a09a76b3a0777664d16a9b2ba2

9 years agoMerge "Read focus range from CameraCharacteristics." into ub-camera-haleakala
Paul Rohde [Tue, 17 Feb 2015 18:16:25 +0000 (18:16 +0000)]
Merge "Read focus range from CameraCharacteristics." into ub-camera-haleakala

9 years agoAllow for the thumbnail to be updated and refreshed.
Sascha Haeberling [Sat, 14 Feb 2015 20:37:10 +0000 (12:37 -0800)]
Allow for the thumbnail to be updated and refreshed.

  Bug: 19325176

Change-Id: Icc0f08b4c8b20e1b6d3e66fa420efea9e24faf73

9 years agoMerge "Fix bug in which exposure and AE settings were not applied to AF scans" into...
Puneet Lall [Fri, 13 Feb 2015 20:10:38 +0000 (20:10 +0000)]
Merge "Fix bug in which exposure and AE settings were not applied to AF scans" into ub-camera-haleakala

9 years agoFix bug in which exposure and AE settings were not applied to AF scans
Puneet Lall [Fri, 13 Feb 2015 20:00:32 +0000 (12:00 -0800)]
Fix bug in which exposure and AE settings were not applied to AF scans

Change-Id: I2b495bab4221f231835219173edade26f3e4e896

9 years agoRemove flicker from view items added to hierarchy as visible
Alan Newberger [Fri, 13 Feb 2015 18:03:49 +0000 (10:03 -0800)]
Remove flicker from view items added to hierarchy as visible

With view items made visible right when added to hierarchy,
under certain use cases the view would then get drawn before
layout puts them offscreen and turns visibility off again. One
example is delete -- once a deletion drag finishes, a view is
added to the end of the 5-item array set to visible, and when
dragging would briefly get shown. This CL ensures views only
become visible when properly positioned.

Bug: 17905863
Change-Id: I860dbee421f5bf6acb3cd9f5c09e4130eb9bc3c9

9 years agoN4 CaptureModule Memory Optimization
I-Jong Lin [Thu, 12 Feb 2015 21:46:05 +0000 (13:46 -0800)]
N4 CaptureModule Memory Optimization

Although functionally correct, there was some processing that was
wasteful of memory in N4 Capture Module.   The two major culprits
are the implicit full-size JPEG decoding for the thumbnail, and
using the capacity (instead of the limit) of the byte buffers when
making a memory copy of the JPEG data.  Fixes include a explicit
subsample value for thumbnail and a tighter memory allocation based on
the limit.

Bug: 19354120
Change-Id: Ibd94c30974753e426254ac002e795b5d1de8bcba

9 years agoMerge "Route all thumbnail updates through CaptureSession" into ub-camera-haleakala
Sascha Haeberling [Fri, 13 Feb 2015 04:50:21 +0000 (04:50 +0000)]
Merge "Route all thumbnail updates through CaptureSession" into ub-camera-haleakala

9 years agoMerge "Simplify double onResume workaround and allow different delays for secure...
Andy Huibers [Thu, 12 Feb 2015 23:21:09 +0000 (23:21 +0000)]
Merge "Simplify double onResume workaround and allow different delays for secure and non secure lock screen." into ub-camera-haleakala

9 years agoMerge "Fix setting surface texture." into ub-camera-haleakala
Shashi Shekhar [Thu, 12 Feb 2015 23:12:33 +0000 (23:12 +0000)]
Merge "Fix setting surface texture." into ub-camera-haleakala

9 years agoFix setting surface texture.
Shashi Shekhar [Thu, 12 Feb 2015 22:47:50 +0000 (14:47 -0800)]
Fix setting surface texture.

Related to removal of FrameDistributor in http://ag/616209

BUG: 19368123
Change-Id: Ie49c5303db72d457493d7967ec2ee5e8638e1956

9 years agoRoute all thumbnail updates through CaptureSession
Sascha Haeberling [Tue, 10 Feb 2015 18:08:18 +0000 (10:08 -0800)]
Route all thumbnail updates through CaptureSession

  Bug: 19326495
  Bug: 19310525

This removes the thumbnail ready callback that was hooked directly into
the ImageBackend from the CaptureModule before since it's now
unnecessary.

Client of CaptureSession can no optionally specify whether the updated
thumbnail is to be used to update the capture indicator. Default is
'yes' so that Lens Blur, Photo Sphere and HDR+ don't need to change.

Change-Id: I94adb50f875ccee214492f03f00ed2a67d400da1

9 years agoSimplify double onResume workaround and allow different delays for secure
Andy Huibers [Wed, 11 Feb 2015 23:17:02 +0000 (15:17 -0800)]
Simplify double onResume workaround and allow different delays for secure
and non secure lock screen.

Bug: 17925205
Change-Id: Ia7cf1d3e134cb7aa725fdeed71235825969d0f89

9 years agoRead focus range from CameraCharacteristics.
Paul Rohde [Thu, 12 Feb 2015 17:29:38 +0000 (09:29 -0800)]
Read focus range from CameraCharacteristics.

- Remove hardcoded focus range values.
- Explicitly provide a lens range and range checks.

Bug: 19356651

Change-Id: Ied2513b5a654a00af07e76a66e72aac50ffc9c42

9 years agoN4 Shutter Regression Fix
I-Jong Lin [Thu, 12 Feb 2015 17:18:43 +0000 (09:18 -0800)]
N4 Shutter Regression Fix

The fix to allow the OnCameraAvailable Listener synchronization
causes a regression failure in enabling the shutter button properly.
Remove that fix, but now I can enable CaptureModule N4 by default,
since it actually works now.

Bug: 19355923
Change-Id: I60fbc38010535cd750a2a74b9b6ead12df80e366

9 years agoMerge "N4 CaptureModule not closing" into ub-camera-haleakala
I-Jong Lin [Thu, 12 Feb 2015 16:50:54 +0000 (16:50 +0000)]
Merge "N4 CaptureModule not closing" into ub-camera-haleakala