commit c272773ab3fa028891d4f551762ade249999d8cf
author shreerag <shreerag@google.com> Tue Jun 18 14:39:09 2019 -0700
committer Shreerag Jayakrishnan <shreerag@google.com> Tue Jun 18 21:46:33 2019 +0000
tree 457df1ec7fb18fb04674b6a7f99a044b9bd11798
parent 94d4b6a63746836224a1e8cead0ea5cdac03fb11

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

tests/tests/view/res/layout/view_layout.xml

diff --git a/tests/tests/view/res/layout/view_layout.xml b/tests/tests/view/res/layout/view_layout.xml
index 801b49b..6e555d7 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"

tests/tests/view/src/android/view/cts/ViewTest.java

diff --git a/tests/tests/view/src/android/view/cts/ViewTest.java b/tests/tests/view/src/android/view/cts/ViewTest.java
index 206ad86..f69e961 100644
--- a/tests/tests/view/src/android/view/cts/ViewTest.java
+++ b/tests/tests/view/src/android/view/cts/ViewTest.java
@@ -1886,8 +1886,8 @@
         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());
@@ -2592,8 +2592,8 @@
         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);