| c7beaf110667df54d7ef97cc73e0fe28e31149de |
|
28-Oct-2014 |
Sascha Haeberling <haeberling@google.com> |
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
/packages/apps/Camera2/src/com/android/camera/CaptureModule.java
|
| ea77c6b2f9a602712c19ed0f441c6439b2f168de |
|
17-Oct-2014 |
Sascha Haeberling <haeberling@google.com> |
Don't release resources until camera is closed.
Bug: 17788328
Change-Id: Id7112b698c8d49f9816e5e1bf6a133272fa2f65a
/packages/apps/Camera2/src/com/android/camera/CaptureModule.java
|
| 7dabda684367122fa2dc2097e198ac6241279bcd |
|
16-Oct-2014 |
Alan Newberger <alann@google.com> |
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
/packages/apps/Camera2/src/com/android/camera/CaptureModule.java
|
| 0e0c55a11c5bc47b14023054f2c5597ea5197fa8 |
|
14-Oct-2014 |
Puneet Lall <puneetl@google.com> |
Don't re-open the camera if already open
Bug: 17870967
Change-Id: Ibafc8c563b6188c4c743a60a3b42b93e107523bc
/packages/apps/Camera2/src/com/android/camera/CaptureModule.java
|
| d25eac4c69ccda0a9e91f6af8032b0624554e7ac |
|
09-Oct-2014 |
Spike Sprague <spikuru@google.com> |
Native 16x9 viewfinder stream for Gcam to reduce switching jank and eliminate black bar overlay hack.
companion CL: ag/562183
bug: 17669070
Change-Id: I4d5402df3848423c236108716f7065a87ce95f6d
/packages/apps/Camera2/src/com/android/camera/CaptureModule.java
|
| 64cb0bf0e5c3efb62b34cd2871723a56f3cc7787 |
|
04-Oct-2014 |
Puneet Lall <puneetl@google.com> |
Merge "Use singleTask to improve unsecure lockscreen startup" into ub-camera-glacier
|
| 4de9b72f79fe256766f25497bff44cb5533b7508 |
|
26-Sep-2014 |
Puneet Lall <puneetl@google.com> |
Use singleTask to improve unsecure lockscreen startup
This enables warm-starts from the lockscreen by reusing the same
activity if possible.
Bug: 16035858
Change-Id: I4b1ce0c290e209a5098e3f3e71509e0ca86e1845
/packages/apps/Camera2/src/com/android/camera/CaptureModule.java
|
| 7a02c1146cd465aa89e4f7249d60bf52ac596dc5 |
|
02-Oct-2014 |
Andy Huibers <andyhuibers@google.com> |
Add zoom value and timer duration to capture parameters, for logging.
Bug: 17204955
Change-Id: I13e087a8e87c9722b83b83d90af491966ff30c9e
/packages/apps/Camera2/src/com/android/camera/CaptureModule.java
|
| 022ce61e1c4f338a79585e8656ab57990ecd32c1 |
|
26-Sep-2014 |
Puneet Lall <puneetl@google.com> |
Synchronize CaptureModule camera open/close operations
This fixes a race condition in which CaptureModule gets a pause()
immediately after it is asked to open the camera. pause() MUST
wait/block to close the camera to ensure that we can later open it (a
fast open()->pause() sequence is reproducible via the lockscreen under
certain cases when we get a rapid onResume()->onPause()->onResume),
so this adds the necessary threading logic to wait, if necessary,
for the camera to finish opening so that it can be closed.
Bug: 17642065
Change-Id: Ic88bd32fc5acc2b333de367019085a8cd539c5a5
/packages/apps/Camera2/src/com/android/camera/CaptureModule.java
|
| eeeed4fa00ed842050bc7e0edd3b37c262802a5b |
|
27-Aug-2014 |
Spike Sprague <spikuru@google.com> |
new sounds for timer ticker and pano / photosphere intermediate captures
companions CL: ag/534823
bug: 17281234
Change-Id: I9d98d8e869dcefdbd0f7e0b53dea6b8e024a8e3b
/packages/apps/Camera2/src/com/android/camera/CaptureModule.java
|
| e6ebf3d73bb3f337413bdde437fbb8fde6cee436 |
|
11-Sep-2014 |
Andy Huibers <andyhuibers@google.com> |
If we are using CaptureModule for Gcam only, turn off flash.
Bug: 17460394
Change-Id: I4743e9c31f516d12537b2ceedc9e1fe35fbd8381
/packages/apps/Camera2/src/com/android/camera/CaptureModule.java
|
| 5675b8af3fddca8d73d0ce0c8aa2f2a38592f556 |
|
10-Sep-2014 |
Senpo Hu <senpo@google.com> |
Fix the upside-down orienation bug in CaptureModule.
Bug: 17369697
Change-Id: I5beb0ec45f2dbf372dda88ffd8a92b1632b3ab90
/packages/apps/Camera2/src/com/android/camera/CaptureModule.java
|
| 5e3bf4cc84a186c5e89dfa692f3af95007751877 |
|
10-Sep-2014 |
Andy Huibers <andyhuibers@google.com> |
Remove toast.
This reverts commit 779414e8bfe23d66de310570ff2314654e45ec9f.
Change-Id: Idf04e0bbb69822792327fd17634a4f95f7eb2092
/packages/apps/Camera2/src/com/android/camera/CaptureModule.java
|
| ca3c564536f154b83e380e37382bc7b9f6049302 |
|
07-Sep-2014 |
Andy Huibers <andyhuibers@google.com> |
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
/packages/apps/Camera2/src/com/android/camera/CaptureModule.java
|
| 13d07d0ecb3bc808fb6f5b65508b1948ab3149d8 |
|
06-Sep-2014 |
Sascha Häberling <haeberling@google.com> |
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
/packages/apps/Camera2/src/com/android/camera/CaptureModule.java
|
| bcc384ea15fc9d25ee3efd934c2ac7ec7a059a52 |
|
06-Sep-2014 |
Sascha Häberling <haeberling@google.com> |
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
/packages/apps/Camera2/src/com/android/camera/CaptureModule.java
|
| f6bf65e9442f2fb7042e37ec21bf1c6c4fbd9bb6 |
|
06-Sep-2014 |
Sascha Haeberling <haeberling@google.com> |
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
/packages/apps/Camera2/src/com/android/camera/CaptureModule.java
|
| dc0369f37b07adb4355113540af3c1f7c82a404e |
|
05-Sep-2014 |
Sascha Haeberling <haeberling@google.com> |
Merge "Load Gcam OneCamera in CaptureModule when it's also doing normal shots." into ub-camera-glacier
|
| 961805e8fafa3ef21d1984eeb1429b40df6ffcde |
|
04-Sep-2014 |
Sascha Haeberling <haeberling@google.com> |
Load Gcam OneCamera in CaptureModule when it's also doing normal shots.
Bug: 16654225
Change-Id: I939e4793125cc996e26bbd5a13579f2f4ebab663
/packages/apps/Camera2/src/com/android/camera/CaptureModule.java
|
| 17d9084e38e64f06a9d411d64fe3c2739d299cda |
|
29-Aug-2014 |
Andy Huibers <andyhuibers@google.com> |
Add short flash animation and shutter sound to ZSL camera.
Bug: 17217567
Change-Id: I9a75fdd15e03f47029ef4a631287899718794c5c
/packages/apps/Camera2/src/com/android/camera/CaptureModule.java
|
| 4d7f3be87a92c7efac7cf92bbd4ce7dd61f46e0d |
|
03-Sep-2014 |
Andy Huibers <andyhuibers@google.com> |
CaptureModule countdown timer fixes: ability to cancel, and remove premature SoundPlayer release.
Bug: 17204673
Change-Id: I438c3d4e7a9aad3f8fc709d255a249399bb05b57
/packages/apps/Camera2/src/com/android/camera/CaptureModule.java
|
| a31162ce3ab4f9c68e46658b16b2c49f4dc0d145 |
|
02-Sep-2014 |
Andy Huibers <andyhuibers@google.com> |
Add countdown timer to CaptureModule.
Bug: 16654225
Bug: 17204673
Change-Id: I914094b204743ddbe786ef1a7621564e864ed834
/packages/apps/Camera2/src/com/android/camera/CaptureModule.java
|
| b868274c9dc8d9c772ec89fb5955215cc7911087 |
|
28-Aug-2014 |
Andy Huibers <andyhuibers@google.com> |
Simplify AF in CaptureModule and OneCameraImpl and share code in AutoFocusHelper.
Bug: 17202848
Change-Id: I08e92c9701d5b92938612137c87ca37c4305411f
/packages/apps/Camera2/src/com/android/camera/CaptureModule.java
|
| 3724805a043ac149b7bc103bb94787133c7e06a5 |
|
29-Aug-2014 |
Puneet Lall <puneetl@google.com> |
Merge "Zsl flash, auto focus, and other minor fixes" into ub-camera-glacier
|
| 580f451fc85cc752e71eb730006b90d09aaafb55 |
|
28-Aug-2014 |
Puneet Lall <puneetl@google.com> |
Zsl flash, auto focus, and other minor fixes
Bug: 17216526
Bug: 17221258
Change-Id: I5129c57674874d3a29789e0c9029eadeaa138788
/packages/apps/Camera2/src/com/android/camera/CaptureModule.java
|
| 2d4be2576b265a4abfbabbda20862fcea19c1395 |
|
28-Aug-2014 |
Sascha Haeberling <haeberling@google.com> |
Add simple sound player to be used in Camera implementations.
Bug: 17205355
Change-Id: I04c4bf1a692c7a4555eafea794737e41a8fc342c
/packages/apps/Camera2/src/com/android/camera/CaptureModule.java
|
| 307c334002d4972b4a4a1d2b1303c1bdf9ed4e2d |
|
27-Aug-2014 |
Sascha Haeberling <haeberling@google.com> |
Make sure CaptureModule (and therefore Gcam) always resumes right.
Bug: 17258531
Change-Id: I8a72fcd8f34eb95676ca939c2aff87fcac105e75
/packages/apps/Camera2/src/com/android/camera/CaptureModule.java
|
| 95817308fddad554c73cbe4539cb868dd4722ff9 |
|
27-Aug-2014 |
Sascha Haeberling <haeberling@google.com> |
Enable location and heading to be stored in picture EXIF.
Bug: 17202845
Change-Id: Ic789c9a2d6078b35a09308d1b631166529f3f1bd
/packages/apps/Camera2/src/com/android/camera/CaptureModule.java
|
| 779414e8bfe23d66de310570ff2314654e45ec9f |
|
27-Aug-2014 |
Sascha Haeberling <haeberling@google.com> |
Show a message to indicate that Gcam is not yet ready for quality feedback on Shamu.
Bug: 17204023
Change-Id: I03ac9df0e4df8f09f5a4527616add6fb12ff0fd8
/packages/apps/Camera2/src/com/android/camera/CaptureModule.java
|
| d225ea6074a58021013c8c063abb51eb80b1feb7 |
|
27-Aug-2014 |
Sascha Haeberling <haeberling@google.com> |
Add volume key capture suppor to CaptureModule
Bug: 17289383
Change-Id: If548c4ebe5f702aca6fc9a983ac4775812ad551f
/packages/apps/Camera2/src/com/android/camera/CaptureModule.java
|
| 9d3ec0396b71d7b9068f83b2e820eee988df8215 |
|
27-Aug-2014 |
Andy Huibers <andyhuibers@google.com> |
Add timeout to touch to focus.
Bug: 17289205
Change-Id: Ide39b4b9c86691de36149fdd15d1db41f9fed342
/packages/apps/Camera2/src/com/android/camera/CaptureModule.java
|
| afb4c581786bb539e8753488e29a3d13fa8b43fd |
|
26-Aug-2014 |
Sascha Haeberling <haeberling@google.com> |
Merge "Enable mode options when capture is done." into ub-camera-glacier
|
| cceaf1d5c7f9c26a9b38367412af066cd19c7e33 |
|
26-Aug-2014 |
Sascha Haeberling <haeberling@google.com> |
Enable mode options when capture is done.
Bug: 17260403
Change-Id: I9e5c6c8516d5cdbb3fd303715af2a109b171c5f7
/packages/apps/Camera2/src/com/android/camera/CaptureModule.java
|
| 62b4c3c0da3abd397b3790820359927784c50bc2 |
|
26-Aug-2014 |
Andy Huibers <andyhuibers@google.com> |
Enable Face rectangles for debugging.
Bug: 17028594
Change-Id: I57521aed991f93da1f5abdace6a72be0f1057dbe
/packages/apps/Camera2/src/com/android/camera/CaptureModule.java
|
| 4c1bffecc94cedf56d188eca40bd65a854746413 |
|
21-Aug-2014 |
Sascha Haeberling <haeberling@google.com> |
Enable switching within CaptureModule to HDR+ and back.
Bug: 16945820
Change-Id: If92371129c5bf2a78b7623d745a8b86d218d32e1
/packages/apps/Camera2/src/com/android/camera/CaptureModule.java
|
| cbe861edcd0d094ee79d3eeaac48bb928017b600 |
|
21-Aug-2014 |
Sascha Haeberling <haeberling@google.com> |
Pick the preview size based on the selected picture size.
Bug: 16654225
Also make this a function of the Camera device, since othe camera might
have to override the picture size.
Change-Id: Ieb6d1ffac0c3d7893416f9eae3232afde6d27240
/packages/apps/Camera2/src/com/android/camera/CaptureModule.java
|
| 90f158340db39bca9ee5da4cf1d246adbcb03453 |
|
21-Aug-2014 |
Sascha Haeberling <haeberling@google.com> |
Enable progress reporting for modules like HDR+.
Bug: 16945820
Change-Id: If6aba8ff5d2b973f4ea8112110695a84f897d881
/packages/apps/Camera2/src/com/android/camera/CaptureModule.java
|
| 26b3334755ffccc039249005435d5cc598d0689e |
|
20-Aug-2014 |
Andy Huibers <andyhuibers@google.com> |
Add zoom to CaptureModule and OneCamera.
Change-Id: Ia679d79a42e20e9033409939d0ca137ffcfbc75a
/packages/apps/Camera2/src/com/android/camera/CaptureModule.java
|
| fa7b92c1ee99bc6734c06bb50445cffae94e8197 |
|
15-Aug-2014 |
Sascha Haeberling <haeberling@google.com> |
Merge "Add ability to add a ready-state changed listener to the camera." into ub-camera-glacier
|
| e3ad4352a23ddb21350d356e0947905d1e635911 |
|
15-Aug-2014 |
Sascha Haeberling <haeberling@google.com> |
Add ability to add a ready-state changed listener to the camera.
Bug: 16945820
Bug: 16948752
This enables us to hook up memory intense cameras and make sure we don't
activate the shutter button if the camera is not ready.
Change-Id: I70a31c76e063d775c844404ee9e20e583fa233e3
/packages/apps/Camera2/src/com/android/camera/CaptureModule.java
|
| 064f851a063c80be4e6cc3f1716ff19b605e4865 |
|
15-Aug-2014 |
Andy Huibers <andyhuibers@google.com> |
Hold touch to focus target in 3A UI debug mode.
Bug: 17028594
Change-Id: I6d60f2a891cc8ab33c2165438295950bf46095b3
/packages/apps/Camera2/src/com/android/camera/CaptureModule.java
|
| 99a37d89f92cb0ad60cd57169c4845560ad0ffac |
|
15-Aug-2014 |
Andy Huibers <andyhuibers@google.com> |
Consolidate properties for debugging.
Change-Id: I052492375bf176622b38382579b2189d22a05349
/packages/apps/Camera2/src/com/android/camera/CaptureModule.java
|
| 59c784bf588b9e0994e9769001f624200e9b1027 |
|
05-Aug-2014 |
Sascha Haeberling <haeberling@google.com> |
[OC] Gcam OneCamera implementation.
Bug: 16948752
Change-Id: I0160de117c4ff7024e0d546f594b5777847d1833
/packages/apps/Camera2/src/com/android/camera/CaptureModule.java
|
| 30ffce08f511fbed4cf18daa743778b541583351 |
|
01-Aug-2014 |
Andy Huibers <andyhuibers@google.com> |
[OC] Add autofocus (tap-to-focus, UI and pre-shot focus) to OneCamera.
Change-Id: Ic88359ad27b8e9ee0e74c8d1bd6ecb71fe3c24f0
/packages/apps/Camera2/src/com/android/camera/CaptureModule.java
|
| 7f112487e7c19983fe36164494486a0a289a4831 |
|
08-Aug-2014 |
Sol Boucher <solb@google.com> |
Merge "Move display orientation calculations out of app code" into ub-camera-glacier
|
| 0024b57e54c674d86ff15011867a0f44029e0c48 |
|
06-Aug-2014 |
Sascha Haeberling <haeberling@google.com> |
Merge "[OC] Enable flash support." into ub-camera-glacier
|
| e3dfd5a433e39d76578b379fe1539864cf924cee |
|
06-Aug-2014 |
Sascha Haeberling <haeberling@google.com> |
[OC] Migrate away from android.util.Size sinc we cannot use it in K.
Bug: 16654225
Change-Id: I2c0ea6b387b8ad38d6e49c84dca8bf2bde34e249
/packages/apps/Camera2/src/com/android/camera/CaptureModule.java
|
| 0cf4a02c13a7710dc9b26ac39bea15a95ac48baf |
|
31-Jul-2014 |
Sascha Haeberling <haeberling@google.com> |
[OC] Enable flash support.
Bug: 16654225
Also show an error and exit the app if camera could not be opened.
Change-Id: Iddccaff35b081ba98efe2aaae51d9ee10bb7726f
/packages/apps/Camera2/src/com/android/camera/CaptureModule.java
|
| 57bcd92f39d85427102f30be2c749c4a7bd4be96 |
|
01-Aug-2014 |
Sascha Haeberling <haeberling@google.com> |
[OC] Refactoring the session API before intgrating GCam into OneCamera
Bug: 16654225
Change-Id: I3fe6f46847ed6424310a81722c93c63be8b807a3
/packages/apps/Camera2/src/com/android/camera/CaptureModule.java
|
| 73ec9851f8e92968ac50193916526afd8f1343fc |
|
25-Jul-2014 |
Sol Boucher <solb@google.com> |
Move display orientation calculations out of app code
Because they're needed by every app, these are being relocated into the
portability layer. As such, the CameraUtil#getDisplayOrientation() and
CameraUtil#getJpegRotation() methods are being replaced by the API-agnostic
CameraDeviceInfo.Characteristics#getPreviewOrientation() and
CameraDeviceInfo.Characteristics#getJpegOrientation() calls, respectively.
Change-Id: I5048e6f1a5ff655e4ea260b109e7c104bbe790b0
/packages/apps/Camera2/src/com/android/camera/CaptureModule.java
|
| 08b3c94a7d7aff30b5da8e99649346e37b67a5c5 |
|
31-Jul-2014 |
Sascha Haeberling <haeberling@google.com> |
[OC] Adds the new CaptureModule and UI.
Bug: 16654225
This is essentially a version of the GCamModule without GCam, plus a few
things we need from PhotoModule.
Some code is commented out to be added back in later as a reminder.
CLs to hook the module up will be following up.
Change-Id: I70108529f81a8b0b744dc846287ea2ac121c85da
/packages/apps/Camera2/src/com/android/camera/CaptureModule.java
|