Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Clean up some methods on the Pip interface

Browse Source 
- Remove some pip methods that aren't used from SysUI
- Migrate an old ISystemUIProxy pip call to IPip

Bug: 238217847
Test: atest WMShellUnitTests
Change-Id: Iab57329a9d79704b0e35fdb22a36594aa4368141
This commit is contained in:
Winson Chung
2022-10-03 22:12:08 +00:00
parent 1c48aa1290
commit 5414dab01e
5 changed files with 17 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
libs/WindowManager/Shell/src/com/android/wm/shell/pip/IPip.aidl
View File

@@ -59,10 +59,15 @@ interface IPip {
/**
* Sets listener to get pinned stack animation callbacks.
*/
oneway void setPinnedStackAnimationListener(IPipAnimationListener listener) = 3;
oneway void setPipAnimationListener(IPipAnimationListener listener) = 3;
/**
* Sets the shelf height and visibility.
*/
oneway void setShelfHeight(boolean visible, int shelfHeight) = 4;
/**
* Sets the next pip animation type to be the alpha animation.
*/
oneway void setPipAnimationTypeToAlpha() = 5;
}

17
libs/WindowManager/Shell/src/com/android/wm/shell/pip/Pip.java
View File

@@ -50,15 +50,6 @@ public interface Pip {
default void onSystemUiStateChanged(boolean isSysUiStateValid, int flag) {
}
/**
* Sets both shelf visibility and its height.
*
* @param visible visibility of shelf.
* @param height to specify the height for shelf.
*/
default void setShelfHeight(boolean visible, int height) {
}
/**
* Set the callback when {@link PipTaskOrganizer#isInPip()} state is changed.
*
@@ -67,14 +58,6 @@ public interface Pip {
*/
default void setOnIsInPipStateChangedListener(Consumer<Boolean> callback) {}
/**
* Set the pinned stack with {@link PipAnimationController.AnimationType}
*
* @param animationType The pre-defined {@link PipAnimationController.AnimationType}
*/
default void setPinnedStackAnimationType(int animationType) {
}
/**
* Called when showing Pip menu.
*/

27
libs/WindowManager/Shell/src/com/android/wm/shell/pip/phone/PipController.java
View File

@@ -23,6 +23,7 @@ import static android.view.WindowManager.INPUT_CONSUMER_PIP;
import static com.android.internal.jank.InteractionJankMonitor.CUJ_PIP_TRANSITION;
import static com.android.wm.shell.common.ExecutorUtils.executeRemoteCallWithTaskPermission;
import static com.android.wm.shell.pip.PipAnimationController.ANIM_TYPE_ALPHA;
import static com.android.wm.shell.pip.PipAnimationController.TRANSITION_DIRECTION_EXPAND_OR_UNEXPAND;
import static com.android.wm.shell.pip.PipAnimationController.TRANSITION_DIRECTION_LEAVE_PIP;
import static com.android.wm.shell.pip.PipAnimationController.TRANSITION_DIRECTION_LEAVE_PIP_TO_SPLIT_SCREEN;
@@ -1064,13 +1065,6 @@ public class PipController implements PipTransitionController.PipTransitionCallb
});
}
@Override
public void setShelfHeight(boolean visible, int height) {
mMainExecutor.execute(() -> {
PipController.this.setShelfHeight(visible, height);
});
}
@Override
public void setOnIsInPipStateChangedListener(Consumer<Boolean> callback) {
mMainExecutor.execute(() -> {
@@ -1078,13 +1072,6 @@ public class PipController implements PipTransitionController.PipTransitionCallb
});
}
@Override
public void setPinnedStackAnimationType(int animationType) {
mMainExecutor.execute(() -> {
PipController.this.setPinnedStackAnimationType(animationType);
});
}
@Override
public void addPipExclusionBoundsChangeListener(Consumer<Rect> listener) {
mMainExecutor.execute(() -> {
@@ -1178,8 +1165,8 @@ public class PipController implements PipTransitionController.PipTransitionCallb
}
@Override
public void setPinnedStackAnimationListener(IPipAnimationListener listener) {
executeRemoteCallWithTaskPermission(mController, "setPinnedStackAnimationListener",
public void setPipAnimationListener(IPipAnimationListener listener) {
executeRemoteCallWithTaskPermission(mController, "setPipAnimationListener",
(controller) -> {
if (listener != null) {
mListener.register(listener);
@@ -1188,5 +1175,13 @@ public class PipController implements PipTransitionController.PipTransitionCallb
}
});
}
@Override
public void setPipAnimationTypeToAlpha() {
executeRemoteCallWithTaskPermission(mController, "setPipAnimationTypeToAlpha",
(controller) -> {
controller.setPinnedStackAnimationType(ANIM_TYPE_ALPHA);
});
}
}
}

5
packages/SystemUI/shared/src/com/android/systemui/shared/recents/ISystemUiProxy.aidl
View File

@@ -81,11 +81,6 @@ interface ISystemUiProxy {
*/
void stopScreenPinning() = 17;
/*
* Notifies that the swipe-to-home (recents animation) is finished.
*/
void notifySwipeToHomeFinished() = 23;
/**
* Notifies that quickstep will switch to a new task
* @param rotation indicates which Surface.Rotation the gesture was started in

8
packages/SystemUI/src/com/android/systemui/recents/OverviewProxyService.java
View File

@@ -341,14 +341,6 @@ public class OverviewProxyService extends CurrentUserTracker implements
});
}
@Override
public void notifySwipeToHomeFinished() {
verifyCallerAndClearCallingIdentity("notifySwipeToHomeFinished", () ->
mPipOptional.ifPresent(
pip -> pip.setPinnedStackAnimationType(
PipAnimationController.ANIM_TYPE_ALPHA)));
}
@Override
public void notifySwipeUpGestureStarted() {
verifyCallerAndClearCallingIdentityPostMain("notifySwipeUpGestureStarted", () ->