summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordianlujitao <dianlujitao@lineageos.org>2019-03-21 22:24:36 +0800
committerMichael Bestas <mkbestas@lineageos.org>2019-11-09 22:47:37 +0200
commitab90fb99ef3fb9e768d3e1118e49c803a5ccc46c (patch)
tree2551f1c07671b09812f348eef6afe31fc4196091
parent24a1159ecc9a7a7c539281947514749725b01dde (diff)
downloadandroid_packages_apps_Snap-ab90fb99ef3fb9e768d3e1118e49c803a5ccc46c.zip
android_packages_apps_Snap-ab90fb99ef3fb9e768d3e1118e49c803a5ccc46c.tar.gz
android_packages_apps_Snap-ab90fb99ef3fb9e768d3e1118e49c803a5ccc46c.tar.bz2
Snap: Fix picture size preference
* Picture sizes are dynamically generated and no longer come with initial entries, thus reloadInitialEntriesAndEntryValues() would just set it to empty. Change-Id: I4d601bdf0faf8065ada7ea252c9d6120a230a420
-rwxr-xr-xsrc/com/android/camera/SettingsManager.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/com/android/camera/SettingsManager.java b/src/com/android/camera/SettingsManager.java
index 6d7a44d..3d2c465 100755
--- a/src/com/android/camera/SettingsManager.java
+++ b/src/com/android/camera/SettingsManager.java
@@ -1247,7 +1247,9 @@ public class SettingsManager implements ListMenu.SettingsListener {
String scene = getValue(SettingsManager.KEY_SCENE_MODE);
ListPreference picturePref = mPreferenceGroup.findPreference(KEY_PICTURE_SIZE);
if (picturePref == null) return;
- picturePref.reloadInitialEntriesAndEntryValues();
+ CameraSettings.formatPictureSizes(picturePref,
+ getSupportedPictureSizeList(getCurrentCameraId()), mContext);
+ CameraSettings.resetIfInvalid(picturePref);
if (Integer.parseInt(scene) == SCENE_MODE_CHROMAFLASH_INT) {
if (filterUnsupportedOptions(picturePref, getSupportedChromaFlashPictureSize())) {
mFilteredKeys.add(picturePref.getKey());