OSDN Git Service
Shashi Shekhar [Wed, 12 Nov 2014 17:52:19 +0000 (09:52 -0800)]
Hook burst controller to the shutter button long press.
Hooks up the shutter button long press to start the burst.
Introduces a BurstManager to interact with burst.
Provides an implementation of BurstManager that listens to burst and
saves results when burst is complete.
The burst eviction handler is now installed on the ring buffer
on shutter button press and uninstalled on shutter button release.
The ring buffer is cleared before starting and after completion of the
burst.
Also provides a stub implementation of the BurstController that has a
static method which controls if burst is enabled or not.
Bug:
18332704
Change-Id: I1098937bf348af7acbf55da1a5eeb423c30fb901
Senpo Hu [Tue, 18 Nov 2014 06:56:31 +0000 (22:56 -0800)]
Unify orientation calculation logic.
Camera API takes clockwise degrees for JPEG rotation and
OrientationEventListener reports clockwise device orientation.
The easiest formula of calculating output image rotation degree is:
"camera sensor orientation" + "device orientation"
Since front cameras face in opposite direction. The result needs to be mirrored
for front camera.
Detailed changes:
* Refactor OrientationManager to remove unnecessary complexity.
* Add OrientationManager.DeviceOrientation enum and
OrientationManager.getDeviceOrientation
* Remove CameraUtil.roundOrientation.
* Fix the weird calculation which is hard to understand in
CameraUtil.getJpegRotation and add CameraUtil.getImageRotation
* Clean up image rotation logic in all modules:
* Always look up the current device orientation via OrientationManager.getDeviceOrientation
* Fix the doc for copyImagePlaneToBitmap() which actually rotates image
counterclockwise.
* Clean up CameraActivity:
* Remove CameraActivity.onOrientationChanged and
ModuleController.onOrientationChanged. Any individual module which
wants to listen orientation change should register itself to
OrientationManager. Now only VideoModule needs to do that.
Bug:
17443789
Change-Id: I6d54cac5bde950acae0c3226448c27a816266df0
Shashi Shekhar [Wed, 19 Nov 2014 21:42:45 +0000 (21:42 +0000)]
Merge "Wrap FrameDistributor in a thread safe accessor." into ub-camera-haleakala
Shashi Shekhar [Tue, 18 Nov 2014 19:01:51 +0000 (11:01 -0800)]
Wrap FrameDistributor in a thread safe accessor.
Wrap FrameDistributo in a thread safe accessor and make the instance to
accessor a final field in CaptureModule. This should help in avoiding
null checks and NPEs.
BUG:
18414956
Change-Id: I8d25c5a2923a7382f98c523e88f7547f16217a6f
Alan Newberger [Sat, 15 Nov 2014 00:47:30 +0000 (00:47 +0000)]
Merge "Vector version of camera preview graphic." into ub-camera-haleakala
Dan Sandler [Fri, 14 Nov 2014 15:39:49 +0000 (10:39 -0500)]
Vector version of camera preview graphic.
Even less RAM required to hang onto this in the lockscreen.
Bug:
18369196
Change-Id: I7ed5ad098b77c96b40d0b76e4a20a7fea12e362a
Dan Sandler [Fri, 14 Nov 2014 15:02:13 +0000 (10:02 -0500)]
Trim transparent pixels off camera preview bitmaps.
Since SysUI holds these bitmaps in memory for jank-free
drawing, these pixels are just wasted RAM. Since the
transition code assumes uniform square bitmaps, these are
all 64x64dp, which is still a teensy bit wasteful but much
better than before (144x144dp).
Bug:
18369196
Change-Id: Idf10b2048190ac44eff3e5da467149c460067347
Shashi Shekhar [Tue, 11 Nov 2014 17:34:49 +0000 (17:34 +0000)]
Merge "Initial version of new module to distribute camera frames to consumers." into ub-camera-haleakala
Shashi Shekhar [Fri, 7 Nov 2014 02:48:26 +0000 (18:48 -0800)]
Initial version of new module to distribute camera frames to consumers.
Add FrameDistributor class, that allows passing frames from a
SurfaceTexture to multiple consumers in an efficient manner.
In the CaptureModule, this distributor is used to handle frames
coming from the Camera. It then hooks up a single FrameConsumer
to render frames into a SurfaceTexture.
Note, that this particular FrameConsumer is atypical in the sense
that it reuses the FrameDistributors GL context for efficiency.
Other consumers will typically use their own GL contexts and threads
for processing.
Bug:
18142762
Change-Id: Iee258d108004c23b7d9777204b58c013a9999215
Sascha Haeberling [Thu, 6 Nov 2014 17:50:51 +0000 (09:50 -0800)]
Add experimental RAW(DNG) support.
Bug:
18272977
This adds RAW writing behind a new debug property:
adb shell setprop persist.camera.capture_dng 1
This will switch to the non-ZSL implementation of one Camera.
The resulting files are stored in a "DNG" folder under DCIM/Camera.
Caveats:
- Preview aspect ratio will not match.
- No item in filmstrip
Change-Id: I9d990de119f22a12d37b22d36d84dc15aeee9340
Shashi Shekhar [Thu, 6 Nov 2014 22:59:25 +0000 (22:59 +0000)]
Merge "Initial interface for the burst module." into ub-camera-haleakala
Andy Huibers [Thu, 6 Nov 2014 16:57:46 +0000 (16:57 +0000)]
Merge "Center zoom UI." into ub-camera-haleakala
Shashi Shekhar [Fri, 17 Oct 2014 18:45:54 +0000 (11:45 -0700)]
Initial interface for the burst module.
Interface for the burst module.
Burst module controls the internal camera buffer and keeps images that
best represent a burst at any given point in time.
The burst module decides which frames to keep by analyzing low-res
preview frames and then keeping corresponding high-res images in the
internal camera buffer.
At the end of the burst, the burst module retrieves results from the
internal camera buffer and can do post processing on the results.
Change-Id: I09d4031ad1566232a5d4641084523c3e3e0aace6
Sascha Haeberling [Thu, 6 Nov 2014 03:34:01 +0000 (19:34 -0800)]
Poke build server, nothing to see here.
Change-Id: I3cbd26744539c2c6cf5e68ecd4c5401a003097b1
Sascha Haeberling [Wed, 5 Nov 2014 19:31:38 +0000 (19:31 +0000)]
Merge "Update project.properties to use proper SDK 21 instead of preview L." into ub-camera-haleakala
Sascha Haeberling [Wed, 5 Nov 2014 19:30:06 +0000 (11:30 -0800)]
Update project.properties to use proper SDK 21 instead of preview L.
Change-Id: I737bdfcfea80a6e722cebf50a2f1ad67542690e1
Alan Newberger [Tue, 4 Nov 2014 22:34:30 +0000 (22:34 +0000)]
am
8dd164a3: Merge "Relax aspect ratio matching tolerance for devices with 1.347 ratios" into ub-camera-glacier
* commit '
8dd164a39a43cdf1a5de5f1e178b42d471316cac':
Relax aspect ratio matching tolerance for devices with 1.347 ratios
Alan Newberger [Tue, 4 Nov 2014 22:30:39 +0000 (22:30 +0000)]
Merge "Relax aspect ratio matching tolerance for devices with 1.347 ratios" into ub-camera-glacier
Alan Newberger [Tue, 4 Nov 2014 22:21:33 +0000 (14:21 -0800)]
Relax aspect ratio matching tolerance for devices with 1.347 ratios
Our .01 tolerance omits valid 4:3 previews when the image capture is
more than 0.01 over true 4:3. Relax matching in Glacier just for
affected builds.
Bug:
18241645
Change-Id: I5868bc9535e4c9bb886f0de0daf0e83cd2f4dc78
Alan Newberger [Tue, 4 Nov 2014 19:40:21 +0000 (19:40 +0000)]
am
5a64d117: move size parameter setting before other settings
* commit '
5a64d117ceccc8572a426e7d27306d81aa5c5663':
move size parameter setting before other settings
Alan Newberger [Tue, 4 Nov 2014 06:44:14 +0000 (22:44 -0800)]
move size parameter setting before other settings
Update picture size before applying parameters prior to starting preview.
This is required to avoid a 640x480 default picture stream on the Nexus 4
which is causing lowered preview frame rates (for unknown reasons).
Bug:
18227551
Change-Id: I2b7648146ff57d5a7d78a22f884643c6d62497e6
Sascha Haeberling [Wed, 29 Oct 2014 19:29:29 +0000 (19:29 +0000)]
am
06a4e103: Forcefully drop 4k recording from pre-L releases.
* commit '
06a4e103aefa3303a6995d465a53c81d6581995f':
Forcefully drop 4k recording from pre-L releases.
Sascha Haeberling [Wed, 29 Oct 2014 19:14:07 +0000 (12:14 -0700)]
Forcefully drop 4k recording from pre-L releases.
Bug:
18172081
Change-Id: I26b09f19757e059d3567b3cb707592696531d0b3
Sascha Haeberling [Tue, 28 Oct 2014 19:18:09 +0000 (19:18 +0000)]
am
1332fc02: Remove additional dependencies on FloatMath
* commit '
1332fc023ea9941ff4afac0a43d13930d5b59771':
Remove additional dependencies on FloatMath
Andy Huibers [Tue, 28 Oct 2014 18:42:56 +0000 (11:42 -0700)]
Center zoom UI.
Bug:
18153777
Change-Id: I27fc0d0ceb8a707214d7dda821a2d5b8c25c955b
Sascha Haeberling [Tue, 28 Oct 2014 17:18:31 +0000 (10:18 -0700)]
Remove additional dependencies on FloatMath
See frameworks/base commit
33253a4baa6279f81a73425b49dfb6abe5f5416e
for details.
Bug: https://code.google.com/p/android/issues/detail?id=36199
Change-Id: I70a3ad8a9264c320b5e2d6a9097a05d473e4fcfa
Sascha Haeberling [Tue, 28 Oct 2014 05:14:49 +0000 (05:14 +0000)]
am
c7beaf11: Fix wear interaction of CaptureModule
* commit '
c7beaf110667df54d7ef97cc73e0fe28e31149de':
Fix wear interaction of CaptureModule
I-Jong Lin [Tue, 28 Oct 2014 05:14:45 +0000 (05:14 +0000)]
am
e11795bf: Merge "Volantis Device Identifier Helper" into ub-camera-glacier
* commit '
e11795bf44b2c0e5668c7ef6660cffb94b690a9b':
Volantis Device Identifier Helper
Spike Sprague [Tue, 28 Oct 2014 05:14:44 +0000 (05:14 +0000)]
am
775b6e6d: Merge "consistent style for titles on user education screens" into ub-camera-glacier
* commit '
775b6e6d8adab73fcae820c6600b173b258d5162':
consistent style for titles on user education screens
Spike Sprague [Tue, 28 Oct 2014 05:14:43 +0000 (05:14 +0000)]
am
7d7d12b2: Merge "Prevent unnecessary setVisibility calls in Filmstrip while zooming" into ub-camera-glacier
* commit '
7d7d12b23cb246c5aa8ebf03a98d189d5b6e0f30':
Prevent unnecessary setVisibility calls in Filmstrip while zooming
Alan Newberger [Tue, 28 Oct 2014 05:14:43 +0000 (05:14 +0000)]
am
8644ffce: Align id selection from QueryTask to sort order from Media query
* commit '
8644ffceaa0968cb3c4e8736d37ef1683aa30977':
Align id selection from QueryTask to sort order from Media query
Sascha Haeberling [Tue, 28 Oct 2014 00:53:12 +0000 (17:53 -0700)]
Fix wear interaction of CaptureModule
Bug:
18121865
- Make sure we announce that the module is exiting.
- Send postview image to wear device.
- Make sure we can take a picture when timer is on.
Change-Id: I1cbc2e9a1725fdd6d8724ce93f547c87eab8b4aa
I-Jong Lin [Mon, 27 Oct 2014 23:17:19 +0000 (23:17 +0000)]
Merge "Volantis Device Identifier Helper" into ub-camera-glacier
I-Jong Lin [Mon, 27 Oct 2014 22:38:32 +0000 (15:38 -0700)]
Volantis Device Identifier Helper
Bug:
17868158
Part of a multi-project commit, along with ag/575889
Adds a helper function to identify when the Android device
is a Nexus 9.
Change-Id: I36c3b6e4472d08d1be7b1197fd62f4766fcc81ed
Spike Sprague [Mon, 27 Oct 2014 21:21:30 +0000 (21:21 +0000)]
Merge "consistent style for titles on user education screens" into ub-camera-glacier
Spike Sprague [Mon, 27 Oct 2014 21:07:14 +0000 (21:07 +0000)]
Merge "Prevent unnecessary setVisibility calls in Filmstrip while zooming" into ub-camera-glacier
Spike Sprague [Mon, 27 Oct 2014 18:58:42 +0000 (11:58 -0700)]
Prevent unnecessary setVisibility calls in Filmstrip while zooming
bug:
18122644
Change-Id: I2681e5f104527553c4f6d71d96c0b659685813fa
Alan Newberger [Mon, 27 Oct 2014 18:29:34 +0000 (11:29 -0700)]
Align id selection from QueryTask to sort order from Media query
In QueryTask we pick the id from the first result and consider it
the max id, yet we query ordered by date taken. On most phones
they're the same but by correcting the query to satisfy the
assumption in QueryTask, we remove costly scenarios where most
photos are reprocessed in LoadNewPhotosTask. One line fix in
LocalMediaData with more verbose logging added in CameraDataAdapter.
Bug:
17437217
Change-Id: Ia643f38d1bfb77ff0beaba989f0effe9a4dec31c
Spike Sprague [Fri, 24 Oct 2014 18:32:06 +0000 (11:32 -0700)]
consistent style for titles on user education screens
bug:
18115448
Change-Id: I9d1caaa0903d6f3c2c47ca3e8457a4f85aad910c
Spike Sprague [Fri, 24 Oct 2014 01:11:28 +0000 (01:11 +0000)]
am
f4857ffa: Merge "When option buttons are disabled, make sure the HDR / HDR+ button has the correct icons." into ub-camera-glacier
* commit '
f4857ffa50a4fe6fcead0abde524376c0e9d6a5a':
When option buttons are disabled, make sure the HDR / HDR+ button has the correct icons.
Sascha Haeberling [Fri, 24 Oct 2014 01:08:37 +0000 (18:08 -0700)]
Merge commit '
770c2b3e' into stuff1
Conflicts:
src/com/android/camera/data/LocalSessionData.java
Change-Id: Id7113ce6ba3b95ac78511dbbb8391b3bf2a17ecd
Alan Newberger [Fri, 24 Oct 2014 01:03:49 +0000 (01:03 +0000)]
am
47e9f17a: Merge "Clean up orientation logging" into ub-camera-glacier
* commit '
47e9f17a13b391554c8121aae049e91b553688cf':
Clean up orientation logging
Spike Sprague [Fri, 24 Oct 2014 00:59:45 +0000 (00:59 +0000)]
Merge "When option buttons are disabled, make sure the HDR / HDR+ button has the correct icons." into ub-camera-glacier
Sascha Haeberling [Fri, 24 Oct 2014 00:28:37 +0000 (17:28 -0700)]
Introduce ActionCallback for LocalData items.
Bug:
18105354
Fixes the bug where we try to cast a context to an activity.
Change-Id: I3e82a2cda5fe004768276a4d48c07d75738b2a5e
Spike Sprague [Thu, 23 Oct 2014 23:35:09 +0000 (16:35 -0700)]
When option buttons are disabled, make sure the HDR / HDR+ button has the correct icons.
bug:
18104680
Change-Id: Ifd56369ca8177d40317f6af76bbc55a2110d6f5c
Spike Sprague [Thu, 23 Oct 2014 17:25:45 +0000 (17:25 +0000)]
am
1c758c88: Merge "new colors for GAR contrast compliance" into ub-camera-glacier
* commit '
1c758c88d5f69b613da4e50d7a06e28804993170':
new colors for GAR contrast compliance
Sascha Haeberling [Thu, 23 Oct 2014 17:24:23 +0000 (10:24 -0700)]
Merge commit '
5aad0cb4' into stuff1
Conflicts:
src/com/android/camera/CameraActivity.java
src/com/android/camera/one/OneCameraManager.java
Change-Id: I9495daa600356ffcef21bba506dc5a3fce365af3
Alan Newberger [Thu, 23 Oct 2014 17:13:30 +0000 (17:13 +0000)]
am
f7a18c7f: Merge "Null check for buildItemFromData" into ub-camera-glacier
* commit '
f7a18c7feaeef3c8398376aaeea22e39dc1bbf5d':
Null check for buildItemFromData
Alan Newberger [Thu, 23 Oct 2014 17:13:30 +0000 (17:13 +0000)]
am
f4084e35: Check for null when deleting preference groups
* commit '
f4084e35eac8a8b86e807573647d4a7b43852a59':
Check for null when deleting preference groups
Alan Newberger [Thu, 23 Oct 2014 17:02:09 +0000 (17:02 +0000)]
am
05edd2ee: Increase VERBOSE logging for PhotoModule orientation use
* commit '
05edd2eec40d2a3ce7a76dc9f4d7dfe65e576ab7':
Increase VERBOSE logging for PhotoModule orientation use
I-Jong Lin [Thu, 23 Oct 2014 17:02:09 +0000 (17:02 +0000)]
am
b20cf71a: Merge "Secure Camera App survives phone unlock screen" into ub-camera-glacier
* commit '
b20cf71a817e1835a5ea8d084c9896c2aae706d9':
Secure Camera App survives phone unlock screen
Alan Newberger [Thu, 23 Oct 2014 17:02:08 +0000 (17:02 +0000)]
am
7eeb897b: Merge "Catch exceptions in settings remove helpers" into ub-camera-glacier
* commit '
7eeb897bc342f3f0d201464f37d5e6bfa7fe8b37':
Catch exceptions in settings remove helpers
I-Jong Lin [Thu, 23 Oct 2014 17:02:07 +0000 (17:02 +0000)]
am
783fe31b: Merge "Button fix for torch when no flash available in hw" into ub-camera-glacier
* commit '
783fe31b1d6ed43c3c2ed24db2ecd78c14578ddf':
Button fix for torch when no flash available in hw
Sascha Haeberling [Thu, 23 Oct 2014 17:01:59 +0000 (17:01 +0000)]
am
ea77c6b2: Don\'t release resources until camera is closed.
* commit '
ea77c6b2f9a602712c19ed0f441c6439b2f168de':
Don't release resources until camera is closed.
Radford Juang [Fri, 17 Oct 2014 21:00:26 +0000 (14:00 -0700)]
Changes to enable previewing animated GIFs in Camera. Also additional
refactoring to incorporate updated Glide.
Change-Id: Ied4170884cbc70805a7145adc84bcd14fc8dda2c
Alan Newberger [Thu, 23 Oct 2014 00:47:04 +0000 (00:47 +0000)]
Merge "Clean up orientation logging" into ub-camera-glacier
Alan Newberger [Thu, 23 Oct 2014 00:42:47 +0000 (17:42 -0700)]
Clean up orientation logging
Making it a bit easier to compare rotation vs capture metrics.
Bug:
18055323
Change-Id: I15904a00fcb463739b5d7e4c2ca7627be2ecb2b7
Spike Sprague [Thu, 23 Oct 2014 00:00:12 +0000 (00:00 +0000)]
Merge "new colors for GAR contrast compliance" into ub-camera-glacier
Spike Sprague [Wed, 22 Oct 2014 22:39:06 +0000 (15:39 -0700)]
new colors for GAR contrast compliance
Change-Id: I2e1a05b9670c01c9729ed9e7b8b146add95ab88f
Sascha Haeberling [Wed, 22 Oct 2014 21:25:59 +0000 (21:25 +0000)]
Merge "Stop activity leaks" into ub-camera-glacier
Sascha Haeberling [Sat, 18 Oct 2014 02:05:12 +0000 (19:05 -0700)]
Stop activity leaks
Bug:
12805279
This CL fixes all known activity leaks that occur from our
app. One leak remains that is caused by Camera Framework and
is tracked under b/
18077200.
For details on how to find and chase these leaks down, see
http://go/camera-activity-leaks
Change-Id: I9608e2fcf77fe97528b883ed40e0c08bbbf45bdf
Alan Newberger [Wed, 22 Oct 2014 18:53:21 +0000 (18:53 +0000)]
Merge "Null check for buildItemFromData" into ub-camera-glacier
Alan Newberger [Wed, 22 Oct 2014 18:46:02 +0000 (11:46 -0700)]
Null check for buildItemFromData
This can return null in some scenarios and other invocations do
null checks, one was missing here.
Bug:
18005946
Change-Id: I14c4b31569ace7e84886228a638757ab1cd4710f
Alan Newberger [Wed, 22 Oct 2014 18:30:06 +0000 (11:30 -0700)]
Check for null when deleting preference groups
No glacier incidents but with hundreds of Fishlake incidents
implying that sometimes we fail to find the preference to
remove, protect against nulls here to avoid crashing in
Settings.
Bug:
14625519
Change-Id: Iebc1a103abae7524e6ab0aca96d5c2479e62d9ee
Alan Newberger [Tue, 21 Oct 2014 23:54:09 +0000 (16:54 -0700)]
Update to latest Glide
Fixes compile and runtime compatibility issues with the latest
Glide update into external/glide
Bug:
18059638
Change-Id: I73dfc37d726284864a07d347015b13d32e084cc0
Alan Newberger [Tue, 21 Oct 2014 00:31:33 +0000 (17:31 -0700)]
Increase VERBOSE logging for PhotoModule orientation use
Log all orientation values to diagnose capture orientation behavior.
Bug:
18055323
Change-Id: If63455104f7b96f5797f2651d1aadcadee67e1af
I-Jong Lin [Mon, 20 Oct 2014 23:12:21 +0000 (23:12 +0000)]
Merge "Secure Camera App survives phone unlock screen" into ub-camera-glacier
Alan Newberger [Mon, 20 Oct 2014 21:37:48 +0000 (21:37 +0000)]
Merge "Catch exceptions in settings remove helpers" into ub-camera-glacier
Alan Newberger [Mon, 20 Oct 2014 20:52:53 +0000 (13:52 -0700)]
Catch exceptions in settings remove helpers
Saw just one case of this and my hypothesis is that it was due to
another now-fixed exception resulting in a partial upgrade. But
in no case should these remove issues fail, so fixing to remove and
return the default if the underlying value is not readable. There
is some possibility for behavior error in this case since perhaps e.g.
a String-based 'true' was written and we upgrade instead to a default
'false', but allowing users to enter camera is better and I've audited
all uses of these, behavior should be fine/recoverable vs and
preferable to startup crash.
Bug:
18042161
Change-Id: If2453a819311bfd9233fdf65d7a97d8a243b393a
I-Jong Lin [Mon, 20 Oct 2014 20:47:50 +0000 (20:47 +0000)]
Merge "Button fix for torch when no flash available in hw" into ub-camera-glacier
I-Jong Lin [Thu, 16 Oct 2014 23:13:24 +0000 (16:13 -0700)]
Secure Camera App survives phone unlock screen
Bug:
17883828
There is UI path to start the secure camera app from the lock
screen, and then unlock the phone and find the secure camera
app on the task manager.
This live instance of secure camera app is confusing to the
user who is expecting to interact with a full camera app.
This fix kills the secure camera app when the phone is unlocked
and ensures that the user cannot easily restart the secure
camera app from the currently running tasks in task manager.
Change-Id: Ia6a6d077c460e66807d4be9836fe192184aa8eaf
I-Jong Lin [Fri, 17 Oct 2014 21:53:30 +0000 (14:53 -0700)]
Button fix for torch when no flash available in hw
Bug:
17952997
The logic to show and disable the flash button was NOT paired
with the torch button and sometimes allowed the enabled
torch button to be shown, even the flash button was disabled.
A bit confusing, since the torch and flash button look exactly
the same.
Torch button logic to show/hide and enable/disable now follows the flash
logic.
Change-Id: Ie14b07815b6d5e1f8d7ce792ef9ee36dfdf8e3ad
Sascha Haeberling [Fri, 17 Oct 2014 18:32:38 +0000 (11:32 -0700)]
Don't release resources until camera is closed.
Bug:
17788328
Change-Id: Id7112b698c8d49f9816e5e1bf6a133272fa2f65a
Puneet Lall [Fri, 17 Oct 2014 01:26:07 +0000 (01:26 +0000)]
Merge "Fix orientation for front-facing cameras using CaptureModule" into ub-camera-haleakala
Puneet Lall [Fri, 17 Oct 2014 01:19:57 +0000 (18:19 -0700)]
Fix orientation for front-facing cameras using CaptureModule
Change-Id: Ibf4a9c7601fbc3e42ec03d18c54a23b604d42249
Puneet Lall [Thu, 16 Oct 2014 22:18:30 +0000 (15:18 -0700)]
Enable shutter button when preview is started
Change-Id: I93d378976c1c34dc05ce40cfb93310572f2ada98
Puneet Lall [Thu, 16 Oct 2014 18:05:38 +0000 (18:05 +0000)]
Merge "Rename ListenerCombiner" into ub-camera-haleakala
Puneet Lall [Thu, 16 Oct 2014 01:21:12 +0000 (18:21 -0700)]
Rename ListenerCombiner
Change-Id: Id293c9cd3a04229524a4fc5047d69e6b37837e62
Spike Sprague [Thu, 16 Oct 2014 16:39:08 +0000 (16:39 +0000)]
am
e6649574: Merge "disable startup shimmy on sd card error" into ub-camera-glacier
* commit '
e664957471663effaa0cf1998b5a1134f5e19aa4':
disable startup shimmy on sd card error
Spike Sprague [Thu, 16 Oct 2014 16:36:09 +0000 (16:36 +0000)]
Merge "disable startup shimmy on sd card error" into ub-camera-glacier
Spike Sprague [Wed, 15 Oct 2014 22:11:06 +0000 (15:11 -0700)]
disable startup shimmy on sd card error
bug:
15841887
Change-Id: If1cbb463a9de916b9fdd2926d8b47db04934535c
Puneet Lall [Thu, 16 Oct 2014 00:44:23 +0000 (00:44 +0000)]
Merge "Enable CaptureModule/ZSL" into ub-camera-haleakala
Puneet Lall [Tue, 14 Oct 2014 21:05:11 +0000 (14:05 -0700)]
Enable CaptureModule/ZSL
* Close the image reader in ZSL impl
* Enable CaptureModule for API2
* Set ZSL ring-buffer to 10 images
Change-Id: I19eb6bf9102ba8397fa073c98b1a3b5f84b74601
Alan Newberger [Thu, 16 Oct 2014 00:03:52 +0000 (00:03 +0000)]
am
7dabda68: Show capturing UI before review UI in intent countdown timer
* commit '
7dabda684367122fa2dc2097e198ac6241279bcd':
Show capturing UI before review UI in intent countdown timer
Alan Newberger [Wed, 15 Oct 2014 22:28:01 +0000 (15:28 -0700)]
Show capturing UI before review UI in intent countdown timer
Going prematurely to the review UI means you can hit the checkbox
before we have JPEG data. With this change, after countdown you
see a grayed out capture button like normal capture animation,
then the checkbox review UI when the picture is ready.
Bug:
18002016
Change-Id: Ieddd71636f962c127aa470ec0f150987d3d287ab
I-Jong Lin [Wed, 15 Oct 2014 19:35:29 +0000 (19:35 +0000)]
am
1cf0679c: Merge "Fix for crash when PhotoApp deletes last Cam pic" into ub-camera-glacier
* commit '
1cf0679c861c280f4bdb801e42ba4882851d3e63':
Fix for crash when PhotoApp deletes last Cam pic
I-Jong Lin [Wed, 15 Oct 2014 19:31:41 +0000 (19:31 +0000)]
Merge "Fix for crash when PhotoApp deletes last Cam pic" into ub-camera-glacier
Sascha Haeberling [Wed, 15 Oct 2014 18:17:50 +0000 (18:17 +0000)]
am
20a5930f: Merge "Make string comparison robust against null values." into ub-camera-glacier
* commit '
20a5930f5e7de203e8a8cbb2f19e87cf0a57d592':
Make string comparison robust against null values.
Sascha Haeberling [Wed, 15 Oct 2014 18:16:14 +0000 (18:16 +0000)]
Merge "Make string comparison robust against null values." into ub-camera-glacier
Sascha Haeberling [Wed, 15 Oct 2014 17:46:01 +0000 (10:46 -0700)]
Make string comparison robust against null values.
Bug:
17999505
Change-Id: Ic255603a5664e7d9be80d9e18435924e18d4ba66
I-Jong Lin [Wed, 15 Oct 2014 16:45:42 +0000 (09:45 -0700)]
Fix for crash when PhotoApp deletes last Cam pic
Bug:
17496363
This crash occurs when there is only one picture in the Camera
filmstrip. When you switch out of the Camera App into the
Photo App and delete it, and then switch back, the Filmstrip
attempts to draw a removal animation with invalid data, and
crashes via trying to call functions on null object. This fix
is simple and catches the null object and does NOT attempt to
draw the invalid object.
The larger issue may be that the Camera App is buffering/caching
invalid or stale data that it is illegally trying to act on.
I've left a warning message in the code to warn on any bad
behavior, but we should catch the invariant that's being violated
and fix the deeper problem.
Change-Id: I2487f753b5c7bb57e34c65d687a2236fa3a23f9f
Senpo Hu [Wed, 15 Oct 2014 00:51:49 +0000 (00:51 +0000)]
am
4a1fd997: Merge "Fix the build break due to ag/567355." into ub-camera-glacier
* commit '
4a1fd9976fc47a732058e764c00a36f538ca430c':
Fix the build break due to ag/567355.
Senpo Hu [Wed, 15 Oct 2014 00:50:09 +0000 (00:50 +0000)]
Merge "Fix the build break due to ag/567355." into ub-camera-glacier
Senpo Hu [Wed, 15 Oct 2014 00:47:12 +0000 (17:47 -0700)]
Fix the build break due to ag/567355.
Change-Id: I3f8b657bea9fdd22287115230709dda0a26b8ae4
Senpo Hu [Tue, 14 Oct 2014 22:14:03 +0000 (22:14 +0000)]
am
828081f5: Merge "Log camera exception via UsageStatistics." into ub-camera-glacier
* commit '
828081f5f947abb8930f084386492efde8c5b83b':
Log camera exception via UsageStatistics.
Senpo Hu [Tue, 14 Oct 2014 22:00:51 +0000 (22:00 +0000)]
Merge "Log camera exception via UsageStatistics." into ub-camera-glacier
Spike Sprague [Tue, 14 Oct 2014 21:58:51 +0000 (21:58 +0000)]
am
c6a48876: Merge "disable shutter button as soon as possible to avoid double shutter presses" into ub-camera-glacier
* commit '
c6a488761b2b9deb11bdcac051dfeacd212ee90f':
disable shutter button as soon as possible to avoid double shutter presses
Alan Newberger [Tue, 14 Oct 2014 21:58:50 +0000 (21:58 +0000)]
am
54985c97: Merge "Revert "Make CameraDataAdapter background new data loading and post to listener"" into ub-camera-glacier
* commit '
54985c973140b896db75f086ac0f904d0228f8aa':
Revert "Make CameraDataAdapter background new data loading and post to listener"
Alan Newberger [Tue, 14 Oct 2014 21:58:49 +0000 (21:58 +0000)]
am
3972da65: Merge "Migrate Settings Fragment to use arguments" into ub-camera-glacier
* commit '
3972da65f958edcfed26f1c32e0cf4e8361306e7':
Migrate Settings Fragment to use arguments
Senpo Hu [Tue, 14 Oct 2014 21:22:31 +0000 (14:22 -0700)]
Log camera exception via UsageStatistics.
Change-Id: I2b80338dd489ece87d94e20a303c5e43e972c3b0