summaryrefslogtreecommitdiffstats
path: root/src/com/android/settings/cyanogenmod
diff options
context:
space:
mode:
authorPawit Pornkitprasan <p.pawit@gmail.com>2013-03-27 09:43:14 +0700
committerPawit Pornkitprasan <p.pawit@gmail.com>2013-03-27 09:43:14 +0700
commit0063e159094238371895992dd695b853ac0aa623 (patch)
tree509d85438e92a8efc1a16efcf2bfde6324bf5dab /src/com/android/settings/cyanogenmod
parente5bba18990fb2cbb4e777e6bd81a97254d909462 (diff)
downloadpackages_apps_settings-0063e159094238371895992dd695b853ac0aa623.zip
packages_apps_settings-0063e159094238371895992dd695b853ac0aa623.tar.gz
packages_apps_settings-0063e159094238371895992dd695b853ac0aa623.tar.bz2
Settings: disable expanded desktop on power menu disable
If expanded desktop is enabled while the option for expanded desktop setting is disabled, expanded desktop will remain active and the user will not be able to disable expanded desktop without reenabling the setting. Change-Id: Ia91e34e5ce9f8680f64b81e5f79c2df6f0639bb2
Diffstat (limited to 'src/com/android/settings/cyanogenmod')
-rw-r--r--src/com/android/settings/cyanogenmod/PowerMenu.java3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/com/android/settings/cyanogenmod/PowerMenu.java b/src/com/android/settings/cyanogenmod/PowerMenu.java
index 3d74d87..7465fe2 100644
--- a/src/com/android/settings/cyanogenmod/PowerMenu.java
+++ b/src/com/android/settings/cyanogenmod/PowerMenu.java
@@ -159,6 +159,9 @@ public class PowerMenu extends SettingsPreferenceFragment implements
Settings.System.putInt(getContentResolver(),
Settings.System.POWER_MENU_EXPANDED_DESKTOP_ENABLED, 0);
mExpandedDesktopPref.setSummary(res.getString(R.string.expanded_desktop_disabled));
+ // Disable expanded desktop if enabled
+ Settings.System.putInt(getContentResolver(),
+ Settings.System.EXPANDED_DESKTOP_STATE, 0);
} else if (value == 1) {
Settings.System.putInt(getContentResolver(),
Settings.System.POWER_MENU_EXPANDED_DESKTOP_ENABLED, 1);