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

Commit 5c6d09ce authored by Hongwei Wang's avatar Hongwei Wang Committed by Automerger Merge Worker
Browse files

Merge "Call setCanAffectSystemUiFlags(false) only for PiP" into tm-qpr-dev am:... 

Merge "Call setCanAffectSystemUiFlags(false) only for PiP" into tm-qpr-dev am: bf8528c2 am: b6e6511b

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18815765



Change-Id: Ib3525c4eb71f4e13094881ad688d93085ec3e9e9
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 44ea2f26 b6e6511b

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

+1 −0
Original line number Diff line number Diff line
@@ -1799,6 +1799,7 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<S>, 
                    new PictureInPictureSurfaceTransaction.Builder()

                            .setAlpha(0f)

                            .build();

            tx.setShouldDisableCanAffectSystemUiFlags(false);

            int[] taskIds = TopTaskTracker.INSTANCE.get(mContext).getRunningSplitTaskIds();

            for (int taskId : taskIds) {

                mRecentsAnimationController.setFinishTaskTransaction(taskId,

quickstep/src/com/android/quickstep/util/SwipePipToHomeAnimator.java

+4 −1
Original line number Diff line number Diff line
@@ -279,7 +279,10 @@ public class SwipePipToHomeAnimator extends RectFSpringAnim { 
        // get the final leash operations but do not apply to the leash.

        final SurfaceControl.Transaction tx =

                PipSurfaceTransactionHelper.newSurfaceControlTransaction();

        return onAnimationUpdate(tx, new RectF(mDestinationBounds), END_PROGRESS);

        final PictureInPictureSurfaceTransaction pipTx =

                onAnimationUpdate(tx, new RectF(mDestinationBounds), END_PROGRESS);

        pipTx.setShouldDisableCanAffectSystemUiFlags(true);

        return pipTx;

    }



    private RotatedPosition getRotatedPosition(float progress) {

quickstep/src/com/android/quickstep/views/RecentsView.java

+2 −1
Original line number Diff line number Diff line
@@ -141,8 +141,8 @@ import com.android.launcher3.util.IntSet; 
import com.android.launcher3.util.MultiValueAlpha;

import com.android.launcher3.util.ResourceBasedOverride.Overrides;

import com.android.launcher3.util.RunnableList;

import com.android.launcher3.util.SplitConfigurationOptions.StagePosition;

import com.android.launcher3.util.SplitConfigurationOptions.SplitBounds;

import com.android.launcher3.util.SplitConfigurationOptions.StagePosition;

import com.android.launcher3.util.Themes;

import com.android.launcher3.util.TranslateEdgeEffect;

import com.android.launcher3.util.ViewPool;
@@ -4562,6 +4562,7 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T 
                    new PictureInPictureSurfaceTransaction.Builder()

                            .setAlpha(0f)

                            .build();

            tx.setShouldDisableCanAffectSystemUiFlags(false);

            int[] taskIds = TopTaskTracker.INSTANCE.get(getContext()).getRunningSplitTaskIds();

            for (int taskId : taskIds) {

                mRecentsAnimationController.setFinishTaskTransaction(taskId,