am 26e98d67: Merge "Fixed android.widget.cts.FrameLayoutTest#testAccessMeasureAllChildren on watches, which have much smaller screens than phones. Bug:15131296" into klp-modular-dev
* commit '26e98d67778c0f4f3e154b0869abbb31e40ed2e9':
Fixed android.widget.cts.FrameLayoutTest#testAccessMeasureAllChildren on watches, which have much smaller screens than phones. Bug:15131296
diff --git a/tests/res/layout/framelayout_layout.xml b/tests/res/layout/framelayout_layout.xml
index 1048d1b..c6d1a83 100644
--- a/tests/res/layout/framelayout_layout.xml
+++ b/tests/res/layout/framelayout_layout.xml
@@ -23,8 +23,8 @@
android:orientation="vertical">
<FrameLayout
- android:layout_width="200dip"
- android:layout_height="200dip"
+ android:layout_width="100dip"
+ android:layout_height="100dip"
android:background="@drawable/yellow"
android:id="@+id/framelayout">
</FrameLayout>
@@ -37,7 +37,7 @@
<TextView android:id="@+id/framelayout_textview"
android:background="@drawable/blue"
- android:layout_width="100dip"
+ android:layout_width="60dip"
android:layout_height="30dip"
android:text="@string/hello_world"/>
diff --git a/tests/tests/widget/src/android/widget/cts/FrameLayoutTest.java b/tests/tests/widget/src/android/widget/cts/FrameLayoutTest.java
index 5b225e8..6564ce0 100644
--- a/tests/tests/widget/src/android/widget/cts/FrameLayoutTest.java
+++ b/tests/tests/widget/src/android/widget/cts/FrameLayoutTest.java
@@ -156,7 +156,7 @@
// text view and button are VISIBLE, they should be measured
final TextView textView = (TextView) frameLayout.findViewById(R.id.framelayout_textview);
compareScaledPixels(30, textView.getMeasuredHeight());
- compareScaledPixels(100, textView.getMeasuredWidth());
+ compareScaledPixels(60, textView.getMeasuredWidth());
assertEquals(textView.getMeasuredHeight(), frameLayout.getMeasuredHeight());
assertEquals(textView.getMeasuredWidth(), frameLayout.getMeasuredWidth());