OSDN Git Service
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
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
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
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
Alan Newberger [Thu, 5 Feb 2015 01:27:18 +0000 (01:27 +0000)]
Merge "Remove elevations from filmstrip" into ub-camera-haleakala
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
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
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
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
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
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
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
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
I-Jong Lin [Wed, 4 Feb 2015 23:54:34 +0000 (23:54 +0000)]
Merge "Remove UNKNOWN Orientation values" into ub-camera-haleakala
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
Paul Rohde [Wed, 4 Feb 2015 22:24:32 +0000 (22:24 +0000)]
Merge "Multi camera device lifecycle management." into ub-camera-haleakala
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
Paul Rohde [Wed, 4 Feb 2015 21:00:29 +0000 (21:00 +0000)]
Merge "Fix filmstrip jank on N4." into ub-camera-haleakala
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
Spike Sprague [Wed, 4 Feb 2015 19:30:59 +0000 (11:30 -0800)]
minor comment fix.
Change-Id: I284a6b4485dd972faef725cd7fd598afc9b83378
Spike Sprague [Wed, 4 Feb 2015 19:18:06 +0000 (19:18 +0000)]
Merge "Fix for CL ag/627135" into ub-camera-haleakala
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
Puneet Lall [Wed, 4 Feb 2015 18:17:01 +0000 (10:17 -0800)]
Implement tracking of FrameServer availability
To track the "ready state" of the camera, it is necessary to track
whether or not a new command can immediately acquire an exclusive lock
on the FrameServer.
Bug:
18934542
Change-Id: Ie87fe8ac0a60662e0889ca6569d6f2f8ffcfb362
Puneet Lall [Wed, 4 Feb 2015 18:41:13 +0000 (10:41 -0800)]
Fix build breakage
Removes import of deleted class.
Change-Id: I998fcd37a6db8ab9e2338c729ef49d116c4d96a4
Puneet Lall [Wed, 4 Feb 2015 18:16:39 +0000 (18:16 +0000)]
Merge "Change/simplify Observable interface" into ub-camera-haleakala
Puneet Lall [Wed, 4 Feb 2015 02:24:00 +0000 (18:24 -0800)]
Change/simplify Observable interface
Previously, the Observable interface allowed registering callbacks to
receive each update to a value, in a thread-safe way. However, this adds
unnecessary complexity and greatly complicates the implementation of
callbacks to track the camera ready-state.
Replacing Callback<T> with Runnables, which can simply call
Observable.get() to retrieve the latest value makes implementing
ready-state significantly simpler.
Bug:
18934542
Change-Id: I00d512f3c380148c0e9cb52352b2f304494e5e5a
Geoff Mendal [Wed, 4 Feb 2015 15:09:59 +0000 (07:09 -0800)]
Import translations. DO NOT MERGE
Change-Id: Id155f7afc4b25a85ef916ca32d52a9d46e5c83ea
Auto-generated-cl: translation import
Alan Newberger [Wed, 4 Feb 2015 02:03:18 +0000 (02:03 +0000)]
Merge "Revert "Move logic to open filmstrip from onUp() to onFling(), mimicking logic in ModeListView fling handling."" into ub-camera-haleakala
Alan Newberger [Wed, 4 Feb 2015 01:59:55 +0000 (01:59 +0000)]
Revert "Move logic to open filmstrip from onUp() to onFling(), mimicking logic in ModeListView fling handling."
This reverts commit
e3fd993f9e85acc7963673ee338ed4f1ba5dacbc.
Change-Id: Idd51a11192640f9f20699b754b121262b3f51cc3
Alan Newberger [Wed, 4 Feb 2015 01:44:04 +0000 (01:44 +0000)]
Merge "Ensure right non-neighbors are invisible during filmstrip item scaling" into ub-camera-haleakala
I-Jong Lin [Tue, 3 Feb 2015 22:32:22 +0000 (14:32 -0800)]
Fix for Capture Indicator Animation Listeners
Issue arose when Capture Indicator was hidden from the screen, and
animations were NOT finished. Current listeners were unregistered,
but never re-registered when capture indicator was shown again.
Simplest solution is to null out the references to the animators in
the RoundThumbnailView to signal animators to be re-created.
Bug:
19034435
Change-Id: I94b74c0ea8f385d348dd981ebe8d9402140c3248
zafir [Fri, 30 Jan 2015 22:26:51 +0000 (14:26 -0800)]
Implemented Report functionality using GMS Core Feedback API. Implemented stubs for Camera2.
Bug:
18188247
Change-Id: Ic47bf432dca326bb454d0e4408b6b58f645a3fa4
Sascha Haeberling [Tue, 3 Feb 2015 21:01:53 +0000 (21:01 +0000)]
Merge "Move CaptureSession into it's own file and clean up interface." into ub-camera-haleakala
Sascha Haeberling [Tue, 3 Feb 2015 18:31:36 +0000 (10:31 -0800)]
Move CaptureSession into it's own file and clean up interface.
Change-Id: Iaca24e22b541aec898cdf1d3246c98ed72cd85ca
I-Jong Lin [Tue, 3 Feb 2015 19:46:00 +0000 (19:46 +0000)]
Merge "ImageBackend Service Integration, Pass 2" into ub-camera-haleakala
I-Jong Lin [Tue, 3 Feb 2015 19:38:10 +0000 (19:38 +0000)]
Merge "Fix centering issue of the Fast Thumbnail Preview" into ub-camera-haleakala
I-Jong Lin [Wed, 28 Jan 2015 00:04:31 +0000 (16:04 -0800)]
Fix centering issue of the Fast Thumbnail Preview
Circular Fast thumbnail doesn't seem to be quite centered, even though
picture is centered in the viewfinder. Y channel horizontal offset
in memory was not being calculated correctly from the specified
pixel strides. Also, added an offset of 1/2 of the downsample so that
the image can be more centered.
Bug:
19132967
Change-Id: I406172beda8b383d513c539ae5963400f57cdd42
Spike Sprague [Tue, 3 Feb 2015 18:20:20 +0000 (18:20 +0000)]
Merge "Move logic to open filmstrip from onUp() to onFling(), mimicking logic in ModeListView fling handling." into ub-camera-haleakala
Spike Sprague [Tue, 3 Feb 2015 01:25:55 +0000 (17:25 -0800)]
Move logic to open filmstrip from onUp() to onFling(), mimicking logic in ModeListView fling handling.
bug:
18904319
Change-Id: I8e2b1db72eceab1b5ba14f3ecf3aa35ba35df046
Puneet Lall [Tue, 3 Feb 2015 00:22:35 +0000 (00:22 +0000)]
Merge "Fix race condition in MetadataPool implementation" into ub-camera-haleakala
Puneet Lall [Mon, 2 Feb 2015 23:52:53 +0000 (15:52 -0800)]
Fix race condition in MetadataPool implementation
Existing code synchronized on the wrong object.
Bug:
19237665
Change-Id: Icd50b3b0dee8a03dfb0696af01351323493d7b0c
Alan Newberger [Mon, 2 Feb 2015 22:08:14 +0000 (22:08 +0000)]
Merge "Log suppression for JVM tests" into ub-camera-haleakala
Alan Newberger [Mon, 2 Feb 2015 21:19:10 +0000 (13:19 -0800)]
Ensure Glide signatures include MediaStore metadata
We add MediaStore metadata to Glide signatures to ensure cache keys
get correctly updated when MediaStore items are updated.
Bug:
19199401
Change-Id: Iaf4db5ad58c33aab454b29e120fe25c5b3accb65
I-Jong Lin [Thu, 15 Jan 2015 00:33:55 +0000 (16:33 -0800)]
ImageBackend Service Integration, Pass 2
ImageBackend now emulates its processing by submitting shadow tasks
onto the Processing Service queue, submitting one ImageShadowTask
for every call to Imagebackend::receiveImage. Actual processing is
still handled by the ImageBackend object, but this shadow task
emulation allows the ProcessingServiceManager to deferment Long
running tasks of Photosphere and Lens blur when there is current
ImageBackend processing. However, ImageBackend does NOT defer any
of its task to Photosphere and Lens Blur and runs all its tasks
asynchronously on its own thread pools. The image shadow tasks
that ImageBackend submits merely block until processing on an image
is finished with processing.
Bug:
18906477
Change-Id: Ia8e89c03a5e64ebb1b980111c9e3b8cc4eaeda4f
Paul Rohde [Thu, 22 Jan 2015 01:07:37 +0000 (17:07 -0800)]
Multi camera device lifecycle management.
- Generic device open lifecycle.
- Generic device open / close states.
- Camera specific single device lifecycle.
- Camera2 specific single device actions.
- Portibility specific single device actions.
- Legacy Camera specific single device actions.
- Combined multi-camera lifecycle layer.
Related Bugs:
Bug:
17905863 - Filmstrip Jank
Bug:
18414621 - Startup Latency
Bug:
17925205 - Cold start Latency
Change-Id: I13e1e5909f05617485c7303c82d3baed20b6cd1c
Geoff Mendal [Mon, 2 Feb 2015 15:16:25 +0000 (07:16 -0800)]
Import translations. DO NOT MERGE
Change-Id: I0ff379f424160a2b4a4b7390f920cc454ef30956
Auto-generated-cl: translation import
Sascha Haeberling [Thu, 29 Jan 2015 01:17:41 +0000 (17:17 -0800)]
Only create temp session file when necessary.
Bug:
19148484
This also removes the IOException that could happen when a new session
is created and moves it to where a module actually needs the temporary
output file.
Change-Id: Ifc1f1ba2735557580c1302f8658a07bb13cc3c3e
Alan Newberger [Fri, 30 Jan 2015 23:49:18 +0000 (15:49 -0800)]
Ensure right non-neighbors are invisible during filmstrip item scaling
Only the immediate right hand neighbor should fade out and translate to
center when drag-scaling the centered filmstrip item. Regression from G
to H, this CL ensures only the immediate neighbor is visible.
Bug:
19127110
Change-Id: I4023b91c384abd2b139b04124167cce8cb50c618
Senpo Hu [Fri, 30 Jan 2015 23:06:39 +0000 (23:06 +0000)]
Merge "Suppress capture indicator while recording video." into ub-camera-haleakala
Senpo Hu [Fri, 30 Jan 2015 22:56:53 +0000 (14:56 -0800)]
Suppress capture indicator while recording video.
Bug:
18908730
Change-Id: I2acd06f792c630b5ddac769c07edbefa94d9e110
Puneet Lall [Fri, 30 Jan 2015 21:35:58 +0000 (21:35 +0000)]
Merge "Enable tracking of image availability" into ub-camera-haleakala
Puneet Lall [Thu, 22 Jan 2015 01:08:05 +0000 (17:08 -0800)]
Enable tracking of image availability
To allow updating the UI whenever image reader space is exhausted, we
must be able to track whether or not non-zsl images can be allocated at
any given time. This CL implements this for the general case of both
single images as well as for finite bursts.
Bug:
18934542
Change-Id: Ia8c6e03f631cf47e4385cb8da1e3f6d74e7901a2
Paul Rohde [Fri, 30 Jan 2015 21:30:18 +0000 (21:30 +0000)]
Merge "Disable the touch to focus sound." into ub-camera-haleakala
Puneet Lall [Fri, 30 Jan 2015 21:12:37 +0000 (13:12 -0800)]
Fix build break
Android's Exception class is missing a constructor which was added in
java 7.
Change-Id: Idab9bf40d59c5816d2431edb8302e350df748ead
Puneet Lall [Fri, 30 Jan 2015 19:54:42 +0000 (11:54 -0800)]
Translate API IllegalStateException into checked exceptions
Fixes AndroidCameraCaptureSessionProxy to actually translate
IllegalStateExceptions into CameraCaptureSessionClosedException.
CameraCaptureSessionProxy already declared this as a possible checked exception,
but the AndroidCameraCaptureSessionProxy implementation never actually
did the correct translation.
As a result, extremely-misleading error-level logs can be output when
the app is paused.
Change-Id: I3f1e39bda079a04500988447dd6c24fa679cd2d0
Paul Rohde [Fri, 30 Jan 2015 18:34:24 +0000 (10:34 -0800)]
Disable the touch to focus sound.
Bug:
18898692
Change-Id: Idd9485971dd6bd9a8175f79455691ef1e56e89f8
Puneet Lall [Fri, 30 Jan 2015 18:25:06 +0000 (18:25 +0000)]
Merge "Fix bug in counting open images" into ub-camera-haleakala
Puneet Lall [Fri, 30 Jan 2015 03:09:30 +0000 (19:09 -0800)]
Fix bug in counting open images
Bug:
19156045
AndroidImageReaderProxy previously would return an instance of itself
via onImageAvailable. This caused a problem because it bypassed the
LoggingImageReaderProxy and CloseWhenDoneImageReaderProxy decorators.
This change also includes additional minor fixes for potential issues,
specifically, it also synchronizes access to each android.media.Image
and ImageReader because they are not thread-safe.
Change-Id: I0d76c07ae37b09cdec40f7d7789b49f7397fb414
Senpo Hu [Fri, 30 Jan 2015 05:06:56 +0000 (05:06 +0000)]
Merge "Trigger hit state animation when clicking on capture indicator." into ub-camera-haleakala
Senpo Hu [Wed, 28 Jan 2015 00:58:33 +0000 (16:58 -0800)]
Trigger hit state animation when clicking on capture indicator.
Bug:
18905659
Change-Id: I78131ded35e7663e159ec378a50603fa4cc23434
Alan Newberger [Thu, 29 Jan 2015 23:22:41 +0000 (23:22 +0000)]
Merge "Avoid building FilmstripItems when data is null" into ub-camera-haleakala
Alan Newberger [Thu, 29 Jan 2015 19:35:59 +0000 (11:35 -0800)]
Log suppression for JVM tests
Allow JVM tests to suppress logs, and thus any calls to Android
specific classes. Static accessors to logs is a common idiom in
Android, rather than overhaul the entire app to inject Loggers,
take advantage of our existing proxy and allow tests to suppress
Android specific class calls (to Context and android.util.Log).
Change-Id: I1b0d266326fc3ecc4791b9bc4b3b69eac8110dc2
Alan Newberger [Thu, 29 Jan 2015 19:32:22 +0000 (11:32 -0800)]
Avoid building FilmstripItems when data is null
Items should not have null data. Code exists to handle null
items generated, and skip them, but if data is null, items
are still added to caches and cause exceptions later.
Bug:
19097423
Change-Id: I171ec40369cdcc5a5567968380a600943d4991e4
Puneet Lall [Tue, 27 Jan 2015 01:06:33 +0000 (17:06 -0800)]
Fix flash implementation
Bug:
19132962
Change-Id: Ifdf4c9694bc503c8b902386f380ae1a39e7824d0
Sascha Haeberling [Wed, 28 Jan 2015 22:13:19 +0000 (22:13 +0000)]
Merge "Make sure to always use ZSL frames for capture." into ub-camera-haleakala
Paul Rohde [Wed, 28 Jan 2015 22:07:37 +0000 (22:07 +0000)]
Merge "Convert Logger from a class to an interface." into ub-camera-haleakala
Sascha Haeberling [Wed, 28 Jan 2015 01:42:49 +0000 (17:42 -0800)]
Make sure to always use ZSL frames for capture.
Bug:
19166357
This fixes an issue on the N9 which does SW NR with
TEMPLATE_STILL_CAPTURE, which stalls the whole camera image reading
pipeline for a long time.
And in general we should probably not take pictures with potentially
differenty qualities for ZSL and while waiting for 3A to converge.
M will solve this issue with the introduction of the reprocessing
pipeline.
Change-Id: Ic444884f5dad6ecff44d0a6b7c7a118f0242bef2
Spike Sprague [Wed, 28 Jan 2015 21:04:59 +0000 (21:04 +0000)]
Merge "set default flashMode and focusMode onto Camera Settings add null checks when accessing flashMode and focusMode" into ub-camera-haleakala
Spike Sprague [Wed, 28 Jan 2015 03:13:44 +0000 (19:13 -0800)]
set default flashMode and focusMode onto Camera Settings
add null checks when accessing flashMode and focusMode
bug:
18200939
Change-Id: I622deed48764ff42b5db9a7313c5bdf3253d3f69
Paul Rohde [Tue, 27 Jan 2015 23:26:41 +0000 (15:26 -0800)]
Convert Logger from a class to an interface.
This set of changes makes it easier to insert any Logger implementation into a method and to ask for instances during object creation so that objects that require logging and testing can be easily tested.
- Add Loggers for individual Logger types.
- Add static methods for existing TagLogger.
- Add NoOp logger implementation.
Change-Id: I30c03667c88214cff03521d0a1f6fa3b00851a68
Spike Sprague [Wed, 28 Jan 2015 19:25:53 +0000 (19:25 +0000)]
Merge "Hide accessibility buttons in Intent Capture Hide options button during Intent Review" into ub-camera-haleakala
Spike Sprague [Wed, 28 Jan 2015 18:42:39 +0000 (18:42 +0000)]
Merge "Fix content description for video intent review playback button." into ub-camera-haleakala
Spike Sprague [Wed, 28 Jan 2015 01:52:07 +0000 (17:52 -0800)]
Fix content description for video intent review playback button.
bug:
18760510
Change-Id: I59773006d8075e957451082ca0fcc11c3c417f30
Spike Sprague [Tue, 13 Jan 2015 01:30:53 +0000 (17:30 -0800)]
Hide accessibility buttons in Intent Capture
Hide options button during Intent Review
bug:
18739652
Change-Id: I6ea912f811e3363c5e1454ad62c6645d7669003f
I-Jong Lin [Wed, 28 Jan 2015 01:42:50 +0000 (01:42 +0000)]
Merge "Fix for Ripple on Fast Thumbnail Indicator" into ub-camera-haleakala
Puneet Lall [Wed, 28 Jan 2015 01:24:28 +0000 (01:24 +0000)]
Merge "Ignore duplicate calls to Image.close()" into ub-camera-haleakala
Puneet Lall [Wed, 28 Jan 2015 00:54:04 +0000 (16:54 -0800)]
Ignore duplicate calls to Image.close()
Bug:
19156045
Change-Id: I78d4dea216b50c0edd3f8784a5aaafc4647568d0
I-Jong Lin [Tue, 27 Jan 2015 19:29:17 +0000 (11:29 -0800)]
Fix for Ripple on Fast Thumbnail Indicator
There was a cute optimization was to start the ripple animation, and
then fill in the bitmap in 30ms after the bitmap was computed.
However, when the system is overloaded, the bitmap is not necessarily
computed in 30ms, and an empty ripple can result. Put in a more
conservative fix, when the ripple only starts when the bitmap has
already been computed.
Bug:
19132963
Change-Id: Id39257a1d75342c78385bac8682462e8875d97f7
Spike Sprague [Fri, 23 Jan 2015 23:19:36 +0000 (15:19 -0800)]
Make CaptureModule obey camera characteristics when reporting flash support
bug:
19018131
Change-Id: If891bc410a99452dfe0fadc6545e41c3853f5639
Puneet Lall [Tue, 27 Jan 2015 18:28:34 +0000 (10:28 -0800)]
Consolidate camera logging
Consolidates logging and removes misleading stack traces when commands
are interrupted due to an application pause.
Bug:
19156045
Change-Id: I92eea8df1d3bbce048bac02689a14d2240aad2be
Puneet Lall [Tue, 27 Jan 2015 01:49:39 +0000 (17:49 -0800)]
Change/fix flash behavior when taking photos
* Ignore ZSL images when flash is ON (Bug:
19151455)
* Ignore AE state when flash is OFF (Bug:
19151502)
Change-Id: I2e27eb9b7573beab352fba89c02805447d009c80
Senpo Hu [Sat, 24 Jan 2015 00:53:02 +0000 (00:53 +0000)]
Merge "Fix NPE crash in RoundedThumbnailView." into ub-camera-haleakala
Senpo Hu [Fri, 23 Jan 2015 23:09:35 +0000 (15:09 -0800)]
Fix NPE crash in RoundedThumbnailView.
Bug:
19003975
Change-Id: I4839696e1f5c4e9b7a768ed24ad5951764cd9d66
Alan Newberger [Fri, 23 Jan 2015 22:23:10 +0000 (14:23 -0800)]
Fix Video thumbnail filmstrip size
Video size comes in asynchronously, and after refactor wasn't
wired up to query the metadata instead of the initial mediastore
size. This CL hides FilmstripItemData dimensions behind FilmstripItem
so that VideoItem can override and provide a Size via its existing
methods that use metadata if present.
Bug:
19000322
Change-Id: Ifddd6c90169c80d9fd69a1549e1086d5f1abfd85
Spike Sprague [Fri, 23 Jan 2015 22:48:00 +0000 (22:48 +0000)]
Merge "add isFlashSUpported() to OneCameraCharacteristics, make it work with API 1 and API 2" into ub-camera-haleakala
Spike Sprague [Fri, 23 Jan 2015 03:37:59 +0000 (19:37 -0800)]
add isFlashSUpported() to OneCameraCharacteristics,
make it work with API 1 and API 2
bug:
19018131
Change-Id: I0d4157688e6219f9d6f5827c19938e90d3831bdf
Sascha Haeberling [Wed, 21 Jan 2015 02:59:08 +0000 (18:59 -0800)]
CaptureSession can now be started with an empty placeholder.
Bug:
19014774
Bug:
18853119
Bug:
18979823
Being able to start with an empty placeholder and then updating that
placeholder allows us to add a visual entry to the filmstrip early on.
This avoid jarring effects where after taking many apid fire shots and
going to filmstrip, the entries are appearing one after the other.
This was caused by sessions only getting started when the thumbnail was
produced, which can take a while when multiple shots are in the
encoding pipeline.
Also contains changes that make CaptureSession testable.
Change-Id: I3d44704099be81524f8e165f3f09de6eebfc147b
Alan Newberger [Fri, 23 Jan 2015 21:31:47 +0000 (21:31 +0000)]
Merge "Remove placeholders from filmstrip methods, add PhotoItem/SessionItem integration" into ub-camera-haleakala
Puneet Lall [Fri, 23 Jan 2015 21:07:36 +0000 (21:07 +0000)]
Merge "Fix build breakage" into ub-camera-haleakala
Puneet Lall [Fri, 23 Jan 2015 21:01:03 +0000 (13:01 -0800)]
Fix build breakage
Fix build breakage due to "Enable testing of ZslSharedImageReaderFactory"
Change-Id: I0e1da855a71f5ab83c65bdfb8b1e76cfd9199e3c
Puneet Lall [Fri, 23 Jan 2015 20:18:12 +0000 (20:18 +0000)]
Merge "Enable testing of ZslSharedImageReaderFactory" into ub-camera-haleakala
Puneet Lall [Fri, 23 Jan 2015 17:45:51 +0000 (09:45 -0800)]
Enable testing of ZslSharedImageReaderFactory
* Migrate from CloseableHandlerThread to HandlerFactory to remove all
direct dependencies on the platform.
Change-Id: I3d6aca94cd6f9559596d157b86c174bfb8801f90
Alan Newberger [Fri, 23 Jan 2015 17:55:47 +0000 (09:55 -0800)]
Remove placeholders from filmstrip methods, add PhotoItem/SessionItem integration
In this CL we add the ability for a PhotoItem to use a Session bitmap as a
placeholder. We also move general placeholder management out of the method
call stack, moving a single static initialization in CameraActivity into a
field in FilmstripItemBase for use by FilmstripItems.
Bug:
18977838
Change-Id: Ic1b0dc11fd0e4c85b9b310235e6d3122cf1543ce
Paul Rohde [Tue, 20 Jan 2015 21:39:16 +0000 (13:39 -0800)]
Make most app services lazy.
Change-Id: I476914b1ed399f8ad727ac33782229cdf39d378f
Alan Newberger [Fri, 23 Jan 2015 01:00:52 +0000 (01:00 +0000)]
Merge "Reduce view add/removes when loading photos" into ub-camera-haleakala
Puneet Lall [Fri, 23 Jan 2015 00:42:40 +0000 (00:42 +0000)]
Merge "Wait for AE/AF convergence before taking pictures" into ub-camera-haleakala
I-Jong Lin [Thu, 15 Jan 2015 19:24:27 +0000 (11:24 -0800)]
Image Backend Integration w/ Simple Camera
Wiring for cameras that only deliver compressed JPEG artifacts.
This CL was tested by enabling it on the Nexus 5.
Currently, the code in this CL is NOT exposed in any known
Nexus Camera model. The two unexposed bugs are as follows: an camera
initialization bug on Nexus 4, and a cross-device functional issue
with the SimpleCameraOneFactory object in that it doesn't request
a JPEG compression artifact from the HAL with zero orientation.
Bug:
18908116
Change-Id: If7080c4e8e52a329fb9a6fed52f7c31541758afb
Puneet Lall [Thu, 22 Jan 2015 23:32:36 +0000 (23:32 +0000)]
Merge "Close ImageReaders after the camera is closed" into ub-camera-haleakala
Alan Newberger [Thu, 22 Jan 2015 19:48:27 +0000 (11:48 -0800)]
Reduce view add/removes when loading photos
Two fixes to reduce flicker when loading images. First, adjust
ViewItem instances in-place instead of creating new ViewItems
which included adding and removing views from the hierarchy.
It turned out we were doing an update for every photo due to
touching PanoramaMetadata and reporting back that metadata
was adjusted, whether or not a photo was a panorama. Now
that data is reported. New photo captures are essentially
added and removed from the view hierarchy three times before
this change, after an ImageView is added once, with its
contents changed as the photo is loaded.
More testing is needed but I cannot repro the elusive filmstrip
flicker with these changes.
Bug:
18977838
Bug:
17905863
Change-Id: I5a42c0baf87a8cef0ee4dbcf9f03d40715e6aa2d
Puneet Lall [Wed, 14 Jan 2015 21:03:47 +0000 (13:03 -0800)]
Close ImageReaders after the camera is closed
Bug:
18841114
Change-Id: Ifc0b79e70059efd8f8ace2c29243406b524ad918