diff options
author | Byunghun Jeon <bjeon@codeaurora.org> | 2016-09-06 10:00:35 -0700 |
---|---|---|
committer | Jay Wang <jaywang@codeaurora.org> | 2016-09-27 10:44:23 -0700 |
commit | 8eefd5866870e7293665df25625ab69fb8e2de0f (patch) | |
tree | 528c75c6f2f331806c2bda2839ebe35a4af3537b /src | |
parent | acc281b545f5651aa094ceeeb219bc181a168a21 (diff) | |
download | android_packages_apps_Snap-8eefd5866870e7293665df25625ab69fb8e2de0f.tar.gz android_packages_apps_Snap-8eefd5866870e7293665df25625ab69fb8e2de0f.tar.bz2 android_packages_apps_Snap-8eefd5866870e7293665df25625ab69fb8e2de0f.zip |
SnapdragonCamera: Use persist to set Camera1/Camera2 mode
Use persist flag to choose camera1 or camera2.
Flag is persist.camera.camera2
Default will be camera1
Change-Id: Ic616b3d4b9f1293e45c7a006587f5c9ba34a0687
CRs-Fixed: 1066444
Diffstat (limited to 'src')
-rw-r--r--[-rwxr-xr-x] | src/com/android/camera/CameraActivity.java | 5 | ||||
-rw-r--r-- | src/com/android/camera/CaptureModule.java | 3 | ||||
-rw-r--r-- | src/com/android/camera/CaptureUI.java | 1 | ||||
-rw-r--r-- | src/com/android/camera/ComboPreferences.java | 1 | ||||
-rw-r--r--[-rwxr-xr-x] | src/com/android/camera/PhotoMenu.java | 8 | ||||
-rw-r--r--[-rwxr-xr-x] | src/com/android/camera/PhotoModule.java | 0 | ||||
-rw-r--r--[-rwxr-xr-x] | src/com/android/camera/SDCard.java | 0 | ||||
-rw-r--r-- | src/com/android/camera/SettingsManager.java | 5 | ||||
-rw-r--r-- | src/com/android/camera/util/PersistUtil.java | 5 |
9 files changed, 9 insertions, 19 deletions
diff --git a/src/com/android/camera/CameraActivity.java b/src/com/android/camera/CameraActivity.java index b88c4b1da..f5fe903da 100755..100644 --- a/src/com/android/camera/CameraActivity.java +++ b/src/com/android/camera/CameraActivity.java @@ -110,6 +110,7 @@ import com.android.camera.util.ApiHelper; import com.android.camera.util.CameraUtil; import com.android.camera.util.GcamHelper; import com.android.camera.util.IntentHelper; +import com.android.camera.util.PersistUtil; import com.android.camera.util.PhotoSphereHelper; import com.android.camera.util.PhotoSphereHelper.PanoramaViewHelper; import com.android.camera.util.UsageStatistics; @@ -1512,7 +1513,7 @@ public class CameraActivity extends Activity } } - boolean cam2on = SettingsManager.getInstance().isCamera2On(); + boolean cam2on = PersistUtil.getCamera2Mode(); if (cam2on && moduleIndex == ModuleSwitcher.PHOTO_MODULE_INDEX) moduleIndex = ModuleSwitcher.CAPTURE_MODULE_INDEX; @@ -2014,7 +2015,7 @@ public class CameraActivity extends Activity @Override public void onModuleSelected(int moduleIndex) { - boolean cam2on = SettingsManager.getInstance().isCamera2On(); + boolean cam2on = PersistUtil.getCamera2Mode(); mForceReleaseCamera = moduleIndex == ModuleSwitcher.CAPTURE_MODULE_INDEX || (cam2on && moduleIndex == ModuleSwitcher.PHOTO_MODULE_INDEX); if (mForceReleaseCamera) { diff --git a/src/com/android/camera/CaptureModule.java b/src/com/android/camera/CaptureModule.java index 79226758c..bc69b584e 100644 --- a/src/com/android/camera/CaptureModule.java +++ b/src/com/android/camera/CaptureModule.java @@ -3289,9 +3289,6 @@ public class CaptureModule implements CameraModule, PhotoController, case SettingsManager.KEY_VIDEO_TIME_LAPSE_FRAME_INTERVAL: updateTimeLapseSetting(); continue; - case SettingsManager.KEY_CAMERA2: - switchCameraMode(value); - return; case SettingsManager.KEY_PICTURE_SIZE: updatePictureSize(); if (count == 0) restart(); diff --git a/src/com/android/camera/CaptureUI.java b/src/com/android/camera/CaptureUI.java index 0ccc0361e..b96902f81 100644 --- a/src/com/android/camera/CaptureUI.java +++ b/src/com/android/camera/CaptureUI.java @@ -112,7 +112,6 @@ public class CaptureUI implements FocusOverlayManager.FocusUI, SettingsManager.KEY_LONGSHOT, SettingsManager.KEY_EXPOSURE, SettingsManager.KEY_WHITE_BALANCE, - SettingsManager.KEY_CAMERA2, SettingsManager.KEY_FACE_DETECTION, SettingsManager.KEY_VIDEO_HIGH_FRAME_RATE, SettingsManager.KEY_VIDEO_FLASH_MODE, diff --git a/src/com/android/camera/ComboPreferences.java b/src/com/android/camera/ComboPreferences.java index 24a5612c7..1979d1b5a 100644 --- a/src/com/android/camera/ComboPreferences.java +++ b/src/com/android/camera/ComboPreferences.java @@ -153,7 +153,6 @@ public class ComboPreferences implements || key.equals(CameraSettings.KEY_TIMER_SOUND_EFFECTS) || key.equals(CameraSettings.KEY_PHOTOSPHERE_PICTURESIZE) || key.equals(CameraSettings.KEY_CAMERA_SAVEPATH) - || key.equals(SettingsManager.KEY_CAMERA2) || 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/PhotoMenu.java b/src/com/android/camera/PhotoMenu.java index dca66d1cb..2da33ebbd 100755..100644 --- a/src/com/android/camera/PhotoMenu.java +++ b/src/com/android/camera/PhotoMenu.java @@ -237,8 +237,7 @@ public class PhotoMenu extends MenuController CameraSettings.KEY_MANUAL_WB, CameraSettings.KEY_MANUAL_FOCUS, CameraSettings.KEY_SELFIE_MIRROR, - CameraSettings.KEY_SHUTTER_SOUND, - SettingsManager.KEY_CAMERA2 + CameraSettings.KEY_SHUTTER_SOUND }; initSwitchItem(CameraSettings.KEY_CAMERA_ID, mFrontBackSwitcher); @@ -1502,11 +1501,6 @@ public class PhotoMenu extends MenuController } super.onSettingChanged(pref); - if (same(pref, SettingsManager.KEY_CAMERA2, "enable")) { - mActivity.onModuleSelected(ModuleSwitcher.CAPTURE_MODULE_INDEX); - } else if (notSame(pref, SettingsManager.KEY_CAMERA2, "enable")) { - mActivity.onModuleSelected(ModuleSwitcher.PHOTO_MODULE_INDEX); - } } public int getOrientation() { diff --git a/src/com/android/camera/PhotoModule.java b/src/com/android/camera/PhotoModule.java index f83dda1d5..f83dda1d5 100755..100644 --- a/src/com/android/camera/PhotoModule.java +++ b/src/com/android/camera/PhotoModule.java diff --git a/src/com/android/camera/SDCard.java b/src/com/android/camera/SDCard.java index b88e32245..b88e32245 100755..100644 --- a/src/com/android/camera/SDCard.java +++ b/src/com/android/camera/SDCard.java diff --git a/src/com/android/camera/SettingsManager.java b/src/com/android/camera/SettingsManager.java index 0c5f2edb2..f2266d6bb 100644 --- a/src/com/android/camera/SettingsManager.java +++ b/src/com/android/camera/SettingsManager.java @@ -89,7 +89,6 @@ public class SettingsManager implements ListMenu.SettingsListener { public static final String KEY_WHITE_BALANCE = "pref_camera2_whitebalance_key"; public static final String KEY_MAKEUP = "pref_camera2_makeup_key"; public static final String KEY_TRACKINGFOCUS = "pref_camera2_trackingfocus_key"; - public static final String KEY_CAMERA2 = "pref_camera2_camera2_key"; public static final String KEY_MONO_ONLY = "pref_camera2_mono_only_key"; public static final String KEY_MONO_PREVIEW = "pref_camera2_mono_preview_key"; public static final String KEY_CLEARSIGHT = "pref_camera2_clearsight_key"; @@ -404,10 +403,6 @@ public class SettingsManager implements ListMenu.SettingsListener { } } - public boolean isCamera2On() { - return mPreferences.getString(KEY_CAMERA2, "disable").equals("enable"); - } - public String getValue(String key) { Values values = mValuesMap.get(key); if (values == null) return null; diff --git a/src/com/android/camera/util/PersistUtil.java b/src/com/android/camera/util/PersistUtil.java index a39abaa82..bd623cf57 100644 --- a/src/com/android/camera/util/PersistUtil.java +++ b/src/com/android/camera/util/PersistUtil.java @@ -36,6 +36,7 @@ public class PersistUtil { private static final String PERSIST_SKIP_MEMORY_CHECK = "persist.camera.perf.skip_memck"; private static final String PERSIST_LONGSHOT_SHOT_LIMIT = "persist.camera.longshot.shotnum"; private static final String PERSIST_CAMERA_PREVIEW_SIZE = "persist.camera.preview.size"; + private static final String PERSIST_CAMERA_CAMERA2 = "persist.camera.camera2"; public static int getMemoryLimit() { return SystemProperties.getInt(PERSIST_MEMORY_LIMIT, 60); @@ -52,4 +53,8 @@ public class PersistUtil { public static int getCameraPreviewSize() { return SystemProperties.getInt(PERSIST_CAMERA_PREVIEW_SIZE, 0); } + + public static boolean getCamera2Mode() { + return SystemProperties.getBoolean(PERSIST_CAMERA_CAMERA2, false); + } } |