diff options
Diffstat (limited to 'src/com/android/camera/SettingsActivity.java')
| -rwxr-xr-x | src/com/android/camera/SettingsActivity.java | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/com/android/camera/SettingsActivity.java b/src/com/android/camera/SettingsActivity.java index 3fef92493..45878e243 100755 --- a/src/com/android/camera/SettingsActivity.java +++ b/src/com/android/camera/SettingsActivity.java @@ -160,11 +160,12 @@ public class SettingsActivity extends PreferenceActivity { updateManualWBSettings(); } - if (pref.getKey().equals(SettingsManager.KEY_VIDEO_QUALITY) || - pref.getKey().equals(SettingsManager.KEY_DIS) || + if (pref.getKey().equals(SettingsManager.KEY_DIS) || pref.getKey().equals(SettingsManager.KEY_EIS_VALUE)) { - updatePreference(SettingsManager.KEY_VIDEO_ENCODER); + mSettingsManager.filterEISVideQualityOptions(); + updatePreference(SettingsManager.KEY_VIDEO_QUALITY); } + } } }; @@ -804,14 +805,14 @@ public class SettingsActivity extends PreferenceActivity { pref.setEntries(mSettingsManager.getEntries(key)); pref.setEntryValues(mSettingsManager.getEntryValues(key)); String values = mSettingsManager.getValue(key); + Set<String> valueSet = new HashSet<String>(); if (values != null) { - Set<String> valueSet = new HashSet<String>(); String[] splitValues = values.split(";"); for (String str : splitValues) { valueSet.add(str); } - pref.setValues(valueSet); } + pref.setValues(valueSet); } } } |