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

Commit 39c548bd authored by Alex Chau's avatar Alex Chau Committed by Android (Google) Code Review
Browse files

Merge "Revert "Update Tapl tests for enable_grid_only_overview"" into main

parents c543b460 0552d37f

quickstep/res/layout/task.xml

+0 −1
Original line number Diff line number Diff line
@@ -19,7 +19,6 @@ 
    xmlns:android="http://schemas.android.com/apk/res/android"

    xmlns:androidprv="http://schemas.android.com/apk/prv/res/android"

    xmlns:launcher="http://schemas.android.com/apk/res-auto"

    android:id="@+id/task"

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:clipChildren="false"

quickstep/res/layout/task_desktop.xml

+0 −1
Original line number Diff line number Diff line
@@ -19,7 +19,6 @@ 
    xmlns:android="http://schemas.android.com/apk/res/android"

    xmlns:androidprv="http://schemas.android.com/apk/prv/res/android"

    xmlns:launcher="http://schemas.android.com/apk/res-auto"

    android:id="@+id/task"

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:clipChildren="true"

quickstep/res/layout/task_grouped.xml

+0 −1
Original line number Diff line number Diff line
@@ -24,7 +24,6 @@ 
    xmlns:android="http://schemas.android.com/apk/res/android"

    xmlns:androidprv="http://schemas.android.com/apk/prv/res/android"

    xmlns:launcher="http://schemas.android.com/apk/res-auto"

    android:id="@+id/task"

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:clipChildren="false"

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

+1 −1
Original line number Diff line number Diff line
@@ -92,7 +92,7 @@ public class TaplOverviewIconTest extends AbstractLauncherUiTest { 
        startTestActivity(2);

        startTestActivity(3);



        if (mLauncher.isTablet() && !mLauncher.isGridOnlyOverviewEnabled()) {

        if (mLauncher.isTablet()) {

            mLauncher.goHome().switchToOverview().getOverviewActions()

                    .clickSplit()

                    .getTestActivityTask(2)

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

+11 −16
Original line number Diff line number Diff line
@@ -179,8 +179,6 @@ public class TaplTestsQuickstep extends AbstractQuickStepTest { 
    @PortraitLandscape

    @PlatinumTest(focusArea = "launcher")

    public void testOverviewActions() throws Exception {

        assumeFalse("Skipping Overview Actions tests for grid only overview",

                mLauncher.isTablet() && mLauncher.isGridOnlyOverviewEnabled());

        // Experimenting for b/165029151:

        final Overview overview = mLauncher.goHome().switchToOverview();

        if (overview.hasTasks()) overview.dismissAllTasks();
@@ -379,9 +377,7 @@ public class TaplTestsQuickstep extends AbstractQuickStepTest { 
        // Test opening the task.

        overview.getCurrentTask().open();

        assertTrue("Test activity didn't open from Overview",

                mDevice.wait(Until.hasObject(By.pkg(getAppPackageName()).text(

                                mLauncher.isGridOnlyOverviewEnabled() ? "TestActivity12"

                                        : "TestActivity13")),

                mDevice.wait(Until.hasObject(By.pkg(getAppPackageName()).text("TestActivity10")),

                        DEFAULT_UI_TIMEOUT));



        // Scroll the task offscreen as it is now first
@@ -402,17 +398,16 @@ public class TaplTestsQuickstep extends AbstractQuickStepTest { 
                (Math.abs(getTopRowTaskCountForTablet(launcher) - getBottomRowTaskCountForTablet(

                        launcher)) <= 1)));



        // TODO(b/308841019): Re-enable after fixing Overview jank when dismiss

//        // Test dismissing more tasks.

//        assertTrue("Launcher internal state didn't remain in Overview",

//                isInState(() -> LauncherState.OVERVIEW));

//        overview.getCurrentTask().dismiss();

//        assertTrue("Launcher internal state didn't remain in Overview",

//                isInState(() -> LauncherState.OVERVIEW));

//        overview.getCurrentTask().dismiss();

//        executeOnLauncher(launcher -> assertTrue("Grid did not rebalance after multiple dismissals",

//                (Math.abs(getTopRowTaskCountForTablet(launcher) - getBottomRowTaskCountForTablet(

//                        launcher)) <= 1)));

        // Test dismissing more tasks.

        assertTrue("Launcher internal state didn't remain in Overview",

                isInState(() -> LauncherState.OVERVIEW));

        overview.getCurrentTask().dismiss();

        assertTrue("Launcher internal state didn't remain in Overview",

                isInState(() -> LauncherState.OVERVIEW));

        overview.getCurrentTask().dismiss();

        executeOnLauncher(launcher -> assertTrue("Grid did not rebalance after multiple dismissals",

                (Math.abs(getTopRowTaskCountForTablet(launcher) - getBottomRowTaskCountForTablet(

                        launcher)) <= 1)));



        // Test dismissing all tasks.

        mLauncher.goHome().switchToOverview().dismissAllTasks();