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

Commit 0896b68c authored by Vadim Tryshev's avatar Vadim Tryshev Committed by Android (Google) Code Review
Browse files

Merge "Removing dependency of All Apps test from 1P apps" into main

parents f912287c 38d395be

tests/AndroidManifest-common.xml

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

            </intent-filter>

        </activity-alias>

        <activity-alias android:name="AAAActivity"

            android:label="AAA"

            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="ZZZActivity"

            android:label="ZZZ"

            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>



        <!-- [b/197780098] Disable eager initialization of Jetpack libraries. -->

        <provider

tests/src/com/android/launcher3/allapps/TaplOpenCloseAllAppsTest.java

+4 −4
Original line number Diff line number Diff line
@@ -181,10 +181,10 @@ public class TaplOpenCloseAllAppsTest extends AbstractLauncherUiTest { 
            executeOnLauncher(launcher -> assertTrue("flingBackward() didn't scroll App Apps",

                    flingBackwardY < flingForwardY));



            // Test scrolling down to YouTube.

            assertNotNull("All apps: can't find YouTube", allApps.getAppIcon("YouTube"));

            // Test scrolling up to Camera.

            assertNotNull("All apps: can't find Camera", allApps.getAppIcon("Camera"));

            // Test scrolling down to the end of the app list.

            assertNotNull("All apps: can't find YouTube", allApps.getAppIcon("ZZZ"));

            // Test scrolling up to the beginning oof the app list.

            assertNotNull("All apps: can't find Camera", allApps.getAppIcon("AAA"));

            // Test failing to find a non-existing app.

            final AllApps allAppsFinal = allApps;

            expectFail("All apps: could find a non-existing app",