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 /services/core/java/com/android/server/policy/PhoneWindowManager.java | |
| 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 'services/core/java/com/android/server/policy/PhoneWindowManager.java')
| -rw-r--r-- | services/core/java/com/android/server/policy/PhoneWindowManager.java | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/services/core/java/com/android/server/policy/PhoneWindowManager.java b/services/core/java/com/android/server/policy/PhoneWindowManager.java index d3bc83a..bdddd7d 100644 --- a/services/core/java/com/android/server/policy/PhoneWindowManager.java +++ b/services/core/java/com/android/server/policy/PhoneWindowManager.java @@ -898,8 +898,8 @@ public class PhoneWindowManager implements WindowManagerPolicy { resolver.registerContentObserver(Settings.System.getUriFor( Settings.System.ACCELEROMETER_ROTATION_ANGLES), false, this, UserHandle.USER_ALL); - resolver.registerContentObserver(CMSettings.Secure.getUriFor( - CMSettings.Secure.DEV_FORCE_SHOW_NAVBAR), false, this, + resolver.registerContentObserver(CMSettings.Global.getUriFor( + CMSettings.Global.DEV_FORCE_SHOW_NAVBAR), false, this, UserHandle.USER_ALL); resolver.registerContentObserver(CMSettings.System.getUriFor( CMSettings.System.VOLBTN_MUSIC_CONTROLS), false, this, @@ -2138,8 +2138,8 @@ public class PhoneWindowManager implements WindowManagerPolicy { updateWakeGestureListenerLp(); } - boolean devForceNavbar = CMSettings.Secure.getIntForUser(resolver, - CMSettings.Secure.DEV_FORCE_SHOW_NAVBAR, 0, UserHandle.USER_CURRENT) == 1; + boolean devForceNavbar = CMSettings.Global.getIntForUser(resolver, + CMSettings.Global.DEV_FORCE_SHOW_NAVBAR, 0, UserHandle.USER_CURRENT) == 1; if (devForceNavbar != mDevForceNavbar) { mDevForceNavbar = devForceNavbar; if (mCMHardware.isSupported(CMHardwareManager.FEATURE_KEY_DISABLE)) { |