diff options
| author | d34d <clark@cyngn.com> | 2015-11-10 10:47:58 -0800 |
|---|---|---|
| committer | Clark Scheff <clark@cyngn.com> | 2015-11-12 10:06:12 -0800 |
| commit | aa782a28f1a75c3d9bdfdc23b5aa29f039fe085b (patch) | |
| tree | 10b375898a3ea87b09fb3af86c8394d5bc9a4170 /packages | |
| parent | a3f946d143b969cf7d385a6c2a1704d4d77dc04c (diff) | |
| download | frameworks_base-aa782a28f1a75c3d9bdfdc23b5aa29f039fe085b.zip frameworks_base-aa782a28f1a75c3d9bdfdc23b5aa29f039fe085b.tar.gz frameworks_base-aa782a28f1a75c3d9bdfdc23b5aa29f039fe085b.tar.bz2 | |
fw: Move Secure settings to CMSettings
This moves all Settings.Secure.* settings that, were added to
CyanogenMod, to CMSettings.
* KEYBOARD_BRIGHTNESS
* BUTTON_BRIGHTNESS
* BUTTON_BACKLIGHT_TIMEOUT
* DEV_FORCE_SHOW_NAVBAR
* ADB_NOTIFY
* ADB_PORT
* DEVICE_HOSTNAME
* KILL_APP_LONGPRESS_BACK
* PROTECTED_COMPONENTS
* LIVE_DISPLAY_COLOR_MATRIX
* ADVANCED_REBOOT
* POWER_MENU_ACTIONS
* DEFAULT_THEME_COMPONENTS
* THEME_PREV_BOOT_API_LEVEL
Change-Id: I49e9160177ffc727b20008817ac2b5ce5e89ead5
Diffstat (limited to 'packages')
3 files changed, 4 insertions, 10 deletions
diff --git a/packages/SettingsProvider/res/values/defaults.xml b/packages/SettingsProvider/res/values/defaults.xml index ac544e2..ff695fd 100644 --- a/packages/SettingsProvider/res/values/defaults.xml +++ b/packages/SettingsProvider/res/values/defaults.xml @@ -235,9 +235,6 @@ <!-- Default for Settings.Secure.NFC_PAYMENT_COMPONENT --> <string name="def_nfc_payment_component"></string> - <!-- Defaults for Settings.System.DEV_FORCE_SHOW_NAVBAR. --> - <integer name="def_force_disable_navkeys">0</integer> - <!-- Default for Settings.System.STATUS_BAR_NOTIF_COUNT. --> <integer name="def_notif_count">0</integer> diff --git a/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java b/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java index 2377241..ec2dea6 100644 --- a/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java +++ b/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java @@ -2493,9 +2493,6 @@ class DatabaseHelper extends SQLiteOpenHelper { loadIntegerSetting(stmt, Settings.Secure.LONG_PRESS_TIMEOUT, R.integer.def_long_press_timeout_millis); - loadIntegerSetting(stmt, Settings.System.DEV_FORCE_SHOW_NAVBAR, - R.integer.def_force_disable_navkeys); - loadBooleanSetting(stmt, Settings.Secure.TOUCH_EXPLORATION_ENABLED, R.bool.def_touch_exploration_enabled); diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java index ab93dd9..111e3f9 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java @@ -494,14 +494,14 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode, protected void observe() { super.observe(); ContentResolver resolver = mContext.getContentResolver(); - resolver.registerContentObserver(Settings.Secure.getUriFor( - Settings.Secure.DEV_FORCE_SHOW_NAVBAR), false, this, UserHandle.USER_ALL); + resolver.registerContentObserver(CMSettings.Secure.getUriFor( + CMSettings.Secure.DEV_FORCE_SHOW_NAVBAR), false, this, UserHandle.USER_ALL); } @Override public void update() { - boolean visible = Settings.Secure.getIntForUser(mContext.getContentResolver(), - Settings.Secure.DEV_FORCE_SHOW_NAVBAR, 0, UserHandle.USER_CURRENT) == 1; + boolean visible = CMSettings.Secure.getIntForUser(mContext.getContentResolver(), + CMSettings.Secure.DEV_FORCE_SHOW_NAVBAR, 0, UserHandle.USER_CURRENT) == 1; if (visible) { forceAddNavigationBar(); |