Merge "Revert "Change TAPL to swipe to stash taskbar (instead of deprec..."" into main

quickstep/tests/src/com/android/quickstep/TaplTestsPersistentTaskbar.java

@@ -20,10 +20,9 @@ import static com.android.quickstep.TaskbarModeSwitchRule.Mode.PERSISTENT;
 import androidx.test.filters.LargeTest;
 import androidx.test.runner.AndroidJUnit4;
 
-import com.android.launcher3.ui.PortraitLandscapeRunner.PortraitLandscape;
-import com.android.quickstep.NavigationModeSwitchRule.NavigationModeSwitch;
 import com.android.quickstep.TaskbarModeSwitchRule.TaskbarModeSwitch;
 
+import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
@@ -33,10 +32,17 @@ public class TaplTestsPersistentTaskbar extends AbstractTaplTestsTaskbar {
 
     @Test
     @TaskbarModeSwitch(mode = PERSISTENT)
-    @PortraitLandscape
-    @NavigationModeSwitch
-    public void testTaskbarFillsWidth() {
-        // Width check is performed inside TAPL whenever getTaskbar() is called.
-        getTaskbar();
+    public void testHideShowTaskbar() {
+        getTaskbar().hide();
+        mLauncher.getLaunchedAppState().showTaskbar();
+    }
+
+    @Test
+    @TaskbarModeSwitch(mode = PERSISTENT)
+    @Ignore // b/301575789
+    public void testHideTaskbarPersistsOnRecreate() {
+        getTaskbar().hide();
+        mLauncher.recreateTaskbar();
+        mLauncher.getLaunchedAppState().assertTaskbarHidden();
     }
 }

quickstep/tests/src/com/android/quickstep/TaplTestsQuickstep.java

@@ -18,6 +18,7 @@ package com.android.quickstep;
 
 import static com.android.launcher3.util.rule.TestStabilityRule.LOCAL;
 import static com.android.launcher3.util.rule.TestStabilityRule.PLATFORM_POSTSUBMIT;
+import static com.android.quickstep.TaskbarModeSwitchRule.Mode.PERSISTENT;
 import static com.android.quickstep.TaskbarModeSwitchRule.Mode.TRANSIENT;
 
 import static org.junit.Assert.assertEquals;
@@ -294,7 +295,7 @@ public class TaplTestsQuickstep extends AbstractQuickStepTest {
     }
 
     @Test
-    @TaskbarModeSwitch
+    @TaskbarModeSwitch(mode = PERSISTENT)
     public void testQuickSwitchToPreviousAppForTablet() throws Exception {
         assumeTrue(mLauncher.isTablet());
         startTestActivity(2);
@@ -303,33 +304,22 @@ public class TaplTestsQuickstep extends AbstractQuickStepTest {
         // Set ignoreTaskbarVisibility to true to verify the task bar visibility explicitly.
         mLauncher.setIgnoreTaskbarVisibility(true);
 
-
-        try {
-            boolean isTransientTaskbar = mLauncher.isTransientTaskbar();
-            // Expect task bar invisible when the launched app was the IME activity.
-            LaunchedAppState launchedAppState = getAndAssertLaunchedApp();
-            if (!isTransientTaskbar && isHardwareKeyboard()) {
-                launchedAppState.assertTaskbarVisible();
-            } else {
-                launchedAppState.assertTaskbarHidden();
-            }
-
-            // Quick-switch to the test app with swiping to right.
-            quickSwitchToPreviousAppAndAssert(true /* toRight */);
-
-            assertTestActivityIsRunning(2,
-                    "The first app we should have quick switched to is not running");
-            launchedAppState = getAndAssertLaunchedApp();
-            if (isTransientTaskbar) {
-                launchedAppState.assertTaskbarHidden();
-            } else {
-                // Expect taskbar visible when the launched app was the test activity.
-                launchedAppState.assertTaskbarVisible();
-            }
-        } finally {
-            // Reset ignoreTaskbarVisibility to ensure other tests still verify it.
-            mLauncher.setIgnoreTaskbarVisibility(false);
+        // Expect task bar invisible when the launched app was the IME activity.
+        LaunchedAppState launchedAppState = getAndAssertLaunchedApp();
+        if (isHardwareKeyboard()) {
+            launchedAppState.assertTaskbarVisible();
+        } else {
+            launchedAppState.assertTaskbarHidden();
         }
+
+        // Quick-switch to the test app with swiping to right.
+        quickSwitchToPreviousAppAndAssert(true /* toRight */);
+
+        assertTestActivityIsRunning(2,
+                "The first app we should have quick switched to is not running");
+        // Expect task bar visible when the launched app was the test activity.
+        launchedAppState = getAndAssertLaunchedApp();
+        launchedAppState.assertTaskbarVisible();
     }
 
     private boolean isHardwareKeyboard() {
@@ -368,7 +358,7 @@ public class TaplTestsQuickstep extends AbstractQuickStepTest {
 
     @Test
     @PortraitLandscape
-    @TaskbarModeSwitch()
+    @TaskbarModeSwitch(mode = PERSISTENT)
     @PlatinumTest(focusArea = "launcher")
     @TestStabilityRule.Stability(flavors = LOCAL | PLATFORM_POSTSUBMIT) // b/309820115
     @ScreenRecord // b/309820115
@@ -464,7 +454,6 @@ public class TaplTestsQuickstep extends AbstractQuickStepTest {
 
     @Test
     @PortraitLandscape
-    @TaskbarModeSwitch
     public void testTaskbarDeadzonesForTablet() throws Exception {
         assumeTrue(mLauncher.isTablet());
 
@@ -477,29 +466,15 @@ public class TaplTestsQuickstep extends AbstractQuickStepTest {
                 launcher -> assertTrue("Should have at least 3 tasks",
                         getTaskCount(launcher) >= 3));
 
-        if (mLauncher.isTransientTaskbar()) {
-            // On transient taskbar, it should dismiss when tapping outside taskbar bounds.
-            overview.touchTaskbarBottomCorner(/* tapRight= */ false);
-            assertTrue("Launcher internal state should be Normal",
-                    isInState(() -> LauncherState.NORMAL));
+        // On persistent taskbar, it should not dismiss when tapping the taskbar
+        overview.touchTaskbarBottomCorner(/* tapRight= */ false);
+        assertTrue("Launcher internal state should be Overview",
+                isInState(() -> LauncherState.OVERVIEW));
 
-            overview = mLauncher.getWorkspace().switchToOverview();
-
-            // On transient taskbar, it should dismiss when tapping outside taskbar bounds.
-            overview.touchTaskbarBottomCorner(/* tapRight= */ true);
-            assertTrue("Launcher internal state should be Normal",
-                    isInState(() -> LauncherState.NORMAL));
-        } else {
-            // On persistent taskbar, it should not dismiss when tapping the taskbar
-            overview.touchTaskbarBottomCorner(/* tapRight= */ false);
-            assertTrue("Launcher internal state should be Overview",
-                    isInState(() -> LauncherState.OVERVIEW));
-
-            // On persistent taskbar, it should not dismiss when tapping the taskbar
-            overview.touchTaskbarBottomCorner(/* tapRight= */ true);
-            assertTrue("Launcher internal state should be Overview",
-                    isInState(() -> LauncherState.OVERVIEW));
-        }
+        // On persistent taskbar, it should not dismiss when tapping the taskbar
+        overview.touchTaskbarBottomCorner(/* tapRight= */ true);
+        assertTrue("Launcher internal state should be Overview",
+                isInState(() -> LauncherState.OVERVIEW));
     }
 
     @Test

quickstep/tests/src/com/android/quickstep/TaplTestsTransientTaskbar.java

@@ -24,7 +24,6 @@ import static org.junit.Assume.assumeTrue;
 import androidx.test.filters.LargeTest;
 import androidx.test.runner.AndroidJUnit4;
 
-import com.android.launcher3.ui.PortraitLandscapeRunner.PortraitLandscape;
 import com.android.quickstep.TaskbarModeSwitchRule.TaskbarModeSwitch;
 
 import org.junit.Test;
@@ -65,12 +64,4 @@ public class TaplTestsTransientTaskbar extends AbstractTaplTestsTaskbar {
         getTaskbar().getAppIcon(TEST_APP_NAME).launch(TEST_APP_PACKAGE);
         mLauncher.getLaunchedAppState().clickStashedTaskbarToGoHome();
     }
-
-    @Test
-    @TaskbarModeSwitch(mode = TRANSIENT)
-    @PortraitLandscape
-    public void testSwipeToStashAndUnstash() {
-        getTaskbar().swipeDownToStash();
-        mLauncher.getLaunchedAppState().swipeUpToUnstashTaskbar();
-    }
 }