OSDN Git Service
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
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
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
Puneet Lall [Thu, 15 Jan 2015 17:28:34 +0000 (09:28 -0800)]
Wait for AE/AF convergence before taking pictures
Bug:
18997124
Change-Id: I27b06186acde05c81d31042f330b6dabeac865cf
Alan Newberger [Thu, 22 Jan 2015 17:39:33 +0000 (17:39 +0000)]
Merge "Add typing to cursor item factories" into ub-camera-haleakala
Paul Rohde [Thu, 22 Jan 2015 17:23:59 +0000 (09:23 -0800)]
Fix camera2 LogHelper signature mismatch.
Change-Id: Ibb37baad498bfebbab9f0451af4d5a95ac45dabe
Paul Rohde [Thu, 22 Jan 2015 01:20:04 +0000 (17:20 -0800)]
Extended logging utilities.
Change-Id: I4a49a0694495f9c03c55a9ea8fad0ed22bc45bfc
Alan Newberger [Thu, 22 Jan 2015 03:25:24 +0000 (19:25 -0800)]
Add typing to cursor item factories
Add a bit of generic typing to allow clients to directly use
PhotoItem or VideoItem without casting, particularly in
CameraActivity.onSessionDone where explicit calls are made
to the PhotoItem factory.
Bug:
18977838
Change-Id: Ib5ecff2342d73ec3ce817a5f7e7fe42733ed8a71
Paul Rohde [Tue, 20 Jan 2015 21:39:16 +0000 (13:39 -0800)]
Make it possible for singletons that rely on application context to be
initalized lazily.
* Add AndroidContext
* Add AndroidServices
* Make LogHelper ues thread safe lazy initialization
* Convert several unused fields into local variables in CameraApp.
Change-Id: I9c73e9b91efb49a01d848a8cca1e8e65f059b5d0
Paul Rohde [Wed, 21 Jan 2015 23:30:15 +0000 (23:30 +0000)]
Merge "Move first run detection into its own object." into ub-camera-haleakala
Paul Rohde [Wed, 21 Jan 2015 23:01:13 +0000 (15:01 -0800)]
Move first run detection into its own object.
Change-Id: I82f109e970ac871c9de54ff551176c2cd29070b4
Puneet Lall [Wed, 21 Jan 2015 23:04:54 +0000 (15:04 -0800)]
Add missing copyright header
Change-Id: Ia0198b9661ef5882e998ac0a6bb17cffc013057a
Radford Juang [Tue, 20 Jan 2015 17:16:38 +0000 (17:16 +0000)]
Merge "Fix issue where holding down shutter button sometimes does not trigger burst." into ub-camera-haleakala
Alan Newberger [Tue, 20 Jan 2015 01:47:36 +0000 (17:47 -0800)]
Preserve zoom on touch to focus
During the full AF scan the crop region is missing from the request,
so you see the preview snap back to no zoom, then back when the delayed
reset occurs. This CL works, I think it's sound per AF/AE metering as
they were already monitoring the crop region in their calculations, this
just feeds the crop region to the request as well.
Bug:
19064291
Change-Id: I5b2b90147f29abda68df80fed66685aca90a515c
Alan Newberger [Sat, 17 Jan 2015 02:14:00 +0000 (02:14 +0000)]
Merge "Check for null camera within proxy" into ub-camera-haleakala
Alan Newberger [Sat, 17 Jan 2015 00:27:58 +0000 (16:27 -0800)]
Check for null camera within proxy
Companion cl to ag/614134, ensures now may have a null camera
rather than a potentially stale one, ensure we don't pass one
into the MediaRecorder.
Bug:
18414095
Change-Id: I215cd10e4322109019ea710b155121d375f82712
Radford Juang [Fri, 16 Jan 2015 22:46:52 +0000 (14:46 -0800)]
Fix issue where holding down shutter button sometimes does not trigger burst.
This can occur when the user intends to do a long-press but finger
budges slightly (e.g., 1 pixel) triggering an ACTION_MOVE event. This
fix disables ACTION_MOVE events from being sent to gesture detector,
allowing the long tap event to occur when slight finger movement occurs.
Change-Id: Id13a7121f0a899291f031509983050d472566c80
Puneet Lall [Fri, 16 Jan 2015 23:22:38 +0000 (23:22 +0000)]
Merge "Delete obsolete/unused interface" into ub-camera-haleakala
I-Jong Lin [Fri, 16 Jan 2015 22:57:13 +0000 (14:57 -0800)]
Framerate fix for ZSL Nexus 5, Redux
Screwed up the merge last time. Need to redo this fix.
Bug:
19017062
Change-Id: I52b5bb71dea71f52c7c5d3379df798931b1976c5
I-Jong Lin [Fri, 16 Jan 2015 22:44:31 +0000 (14:44 -0800)]
Fix for Camera2 Build
Unfortunately, introduced in ag/612015.
Change-Id: Ic4e17f8093272f7b531c526607ca974b2d456737
Senpo Hu [Fri, 16 Jan 2015 22:33:57 +0000 (22:33 +0000)]
Merge "Fix capture indicator on non-zsl modules." into ub-camera-haleakala
I-Jong Lin [Fri, 16 Jan 2015 22:25:37 +0000 (22:25 +0000)]
Revert "Optimize Framerate Workaround for ZSL on Nexus 5"
This reverts commit
3ec132c4429683871ffd652e2563459e5c866065.
Change-Id: I269f26ce801dc730055307226479af1d6f6effd5
Puneet Lall [Fri, 16 Jan 2015 22:23:03 +0000 (14:23 -0800)]
Delete obsolete/unused interface
Change-Id: I5c79e3372c9950fde6d6a86e647cf38dee79c9af
I-Jong Lin [Fri, 16 Jan 2015 20:58:10 +0000 (12:58 -0800)]
Optimize Framerate Workaround for ZSL on Nexus 5
Through experimentation, we have found that the framerate range
[7,29] does NOT reproduce the preview jank, but still allows
ZSL to be run.
Bug:
19017062
Change-Id: I99f71385640f103a05f86d7a194f36712b1841d8
I-Jong Lin [Fri, 16 Jan 2015 22:14:44 +0000 (22:14 +0000)]
Merge "Route ImageBackend JPEG Thumbnail To Wear" into ub-camera-haleakala
Senpo Hu [Fri, 16 Jan 2015 22:13:42 +0000 (14:13 -0800)]
Fix capture indicator on non-zsl modules.
The logic is accidentally changed by ag/607738.
Let's revert it here.
Bug:
19022139
Change-Id: Idc6fd91ff5352a464bc128b367c54ba971b16b28
I-Jong Lin [Tue, 13 Jan 2015 18:23:16 +0000 (10:23 -0800)]
Route ImageBackend JPEG Thumbnail To Wear
Sends the results of JPEG compression task to a wear device if
available. Need to do a little plumbing on the
OneCamera.PictureSaverCallback.
Bug:
18841900
Change-Id: Iec86a82d9b99e8ff9fecd208d27bfbc563af73f6
Puneet Lall [Fri, 16 Jan 2015 22:09:49 +0000 (22:09 +0000)]
Merge "Apply flash setting changes to the AE mode" into ub-camera-haleakala
Puneet Lall [Fri, 9 Jan 2015 18:08:16 +0000 (10:08 -0800)]
Apply flash setting changes to the AE mode
Bug:
17216526
Change-Id: If6c03102f04ad2ba54e1a045a3ab7445aaa5b595
Andy Huibers [Fri, 16 Jan 2015 02:19:10 +0000 (18:19 -0800)]
Move stats to new package.
Change-Id: Idfab1a24c91ff4c96515f3520283c7a0512d0514
Senpo Hu [Fri, 16 Jan 2015 21:19:59 +0000 (21:19 +0000)]
Merge "Move FirstRunDialog to app layer." into ub-camera-haleakala
Puneet Lall [Fri, 16 Jan 2015 21:18:06 +0000 (21:18 +0000)]
Merge "Add method for preallocating image-reader space" into ub-camera-haleakala
Senpo Hu [Sun, 11 Jan 2015 23:04:31 +0000 (15:04 -0800)]
Move FirstRunDialog to app layer.
The first run logic should live in CameraActivity. This refactoring
could clean up CaptureModule and PhotoModule.
* Introduce ResolutionSetting class.
* Introduce OneCameraManagerImpl for camera API 1.
Tested and verified this works on K / L devices.
Change-Id: I11a968a9346b520dee23fc4591a73bb483c43246
Alan Newberger [Fri, 16 Jan 2015 17:46:06 +0000 (17:46 +0000)]
Merge "Add Camera cover equivalent to windowBackground to smooth lockscreen startup" into ub-camera-haleakala
Alan Newberger [Wed, 14 Jan 2015 22:10:05 +0000 (14:10 -0800)]
Add Camera cover equivalent to windowBackground to smooth lockscreen startup
This CL adds a windowBackground drawable equivalent to the covers shown by lockscreen
and app, to remove the black screen in between. With this CL I mostly see no artifacts
when opening camera from lockscreen. Some issues:
* to improve memory usage in system UI holding the lockscreen preview, a vector
camera blanket was added in ag/587418 to ic_camera_blanket. That works transparently
everywhere so far but not in resource drawables that can only handle bitmaps in
layer-list items. Split the vector and bitmaps here, which means only the lockscreen
uses the vector -- this also surfaced a color mismatch between the vector and our PNG
bitmaps, corrected in the new ic_camera_blanket_vector resource. This is a bit fragile
as we rely on pixel match of the two resources, would like a cleaner solution but the
layer-list limitation is tough -- without this change the app crashes at runtime within
BitmapDrawable when the windowBackground is loaded.
* likewise both the lockscreen and app covers explicitly size the bitmap, there are no
provisions to do so within layer-list. Will follow up with a refactor of in-app cover
(ModeTransitionView) to remove explicit sizing and then all will rely on bitmap size
(per above will still need vector file size coordinated with bitmap).
* current implementation relies upon a black window background, we restore that in onCreate.
* Both secure camera and v21 main camera currently use the windowBackground, will submit
just for secure then introduce for main camera when we always start into Camera mode.
* For L explicitly set android:windowDrawsSystemBarBackgrounds to false to ensure the
system preview into the DecorView doesn't take the navigation bar into account when
vertically centering the cover bitmap, to make the preview identical to the other covers.
Bug:
18369862
Change-Id: Ia481e2d1d94bdc5a5d39b4d35b32c29a75bf99ec
Puneet Lall [Fri, 16 Jan 2015 00:16:43 +0000 (16:16 -0800)]
Add method for preallocating image-reader space
For non-zsl picture-taking, it is critical that image-reader
space be allocated prior to starting the precapture AF/AE sequence.
Bug:
18997124
Change-Id: Id931d687c4034dadab3aee60142b096f298216a7
Sascha Haeberling [Thu, 15 Jan 2015 21:17:29 +0000 (13:17 -0800)]
Change visibility to allow for continuous testing.
Bug:
19034273
Background: Dexmaker (through Mockito) is not able to mock
package-protected classes:
https://code.google.com/p/dexmaker/issues/detail?id=34
This can be reverted once we have a build system that doesn't require us
wrapping JUnit tests into an APK.
Change-Id: I7de59e36fa7645f9e1616e4d9c4fdda8e612e9bc
I-Jong Lin [Thu, 15 Jan 2015 17:38:53 +0000 (09:38 -0800)]
Fix for JPEG Compression w/ Unknown Orientation
TaskCompressImageToJpeg blindly passed the orientation from the camera to
JpegUtilNative.compressJpegFromYUV420Image, which then threw a run-time
exception. Behavior for TaskCompressImageToJpeg with an image of
UNKNOWN orientation is to treat it as CLOCKWISE_0 for purposes of
JPEG compression. Instead of crashing, the camera now receives a JPEG
of the dark image of one's tabletop.
Bug:
19000723
Change-Id: I412fb6fed5d80035b180db7f6e8504d6d36b4fcc
Puneet Lall [Wed, 14 Jan 2015 23:22:55 +0000 (23:22 +0000)]
Merge "Make SettingsManager thread-safe" into ub-camera-haleakala
Puneet Lall [Wed, 14 Jan 2015 23:22:42 +0000 (23:22 +0000)]
Merge "Filter ZSL images based on frame metadata" into ub-camera-haleakala
Puneet Lall [Tue, 13 Jan 2015 23:55:15 +0000 (15:55 -0800)]
Make SettingsManager thread-safe
Required to fix bug:
17216526
Change-Id: I4e0d8dfc613a8022982d48f2086e2539f3db9596
Paul Rohde [Wed, 14 Jan 2015 18:17:01 +0000 (10:17 -0800)]
Check filmstrip scroll controller as well when deciding to load the full resolution image.
b/
18947934
Change-Id: I6e9558bbd8a9b5ae52207cbb9af3b575123eda1f
Puneet Lall [Thu, 8 Jan 2015 01:40:51 +0000 (17:40 -0800)]
Filter ZSL images based on frame metadata
Introduces a new metadatasynchronizer package with functionality for
retrieving metadata (TotalCaptureResults) for images which have been added to
the zsl ringbuffer.
To enable unit-testing, proxy objects for CaptureRequest, CaptureResult,
and TotalCaptureResult have been added, so they can now be mocked.
Bug:
18964540
Change-Id: I8374350e09d33f54ff241f23fd005013ed26dab0
Paul Rohde [Wed, 14 Jan 2015 00:45:21 +0000 (00:45 +0000)]
Merge "Load full resolution images for newly inserted images." into ub-camera-haleakala
Paul Rohde [Wed, 14 Jan 2015 00:16:07 +0000 (16:16 -0800)]
Load full resolution images for newly inserted images.
- Update log messages to remove filmstrip log spam.
b/
18947934
Change-Id: I7ee26e45ab2991ada148ce52d04899fc1d164784