diff options
| author | Alan Newberger <alann@google.com> | 2014-08-07 18:02:07 -0700 |
|---|---|---|
| committer | Alan Newberger <alann@google.com> | 2014-08-07 18:02:07 -0700 |
| commit | 282655f4d66c24c5d2f4ea696f53a345e31926dd (patch) | |
| tree | bf8e686da45a33eea51d7d8ff9f2bd768745cfd9 /src | |
| parent | 60c02b437771c8fe959b233bcdcb28e4314c7489 (diff) | |
| download | android_packages_apps_Camera2-282655f4d66c24c5d2f4ea696f53a345e31926dd.tar.gz android_packages_apps_Camera2-282655f4d66c24c5d2f4ea696f53a345e31926dd.tar.bz2 android_packages_apps_Camera2-282655f4d66c24c5d2f4ea696f53a345e31926dd.zip | |
Route zoom value through to zoomIndex in device API
Current UI is wired to track zoom index, so pass that in rather
than the unfinished new zoom ratio API. This finishes the fix for
zoom in the app.
Extended TODO already there. App should continue to operate until
one big refactor moves it form working with zoom indices, to working
with zoom ratios, no breakage in between.
Bug: 16527845
Change-Id: I8d88c3d34ba9ad85b1a115cf1249548a16722a38
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/camera/PhotoModule.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/com/android/camera/PhotoModule.java b/src/com/android/camera/PhotoModule.java index c39766b8e..75de51621 100644 --- a/src/com/android/camera/PhotoModule.java +++ b/src/com/android/camera/PhotoModule.java @@ -2289,7 +2289,7 @@ public class PhotoModule mCameraCapabilities.supports(CameraCapabilities.FocusMode.CONTINUOUS_PICTURE); } - // TODO: Remove this + // TODO: Use zoomRatio device API rather than deprecated zoomIndex @Override public int onZoomChanged(int index) { // Not useful to change zoom value when the activity is paused. @@ -2301,7 +2301,7 @@ public class PhotoModule return index; } // Set zoom parameters asynchronously - mCameraSettings.setZoomRatio(mZoomValue); + mCameraSettings.setZoomIndex(mZoomValue); mCameraDevice.applySettings(mCameraSettings); CameraSettings settings = mCameraDevice.getSettings(); if (settings != null) { |