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

Commit 2e34c549 authored by Tiger's avatar Tiger
Browse files

Refine the name of onInsetsModified 

It won't get called on every insets change, but will only get called
when the requested visible types is changed. This CL renames it to
onRequestedVisibleTypesChanged.

Fix: 282682000
Bug: 282128806
Test: atest InsetsStateControllerTest
Change-Id: I5924bf03c5e1ba682d0bb271e32992b0a7290808
parent c6d96422

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

+2 −2
Original line number Diff line number Diff line
@@ -440,8 +440,8 @@ class InsetsPolicy { 
        return originalState;

    }



    void onInsetsModified(InsetsControlTarget caller) {

        mStateController.onInsetsModified(caller);

    void onRequestedVisibleTypesChanged(InsetsControlTarget caller) {

        mStateController.onRequestedVisibleTypesChanged(caller);

        checkAbortTransient(caller);

        updateBarControlTarget(mFocusedWin);

    }

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

+2 −2
Original line number Diff line number Diff line
@@ -190,7 +190,7 @@ class InsetsStateController { 
        }

    }



    void onInsetsModified(InsetsControlTarget caller) {

    void onRequestedVisibleTypesChanged(InsetsControlTarget caller) {

        boolean changed = false;

        for (int i = mProviders.size() - 1; i >= 0; i--) {

            changed |= mProviders.valueAt(i).updateClientVisibility(caller);
@@ -352,7 +352,7 @@ class InsetsStateController { 
            // to the clients, so that the clients can change the current visibilities to the

            // requested visibilities with animations.

            for (int i = newControlTargets.size() - 1; i >= 0; i--) {

                onInsetsModified(newControlTargets.valueAt(i));

                onRequestedVisibleTypesChanged(newControlTargets.valueAt(i));

            }

            newControlTargets.clear();

        });

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

+4 −4
Original line number Diff line number Diff line
@@ -687,11 +687,11 @@ class Session extends IWindowSession.Stub implements IBinder.DeathRecipient { 
    @Override

    public void updateRequestedVisibleTypes(IWindow window, @InsetsType int requestedVisibleTypes) {

        synchronized (mService.mGlobalLock) {

            final WindowState windowState = mService.windowForClientLocked(this, window,

            final WindowState win = mService.windowForClientLocked(this, window,

                    false /* throwOnError */);

            if (windowState != null) {

                windowState.setRequestedVisibleTypes(requestedVisibleTypes);

                windowState.getDisplayContent().getInsetsPolicy().onInsetsModified(windowState);

            if (win != null) {

                win.setRequestedVisibleTypes(requestedVisibleTypes);

                win.getDisplayContent().getInsetsPolicy().onRequestedVisibleTypesChanged(win);

            }

        }

    }

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

+2 −1
Original line number Diff line number Diff line
@@ -4537,7 +4537,8 @@ public class WindowManagerService extends IWindowManager.Stub 
                    return;

                }

                dc.mRemoteInsetsControlTarget.setRequestedVisibleTypes(requestedVisibleTypes);

                dc.getInsetsStateController().onInsetsModified(dc.mRemoteInsetsControlTarget);

                dc.getInsetsStateController().onRequestedVisibleTypesChanged(

                        dc.mRemoteInsetsControlTarget);

            }

        } finally {

            Binder.restoreCallingIdentity(origId);

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

+2 −2
Original line number Diff line number Diff line
@@ -3329,7 +3329,7 @@ public class ActivityRecordTests extends WindowTestsBase { 


        // app1 requests IME visible.

        app1.setRequestedVisibleTypes(ime(), ime());

        mDisplayContent.getInsetsStateController().onInsetsModified(app1);

        mDisplayContent.getInsetsStateController().onRequestedVisibleTypesChanged(app1);



        // Verify app1's IME insets is visible and app2's IME insets frozen flag set.

        assertTrue(app1.getInsetsState().peekSource(ID_IME).isVisible());
@@ -3398,7 +3398,7 @@ public class ActivityRecordTests extends WindowTestsBase { 
        assertFalse(activity2.mImeInsetsFrozenUntilStartInput);



        app1.setRequestedVisibleTypes(ime());

        controller.onInsetsModified(app1);

        controller.onRequestedVisibleTypesChanged(app1);



        // Expect all activities in split-screen will get IME insets visible state

        assertTrue(app1.getInsetsState().peekSource(ID_IME).isVisible());