OSDN Git Service
Geoff Mendal [Mon, 13 Jul 2015 12:20:38 +0000 (05:20 -0700)]
Import translations. DO NOT MERGE
Change-Id: Idd4712a71746b45c1512f75c8d1062513acb3a6a
Auto-generated-cl: translation import
Geoff Mendal [Sat, 11 Jul 2015 12:26:23 +0000 (05:26 -0700)]
Import translations. DO NOT MERGE
Change-Id: I29df25340044638daaed9d2fd7828b85af0eef86
Auto-generated-cl: translation import
Alan Newberger [Fri, 10 Jul 2015 23:46:40 +0000 (16:46 -0700)]
Shorten location startup dialog string
BUG=
21706101
Change-Id: I66164d43830cb71bb3a24f0f996a533358cb7d7e
Alan Newberger [Fri, 10 Jul 2015 16:39:13 +0000 (09:39 -0700)]
Null check when evaluating valid resolution size
Guard against nonexistent size so that logic to reset size
preference can proceed
BUG=
22396405
Change-Id: Id508713ef91f632867366934e72fe939a839e228
Alan Newberger [Mon, 29 Jun 2015 17:49:25 +0000 (17:49 +0000)]
Merge "Ensure CaptureModule/API2 works without front camera" into ub-camera-haleakala
Alan Newberger [Mon, 29 Jun 2015 17:32:35 +0000 (17:32 +0000)]
Merge "Update filmstrip item on metadata update" into ub-camera-haleakala
Alan Newberger [Thu, 25 Jun 2015 20:58:33 +0000 (13:58 -0700)]
Ensure CaptureModule/API2 works without front camera
Add a check in both first run dialogs, and the generated HardwareSpec,
so that front cameras are only used if detected.
BUG=
21781461
Change-Id: I6844655b2fd3df90b649f5dfd6a006ef68dbf1da
Alan Newberger [Thu, 25 Jun 2015 18:40:32 +0000 (11:40 -0700)]
Update filmstrip item on metadata update
Due to async metadata loading, when viewing an image progress bar,
after progress completion the main handler hiding progress bar would
also hide filmstrip buttons if in secure mode, but the async metadata
handler was calling a restricted handler that would only update the
controls, not hiding for secure, or updating overflow menu. This
change ensures all UI aspects of the item update are processed upon
metadata loading.
BUG=
21499182
Change-Id: I92f22667d836d6ece6aa8427d967ec8e038b1e77
Senpo Hu [Thu, 25 Jun 2015 17:32:49 +0000 (17:32 +0000)]
Merge "Fix transform issue in CaptureIntent." into ub-camera-haleakala
Senpo Hu [Fri, 12 Jun 2015 23:20:46 +0000 (16:20 -0700)]
Fix transform issue in CaptureIntent.
On M, EventOnTextureViewLayoutChanged comes earlier during app
initialization in StateForeground which doesn't handle it. So
here in StateReadyForCapture, we pull the current preview layout
size and inform ResourceSurfaceTexture to allow it to calculate
transform.
Noted that we also need to bring this fix to Ivvavik.
Bug:
21786937
Bug:
20173626
Change-Id: I417aef2f09247e77059fc5b066cbf10602ce5cf1
Geoff Mendal [Tue, 16 Jun 2015 14:26:13 +0000 (07:26 -0700)]
Import translations. DO NOT MERGE
Change-Id: I68480e5a35383d6967dedbada17bc8075a24d90e
Auto-generated-cl: translation import
I-Jong Lin [Thu, 11 Jun 2015 00:10:30 +0000 (17:10 -0700)]
Fix for invalidated resolutions via upgrade
Bug:
21758681
There was a upgrade bug where an valid resolution of the
previous version of the Camera App could then be invalidated
the subsequent version of the Camera App. If there were no
other valid resolutions of the same aspect ratio available
to the app, the current Camera App would choose (0,0) as its
default size and then write this value into the saved settings.
This fix allows the current Camera App to consider other resolutions
not of aspect ratio as a fallback resolution setting. Also, if
an invalid resolution valid has been saved to the settings, it
also ignores it and then resaves a valid resolution value to the
settings.
Change-Id: I08f19d1ee6491619e92697897b73e4fd33a19a00
I-Jong Lin [Mon, 8 Jun 2015 19:24:51 +0000 (12:24 -0700)]
Refresh required for full-screen undo in filmstrip
Bug:
21666018
A Glacier regression bug: when filmstrip is in full-screen mode,
and an deletion is undone, a blank screen is shown. With the fix,
the undo forces the filmstrip into its "filmstrip" mode and
forces a refresh with the un-deleted image.
Change-Id: Id99be5d4d06e220e8698821badff32dba9b43997
Geoff Mendal [Mon, 8 Jun 2015 12:36:01 +0000 (05:36 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ia8c1a4f5d0fdc4d89b6b817da959888d1916aac0
Auto-generated-cl: translation import
Geoff Mendal [Wed, 3 Jun 2015 16:20:51 +0000 (09:20 -0700)]
Import translations. DO NOT MERGE
Change-Id: I1f299766739dbf1ed6fa34340cdca5dbea1f6837
Auto-generated-cl: translation import
Geoff Mendal [Mon, 1 Jun 2015 13:07:40 +0000 (06:07 -0700)]
Import translations. DO NOT MERGE
Change-Id: I9e3eba897019de07aefe4b661040453808a94de9
Auto-generated-cl: translation import
Geoff Mendal [Sat, 30 May 2015 16:15:38 +0000 (09:15 -0700)]
Import translations. DO NOT MERGE
Change-Id: I85d8e4593585d2af00fd20b7e1ec65630b8476b0
Auto-generated-cl: translation import
Sascha Haeberling [Fri, 29 May 2015 23:20:28 +0000 (16:20 -0700)]
Use Google Feedback CrashBuilder API to make reports easier to consume.
Manual Cherry-Pick Part 1 of http://ag/699672
Currently, Feedback reports don't include a stacktrace. You have to
download
a system log file to find it. This tweak allows us to see the stacktrace
on the Report page itself.
Example old report:
https://feedback.corp.google.com/product/102042/crash?lView=rd&lCategory=
8590053278&lRSort=1&lROrder=2&lRFilter=1&lReport=
5517267704
Example new report:
https://feedback.corp.google.com/product/102042/crash?lView=rd&lCategory=
8590053278&lRSort=1&lROrder=2&lRFilter=1&lReport=
5517601160
Change-Id: If5f0ed6c69e96fe5f3661af913ae1525f8594b75
Gabriel Nava [Thu, 28 May 2015 16:36:23 +0000 (09:36 -0700)]
Fix for unusable camera after quick pause/resume and HDR+ switch (camera-Haleakala)
- Removing the hack for b/
18854352
- Running the camera reopen camera operations and onReadyForCapture callback in a non-UI thread to avoid dead-locks
Bug:
21025113
Change-Id: I5545148769d92e5a87ffa9b693397fd7737edee6
Sascha Haeberling [Thu, 28 May 2015 00:04:28 +0000 (17:04 -0700)]
Add logging for when a session knowingly failed.
Bug:
21169512
Change-Id: Ic1dc499785a97f7344e517f555fa5f7b3a1c7ea9
Paul Rohde [Wed, 27 May 2015 23:36:28 +0000 (23:36 +0000)]
Merge "Log capture session canceled events." into ub-camera-haleakala
Paul Rohde [Wed, 27 May 2015 22:14:59 +0000 (15:14 -0700)]
Log capture session canceled events.
This will handle the edgecase where capture sessions may be
canceled inbetween the time the button is pressed and the capture
actually starts so that it is possible to subtract these cases
out of the unsaved image data.
Bug:
21169512
Change-Id: Ie226d81bb10acd90dc1297230d4b024b7cd2d4d6
Gabriel Nava [Wed, 27 May 2015 17:42:03 +0000 (10:42 -0700)]
Handling the GcamService timeout due to application in paused state (camera-Haleakala)
- When GcamService times out due to a pause state, all resources are released.
- Releasing the gcam resources without showing the error dialog allows next resume operation to open the camera
Bug:
21025113
Change-Id: I95a89fbf6ce2498c1323cd4d06383141cc7cb913
Geoff Mendal [Thu, 21 May 2015 13:42:33 +0000 (06:42 -0700)]
Import translations. DO NOT MERGE
Change-Id: I3f56ffd3cd032a6c6c1984c6a5c0648733a748b2
Auto-generated-cl: translation import
Spike Sprague [Wed, 20 May 2015 02:03:23 +0000 (19:03 -0700)]
Fill out more EXIF data, closer parity to Nexus HAL
bug:
21277434
Change-Id: I4e4d9b4bffa6b0a8ccb3e870d553643dd27d2356
Sascha Haeberling [Wed, 20 May 2015 21:54:13 +0000 (21:54 +0000)]
Merge "Don't attempt to update thumbnail if session is finished." into ub-camera-haleakala
Sascha Haeberling [Wed, 20 May 2015 21:41:53 +0000 (14:41 -0700)]
Don't attempt to update thumbnail if session is finished.
Bug:
21167342
Change-Id: If2e4db523aa66e82809d30aa35fb9a30d124d9df
Gabriel Nava [Wed, 20 May 2015 19:39:02 +0000 (12:39 -0700)]
Fix to avoid random ArrayIndexOutOfBoundsException in bottom bar (camera-Haleakala)
Bug:
20957536
Change-Id: I6985d009e550f8f67ff36be3fce53c82ada0610e
Paul Rohde [Wed, 20 May 2015 18:43:37 +0000 (18:43 +0000)]
Merge "Log capture started and bytes on disk" into ub-camera-haleakala
Paul Rohde [Fri, 15 May 2015 22:29:26 +0000 (15:29 -0700)]
Log capture started and bytes on disk
Change-Id: I3a62aed33f55b396b4940a7bc9e5da5131616890
Paul Rohde [Mon, 18 May 2015 18:27:40 +0000 (11:27 -0700)]
Make filmstrip grey squares less common.
Increase the encoding priority of the intermediate thumbnails
by changing the task priority to "Average". This causes the
intermediate thumbs to run on their own thread pool, after
the tiny thumbs are generated but allow them to not get
prempted by slow, full jpg encoding tasks.
Bug:
21169512
Change-Id: I2862acac724cf6302c896feeeb04702170cbf030
Pengchong Jin [Fri, 15 May 2015 23:12:21 +0000 (23:12 +0000)]
Merge "Workaround of the face detection failure on L and N5" into ub-camera-haleakala
Paul Rohde [Fri, 15 May 2015 22:55:21 +0000 (22:55 +0000)]
Merge "Increase the default JPG buffer size." into ub-camera-haleakala
Paul Rohde [Fri, 15 May 2015 22:30:13 +0000 (15:30 -0700)]
Increase the default JPG buffer size.
BUG:
21162720
Change-Id: Ie9d634533778c254a000da92f0af2948d814b1dd
Alan Newberger [Fri, 15 May 2015 22:05:00 +0000 (15:05 -0700)]
Dynamic configuration management for Camera2
Ensure Camera2 app selects the appropriate OneCamera per
feature configuration.
Bug:
21204365
Change-Id: I47671a91c89f20e2add2f1f3889d4411341fa1dc
Pengchong Jin [Fri, 15 May 2015 20:07:10 +0000 (13:07 -0700)]
Workaround of the face detection failure on L and N5
This patch is a workaround of the face detection failure on L
and Nexus 5. For Nexus 5 on L, the current FD only works when
the preview stream is configured as the first stream before the
JPEG stream. This change lock the order by creating a capture
session with the preview stream first, and then creating the
normal capture session with preview and JPEG.
Bug: b/
21039466
Change-Id: Icb7f1f758bc9d7ca428c7a4748223072d39dd57f
Alan Newberger [Thu, 14 May 2015 23:44:34 +0000 (23:44 +0000)]
Merge "Remove jpegutiltest for ub-camera-haleakala" into ub-camera-haleakala
Alan Newberger [Thu, 14 May 2015 23:39:24 +0000 (16:39 -0700)]
Remove jpegutiltest for ub-camera-haleakala
This test breaks on mnc-dev toolchain, not critical for operation.
Change-Id: Icad375c9d1d7a943168d88241e69276d7536df61
Gabriel Nava [Wed, 13 May 2015 18:44:13 +0000 (11:44 -0700)]
Fix for crash when switching cameras on KitKat (camera-haleakala)
- Adding null check for hardwareSpec in CameraAppUI.onChangeCamera()
- Hardware spec may not be available if call to get camera parameters hasn't finished yet
Bug:
21118170
Change-Id: I5bf1b0328f2cae7211464ff136a31ace2577630f
Geoff Mendal [Wed, 13 May 2015 13:49:41 +0000 (06:49 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ia40e98cbd91bc955da9f01c1be57d9ecfc79c1d1
Auto-generated-cl: translation import
Pengchong Jin [Wed, 13 May 2015 00:41:34 +0000 (00:41 +0000)]
Merge "WAR of the face detection failure" into ub-camera-haleakala
Gabriel Nava [Tue, 12 May 2015 21:31:45 +0000 (21:31 +0000)]
Merge "Ensuring the right HDR icon is shown on camera switch (camera-haleakala)" into ub-camera-haleakala
Alan Newberger [Tue, 12 May 2015 21:01:06 +0000 (21:01 +0000)]
Merge "skip first run dialog when starting in secure mode" into ub-camera-haleakala
Alan Newberger [Tue, 12 May 2015 20:39:54 +0000 (13:39 -0700)]
skip first run dialog when starting in secure mode
Go right into camera mode when starting from secure lockscreen, this
restores prior behavior and avoids resume loops in double onResume
workarounds.
Bug:
21070237
Change-Id: I353bdd4b73c8c63e58710e35304b5c269458c72e
Gabriel Nava [Tue, 12 May 2015 18:51:07 +0000 (11:51 -0700)]
Ensuring the right HDR icon is shown on camera switch (camera-haleakala)
- When switching cameras HDR+ icon was always shown in disabled state regardless of the actual support mode
- Existing boolean setting to track device's HDR support is not enough
- Changing global device's HDR support setting to string that can hold no-hdr, hdr or hdr-plus values
Bug:
21037428
Change-Id: Ia9cf0484879a22a27e4deb0e4aa066ec806a43e6
Gabriel Nava [Tue, 12 May 2015 17:26:20 +0000 (17:26 +0000)]
Merge "Freezing preview in capture intent when image is exposed instead of shutter click (camera-haleakala)" into ub-camera-haleakala
Pengchong Jin [Sat, 9 May 2015 03:55:57 +0000 (20:55 -0700)]
WAR of the face detection failure
This patch gives a work-around of the face detection failure that
occurs when the ZSL camera is used. It forces to request a preview
frame followed by a 5-frame ZSL burst before requesting the repeated
preview and ZSL streams. It also hides the first preview frame in order
to avoid potential janks. We do this only for L, Nexus 6 and Haleakala.
Bug:
20724126
Change-Id: I40b7861e07570ed53135b2d8d182b65c5799adac
Gabriel Nava [Mon, 11 May 2015 20:29:16 +0000 (13:29 -0700)]
Freezing preview in capture intent when image is exposed instead of shutter click (camera-haleakala)
- Removing preview freeze call from shutter button callback
- Relocating preview freeze call to quick expose handler
Bug:
20957671
Change-Id: Ie1c68ed52e04cdafd6f5894d001990a030d15761
Paul Rohde [Mon, 11 May 2015 18:45:18 +0000 (18:45 +0000)]
Merge "Hide no active camera NPE by defaulting to camera device -1" into ub-camera-haleakala
Paul Rohde [Mon, 11 May 2015 18:29:21 +0000 (11:29 -0700)]
Hide no active camera NPE by defaulting to camera device -1
NPE's can occur if no camera device is currently active. It's
not feasable to rewire all parts of the codebase for this
release to properly access the target camera device. This
fix may lead to inconsistent setting persistance if in places
where a NPE would otherwise occur.
Bug:
21026362
Change-Id: I76c5b5fab429f61238a1ba91c0c52e839a431573
Alan Newberger [Mon, 11 May 2015 17:10:26 +0000 (10:10 -0700)]
Fall back to bounds if provided width/height is 0
Monkey results show async dimensions can lag behind
automated filmstrip. Protect against this case, should
reduce monkey issues.
Bug:
21023148
Change-Id: I8fef5e8d00f96c4b4c249b3a9daebfcf9991e193
Senpo Hu [Fri, 8 May 2015 21:18:49 +0000 (14:18 -0700)]
[ImageIntent] Support volume / camera key to take photo.
Bug:
20947910
Change-Id: I01e49840b69926b1489d6564a8b183d653b71ac1
Gabriel Nava [Wed, 6 May 2015 23:06:50 +0000 (16:06 -0700)]
Opening the right camera on app restart when using PhotoModule (camera-haleakala)
- In existing logic PhotoModule reverts to back camera if no aspect ratio has been selected
- Reverting to Back camera only if device allows showing the aspect ratio dialog (N4,N5,N6)
- Updating the Camera ID persistent setting if reverting, not only the runtime value
Bug:
20889927
Change-Id: Ie59b878fd03da751c552fbf92ec5c96889144016
Alan Newberger [Wed, 6 May 2015 19:55:49 +0000 (12:55 -0700)]
Refresh metadata for every filmstrip item update.
Current filmstrip item updates:
1. call CameraFilmstripDataAdapter.updateItemAt which then calls FilmstripView.updateViewItem
2. FilmstripView.updateViewItem updates the view then calls CameraActivity.updateUiByData
3. CameraActivity.updateUiByData calls CameraFilmstripDataAdapter.updateMetadataAt
4. MetadataUpdateTask calls FilmstripView.updateViewItem again if metadata was loaded
The double updateViewItems disrupts SessionItem -> PhotoItem transitions, and for some
reason for LB causes the second updateViewItem to only request tiny thumbnails. For a very targeted
fix, we instead make step 1 do the metadata load, and then updateViewItem is only called once. The
code in step 3 still executes but is a no-op since metadata was already loaded in step one.
Tested with Camera mode, Pano/PhotoSphere, LB, redoing an LB, calling out to editor and changing a
photo, and taking a video.
Bug:
20862631
Change-Id: Ib8b112c2ef1b5a364a5569d1391ef359d1b5fb1a
Gabriel Nava [Mon, 4 May 2015 20:44:56 +0000 (13:44 -0700)]
Preventing camera button to get into wrong state when pressed in succession (camera-haleakala)
- Adding methods to ButtonManager to enable/disable camera button explicitly
- Camera button cannot be enabled during initialization if it was explicitly disabled
- PhotoModule, VideoModule and CaptureModule enable/disable camera button on camera switch
- Capture button is disabled before requesting the camera switch
- Capture button is re-enabled once the camera open confirmation is received
Bug:
20693214
Change-Id: I6383c705eee0a82397b975332cf37bbcd5913128
Gabriel Nava [Mon, 4 May 2015 20:09:25 +0000 (20:09 +0000)]
Merge "Avoid camera switch while HDR activation is in progress (camera-haleakala)" into ub-camera-haleakala
Gabriel Nava [Fri, 1 May 2015 22:45:36 +0000 (15:45 -0700)]
Avoid camera switch while HDR activation is in progress (camera-haleakala)
- Adding pre-change listener to MultiToggleImageButton to be executed before running state change animations
- Allowing button initialization with pre-change callback in ButtonManager
- Adding pre-change callback for conflicting options in CameraAppUI:
HDR/HDR+ button disables camera button to avoid camera facing switch
Camera facing disables HDR/HDR+
- Conflicting button is shown in disabled state for a while until re-enabled if applicable when the module switch is completed
Bug:
20696068
Change-Id: I11a0a0567363f656be52a9ece0707ccf326f2d67
Paul Rohde [Fri, 1 May 2015 22:34:45 +0000 (22:34 +0000)]
Merge "Check for a potentially destroyed activity before startPreview." into ub-camera-haleakala
Pengchong Jin [Fri, 1 May 2015 22:24:54 +0000 (22:24 +0000)]
Merge "Fix bug b/
20638423" into ub-camera-haleakala
Gabriel Nava [Fri, 1 May 2015 22:17:02 +0000 (22:17 +0000)]
Merge "Disabling non available options instead of hiding when hw support is present (camera-haleakala)" into ub-camera-haleakala
Paul Rohde [Thu, 30 Apr 2015 18:08:23 +0000 (11:08 -0700)]
Check for a potentially destroyed activity before startPreview.
There is a small chance that the activity can be destroyed
between the time the camera is created and the preview is started.
This can lead to unchecked NPE's across the app because most code
assumes that there will never be a case where activity objects
are accessed after onDestroy.
Bug:
20097425
Change-Id: I2904ffba451ded2417a806c83fd12e4f62611150
Gabriel Nava [Fri, 1 May 2015 16:28:50 +0000 (09:28 -0700)]
Disabling non available options instead of hiding when hw support is present (camera-haleakala)
- Global scope property persists the support of flash and hdr for the main camera (back)
- If option is not supported at all, option is hidden
- If option is supported in at least one camera but not supported in current module, option is disabled
- If option is supported in current module, option is enabled
- Avoiding race condition where CameraAppUI.applyModuleSpecs was bein called multiple times simultaneously for the same change
- Adding a check so BottomBar UI is updated only when there's a scope (module/camera) change, unless...
- Scope check can be requested within same scope for settings change
Bug:
20630060
Change-Id: Iac5fa2658f04fe8329a2232fb0d5b11d20e566a2
Pengchong Jin [Thu, 30 Apr 2015 21:11:16 +0000 (14:11 -0700)]
Fix bug b/
20638423
Catch the AssertionError exception thrown by
CameraAgentFactory.getAndroidCameraAgent, and pop up the reporting
dialog before App termination.
Bug:
20638423
Change-Id: I090ea03b7ff872b40f4b0cc6bcbb33e41f332920
Pengchong Jin [Fri, 1 May 2015 06:06:16 +0000 (06:06 +0000)]
Merge "Fix bug b/
19965993" into ub-camera-haleakala
Senpo Hu [Fri, 1 May 2015 00:42:40 +0000 (00:42 +0000)]
Merge "Freeze preview after taking shot in capture intent." into ub-camera-haleakala
Senpo Hu [Thu, 30 Apr 2015 23:23:15 +0000 (16:23 -0700)]
Freeze preview after taking shot in capture intent.
Bug:
20690039
Change-Id: I3402b7d7acb956a886596267ca37bd129ba74e3c
Pengchong Jin [Thu, 30 Apr 2015 22:25:13 +0000 (15:25 -0700)]
Fix bug b/
19965993
CameraId null check before checking whether the exposure compensation is
supported.
Bug:
19965993
Change-Id: If5cd7fbfe9ae6d2f83e56c8647836f96fa6e7426
I-Jong Lin [Thu, 30 Apr 2015 22:08:05 +0000 (22:08 +0000)]
Merge "Fix for N4 Video and inclusion of CaptureIntent" into ub-camera-haleakala
I-Jong Lin [Thu, 30 Apr 2015 21:23:28 +0000 (14:23 -0700)]
Fix for N4 Video and inclusion of CaptureIntent
Bug:
20694189
Workaround b/
19271661 needs to specifically applied in
these circumstances only:
1. Phone is Nexus4
2. CaptureModule is enabled
3. Photo Mode, OR Capture Intent Photo is enabled.
Since we are passing the CameraActivity in TextureViewHelper,
it has enough context to know everything. Previous implementation
used an invalid CameraProvider to signal that Camera2 was enabled.
Now we just ask the CameraActivity directly.
Change-Id: I47f841ae6476bc034a7ad3f487c40616eed05b71
Sascha Haeberling [Thu, 30 Apr 2015 21:24:57 +0000 (14:24 -0700)]
Make sure we cancel countdown before mPaused is set.
Bug:
20696312
Change-Id: I3785a46881e2bb027d0cd06d1c2eba1b38ca2b4a
Sascha Haeberling [Thu, 30 Apr 2015 19:58:54 +0000 (12:58 -0700)]
Lower the priority of ProcessingService to 'background'.
Bug:
20675397
This should e.g. greatly reduce the jank we see while Lens Blurs are
processing.
Change-Id: I7ffd9bb394a113b913105a6e91c8f12fc067bfbb
I-Jong Lin [Thu, 30 Apr 2015 01:18:26 +0000 (01:18 +0000)]
Merge "Fix for N4 Video Rotation Bug" into ub-camera-haleakala
I-Jong Lin [Thu, 30 Apr 2015 00:37:21 +0000 (17:37 -0700)]
Fix for N4 Video Rotation Bug
Previous fix for N4 preview (b/
19271661) needed to only be applied
when PhotoModule is active. Grossly plumbed the correct object
references into TextureViewHelper so that it could know which
module was active.
Bug:
20694189
Change-Id: I0f639ae6ee0832f453213699723dc8aa25e5d9e7
Sascha Haeberling [Thu, 30 Apr 2015 01:09:05 +0000 (01:09 +0000)]
Merge "DO NOT MERGE - Show an error if we couldn't connect to the Camera device." into ub-camera-haleakala
Sascha Haeberling [Thu, 30 Apr 2015 00:28:23 +0000 (17:28 -0700)]
DO NOT MERGE - Show an error if we couldn't connect to the Camera device.
Bug:
20158861
Change-Id: Ib7cec6547a52ef02bb4ab1791d3945ef9e0a99d7
Pengchong Jin [Thu, 30 Apr 2015 00:03:00 +0000 (00:03 +0000)]
Merge "Fix b/
20638271: (Part 1)" into ub-camera-haleakala
Pengchong Jin [Wed, 29 Apr 2015 22:56:09 +0000 (15:56 -0700)]
Fix b/
20638271: (Part 1)
Handle the case when the instance of CameraDeviceInfo is null.
Bug: b/
20638271
Change-Id: If8d9938405f4f2229bc5962c21f3f46e9a2bd1dd
Paul Rohde [Wed, 29 Apr 2015 22:44:54 +0000 (22:44 +0000)]
Merge "Correctly read AF and AE capabilities for front-camera." into ub-camera-haleakala
Senpo Hu [Wed, 29 Apr 2015 22:22:13 +0000 (22:22 +0000)]
Merge "Fix a race condition while tapping retake button." into ub-camera-haleakala
Senpo Hu [Wed, 29 Apr 2015 21:25:21 +0000 (14:25 -0700)]
Fix a race condition while tapping retake button.
Bug:
19988384
Change-Id: I2dd6c31bdaaf24475b1cb1239a06592b3bd2ec56
Spike Sprague [Wed, 29 Apr 2015 18:56:50 +0000 (11:56 -0700)]
calling setDrawableByLayerId sets that Drawable's level to 0. reset level of video shutter button to maximum.
bug:
19955500
Change-Id: Ie1fb79dc57edfcd53fa2148b2223a0cd5d6faeb3
Paul Rohde [Wed, 29 Apr 2015 18:13:38 +0000 (11:13 -0700)]
Correctly read AF and AE capabilities for front-camera.
Bug:
20088402
Change-Id: I034bc7db3a52a9ab950da0f41515ceec8f170d03
Alan Newberger [Mon, 20 Apr 2015 23:57:13 +0000 (16:57 -0700)]
Ensure OnScreenHint uses an Activity
While using an appContext WindowManager is useful in certain cases,
for OnScreenHint is MUST have an Activity-based one so that it
can attach views to it. This was changed before but when moved to
AndroidServices layer, regressed. Added explicit doc comment to
ensure we preserve the activity reference.
Bug:
20430202
Change-Id: Id4977bd8913e8bff8848e5241738111dcc10ac74
Paul Rohde [Wed, 15 Apr 2015 20:35:46 +0000 (20:35 +0000)]
Merge "Add copywrite headers for device lifecycle classes." into ub-camera-haleakala
Paul Rohde [Wed, 15 Apr 2015 20:22:44 +0000 (13:22 -0700)]
Add copywrite headers for device lifecycle classes.
Bug:
20263460
Change-Id: Ia583ec45ba9bec7dbcf41312905f7d92fa9b47dd
Sascha Haeberling [Wed, 15 Apr 2015 19:54:27 +0000 (19:54 +0000)]
Merge "Add some basic progress reporting for saving JPEG files." into ub-camera-haleakala
Sascha Haeberling [Wed, 15 Apr 2015 17:12:25 +0000 (10:12 -0700)]
Add some basic progress reporting for saving JPEG files.
Bug:
18960470
Change-Id: I8f1547ae6652cd6b81773acf7726751f2d22a55c
Paul Rohde [Tue, 14 Apr 2015 23:54:18 +0000 (16:54 -0700)]
Send a warmup burst to the camera before attaching the preview.
This reduces startup jank by submitting a warmup burst of n
frames to the camera before the preview surface is attached to
the camera. This ensures the large internal buffers are
allocated by the HAL before the preview stream is attached. The
change will delay the preview by n frames in exchange for a
smoother preview once the preview is actually shown.
Bug:
19076469
Change-Id: I5abb8b49a64c35686c014001a45239f4eccfe34d
Paul Rohde [Tue, 14 Apr 2015 22:55:06 +0000 (22:55 +0000)]
Merge "Add a memory pool for reusing direct bytebuffers." into ub-camera-haleakala
Paul Rohde [Thu, 9 Apr 2015 16:16:29 +0000 (09:16 -0700)]
Add a memory pool for reusing direct bytebuffers.
This should reduce GC's caused by releasing and reusing direct
bytebuffers for subsequent image captures and jpg encoding.
Bug:
20129797
Change-Id: I5dd2538bd3dbc77be1446564f537e7ec0fc56ec4
Sascha Haeberling [Mon, 13 Apr 2015 21:06:16 +0000 (14:06 -0700)]
Add proper support for canceling sessions.
Bug:
19384186
Change-Id: I45b0262947dcd4257d54e706f3cffc69b6bd4bc9
zafir [Sat, 11 Apr 2015 00:36:09 +0000 (00:36 +0000)]
Merge "Catch security exception and show error dialog." into ub-camera-haleakala
zafir [Sat, 11 Apr 2015 00:30:50 +0000 (17:30 -0700)]
Catch security exception and show error dialog.
Bug:
20159429
Change-Id: I180ca3d5582d6e5824adc6bdf248af686724ceba
Alan Newberger [Fri, 10 Apr 2015 22:49:23 +0000 (22:49 +0000)]
Merge "Fix view recycling in filmstrip" into ub-camera-haleakala
Alan Newberger [Thu, 9 Apr 2015 17:42:06 +0000 (10:42 -0700)]
Fix view recycling in filmstrip
View recycling is pretty broken, with code put in for the old
camera preview in filmstrip being used to avoid recycling in all
cases. This looks like its been broken in a number of releases, but
less so due to a destructive removal of views during updates. I had
fixed that but it then exposed the issue that recycling wasn't occurring
elsewhere. This CL removes views from hierarchy, confirmed no more leaks
when capturing and when swiping through filmstrip.
Bug:
19970885
Change-Id: Ic63b9231bd24db0f44a99567278886eb0998d740
I-Jong Lin [Thu, 9 Apr 2015 17:00:18 +0000 (10:00 -0700)]
Add average priority speed to ImageBackend
Bug:
20129797
Create another priority level for ImageBackend so that
we have finer grain assignment of thread priority.
Change-Id: I291efeab8cf4be561c7d53c52fe13b64dc75f080
Paul Rohde [Wed, 8 Apr 2015 23:30:22 +0000 (16:30 -0700)]
Increase the thread priority of critical camera components.
This increases the priority of the frame server and metadata
response listeners that must respond immediatly to frames and
callbacks that are returned from the camera HAL. Both threads have
a tiny amout of code and callbacks that get run but must not block
or they will stall the preview on image capture. This appears to
only have limited impact on jank in the app.
Bug:
19076469
Change-Id: I41845e094feffb1ecd3be9613489a3d70f916580
Paul Rohde [Wed, 8 Apr 2015 20:31:22 +0000 (20:31 +0000)]
Merge "Reduce software jpg encoding priority." into ub-camera-haleakala
Paul Rohde [Wed, 8 Apr 2015 19:01:15 +0000 (12:01 -0700)]
Reduce software jpg encoding priority.
This skews the time-to-jpg vs preview jank in favor of a smoother
preview after capturing an image compared to jpg encoding time.
This should remove some of the excessive jank present post-image
capture.
Bug:
19076469
Change-Id: I908ec91153268a0fc9eb3a8e0112dda5bd15a6fb
Senpo Hu [Tue, 7 Apr 2015 18:21:31 +0000 (11:21 -0700)]
On non-Nexus device, don't show aspect ratio dialog.
Bug:
20101791
Change-Id: I569f0d235c27b87bf5275d7d8f8956162f6de7bf