diff options
| author | codeworkx <codeworkx@cyanogenmod.org> | 2016-01-05 21:39:36 +0100 |
|---|---|---|
| committer | codeworkx <codeworkx@cyanogenmod.org> | 2016-01-05 23:41:58 +0100 |
| commit | c544747c2892b3984357a86b4116e1faa2be2210 (patch) | |
| tree | b5413db5a3dc897ad91bf7c9ae0bbbc4aa1945ef /src/com/android/camera/PhotoModule.java | |
| parent | 185bfd4a342125b91cffe533f12917dd214f7d1e (diff) | |
| download | android_packages_apps_Snap-c544747c2892b3984357a86b4116e1faa2be2210.tar.gz android_packages_apps_Snap-c544747c2892b3984357a86b4116e1faa2be2210.tar.bz2 android_packages_apps_Snap-c544747c2892b3984357a86b4116e1faa2be2210.zip | |
add support for non-standard iso keys and values
Change-Id: I3a948495cdf84dae3c1734d50ff91b4a5d3d9fc0
Diffstat (limited to 'src/com/android/camera/PhotoModule.java')
| -rw-r--r-- | src/com/android/camera/PhotoModule.java | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/com/android/camera/PhotoModule.java b/src/com/android/camera/PhotoModule.java index f67200f88..b0260fe2b 100644 --- a/src/com/android/camera/PhotoModule.java +++ b/src/com/android/camera/PhotoModule.java @@ -1664,7 +1664,7 @@ public class PhotoModule mUI.overrideSettings(CameraSettings.KEY_LONGSHOT, null); } - String isoMode = mParameters.getISOValue(); + String isoMode = CameraSettings.getISOValue(mParameters); final String isoManual = CameraSettings.KEY_MANUAL_ISO; if (isoMode.equals(isoManual)) { final String isoPref = mPreferences.getString( @@ -2907,8 +2907,8 @@ public class PhotoModule CameraSettings.KEY_ISO, mActivity.getString(R.string.pref_camera_iso_default)); if (CameraUtil.isSupported(iso, - mParameters.getSupportedIsoValues())) { - mParameters.setISOValue(iso); + CameraSettings.getSupportedIsoValues(mParameters))) { + CameraSettings.setISOValue(mParameters, iso); } } // Set color effect parameter. @@ -3994,7 +3994,7 @@ public class PhotoModule mParameters = mCameraDevice.getParameters(); final int minISO = mParameters.getInt(CameraSettings.KEY_MIN_ISO); final int maxISO = mParameters.getInt(CameraSettings.KEY_MAX_ISO); - String isoMode = mParameters.getISOValue(); + String isoMode = CameraSettings.getISOValue(mParameters); final String isoManual = CameraSettings.KEY_MANUAL_ISO; String currentISO = mParameters.get(CameraSettings.KEY_CURRENT_ISO); if (currentISO != null) { @@ -4036,7 +4036,7 @@ public class PhotoModule if (newISO <= maxISO && newISO >= minISO) { Log.v(TAG, "Setting ISO : " + newISO); mManual3AEnabled |= MANUAL_EXPOSURE; - mParameters.setISOValue(isoManual); + CameraSettings.setISOValue(mParameters, isoManual); mParameters.set(CameraSettings.KEY_CONTINUOUS_ISO, newISO); mParameters.set(CameraSettings.KEY_EXPOSURE_TIME, "0"); updateCommonManual3ASettings(); @@ -4067,7 +4067,7 @@ public class PhotoModule Log.v(TAG, "Setting Exposure time : " + newExpTime); mManual3AEnabled |= MANUAL_EXPOSURE; mParameters.set(CameraSettings.KEY_EXPOSURE_TIME, expTime); - mParameters.setISOValue(Parameters.ISO_AUTO); + CameraSettings.setISOValue(mParameters, Parameters.ISO_AUTO); mUI.setPreference(CameraSettings.KEY_ISO, Parameters.ISO_AUTO); mUI.overrideSettings(CameraSettings.KEY_ISO, null); updateCommonManual3ASettings(); @@ -4113,7 +4113,7 @@ public class PhotoModule newExpTime >= Double.parseDouble(minExpTime)) { mManual3AEnabled |= MANUAL_EXPOSURE; Log.v(TAG, "Setting ISO : " + newISO); - mParameters.setISOValue(isoManual); + CameraSettings.setISOValue(mParameters, isoManual); mParameters.set(CameraSettings.KEY_CONTINUOUS_ISO, newISO); Log.v(TAG, "Setting Exposure time : " + newExpTime); mParameters.set(CameraSettings.KEY_EXPOSURE_TIME, expTime); |