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

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

Merge "Not using Settings in TaplTestsLauncher3.testDragAppIcon" into ub-launcher3-master

parents 2c46fcfa fb0cb7a2

tests/AndroidManifest-common.xml

+8 −0
Original line number Diff line number Diff line
@@ -97,5 +97,13 @@ 
                <category android:name="android.intent.category.LAUNCHER_APP" />

            </intent-filter>

        </activity>

        <activity

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

            android:label="LauncherTestApp">

            <intent-filter>

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

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

            </intent-filter>

        </activity>

    </application>

</manifest>

tests/src/com/android/launcher3/testcomponent/BaseTestingActivity.java

+2 −0
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ import android.content.BroadcastReceiver; 
import android.content.Context;

import android.content.Intent;

import android.content.IntentFilter;

import android.graphics.Color;

import android.os.Bundle;

import android.util.TypedValue;

import android.view.View;
@@ -63,6 +64,7 @@ public class BaseTestingActivity extends Activity implements View.OnClickListene 
        mView = new LinearLayout(this);

        mView.setPadding(mMargin, mMargin, mMargin, mMargin);

        mView.setOrientation(LinearLayout.VERTICAL);

        mView.setBackgroundColor(Color.BLUE);

        setContentView(mView);



        registerReceiver(mCommandReceiver, new IntentFilter(mAction + SUFFIX_COMMAND));

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

+2 −4
Original line number Diff line number Diff line
@@ -330,9 +330,7 @@ public class TaplTestsLauncher3 extends AbstractLauncherUiTest { 
    public void testDragAppIcon() throws Throwable {

        try {

            TestProtocol.sDebugTracing = true;

            LauncherActivityInfo settingsApp = getSettingsApp();



            final String appName = settingsApp.getLabel().toString();

            final String appName = "LauncherTestApp";

            // 1. Open all apps and wait for load complete.

            // 2. Drag icon to homescreen.

            // 3. Verify that the icon works on homescreen.
@@ -341,7 +339,7 @@ public class TaplTestsLauncher3 extends AbstractLauncherUiTest { 
                    getAppIcon(appName).

                    dragToWorkspace().

                    getWorkspaceAppIcon(appName).

                    launch(settingsApp.getComponentName().getPackageName());

                    launch(getInstrumentation().getContext().getPackageName());

        } finally {

            TestProtocol.sDebugTracing = false;

        }