commit 2727e0e4b1e132909a25131742be85bfe0ea7365
author Android Merger <noreply-android-build-merger@google.com> Tue Dec 05 20:32:46 2017 +0000
committer android-build-merger <android-build-merger@google.com> Tue Dec 05 20:32:46 2017 +0000
tree 272ed7dfabd33a1b72771a2410bffef0cc04fc0e
parent ac2ac02384494eb6fe5678e8dcef6ea8f52ba6d5
parent 5b82db678c9eef3b148b94e92654c217e961ff43

Merge "Merge "CTS test fix for small screens" into oreo-cts-dev am: ad1bb552b8" am: 41cde070dd am: 4e3a3a72fc
am: 5b82db678c

Change-Id: I325912c59a648ae0a0475a9c1e36fd892ab8f452

tests/tests/view/res/layout/tooltip_layout.xml

diff --git a/tests/tests/view/res/layout/tooltip_layout.xml b/tests/tests/view/res/layout/tooltip_layout.xml
index eac341d..eab1f25 100644
--- a/tests/tests/view/res/layout/tooltip_layout.xml
+++ b/tests/tests/view/res/layout/tooltip_layout.xml
@@ -30,14 +30,14 @@
                 android:id="@+id/no_tooltip"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_margin="10dp"
+                android:layout_margin="5dp"
                 android:text="View with no tooltip"/>
 
         <TextView
                 android:id="@+id/has_tooltip"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_margin="10dp"
+                android:layout_margin="5dp"
                 android:text="View with tooltip"
                 android:tooltipText="tooltip text"/>
 
@@ -47,21 +47,21 @@
             android:id="@+id/no_tooltip2"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_margin="10dp"
+            android:layout_margin="5dp"
             android:text="Another view with no tooltip"/>
 
     <LinearLayout
             android:id="@+id/empty_group"
             android:layout_width="100dp"
             android:layout_height="30dp"
-            android:layout_margin="10dp"
+            android:layout_margin="5dp"
             android:background="#ddd"/>
 
     <RelativeLayout
             android:id="@+id/overlap_group"
             android:layout_width="100dp"
             android:layout_height="30dp"
-            android:layout_margin="10dp"
+            android:layout_margin="5dp"
             android:tooltipText="overlap tooltip group"
             android:background="#ddd">
         <View