openkylin
/
platform_packages_apps_Launcher3
mirror of https://gitee.com/openkylin/platform_packages_apps_launcher3.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge "Moving OrientationTouchTransformerTest to instrumentation tests" into sc-v2-dev

This commit is contained in:
Android Build Prod User 2021-08-24 23:30:54 +00:00 committed by Android (Google) Code Review
parent 497a6ad826 39aa2e0f1d
commit 02da47404c
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
quickstep/src/com/android/quickstep/OrientationTouchTransformer.java
View File

@ -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;

12
quickstep/robolectric_tests/src/com/android/quickstep/OrientationTouchTransformerTest.java → quickstep/tests/src/com/android/quickstep/OrientationTouchTransformerTest.java
View File

@ -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));