diff options
Diffstat (limited to 'DeviceSettings')
5 files changed, 29 insertions, 16 deletions
diff --git a/DeviceSettings/res/values-de/arrays.xml b/DeviceSettings/res/values-de/arrays.xml index ee5c510..0052261 100644 --- a/DeviceSettings/res/values-de/arrays.xml +++ b/DeviceSettings/res/values-de/arrays.xml @@ -15,19 +15,19 @@ </string-array> <string-array name="mdnie_scenario_entries"> - <item>Kamera (Standard)</item> + <item>UI (Standard)</item> <item>Video</item> <item>Video warm</item> <item>Video kalt</item> - <item>UI</item> + <item>Kamera</item> <item>Navigation</item> <item>Gallerie</item> <item>VT</item> </string-array> <string-array name="mdnie_mode_entries"> - <item>Standard (Standard)</item> - <item>Dynamisch</item> + <item>Dynamisch (Standard)</item> + <item>Standard</item> <item>Natürlich</item> <item>Film</item> </string-array> diff --git a/DeviceSettings/res/values/arrays.xml b/DeviceSettings/res/values/arrays.xml index dc527cf..5272f09 100644 --- a/DeviceSettings/res/values/arrays.xml +++ b/DeviceSettings/res/values/arrays.xml @@ -29,37 +29,37 @@ </string-array> <string-array name="mdnie_scenario_entries"> - <item>Camera (Default)</item> + <item>UI (Default)</item> <item>Video</item> <item>Video Warm</item> <item>Video Cold</item> - <item>UI</item> + <item>Camera</item> <item>Navigation</item> <item>Gallery</item> <item>VT</item> </string-array> <string-array name="mdnie_scenario_entries_values" translatable="false"> - <item>4</item> + <item>0</item> <item>1</item> <item>2</item> <item>3</item> - <item>0</item> + <item>4</item> <item>5</item> <item>6</item> <item>7</item> </string-array> <string-array name="mdnie_mode_entries"> - <item>Standard (Default)</item> - <item>Dynamic</item> + <item>Dynamic (Default)</item> + <item>Standard</item> <item>Natural</item> <item>Movie</item> </string-array> <string-array name="mdnie_mode_entries_values" translatable="false"> - <item>1</item> <item>0</item> + <item>1</item> <item>2</item> <item>3</item> </string-array> diff --git a/DeviceSettings/src/com/cyanogenmod/settings/device/ScreenFragmentActivity.java b/DeviceSettings/src/com/cyanogenmod/settings/device/ScreenFragmentActivity.java index 37f25b8..2c171a5 100644 --- a/DeviceSettings/src/com/cyanogenmod/settings/device/ScreenFragmentActivity.java +++ b/DeviceSettings/src/com/cyanogenmod/settings/device/ScreenFragmentActivity.java @@ -59,7 +59,13 @@ public class ScreenFragmentActivity extends PreferenceFragment { mmDNIeNegative.setEnabled(mDNIeNegative.isSupported()); mLedFade = (LedFade) findPreference(DeviceSettings.KEY_LED_FADE); - mLedFade.setEnabled(LedFade.isSupported()); + mLedFade.setEnabled(LedFade.isSupported()); + + if (((CheckBoxPreference)prefSet.findPreference(DeviceSettings.KEY_TOUCHKEY_LIGHT)).isChecked()) { + prefSet.findPreference(DeviceSettings.KEY_TOUCHKEY_TIMEOUT).setEnabled(true); + } else { + prefSet.findPreference(DeviceSettings.KEY_TOUCHKEY_TIMEOUT).setEnabled(false); + } } @Override @@ -70,8 +76,15 @@ public class ScreenFragmentActivity extends PreferenceFragment { Log.w(TAG, "key: " + key); if (key.compareTo(DeviceSettings.KEY_TOUCHKEY_LIGHT) == 0) { - Utils.writeValue(FILE_TOUCHKEY_DISABLE, ((CheckBoxPreference)preference).isChecked() ? "0" : "1"); - Utils.writeValue(FILE_TOUCHKEY_BRIGHTNESS, ((CheckBoxPreference)preference).isChecked() ? "1" : "2"); + if (((CheckBoxPreference)preference).isChecked()) { + Utils.writeValue(FILE_TOUCHKEY_DISABLE, "0"); + Utils.writeValue(FILE_TOUCHKEY_BRIGHTNESS, "1"); + preferenceScreen.findPreference(DeviceSettings.KEY_TOUCHKEY_TIMEOUT).setEnabled(true); + } else { + Utils.writeValue(FILE_TOUCHKEY_DISABLE, "1"); + Utils.writeValue(FILE_TOUCHKEY_BRIGHTNESS, "2"); + preferenceScreen.findPreference(DeviceSettings.KEY_TOUCHKEY_TIMEOUT).setEnabled(false); + } } return true; } diff --git a/DeviceSettings/src/com/cyanogenmod/settings/device/mDNIeMode.java b/DeviceSettings/src/com/cyanogenmod/settings/device/mDNIeMode.java index c7fc94b..7969637 100644 --- a/DeviceSettings/src/com/cyanogenmod/settings/device/mDNIeMode.java +++ b/DeviceSettings/src/com/cyanogenmod/settings/device/mDNIeMode.java @@ -48,7 +48,7 @@ public class mDNIeMode extends ListPreference implements OnPreferenceChangeListe } SharedPreferences sharedPrefs = PreferenceManager.getDefaultSharedPreferences(context); - Utils.writeValue(FILE, sharedPrefs.getString(DeviceSettings.KEY_MDNIE_MODE, "1")); + Utils.writeValue(FILE, sharedPrefs.getString(DeviceSettings.KEY_MDNIE_MODE, "0")); } public boolean onPreferenceChange(Preference preference, Object newValue) { diff --git a/DeviceSettings/src/com/cyanogenmod/settings/device/mDNIeScenario.java b/DeviceSettings/src/com/cyanogenmod/settings/device/mDNIeScenario.java index 0557ba3..a9c935a 100644 --- a/DeviceSettings/src/com/cyanogenmod/settings/device/mDNIeScenario.java +++ b/DeviceSettings/src/com/cyanogenmod/settings/device/mDNIeScenario.java @@ -48,7 +48,7 @@ public class mDNIeScenario extends ListPreference implements OnPreferenceChangeL } SharedPreferences sharedPrefs = PreferenceManager.getDefaultSharedPreferences(context); - Utils.writeValue(FILE, sharedPrefs.getString(DeviceSettings.KEY_MDNIE_SCENARIO, "4")); + Utils.writeValue(FILE, sharedPrefs.getString(DeviceSettings.KEY_MDNIE_SCENARIO, "0")); } public boolean onPreferenceChange(Preference preference, Object newValue) { |