diff options
7 files changed, 19 insertions, 19 deletions
diff --git a/services/core/java/com/android/server/wm/InsetsPolicy.java b/services/core/java/com/android/server/wm/InsetsPolicy.java index ddf96c53323d..698c9abee1f5 100644 --- a/services/core/java/com/android/server/wm/InsetsPolicy.java +++ b/services/core/java/com/android/server/wm/InsetsPolicy.java @@ -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); } diff --git a/services/core/java/com/android/server/wm/InsetsStateController.java b/services/core/java/com/android/server/wm/InsetsStateController.java index 249ead0a8509..addb5219c663 100644 --- a/services/core/java/com/android/server/wm/InsetsStateController.java +++ b/services/core/java/com/android/server/wm/InsetsStateController.java @@ -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(); }); diff --git a/services/core/java/com/android/server/wm/Session.java b/services/core/java/com/android/server/wm/Session.java index 7b10c6372b0e..b49c5fb2c25d 100644 --- a/services/core/java/com/android/server/wm/Session.java +++ b/services/core/java/com/android/server/wm/Session.java @@ -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); } } } diff --git a/services/core/java/com/android/server/wm/WindowManagerService.java b/services/core/java/com/android/server/wm/WindowManagerService.java index 322c11a7cc4b..72302132347b 100644 --- a/services/core/java/com/android/server/wm/WindowManagerService.java +++ b/services/core/java/com/android/server/wm/WindowManagerService.java @@ -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); diff --git a/services/tests/wmtests/src/com/android/server/wm/ActivityRecordTests.java b/services/tests/wmtests/src/com/android/server/wm/ActivityRecordTests.java index cb984f814f1a..77e944f35cb2 100644 --- a/services/tests/wmtests/src/com/android/server/wm/ActivityRecordTests.java +++ b/services/tests/wmtests/src/com/android/server/wm/ActivityRecordTests.java @@ -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()); diff --git a/services/tests/wmtests/src/com/android/server/wm/InsetsPolicyTest.java b/services/tests/wmtests/src/com/android/server/wm/InsetsPolicyTest.java index a8fc25fc4477..204cbf79dba9 100644 --- a/services/tests/wmtests/src/com/android/server/wm/InsetsPolicyTest.java +++ b/services/tests/wmtests/src/com/android/server/wm/InsetsPolicyTest.java @@ -370,7 +370,7 @@ public class InsetsPolicyTest extends WindowTestsBase { mAppWindow.setRequestedVisibleTypes( navigationBars() | statusBars(), navigationBars() | statusBars()); - policy.onInsetsModified(mAppWindow); + policy.onRequestedVisibleTypesChanged(mAppWindow); waitUntilWindowAnimatorIdle(); controls = mDisplayContent.getInsetsStateController().getControlsForDispatch(mAppWindow); diff --git a/services/tests/wmtests/src/com/android/server/wm/InsetsStateControllerTest.java b/services/tests/wmtests/src/com/android/server/wm/InsetsStateControllerTest.java index d1d83f62934d..866260757df9 100644 --- a/services/tests/wmtests/src/com/android/server/wm/InsetsStateControllerTest.java +++ b/services/tests/wmtests/src/com/android/server/wm/InsetsStateControllerTest.java @@ -190,17 +190,16 @@ public class InsetsStateControllerTest extends WindowTestsBase { // This can be the IME z-order target while app cannot be the IME z-order target. // This is also the only IME control target in this test, so IME won't be invisible caused // by the control-target change. - mDisplayContent.updateImeInputAndControlTarget( - createWindow(null, TYPE_APPLICATION, "base")); + final WindowState base = createWindow(null, TYPE_APPLICATION, "base"); + mDisplayContent.updateImeInputAndControlTarget(base); // Make IME and stay visible during the test. mImeWindow.setHasSurface(true); getController().getOrCreateSourceProvider(ID_IME, ime()) .setWindowContainer(mImeWindow, null, null); - getController().onImeControlTargetChanged( - mDisplayContent.getImeInputTarget().getWindowState()); - mDisplayContent.getImeInputTarget().getWindowState().setRequestedVisibleTypes(ime(), ime()); - getController().onInsetsModified(mDisplayContent.getImeInputTarget().getWindowState()); + getController().onImeControlTargetChanged(base); + base.setRequestedVisibleTypes(ime(), ime()); + getController().onRequestedVisibleTypesChanged(base); // Send our spy window (app) into the system so that we can detect the invocation. final WindowState win = createWindow(null, TYPE_APPLICATION, "app"); @@ -481,7 +480,7 @@ public class InsetsStateControllerTest extends WindowTestsBase { mDisplayContent.updateImeInputAndControlTarget(app); app.setRequestedVisibleTypes(ime(), ime()); - getController().onInsetsModified(app); + getController().onRequestedVisibleTypesChanged(app); assertTrue(ime.getControllableInsetProvider().getSource().isVisible()); getController().updateAboveInsetsState(true /* notifyInsetsChange */); |