[Predictive Back] Replace legacy flag with aconfig flag in launcher
Fix: 323971106 Flag: ACONFIG launcher.enable_predictive_back_gesture DISABLED Test: manual Change-Id: Ie8051af2540699a7d75f1ed05132584d0b40d17d
This commit is contained in:
@@ -35,9 +35,9 @@ import androidx.test.runner.AndroidJUnit4;
|
||||
import androidx.test.uiautomator.By;
|
||||
import androidx.test.uiautomator.Until;
|
||||
|
||||
import com.android.launcher3.Flags;
|
||||
import com.android.launcher3.Launcher;
|
||||
import com.android.launcher3.LauncherState;
|
||||
import com.android.launcher3.config.FeatureFlags;
|
||||
import com.android.launcher3.tapl.LaunchedAppState;
|
||||
import com.android.launcher3.tapl.LauncherInstrumentation.NavigationModel;
|
||||
import com.android.launcher3.tapl.Overview;
|
||||
@@ -394,7 +394,7 @@ public class TaplTestsQuickstep extends AbstractQuickStepTest {
|
||||
READ_DEVICE_CONFIG_PERMISSION);
|
||||
// Debug if we need to goHome to prevent wrong previous state b/315525621
|
||||
mLauncher.goHome();
|
||||
assumeFalse(FeatureFlags.ENABLE_BACK_SWIPE_LAUNCHER_ANIMATION.get());
|
||||
assumeFalse(Flags.enablePredictiveBackGesture());
|
||||
mLauncher.getWorkspace().switchToAllApps().pressBackToWorkspace();
|
||||
waitForState("Launcher internal state didn't switch to Home", () -> LauncherState.NORMAL);
|
||||
|
||||
|
||||
@@ -28,7 +28,7 @@ import androidx.test.filters.LargeTest;
|
||||
import androidx.test.platform.app.InstrumentationRegistry;
|
||||
import androidx.test.runner.AndroidJUnit4;
|
||||
|
||||
import com.android.launcher3.config.FeatureFlags;
|
||||
import com.android.launcher3.Flags;
|
||||
import com.android.launcher3.tapl.LauncherInstrumentation.TrackpadGestureType;
|
||||
import com.android.launcher3.tapl.Workspace;
|
||||
import com.android.launcher3.ui.AbstractLauncherUiTest;
|
||||
@@ -77,7 +77,7 @@ public class TaplTestsTrackpad extends AbstractQuickStepTest {
|
||||
@NavigationModeSwitch(mode = ZERO_BUTTON)
|
||||
public void pressBack() throws Exception {
|
||||
assumeTrue(mLauncher.isTablet());
|
||||
assumeFalse(FeatureFlags.ENABLE_BACK_SWIPE_LAUNCHER_ANIMATION.get());
|
||||
assumeFalse(Flags.enablePredictiveBackGesture());
|
||||
Instrumentation instrumentation = InstrumentationRegistry.getInstrumentation();
|
||||
|
||||
try {
|
||||
|
||||
Reference in New Issue
Block a user