OSDN Git Service
Andy Huibers [Fri, 27 Mar 2015 00:15:29 +0000 (17:15 -0700)]
Include HDR on/off correctly in event.
Bug:
19900458
Change-Id: Ifd9a585a61801cd1abe16bdbe47a56d96399b84e
Paul Rohde [Thu, 26 Mar 2015 17:29:44 +0000 (10:29 -0700)]
Prevent countdown cancelation from starting the camera on pause.
Bug:
19937825
Change-Id: I13e774afe2da9342b9defcc0f1d304032d931b12
Senpo Hu [Thu, 26 Mar 2015 01:22:39 +0000 (18:22 -0700)]
[CaptureIntent] Fix NPE crash when open camera.
Change-Id: I09cddae3ce935c92d6829924372a4082bb69f48a
Paul Rohde [Thu, 26 Mar 2015 00:19:20 +0000 (00:19 +0000)]
Merge "Remove the setFocusRatio verbose logspam." into ub-camera-haleakala
Sascha Haeberling [Wed, 25 Mar 2015 23:39:44 +0000 (23:39 +0000)]
Merge "Change CaptureSession.saveAndFinish to return a future for the URI." into ub-camera-haleakala
Sascha Haeberling [Wed, 25 Mar 2015 22:08:34 +0000 (15:08 -0700)]
Change CaptureSession.saveAndFinish to return a future for the URI.
Bug:
19665531
Most callers of saveAndFinish never provided the callback. In addition
it's unclear on what thread the callback is called. This cleans this up
a bit and moves the responsibility to the caller to decide on which
thread the URI should be received. Callers that don't care don't have to
do anything.
Also fixes a bug where we wouldn't even supply a URI for when there was
no placeholder.
Change-Id: I1a186b470d2cca8f34a674e9eb5c533fc01a4409
Paul Rohde [Wed, 25 Mar 2015 23:29:26 +0000 (16:29 -0700)]
Remove the setFocusRatio verbose logspam.
Bug:
19931564
Change-Id: Ib4d9768a95e47879f945f9a869ce1631d43cbbc8
Sascha Haeberling [Wed, 25 Mar 2015 22:21:26 +0000 (15:21 -0700)]
Fix build error. Mirror API change to Camera2.
Bug:
19899007
Change-Id: I51d3e02b42a0bff1bea85c6cd910192e6c239293
Sascha Haeberling [Wed, 25 Mar 2015 20:50:52 +0000 (20:50 +0000)]
Merge "Catch HAL error that prevents retrieval of resolutions." into ub-camera-haleakala
Sascha Häberling [Wed, 25 Mar 2015 20:50:20 +0000 (20:50 +0000)]
Merge "Cancel in-progress capture when paused" into ub-camera-haleakala
Sascha Haeberling [Tue, 24 Mar 2015 22:59:39 +0000 (15:59 -0700)]
Catch HAL error that prevents retrieval of resolutions.
Bug:
19899007
Change-Id: I822510c03ecc1d48f607bf8f765831f1a39e3074
Puneet Lall [Wed, 25 Mar 2015 20:19:36 +0000 (13:19 -0700)]
Cancel in-progress capture when paused
Change exception-handling behavior to cancel an in-progress capture (via
CaptureSession#cancel()) if the app is paused before any image is
acquired from the device. Previous behavior launched an error dialog to the
user.
Bug:
19913612
Change-Id: If40dceabc4adbd901fbdac1a0d97f805389c778d
Alan Newberger [Wed, 25 Mar 2015 00:33:18 +0000 (17:33 -0700)]
Suppress HDR 16:9 on N4
Add logic to CaptureModule HardwareSpec to avoid
support for HDR if in 16:9. This takes care of UI,
also wire HardwareSpec into OneCameraCaptureSetting
to ensure we only use the stored setting when HDR
is supported.
Bug:
19697027
Change-Id: Idcd02ea9910974d8afda5f81c45eb928b9df89af
zafir [Wed, 25 Mar 2015 17:57:58 +0000 (17:57 +0000)]
Merge "Show error dialog when camera is unavailable." into ub-camera-haleakala
zafir [Tue, 24 Mar 2015 23:22:06 +0000 (16:22 -0700)]
Show error dialog when camera is unavailable.
Bug:
19888394
Change-Id: I6d52d1be7ecac6ece85845bc3f06b1c7e0963d6f
Senpo Hu [Wed, 25 Mar 2015 05:28:55 +0000 (05:28 +0000)]
Merge "[CaptureIntent] Log CaptureDone event to Clearcut." into ub-camera-haleakala
Senpo Hu [Wed, 25 Mar 2015 00:56:15 +0000 (17:56 -0700)]
[CaptureIntent] Log CaptureDone event to Clearcut.
Bug:
19035503
Change-Id: I786f834beb45d519047aaa06a7838720c0188459
Sascha Haeberling [Tue, 24 Mar 2015 23:00:01 +0000 (16:00 -0700)]
DO NOT MERGE Disable ZSL for N5.
Bug:
19565931
Data showed the preview freeze is happening and WAR is not working.
Change-Id: I9e49bfe7cdf447ef5fe57a1a393ba8d96d1b051b
Puneet Lall [Tue, 24 Mar 2015 18:00:24 +0000 (11:00 -0700)]
Send AF_TRIGGER_CANCEL before every AF_TRIGGER_START
Implements a workaround for bug on N6 in which the camera driver may get
stuck if two adjacent AF_TRIGGER_START are sent in a sequence.
Bug:
19892741
Change-Id: I729d7a5ca865cd5b3ba8ddd5862e422470c16671
Paul Rohde [Tue, 24 Mar 2015 17:24:27 +0000 (17:24 +0000)]
Merge "Fix the camera2 build and import the correct Android metadata." into ub-camera-haleakala
Paul Rohde [Tue, 24 Mar 2015 17:20:27 +0000 (10:20 -0700)]
Fix the camera2 build and import the correct Android metadata.
Change-Id: Id7f6d630ec7eb8db2e43c97025b5cbb172ed9192
zafir [Tue, 24 Mar 2015 16:54:12 +0000 (16:54 +0000)]
Merge "Hiding manual exposure button in N6. The button was previously disabled." into ub-camera-haleakala
Paul Rohde [Mon, 23 Mar 2015 23:37:40 +0000 (16:37 -0700)]
Read and enable face detection when available in capture module.
Bug:
19715640
Change-Id: I719cc92800a73ec3eaa27044fda09f64e1b9d946
zafir [Tue, 24 Mar 2015 01:13:35 +0000 (18:13 -0700)]
Hiding manual exposure button in N6. The button was previously disabled.
Bug:
18523154
Change-Id: Id08cef46fc4a67e50ce4b1acd185c5ae6efa94ad
Andy Huibers [Mon, 23 Mar 2015 23:56:19 +0000 (23:56 +0000)]
Merge "Limit maximum display size to prevent out of memory problems." into ub-camera-haleakala
Paul Rohde [Mon, 23 Mar 2015 23:47:32 +0000 (16:47 -0700)]
Limit maximum display size to prevent out of memory problems.
Change-Id: Id681ab9f66d6a5f10f9df8fb6ae57ce90f5e25d8
I-Jong Lin [Mon, 23 Mar 2015 23:23:38 +0000 (23:23 +0000)]
Merge "Add Faces and Lens Dist. info to photoCaptureDone" into ub-camera-haleakala
Senpo Hu [Mon, 23 Mar 2015 23:02:41 +0000 (23:02 +0000)]
Merge "OneCameraOpener should inform ActiveCameraDeviceTracker about camera open." into ub-camera-haleakala
Senpo Hu [Mon, 23 Mar 2015 22:15:47 +0000 (22:15 +0000)]
Merge "Clean up HDR+ button state logic." into ub-camera-haleakala
Senpo Hu [Mon, 23 Mar 2015 21:52:42 +0000 (14:52 -0700)]
OneCameraOpener should inform ActiveCameraDeviceTracker about camera open.
Therefore, people use OneCameraOpener to open a camera don't need to worry
about ActiveCameraDeviceTracker.
To make people don't need to depend on CameraActivity/AppController, move
setting scope generation into two utility methods:
* SettingsManager.getCameraSettingScope()
* SettingsManager.getModuleSettingScope()
Bug:
19892712
Change-Id: I04caae24ea72a41d7d8e0786a99912098c2cf1ef
I-Jong Lin [Wed, 18 Mar 2015 19:35:30 +0000 (12:35 -0700)]
Add Faces and Lens Dist. info to photoCaptureDone
Added the plumbing for getting values off of the
TotalCaptureResult and putting them into the
photoCaptureDoneEvent.
Bug:
19805467
Change-Id: Id0d16623ffe7eef78b23fd15a4edfeeca5a66eaa
Paul Rohde [Mon, 23 Mar 2015 20:15:38 +0000 (20:15 +0000)]
Merge "Compute the max texture size from the EGL context" into ub-camera-haleakala
Paul Rohde [Mon, 23 Mar 2015 20:15:01 +0000 (20:15 +0000)]
Merge "Clamp pixels and bounds for filmstrip images." into ub-camera-haleakala
Paul Rohde [Mon, 23 Mar 2015 17:42:44 +0000 (10:42 -0700)]
Compute the max texture size from the EGL context
Initialize and read the GL_MAX_TEXTURE_SIZE property by opening
and initializing an Open GL display, context, and surface and
using the initialized objects to read out the texture size.
Bug:
19871547
Change-Id: If74045e00d99e7268b78dcca0ad0a22f4d581f0e
Senpo Hu [Fri, 20 Mar 2015 21:28:24 +0000 (14:28 -0700)]
Clean up HDR+ button state logic.
CameraAppUI#applyModuleSpecs should honor whatever HardwareSpec and
BottomBarUISpec provided by modules. UI should not change behavior by
poking setting by itself. This can cause huge pain when debugging.
Bug:
19657871
Change-Id: Ief153f6c92a12ab1a72732a7a0908059fd91167e
Paul Rohde [Mon, 23 Mar 2015 17:18:24 +0000 (10:18 -0700)]
Clamp pixels and bounds for filmstrip images.
This change does a more extensive set of checks and constraints
based on the maximum area (to prevent jank) and adds clamping for
the bounds of the image based on the maximum supported texture
size of the device to prevent blank frames.
Bug:
19871547
Change-Id: Ib33e6e591638fb4dfefb60ddea488818e985495d
Alan Newberger [Mon, 23 Mar 2015 16:38:20 +0000 (09:38 -0700)]
Check for null on N5 resolution upgrade
In case of first run with no existing resolution setting, ignore
the upgrade step.
Bug:
19889422
Change-Id: I518eaf089468c8255dedfea371f68763d62d777a
Geoff Mendal [Sat, 21 Mar 2015 07:25:15 +0000 (00:25 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ie1dc944ecb771d87935cd89b62a679c335f81452
Auto-generated-cl: translation import
zafir [Fri, 20 Mar 2015 21:50:48 +0000 (21:50 +0000)]
Merge "Display error dialog and log error when video recording fails to start." into ub-camera-haleakala
I-Jong Lin [Fri, 20 Mar 2015 21:47:50 +0000 (21:47 +0000)]
Merge "Catch memory allocation errors JPEG ImageTask" into ub-camera-haleakala
zafir [Fri, 20 Mar 2015 21:43:46 +0000 (16:43 -0500)]
Display error dialog and log error when video recording fails to start.
Bug:
19814676
Change-Id: Iec3fde247720db4471da8f40a5c0f55d706d52cd
Paul Rohde [Fri, 20 Mar 2015 20:08:55 +0000 (20:08 +0000)]
Merge "Re-arrange camera initialization." into ub-camera-haleakala
Paul Rohde [Thu, 12 Mar 2015 16:48:52 +0000 (09:48 -0700)]
Re-arrange camera initialization.
This change re-arranges several things to make it possible to know
the CameraId you are about to open before you actually open the
camera device. It also adds an explicit CameraId class for handling
both legacy and camera2 id comparisons, an active camera tracker,
and moves the camera id query mechanism into a hardware manager
class in prep for the subsequent camera release.
Bug:
19679820
Change-Id: I4c09b9a12a1ea5badcac3a6a073a56764f9a7eba
I-Jong Lin [Fri, 20 Mar 2015 16:27:34 +0000 (09:27 -0700)]
Catch memory allocation errors JPEG ImageTask
Bug:
19354210
Although rare, we should fail gracefully in the case
where we cannot allocate a large memory buffer in
TaskCompressImageToJpeg.
Change-Id: I1f16ba16a785b32869030a5f8ec2116fbbc900d3
Sascha Haeberling [Fri, 20 Mar 2015 08:11:28 +0000 (01:11 -0700)]
Rename CaptureSession#finalize to not collide with Object#finalize.
Bug:
19855781
Change-Id: Ie32024a9d2b7c04a27cc1ff7eee62df0e6857031
Spike Sprague [Thu, 19 Mar 2015 00:43:36 +0000 (00:43 +0000)]
Merge "Hide flash icon if not supported by camera hardware." into ub-camera-haleakala
Spike Sprague [Thu, 19 Mar 2015 00:22:30 +0000 (00:22 +0000)]
Merge "don't mess with the options buttons in transistionToCapture and transitionToCancel" into ub-camera-haleakala
Spike Sprague [Wed, 18 Mar 2015 23:07:54 +0000 (16:07 -0700)]
Hide flash icon if not supported by camera hardware.
bug:
19199856
Change-Id: I5e4f7842c61e6c260b7a35c455f2caaa4d8e5e53
Spike Sprague [Wed, 18 Mar 2015 22:49:44 +0000 (15:49 -0700)]
don't mess with the options buttons in transistionToCapture and transitionToCancel
bug:
19366720
Change-Id: I0620d1ceb80c2c45de95336be18ccf212ace6f69
Geoff Mendal [Wed, 18 Mar 2015 13:15:14 +0000 (06:15 -0700)]
Import translations. DO NOT MERGE
Change-Id: Iaa30b150c8992357763849265a2b2de4a172f3f7
Auto-generated-cl: translation import
I-Jong Lin [Mon, 16 Mar 2015 23:09:16 +0000 (16:09 -0700)]
Pass crop and implement crop in JPEG ImageSaver
Bug:
19660460
Allows for the JpegImageBackendSaver to accept crop
regions and then implements this crop within the
JPEG compression task.
Change-Id: I165b272376c3d5c919c1c41b55bf0b8e551520be
Andy Huibers [Tue, 17 Mar 2015 19:32:08 +0000 (19:32 +0000)]
Merge "Add processing time to capture done event for CaptureModule captures." into ub-camera-haleakala
Puneet Lall [Tue, 17 Mar 2015 18:58:42 +0000 (18:58 +0000)]
Merge "Detect and log missing images" into ub-camera-haleakala
Puneet Lall [Tue, 17 Mar 2015 18:32:57 +0000 (11:32 -0700)]
Detect and log missing images
Adds logic to detect and log when the camera framework
fails to deliver an image, but successfully delivers
subsequent images.
Bug:
19430369
Change-Id: I404888882879ac021ba84d725732e9c9a9c61f05
Puneet Lall [Tue, 17 Mar 2015 18:07:19 +0000 (18:07 +0000)]
Merge "Optimize ZSL for auto-flash mode" into ub-camera-haleakala
Puneet Lall [Fri, 6 Mar 2015 23:58:16 +0000 (15:58 -0800)]
Optimize ZSL for auto-flash mode
Cache the most recent converged AE state to enable more
auto-flash pictures to be taken with zero shutter lag.
Bug:
19151363
Change-Id: I7d4bd5a67d4cddb7a1f733844e1a080acfacf7f4
Sascha Haeberling [Tue, 17 Mar 2015 17:42:14 +0000 (17:42 +0000)]
Merge "Fix bug where return value for thumbnail can be null." into ub-camera-haleakala
Puneet Lall [Mon, 16 Mar 2015 21:32:52 +0000 (14:32 -0700)]
Optimize shot-to-shot time for camera2 legacy
Optimize shot-to-shot time for devices which only support
the camera2 LEGACY api by releasing the exclusive lock on the
FrameServer as soon as each image is exposed, allowing the user
to immediately submit a request for the next shot.
Bug:
19365933
Change-Id: I8935611fae666dde1fb3a1c4aecf95c1cc5a7ef8
Andy Huibers [Tue, 17 Mar 2015 00:23:39 +0000 (17:23 -0700)]
Add processing time to capture done event for CaptureModule captures.
Bug:
18913439
Bug:
19035503
Change-Id: Ib3768d93a2240ccfbf5f5a750b66939c6930ed0e
Sascha Haeberling [Tue, 17 Mar 2015 17:22:48 +0000 (10:22 -0700)]
Fix bug where return value for thumbnail can be null.
Bug:
19779596
Change-Id: I4ccf39b0e19956c6873868bc02be836b547fa1c5
I-Jong Lin [Mon, 16 Mar 2015 20:58:18 +0000 (20:58 +0000)]
Merge "Add PhotoCaptureEvent to Capture Module" into ub-camera-haleakala
I-Jong Lin [Thu, 12 Mar 2015 21:33:41 +0000 (14:33 -0700)]
Add PhotoCaptureEvent to Capture Module
Adds a CaptureSession collector class so that
we can combine stats information from both the
CaptureModule and ImageBackend to create a
complete PhotoCaptureDone event.
Bug:
19035503
Change-Id: Ide5f708c5f3efb710fa704f3f30c52ac7a8c3fe4
Geoff Mendal [Mon, 16 Mar 2015 14:38:22 +0000 (07:38 -0700)]
Import translations. DO NOT MERGE
Change-Id: I1f460126d1eea77d4106016fea65f03ed550922f
Auto-generated-cl: translation import
Senpo Hu [Sat, 14 Mar 2015 00:57:34 +0000 (17:57 -0700)]
[CaptureIntent] clean up extra PreviewAreaChangedListener.
A simple cleanup that we register two PreviewAreaChangedListener for
CaptureIntentModuleUI which is kind of silly. This CL consolidate it
into one.
Change-Id: I1c5b29a77021a21cd6d8c023b4b98906430c305e
Sascha Haeberling [Fri, 13 Mar 2015 20:54:07 +0000 (20:54 +0000)]
Merge "Don't take picture if camera is closed." into ub-camera-haleakala
I-Jong Lin [Fri, 6 Mar 2015 18:52:24 +0000 (10:52 -0800)]
Automated ImageProcessorListener registration
I've added the ImageConsumer interface and implementation
in ImageBackend to support the automatic registering and
unregistering of the ImageProcessingListener. This
new functionality avoids the issues of reference leaking,
so that the transient listener implementations are NOT
held by the image backend. Also more general purpose
interface has been created such that any passed Runnable
will be executed when the associated set of tasks that have
been enqueued with ImageBackend::ReceiveImage have finished
processing. This functionality solves the referencing
leaking issue of ImageProcessingListener in the current
implementation. Also, removed all references to Main
thread executor so that ImageBackend is not a direct
suspect in jank issues.
Bug:
19517380
Change-Id: I806582f13157030ed6bc23ad70a4efd93339d9ff
Sascha Haeberling [Fri, 13 Mar 2015 17:21:16 +0000 (10:21 -0700)]
Don't take picture if camera is closed.
Bug:
19712310
Change-Id: Iaaae7a1c784e4149ca837e9bda496f734be56890
I-Jong Lin [Fri, 13 Mar 2015 16:21:28 +0000 (16:21 +0000)]
Merge "Implementation of Crop in Thumbnail Creation" into ub-camera-haleakala
Puneet Lall [Thu, 12 Mar 2015 23:12:12 +0000 (16:12 -0700)]
Fix build
Change-Id: I36c5f2bf963bfe7d63941777ecedce7354aa0212
Puneet Lall [Thu, 12 Mar 2015 22:48:07 +0000 (22:48 +0000)]
Merge "Reset existing AF scan upon tap-to-focus" into ub-camera-haleakala
zafir [Thu, 12 Mar 2015 22:34:42 +0000 (22:34 +0000)]
Merge "Disable manual exposure button in HDR+ mode." into ub-camera-haleakala
zafir [Wed, 11 Mar 2015 19:32:19 +0000 (12:32 -0700)]
Disable manual exposure button in HDR+ mode.
Bug:
19641530
Change-Id: I70d47a678eb0c5b77040ff071af14dd35c1e73a8
I-Jong Lin [Tue, 10 Mar 2015 21:28:16 +0000 (14:28 -0700)]
Implementation of Crop in Thumbnail Creation
Propogated the crop information into the thumbnail creation
code. Required generalization of the thubmnail creator to
accept a crop region, and implementation of consistent
handling of the crop parameter into the TaskInfo.
Tests for this newer functionality are available in ag/653259.
Bug:
19323062
Change-Id: I135ae16459eedf7f2631925526c0e64184f6a859
Spike Sprague [Thu, 12 Mar 2015 00:26:03 +0000 (17:26 -0700)]
If JPEG data already has some EXIF data, carry it over during EXIF population
bug:
16961102
Change-Id: I887726dda0af62c7eaecbde4297079fc447c39fa
Spike Sprague [Wed, 11 Mar 2015 23:53:45 +0000 (16:53 -0700)]
add null check protections to ExifUtil to prevent Nexus 4 crashes
bug:
19701200
Change-Id: Icea7d5d57e5c692d214745f83efd4b06f3517740
Puneet Lall [Tue, 10 Mar 2015 21:11:12 +0000 (14:11 -0700)]
Reset existing AF scan upon tap-to-focus
* Interrupts existing, in-progress AF scans upon tap-to-focus
(triggerFocusAndMeterAtPoint).
* Removes pending delayed-af-resets upon subsequent tap-to-focus
to fix the case in which a user triggers AF twice within <3 seconds
which previously resulted in the AF mode returning to
continuous_picture shortly after the second AF scan.
* Removes dependencies on CameraUtil and static Settings3A
methods, and refactors FrameServerImpl to enable unit-testing.
Bug:
18935538
Change-Id: I0c2d5d92d2b07efdc11de8388e42b931d3ea89d0
Puneet Lall [Fri, 6 Mar 2015 20:36:55 +0000 (12:36 -0800)]
Fix ready-state issue when commands are queued
Ensure that the FrameServer is marked as unavailable if a command is
queued, waiting to acquire access.
Bug:
19367334
Change-Id: Id7b1639c6c3a7e65c75002b9f6f8f24c7515e932
Sascha Haeberling [Wed, 11 Mar 2015 21:26:37 +0000 (21:26 +0000)]
Merge "Fix 16:9 start-up dialog selection." into ub-camera-haleakala
Sascha Haeberling [Wed, 11 Mar 2015 21:18:03 +0000 (14:18 -0700)]
Fix 16:9 start-up dialog selection.
Bug:
19696056
We need to make sure the list from which we choose the highest
resolution size of a given aspect ratio based on a list that is filtered
to be chosen by the user. In case of the N5 the native camera list will
be augmented with a new high resolution 16:9 size which needs to be
selected if the user chooses 16:9 on start-up on the N5.
Change-Id: I03a86aa0a148b6cbabbd51a577202b79b4941d7d
Sascha Haeberling [Wed, 11 Mar 2015 20:59:40 +0000 (13:59 -0700)]
Swap dimensions of artificial 16:9 resolution on N5 on upgrade.
Bug:
19693226
Since the N5 doesn't natively support a high resolution 16:9 size we need
to artificially add it and then crop the result from the high-resolution
4:3 size. In version 2.4 we unfortunately swapped the dimensions of
ResolutionUtil#NEXUS_5_LARGE_16_BY_9_SIZE, which now causes a few issues
in 2.5. If we detect this case, we will swap the dimensions here to make
sure they are the right way around going forward.
Change-Id: I579e464d177ac86d6cc88e9142c26fd9d6b67a76
Shashi Shekhar [Fri, 6 Mar 2015 19:53:30 +0000 (11:53 -0800)]
Enable shutter button as soon as burst finishes.
Instead of keeping the Capture button disabled, do not wait for burst
results to enable the capture button. Instead enable it as soon as burst
is done.
Change-Id: I19f873d8e461b0c5385bdd2f9fb93f0a9fb7a05b
Geoff Mendal [Wed, 11 Mar 2015 14:15:48 +0000 (07:15 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ib339597a120a49926cc3fc4be01c0541af9bbeec
Auto-generated-cl: translation import
Sascha Haeberling [Tue, 10 Mar 2015 23:28:45 +0000 (16:28 -0700)]
Add Location to EXIF
Bug:
16961102
Change-Id: I9f2335c0f02bea1286698330483cd30fdb875f45
Spike Sprague [Thu, 19 Feb 2015 22:19:10 +0000 (14:19 -0800)]
Add EXIF data to images processed via software JPEG encoder.
bug:
16961102
Change-Id: I3df48a74fedbba6ca5540bf095f5e5eaf93db3ab
Alan Newberger [Tue, 10 Mar 2015 21:07:00 +0000 (21:07 +0000)]
Merge "Workaround for future GPS timestamps" into ub-camera-haleakala
Alan Newberger [Tue, 10 Mar 2015 17:29:11 +0000 (10:29 -0700)]
Workaround for future GPS timestamps
Some images are known to have incorrect GPS timestamps, which are used
by MediaStore as creation date. If future creation dates are encountered,
fall back to modification date which is not known to have bugs.
Bug:
19565464
Change-Id: I35b5e43c9a3de1f05d9a2f405502a2bb2bf9adde
zafir [Tue, 10 Mar 2015 19:47:56 +0000 (12:47 -0700)]
Add error handling for CameraDevice.StateCallBack when the camera is already opened.
Bug:
19569722
Change-Id: I510931e595d491c2d42710151b05edea89c81094
Alan Newberger [Tue, 10 Mar 2015 19:17:16 +0000 (19:17 +0000)]
Merge "Grant read URI permission for playback of video capture" into ub-camera-haleakala
Senpo Hu [Tue, 10 Mar 2015 18:59:32 +0000 (18:59 +0000)]
Merge "[CaptureIntent] Detect if flash is supported from camera characteristics." into ub-camera-haleakala
Alan Newberger [Tue, 10 Mar 2015 18:14:32 +0000 (11:14 -0700)]
Grant read URI permission for playback of video capture
Current implementation of video capture UI configured MediaRecorder to
output directly into supplied URI, which per recommendation should be
a content: URI. We pass this URI to another app to play back the video,
and should pass along the read permission.
Bug:
19675889
Change-Id: I37f8ae3702a9f1ed9dbaac9416104c0c0bfb6dd0
Senpo Hu [Tue, 10 Mar 2015 05:13:43 +0000 (22:13 -0700)]
[CaptureIntent] Detect if flash is supported from camera characteristics.
Bug:
19669175
Change-Id: I04c5ab27d9ee0c8723d9bffab55b89def7311acf
Alan Newberger [Tue, 10 Mar 2015 15:56:36 +0000 (15:56 +0000)]
Merge "Limit setting photo item placeholders when session is done." into ub-camera-haleakala
Alan Newberger [Mon, 9 Mar 2015 21:42:19 +0000 (14:42 -0700)]
Limit setting photo item placeholders when session is done.
Only add placeholders for an item visible in the filmstrip. If a session
is done for an item not visible, it is less janky for the user to see the
standard gray placeholder while loading the image from disk.
Pruned older methods of determining filmstrip visibility, none of which
worked and relied on older code assuming the camera preview was an item
in the filmstrip, including 'sticky' filmstrip item bits. Added a method
to CameraAppUI that proxies the FilmstripLayout visibility, which is
actually what app uses to show/hide the filmstrip.
Bug:
19517380
Change-Id: I5e2a61b55aa2045bfd09f495dd02cdcb9c65dc68
Shashi Shekhar [Mon, 9 Mar 2015 20:55:40 +0000 (20:55 +0000)]
Merge "Fix zoom for burst." into ub-camera-haleakala
Alan Newberger [Mon, 9 Mar 2015 20:13:49 +0000 (20:13 +0000)]
Merge "Remove video portrait orientation prompt" into ub-camera-haleakala
Alan Newberger [Mon, 9 Mar 2015 19:57:14 +0000 (12:57 -0700)]
Remove video portrait orientation prompt
No longer display visual reminder for users to rotate device to landscape.
Bug:
19416311
Change-Id: Ia03f54809f64e6034479a9021c87b50f186bab99
Shashi Shekhar [Mon, 9 Mar 2015 18:52:55 +0000 (11:52 -0700)]
Fix zoom for burst.
Instead of passing the root request builder, use the request builder
configured by the Camera factory.
BUG:
19637871
Change-Id: Ibae1a85c47b0b31e07c91c4a15ec138ad021449e
Shashi Shekhar [Mon, 9 Mar 2015 18:46:13 +0000 (18:46 +0000)]
Merge "Fix a typo in Camera capture session." into ub-camera-haleakala
Shashi Shekhar [Mon, 9 Mar 2015 18:14:53 +0000 (11:14 -0700)]
Fix a typo in Camera capture session.
Fix a typo that leads to recursive call.
Change-Id: Iad9fe9335169f1d7b211d6d6f5355229a08f797b
zafir [Mon, 9 Mar 2015 18:13:43 +0000 (18:13 +0000)]
Merge "Hide "Advanced" settings screen on N6." into ub-camera-haleakala