summaryrefslogtreecommitdiffstats
path: root/src/com/android/settings/ButtonSettings.java
diff options
context:
space:
mode:
authord34d <clark@cyngn.com>2015-11-10 10:49:22 -0800
committerClark Scheff <clark@cyngn.com>2015-11-11 16:25:06 -0800
commitfbfb6d1527ea3b7688db6bc12896e671287ef998 (patch)
tree5858e9920fb6a7383a0d7b7c45e43d9164b3c442 /src/com/android/settings/ButtonSettings.java
parent19bb250cf1eea6e360285a159e8d88d576b2a9e9 (diff)
downloadpackages_apps_Settings-fbfb6d1527ea3b7688db6bc12896e671287ef998.zip
packages_apps_Settings-fbfb6d1527ea3b7688db6bc12896e671287ef998.tar.gz
packages_apps_Settings-fbfb6d1527ea3b7688db6bc12896e671287ef998.tar.bz2
Settings: Move Secure settings to CMSettings
Change-Id: If2e4f1e44b448c953f6fb1f3a0689b73cc3958c0
Diffstat (limited to 'src/com/android/settings/ButtonSettings.java')
-rw-r--r--src/com/android/settings/ButtonSettings.java20
1 files changed, 10 insertions, 10 deletions
diff --git a/src/com/android/settings/ButtonSettings.java b/src/com/android/settings/ButtonSettings.java
index d368cab..aa4e1e7 100644
--- a/src/com/android/settings/ButtonSettings.java
+++ b/src/com/android/settings/ButtonSettings.java
@@ -385,8 +385,8 @@ public class ButtonSettings extends SettingsPreferenceFragment implements
try {
// Only show the navigation bar category on devices that have a navigation bar
// unless we are forcing it via development settings
- boolean forceNavbar = android.provider.Settings.System.getInt(getContentResolver(),
- android.provider.Settings.System.DEV_FORCE_SHOW_NAVBAR, 0) == 1;
+ boolean forceNavbar = CMSettings.Secure.getInt(getContentResolver(),
+ CMSettings.Secure.DEV_FORCE_SHOW_NAVBAR, 0) == 1;
boolean hasNavBar = WindowManagerGlobal.getWindowManagerService().hasNavigationBar()
|| forceNavbar;
@@ -616,26 +616,26 @@ public class ButtonSettings extends SettingsPreferenceFragment implements
final int defaultBrightness = context.getResources().getInteger(
com.android.internal.R.integer.config_buttonBrightnessSettingDefault);
- Settings.Secure.putInt(context.getContentResolver(),
- Settings.Secure.DEV_FORCE_SHOW_NAVBAR, enabled ? 1 : 0);
+ CMSettings.Secure.putInt(context.getContentResolver(),
+ CMSettings.Secure.DEV_FORCE_SHOW_NAVBAR, enabled ? 1 : 0);
CMHardwareManager hardware = CMHardwareManager.getInstance(context);
hardware.set(CMHardwareManager.FEATURE_KEY_DISABLE, enabled);
/* Save/restore button timeouts to disable them in softkey mode */
if (enabled) {
- Settings.Secure.putInt(context.getContentResolver(),
- Settings.Secure.BUTTON_BRIGHTNESS, 0);
+ CMSettings.Secure.putInt(context.getContentResolver(),
+ CMSettings.Secure.BUTTON_BRIGHTNESS, 0);
} else {
int oldBright = prefs.getInt(ButtonBacklightBrightness.KEY_BUTTON_BACKLIGHT,
defaultBrightness);
- Settings.Secure.putInt(context.getContentResolver(),
- Settings.Secure.BUTTON_BRIGHTNESS, oldBright);
+ CMSettings.Secure.putInt(context.getContentResolver(),
+ CMSettings.Secure.BUTTON_BRIGHTNESS, oldBright);
}
}
private void updateDisableNavkeysOption() {
- boolean enabled = Settings.System.getInt(getActivity().getContentResolver(),
- Settings.System.DEV_FORCE_SHOW_NAVBAR, 0) != 0;
+ boolean enabled = CMSettings.Secure.getInt(getActivity().getContentResolver(),
+ CMSettings.Secure.DEV_FORCE_SHOW_NAVBAR, 0) != 0;
mDisableNavigationKeys.setChecked(enabled);
}