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

Commit 2920a61a authored by Tiger Huang's avatar Tiger Huang Committed by Automerger Merge Worker
Browse files

Clear low profile mode while forcing client to show system bars am: 3b6bdffa 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12683363

Change-Id: Iefd90b4aebc1c683fb99a482f5c897d7ea6b7ac4
parents 0a8d8caf 3b6bdffa

core/java/android/view/ViewRootImpl.java

+25 −7
Original line number Diff line number Diff line
@@ -1981,11 +1981,7 @@ public final class ViewRootImpl implements ViewParent, 
            mCompatibleVisibilityInfo.globalVisibility =

                    (mCompatibleVisibilityInfo.globalVisibility & ~View.SYSTEM_UI_FLAG_LOW_PROFILE)

                            | (mAttachInfo.mSystemUiVisibility & View.SYSTEM_UI_FLAG_LOW_PROFILE);

            if (mDispatchedSystemUiVisibility != mCompatibleVisibilityInfo.globalVisibility) {

                mHandler.removeMessages(MSG_DISPATCH_SYSTEM_UI_VISIBILITY);

                mHandler.sendMessage(mHandler.obtainMessage(

                        MSG_DISPATCH_SYSTEM_UI_VISIBILITY, mCompatibleVisibilityInfo));

            }

            dispatchDispatchSystemUiVisibilityChanged(mCompatibleVisibilityInfo);

            if (mAttachInfo.mKeepScreenOn != oldScreenOn

                    || mAttachInfo.mSystemUiVisibility != params.subtreeSystemUiVisibility

                    || mAttachInfo.mHasSystemUiListeners != params.hasSystemUiListeners) {
@@ -2039,9 +2035,30 @@ public final class ViewRootImpl implements ViewParent, 
            info.globalVisibility |= systemUiFlag;

            info.localChanges &= ~systemUiFlag;

        }

        if (mDispatchedSystemUiVisibility != info.globalVisibility) {

        dispatchDispatchSystemUiVisibilityChanged(info);

    }



    /**

     * If the system is forcing showing any system bar, the legacy low profile flag should be

     * cleared for compatibility.

     *

     * @param showTypes {@link InsetsType types} shown by the system.

     * @param fromIme {@code true} if the invocation is from IME.

     */

    private void clearLowProfileModeIfNeeded(@InsetsType int showTypes, boolean fromIme) {

        final SystemUiVisibilityInfo info = mCompatibleVisibilityInfo;

        if ((showTypes & Type.systemBars()) != 0 && !fromIme

                && (info.globalVisibility & SYSTEM_UI_FLAG_LOW_PROFILE) != 0) {

            info.globalVisibility &= ~SYSTEM_UI_FLAG_LOW_PROFILE;

            info.localChanges |= SYSTEM_UI_FLAG_LOW_PROFILE;

            dispatchDispatchSystemUiVisibilityChanged(info);

        }

    }



    private void dispatchDispatchSystemUiVisibilityChanged(SystemUiVisibilityInfo args) {

        if (mDispatchedSystemUiVisibility != args.globalVisibility) {

            mHandler.removeMessages(MSG_DISPATCH_SYSTEM_UI_VISIBILITY);

            mHandler.sendMessage(mHandler.obtainMessage(MSG_DISPATCH_SYSTEM_UI_VISIBILITY, info));

            mHandler.sendMessage(mHandler.obtainMessage(MSG_DISPATCH_SYSTEM_UI_VISIBILITY, args));

        }

    }
@@ -5008,6 +5025,7 @@ public final class ViewRootImpl implements ViewParent, 
                                String.format("Calling showInsets(%d,%b) on window that no longer"

                                        + " has views.", msg.arg1, msg.arg2 == 1));

                    }

                    clearLowProfileModeIfNeeded(msg.arg1, msg.arg2 == 1);

                    mInsetsController.show(msg.arg1, msg.arg2 == 1);

                    break;

                }