From 50dca41acfe880bf5d96cfd8cd21475a86d5dd5a Mon Sep 17 00:00:00 2001 From: Byunghun Jeon Date: Tue, 24 May 2016 14:34:56 -0700 Subject: SnapdragonCamera: Fix initial camera id Fix initial camera id to proper value. Previously it was always using 0 as initial id Change-Id: Ifc8d63ba2bccb4afcc25445d6713e28732e7deb4 CRs-Fixed: 1018118 --- src/com/android/camera/CameraSettings.java | 5 ----- src/com/android/camera/ComboPreferences.java | 1 - src/com/android/camera/SettingsManager.java | 13 +++++++++++-- 3 files changed, 11 insertions(+), 8 deletions(-) diff --git a/src/com/android/camera/CameraSettings.java b/src/com/android/camera/CameraSettings.java index dfadeed71..e7e3c0e3a 100644 --- a/src/com/android/camera/CameraSettings.java +++ b/src/com/android/camera/CameraSettings.java @@ -1262,11 +1262,6 @@ public class CameraSettings { return Integer.parseInt(pref.getString(KEY_CAMERA_ID, rearCameraId)); } - public static int getInitialCameraId(SharedPreferences pref) { - String value = pref.getString(SettingsManager.KEY_INITIAL_CAMERA, "0"); - return Integer.parseInt(value); - } - public static void writePreferredCameraId(SharedPreferences pref, int cameraId) { Editor editor = pref.edit(); diff --git a/src/com/android/camera/ComboPreferences.java b/src/com/android/camera/ComboPreferences.java index c37e9f5aa..a094a809e 100644 --- a/src/com/android/camera/ComboPreferences.java +++ b/src/com/android/camera/ComboPreferences.java @@ -157,7 +157,6 @@ public class ComboPreferences implements || key.equals(CameraSettings.KEY_POWER_SHUTTER) || key.equals(CameraSettings.KEY_MAX_BRIGHTNESS || key.equals(SettingsManager.KEY_CAMERA2) - || key.equals(SettingsManager.KEY_INITIAL_CAMERA) || key.equals(SettingsManager.KEY_CAMERA_ID) || key.equals(SettingsManager.KEY_MONO_ONLY) || key.equals(SettingsManager.KEY_MONO_PREVIEW) 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 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); -- cgit v1.2.3