Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 60136287 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Re-enable testOverviewForTablet for persistent taskbar." into udc-dev... 

Merge "Re-enable testOverviewForTablet for persistent taskbar." into udc-dev am: 4b941231 am: d4df5d9f

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23267632



Change-Id: I4f715c5c8a54bd2c7eecf683400f77369d4423df
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 73be40fa d4df5d9f

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

+3 −1
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
package com.android.quickstep;



import static com.android.launcher3.ui.TaplTestsLauncher3.getAppPackageName;

import static com.android.quickstep.TaskbarModeSwitchRule.Mode.PERSISTENT;



import static org.junit.Assert.assertEquals;

import static org.junit.Assert.assertNotNull;
@@ -44,6 +45,7 @@ import com.android.launcher3.ui.TaplTestsLauncher3; 
import com.android.launcher3.util.Wait;

import com.android.launcher3.util.rule.ScreenRecordRule.ScreenRecord;

import com.android.quickstep.NavigationModeSwitchRule.NavigationModeSwitch;

import com.android.quickstep.TaskbarModeSwitchRule.TaskbarModeSwitch;

import com.android.quickstep.views.RecentsView;



import org.junit.After;
@@ -359,9 +361,9 @@ public class TaplTestsQuickstep extends AbstractQuickStepTest { 
        waitForState("Launcher internal state didn't switch to Home", () -> LauncherState.NORMAL);

    }



    @Ignore

    @Test

    @PortraitLandscape

    @TaskbarModeSwitch(mode = PERSISTENT)

    public void testOverviewForTablet() throws Exception {

        assumeTrue(mLauncher.isTablet());