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

Commit c7bb8479 authored by vadimt's avatar vadimt
Browse files

Fix pinning tests on android virtual device

Change-Id: I90a8753975538ab9864591a37a7d366e1222f2d8
parent 5338e054
Loading
Loading
Loading
Loading
+6 −6
Original line number Diff line number Diff line
@@ -17,26 +17,25 @@ package com.android.launcher3.ui.widget;

import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNotSame;
import static org.junit.Assert.assertTrue;

import android.app.PendingIntent;
import android.appwidget.AppWidgetManager;
import android.content.Intent;
import android.graphics.Color;
import android.view.View;

import androidx.test.filters.LargeTest;
import androidx.test.runner.AndroidJUnit4;
import androidx.test.uiautomator.By;
import androidx.test.uiautomator.UiObject2;
import androidx.test.uiautomator.Until;
import android.view.View;

import com.android.launcher3.ItemInfo;
import com.android.launcher3.LauncherAppWidgetInfo;
import com.android.launcher3.LauncherSettings.Favorites;
import com.android.launcher3.R;
import com.android.launcher3.WorkspaceItemInfo;
import com.android.launcher3.Utilities;
import com.android.launcher3.Workspace.ItemOperator;
import com.android.launcher3.WorkspaceItemInfo;
import com.android.launcher3.shortcuts.ShortcutKey;
import com.android.launcher3.testcomponent.AppWidgetNoConfig;
import com.android.launcher3.testcomponent.AppWidgetWithConfig;
@@ -49,7 +48,6 @@ import com.android.launcher3.util.rule.ShellCommandRule;
import com.android.launcher3.widget.WidgetCell;

import org.junit.Before;
import org.junit.Ignore;
import org.junit.Rule;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -181,7 +179,9 @@ public class RequestPinItemTest extends AbstractLauncherUiTest {

        // Accept confirmation:
        BlockingBroadcastReceiver resultReceiver = new BlockingBroadcastReceiver(mCallbackAction);
        mDevice.wait(Until.findObject(By.text("Add automatically")), DEFAULT_UI_TIMEOUT).click();
        mDevice.wait(Until.findObject(
                By.text(mLauncher.isAvd() ? "ADD AUTOMATICALLY" : "Add automatically")),
                DEFAULT_UI_TIMEOUT).click();
        Intent result = resultReceiver.blockingGetIntent();
        assertNotNull(result);
        mAppWidgetId = result.getIntExtra(AppWidgetManager.EXTRA_APPWIDGET_ID, -1);
+1 −1
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ import java.util.List;
 * Common overview pane for both Launcher and fallback recents
 */
public class BaseOverview extends LauncherInstrumentation.VisibleContainer {
    private static final int FLING_SPEED = LauncherInstrumentation.needSlowGestures() ? 500 : 1500;
    private static final int FLING_SPEED = LauncherInstrumentation.isAvd() ? 500 : 1500;
    private static final int FLINGS_FOR_DISMISS_LIMIT = 40;

    BaseOverview(LauncherInstrumentation launcher) {
+1 −1
Original line number Diff line number Diff line
@@ -198,7 +198,7 @@ public final class LauncherInstrumentation {
        return NavigationModel.THREE_BUTTON;
    }

    public static boolean needSlowGestures() {
    public static boolean isAvd() {
        return Build.MODEL.contains("Cuttlefish");
    }

+1 −1
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ import com.android.launcher3.TestProtocol;
 */
public final class Workspace extends Home {
    private static final float FLING_SPEED =
            LauncherInstrumentation.needSlowGestures() ? 1500.0F : 3500.0F;
            LauncherInstrumentation.isAvd() ? 1500.0F : 3500.0F;
    private static final int DRAG_DURACTION = 2000;
    private final UiObject2 mHotseat;