diff options
| author | shreerag <shreerag@google.com> | 2019-06-18 14:39:09 -0700 |
|---|---|---|
| committer | Vishal Sheth <vishalsheth@google.com> | 2019-08-21 16:19:00 -0700 |
| commit | 662710e3d15d17a0f033f1718bddadf358f2c3ef (patch) | |
| tree | 55bde57e94b4a6b5f9fb7685ffd4173f99b1c3bb | |
| parent | 9fe71a80ed80e1a995eb49ce1eaa9c665c4d0b1a (diff) | |
| download | cts-662710e3d15d17a0f033f1718bddadf358f2c3ef.tar.gz | |
Fix ViewTest.testOnTouchEvent for Wear
Switching width/height dimensions on MockView to ensure it fits on circular screens.
Test: run cts -m CtsViewTestCases --test android.view.cts.ViewTest
Bug: 134871138
Change-Id: I9d2c537391b31eee3b070a76cc284b781f685d02
| -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); |