diff options
| author | Camera Software Integration <camswint@localhost> | 2017-02-28 04:42:18 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2017-02-28 04:42:18 -0800 |
| commit | dea6b33f750a9675903dc4ff45779c7891d164ec (patch) | |
| tree | 9e65853ba45bb3fafcbfc0b4804cada112bd5714 /src/com/android/camera/CameraSettings.java | |
| parent | 9a128da6c36a004c9278c606eb52f506e3a66ed3 (diff) | |
| parent | f9b1301938574ac8236cff60d668dff28ac3f01e (diff) | |
| download | android_packages_apps_Snap-dea6b33f750a9675903dc4ff45779c7891d164ec.tar.gz android_packages_apps_Snap-dea6b33f750a9675903dc4ff45779c7891d164ec.tar.bz2 android_packages_apps_Snap-dea6b33f750a9675903dc4ff45779c7891d164ec.zip | |
Merge "SnapdragonCamera: Add zoom option to developer option" into camera.lnx.1.0-dev.1.0
Diffstat (limited to 'src/com/android/camera/CameraSettings.java')
| -rw-r--r-- | src/com/android/camera/CameraSettings.java | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/src/com/android/camera/CameraSettings.java b/src/com/android/camera/CameraSettings.java index 4bd88f755..2a8122872 100644 --- a/src/com/android/camera/CameraSettings.java +++ b/src/com/android/camera/CameraSettings.java @@ -127,6 +127,7 @@ public class CameraSettings { public static final String KEY_LONGSHOT = "pref_camera_longshot_key"; public static final String KEY_INSTANT_CAPTURE = "pref_camera_instant_capture_key"; + public static final String KEY_ZOOM = "pref_camera_zoom_key"; public static final String KEY_BOKEH_MODE = "pref_camera_bokeh_mode_key"; public static final String KEY_BOKEH_MPO = "pref_camera_bokeh_mpo_key"; @@ -662,6 +663,18 @@ public class CameraSettings { } + private static List<String> getSupportedZoomLevel(Parameters params) { + ArrayList<String> supported = new ArrayList<String>(); + int zoomMaxIdx = params.getMaxZoom(); + List <Integer> zoomRatios = params.getZoomRatios(); + int zoomMax = zoomRatios.get(zoomMaxIdx)/100; + + for (int zoomLevel = 0; zoomLevel <= zoomMax; zoomLevel++) { + supported.add(String.valueOf(zoomLevel)); + } + return supported; + } + private void qcomInitPreferences(PreferenceGroup group){ //Qcom Preference add here ListPreference powerMode = group.findPreference(KEY_POWER_MODE); @@ -702,6 +715,8 @@ public class CameraSettings { ListPreference bokehMode = group.findPreference(KEY_BOKEH_MODE); ListPreference bokehMpo = group.findPreference(KEY_BOKEH_MPO); ListPreference bokehBlurDegree = group.findPreference(KEY_BOKEH_BLUR_VALUE); + ListPreference zoomLevel = group.findPreference(KEY_ZOOM); + if (instantCapture != null) { if (!isInstantCaptureSupported(mParameters)) { @@ -855,6 +870,11 @@ public class CameraSettings { filterUnsupportedOptions(group, manualExposure, getSupportedManualExposureModes(mParameters)); } + + if (zoomLevel != null) { + filterUnsupportedOptions(group, + zoomLevel, getSupportedZoomLevel(mParameters)); + } } private void initPreference(PreferenceGroup group) { |