OSDN Git Service

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

9 years agoPort burst to use FrameServer.
Shashi Shekhar [Fri, 16 Jan 2015 18:16:25 +0000 (10:16 -0800)]
Port burst to use FrameServer.

Port burst to frameserver
- simplifies burst interfaces
- removes burst methods from OneCamera.
- locks orientation when burst is running.
- Deletes most old code for burst integration.
- Removes frame distributor preview forwarding, instead frames are
  streamed using a surface texture the Surface for which is passed
  as a output target to the create capture session.
- Deletes FrameDistributor, now the low-res frames are streamed to a new
  surface specifically setup for burst.

Change-Id: I50f2955bb48610a7e284f9609cd70b8e4e1f1059

9 years agoMerge "Fix several focus indicator edge cases." into ub-camera-haleakala
Paul Rohde [Thu, 12 Feb 2015 00:41:43 +0000 (00:41 +0000)]
Merge "Fix several focus indicator edge cases." into ub-camera-haleakala

9 years agoN4 CaptureModule not closing
I-Jong Lin [Wed, 11 Feb 2015 23:01:05 +0000 (15:01 -0800)]
N4 CaptureModule not closing

N4 CaptureModule was not wired up properly to close the device when it
closed.  There's still an issue that the synchronization is incorrect,
i.e. we don't guarentee close has completed before we open it again.
There's a fix so that we can use OnCameraAvailable listener to only open
the camera when it is available.

Bug: 19332637
Change-Id: Ie88acb3a9f75a5896606dd660c005de0dc82dc3c

9 years agoMerge "Adjust device lifecycle log messages to be more consistent." into ub-camera...
Paul Rohde [Wed, 11 Feb 2015 21:29:39 +0000 (21:29 +0000)]
Merge "Adjust device lifecycle log messages to be more consistent." into ub-camera-haleakala

9 years agoAdjust device lifecycle log messages to be more consistent.
Paul Rohde [Wed, 11 Feb 2015 20:29:42 +0000 (12:29 -0800)]
Adjust device lifecycle log messages to be more consistent.

Change-Id: Iaeed1c0746f05aedcd1ee0554b0904256a28e623

9 years agoRemove overlays from Capture UI, partial revert of overdraw improvements
Alan Newberger [Wed, 11 Feb 2015 20:38:10 +0000 (12:38 -0800)]
Remove overlays from Capture UI, partial revert of overdraw improvements

This partially reverts ag/631666, keeping overdraw improvements for
filmstrip but adding overdraw back in for capture to remove overlays
which have landscape issues in video/photosphere. Keeping
MarginDrawable in codebase for now in hopes of re-adding the overlay
soon.

Bug: 19352143
Change-Id: I7c75a7dcfa1643c7e4783742bfe5da49443a1848

9 years agoFix several focus indicator edge cases.
Paul Rohde [Sat, 31 Jan 2015 00:55:25 +0000 (16:55 -0800)]
Fix several focus indicator edge cases.

Bug: 19213609
Bug: 18949556
Bug: 19214672
Bug: 19213602

Change-Id: I0d5c5ce8b4a62f98b44f6ae02ef1ac81d1d7f178

9 years agoMerge "Don't assume OneCamera implementation is ready to take a shot after startup...
Andy Huibers [Tue, 10 Feb 2015 23:16:10 +0000 (23:16 +0000)]
Merge "Don't assume OneCamera implementation is ready to take a shot after startup." into ub-camera-haleakala

9 years agoMerge "Remove app background and reduce 1 layer of overdraw" into ub-camera-haleakala
Alan Newberger [Tue, 10 Feb 2015 22:09:24 +0000 (22:09 +0000)]
Merge "Remove app background and reduce 1 layer of overdraw" into ub-camera-haleakala

9 years agoMerge "Add JPEG Orientation into N4 CaptureRequests" into ub-camera-haleakala
I-Jong Lin [Tue, 10 Feb 2015 22:03:35 +0000 (22:03 +0000)]
Merge "Add JPEG Orientation into N4 CaptureRequests" into ub-camera-haleakala

9 years agoAdd JPEG Orientation into N4 CaptureRequests
I-Jong Lin [Thu, 5 Feb 2015 18:46:26 +0000 (10:46 -0800)]
Add JPEG Orientation into N4 CaptureRequests

Wired up the SimpleOneCameraFactory to dynamically decorate
the JPEG capture request with the proper orientation so that
the framework does the proper orientation.

Paired with ag/629241.

Bug: 19122922
Change-Id: If206b0d18979ddc4ed9ab6df7ce4d22ba01534a8

9 years agoDon't assume OneCamera implementation is ready to take a shot after startup.
Andy Huibers [Tue, 10 Feb 2015 18:59:36 +0000 (10:59 -0800)]
Don't assume OneCamera implementation is ready to take a shot after startup.

Bug: 18114636
Change-Id: I1b4366dcef4a7f02a3240768508b39296db9b0b9

9 years agoRemove app background and reduce 1 layer of overdraw
Alan Newberger [Tue, 10 Feb 2015 04:53:03 +0000 (20:53 -0800)]
Remove app background and reduce 1 layer of overdraw

Set the app background to null. This saves one full layer of
overdraw in the filmstrip. The capture UI is more dependent
on the window background, both for gaps in the preview and
screen edges, and behind the shutter button when it is
made transparent when the mode list is open. The preview
is a large portion of screen and to remove one overdraw,
we instead fill gaps around the preview with a
MarginDrawable overlay. This CL leaves a background behind
the shutter button when opaque, to allow for it becoming
transparent during mode list view.

Bug: 18596159
Change-Id: I2a9083a2413944c6244e2f0528164e8852ae3d8e

9 years agoLog service requests taking longer than a threshold.
Andy Huibers [Tue, 10 Feb 2015 17:36:59 +0000 (09:36 -0800)]
Log service requests taking longer than a threshold.

Bug: 19269341
Change-Id: I1d199b7e53890214ab2d9fabb0e82219ed7b5699

9 years agoFish crash due to null session bitmap
Sascha Haeberling [Tue, 10 Feb 2015 06:12:07 +0000 (22:12 -0800)]
Fish crash due to null session bitmap

  Bug: 19310525

Change-Id: I3701f18ba4080f2414bdb84141d8bf9597d9ab3b

9 years agoFix capture indicators not showing caused by refactoring last month.
Sascha Haeberling [Tue, 10 Feb 2015 01:36:08 +0000 (17:36 -0800)]
Fix capture indicators not showing caused by refactoring last month.

  Bug: 19310525

This was caused by http://ag/607738 which refactored the data classes.

Change-Id: Idbbaf1b40c9aaf5ea241408125fa97bb2e6c36b2

9 years agoMerge "gray cleanup to 1b1b1b" into ub-camera-haleakala
Alan Newberger [Mon, 9 Feb 2015 18:00:03 +0000 (18:00 +0000)]
Merge "gray cleanup to 1b1b1b" into ub-camera-haleakala

9 years agoMerge "Access KeyguardManager from AndroidServices." into ub-camera-haleakala
Andy Huibers [Mon, 9 Feb 2015 17:16:52 +0000 (17:16 +0000)]
Merge "Access KeyguardManager from AndroidServices." into ub-camera-haleakala

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

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

9 years agogray cleanup to 1b1b1b
Alan Newberger [Sat, 7 Feb 2015 02:02:10 +0000 (18:02 -0800)]
gray cleanup to 1b1b1b

During Material update, filmstrip background was intentionally made
1b1b1b. Capture button and mode covers were slightly off from a previous
gray design. Unifying all to one color constant. There are other, unused
background specified from older times, removing them as part of cleanup.
Confirmed with UX that all these colors should be 1b1b1b.

Change-Id: I3da07e9828546d2c9d30a8ac756a0bbb89d6376c

9 years agoMake sure shutter button is inactive before the preview was started.
Sascha Haeberling [Sat, 7 Feb 2015 01:58:13 +0000 (17:58 -0800)]
Make sure shutter button is inactive before the preview was started.

  Bug: 19285609

Change-Id: I7ef4cd5a80bdc151d743ece99aa1528ffe09ed20

9 years agoAccess KeyguardManager from AndroidServices.
Andy Huibers [Fri, 6 Feb 2015 22:03:01 +0000 (14:03 -0800)]
Access KeyguardManager from AndroidServices.

Bug: 17925205
Change-Id: I29bd61eb49f5c8a5ec3ac7d9c2357d742e1929d1

9 years agoImplement ready-state for non-zsl cameras
Puneet Lall [Fri, 6 Feb 2015 19:15:56 +0000 (11:15 -0800)]
Implement ready-state for non-zsl cameras

Bug: 18934542
Change-Id: I028177a0ea02d8477083ffca8b40d03be5f444ac

9 years agoMinor cleanup
Puneet Lall [Fri, 6 Feb 2015 18:06:38 +0000 (10:06 -0800)]
Minor cleanup

Change-Id: I1c8a953762fc51ddaabd0b3b0a82ec2a95e4757d

9 years agoMerge "Implement ready state" into ub-camera-haleakala
Puneet Lall [Fri, 6 Feb 2015 17:43:35 +0000 (17:43 +0000)]
Merge "Implement ready state" into ub-camera-haleakala

9 years agoMerge "Rename ImageStreamFactory to ManagedImageReader" into ub-camera-haleakala
Puneet Lall [Fri, 6 Feb 2015 17:43:27 +0000 (17:43 +0000)]
Merge "Rename ImageStreamFactory to ManagedImageReader" into ub-camera-haleakala

9 years agoImplement ready state
Puneet Lall [Sat, 31 Jan 2015 02:00:12 +0000 (18:00 -0800)]
Implement ready state

Bug: 18934542

Change-Id: I1dc27eb3f8fb1ef156ae8643b2b5e92f013c4e4b

9 years agoRename ImageStreamFactory to ManagedImageReader
Puneet Lall [Fri, 6 Feb 2015 02:02:09 +0000 (18:02 -0800)]
Rename ImageStreamFactory to ManagedImageReader

Improves documentation for the internal camera2 wrapper API.

Change-Id: I62d0c9aa52f5254c45fc06f2792f92b9b90e3e31

9 years agoMerge "in secure camera, prevent swiping to filmstrip when no photo has been taken...
Spike Sprague [Thu, 5 Feb 2015 22:15:48 +0000 (22:15 +0000)]
Merge "in secure camera, prevent swiping to filmstrip when no photo has been taken." into ub-camera-haleakala

9 years agoin secure camera, prevent swiping to filmstrip when no photo has been taken.
Spike Sprague [Thu, 5 Feb 2015 21:42:49 +0000 (13:42 -0800)]
in secure camera, prevent swiping to filmstrip when no photo has been taken.

bug: 19279388
Change-Id: I92c23dd5546aa31166df2ce40d19e374808d83d3

9 years agoMerge "Use MainThread in CaptureModule and FocusController." into ub-camera-haleakala
Senpo Hu [Thu, 5 Feb 2015 20:59:03 +0000 (20:59 +0000)]
Merge "Use MainThread in CaptureModule and FocusController." into ub-camera-haleakala

9 years agoMerge "Cancel implicit AE lock after AE precapture sequence" into ub-camera-haleakala
Puneet Lall [Thu, 5 Feb 2015 20:14:42 +0000 (20:14 +0000)]
Merge "Cancel implicit AE lock after AE precapture sequence" into ub-camera-haleakala

9 years agoCancel implicit AE lock after AE precapture sequence
Puneet Lall [Thu, 5 Feb 2015 19:19:19 +0000 (11:19 -0800)]
Cancel implicit AE lock after AE precapture sequence

After taking, or attempting to take a flash photo, the app currently
sends a CONTROL_AF_TRIGGER_CANCEL to release the AF lock.  On some
devices (N6), there appears to be an implicit AE lock set by the
CONTROL_AE_PRECAPTURE_TRIGGER, which is unlocked when a flash photo
is captured (with INTENT_STILL_CAPTURE).  In the event that the app
is interrupted before sending the still capture request, it must
still cancel the implicit AE lock.  As a workaround, sending
a request with AE_LOCK=true followed by AE_LOCK=false appears
to reset this implicit AE lock.

Workaround for Bug: 19265647

Change-Id: Ie76a81c1a138fb2334de736b315796e869378bf4

9 years agoRevert N4 to PhotoModule until ImageBackend can handle EXIF rotation.
Sascha Haeberling [Thu, 5 Feb 2015 20:00:39 +0000 (12:00 -0800)]
Revert N4 to PhotoModule until ImageBackend can handle EXIF rotation.

  Bug: 19281550

Change-Id: I8a87b8e4815b2f16d42c28a0cd9887379b742f75

9 years agoUse MainThread in CaptureModule and FocusController.
Senpo Hu [Thu, 5 Feb 2015 19:15:37 +0000 (11:15 -0800)]
Use MainThread in CaptureModule and FocusController.

Change-Id: I9de2aa619edc3cc1d686b297776cdf8ab2a65ce7

9 years agoMerge "Add support for non-ZSL, non-legacy cameras" into ub-camera-haleakala
Puneet Lall [Thu, 5 Feb 2015 18:27:14 +0000 (18:27 +0000)]
Merge "Add support for non-ZSL, non-legacy cameras" into ub-camera-haleakala

9 years agoMerge "Control some chatty logging with a boolean." into ub-camera-haleakala
Andy Huibers [Thu, 5 Feb 2015 06:23:14 +0000 (06:23 +0000)]
Merge "Control some chatty logging with a boolean." into ub-camera-haleakala

9 years agoMerge "Make sure to null SurfaceTexture when destroyed." into ub-camera-haleakala
Sascha Haeberling [Thu, 5 Feb 2015 02:55:02 +0000 (02:55 +0000)]
Merge "Make sure to null SurfaceTexture when destroyed." into ub-camera-haleakala

9 years agoControl some chatty logging with a boolean.
Andy Huibers [Thu, 5 Feb 2015 02:44:31 +0000 (18:44 -0800)]
Control some chatty logging with a boolean.

Bug: 19269341
Change-Id: Ifb90a06a8022cadc47cbe67b852dc2d0f5da2571

9 years agoMerge "Use KeyguardManager.isKeyguardLocked() to fire double-onResume lock screen...
Andy Huibers [Thu, 5 Feb 2015 02:43:42 +0000 (02:43 +0000)]
Merge "Use KeyguardManager.isKeyguardLocked() to fire double-onResume lock screen launch workaround. Previously we were only doing workaround for INTENT_ACTION_STILL_IMAGE_CAMERA_SECURE." into ub-camera-haleakala

9 years agoMake sure to null SurfaceTexture when destroyed.
Sascha Haeberling [Thu, 5 Feb 2015 02:39:23 +0000 (18:39 -0800)]
Make sure to null SurfaceTexture when destroyed.

  Bug: 19149830

This will prevent unnecessary camera open events. We assume that when a
SurfaceTexture is present at the time we resume, that it is usable and
we can initialize the camera. Not nulling it causes the camera to be
initialized on a potentially invalid Surface. Once the Surface becomes
available, we'd close and re-open the camera, which slows down our
resume times.

By nulling the SurfaceTexture when it gets destroyed we make sure to not
initialize the camera in resume an instead wait for the proper callback.

This might get rid of the HDR+ resume issue we've been seeing as well.

Change-Id: I71837aeda79c2f7516e64bdb10c12d39f728c0ca

9 years agoUse KeyguardManager.isKeyguardLocked() to fire double-onResume lock screen launch...
Andy Huibers [Thu, 5 Feb 2015 01:36:46 +0000 (17:36 -0800)]
Use KeyguardManager.isKeyguardLocked() to fire double-onResume lock screen launch workaround.
Previously we were only doing workaround for INTENT_ACTION_STILL_IMAGE_CAMERA_SECURE.

Bug: 17925205

Change-Id: I63206aa268fb41897da6fe37fc967bf12c3f4e7b

9 years agoAdd support for non-ZSL, non-legacy cameras
Puneet Lall [Thu, 5 Feb 2015 01:50:25 +0000 (17:50 -0800)]
Add support for non-ZSL, non-legacy cameras

Bug: 19178315
Change-Id: Icc73563cdf708efe70bfc814c279850e1a690cf3

9 years agoMerge "Remove elevations from filmstrip" into ub-camera-haleakala
Alan Newberger [Thu, 5 Feb 2015 01:27:18 +0000 (01:27 +0000)]
Merge "Remove elevations from filmstrip" into ub-camera-haleakala

9 years agoMerge "Address black flash on filmstrip items by loading placeholder consistently...
Alan Newberger [Thu, 5 Feb 2015 01:21:38 +0000 (01:21 +0000)]
Merge "Address black flash on filmstrip items by loading placeholder consistently" into ub-camera-haleakala

9 years agoRemove elevations from filmstrip
Alan Newberger [Wed, 4 Feb 2015 01:59:55 +0000 (01:59 +0000)]
Remove elevations from filmstrip

Elevations were not applied to SessionItems causing bad z-order
behavior. As the shadows are not really visible, just removing
elevation entirely, this also seems to improve performance.

Bug: 17742801
Change-Id: I8fedad3b6c083f7cde349e51021f928d719edb40

9 years agoMerge "Implemented Report functionality using GMS Core Feedback API. Implemented...
zafir [Thu, 5 Feb 2015 00:54:25 +0000 (00:54 +0000)]
Merge "Implemented Report functionality using GMS Core Feedback API. Implemented stubs for Camera2." into ub-camera-haleakala

9 years agoAddress black flash on filmstrip items by loading placeholder consistently
Alan Newberger [Thu, 5 Feb 2015 00:37:55 +0000 (16:37 -0800)]
Address black flash on filmstrip items by loading placeholder consistently

Refactor removed placeholder (gray rectangle) from large image builder in
glide, but it's necessary there. Moved default placeholder to builders,
behavior looks correct now.

Change-Id: Ib154c5f5db0d2b7d4f861366bfe4e156fabad45d

9 years agoMerge "Nexus 4 Camera Start-up Fix" into ub-camera-haleakala
I-Jong Lin [Thu, 5 Feb 2015 00:25:31 +0000 (00:25 +0000)]
Merge "Nexus 4 Camera Start-up Fix" into ub-camera-haleakala

9 years agoNexus 4 Camera Start-up Fix
I-Jong Lin [Wed, 4 Feb 2015 21:36:52 +0000 (13:36 -0800)]
Nexus 4 Camera Start-up Fix

Issue revolves around the fact that the camera ZSL template was invalid for
Nexus4, and Nexus4 did not support ConvergedImage Picture taker.  Turned
those things off for the Nexus 4 and now it works.

Bug: 19123014
Change-Id: I5aef58a0f0c7e9396e999d6b7ab2736e4565b73f

9 years agoMerge "Adjust capture indicator position while open/close mode options." into ub...
Senpo Hu [Thu, 5 Feb 2015 00:01:24 +0000 (00:01 +0000)]
Merge "Adjust capture indicator position while open/close mode options." into ub-camera-haleakala

9 years agoAdjust capture indicator position while open/close mode options.
Senpo Hu [Mon, 2 Feb 2015 20:41:57 +0000 (12:41 -0800)]
Adjust capture indicator position while open/close mode options.

This CL also fixes the layout issue in landscape mode when
mode option indicators are visible.

Bug: 18866551
Bug: 18317565
Bug: 18905659
Change-Id: I34ca5aa77aa9d37a7f0ad3d2d7efbed92fe94f2b

9 years agoMerge "Remove UNKNOWN Orientation values" into ub-camera-haleakala
I-Jong Lin [Wed, 4 Feb 2015 23:54:34 +0000 (23:54 +0000)]
Merge "Remove UNKNOWN Orientation values" into ub-camera-haleakala

9 years agoUse CONTROL_CAPTURE_INTENT_STILL_CAPTURE
Puneet Lall [Wed, 4 Feb 2015 23:24:34 +0000 (15:24 -0800)]
Use CONTROL_CAPTURE_INTENT_STILL_CAPTURE

Fixes issue in which flash may not fire when set to on or auto.

Bug: 19151455
Change-Id: If5cb82bea3e882224ad9afe2b3a69d5e5596ee36

9 years agoMerge "Multi camera device lifecycle management." into ub-camera-haleakala
Paul Rohde [Wed, 4 Feb 2015 22:24:32 +0000 (22:24 +0000)]
Merge "Multi camera device lifecycle management." into ub-camera-haleakala

9 years agoRemove UNKNOWN Orientation values
I-Jong Lin [Wed, 4 Feb 2015 17:57:49 +0000 (09:57 -0800)]
Remove UNKNOWN Orientation values

UNKNOWN Orientation is causing some strange crashes in the Camera App,
in certain situation when the phone starts up while faceup on a table,
i.e. an unknown orientation.   This CL is to make sure that we stop
any UNKOWN orientations propogating through the system and causes these
sorts of crashes.

Bug: 19049293
Change-Id: I4f403bda1b6b23f2bbe5ee590e23d0fc078543b7

9 years agoMerge "Fix filmstrip jank on N4." into ub-camera-haleakala
Paul Rohde [Wed, 4 Feb 2015 21:00:29 +0000 (21:00 +0000)]
Merge "Fix filmstrip jank on N4." into ub-camera-haleakala

9 years agoFix filmstrip jank on N4.
Paul Rohde [Tue, 3 Feb 2015 22:43:06 +0000 (14:43 -0800)]
Fix filmstrip jank on N4.

Bug: 19164291
Bug: 19220382
Bug: 19020507

Change-Id: Id1c2011b29b1cee206593fb395d9b4a4c89e71ab

9 years agominor comment fix.
Spike Sprague [Wed, 4 Feb 2015 19:30:59 +0000 (11:30 -0800)]
minor comment fix.

Change-Id: I284a6b4485dd972faef725cd7fd598afc9b83378

9 years agoMerge "Fix for CL ag/627135" into ub-camera-haleakala
Spike Sprague [Wed, 4 Feb 2015 19:18:06 +0000 (19:18 +0000)]
Merge "Fix for CL ag/627135" into ub-camera-haleakala

9 years agoFix for CL ag/627135
Spike Sprague [Wed, 4 Feb 2015 19:05:23 +0000 (11:05 -0800)]
Fix for CL ag/627135

Move logic to open filmstrip from onUp() to onFling(), mimicking logic in ModeListView fling handling. Limit fling handling to entering Filmstip from the Preview.

bug: 18904319
Change-Id: I51960dbb427345eb69a2d4a4a84d74479361be96