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

Commit c6d1c60f authored by John Spurlock's avatar John Spurlock
Browse files

Global system setting to override certain window policy. 

Specifically, the ability to force immersive-mode-like behavior
on the status bar, the navigation bar (or both) on a
package-by-package basis - and to disable immersive mode
confirmations for specific packages.

Change-Id: I2df7092a91eceeb815367ef917dd7289f4f2b27e
parent 2a1fdefe

core/java/android/provider/Settings.java

+8 −0
Original line number Diff line number Diff line
@@ -6057,6 +6057,14 @@ public final class Settings { 
         */

        public static final String WIFI_BOUNCE_DELAY_OVERRIDE_MS = "wifi_bounce_delay_override_ms";



        /**

         * Defines global runtime overrides to window policy.

         *

         * See {@link com.android.internal.policy.impl.PolicyControl} for value format.

         *

         * @hide

         */

        public static final String POLICY_CONTROL = "policy_control";



        /**

         * Settings to backup. This is here so that it's in the same place as the settings

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

+1 −1
Original line number Diff line number Diff line
@@ -1914,7 +1914,7 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode { 
            }

            if (sbModeChanged || nbModeChanged) {

                // update transient bar autohide

                if (sbMode == MODE_SEMI_TRANSPARENT || nbMode == MODE_SEMI_TRANSPARENT) {

                if (mStatusBarMode == MODE_SEMI_TRANSPARENT || mNavigationBarMode == MODE_SEMI_TRANSPARENT) {

                    scheduleAutohide();

                } else {

                    cancelAutohide();

policy/src/com/android/internal/policy/impl/BarController.java

+1 −1
Original line number Diff line number Diff line
@@ -108,7 +108,7 @@ public class BarController { 
        if (mWin != null) {

            if (win != null && (win.getAttrs().privateFlags

                    & WindowManager.LayoutParams.PRIVATE_FLAG_INHERIT_TRANSLUCENT_DECOR) == 0) {

                if ((win.getAttrs().flags & mTranslucentWmFlag) != 0) {

                if ((PolicyControl.getWindowFlags(win, null) & mTranslucentWmFlag) != 0) {

                    vis |= mTranslucentFlag;

                } else {

                    vis &= ~mTranslucentFlag;

policy/src/com/android/internal/policy/impl/ImmersiveModeConfirmation.java

+1 −1
Original line number Diff line number Diff line
@@ -117,7 +117,7 @@ public class ImmersiveModeConfirmation { 
    }



    public void immersiveModeChanged(String pkg, boolean isImmersiveMode) {

        if (pkg == null) {

        if (pkg == null || PolicyControl.disableImmersiveConfirmation(pkg)) {

            return;

        }

        mHandler.removeMessages(H.SHOW);

policy/src/com/android/internal/policy/impl/PhoneWindowManager.java

+21 −13
Original line number Diff line number Diff line
@@ -526,6 +526,9 @@ public class PhoneWindowManager implements WindowManagerPolicy { 
            resolver.registerContentObserver(Settings.System.getUriFor(

                    Settings.Secure.IMMERSIVE_MODE_CONFIRMATIONS), false, this,

                    UserHandle.USER_ALL);

            resolver.registerContentObserver(Settings.Global.getUriFor(

                    Settings.Global.POLICY_CONTROL), false, this,

                    UserHandle.USER_ALL);

            updateSettings();

        }
@@ -1167,6 +1170,7 @@ public class PhoneWindowManager implements WindowManagerPolicy { 
            if (mImmersiveModeConfirmation != null) {

                mImmersiveModeConfirmation.loadSetting();

            }

            PolicyControl.reloadFromSetting(mContext);

        }

        if (updateRotation) {

            updateRotation(true);
@@ -2564,7 +2568,7 @@ public class PhoneWindowManager implements WindowManagerPolicy { 


    @Override

    public void getContentInsetHintLw(WindowManager.LayoutParams attrs, Rect contentInset) {

        final int fl = attrs.flags;

        final int fl = PolicyControl.getWindowFlags(null, attrs);

        final int systemUiVisibility = (attrs.systemUiVisibility|attrs.subtreeSystemUiVisibility);



        if ((fl & (FLAG_LAYOUT_IN_SCREEN | FLAG_LAYOUT_INSET_DECOR))
@@ -2737,7 +2741,8 @@ public class PhoneWindowManager implements WindowManagerPolicy { 
                        // We currently want to hide the navigation UI.

                        mNavigationBarController.setBarShowingLw(false);

                    }

                    if (navVisible && !navTranslucent && !mNavigationBar.isAnimatingLw()

                    if (navVisible && !navTranslucent && !navAllowedHidden

                            && !mNavigationBar.isAnimatingLw()

                            && !mNavigationBarController.wasRecentlyTranslucent()) {

                        // If the opaque nav bar is currently requested to be visible,

                        // and not in the process of animating on or off, then
@@ -2946,9 +2951,9 @@ public class PhoneWindowManager implements WindowManagerPolicy { 
            offsetInputMethodWindowLw(mLastInputMethodWindow);

        }



        final int fl = attrs.flags;

        final int fl = PolicyControl.getWindowFlags(win, attrs);

        final int sim = attrs.softInputMode;

        final int sysUiFl = win.getSystemUiVisibility();

        final int sysUiFl = PolicyControl.getSystemUiVisibility(win);



        final Rect pf = mTmpParentFrame;

        final Rect df = mTmpDisplayFrame;
@@ -3366,6 +3371,7 @@ public class PhoneWindowManager implements WindowManagerPolicy { 
                                WindowManager.LayoutParams attrs) {

        if (DEBUG_LAYOUT) Slog.i(TAG, "Win " + win + ": isVisibleOrBehindKeyguardLw="

                + win.isVisibleOrBehindKeyguardLw());

        final int fl = PolicyControl.getWindowFlags(win, attrs);

        if (mTopFullscreenOpaqueWindowState == null

                && win.isVisibleLw() && attrs.type == TYPE_INPUT_METHOD) {

            mForcingShowNavBar = true;
@@ -3373,7 +3379,7 @@ public class PhoneWindowManager implements WindowManagerPolicy { 
        }

        if (mTopFullscreenOpaqueWindowState == null &&

                win.isVisibleOrBehindKeyguardLw() && !win.isGoneForLayoutLw()) {

            if ((attrs.flags & FLAG_FORCE_NOT_FULLSCREEN) != 0) {

            if ((fl & FLAG_FORCE_NOT_FULLSCREEN) != 0) {

                if (attrs.type == TYPE_KEYGUARD) {

                    mForceStatusBarFromKeyguard = true;

                } else {
@@ -3400,12 +3406,12 @@ public class PhoneWindowManager implements WindowManagerPolicy { 
                    && attrs.height == WindowManager.LayoutParams.MATCH_PARENT) {

                if (DEBUG_LAYOUT) Slog.v(TAG, "Fullscreen window: " + win);

                mTopFullscreenOpaqueWindowState = win;

                if ((attrs.flags & FLAG_SHOW_WHEN_LOCKED) != 0) {

                if ((fl & FLAG_SHOW_WHEN_LOCKED) != 0) {

                    if (DEBUG_LAYOUT) Slog.v(TAG, "Setting mHideLockScreen to true by win " + win);

                    mHideLockScreen = true;

                    mForceStatusBarFromKeyguard = false;

                }

                if ((attrs.flags & FLAG_DISMISS_KEYGUARD) != 0

                if ((fl & FLAG_DISMISS_KEYGUARD) != 0

                        && mDismissKeyguard == DISMISS_KEYGUARD_NONE) {

                    if (DEBUG_LAYOUT) Slog.v(TAG, "Setting mDismissKeyguard true by win " + win);

                    mDismissKeyguard = mWinDismissingKeyguard == win ?
@@ -3413,7 +3419,7 @@ public class PhoneWindowManager implements WindowManagerPolicy { 
                    mWinDismissingKeyguard = win;

                    mForceStatusBarFromKeyguard = mShowingLockscreen && isKeyguardSecure();

                }

                if ((attrs.flags & FLAG_ALLOW_LOCK_WHILE_SCREEN_ON) != 0) {

                if ((fl & FLAG_ALLOW_LOCK_WHILE_SCREEN_ON) != 0) {

                    mAllowLockscreenWhenOn = true;

                }

            }
@@ -3455,13 +3461,14 @@ public class PhoneWindowManager implements WindowManagerPolicy { 
                            mLastSystemUiFlags, mLastSystemUiFlags);

                }

            } else if (mTopFullscreenOpaqueWindowState != null) {

                final int fl = PolicyControl.getWindowFlags(null, lp);

                if (localLOGV) {

                    Slog.d(TAG, "frame: " + mTopFullscreenOpaqueWindowState.getFrameLw()

                            + " shown frame: " + mTopFullscreenOpaqueWindowState.getShownFrameLw());

                    Slog.d(TAG, "attr: " + mTopFullscreenOpaqueWindowState.getAttrs()

                            + " lp.flags=0x" + Integer.toHexString(lp.flags));

                            + " lp.flags=0x" + Integer.toHexString(fl));

                }

                topIsFullscreen = (lp.flags & WindowManager.LayoutParams.FLAG_FULLSCREEN) != 0

                topIsFullscreen = (fl & WindowManager.LayoutParams.FLAG_FULLSCREEN) != 0

                        || (mLastSystemUiFlags & View.SYSTEM_UI_FLAG_FULLSCREEN) != 0;

                // The subtle difference between the window for mTopFullscreenOpaqueWindowState

                // and mTopIsFullscreen is that that mTopIsFullscreen is set only if the window
@@ -5061,11 +5068,11 @@ public class PhoneWindowManager implements WindowManagerPolicy { 
            return 0;

        }



        int tmpVisibility = win.getSystemUiVisibility()

        int tmpVisibility = PolicyControl.getSystemUiVisibility(win)

                & ~mResettingSystemUiFlags

                & ~mForceClearedSystemUiFlags;

        if (mForcingShowNavBar && win.getSurfaceLayer() < mForcingShowNavBarLayer) {

            tmpVisibility &= ~View.SYSTEM_UI_CLEARABLE_FLAGS;

            tmpVisibility &= ~PolicyControl.adjustClearableFlags(win, View.SYSTEM_UI_CLEARABLE_FLAGS);

        }

        final int visibility = updateSystemBarsLw(win, mLastSystemUiFlags, tmpVisibility);

        final int diff = visibility ^ mLastSystemUiFlags;
@@ -5124,7 +5131,7 @@ public class PhoneWindowManager implements WindowManagerPolicy { 
                (vis & View.SYSTEM_UI_FLAG_IMMERSIVE_STICKY) != 0;

        boolean hideStatusBarWM =

                mTopFullscreenOpaqueWindowState != null &&

                (mTopFullscreenOpaqueWindowState.getAttrs().flags

                (PolicyControl.getWindowFlags(mTopFullscreenOpaqueWindowState, null)

                        & WindowManager.LayoutParams.FLAG_FULLSCREEN) != 0;

        boolean hideStatusBarSysui =

                (vis & View.SYSTEM_UI_FLAG_FULLSCREEN) != 0;
@@ -5412,5 +5419,6 @@ public class PhoneWindowManager implements WindowManagerPolicy { 
        pw.print(prefix); pw.print("mUndockedHdmiRotation="); pw.println(mUndockedHdmiRotation);

        mStatusBarController.dump(pw, prefix);

        mNavigationBarController.dump(pw, prefix);

        PolicyControl.dump(prefix, pw);

    }

}