diff options
| author | shreerag <shreerag@google.com> | 2019-08-21 18:09:47 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-08-21 18:09:47 -0700 |
| commit | b8a54c7b3a5466d0b601cc94d9672ebb96995d4f (patch) | |
| tree | 6265e9bf717220512bcb0562246e4b3acd5ab63a | |
| parent | 0bbbca91ae313cd504d9c18a300fc862a655a2af (diff) | |
| parent | c55b42f8e23a952f3d58dee1a13421c531e75fd4 (diff) | |
| download | cts-b8a54c7b3a5466d0b601cc94d9672ebb96995d4f.tar.gz | |
Merge "Fix ViewTest.testOnTouchEvent for Wear" into oreo-mr1-cts-dev
am: c55b42f8e2
Change-Id: I7624e517deb90315eb3823367ef2187668032c4d
| -rw-r--r-- | tests/tests/view/res/layout/view_layout.xml | 4 | ||||
| -rw-r--r-- | tests/tests/view/src/android/view/cts/ViewTest.java | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/tests/tests/view/res/layout/view_layout.xml b/tests/tests/view/res/layout/view_layout.xml index 6f886bbf9fd..fbdddc2c55a 100644 --- a/tests/tests/view/res/layout/view_layout.xml +++ b/tests/tests/view/res/layout/view_layout.xml @@ -26,8 +26,8 @@ <android.view.cts.MockView android:id="@+id/mock_view" - android:layout_width="100dp" - android:layout_height="75dp"/> + android:layout_width="75dp" + android:layout_height="100dp"/> <android.view.cts.MockView android:id="@+id/scroll_view" diff --git a/tests/tests/view/src/android/view/cts/ViewTest.java b/tests/tests/view/src/android/view/cts/ViewTest.java index 194fd78039b..cdb22233707 100644 --- a/tests/tests/view/src/android/view/cts/ViewTest.java +++ b/tests/tests/view/src/android/view/cts/ViewTest.java @@ -1824,8 +1824,8 @@ public class ViewTest { final MockView view = (MockView) mActivity.findViewById(R.id.mock_view); float density = view.getContext().getResources().getDisplayMetrics().density; - int size1 = (int) (100 * density + 0.5); - int size2 = (int) (75 * density + 0.5); + int size1 = (int) (75 * density + 0.5); + int size2 = (int) (100 * density + 0.5); assertTrue(view.hasCalledOnMeasure()); assertEquals(size1, view.getMeasuredWidth()); @@ -2424,8 +2424,8 @@ public class ViewTest { Rect rect = new Rect(); float density = view.getContext().getResources().getDisplayMetrics().density; - int size1 = (int) (100 * density + 0.5); - int size2 = (int) (75 * density + 0.5); + int size1 = (int) (75 * density + 0.5); + int size2 = (int) (100 * density + 0.5); assertTrue(view.getLocalVisibleRect(rect)); assertEquals(0, rect.left); |