commit 1983e4fb138793e2b02653616f54147160e3b348
author Tracy Zhou <tracyzhou@google.com> Tue Jun 18 20:25:33 2024 +0000
committer Tracy Zhou <tracyzhou@google.com> Wed Jun 19 18:45:22 2024 +0000
tree 046467a3453e2e9de9e5fc290febb068d92c858d
parent b47bed0fe6608a58b44aa6b8d2d59907a2ce3c88

Enable taskbar on phones when the flag is turned on

Bug: 348017501
Test: N/A
Flag: com.android.wm.shell.enable_taskbar_on_phones
Change-Id: I8f283609b24c49e4ecd37142b0d94e449d1dc118

src/com/android/launcher3/config/FeatureFlags.java

diff --git a/src/com/android/launcher3/config/FeatureFlags.java b/src/com/android/launcher3/config/FeatureFlags.java
index 33e6f91..d0596fa 100644
--- a/src/com/android/launcher3/config/FeatureFlags.java
+++ b/src/com/android/launcher3/config/FeatureFlags.java
@@ -19,6 +19,7 @@
 import static com.android.launcher3.config.FeatureFlags.BooleanFlag.DISABLED;
 import static com.android.launcher3.config.FeatureFlags.BooleanFlag.ENABLED;
 import static com.android.wm.shell.Flags.enableTaskbarNavbarUnification;
+import static com.android.wm.shell.Flags.enableTaskbarOnPhones;
 
 import android.content.res.Resources;
 
@@ -143,7 +144,7 @@
             DISABLED, "Sends a notification whenever launcher encounters an uncaught exception.");
 
     public static final boolean ENABLE_TASKBAR_NAVBAR_UNIFICATION =
-            enableTaskbarNavbarUnification() && !isPhone();
+            enableTaskbarNavbarUnification() && (!isPhone() || enableTaskbarOnPhones());
 
     private static boolean isPhone() {
         final boolean isPhone;