diff options
| author | Camera Software Integration <camswint@localhost> | 2016-06-20 01:38:59 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2016-06-20 01:38:59 -0700 |
| commit | b32bae395de153fe2ee9ca865dad4f0873067a4f (patch) | |
| tree | e6b7d38f54ebb2c3c2f43e357c6793d4da083057 | |
| parent | 8b94869670e9907ff23776b790b7925b31725d4a (diff) | |
| parent | 96e5d34d383a6e22470e9dcead71e009d42bc6bd (diff) | |
| download | android_packages_apps_Snap-b32bae395de153fe2ee9ca865dad4f0873067a4f.tar.gz android_packages_apps_Snap-b32bae395de153fe2ee9ca865dad4f0873067a4f.tar.bz2 android_packages_apps_Snap-b32bae395de153fe2ee9ca865dad4f0873067a4f.zip | |
Merge "SnapdragonCamera: Fix initial camera id" into camera.lnx.1.0-dev.1.0
| -rw-r--r-- | src/com/android/camera/CameraSettings.java | 5 | ||||
| -rw-r--r-- | src/com/android/camera/ComboPreferences.java | 1 | ||||
| -rw-r--r-- | 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 7a1cf8d74..d073c48b2 100644 --- a/src/com/android/camera/CameraSettings.java +++ b/src/com/android/camera/CameraSettings.java @@ -1175,11 +1175,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 7d4d92087..24a5612c7 100644 --- a/src/com/android/camera/ComboPreferences.java +++ b/src/com/android/camera/ComboPreferences.java @@ -154,7 +154,6 @@ public class ComboPreferences implements || key.equals(CameraSettings.KEY_PHOTOSPHERE_PICTURESIZE) || key.equals(CameraSettings.KEY_CAMERA_SAVEPATH) || 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 a66a3d992..e06e5d3e9 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 SettingsManager sInstance; @@ -173,7 +173,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); } @@ -475,6 +475,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); |