Merge "Merge changes I452e051c,If35ceac5 into oreo-cts-dev am: 426516cdee"
diff --git a/tests/tests/widget/res/layout/calendarview_layout.xml b/tests/tests/widget/res/layout/calendarview_layout.xml
index 507d48e..35c72ba 100644
--- a/tests/tests/widget/res/layout/calendarview_layout.xml
+++ b/tests/tests/widget/res/layout/calendarview_layout.xml
@@ -42,7 +42,7 @@
style="@android:style/Widget.Holo.Light.CalendarView"
android:id="@+id/calendar_view_holoyolo"
android:layout_width="match_parent"
- android:layout_height="320dip"
+ android:layout_height="@dimen/calendarview_holo_height"
android:firstDayOfWeek="3"
android:shownWeekCount="5"
android:showWeekNumber="false"
diff --git a/tests/tests/widget/res/layout/imageview_layout.xml b/tests/tests/widget/res/layout/imageview_layout.xml
index 1876e2f..5de0769 100644
--- a/tests/tests/widget/res/layout/imageview_layout.xml
+++ b/tests/tests/widget/res/layout/imageview_layout.xml
@@ -26,7 +26,7 @@
<ImageView
android:id="@+id/imageview_regular"
android:layout_width="320px"
- android:layout_height="240px"/>
+ android:layout_height="@dimen/imageview_regular_height"/>
<ImageView
android:id="@+id/imageview_tint"
diff --git a/tests/tests/widget/res/values-watch/dimens.xml b/tests/tests/widget/res/values-watch/dimens.xml
new file mode 100644
index 0000000..c1de29f
--- /dev/null
+++ b/tests/tests/widget/res/values-watch/dimens.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2017 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<resources>
+ <dimen name="calendarview_holo_height">200dip</dimen>
+
+ <dimen name="imageview_regular_height">100dip</dimen>
+</resources>
diff --git a/tests/tests/widget/res/values/dimens.xml b/tests/tests/widget/res/values/dimens.xml
index 5287b22..558ba40 100644
--- a/tests/tests/widget/res/values/dimens.xml
+++ b/tests/tests/widget/res/values/dimens.xml
@@ -47,4 +47,8 @@
<dimen name="radiogroup_margin">4dip</dimen>
<dimen name="listrow_height">40dp</dimen>
-</resources>
\ No newline at end of file
+
+ <dimen name="calendarview_holo_height">320dip</dimen>
+
+ <dimen name="imageview_regular_height">240dip</dimen>
+</resources>
