Revert "Add TaskbarModeSwitchRule to test both transient/persistent taskbar."

This reverts commit d5a6b5f688.

Reason for revert: Breaks tests due to "SharedPreferences in credential encrypted storage are not available until after user is unlocked"

Bug: 258256906
Change-Id: I1de69249685f9d2e71183357cf3eda8d443c7d97

quickstep/src/com/android/launcher3/taskbar/TaskbarStashController.java

@@ -37,7 +37,6 @@ import android.view.View;
 import android.view.ViewConfiguration;
 
 import androidx.annotation.NonNull;
-import androidx.annotation.VisibleForTesting;
 
 import com.android.internal.jank.InteractionJankMonitor;
 import com.android.launcher3.Alarm;
@@ -170,7 +169,6 @@ public class TaskbarStashController implements TaskbarControllers.LoggableTaskba
     private boolean mEnableManualStashingDuringTests = false;
 
     private final Alarm mTimeoutAlarm = new Alarm();
-    private boolean mEnableBlockingTimeoutDuringTests = false;
 
     // Evaluate whether the handle should be stashed
     private final StatePropertyHolder mStatePropertyHolder = new StatePropertyHolder(
@@ -269,20 +267,10 @@ public class TaskbarStashController implements TaskbarControllers.LoggableTaskba
      * Enables support for manual stashing. This should only be used to add this functionality
      * to Launcher specific tests.
      */
-    @VisibleForTesting
     public void enableManualStashingDuringTests(boolean enableManualStashing) {
         mEnableManualStashingDuringTests = enableManualStashing;
     }
 
-    /**
-     * Enables the auto timeout for taskbar stashing. This method should only be used for taskbar
-     * testing.
-     */
-    @VisibleForTesting
-    public void enableBlockingTimeoutDuringTests(boolean enableBlockingTimeout) {
-        mEnableBlockingTimeoutDuringTests = enableBlockingTimeout;
-    }
-
     /**
      * Sets the flag indicating setup UI is visible
      */
@@ -858,12 +846,12 @@ public class TaskbarStashController implements TaskbarControllers.LoggableTaskba
      * Attempts to start timer to auto hide the taskbar based on time.
      */
     public void tryStartTaskbarTimeout() {
-        if (!DisplayController.isTransientTaskbar(mActivity)
-                || mIsStashed
-                || mEnableBlockingTimeoutDuringTests) {
+        if (!DisplayController.isTransientTaskbar(mActivity)) {
+            return;
+        }
+        if (mIsStashed) {
             return;
         }
-
         cancelTimeoutIfExists();
 
         mTimeoutAlarm.setOnAlarmListener(this::onTaskbarTimeout);