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

Commit fad07095 authored by Vinit Nayak's avatar Vinit Nayak
Browse files

Update test infra to allow split placeholder view in all apps 

* Previously we assume the split placeholder view shouldn't be
present in any states except launcher split selection, however
with contextual that changes.
* Now we only ensure that view isn't there in all apps when
we are not in split selection.

Test: Test runs and passes locally
Fixes: 323418145
Change-Id: Ida92030f9b139532ebb09c1d2646795bbb940bfc
parent fe35d069

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

+1 −1
Original line number Diff line number Diff line
@@ -109,7 +109,7 @@ public class TaplTestsSplitscreen extends AbstractQuickStepTest { 
            // We're staying in all apps, use same instance

            mLauncher.getAllApps()

                    .getAppIcon(CALCULATOR_APP_NAME)

                    .launch(CALCULATOR_APP_PACKAGE);

                    .launchIntoSplitScreen();

        } else {

            // We're in overview, use taskbar instance

            mLauncher.getLaunchedAppState()

src/com/android/launcher3/testing/TestInformationHandler.java

+7 −0
Original line number Diff line number Diff line
@@ -18,6 +18,8 @@ package com.android.launcher3.testing; 
import static com.android.launcher3.Flags.enableGridOnlyOverview;

import static com.android.launcher3.allapps.AllAppsStore.DEFER_UPDATES_TEST;

import static com.android.launcher3.config.FeatureFlags.FOLDABLE_SINGLE_PAGE;

import static com.android.launcher3.config.FeatureFlags.enableSplitContextually;

import static com.android.launcher3.testing.shared.TestProtocol.TEST_INFO_RESPONSE_FIELD;

import static com.android.launcher3.util.Executors.MAIN_EXECUTOR;



import android.app.Activity;
@@ -202,6 +204,11 @@ public class TestInformationHandler implements ResourceBasedOverride { 
                return response;

            }



            case TestProtocol.REQUEST_GET_SPLIT_SELECTION_ACTIVE:

                response.putBoolean(TEST_INFO_RESPONSE_FIELD, enableSplitContextually()

                        && Launcher.ACTIVITY_TRACKER.getCreatedActivity().isSplitSelectionActive());

                return response;



            case TestProtocol.REQUEST_ENABLE_ROTATION:

                MAIN_EXECUTOR.submit(() ->

                        Launcher.ACTIVITY_TRACKER.getCreatedActivity().getRotationHelper()

tests/multivalentTests/shared/com/android/launcher3/testing/shared/TestProtocol.java

+1 −0
Original line number Diff line number Diff line
@@ -149,6 +149,7 @@ public final class TestProtocol { 
    public static final String REQUEST_GET_OVERVIEW_PAGE_SPACING = "get-overview-page-spacing";

    public static final String REQUEST_GET_OVERVIEW_CURRENT_PAGE_INDEX =

            "get-overview-current-page-index";

    public static final String REQUEST_GET_SPLIT_SELECTION_ACTIVE = "get-split-selection-active";

    public static final String REQUEST_ENABLE_ROTATION = "enable_rotation";

    public static final String REQUEST_ENABLE_SUGGESTION = "enable-suggestion";

    public static final String REQUEST_MODEL_QUEUE_CLEARED = "model-queue-cleared";

tests/multivalentTests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java

+8 −1
Original line number Diff line number Diff line
@@ -28,7 +28,9 @@ import static android.view.MotionEvent.AXIS_GESTURE_SWIPE_FINGER_COUNT; 
import static com.android.launcher3.tapl.Folder.FOLDER_CONTENT_RES_ID;

import static com.android.launcher3.tapl.TestHelpers.getOverviewPackageName;

import static com.android.launcher3.testing.shared.TestProtocol.NORMAL_STATE_ORDINAL;

import static com.android.launcher3.testing.shared.TestProtocol.REQUEST_GET_SPLIT_SELECTION_ACTIVE;

import static com.android.launcher3.testing.shared.TestProtocol.REQUEST_NUM_ALL_APPS_COLUMNS;

import static com.android.launcher3.testing.shared.TestProtocol.TEST_INFO_RESPONSE_FIELD;



import android.app.ActivityManager;

import android.app.Instrumentation;
@@ -873,7 +875,6 @@ public final class LauncherInstrumentation { 
                    waitUntilLauncherObjectGone(WORKSPACE_RES_ID);

                    waitUntilLauncherObjectGone(WIDGETS_RES_ID);

                    waitUntilSystemLauncherObjectGone(OVERVIEW_RES_ID);

                    waitUntilSystemLauncherObjectGone(SPLIT_PLACEHOLDER_RES_ID);

                    waitUntilLauncherObjectGone(KEYBOARD_QUICK_SWITCH_RES_ID);



                    if (is3PLauncher() && isTablet() && !isTransientTaskbar()) {
@@ -882,6 +883,12 @@ public final class LauncherInstrumentation { 
                        waitUntilSystemLauncherObjectGone(TASKBAR_RES_ID);

                    }



                    boolean splitSelectionActive = getTestInfo(REQUEST_GET_SPLIT_SELECTION_ACTIVE)

                            .getBoolean(TEST_INFO_RESPONSE_FIELD);

                    if (!splitSelectionActive) {

                        waitUntilSystemLauncherObjectGone(SPLIT_PLACEHOLDER_RES_ID);

                    } // do nothing, we expect that view



                    return waitForLauncherObject(APPS_RES_ID);

                }

                case OVERVIEW: