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

Commit 7171aca7 authored by Hongwei Wang's avatar Hongwei Wang
Browse files

Move PiP animation to SysUI package 

The bounds animation is cleaned up within window manager and it's now
the SysUI component listening on callbacks from TaskOrganizer for
entering to and exiting from PiP mode.

Additionally, the expand and move of the PiP window is now part of SysUI
as well.

Known issues:
- Black background when in transition from PiP to fullscreen. The
wallpaper gets into hidden state too early
- App gets into PiP mode too early when entering PiP, need to defer the
configuration change sent to app in this case

Bug: 146594635
Bug: 148198539
Bug: 138144750
Bug: 149569903
Test: atest PinnedStackTests
Test: atest PipAnimationControllerTest
Test: atest RecentsAnimationTest
Test: atest RecentTasksTest
Test: atest com.android.server.wm.ActivityStarterTests
Change-Id: Id0c8ce03fa26952daf5e3687b18b2eb2375b7d20
parent df58dc92

api/test-current.txt

+0 −1
Original line number Diff line number Diff line
@@ -118,7 +118,6 @@ package android.app { 
    method @RequiresPermission(android.Manifest.permission.MANAGE_ACTIVITY_STACKS) public void removeStacksWithActivityTypes(int[]) throws java.lang.SecurityException;

    method @RequiresPermission(android.Manifest.permission.MANAGE_ACTIVITY_STACKS) public void requestPictureInPictureMode(@NonNull android.os.IBinder);

    method @RequiresPermission(android.Manifest.permission.MANAGE_ACTIVITY_STACKS) public void resizeDockedStack(android.graphics.Rect, android.graphics.Rect);

    method @RequiresPermission(android.Manifest.permission.MANAGE_ACTIVITY_STACKS) public void resizePinnedStack(int, android.graphics.Rect, boolean);

    method @RequiresPermission(android.Manifest.permission.MANAGE_ACTIVITY_STACKS) public void resizeTask(int, android.graphics.Rect);

    method @RequiresPermission(android.Manifest.permission.MANAGE_ACTIVITY_STACKS) public void setDisplayToSingleTaskInstance(int);

    method @RequiresPermission(android.Manifest.permission.MANAGE_ACTIVITY_STACKS) public boolean setTaskWindowingMode(int, int, boolean) throws java.lang.SecurityException;

core/java/android/app/ActivityTaskManager.java

+0 −19
Original line number Diff line number Diff line
@@ -361,25 +361,6 @@ public class ActivityTaskManager { 
        }

    }



    /**

     * Resize the input stack id to the given bounds with animate setting.

     * @param stackId Id of the stack to resize.

     * @param bounds Bounds to resize the stack to or {@code null} for fullscreen.

     * @param animate Whether we should play an animation for resizing stack.

     */

    @RequiresPermission(android.Manifest.permission.MANAGE_ACTIVITY_STACKS)

    public void resizePinnedStack(int stackId, Rect bounds, boolean animate) {

        try {

            if (animate) {

                getService().animateResizePinnedStack(stackId, bounds, -1 /* animationDuration */);

            } else {

                getService().resizePinnedStack(bounds, null /* tempPinnedTaskBounds */);

            }

        } catch (RemoteException e) {

            throw e.rethrowFromSystemServer();

        }

    }



    /**

     * Resize task to given bounds.

     * @param taskId Id of task to resize.

core/java/android/app/IActivityTaskManager.aidl

+0 −37
Original line number Diff line number Diff line
@@ -244,32 +244,8 @@ interface IActivityTaskManager { 
     */

    boolean setTaskWindowingMode(int taskId, int windowingMode, boolean toTop);

    void moveTaskToStack(int taskId, int stackId, boolean toTop);

    /**

     * Resizes the input pinned stack to the given bounds with animation.

     *

     * @param stackId Id of the pinned stack to resize.

     * @param bounds Bounds to resize the stack to or {@code null} for fullscreen.

     * @param animationDuration The duration of the resize animation in milliseconds or -1 if the

     *                          default animation duration should be used.

     * @throws RemoteException

     */

    void animateResizePinnedStack(int stackId, in Rect bounds, int animationDuration);

    boolean setTaskWindowingModeSplitScreenPrimary(int taskId, int createMode, boolean toTop,

            boolean animate, in Rect initialBounds, boolean showRecents);

    /**

     * Use the offset to adjust the stack boundary with animation.

     *

     * @param stackId Id of the stack to adjust.

     * @param compareBounds Offset is only applied if the current pinned stack bounds is equal to

     *                      the compareBounds.

     * @param xOffset The horizontal offset.

     * @param yOffset The vertical offset.

     * @param animationDuration The duration of the resize animation in milliseconds or -1 if the

     *                          default animation duration should be used.

     * @throws RemoteException

     */

    void offsetPinnedStackBounds(int stackId, in Rect compareBounds, int xOffset, int yOffset,

            int animationDuration);

    /**

     * Removes stacks in the input windowing modes from the system if they are of activity type

     * ACTIVITY_TYPE_STANDARD or ACTIVITY_TYPE_UNDEFINED
@@ -379,23 +355,10 @@ interface IActivityTaskManager { 
    void startLocalVoiceInteraction(in IBinder token, in Bundle options);

    void stopLocalVoiceInteraction(in IBinder token);

    boolean supportsLocalVoiceInteraction();

    void notifyPinnedStackAnimationStarted();

    void notifyPinnedStackAnimationEnded();



    // Get device configuration

    ConfigurationInfo getDeviceConfigurationInfo();



    /**

     * Resizes the pinned stack.

     *

     * @param pinnedBounds The bounds for the pinned stack.

     * @param tempPinnedTaskBounds The temporary bounds for the tasks in the pinned stack, which

     *                             might be different from the stack bounds to allow more

     *                             flexibility while resizing, or {@code null} if they should be the

     *                             same as the stack bounds.

     */

    void resizePinnedStack(in Rect pinnedBounds, in Rect tempPinnedTaskBounds);



    void dismissKeyguard(in IBinder token, in IKeyguardDismissCallback callback,

            in CharSequence message);

core/java/android/app/ITaskStackListener.aidl

+0 −10
Original line number Diff line number Diff line
@@ -45,16 +45,6 @@ oneway interface ITaskStackListener { 
     */

    void onPinnedActivityRestartAttempt(boolean clearedTask);



    /**

     * Called whenever the pinned stack is starting animating a resize.

     */

    void onPinnedStackAnimationStarted();



    /**

     * Called whenever the pinned stack is done animating a resize.

     */

    void onPinnedStackAnimationEnded();



    /**

     * Called when we launched an activity that we forced to be resizable.

     *

core/java/android/app/TaskStackListener.java

+0 −10
Original line number Diff line number Diff line
@@ -56,16 +56,6 @@ public abstract class TaskStackListener extends ITaskStackListener.Stub { 
    public void onPinnedActivityRestartAttempt(boolean clearedTask) throws RemoteException {

    }



    @Override

    @UnsupportedAppUsage

    public void onPinnedStackAnimationStarted() throws RemoteException {

    }



    @Override

    @UnsupportedAppUsage

    public void onPinnedStackAnimationEnded() throws RemoteException {

    }



    @Override

    @UnsupportedAppUsage

    public void onActivityForcedResizable(String packageName, int taskId, int reason)