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

Commit 34c75391 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "InsetsSourceProvider: Fix serverVisible update order in onPostLayout"... 

Merge "InsetsSourceProvider: Fix serverVisible update order in onPostLayout" into rvc-dev am: dc9883a0 am: ff7566b9 am: 041059a6

Change-Id: I4195b7cd7808ece196d28183df2c88173a0cfcea
parents 0f62bf40 041059a6

services/core/java/com/android/server/wm/InsetsSourceProvider.java

+2 −2
Original line number Diff line number Diff line
@@ -219,6 +219,8 @@ class InsetsSourceProvider { 
            return;

        }



        setServerVisible(mWin.wouldBeVisibleIfPolicyIgnored() && mWin.isVisibleByPolicy()

                && !mWin.mGivenInsetsPending);

        updateSourceFrame();

        if (mControl != null) {

            final Rect frame = mWin.getWindowFrames().mFrame;
@@ -228,8 +230,6 @@ class InsetsSourceProvider { 
                mStateController.notifyControlChanged(mControlTarget);

            }

        }

        setServerVisible(mWin.wouldBeVisibleIfPolicyIgnored() && mWin.isVisibleByPolicy()

                && !mWin.mGivenInsetsPending);

    }



    /**

services/tests/wmtests/src/com/android/server/wm/InsetsSourceProviderTest.java

+1 −1
Original line number Diff line number Diff line
@@ -54,7 +54,6 @@ public class InsetsSourceProviderTest extends WindowTestsBase { 
        mSource.setVisible(true);

        mProvider = new InsetsSourceProvider(mSource,

                mDisplayContent.getInsetsStateController(), mDisplayContent);

        mProvider.setServerVisible(true);

        mImeProvider = new InsetsSourceProvider(mImeSource,

                mDisplayContent.getInsetsStateController(), mDisplayContent);

    }
@@ -106,6 +105,7 @@ public class InsetsSourceProviderTest extends WindowTestsBase { 
    public void testPostLayout_frameProvider() {

        final WindowState statusBar = createWindow(null, TYPE_APPLICATION, "statusBar");

        statusBar.getFrameLw().set(0, 0, 500, 100);

        statusBar.mHasSurface = true;

        mProvider.setWindow(statusBar,

                (displayFrames, windowState, rect) -> {

                    rect.set(10, 10, 20, 20);