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

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

Merge "Not using Contacts app" into ub-launcher3-qt-dev

parents 428617eb f1e0c90a

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

+3 −3
Original line number Diff line number Diff line
@@ -64,7 +64,7 @@ public class TaplTestsQuickstep extends AbstractQuickStepTest { 
    private void startTestApps() throws Exception {

        startAppFast(getAppPackageName());

        startAppFast(resolveSystemApp(Intent.CATEGORY_APP_CALCULATOR));

        startAppFast(resolveSystemApp(Intent.CATEGORY_APP_CONTACTS));

        startTestActivity(2);



        executeOnLauncher(launcher -> assertTrue(

                "Launcher activity is the top activity; expecting another activity to be the top "
@@ -130,8 +130,8 @@ public class TaplTestsQuickstep extends AbstractQuickStepTest { 
        OverviewTask task = mLauncher.pressHome().switchToOverview().getCurrentTask();

        assertNotNull("overview.getCurrentTask() returned null (1)", task);

        assertNotNull("OverviewTask.open returned null", task.open());

        assertTrue("Contacts app didn't open from Overview", mDevice.wait(Until.hasObject(

                By.pkg(resolveSystemApp(Intent.CATEGORY_APP_CONTACTS)).depth(0)),

        assertTrue("Test activity didn't open from Overview", mDevice.wait(Until.hasObject(

                By.pkg(getAppPackageName()).text("TestActivity2")),

                LONG_WAIT_TIME_MS));

        executeOnLauncher(launcher -> assertTrue(

                "Launcher activity is the top activity; expecting another activity to be the top "

tests/AndroidManifest-common.xml

+2 −1
Original line number Diff line number Diff line
@@ -99,7 +99,8 @@ 
        </activity>

        <activity

            android:name="com.android.launcher3.testcomponent.BaseTestingActivity"

            android:label="LauncherTestApp">

            android:label="LauncherTestApp"

            android:taskAffinity="com.android.launcher3.testcomponent.Affinity1">

            <intent-filter>

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

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

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

+18 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ package com.android.launcher3.ui; 


import static androidx.test.InstrumentationRegistry.getInstrumentation;



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

import static com.android.systemui.shared.system.QuickStepContract.NAV_BAR_MODE_2BUTTON_OVERLAY;

import static com.android.systemui.shared.system.QuickStepContract.NAV_BAR_MODE_3BUTTON_OVERLAY;

import static com.android.systemui.shared.system.QuickStepContract.NAV_BAR_MODE_GESTURAL_OVERLAY;
@@ -28,6 +29,7 @@ import static java.lang.System.exit; 


import android.app.Instrumentation;

import android.content.BroadcastReceiver;

import android.content.ComponentName;

import android.content.Context;

import android.content.Intent;

import android.content.IntentFilter;
@@ -426,6 +428,22 @@ public abstract class AbstractLauncherUiTest { 
                mDevice.wait(Until.hasObject(By.pkg(packageName).depth(0)), LONG_WAIT_TIME_MS));

    }



    protected void startTestActivity(int activityNumber) {

        final String packageName = getAppPackageName();

        final Instrumentation instrumentation = getInstrumentation();

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

                getLaunchIntentForPackage(packageName);

        intent.addCategory(Intent.CATEGORY_LAUNCHER);

        intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);

        intent.setComponent(new ComponentName(packageName,

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

        instrumentation.getTargetContext().startActivity(intent);

        assertTrue(packageName + " didn't start",

                mDevice.wait(

                        Until.hasObject(By.pkg(packageName).text("TestActivity" + activityNumber)),

                        LONG_WAIT_TIME_MS));

    }



    protected static String resolveSystemApp(String category) {

        return getInstrumentation().getContext().getPackageManager().resolveActivity(

                new Intent(Intent.ACTION_MAIN).addCategory(category),