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

Commit b111413d authored by Android Build Prod User's avatar Android Build Prod User Committed by Automerger Merge Worker
Browse files

Merge "Moving OrientationTouchTransformerTest to instrumentation tests" into...

Merge "Moving OrientationTouchTransformerTest to instrumentation tests" into sc-v2-dev am: 02da4740

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15628069

Change-Id: Ib3a335392f4f35e18ae258b07b3f5a16e8fc2be4
parents 05e0d86c 02da4740
Loading
Loading
Loading
Loading
+2 −2
Original line number Diff line number Diff line
@@ -462,7 +462,7 @@ class OrientationTouchTransformer {
                            + "mRotation: " + mRotation
                            + " this: " + this);
                }
                event.transform(mTmpMatrix);
                event.applyTransform(mTmpMatrix);
                return true;
            }
            mTmpPoint[0] = event.getX();
@@ -478,7 +478,7 @@ class OrientationTouchTransformer {
            }

            if (contains(mTmpPoint[0], mTmpPoint[1])) {
                event.transform(mTmpMatrix);
                event.applyTransform(mTmpMatrix);
                return true;
            }
            return false;
+8 −4
Original line number Diff line number Diff line
@@ -19,6 +19,8 @@ package com.android.quickstep;

import static android.view.Display.DEFAULT_DISPLAY;

import static androidx.test.core.app.ApplicationProvider.getApplicationContext;

import static com.android.quickstep.SysUINavigationMode.Mode.NO_BUTTON;

import static org.junit.Assert.assertFalse;
@@ -40,6 +42,9 @@ import android.view.Display;
import android.view.MotionEvent;
import android.view.Surface;

import androidx.test.ext.junit.runners.AndroidJUnit4;
import androidx.test.filters.SmallTest;

import com.android.launcher3.ResourceUtils;
import com.android.launcher3.util.DisplayController;

@@ -47,10 +52,9 @@ import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.MockitoAnnotations;
import org.robolectric.RobolectricTestRunner;
import org.robolectric.RuntimeEnvironment;

@RunWith(RobolectricTestRunner.class)
@SmallTest
@RunWith(AndroidJUnit4.class)
public class OrientationTouchTransformerTest {
    static class ScreenSize {
        int mHeight;
@@ -293,7 +297,7 @@ public class OrientationTouchTransformerTest {
    }

    private DisplayController.Info createDisplayInfo(ScreenSize screenSize, int rotation) {
        Context context = RuntimeEnvironment.application;
        Context context = getApplicationContext();
        Display display = spy(context.getSystemService(DisplayManager.class)
                .getDisplay(DEFAULT_DISPLAY));