commit 7c75e25f5633395e191dc643f6eda1e32158ffc6
author Alina Zaidi <alinazaidi@google.com> Tue Jul 23 10:45:56 2024 +0000
committer Alina Zaidi <alinazaidi@google.com> Tue Jul 23 13:41:41 2024 +0000
tree 99c5ed84e9bed6d71e1de21ee80441e224324e73
parent 65794ef7774ccaa48a8e44b28fe7bad803191097

[Dev options][More flags] Update all usages of some flags to use
DesktopModeFlags.

Test: Current tests pass
Bug: 348193756
Flag: com.android.window.flags.show_desktop_windowing_dev_option
Change-Id: Ie418f511c3b5d21cb2b4e485d30249b853a463af

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

diff --git a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
index b059186..5a03ae6 100644
--- a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
+++ b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
@@ -63,7 +63,6 @@
 import static com.android.quickstep.views.RecentsView.UPDATE_SYSUI_FLAGS_THRESHOLD;
 import static com.android.systemui.shared.system.ActivityManagerWrapper.CLOSE_SYSTEM_WINDOWS_REASON_RECENTS;
 import static com.android.wm.shell.shared.desktopmode.DesktopModeFlags.DESKTOP_WINDOWING_MODE;
-import static com.android.wm.shell.shared.desktopmode.DesktopModeFlags.WALLPAPER_ACTIVITY;
 
 import android.animation.Animator;
 import android.animation.AnimatorListenerAdapter;
@@ -150,8 +149,8 @@
 import com.android.systemui.shared.system.SysUiStatsLog;
 import com.android.systemui.shared.system.TaskStackChangeListener;
 import com.android.systemui.shared.system.TaskStackChangeListeners;
-import com.android.window.flags.Flags;
 import com.android.wm.shell.common.TransactionPool;
+import com.android.wm.shell.shared.desktopmode.DesktopModeFlags;
 import com.android.wm.shell.startingsurface.SplashScreenExitAnimationUtils;
 
 import kotlin.Unit;
@@ -1275,8 +1274,8 @@
                 ? mRecentsView.getCurrentPageTaskView() : null;
 
         if (DESKTOP_WINDOWING_MODE.isEnabled(mContext)
-                && !(WALLPAPER_ACTIVITY.isEnabled(mContext)
-                && Flags.enableDesktopWindowingQuickSwitch())) {
+                && !(DesktopModeFlags.WALLPAPER_ACTIVITY.isEnabled(mContext)
+                && DesktopModeFlags.QUICK_SWITCH.isEnabled(mContext))) {
             if ((nextPageTaskView instanceof DesktopTaskView
                     || currentPageTaskView instanceof DesktopTaskView)
                     && endTarget == NEW_TASK) {
@@ -1448,8 +1447,8 @@
         };
 
         if (DESKTOP_WINDOWING_MODE.isEnabled(mContext)
-                && !(WALLPAPER_ACTIVITY.isEnabled(mContext)
-                && Flags.enableDesktopWindowingQuickSwitch())) {
+                && !(DesktopModeFlags.WALLPAPER_ACTIVITY.isEnabled(mContext)
+                && DesktopModeFlags.QUICK_SWITCH.isEnabled(mContext))) {
             if (mRecentsView != null && (mRecentsView.getCurrentPageTaskView() != null
                     && !(mRecentsView.getCurrentPageTaskView() instanceof DesktopTaskView))) {
                 ActiveGestureLog.INSTANCE.trackEvent(ActiveGestureErrorDetector.GestureEvent
@@ -2296,8 +2295,8 @@
         });
 
         if (DESKTOP_WINDOWING_MODE.isEnabled(mContext)
-                && !(WALLPAPER_ACTIVITY.isEnabled(mContext)
-                        && Flags.enableDesktopWindowingQuickSwitch())) {
+                && !(DesktopModeFlags.WALLPAPER_ACTIVITY.isEnabled(mContext)
+                        && DesktopModeFlags.QUICK_SWITCH.isEnabled(mContext))) {
             if (mRecentsView.getNextPageTaskView() instanceof DesktopTaskView
                     || mRecentsView.getCurrentPageTaskView() instanceof DesktopTaskView) {
                 mRecentsViewScrollLinked = false;