OSDN Git Service

android-x86/packages-apps-Camera2.git
9 years agoThis fixes Bitmap.createBitmap offset bug in L, not sure why.
Andy Huibers [Tue, 9 Sep 2014 19:52:29 +0000 (12:52 -0700)]
This fixes Bitmap.createBitmap offset bug in L, not sure why.

Bug: 17145703
Change-Id: I18a673a5cac4400a2d6e80a851b1fb12381dc995

9 years agoAdditional logging for CAPTURE intent handling
Alan Newberger [Mon, 8 Sep 2014 21:44:30 +0000 (14:44 -0700)]
Additional logging for CAPTURE intent handling

Adds verbose logging and some exception log warnings to help diagnose issues
in CAPTURE intents.

Bug: 17421140
Change-Id: Ib0afe4219418b1e7ee5ca4879e39a4448ec13cc0

9 years agoMerge "In debug_ui mode, show CAF result state, length of AF scan, fps, for camera2...
Andy Huibers [Mon, 8 Sep 2014 20:53:28 +0000 (20:53 +0000)]
Merge "In debug_ui mode, show CAF result state, length of AF scan, fps, for camera2 API." into ub-camera-glacier

9 years agoIn debug_ui mode, show CAF result state, length of AF scan, fps, for camera2 API.
Andy Huibers [Sun, 7 Sep 2014 03:44:25 +0000 (20:44 -0700)]
In debug_ui mode, show CAF result state, length of AF scan, fps, for camera2 API.

Bug: 17397777
Bug: 17028594
Bug: 17391241
Change-Id: Id5a7fe748f988755cb2d786a2103e375eb97b08f

9 years agoDO NOT MERGE Update Camera2 to use latest APIs
Alan Newberger [Mon, 8 Sep 2014 18:26:27 +0000 (11:26 -0700)]
DO NOT MERGE Update Camera2 to use latest APIs

Bug: 17423266
Change-Id: I1f1d79619d89971b387a78756b8f3b4d4b45d76e

9 years agoMerge "wait for filmstrip bottom panel buttons to finish animating to show clings...
Spike Sprague [Mon, 8 Sep 2014 17:31:33 +0000 (17:31 +0000)]
Merge "wait for filmstrip bottom panel buttons to finish animating to show clings" into ub-camera-glacier

9 years agoDO NOT MERGE Pipe context through to camera
Sascha Häberling [Sat, 6 Sep 2014 02:50:42 +0000 (02:50 +0000)]
DO NOT MERGE Pipe context through to camera

  Bug: 17203825

Not merging since a CL depending on this one cannot be merged cleanly into lmp-dev right now: http://ag/541468

Will also apply this one to haleakala.

Change-Id: I7a386b92cf6168185bd28bd02a78d87c5826639a

9 years agoRevert "Pipe context through to camera"
Sascha Häberling [Sat, 6 Sep 2014 02:48:13 +0000 (02:48 +0000)]
Revert "Pipe context through to camera"

Second half of the CL didn't make it through to lmp-dev due to Camera API change craziness. Reverting this one to unbreak the build and will submit again to G and H Camera branches only.

This reverts commit f6bf65e9442f2fb7042e37ec21bf1c6c4fbd9bb6.

Change-Id: I5e11c5c1b29586110ed504fbb1be2dfe76accab0

9 years agoPipe context through to camera
Sascha Haeberling [Sat, 6 Sep 2014 00:33:59 +0000 (17:33 -0700)]
Pipe context through to camera

  Bug: 17203825

Also don't just activate the shutter after a picture has been taken
since some cameras might not be ready for another picture yet.
This decision should be up to the camera.

Change-Id: I5991da1d8fc942b48fe085b18ec93b07bfafe889

9 years agoMerge "DO NOT MERGE Revert "Update camera2 API usage"" into ub-camera-glacier
Alan Newberger [Fri, 5 Sep 2014 23:24:02 +0000 (23:24 +0000)]
Merge "DO NOT MERGE Revert "Update camera2 API usage"" into ub-camera-glacier

9 years agoMerge "Close the camera when the async open callback runs after pause" into ub-camera...
Alan Newberger [Fri, 5 Sep 2014 23:23:14 +0000 (23:23 +0000)]
Merge "Close the camera when the async open callback runs after pause" into ub-camera-glacier

9 years agoDO NOT MERGE Revert "Update camera2 API usage"
Alan Newberger [Fri, 5 Sep 2014 23:14:10 +0000 (23:14 +0000)]
DO NOT MERGE Revert "Update camera2 API usage"

This temporarily reverts commit for unbundled branch 9c84812bba91831e1759c23e8c92082a8a5f44fd.

Change-Id: Ic4767cd27373c36dd77df4469f5006ced8746f9f

9 years agowait for filmstrip bottom panel buttons to finish animating
Spike Sprague [Fri, 5 Sep 2014 22:11:15 +0000 (15:11 -0700)]
wait for filmstrip bottom panel buttons to finish animating
to show clings

bug: 17321626

Change-Id: Ib810157a2821ed40b2d1e30bee80bf1cc243ee59

9 years agoClose the camera when the async open callback runs after pause
Alan Newberger [Fri, 5 Sep 2014 22:52:39 +0000 (15:52 -0700)]
Close the camera when the async open callback runs after pause

Current implementation leaves the camera device open if callback
returns after app is paused, since activity/module pausing is
already complete before the camera opened. This CL adds a close
if the opened callback returns when the activity is already paused.

Bug: 17397753
Change-Id: Iec5d16445201b4e308b16e9237fd98ed8599fddc

9 years agoMerge "Update camera2 API usage" into ub-camera-glacier
Eino-Ville Talvala [Fri, 5 Sep 2014 20:44:02 +0000 (20:44 +0000)]
Merge "Update camera2 API usage" into ub-camera-glacier

9 years agoAdd additional lifecycle logging to Camera
Alan Newberger [Fri, 5 Sep 2014 19:47:42 +0000 (12:47 -0700)]
Add additional lifecycle logging to Camera

To assist in diagnosing startup issues, added some logging.

Bug: 17397753
Change-Id: Icc47ec278c0b68c8834bfb52554425ff7f371ea0

9 years agoUpdate camera2 API usage
Eino-Ville Talvala [Thu, 4 Sep 2014 22:57:24 +0000 (15:57 -0700)]
Update camera2 API usage

Rename listeners to callbacks

Bug: 17389922
Change-Id: I33affcaeec331eca2d084ded4eb199f86fa58765

9 years agoMerge "Load Gcam OneCamera in CaptureModule when it's also doing normal shots." into...
Sascha Haeberling [Thu, 4 Sep 2014 23:20:19 +0000 (23:20 +0000)]
Merge "Load Gcam OneCamera in CaptureModule when it's also doing normal shots." into ub-camera-glacier

9 years agoLoad Gcam OneCamera in CaptureModule when it's also doing normal shots.
Sascha Haeberling [Thu, 4 Sep 2014 20:32:35 +0000 (13:32 -0700)]
Load Gcam OneCamera in CaptureModule when it's also doing normal shots.

  Bug: 16654225

Change-Id: I939e4793125cc996e26bbd5a13579f2f4ebab663

9 years agoMerge "remove stray bool resource for determining if OS is L or not, moved to more...
Spike Sprague [Thu, 4 Sep 2014 21:57:34 +0000 (21:57 +0000)]
Merge "remove stray bool resource for determining if OS is L or not, moved to more universal ApiHelper for that." into ub-camera-glacier

9 years agoremove stray bool resource for determining if OS is L or not,
Spike Sprague [Thu, 4 Sep 2014 18:54:26 +0000 (11:54 -0700)]
remove stray bool resource for determining if OS is L or not,
moved to more universal ApiHelper for that.

this brings back the fade-in on shutter button touchDown.

bug: 17389859

Change-Id: I7c7d24db30bfbb149f84e6f5acf3e211c282c1ec

9 years agoAdd short flash animation and shutter sound to ZSL camera.
Andy Huibers [Thu, 28 Aug 2014 22:05:57 +0000 (15:05 -0700)]
Add short flash animation and shutter sound to ZSL camera.

Bug: 17217567
Change-Id: I9a75fdd15e03f47029ef4a631287899718794c5c

9 years agoMerge "Import translations. DO NOT MERGE" into ub-camera-glacier
Baligh Uddin [Thu, 4 Sep 2014 18:40:24 +0000 (18:40 +0000)]
Merge "Import translations. DO NOT MERGE" into ub-camera-glacier

9 years agoMerge "Added log for first preview frame" into ub-camera-glacier
Puneet Lall [Thu, 4 Sep 2014 18:11:44 +0000 (18:11 +0000)]
Merge "Added log for first preview frame" into ub-camera-glacier

9 years agoAdded log for first preview frame
Puneet Lall [Thu, 4 Sep 2014 18:05:14 +0000 (11:05 -0700)]
Added log for first preview frame

Bug: 17386943
Change-Id: I17907402c9d1cd4678634e2ceb8cbf921f010d9f

9 years agoImport translations. DO NOT MERGE
Baligh Uddin [Thu, 4 Sep 2014 07:06:22 +0000 (00:06 -0700)]
Import translations. DO NOT MERGE

Change-Id: I9f25ac4e3c13fcd64389cf61422fd64c831c8d02
Auto-generated-cl: translation import

9 years agoMerge "Re-enable shutter-button when switching between front and back cameras." into...
Puneet Lall [Thu, 4 Sep 2014 01:11:50 +0000 (01:11 +0000)]
Merge "Re-enable shutter-button when switching between front and back cameras." into ub-camera-glacier

9 years agoFix unnecessary string cast
Alan Newberger [Thu, 4 Sep 2014 01:02:49 +0000 (18:02 -0700)]
Fix unnecessary string cast

Code was taking a setting as a string, which when empty returns null,
then tried to parseInt it. Instead ask for an int, which will default
to zero, and things will work.

Bug: 16827108
Change-Id: I5bbed091ec29fc98257a5eb18948891c43caa29f

9 years agoMerge "Fixing settings upgrades" into ub-camera-glacier
Alan Newberger [Thu, 4 Sep 2014 00:06:17 +0000 (00:06 +0000)]
Merge "Fixing settings upgrades" into ub-camera-glacier

9 years agoFixing settings upgrades
Alan Newberger [Wed, 3 Sep 2014 01:31:10 +0000 (18:31 -0700)]
Fixing settings upgrades

Did a full audit of upgrade scenarios and performed the following fixes.
* restored pre-existing location upgrade code that handled old upgrades.
preserves location choice from C straight to G.
* added string type format conversion for "old global" values that were
not implemented in the refactor : hdr, hdr+, grid buttons
* moved a "reset" that existed in upgraders that put the user in Camera
mode on upgrade. it should run for everglades upgraders along with size
changes.

Bug: 17317510
Change-Id: I87db511bfa89676525ee727620cb546c180a8ef6

9 years agoRe-enable shutter-button when switching between front and back cameras.
Puneet Lall [Wed, 3 Sep 2014 21:58:51 +0000 (14:58 -0700)]
Re-enable shutter-button when switching between front and back cameras.

Bug: 16961251
Change-Id: Ie3075bf711ab44dfe5e6cdd6b3645dd6583708b5

9 years agoRefactor default picture size selection in zsl cam.
Puneet Lall [Wed, 3 Sep 2014 20:22:01 +0000 (13:22 -0700)]
Refactor default picture size selection in zsl cam.

Bug: 17322843
Change-Id: Ib34584937db639f984689042bd8371443a33bb64

9 years agoMerge "[ZSL Cam] Use largest supported size if no picture size is already set." into...
Puneet Lall [Wed, 3 Sep 2014 18:01:21 +0000 (18:01 +0000)]
Merge "[ZSL Cam] Use largest supported size if no picture size is already set." into ub-camera-glacier

9 years ago[ZSL Cam] Use largest supported size if no picture size is already set.
Puneet Lall [Wed, 3 Sep 2014 17:43:35 +0000 (10:43 -0700)]
[ZSL Cam] Use largest supported size if no picture size is already set.

Fixes crash due to null size when zsl is started for the first time on a
fresh device.

Bug: 17322843
Change-Id: I31ef4202c13cee1270af59231f93842fa0e86009

9 years agoCaptureModule countdown timer fixes: ability to cancel, and remove premature SoundPla...
Andy Huibers [Wed, 3 Sep 2014 05:12:09 +0000 (22:12 -0700)]
CaptureModule countdown timer fixes: ability to cancel, and remove premature SoundPlayer release.

Bug: 17204673
Change-Id: I438c3d4e7a9aad3f8fc709d255a249399bb05b57

9 years agoMerge "Add countdown timer to CaptureModule." into ub-camera-glacier
Andy Huibers [Wed, 3 Sep 2014 02:16:26 +0000 (02:16 +0000)]
Merge "Add countdown timer to CaptureModule." into ub-camera-glacier

9 years agoAdd countdown timer to CaptureModule.
Andy Huibers [Tue, 2 Sep 2014 18:27:11 +0000 (11:27 -0700)]
Add countdown timer to CaptureModule.

Bug: 16654225
Bug: 17204673

Change-Id: I914094b204743ddbe786ef1a7621564e864ed834

9 years agoMerge "A few Size clean-ups to support live metering changes." into ub-camera-glacier
Sascha Haeberling [Tue, 2 Sep 2014 23:06:57 +0000 (23:06 +0000)]
Merge "A few Size clean-ups to support live metering changes." into ub-camera-glacier

9 years agoMerge "actionbar opactiy tweaks" into ub-camera-glacier
Spike Sprague [Tue, 2 Sep 2014 22:33:35 +0000 (22:33 +0000)]
Merge "actionbar opactiy tweaks" into ub-camera-glacier

9 years agoactionbar opactiy tweaks
Spike Sprague [Thu, 28 Aug 2014 22:48:50 +0000 (15:48 -0700)]
actionbar opactiy tweaks

bug: 17319586

Change-Id: I2bfde2db9cff62b6ac8d8f416c1f8512c25bd900

9 years agoshutter button color fix (pre-L)
Spike Sprague [Mon, 18 Aug 2014 17:53:51 +0000 (10:53 -0700)]
shutter button color fix (pre-L)

bug: 17011894

Change-Id: Ic7626f89c811c08f1d16bb5e42fa9169b1e65759

9 years agoA few Size clean-ups to support live metering changes.
Sascha Haeberling [Tue, 2 Sep 2014 21:20:57 +0000 (14:20 -0700)]
A few Size clean-ups to support live metering changes.

  Bug: 16948752

Change-Id: I262a6b3caa42ecd7a4da40d1eaca6a7eaa96be98

9 years agoMerge "Remove android.hardware.camera2 import from Settings3A." into ub-camera-glacier
Andy Huibers [Tue, 2 Sep 2014 20:51:55 +0000 (20:51 +0000)]
Merge "Remove android.hardware.camera2 import from Settings3A." into ub-camera-glacier

9 years agoRemove android.hardware.camera2 import from Settings3A.
Andy Huibers [Tue, 2 Sep 2014 20:11:37 +0000 (13:11 -0700)]
Remove android.hardware.camera2 import from Settings3A.

Bug: 17358060
Change-Id: I7e4442a4257acf9e4b58981be697949aba62a31f

9 years agoMerge "Starting share/edit/play activities in its own task." into ub-camera-glacier
Senpo Hu [Tue, 2 Sep 2014 18:53:54 +0000 (18:53 +0000)]
Merge "Starting share/edit/play activities in its own task." into ub-camera-glacier

9 years agoStarting share/edit/play activities in its own task.
Senpo Hu [Fri, 29 Aug 2014 23:27:03 +0000 (16:27 -0700)]
Starting share/edit/play activities in its own task.

Bug: 17091348
Change-Id: Ib90173e164fab2a1aba753ab4d4f05d305d3d522

9 years agoMerge "Ensure ZoomView appears on top of other views in L" into ub-camera-glacier
Alan Newberger [Sat, 30 Aug 2014 00:43:49 +0000 (00:43 +0000)]
Merge "Ensure ZoomView appears on top of other views in L" into ub-camera-glacier

9 years agoEnsure ZoomView appears on top of other views in L
Alan Newberger [Sat, 30 Aug 2014 00:34:48 +0000 (17:34 -0700)]
Ensure ZoomView appears on top of other views in L

Since our normal image view now has an elevation on L, just calling
bringChildToFront() is not enough, elevation supersedes z order.
So we also ensure the ZoomView is at max elevation when we bring it
to front.

Bug: 17331586
Change-Id: I34b06949d063daa08d964003b28a245eb6133f95

9 years agoSimplify AF in CaptureModule and OneCameraImpl and share code in AutoFocusHelper.
Andy Huibers [Wed, 27 Aug 2014 22:28:42 +0000 (15:28 -0700)]
Simplify AF in CaptureModule and OneCameraImpl and share code in AutoFocusHelper.

Bug: 17202848
Change-Id: I08e92c9701d5b92938612137c87ca37c4305411f

9 years agoZSL refactoring
Puneet Lall [Fri, 29 Aug 2014 01:36:33 +0000 (18:36 -0700)]
ZSL refactoring

Bug: 16961251

Change-Id: I19642f5de088135db6650df98a62dd8dd462e0da

9 years agoAdd missing copyright header in Open Source code.
Puneet Lall [Fri, 29 Aug 2014 00:55:18 +0000 (17:55 -0700)]
Add missing copyright header in Open Source code.

Change-Id: I07703e0f55544204645396423ced09f957214d73

9 years agoMerge "[ZSL Cam] Fixed shutter button, compress on threadpool." into ub-camera-glacier
Puneet Lall [Fri, 29 Aug 2014 00:46:31 +0000 (00:46 +0000)]
Merge "[ZSL Cam] Fixed shutter button, compress on threadpool." into ub-camera-glacier

9 years agoMerge "fix for a regression introduced in ag/534531" into ub-camera-glacier
Spike Sprague [Fri, 29 Aug 2014 00:45:14 +0000 (00:45 +0000)]
Merge "fix for a regression introduced in ag/534531" into ub-camera-glacier

9 years agofix for a regression introduced in ag/534531
Spike Sprague [Fri, 29 Aug 2014 00:41:09 +0000 (17:41 -0700)]
fix for a regression introduced in ag/534531

that CL kept the swipe-away-from-filmstip
preview background from alpha-animating correctly.

this CL fixes that and provides an alternate solution
to bug 17301367

Change-Id: I04ba363a55dd9485d13e2d243fd1fb84df1d31e5

9 years ago[ZSL Cam] Fixed shutter button, compress on threadpool.
Puneet Lall [Thu, 28 Aug 2014 23:44:08 +0000 (16:44 -0700)]
[ZSL Cam] Fixed shutter button, compress on threadpool.

Change-Id: I4c2167163ee35ba841f459ae76779f44647bcb28

9 years agoMerge "Increasing JPEG compression quality for filmstrip" into ub-camera-glacier
Alan Newberger [Thu, 28 Aug 2014 23:41:45 +0000 (23:41 +0000)]
Merge "Increasing JPEG compression quality for filmstrip" into ub-camera-glacier

9 years agoIncreasing JPEG compression quality for filmstrip
Alan Newberger [Thu, 28 Aug 2014 23:37:33 +0000 (16:37 -0700)]
Increasing JPEG compression quality for filmstrip

This CL increases JPEG quality for generated cache images
in the filmstrip. This reduces overall artifacts for thumbnails.

Bug: 17320690
Change-Id: If2d0483502c0d8d18755b42dff5ffe9fd74e540f

9 years agoMerge "Zsl flash, auto focus, and other minor fixes" into ub-camera-glacier
Puneet Lall [Thu, 28 Aug 2014 22:04:53 +0000 (22:04 +0000)]
Merge "Zsl flash, auto focus, and other minor fixes" into ub-camera-glacier

9 years agoZsl flash, auto focus, and other minor fixes
Puneet Lall [Thu, 28 Aug 2014 02:27:50 +0000 (19:27 -0700)]
Zsl flash, auto focus, and other minor fixes

Bug: 17216526
Bug: 17221258
Change-Id: I5129c57674874d3a29789e0c9029eadeaa138788

9 years agoMerge "Actually remove settings" into ub-camera-glacier
Alan Newberger [Thu, 28 Aug 2014 17:58:39 +0000 (17:58 +0000)]
Merge "Actually remove settings" into ub-camera-glacier

9 years agoActually remove settings
Alan Newberger [Thu, 28 Aug 2014 17:30:33 +0000 (10:30 -0700)]
Actually remove settings

Correct settings removal, which wasn't occurring during upgrades. Will
followup with scrub of preference file references -- there are likely
additional reasons this wasn't causing more crashes, i.e. certain
settings not being ported over earlier versions.

Bug: 16879376
Change-Id: I720a3181958a4201508726d0f6e06803c456f737

9 years agoDo not show AF UI prior to snapping a picture (for state STATE_FOCUSING_SNAP_ON_FINISH).
Andy Huibers [Thu, 28 Aug 2014 15:52:41 +0000 (08:52 -0700)]
Do not show AF UI prior to snapping a picture (for state STATE_FOCUSING_SNAP_ON_FINISH).

Bug: 17312087
Change-Id: Ib706e35af5b1f49021efdd45b1e010e24dfbc333

9 years agoAdd simple sound player to be used in Camera implementations.
Sascha Haeberling [Thu, 28 Aug 2014 00:56:08 +0000 (17:56 -0700)]
Add simple sound player to be used in Camera implementations.

  Bug: 17205355

Change-Id: I04c4bf1a692c7a4555eafea794737e41a8fc342c

9 years agoMerge "Remove FeedbackHelper" into ub-camera-glacier
Alan Newberger [Wed, 27 Aug 2014 22:34:20 +0000 (22:34 +0000)]
Merge "Remove FeedbackHelper" into ub-camera-glacier

9 years agogcam: Restore naming of Gcam debug folders.
Sam Hasinoff [Wed, 27 Aug 2014 05:12:00 +0000 (22:12 -0700)]
gcam: Restore naming of Gcam debug folders.

When Gcam debugging is on, write output to per-burst folders
named SSSS_YYYYMMDD_HHMMSS_XXX, where 'SSSS' is the last 4
digits of the device serial number and 'XXX' are the
milliseconds of the timestamp.

Bug: 17204023

Change-Id: Ie1d58dc3ecb5d9dc7389d24acc4937498f00dbc9

9 years agoRemove FeedbackHelper
Alan Newberger [Wed, 27 Aug 2014 22:28:57 +0000 (15:28 -0700)]
Remove FeedbackHelper

ag/393130 has comments pointing out that startFeedback has a leak. We don't
use it anymore after Help library integration, so just remove it.

Bug: 17302992
Change-Id: I519a2b0eb7a0ce06d6fcdcbfa2c851837e9a6579

9 years agoMerge "Add setprop to enable ZSL." into ub-camera-glacier
Puneet Lall [Wed, 27 Aug 2014 22:08:30 +0000 (22:08 +0000)]
Merge "Add setprop to enable ZSL." into ub-camera-glacier

9 years agoAdd setprop to enable ZSL.
Puneet Lall [Wed, 27 Aug 2014 20:38:29 +0000 (13:38 -0700)]
Add setprop to enable ZSL.

Bug: 16961251
Change-Id: I997a47345f7c277abb43f2533fa5226e0c6a3e06

9 years agoMerge "Make sure CaptureModule (and therefore Gcam) always resumes right." into ub...
Sascha Haeberling [Wed, 27 Aug 2014 21:29:14 +0000 (21:29 +0000)]
Merge "Make sure CaptureModule (and therefore Gcam) always resumes right." into ub-camera-glacier

9 years agoMerge "fix for a doublebounce of the filmstip button on filmstip swipe out" into...
Spike Sprague [Wed, 27 Aug 2014 20:13:41 +0000 (20:13 +0000)]
Merge "fix for a doublebounce of the filmstip button on filmstip swipe out" into ub-camera-glacier

9 years agofix for a doublebounce of the filmstip button on filmstip swipe out
Spike Sprague [Wed, 27 Aug 2014 18:25:45 +0000 (11:25 -0700)]
fix for a doublebounce of the filmstip button on filmstip swipe out

bug: 17301367

Change-Id: I305618ee5012de229c9cc1fd73f0b6506d701477

9 years agoMerge "Initial ZSL implementation" into ub-camera-glacier
Puneet Lall [Wed, 27 Aug 2014 19:09:59 +0000 (19:09 +0000)]
Merge "Initial ZSL implementation" into ub-camera-glacier

9 years agoMake sure CaptureModule (and therefore Gcam) always resumes right.
Sascha Haeberling [Wed, 27 Aug 2014 19:07:58 +0000 (12:07 -0700)]
Make sure CaptureModule (and therefore Gcam) always resumes right.

  Bug: 17258531

Change-Id: I8a72fcd8f34eb95676ca939c2aff87fcac105e75

9 years agoInitial ZSL implementation
Puneet Lall [Thu, 14 Aug 2014 01:53:53 +0000 (18:53 -0700)]
Initial ZSL implementation

Bug: 16961251
Change-Id: I03c7c1813f99d460495472addc7f733e1bfa6a97

9 years agoMerge "boatload of new assets" into ub-camera-glacier
Spike Sprague [Wed, 27 Aug 2014 17:35:31 +0000 (17:35 +0000)]
Merge "boatload of new assets" into ub-camera-glacier

9 years agoMerge "Import translations. DO NOT MERGE" into ub-camera-glacier
Baligh Uddin [Wed, 27 Aug 2014 16:22:38 +0000 (16:22 +0000)]
Merge "Import translations. DO NOT MERGE" into ub-camera-glacier

9 years agoEnable location and heading to be stored in picture EXIF.
Sascha Haeberling [Wed, 27 Aug 2014 01:03:22 +0000 (18:03 -0700)]
Enable location and heading to be stored in picture EXIF.

  Bug: 17202845

Change-Id: Ic789c9a2d6078b35a09308d1b631166529f3f1bd

9 years agoImport translations. DO NOT MERGE
Baligh Uddin [Wed, 27 Aug 2014 04:39:30 +0000 (21:39 -0700)]
Import translations. DO NOT MERGE

Change-Id: I785196ae077b6f1720086a546c115f6eec7e1043
Auto-generated-cl: translation import

9 years agoShow a message to indicate that Gcam is not yet ready for quality feedback on Shamu.
Sascha Haeberling [Wed, 27 Aug 2014 04:04:52 +0000 (21:04 -0700)]
Show a message to indicate that Gcam is not yet ready for quality feedback on Shamu.

  Bug: 17204023

Change-Id: I03ac9df0e4df8f09f5a4527616add6fb12ff0fd8

9 years agoProtect video recording callback from activity/module pauses
Alan Newberger [Wed, 27 Aug 2014 01:18:48 +0000 (18:18 -0700)]
Protect video recording callback from activity/module pauses

This CL should eliminate MediaRecorder start exceptions, which
appear to be due to ending the camera or switching the module.
Storage I/O could take a while during which pauses can occur,
so we check for them and avoid starting video in that case.

Bug: 16298718
Change-Id: I9abca815400e9ce545fed96f6e31cb792860a1d0

9 years agoAdd volume key capture suppor to CaptureModule
Sascha Haeberling [Wed, 27 Aug 2014 01:20:35 +0000 (18:20 -0700)]
Add volume key capture suppor to CaptureModule

  Bug: 17289383

Change-Id: If548c4ebe5f702aca6fc9a983ac4775812ad551f

9 years agoAdd timeout to touch to focus.
Andy Huibers [Wed, 27 Aug 2014 00:32:39 +0000 (17:32 -0700)]
Add timeout to touch to focus.

Bug: 17289205
Change-Id: Ide39b4b9c86691de36149fdd15d1db41f9fed342

9 years agoMerge "more consistently apply filmstip hide animations" into ub-camera-glacier
Spike Sprague [Wed, 27 Aug 2014 00:17:45 +0000 (00:17 +0000)]
Merge "more consistently apply filmstip hide animations" into ub-camera-glacier

9 years agomore consistently apply filmstip hide animations
Spike Sprague [Wed, 27 Aug 2014 00:09:45 +0000 (17:09 -0700)]
more consistently apply filmstip hide animations

bug: 17278732
bug: 17279637

Change-Id: I2346dcd77c0afd84eb1167ad5d5df3770551c14f

9 years agoReset metering and focus areas when touch focus period ends.
Andy Huibers [Tue, 26 Aug 2014 23:21:15 +0000 (16:21 -0700)]
Reset metering and focus areas when touch focus period ends.

Bug: 17286539
Change-Id: I36e554cac3969d6d0422efd2cb169d7afb08911c

9 years agoMerge "Remove one shot callback workaround in VideoModule for L" into ub-camera-glacier
Alan Newberger [Tue, 26 Aug 2014 23:11:24 +0000 (23:11 +0000)]
Merge "Remove one shot callback workaround in VideoModule for L" into ub-camera-glacier

9 years agoMerge "In 3A debug mode, show pass/fail for active scans and show exact AF, AE region...
Andy Huibers [Tue, 26 Aug 2014 22:57:10 +0000 (22:57 +0000)]
Merge "In 3A debug mode, show pass/fail for active scans and show exact AF, AE regions." into ub-camera-glacier

9 years agoMerge "Material Ripple effect on filmstip buttons" into ub-camera-glacier
Spike Sprague [Tue, 26 Aug 2014 22:06:24 +0000 (22:06 +0000)]
Merge "Material Ripple effect on filmstip buttons" into ub-camera-glacier

9 years agoMaterial Ripple effect on filmstip buttons
Spike Sprague [Tue, 26 Aug 2014 21:59:43 +0000 (14:59 -0700)]
Material Ripple effect on filmstip buttons

bug: 17281225
Change-Id: Ic2876527a6d1fedaeb9ecdddbc8627e1c4e396b1

9 years agoIn 3A debug mode, show pass/fail for active scans and show exact AF, AE regions.
Andy Huibers [Tue, 26 Aug 2014 18:16:59 +0000 (11:16 -0700)]
In 3A debug mode, show pass/fail for active scans and show exact AF, AE regions.

Bug: 17028594
Change-Id: I9c85178926a68c5e3ce26d04107db65514d84169

9 years agoboatload of new assets
Spike Sprague [Fri, 22 Aug 2014 22:15:48 +0000 (15:15 -0700)]
boatload of new assets

also:
bug: 17255612

Change-Id: I8551e3162b8eedee9653a05abb88177e39f12be5

9 years agoMerge "photosphere: Fix TextureView transforms." into ub-camera-glacier
Ruben Brunk [Tue, 26 Aug 2014 21:00:05 +0000 (21:00 +0000)]
Merge "photosphere: Fix TextureView transforms." into ub-camera-glacier

9 years agophotosphere: Fix TextureView transforms.
Ruben Brunk [Tue, 26 Aug 2014 10:16:27 +0000 (03:16 -0700)]
photosphere: Fix TextureView transforms.

Bug: 17098224

- WAR to set the SurfaceTexture default buffer dimensions to
  the TextureView's layout dimensions to avoid bad
  scaling/translation in TextureView's HardwareLayer transform.

Change-Id: I9e7d6e6cb33d806470cb11f00d45b97218ee7c11

9 years agoRemove one shot callback workaround in VideoModule for L
Alan Newberger [Thu, 21 Aug 2014 21:42:36 +0000 (14:42 -0700)]
Remove one shot callback workaround in VideoModule for L

Since there was a framework fix for the issue, we don't need
to do an extra preview callback when entering video if on L.

Bug: 16649297
Bug: 17241994
Change-Id: I67fc67ef34a661daea6991c3b895b1c1bf6b9b85

9 years agoMerge "Enable mode options when capture is done." into ub-camera-glacier
Sascha Haeberling [Tue, 26 Aug 2014 20:36:10 +0000 (20:36 +0000)]
Merge "Enable mode options when capture is done." into ub-camera-glacier

9 years agoEnable mode options when capture is done.
Sascha Haeberling [Tue, 26 Aug 2014 19:15:41 +0000 (12:15 -0700)]
Enable mode options when capture is done.

  Bug: 17260403

Change-Id: I9e5c6c8516d5cdbb3fd303715af2a109b171c5f7

9 years agoMerge "util: Optimal preview size picks smaller-than-display size in case of tie...
Igor Murashkin [Tue, 26 Aug 2014 17:30:02 +0000 (17:30 +0000)]
Merge "util: Optimal preview size picks smaller-than-display size in case of tie" into ub-camera-glacier

9 years agoShow animated AF ring UI when lens is moving in continuous autofocus.
Andy Huibers [Tue, 26 Aug 2014 05:25:49 +0000 (22:25 -0700)]
Show animated AF ring UI when lens is moving in continuous autofocus.

Bug: 17028594
Change-Id: I0bb7c7cb3f8264304d4375f9f2b73608c8bfc1e5

9 years agoMerge "Enable Face rectangles for debugging." into ub-camera-glacier
Andy Huibers [Tue, 26 Aug 2014 01:34:46 +0000 (01:34 +0000)]
Merge "Enable Face rectangles for debugging." into ub-camera-glacier

9 years agoEnable Face rectangles for debugging.
Andy Huibers [Mon, 25 Aug 2014 22:01:25 +0000 (15:01 -0700)]
Enable Face rectangles for debugging.

Bug: 17028594

Change-Id: I57521aed991f93da1f5abdace6a72be0f1057dbe