Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 760a55c7 authored by Danesh M's avatar Danesh M Committed by Danesh M
Browse files

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
(cherry picked from commit 971ea687)
parent 7f3d1546

packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java

+1 −1
Original line number Diff line number Diff line
@@ -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

packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java

+4 −4
Original line number Diff line number Diff line
@@ -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();

services/core/java/com/android/server/am/LockTaskNotify.java

+2 −2
Original line number Diff line number Diff line
@@ -51,8 +51,8 @@ public class LockTaskNotify { 
    private boolean hasNavigationBar() {

        return mContext.getResources().getBoolean(

                com.android.internal.R.bool.config_showNavigationBar)

                || CMSettings.Secure.getIntForUser(mContext.getContentResolver(),

                        CMSettings.Secure.DEV_FORCE_SHOW_NAVBAR, 0, UserHandle.USER_CURRENT) == 1;

                || CMSettings.Global.getIntForUser(mContext.getContentResolver(),

                        CMSettings.Global.DEV_FORCE_SHOW_NAVBAR, 0, UserHandle.USER_CURRENT) == 1;

    }



    public void showToast(int lockTaskModeState) {

services/core/java/com/android/server/policy/PhoneWindowManager.java

+4 −4
Original line number Diff line number Diff line
@@ -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)) {

services/core/java/com/android/server/power/PowerManagerService.java

+4 −4
Original line number Diff line number Diff line
@@ -718,8 +718,8 @@ public final class PowerManagerService extends SystemService 
            resolver.registerContentObserver(CMSettings.Global.getUriFor(

                    CMSettings.Global.WAKE_WHEN_PLUGGED_OR_UNPLUGGED),

                    false, mSettingsObserver, UserHandle.USER_ALL);

            resolver.registerContentObserver(CMSettings.Secure.getUriFor(

                    CMSettings.Secure.DEV_FORCE_SHOW_NAVBAR),

            resolver.registerContentObserver(CMSettings.Global.getUriFor(

                    CMSettings.Global.DEV_FORCE_SHOW_NAVBAR),

                    false, mSettingsObserver, UserHandle.USER_ALL);



            // Go.
@@ -865,8 +865,8 @@ public final class PowerManagerService extends SystemService 
        mKeyboardBrightness = CMSettings.Secure.getIntForUser(resolver,

                CMSettings.Secure.KEYBOARD_BRIGHTNESS, mKeyboardBrightnessSettingDefault,

                UserHandle.USER_CURRENT);

        mForceNavbar = CMSettings.Secure.getIntForUser(resolver,

                CMSettings.Secure.DEV_FORCE_SHOW_NAVBAR, 0, UserHandle.USER_CURRENT) == 1;

        mForceNavbar = CMSettings.Global.getIntForUser(resolver,

                CMSettings.Global.DEV_FORCE_SHOW_NAVBAR, 0, UserHandle.USER_CURRENT) == 1;

        mDirty |= DIRTY_SETTINGS;

    }