commit 1b499bfde825a99eba23e273b1fbb0b83cc14d24
author Ats Jenk <atsjenk@google.com> Fri Dec 02 06:12:51 2022 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Dec 02 06:12:51 2022 +0000
tree de81ec318d2c0d301d4cea5ed02f83f852dcb84f
parent 4093307b8786b7050b17a9ee5ed246121b086def
parent 8121e0d8b1d861bea3de068fba28931e9ccd2fab

Merge "Add a flag to not disable back gesture in launcher" into tm-qpr-dev

src/com/android/launcher3/Launcher.java

diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index 5cce407..1a6c68d 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -313,6 +313,12 @@
     private static final FloatProperty<Hotseat> HOTSEAT_WIDGET_SCALE =
             HOTSEAT_SCALE_PROPERTY_FACTORY.get(SCALE_INDEX_WIDGET_TRANSITION);
 
+    private static final boolean DESKTOP_MODE_1_SUPPORTED =
+            "1".equals(Utilities.getSystemProperty("persist.wm.debug.desktop_mode", "0"));
+
+    private static final boolean DESKTOP_MODE_2_SUPPORTED =
+            "1".equals(Utilities.getSystemProperty("persist.wm.debug.desktop_mode_2", "0"));
+
     @Thunk
     Workspace<?> mWorkspace;
     @Thunk
@@ -3154,6 +3160,10 @@
     }
 
     private void updateDisallowBack() {
+        if (DESKTOP_MODE_1_SUPPORTED || DESKTOP_MODE_2_SUPPORTED) {
+            // Do not disable back in launcher when prototype behavior is enabled
+            return;
+        }
         LauncherRootView rv = getRootView();
         if (rv != null) {
             boolean disableBack = getStateManager().getState() == NORMAL