PawletOS/Lawnchair
1
0
Fork 0
Code Issues Pull Requests Actions 6 Packages Projects Releases Wiki Activity

Merge "[Pip2] Use PipFlags#isPip2ExperimentEnabled in Launcher" into main

Browse Source
This commit is contained in:
Merissa Mitchell
2025-05-07 14:12:10 -07:00
committed by Android (Google) Code Review
parent c67c038ec3 bea2e7ca6c
commit 6ce6bd6328
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
+2 -2
View File
@@ -167,10 +167,10 @@ import com.android.systemui.shared.system.InteractionJankMonitorWrapper;
import com.android.systemui.shared.system.SysUiStatsLog;
import com.android.systemui.shared.system.TaskStackChangeListener;
import com.android.systemui.shared.system.TaskStackChangeListeners;
import com.android.wm.shell.Flags;
import com.android.wm.shell.shared.GroupedTaskInfo;
import com.android.wm.shell.shared.TransactionPool;
import com.android.wm.shell.shared.desktopmode.DesktopModeStatus;
import com.android.wm.shell.shared.pip.PipFlags;
import com.android.wm.shell.shared.startingsurface.SplashScreenExitAnimationUtils;
import com.google.android.msdl.data.model.MSDLToken;
@@ -2320,7 +2320,7 @@ public abstract class AbsSwipeUpHandler<
mSwipePipToHomeAnimator.getFinishTransaction(),
mSwipePipToHomeAnimator.getContentOverlay());
mIsSwipingPipToHome = false;
} else if (mIsSwipeForSplit && !Flags.enablePip2()) {
} else if (mIsSwipeForSplit && !PipFlags.isPip2ExperimentEnabled()) {
// Transaction to hide the task to avoid flicker for entering PiP from split-screen.
// Note: PiP2 handles entering differently, so skip if enable_pip2=true
PictureInPictureSurfaceTransaction tx =
quickstep/src/com/android/quickstep/views/RecentsView.java
+2 -1
View File
@@ -245,6 +245,7 @@ import com.android.wm.shell.common.pip.IPipAnimationListener;
import com.android.wm.shell.shared.GroupedTaskInfo;
import com.android.wm.shell.shared.desktopmode.DesktopModeStatus;
import com.android.wm.shell.shared.desktopmode.DesktopModeTransitionSource;
import com.android.wm.shell.shared.pip.PipFlags;
import com.android.wm.shell.shared.split.SplitBounds;
import kotlin.Unit;
@@ -6038,7 +6039,7 @@ public abstract class RecentsView<
}
final boolean sendUserLeaveHint = toRecents && shouldPip;
if (sendUserLeaveHint && !com.android.wm.shell.Flags.enablePip2()) {
if (sendUserLeaveHint && !PipFlags.isPip2ExperimentEnabled()) {
// Notify the SysUI to use fade-in animation when entering PiP from live tile.
// Note: PiP2 handles entering differently, so skip if enable_pip2=true.
final SystemUiProxy systemUiProxy = SystemUiProxy.INSTANCE.get(getContext());