diff options
| author | Danesh M <daneshm90@gmail.com> | 2015-11-17 15:02:55 -0800 |
|---|---|---|
| committer | Danesh M <daneshm90@gmail.com> | 2015-11-17 15:26:45 -0800 |
| commit | 82dfdc415041cdd832b968890edd0461a47ce9ac (patch) | |
| tree | 34071cca2154abff2b56ab0910dadc025e306e61 | |
| parent | 2209d0353965d30f88d9ee5adc5de58376c2595a (diff) | |
| download | packages_apps_Settings-82dfdc415041cdd832b968890edd0461a47ce9ac.tar.gz packages_apps_Settings-82dfdc415041cdd832b968890edd0461a47ce9ac.tar.bz2 packages_apps_Settings-82dfdc415041cdd832b968890edd0461a47ce9ac.zip | |
Settings : Update settings reference for powerButton/bugReport
Switch INCALL_POWER_BUTTON_BEHAVIOR and BUGREPORT_IN_POWER_MENU to
Settings reference
Change-Id: I0a14e8b1a667e3922540a77479bfc1932cad7130
| -rw-r--r-- | src/com/android/settings/ButtonSettings.java | 14 | ||||
| -rw-r--r-- | src/com/android/settings/cyanogenmod/PowerMenuActions.java | 4 |
2 files changed, 9 insertions, 9 deletions
diff --git a/src/com/android/settings/ButtonSettings.java b/src/com/android/settings/ButtonSettings.java index 0bd79c1d8..998ea39ab 100644 --- a/src/com/android/settings/ButtonSettings.java +++ b/src/com/android/settings/ButtonSettings.java @@ -446,10 +446,10 @@ public class ButtonSettings extends SettingsPreferenceFragment implements // Power button ends calls. if (mPowerEndCall != null) { final int incallPowerBehavior = CMSettings.Secure.getInt(getContentResolver(), - CMSettings.Secure.INCALL_POWER_BUTTON_BEHAVIOR, - CMSettings.Secure.INCALL_POWER_BUTTON_BEHAVIOR_DEFAULT); + Settings.Secure.INCALL_POWER_BUTTON_BEHAVIOR, + Settings.Secure.INCALL_POWER_BUTTON_BEHAVIOR_DEFAULT); final boolean powerButtonEndsCall = - (incallPowerBehavior == CMSettings.Secure.INCALL_POWER_BUTTON_BEHAVIOR_HANGUP); + (incallPowerBehavior == Settings.Secure.INCALL_POWER_BUTTON_BEHAVIOR_HANGUP); mPowerEndCall.setChecked(powerButtonEndsCall); } @@ -732,10 +732,10 @@ public class ButtonSettings extends SettingsPreferenceFragment implements } private void handleTogglePowerButtonEndsCallPreferenceClick() { - CMSettings.Secure.putInt(getContentResolver(), - CMSettings.Secure.INCALL_POWER_BUTTON_BEHAVIOR, (mPowerEndCall.isChecked() - ? CMSettings.Secure.INCALL_POWER_BUTTON_BEHAVIOR_HANGUP - : CMSettings.Secure.INCALL_POWER_BUTTON_BEHAVIOR_SCREEN_OFF)); + Settings.Secure.putInt(getContentResolver(), + Settings.Secure.INCALL_POWER_BUTTON_BEHAVIOR, (mPowerEndCall.isChecked() + ? Settings.Secure.INCALL_POWER_BUTTON_BEHAVIOR_HANGUP + : Settings.Secure.INCALL_POWER_BUTTON_BEHAVIOR_SCREEN_OFF)); } private void handleToggleHomeButtonAnswersCallPreferenceClick() { diff --git a/src/com/android/settings/cyanogenmod/PowerMenuActions.java b/src/com/android/settings/cyanogenmod/PowerMenuActions.java index 5a3eb7dfd..527929dc7 100644 --- a/src/com/android/settings/cyanogenmod/PowerMenuActions.java +++ b/src/com/android/settings/cyanogenmod/PowerMenuActions.java @@ -259,8 +259,8 @@ public class PowerMenuActions extends SettingsPreferenceFragment { } private void updatePreferences() { - boolean bugreport = CMSettings.Secure.getInt(getContentResolver(), - CMSettings.Secure.BUGREPORT_IN_POWER_MENU, 0) != 0; + boolean bugreport = Settings.Secure.getInt(getContentResolver(), + Settings.Secure.BUGREPORT_IN_POWER_MENU, 0) != 0; boolean profiles = CMSettings.System.getInt(getContentResolver(), CMSettings.System.SYSTEM_PROFILES_ENABLED, 1) != 0; |