diff options
Diffstat (limited to 'src/com/android/camera/SettingsManager.java')
-rw-r--r-- | src/com/android/camera/SettingsManager.java | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/src/com/android/camera/SettingsManager.java b/src/com/android/camera/SettingsManager.java index 1433f1cd0..f3a228562 100644 --- a/src/com/android/camera/SettingsManager.java +++ b/src/com/android/camera/SettingsManager.java @@ -30,6 +30,7 @@ package com.android.camera; import android.content.Context; +import android.content.SharedPreferences; import android.graphics.ImageFormat; import android.graphics.Rect; import android.hardware.camera2.CameraAccessException; @@ -85,7 +86,6 @@ public class SettingsManager implements ListMenu.SettingsListener { public static final String KEY_EXPOSURE = "pref_camera2_exposure_key"; public static final String KEY_TIMER = "pref_camera2_timer_key"; public static final String KEY_LONGSHOT = "pref_camera2_longshot_key"; - public static final String KEY_INITIAL_CAMERA = "pref_camera2_initial_camera_key"; private static final String TAG = "SnapCam_SettingsManager"; private static final List<CameraCharacteristics> mCharacteristics = new ArrayList<>(); @@ -167,7 +167,7 @@ public class SettingsManager implements ListMenu.SettingsListener { public void init() { Log.d(TAG, "SettingsManager init"); - int cameraId = CameraSettings.getInitialCameraId(mPreferences); + int cameraId = getInitialCameraId(mPreferences); setLocalIdAndInitialize(cameraId); } @@ -469,6 +469,15 @@ public class SettingsManager implements ListMenu.SettingsListener { return null; } + public int getInitialCameraId(SharedPreferences pref) { + String value = pref.getString(SettingsManager.KEY_CAMERA_ID, "0"); + int frontBackId = Integer.parseInt(value); + if (frontBackId == CaptureModule.FRONT_ID) return frontBackId; + String monoOnly = pref.getString(SettingsManager.KEY_MONO_ONLY, "off"); + if (monoOnly.equals("off")) return frontBackId; + else return CaptureModule.MONO_ID; + } + private void filterPreferences(int cameraId) { // filter unsupported preferences ListPreference whiteBalance = mPreferenceGroup.findPreference(KEY_WHITE_BALANCE); |