1 files changed, 13 insertions, 7 deletions
diff --git a/src/com/android/camera/CameraSettings.java b/src/com/android/camera/CameraSettings.java
index a7fade722..3d2b3b6c6 100644
--- a/src/com/android/camera/CameraSettings.java
+++ b/src/com/android/camera/CameraSettings.java
@@ -243,11 +243,6 @@ public class CameraSettings {
 
     public static final String KEY_REQUEST_PERMISSION  = "request_permission";
 
-    public static final String KEY_CAMERA2 = "pref_camera_camera2_key";
-    public static final String KEY_DUAL_CAMERA = "pref_camera_dual_camera_key";
-    public static final String KEY_MONO_PREVIEW = "pref_camera_mono_preview_key";
-    public static final String KEY_CLEARSIGHT = "pref_camera_clearsight_key";
-
     public static final String KEY_SELFIE_FLASH = "pref_selfie_flash_key";
 
     public static final String EXPOSURE_DEFAULT_VALUE = "0";
@@ -1115,7 +1110,7 @@ public class CameraSettings {
         return false;
     }
 
-    private void filterUnsupportedOptions(PreferenceGroup group,
+    public static void filterUnsupportedOptions(PreferenceGroup group,
             ListPreference pref, List<String> supported) {
 
         // Remove the preference if the parameter is not supported or there is
@@ -1144,7 +1139,7 @@ public class CameraSettings {
         resetIfInvalid(pref);
     }
 
-    private void resetIfInvalid(ListPreference pref) {
+    private static void resetIfInvalid(ListPreference pref) {
         // Set the value to the first entry if it is invalid.
         String value = pref.getValue();
         if (pref.findIndexOfValue(value) == NOT_FOUND) {
@@ -1267,6 +1262,17 @@ public class CameraSettings {
         return Integer.parseInt(pref.getString(KEY_CAMERA_ID, rearCameraId));
     }
 
+    public static int getInitialCameraId(SharedPreferences pref) {
+        int id = Integer.parseInt(pref.getString(KEY_CAMERA_ID, "0"));
+        if (id == CaptureModule.BAYER_ID) {
+            int mode = Integer.parseInt(pref.getString(SettingsManager.KEY_DUAL_CAMERA, "1"));
+            if (mode == CaptureModule.MONO_MODE) return CaptureModule.MONO_ID;
+            else return CaptureModule.BAYER_ID;
+        } else {
+            return CaptureModule.FRONT_ID;
+        }
+    }
+
     public static void writePreferredCameraId(SharedPreferences pref,
             int cameraId) {
         Editor editor = pref.edit();