diff options
| author | Ricardo Cerqueira <cyanogenmod@cerqueira.org> | 2013-12-22 22:27:33 +0000 |
|---|---|---|
| committer | Michael Bestas <mikeioannina@cyanogenmod.org> | 2016-01-16 02:39:17 +0200 |
| commit | a676e15c3728422f31970dce3f60e74bfc9c9e60 (patch) | |
| tree | f297d7c8148e51c7a6e97e2e74e506529648f758 /src/com/android/camera/CameraSettings.java | |
| parent | 44cfc318abd5ffaca40b88215e5f2834c4b1bf68 (diff) | |
| download | android_packages_apps_Snap-a676e15c3728422f31970dce3f60e74bfc9c9e60.tar.gz android_packages_apps_Snap-a676e15c3728422f31970dce3f60e74bfc9c9e60.tar.bz2 android_packages_apps_Snap-a676e15c3728422f31970dce3f60e74bfc9c9e60.zip | |
Revert "Camera: Propagate power mode selection from UI to lower layers."
This reverts commit 5302d2e099de0ae1c3cb4a9cda993fe28b0e8c46, runtime
power-mode changes are causing stability issues in camcorder
Change-Id: I118f7c47bea2d07296dc18ed8a3a790eef592ca2
Revert "SnapdragonCamera: Disable LPM if DIS/Flip are enabled."
This reverts commit 6cd860119a45b4a44d3e1314981862d9dac47955.
Revert "SnapdragonCamera: Set low power mode by default."
This reverts commit d4fccc04331a6a5a7038a542f7d17ecefa4ac95a.
Revert "SnapdragonCamera: Enable low power mode in Camera."
This reverts commit 195fccbe69e92b0312822aa762bb53d301c0f56f.
Change-Id: I623626e60efc850fe182e54d9e9997ca41275579
[mikeioannina]: Remove the now obsolete power mode setting and
unhide the video snapshot size setting
Change-Id: I118f7c47bea2d07296dc18ed8a3a790eef592ca2
Diffstat (limited to 'src/com/android/camera/CameraSettings.java')
| -rw-r--r-- | src/com/android/camera/CameraSettings.java | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/src/com/android/camera/CameraSettings.java b/src/com/android/camera/CameraSettings.java index 148e1fc1c..e322421b1 100644 --- a/src/com/android/camera/CameraSettings.java +++ b/src/com/android/camera/CameraSettings.java @@ -80,7 +80,6 @@ public class CameraSettings { public static final String KEY_MAX_BRIGHTNESS = "pref_max_brightness"; public static final String KEY_VIDEO_ENCODER = "pref_camera_videoencoder_key"; public static final String KEY_AUDIO_ENCODER = "pref_camera_audioencoder_key"; - public static final String KEY_POWER_MODE = "pref_camera_powermode_key"; public static final String KEY_PICTURE_FORMAT = "pref_camera_pictureformat_key"; public static final String KEY_ZSL = "pref_camera_zsl_key"; public static final String KEY_CAMERA_SAVEPATH = "pref_camera_savepath_key"; @@ -647,7 +646,6 @@ public class CameraSettings { private void qcomInitPreferences(PreferenceGroup group){ //Qcom Preference add here - ListPreference powerMode = group.findPreference(KEY_POWER_MODE); ListPreference zsl = group.findPreference(KEY_ZSL); ListPreference colorEffect = group.findPreference(KEY_COLOR_EFFECT); ListPreference camcorderColorEffect = group.findPreference(KEY_VIDEOCAMERA_COLOR_EFFECT); @@ -721,10 +719,6 @@ public class CameraSettings { ListPreference videoRotation = group.findPreference(KEY_VIDEO_ROTATION); - if (!mParameters.isPowerModeSupported() && powerMode != null) { - removePreference(group, powerMode.getKey()); - } - if (selectableZoneAf != null) { filterUnsupportedOptions(group, selectableZoneAf, mParameters.getSupportedSelectableZoneAf()); @@ -800,12 +794,9 @@ public class CameraSettings { autoExposure, mParameters.getSupportedAutoexposure()); } - if (!mParameters.isPowerModeSupported()){ - filterUnsupportedOptions(group, - videoSnapSize, null); - } else { + if (videoSnapSize != null) { filterUnsupportedOptions(group, videoSnapSize, sizeListToStringList( - mParameters.getSupportedPictureSizes())); + mParameters.getSupportedPictureSizes())); } if (histogram!= null) { |