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

Commit b009faca authored by Winson Chung's avatar Winson Chung Committed by Android (Google) Code Review
Browse files

Merge changes Ib7d3a07e,Ic22ccf17 into sc-dev 

* changes:
  Disallow auto-enter PIP when there is an existing PIP
  Don't use icon home animator when entering PIP
parents be2a0989 954681d8

quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java

+11 −7
Original line number Diff line number Diff line
@@ -117,6 +117,7 @@ import com.android.systemui.shared.system.LatencyTrackerCompat; 
import com.android.systemui.shared.system.RemoteAnimationTargetCompat;

import com.android.systemui.shared.system.TaskInfoCompat;

import com.android.systemui.shared.system.TaskStackChangeListener;

import com.android.systemui.shared.system.TaskStackChangeListeners;



import java.util.ArrayList;

import java.util.function.Consumer;
@@ -1072,7 +1073,7 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<S>, 


    protected abstract HomeAnimationFactory createHomeAnimationFactory(

            ArrayList<IBinder> launchCookies, long duration, boolean isTargetTranslucent,

            RemoteAnimationTargetCompat runningTaskTarget);

            boolean appCanEnterPip, RemoteAnimationTargetCompat runningTaskTarget);



    private final TaskStackChangeListener mActivityRestartListener = new TaskStackChangeListener() {

        @Override
@@ -1083,7 +1084,7 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<S>, 
                // Since this is an edge case, just cancel and relaunch with default activity

                // options (since we don't know if there's an associated app icon to launch from)

                endRunningWindowAnim(true /* cancel */);

                ActivityManagerWrapper.getInstance().unregisterTaskStackListener(

                TaskStackChangeListeners.getInstance().unregisterTaskStackListener(

                        mActivityRestartListener);

                ActivityManagerWrapper.getInstance().startActivityFromRecents(task.taskId, null);

            }
@@ -1098,7 +1099,7 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<S>, 
        // If we are transitioning to launcher, then listen for the activity to be restarted while

        // the transition is in progress

        if (mGestureState.getEndTarget().isLauncher) {

            ActivityManagerWrapper.getInstance().registerTaskStackListener(

            TaskStackChangeListeners.getInstance().registerTaskStackListener(

                    mActivityRestartListener);



            mParallelRunningAnim = mActivityInterface.getParallelAnimationToLauncher(
@@ -1117,13 +1118,15 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<S>, 
                    ? runningTaskTarget.taskInfo.launchCookies

                    : new ArrayList<>();

            boolean isTranslucent = runningTaskTarget != null && runningTaskTarget.isTranslucent;

            HomeAnimationFactory homeAnimFactory =

                    createHomeAnimationFactory(cookies, duration, isTranslucent, runningTaskTarget);

            mIsSwipingPipToHome = homeAnimFactory.supportSwipePipToHome()

            boolean appCanEnterPip = !mDeviceState.isPipActive()

                    && runningTaskTarget != null

                    && runningTaskTarget.taskInfo.pictureInPictureParams != null

                    && TaskInfoCompat.isAutoEnterPipEnabled(

                            runningTaskTarget.taskInfo.pictureInPictureParams);

            HomeAnimationFactory homeAnimFactory =

                    createHomeAnimationFactory(cookies, duration, isTranslucent, appCanEnterPip,

                            runningTaskTarget);

            mIsSwipingPipToHome = homeAnimFactory.supportSwipePipToHome() && appCanEnterPip;

            if (mIsSwipingPipToHome) {

                mSwipePipToHomeAnimator = getSwipePipToHomeAnimator(

                        homeAnimFactory, runningTaskTarget, start);
@@ -1399,7 +1402,8 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<S>, 
        }



        mActivityInitListener.unregister();

        ActivityManagerWrapper.getInstance().unregisterTaskStackListener(mActivityRestartListener);

        TaskStackChangeListeners.getInstance().unregisterTaskStackListener(

                mActivityRestartListener);

        mTaskSnapshot = null;

    }

quickstep/src/com/android/quickstep/FallbackSwipeHandler.java

+1 −1
Original line number Diff line number Diff line
@@ -129,7 +129,7 @@ public class FallbackSwipeHandler extends 


    @Override

    protected HomeAnimationFactory createHomeAnimationFactory(ArrayList<IBinder> launchCookies,

            long duration, boolean isTargetTranslucent,

            long duration, boolean isTargetTranslucent, boolean appCanEnterPip,

            RemoteAnimationTargetCompat runningTaskTarget) {

        mActiveAnimationFactory = new FallbackHomeAnimationFactory(duration);

        ActivityOptions options = ActivityOptions.makeCustomAnimation(mContext, 0, 0);

quickstep/src/com/android/quickstep/LauncherSwipeHandlerV2.java

+2 −2
Original line number Diff line number Diff line
@@ -88,7 +88,7 @@ public class LauncherSwipeHandlerV2 extends 


    @Override

    protected HomeAnimationFactory createHomeAnimationFactory(ArrayList<IBinder> launchCookies,

            long duration, boolean isTargetTranslucent,

            long duration, boolean isTargetTranslucent, boolean appCanEnterPip,

            RemoteAnimationTargetCompat runningTaskTarget) {

        if (mActivity == null) {

            mStateCallback.addChangeListener(STATE_LAUNCHER_PRESENT | STATE_HANDLER_INVALIDATED,
@@ -108,7 +108,7 @@ public class LauncherSwipeHandlerV2 extends 
        mActivity.getRootView().setForceHideBackArrow(true);

        mActivity.setHintUserWillBeActive();



        if (!canUseWorkspaceView) {

        if (!canUseWorkspaceView || appCanEnterPip) {

            return new LauncherHomeAnimationFactory();

        }

        if (workspaceView instanceof LauncherAppWidgetHostView) {

quickstep/src/com/android/quickstep/RecentTasksList.java

+2 −1
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ import com.android.systemui.shared.recents.model.Task; 
import com.android.systemui.shared.system.ActivityManagerWrapper;

import com.android.systemui.shared.system.KeyguardManagerCompat;

import com.android.systemui.shared.system.TaskStackChangeListener;

import com.android.systemui.shared.system.TaskStackChangeListeners;



import java.util.ArrayList;

import java.util.Collections;
@@ -66,7 +67,7 @@ public class RecentTasksList extends TaskStackChangeListener { 
        mKeyguardManager = keyguardManager;

        mChangeId = 1;

        mActivityManagerWrapper = activityManagerWrapper;

        mActivityManagerWrapper.registerTaskStackListener(this);

        TaskStackChangeListeners.getInstance().registerTaskStackListener(this);

    }



    @VisibleForTesting

quickstep/src/com/android/quickstep/RecentsAnimationDeviceState.java

+36 −5
Original line number Diff line number Diff line
@@ -15,6 +15,8 @@ 
 */

package com.android.quickstep;



import static android.app.WindowConfiguration.ACTIVITY_TYPE_UNDEFINED;

import static android.app.WindowConfiguration.WINDOWING_MODE_PINNED;

import static android.content.Intent.ACTION_USER_UNLOCKED;



import static com.android.launcher3.util.DisplayController.CHANGE_ALL;
@@ -41,6 +43,7 @@ import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_S 
import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_STATUS_BAR_KEYGUARD_SHOWING_OCCLUDED;



import android.app.ActivityManager;

import android.app.ActivityTaskManager;

import android.content.BroadcastReceiver;

import android.content.ComponentName;

import android.content.Context;
@@ -50,6 +53,7 @@ import android.content.res.Resources; 
import android.graphics.Region;

import android.net.Uri;

import android.os.Process;

import android.os.RemoteException;

import android.os.SystemProperties;

import android.os.UserManager;

import android.provider.Settings;
@@ -75,6 +79,8 @@ import com.android.systemui.shared.system.ActivityManagerWrapper; 
import com.android.systemui.shared.system.QuickStepContract;

import com.android.systemui.shared.system.QuickStepContract.SystemUiStateFlags;

import com.android.systemui.shared.system.SystemGestureExclusionListenerCompat;

import com.android.systemui.shared.system.TaskStackChangeListener;

import com.android.systemui.shared.system.TaskStackChangeListeners;



import java.io.PrintWriter;

import java.util.ArrayList;
@@ -96,6 +102,8 @@ public class RecentsAnimationDeviceState implements 
    private final DisplayController mDisplayController;

    private final int mDisplayId;

    private final RotationTouchHelper mRotationTouchHelper;

    private final TaskStackChangeListener mPipListener;

    private final List<ComponentName> mGestureBlockedActivities;



    private final ArrayList<Runnable> mOnDestroyActions = new ArrayList<>();
@@ -106,9 +114,11 @@ public class RecentsAnimationDeviceState implements 
    private final Region mDeferredGestureRegion = new Region();

    private boolean mAssistantAvailable;

    private float mAssistantVisibility;

    private boolean mIsUserSetupComplete;

    private boolean mIsOneHandedModeEnabled;

    private boolean mIsSwipeToNotificationEnabled;

    private final boolean mIsOneHandedModeSupported;

    private boolean mPipIsActive;



    private boolean mIsUserUnlocked;

    private final ArrayList<Runnable> mUserUnlockedActions = new ArrayList<>();
@@ -125,10 +135,6 @@ public class RecentsAnimationDeviceState implements 
    private Region mExclusionRegion;

    private SystemGestureExclusionListenerCompat mExclusionListener;



    private final List<ComponentName> mGestureBlockedActivities;



    private boolean mIsUserSetupComplete;



    public RecentsAnimationDeviceState(Context context) {

        this(context, false);

    }
@@ -204,7 +210,6 @@ public class RecentsAnimationDeviceState implements 
            mIsOneHandedModeEnabled = false;

        }





        Uri swipeBottomNotificationUri =

                Settings.Secure.getUriFor(ONE_HANDED_SWIPE_BOTTOM_TO_NOTIFICATION_ENABLED);

        SettingsCache.OnChangeListener onChangeListener =
@@ -220,6 +225,27 @@ public class RecentsAnimationDeviceState implements 
            settingsCache.register(setupCompleteUri, userSetupChangeListener);

            runOnDestroy(() -> settingsCache.unregister(setupCompleteUri, userSetupChangeListener));

        }



        try {

            mPipIsActive = ActivityTaskManager.getService().getRootTaskInfo(

                    WINDOWING_MODE_PINNED, ACTIVITY_TYPE_UNDEFINED) != null;

        } catch (RemoteException e) {

            // Do nothing

        }

        mPipListener = new TaskStackChangeListener() {

            @Override

            public void onActivityPinned(String packageName, int userId, int taskId, int stackId) {

                mPipIsActive = true;

            }



            @Override

            public void onActivityUnpinned() {

                mPipIsActive = false;

            }

        };

        TaskStackChangeListeners.getInstance().registerTaskStackListener(mPipListener);

        runOnDestroy(() ->

                TaskStackChangeListeners.getInstance().unregisterTaskStackListener(mPipListener));

    }



    private void runOnDestroy(Runnable action) {
@@ -579,6 +605,10 @@ public class RecentsAnimationDeviceState implements 
        return mIsSwipeToNotificationEnabled;

    }



    public boolean isPipActive() {

        return mPipIsActive;

    }



    public RotationTouchHelper getRotationTouchHelper() {

        return mRotationTouchHelper;

    }
@@ -596,6 +626,7 @@ public class RecentsAnimationDeviceState implements 
        pw.println("  isOneHandedModeEnabled=" + mIsOneHandedModeEnabled);

        pw.println("  isSwipeToNotificationEnabled=" + mIsSwipeToNotificationEnabled);

        pw.println("  deferredGestureRegion=" + mDeferredGestureRegion);

        pw.println("  pipIsActive=" + mPipIsActive);

        mRotationTouchHelper.dump(pw);

    }

}