Moves shelf offset into SysUI package
With this change, the shelf offset will be set directly by Launcher to
SysUI without WM being involved.
PinnedStackControllerTest is removed in this change since the only test
function is against WM.setShelfHeight. However, new tests regard
PinnedStackController should be added per b/141200935.
See also: go/pip-sysui-migration
Bug: 139016518
Test: atest PinnedStackTests
Change-Id: I606de3d8106ac12d7bf2b367877bc5bb345af3fe
diff --git a/packages/SystemUI/src/com/android/systemui/pip/phone/PipManager.java b/packages/SystemUI/src/com/android/systemui/pip/phone/PipManager.java
index 8dfae32..369073c 100644
--- a/packages/SystemUI/src/com/android/systemui/pip/phone/PipManager.java
+++ b/packages/SystemUI/src/com/android/systemui/pip/phone/PipManager.java
@@ -143,14 +143,6 @@
}
@Override
- public void onShelfVisibilityChanged(boolean shelfVisible, int shelfHeight) {
- mHandler.post(() -> {
- mPipBoundsHandler.onShelfVisibilityChanged(shelfVisible, shelfHeight);
- mTouchHandler.onShelfVisibilityChanged(shelfVisible, shelfHeight);
- });
- }
-
- @Override
public void onMinimizedStateChanged(boolean isMinimized) {
mHandler.post(() -> {
mPipBoundsHandler.onMinimizedStateChanged(isMinimized);
@@ -161,14 +153,8 @@
@Override
public void onMovementBoundsChanged(Rect animatingBounds, boolean fromImeAdjustment,
boolean fromShelfAdjustment) {
- mHandler.post(() -> {
- // Populate the inset / normal bounds and DisplayInfo from mPipBoundsHandler first.
- mPipBoundsHandler.onMovementBoundsChanged(mTmpInsetBounds, mTmpNormalBounds,
- animatingBounds, mTmpDisplayInfo);
- mTouchHandler.onMovementBoundsChanged(mTmpInsetBounds, mTmpNormalBounds,
- animatingBounds, fromImeAdjustment, fromShelfAdjustment,
- mTmpDisplayInfo.rotation);
- });
+ mHandler.post(() -> updateMovementBounds(animatingBounds, fromImeAdjustment,
+ fromShelfAdjustment));
}
@Override
@@ -280,6 +266,31 @@
}
/**
+ * Sets both shelf visibility and its height.
+ */
+ @Override
+ public void setShelfHeight(boolean visible, int height) {
+ mHandler.post(() -> {
+ final boolean changed = mPipBoundsHandler.setShelfHeight(visible, height);
+ if (changed) {
+ mTouchHandler.onShelfVisibilityChanged(visible, height);
+ updateMovementBounds(mPipBoundsHandler.getLastDestinationBounds(),
+ false /* fromImeAdjustment */, true /* fromShelfAdjustment */);
+ }
+ });
+ }
+
+ private void updateMovementBounds(Rect animatingBounds, boolean fromImeAdjustment,
+ boolean fromShelfAdjustment) {
+ // Populate inset / normal bounds and DisplayInfo from mPipBoundsHandler first.
+ mPipBoundsHandler.onMovementBoundsChanged(mTmpInsetBounds, mTmpNormalBounds,
+ animatingBounds, mTmpDisplayInfo);
+ mTouchHandler.onMovementBoundsChanged(mTmpInsetBounds, mTmpNormalBounds,
+ animatingBounds, fromImeAdjustment, fromShelfAdjustment,
+ mTmpDisplayInfo.rotation);
+ }
+
+ /**
* Gets an instance of {@link PipManager}.
*/
public static PipManager getInstance() {