diff options
| author | Danesh M <danesh@cyngn.com> | 2016-05-13 13:09:15 -0700 |
|---|---|---|
| committer | Danesh M <daneshm90@gmail.com> | 2016-05-13 13:36:30 -0700 |
| commit | 971ea687427cc8ca09093fde962aadf90704f516 (patch) | |
| tree | 53c8efc3b5d01b2bfe85bbcbba64c7f6e4a23b35 /packages | |
| parent | c3de534b5f13e62791899163d79521f3fa446a71 (diff) | |
| download | frameworks_base-971ea687427cc8ca09093fde962aadf90704f516.zip frameworks_base-971ea687427cc8ca09093fde962aadf90704f516.tar.gz frameworks_base-971ea687427cc8ca09093fde962aadf90704f516.tar.bz2 | |
CMSettings : Move force_show_navbar to global
Keep feature inline with 12.1, only allow owner to
control the feature and mirror across users.
Also add additional checks for moved settings.
OPO-696
Change-Id: I81c942ab106fead12020107b99c0795a5b9aac98
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java | 2 | ||||
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java b/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java index 8515fdc..a3aeaa9 100644 --- a/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java +++ b/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java @@ -2087,7 +2087,7 @@ class DatabaseHelper extends SQLiteOpenHelper { } String[] systemToSecure = new String[] { - CMSettings.Secure.DEV_FORCE_SHOW_NAVBAR, + CMSettings.Global.DEV_FORCE_SHOW_NAVBAR, CMSettings.Secure.KEYBOARD_BRIGHTNESS, CMSettings.Secure.BUTTON_BRIGHTNESS, CMSettings.Secure.BUTTON_BACKLIGHT_TIMEOUT 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 3e78be6..8d8e054 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java @@ -507,14 +507,14 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode, protected void observe() { super.observe(); ContentResolver resolver = mContext.getContentResolver(); - resolver.registerContentObserver(CMSettings.Secure.getUriFor( - CMSettings.Secure.DEV_FORCE_SHOW_NAVBAR), false, this, UserHandle.USER_ALL); + resolver.registerContentObserver(CMSettings.Global.getUriFor( + CMSettings.Global.DEV_FORCE_SHOW_NAVBAR), false, this, UserHandle.USER_ALL); } @Override public void update() { - boolean visible = CMSettings.Secure.getIntForUser(mContext.getContentResolver(), - CMSettings.Secure.DEV_FORCE_SHOW_NAVBAR, 0, UserHandle.USER_CURRENT) == 1; + boolean visible = CMSettings.Global.getIntForUser(mContext.getContentResolver(), + CMSettings.Global.DEV_FORCE_SHOW_NAVBAR, 0, UserHandle.USER_CURRENT) == 1; if (visible) { forceAddNavigationBar(); |