History log of /packages/apps/Camera2/src/com/android/camera/one/OneCamera.java
Revision Date Author Comments (<<< Hide modified files) (Show modified files >>>)
2914f845c1d53f4a3b9aac68998b521290a7192c 30-Apr-2015 Paul Rohde <codelogic@google.com> 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
/packages/apps/Camera2/src/com/android/camera/one/OneCamera.java
d1f25e8507bc27a85853bb718c365d79a838dc33 27-Feb-2015 Paul Rohde <codelogic@google.com> Fix focus ring radius responses.

This fixes a scaling problem that was causing the focus controller
to ignore the radius changes on devices that supported providing
lens position. It also removes redundant focus indicator clearing
that was causing intermitent and jumpy animations.

Bug: 19527399

Change-Id: I0b2a734aa9dc4030430f1420cc26d75784dcbdf6
/packages/apps/Camera2/src/com/android/camera/one/OneCamera.java
0db8a2fd5cc02753d42f34a1c858b980c6c277bb 20-Feb-2015 Paul Rohde <codelogic@google.com> HDR Scene mode support for CaptureModule.

Bug: 18622877 N4 HDR Scene support.
Bug: 19269257 HDR+ flash setting persistance.

Change-Id: Ibac3d6513a1e14d8a2ffaf6208509133d31a8fb8
/packages/apps/Camera2/src/com/android/camera/one/OneCamera.java
401990916915791be14c65694ce3507eac3ec82d 17-Feb-2015 Paul Rohde <codelogic@google.com> Merge "Read focus range from CameraCharacteristics." into ub-camera-haleakala
6dd5840e86bffecba8a7f52327b9c1085caeb7d2 10-Feb-2015 Sascha Haeberling <haeberling@google.com> Route all thumbnail updates through CaptureSession

Bug: 19326495
Bug: 19310525

This removes the thumbnail ready callback that was hooked directly into
the ImageBackend from the CaptureModule before since it's now
unnecessary.

Client of CaptureSession can no optionally specify whether the updated
thumbnail is to be used to update the capture indicator. Default is
'yes' so that Lens Blur, Photo Sphere and HDR+ don't need to change.

Change-Id: I94adb50f875ccee214492f03f00ed2a67d400da1
/packages/apps/Camera2/src/com/android/camera/one/OneCamera.java
aca904e29aea542b6e6a4fcc837759a57a270a49 12-Feb-2015 Paul Rohde <codelogic@google.com> Read focus range from CameraCharacteristics.

- Remove hardcoded focus range values.
- Explicitly provide a lens range and range checks.

Bug: 19356651

Change-Id: Ied2513b5a654a00af07e76a66e72aac50ffc9c42
/packages/apps/Camera2/src/com/android/camera/one/OneCamera.java
b4b27f2c7738cd5e3f31a281d66a33f4698810b3 16-Jan-2015 Shashi Shekhar <shashishekhar@google.com> Port burst to use FrameServer.

Port burst to frameserver
- simplifies burst interfaces
- removes burst methods from OneCamera.
- locks orientation when burst is running.
- Deletes most old code for burst integration.
- Removes frame distributor preview forwarding, instead frames are
streamed using a surface texture the Surface for which is passed
as a output target to the create capture session.
- Deletes FrameDistributor, now the low-res frames are streamed to a new
surface specifically setup for burst.

Change-Id: I50f2955bb48610a7e284f9609cd70b8e4e1f1059
/packages/apps/Camera2/src/com/android/camera/one/OneCamera.java
04f6bcb60fde3cfd12097509a1fb0b57a4248660 27-Jan-2015 I-Jong Lin <ijonglin@google.com> Fix for Ripple on Fast Thumbnail Indicator

There was a cute optimization was to start the ripple animation, and
then fill in the bitmap in 30ms after the bitmap was computed.
However, when the system is overloaded, the bitmap is not necessarily
computed in 30ms, and an empty ripple can result. Put in a more
conservative fix, when the ripple only starts when the bitmap has
already been computed.

Bug: 19132963
Change-Id: Id39257a1d75342c78385bac8682462e8875d97f7
/packages/apps/Camera2/src/com/android/camera/one/OneCamera.java
d3f4c08da939e6a74eabec8991b28e978100c7d0 16-Jan-2015 Puneet Lall <puneetl@google.com> Delete obsolete/unused interface

Change-Id: I5c79e3372c9950fde6d6a86e647cf38dee79c9af
/packages/apps/Camera2/src/com/android/camera/one/OneCamera.java
ad38daf0897acce9f6b4a5a69e6032faf0e70aff 16-Jan-2015 I-Jong Lin <ijonglin@google.com> Merge "Route ImageBackend JPEG Thumbnail To Wear" into ub-camera-haleakala
9eab2cdc9f38f06586f342ef5cf5418ebc317db8 13-Jan-2015 I-Jong Lin <ijonglin@google.com> Route ImageBackend JPEG Thumbnail To Wear

Sends the results of JPEG compression task to a wear device if
available. Need to do a little plumbing on the
OneCamera.PictureSaverCallback.

Bug: 18841900
Change-Id: Iec86a82d9b99e8ff9fecd208d27bfbc563af73f6
/packages/apps/Camera2/src/com/android/camera/one/OneCamera.java
386c5b885b99f67f9c0a7380f4be153f28333089 09-Jan-2015 Puneet Lall <puneetl@google.com> Apply flash setting changes to the AE mode

Bug: 17216526

Change-Id: If6c03102f04ad2ba54e1a045a3ab7445aaa5b595
/packages/apps/Camera2/src/com/android/camera/one/OneCamera.java
bc735745e301191389d95c3e46e4cc2f78b424d0 09-Jan-2015 Senpo Hu <senpo@google.com> Add OneCamera.PictureSaverCallback.

Remove the undesirable dependency between ImageBackend and CameraAppUI.

Create a new interface rather than using PictureCallback since
at some points we might consider retiring it.

Change-Id: I6e02564c9ca9990aa847902d86806f8bbd9cd652
/packages/apps/Camera2/src/com/android/camera/one/OneCamera.java
d8463954727c9f8b688e69476439830cadb7b45a 30-Dec-2014 Puneet Lall <puneetl@google.com> Refactor camera factories to reduce code duplication

Change-Id: I5f5c899f595dbbaa9fa181c5caa092d4bad69f07
/packages/apps/Camera2/src/com/android/camera/one/OneCamera.java
c7251753978f80dc40131e7676f69f7e86208fd1 29-Dec-2014 Puneet Lall <puneetl@google.com> Remove unused parameter to OneCamera.close

Change-Id: Iea5dcb41eb5c387a7f19db280ea9c681e2aabc7e
/packages/apps/Camera2/src/com/android/camera/one/OneCamera.java
0e08cd20de04edc8ad8a8aa7f677b7cc708f21d3 20-Dec-2014 Puneet Lall <puneetl@google.com> Implement callbacks for focus indicator on zsl

Change-Id: I5348192a76222ac41923b680acb58ac6480affcf
/packages/apps/Camera2/src/com/android/camera/one/OneCamera.java
987ee64612e2510004fdf08536746c87234d01c1 05-Dec-2014 Paul Rohde <codelogic@google.com> Drop new focus indicator into Camera2.

* Create a new custom focus view that interacts with physical lens diopter changes.
* Replace all occurances of the old focus indicator with the new one.

Change-Id: Ia02646ce4d1eb059ecb8a1dfccc15dfc9c167e1b
/packages/apps/Camera2/src/com/android/camera/one/OneCamera.java
9c94ab32a69a1ad3642a0f1e38e68bcfd97d3511 02-Dec-2014 Puneet Lall <puneetl@google.com> Initial frameserver/OneCamera integration

Change-Id: I2fe0d8acf9ce927a6a0a1dea599299c715503462
/packages/apps/Camera2/src/com/android/camera/one/OneCamera.java
9ceed0d5535e8453f8b5f77959134760dac01ec5 25-Nov-2014 Puneet Lall <puneetl@google.com> Refactor OneCamera

* Removed CaptureParameter "sanityCheck"
* Removed unused OneCamera interface methods

Change-Id: I2464cedf4ad9122e6ca72055e1cc8c0ba633a164
/packages/apps/Camera2/src/com/android/camera/one/OneCamera.java
82d592f64966766ac4e4181e08b0d2989d4ed9c3 12-Nov-2014 Shashi Shekhar <shashishekhar@google.com> 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
/packages/apps/Camera2/src/com/android/camera/one/OneCamera.java
c6da1a12fe8b78e2fbebe1af5efee514bc8e25ee 06-Nov-2014 Sascha Haeberling <haeberling@google.com> 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
/packages/apps/Camera2/src/com/android/camera/one/OneCamera.java
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/one/OneCamera.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/one/OneCamera.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/one/OneCamera.java
0971376b0ddf12c8aa886ad9109f6a8929095154 17-Sep-2014 Jiawen Chen <jiawen@google.com> Changed tap-to-meter rectangle and weights.

Bug: 17417649

- Clarified widths in Settings3A.
- For Gcam only, reduced AE box to 12.25% of the shorter edge of the crop
rectangle. This matches the setting on Nexus 5.
- For Gcam only, changed AE weight to 22 after consultations with Ryan.
- Tested with Gcam and it final shots look great in HDR scenes.
- Does not fully address b/17417649: ISP AE ignores the weight completely and
overcompensates for the tap region.
- Changed AutoFocusHelper to take touch points in normalized portrait
coordinates along with a sensor orientation. The output is a MeteringRectangle
in sensor pixels.
- Fixed a bug where a digital-zoomed tap doesn't work when the rect intersects
edges. It should have been clamp, not check for intersection and return the
full crop rectangle if it doesn't intersect.

- Submit simultaneously with ag/549706.

Change-Id: If084e64ecbfc4a08ece96a7cebfcaf835d92b9d1
/packages/apps/Camera2/src/com/android/camera/one/OneCamera.java
9cefdd495332719d987ffb942742ec602793d8d4 09-Sep-2014 Jiawen Chen <jiawen@google.com> Changed double to float. viewFinder -> viewfinder.

Change-Id: I5f10a5e8dae40f56457b863d5e8c703e7bf68e49
/packages/apps/Camera2/src/com/android/camera/one/OneCamera.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/one/OneCamera.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/one/OneCamera.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/one/OneCamera.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/one/OneCamera.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/one/OneCamera.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/one/OneCamera.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/one/OneCamera.java
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/one/OneCamera.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/one/OneCamera.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/one/OneCamera.java
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/one/OneCamera.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/one/OneCamera.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/one/OneCamera.java
8c34b30b2ae23ceb13f2912fe8b6f83c27940306 30-Jul-2014 Sascha Haeberling <haeberling@google.com> [OC] Add common abstract OneCamera class.

Bug: 16654225

Change-Id: I31c0ab4d8f4aa91447d384444258616648633de4
/packages/apps/Camera2/src/com/android/camera/one/OneCamera.java
00c122a56f76d8ba523c324638e5083f721da01a 30-Jul-2014 Sascha Haeberling <haeberling@google.com> [OC] Version 1 of the nterface for OneCamera.

Bug: 16654225

Change-Id: Id4a6755577e327849ce60db7c5f64d76fb0a55b2
/packages/apps/Camera2/src/com/android/camera/one/OneCamera.java