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

Commit 36304fd1 authored by Jordan Silva's avatar Jordan Silva Committed by Android (Google) Code Review
Browse files

Merge "Add function to start a test activity with different name and label" into main

parents 410b2d74 baae8c55

tests/AndroidManifest-common.xml

+18 −0
Original line number Diff line number Diff line
@@ -301,6 +301,24 @@ 
                <category android:name="android.intent.category.LAUNCHER" />

            </intent-filter>

        </activity-alias>

        <activity-alias android:name="SplitTask1"

            android:label="1st TopLeft"

            android:exported="true"

            android:targetActivity="com.android.launcher3.testcomponent.BaseTestingActivity">

            <intent-filter>

                <action android:name="android.intent.action.MAIN"/>

                <category android:name="android.intent.category.LAUNCHER"/>

            </intent-filter>

        </activity-alias>

        <activity-alias android:name="SplitTask2"

            android:label="2nd BottomRight"

            android:exported="true"

            android:targetActivity="com.android.launcher3.testcomponent.BaseTestingActivity">

            <intent-filter>

                <action android:name="android.intent.action.MAIN"/>

                <category android:name="android.intent.category.LAUNCHER"/>

            </intent-filter>

        </activity-alias>

        <activity-alias android:name="MaxShortcutsActivity"

            android:label="TestActivityMaxShortcuts"

            android:exported="true"

tests/multivalentTests/src/com/android/launcher3/ui/AbstractLauncherUiTest.java

+7 −3
Original line number Diff line number Diff line
@@ -561,16 +561,20 @@ public abstract class AbstractLauncherUiTest { 
                true /* newTask */);

    }



    public static void startTestActivity(int activityNumber) {

    public static void startTestActivity(String activityName, String activityLabel) {

        final String packageName = getAppPackageName();

        final Intent intent = getInstrumentation().getContext().getPackageManager().

                getLaunchIntentForPackage(packageName);

        intent.setComponent(new ComponentName(packageName,

                "com.android.launcher3.tests.Activity" + activityNumber));

        startIntent(intent, By.pkg(packageName).text("TestActivity" + activityNumber),

                "com.android.launcher3.tests." + activityName));

        startIntent(intent, By.pkg(packageName).text(activityLabel),

                false /* newTask */);

    }



    public static void startTestActivity(int activityNumber) {

        startTestActivity("Activity" + activityNumber, "TestActivity" + activityNumber);

    }



    public static void startImeTestActivity() {

        final String packageName = getAppPackageName();

        final Intent intent = getInstrumentation().getContext().getPackageManager().