diff options
| -rwxr-xr-x | src/com/android/camera/SettingsActivity.java | 30 |
1 files changed, 30 insertions, 0 deletions
diff --git a/src/com/android/camera/SettingsActivity.java b/src/com/android/camera/SettingsActivity.java index 3fef92493..ffdb1a5db 100755 --- a/src/com/android/camera/SettingsActivity.java +++ b/src/com/android/camera/SettingsActivity.java @@ -156,6 +156,12 @@ public class SettingsActivity extends PreferenceActivity { pref, "Off", "0"); } + if ((pref.getKey().equals(SettingsManager.KEY_ZSL) || + pref.getKey().equals(SettingsManager.KEY_PICTURE_FORMAT)) || + pref.getKey().equals(SettingsManager.KEY_SELFIEMIRROR)) { + updateFormatPreference(); + } + if ( (pref.getKey().equals(SettingsManager.KEY_MANUAL_WB)) ) { updateManualWBSettings(); } @@ -169,6 +175,7 @@ public class SettingsActivity extends PreferenceActivity { } }; + /** * This method is to enable or disable the option which is conflict with changed setting * @param conflictKey key you want to change after setting is changed @@ -188,6 +195,29 @@ public class SettingsActivity extends PreferenceActivity { } } + private void updateFormatPreference() { + ListPreference formatPref = (ListPreference)findPreference(SettingsManager.KEY_PICTURE_FORMAT); + ListPreference ZSLPref = (ListPreference) findPreference(SettingsManager.KEY_ZSL); + ListPreference mfnrPref = (ListPreference) findPreference(SettingsManager.KEY_CAPTURE_MFNR_VALUE); + SwitchPreference selfiePref = (SwitchPreference) findPreference(SettingsManager.KEY_SELFIEMIRROR); + if (formatPref == null) { + return; + } + if((ZSLPref != null && "app-zsl".equals(ZSLPref.getValue())) || + (selfiePref != null && selfiePref.isChecked())){ + formatPref.setValue("0"); + formatPref.setEnabled(false); + if (mfnrPref != null) { + mfnrPref.setEnabled(false); + } + } else { + formatPref.setEnabled(true); + if (mfnrPref != null) { + mfnrPref.setEnabled(true); + } + } + } + private void UpdateManualExposureSettings() { //dismiss all popups first, because we need to show edit dialog int cameraId = mSettingsManager.getCurrentCameraId(); |