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

Commit 5735251c authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Use list instead of array when filtering non-app leashes" into sc-v2-dev

parents 3a6a0f5a d25fb5bd

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

+2 −2
Original line number Diff line number Diff line
@@ -1001,7 +1001,7 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<S>, 
                }

                if (mRecentsAnimationTargets != null) {

                    TaskViewUtils.setSplitAuxiliarySurfacesShown(mRecentsAnimationTargets.nonApps,

                            true /*shown*/, true /*animate*/);

                            true /*shown*/, false /*animate*/);

                }

                break;

        }
@@ -1654,7 +1654,7 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<S>, 


        if (mRecentsAnimationTargets != null) {

            TaskViewUtils.setSplitAuxiliarySurfacesShown(mRecentsAnimationTargets.nonApps,

                    true /*shown*/, true /*animate*/);

                    true /*shown*/, false /*animate*/);

        }



        // Leave the pending invisible flag, as it may be used by wallpaper open animation.

quickstep/src/com/android/quickstep/TaskViewUtils.java

+3 −2
Original line number Diff line number Diff line
@@ -84,6 +84,7 @@ import com.android.systemui.shared.system.RemoteAnimationTargetCompat; 
import com.android.systemui.shared.system.SyncRtSurfaceTransactionApplierCompat.SurfaceParams;



import java.util.ArrayList;

import java.util.List;



/**

 * Utility class for helpful methods related to {@link TaskView} objects and their tasks.
@@ -606,13 +607,13 @@ public final class TaskViewUtils { 
        }



        SurfaceControl.Transaction t = new SurfaceControl.Transaction();

        SurfaceControl[] auxiliarySurfaces = new SurfaceControl[nonApps.length];

        List<SurfaceControl> auxiliarySurfaces = new ArrayList<>(nonApps.length);

        boolean hasSurfaceToAnimate = false;

        for (int i = 0; i < nonApps.length; ++i) {

            final RemoteAnimationTargetCompat targ = nonApps[i];

            final SurfaceControl leash = targ.leash.getSurfaceControl();

            if (targ.windowType == TYPE_DOCK_DIVIDER && leash != null) {

                auxiliarySurfaces[i] = leash;

                auxiliarySurfaces.add(leash);

                hasSurfaceToAnimate = true;

            }

        }