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

Commit fb05759b authored by Jon Miranda's avatar Jon Miranda
Browse files

Register setStartingWindowListener so launcher can defer icon drawing/crop correctly. 

Bug: 177264697
Test: manual
      close all tasks
      launch app, note that shell is drawing icon & launcher correctly crops
      return home
      launch same app, note that launcher draws the icon

Change-Id: Id320eb9e3e03f861cc8e4adec739b8faf29adda0
parent ea39d160

quickstep/src/com/android/launcher3/QuickstepAppTransitionManagerImpl.java

+67 −4
Original line number Diff line number Diff line
@@ -16,6 +16,9 @@ 


package com.android.launcher3;



import static android.window.StartingWindowInfo.STARTING_WINDOW_TYPE_NONE;

import static android.window.StartingWindowInfo.STARTING_WINDOW_TYPE_SPLASH_SCREEN;



import static com.android.launcher3.BaseActivity.INVISIBLE_ALL;

import static com.android.launcher3.BaseActivity.INVISIBLE_BY_APP_TRANSITIONS;

import static com.android.launcher3.BaseActivity.INVISIBLE_BY_PENDING_FLAGS;
@@ -80,6 +83,7 @@ import com.android.quickstep.util.MultiValueUpdateListener; 
import com.android.quickstep.util.RemoteAnimationProvider;

import com.android.quickstep.util.StaggeredWorkspaceAnim;

import com.android.quickstep.util.SurfaceTransactionApplier;

import com.android.systemui.shared.recents.IStartingWindowListener;

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

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

import com.android.systemui.shared.system.InteractionJankMonitorWrapper;
@@ -92,6 +96,8 @@ import com.android.systemui.shared.system.RemoteTransitionCompat; 
import com.android.systemui.shared.system.SyncRtSurfaceTransactionApplierCompat.SurfaceParams;

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



import java.util.LinkedHashMap;



/**

 * {@link LauncherAppTransitionManager} with Quickstep-specific app transitions for launching from

 * home and/or all-apps.  Not used for 3p launchers.
@@ -145,6 +151,8 @@ public abstract class QuickstepAppTransitionManagerImpl extends LauncherAppTrans 
    // Progress = 0: All apps is fully pulled up, Progress = 1: All apps is fully pulled down.

    public static final float ALL_APPS_PROGRESS_OFF_SCREEN = 1.3059858f;



    private static final int MAX_NUM_TASKS = 5;



    protected final BaseQuickstepLauncher mLauncher;



    private final DragLayer mDragLayer;
@@ -180,6 +188,9 @@ public abstract class QuickstepAppTransitionManagerImpl extends LauncherAppTrans 
        }

    };



    // Will never be larger than MAX_NUM_TASKS

    private LinkedHashMap<Integer, Integer> mTypeForTaskId;



    public QuickstepAppTransitionManagerImpl(Context context) {

        mLauncher = Launcher.cast(Launcher.getLauncher(context));

        mDragLayer = mLauncher.getDragLayer();
@@ -194,6 +205,23 @@ public abstract class QuickstepAppTransitionManagerImpl extends LauncherAppTrans 
        mMaxShadowRadius = res.getDimensionPixelSize(R.dimen.max_shadow_radius);



        mLauncher.addOnDeviceProfileChangeListener(this);



        if (supportsSSplashScreen()) {

            mTypeForTaskId = new LinkedHashMap<Integer, Integer>(MAX_NUM_TASKS) {

                @Override

                protected boolean removeEldestEntry(Entry<Integer, Integer> entry) {

                    return size() > MAX_NUM_TASKS;

                }

            };



            SystemUiProxy.INSTANCE.get(mLauncher).setStartingWindowListener(

                    new IStartingWindowListener.Stub() {

                        @Override

                        public void onTaskLaunching(int taskId, int supportedType) {

                            mTypeForTaskId.put(taskId, supportedType);

                        }

                    });

        }

    }



    @Override
@@ -336,6 +364,15 @@ public abstract class QuickstepAppTransitionManagerImpl extends LauncherAppTrans 
        return bounds;

    }



    private int getOpeningTaskId(RemoteAnimationTargetCompat[] appTargets) {

        for (RemoteAnimationTargetCompat target : appTargets) {

            if (target.mode == MODE_OPENING) {

                return target.taskId;

            }

        }

        return -1;

    }



    public void setRemoteAnimationProvider(final RemoteAnimationProvider animationProvider,

            CancellationSignal cancellationSignal) {

        mRemoteAnimationProvider = animationProvider;
@@ -471,8 +508,19 @@ public abstract class QuickstepAppTransitionManagerImpl extends LauncherAppTrans 
        int[] dragLayerBounds = new int[2];

        mDragLayer.getLocationOnScreen(dragLayerBounds);



        final boolean hasSplashScreen;

        if (supportsSSplashScreen()) {

            int taskId = getOpeningTaskId(appTargets);

            int type = mTypeForTaskId.getOrDefault(taskId, STARTING_WINDOW_TYPE_NONE);

            mTypeForTaskId.remove(taskId);

            hasSplashScreen = type == STARTING_WINDOW_TYPE_SPLASH_SCREEN;

        } else {

            hasSplashScreen = false;

        }



        AnimOpenProperties prop = new AnimOpenProperties(mLauncher.getResources(), mDeviceProfile,

                windowTargetBounds, launcherIconBounds, v, dragLayerBounds[0], dragLayerBounds[1]);

                windowTargetBounds, launcherIconBounds, v, dragLayerBounds[0], dragLayerBounds[1],

                hasSplashScreen);

        int left = (int) (prop.cropCenterXStart - prop.cropWidthStart / 2);

        int top = (int) (prop.cropCenterYStart - prop.cropHeightStart / 2);

        int right = (int) (left + prop.cropWidthStart);
@@ -562,7 +610,7 @@ public abstract class QuickstepAppTransitionManagerImpl extends LauncherAppTrans 
                Utilities.scaleRectFAboutCenter(tmpRectF, mIconScaleToFitScreen.value);

                float windowTransX0 = tmpRectF.left - offsetX;

                float windowTransY0 = tmpRectF.top - offsetY;

                if (ENABLE_SHELL_STARTING_SURFACE) {

                if (hasSplashScreen) {

                    windowTransX0 -= crop.left * scale;

                    windowTransY0 -= crop.top * scale;

                }
@@ -686,6 +734,14 @@ public abstract class QuickstepAppTransitionManagerImpl extends LauncherAppTrans 
        }

    }



    @Override

    public void onActivityDestroyed() {

        super.onActivityDestroyed();

        unregisterRemoteAnimations();

        unregisterRemoteTransitions();

        SystemUiProxy.INSTANCE.getNoCreate().setStartingWindowListener(null);

    }



    /**

     * Unregisters all remote animations.

     */
@@ -821,6 +877,12 @@ public abstract class QuickstepAppTransitionManagerImpl extends LauncherAppTrans 
        return closingAnimator;

    }



    private boolean supportsSSplashScreen() {

        return hasControlRemoteAppTransitionPermission()

                && Utilities.ATLEAST_S

                && ENABLE_SHELL_STARTING_SURFACE;

    }



    private boolean hasControlRemoteAppTransitionPermission() {

        return mLauncher.checkSelfPermission(CONTROL_REMOTE_APP_TRANSITION_PERMISSION)

                == PackageManager.PERMISSION_GRANTED;
@@ -1030,7 +1092,8 @@ public abstract class QuickstepAppTransitionManagerImpl extends LauncherAppTrans 
        public final float iconAlphaStart;



        AnimOpenProperties(Resources r, DeviceProfile dp, Rect windowTargetBounds,

                RectF launcherIconBounds, View view, int dragLayerLeft, int dragLayerTop) {

                RectF launcherIconBounds, View view, int dragLayerLeft, int dragLayerTop,

                boolean hasSplashScreen) {

            // Scale the app icon to take up the entire screen. This simplifies the math when

            // animating the app window position / scale.

            float smallestSize = Math.min(windowTargetBounds.height(), windowTargetBounds.width());
@@ -1063,7 +1126,7 @@ public abstract class QuickstepAppTransitionManagerImpl extends LauncherAppTrans 
            alphaDuration = useUpwardAnimation ? APP_LAUNCH_ALPHA_DURATION

                    : APP_LAUNCH_ALPHA_DOWN_DURATION;



            if (ENABLE_SHELL_STARTING_SURFACE) {

            if (hasSplashScreen) {

                iconAlphaStart = 0;



                // TOOD: Share value from shell when available.

src/com/android/launcher3/Launcher.java

+1 −2
Original line number Diff line number Diff line
@@ -1609,8 +1609,7 @@ public class Launcher extends StatefulActivity<LauncherState> implements Launche 
        LauncherAppState.getIDP(this).removeOnChangeListener(this);



        mOverlayManager.onActivityDestroyed(this);

        mAppTransitionManager.unregisterRemoteAnimations();

        mAppTransitionManager.unregisterRemoteTransitions();

        mAppTransitionManager.onActivityDestroyed();

        mUserChangedCallbackCloseable.close();

        mLiveSearchManager.stop();

    }

src/com/android/launcher3/LauncherAppTransitionManager.java

+7 −0
Original line number Diff line number Diff line
@@ -61,6 +61,13 @@ public class LauncherAppTransitionManager implements ResourceBasedOverride { 
        // Do nothing

    }



    /**

     * Handles clean up when activity is destroyed.

     */

    public void onActivityDestroyed() {

        // Do nothing

    }



    /**

     * Unregisters all remote animations.

     */