From a035dfbf8ddfc8d301dd96088eb50e8c2e63e487 Mon Sep 17 00:00:00 2001
From: Deepanshu Gupta <deepanshu@google.com>
Date: Thu, 16 Apr 2015 15:37:28 -0700
Subject: [PATCH] More layoutlib tests.

- Add another layout including more widgets and thus testing layoutlib
  better.
- Update targetSdk Version to 22.
- Handling of dynamic ids (@+id/) in LayoutLibTestCallback is buggy.
  Since this is not a problem in Studio, and this is not testing the
  callback, work around the issue by declaring the ids in
  values/ids.xml.

Change-Id: I457c105e8556c4df13cd86da2250fe5fd37843a8
---
 .../test/myapplication/MyActivity.class       | Bin 1157 -> 1157 bytes
 .../layoutlib/test/myapplication/R$id.class   | Bin 488 -> 1978 bytes
 .../test/myapplication/R$layout.class         | Bin 485 -> 519 bytes
 .../layoutlib/test/myapplication/R$menu.class | Bin 452 -> 452 bytes
 .../test/myapplication/R$string.class         | Bin 538 -> 538 bytes
 .../test/myapplication/R$style.class          | Bin 461 -> 461 bytes
 .../layoutlib/test/myapplication/R.class      | Bin 897 -> 897 bytes
 .../MyApplication/golden/allwidgets.png       | Bin 0 -> 11038 bytes
 .../src/main/res/layout/allwidgets.xml        | 393 ++++++++++++++++++
 .../MyApplication/src/main/res/values/ids.xml |  47 +++
 .../layoutlib/bridge/intensive/Main.java      |  31 +-
 .../intensive/setup/ConfigGenerator.java      |   6 +-
 .../setup/LayoutLibTestCallback.java          |   6 +-
 13 files changed, 468 insertions(+), 15 deletions(-)
 create mode 100644 tools/layoutlib/bridge/tests/res/testApp/MyApplication/golden/allwidgets.png
 create mode 100644 tools/layoutlib/bridge/tests/res/testApp/MyApplication/src/main/res/layout/allwidgets.xml
 create mode 100644 tools/layoutlib/bridge/tests/res/testApp/MyApplication/src/main/res/values/ids.xml

diff --git a/tools/layoutlib/bridge/tests/res/testApp/MyApplication/build/intermediates/classes/debug/com/android/layoutlib/test/myapplication/MyActivity.class b/tools/layoutlib/bridge/tests/res/testApp/MyApplication/build/intermediates/classes/debug/com/android/layoutlib/test/myapplication/MyActivity.class
index d2524625e16c8549eaae0a041056ffd91c362f0a..8af93ebda1e42cc9a75984b06bae1ef7a729b6db 100644
GIT binary patch
delta 29
kcmZqWY~`GwD#XFSz{Q}+pvBFg&7i|v&&r^?(cF&(07g^<nE(I)

delta 29
kcmZqWY~`GwD#Xsfz{Q}+pvBFg&7i|v&%waB(cF&(07Z8MZvX%Q

diff --git a/tools/layoutlib/bridge/tests/res/testApp/MyApplication/build/intermediates/classes/debug/com/android/layoutlib/test/myapplication/R$id.class b/tools/layoutlib/bridge/tests/res/testApp/MyApplication/build/intermediates/classes/debug/com/android/layoutlib/test/myapplication/R$id.class
index d109302c913fe664449081270148e790f2124314..069f9f7e826bfeacb722bdc4ab6b1587b5246abb 100644
GIT binary patch
literal 1978
zcmb8vTU!%H7zglo0!bhQIe5gghzcld!E-%_iqfXqB25q4+R5&i3~YAd?4)XM`kB1)
zdA#rg_@VmrKO=$HyLz+9@1LE+`|fN${`>v|5iOIg&;WJHWXjYPG$v!GP4+xj&gra`
z3leLBMpsOhJDItLOnYkJpCT;?Dm8n~naqm>l|O0OQwSQ0+bZ6wnb+P0%p0td4fWbJ
zw0h;^0YTM7%T(D_ojPTGHi)4r(azuJT@*CjcbL1xf{Xr+G7B#GV2A~meK5>|D?X^O
z;HnQsSa8h;RTf<L!6-_=mMq$HpKWiCpph3=c2r%yF}<+kF+r7<)yZx$j+%VZuX_T6
zbVs&SZKr{gST98Vd-kF?sm_$NyYuYBgWy@{$9_zn>U^iE2QYcpnwC|0UX!7x2Qe3m
z!mvZ1XQ7i*pJ$<&hXqZ%?CE$5C%~cjnoL^Z035+ORwml)7I75gSrpbehQh4$M`?RA
z$I+fVwkA#crJnE!3XR+S<Rp$$uGH4{kW-#ron@bn$h7Ax?c(;5e=?_c7#5rXooqfd
zd3YLU1Qi_~T)6cDdgaky=PWkYcNlz*1)(LgEC~IWL)m^v&#L|`^C<goV>-S=s4MrI
zI*-@mrp~mxEofkNt|4e}#Uu)csE&vFsMl#KyCIt?lF7P>W!jKddvAw>uC4Lz6?B5h
z*L>wGsmybQEUL$*6Ui*GMki4k&RwdTkyE*gI&WmRo9Y-HH(9hkqmvux?i16qvBFD+
z<x1;|oANJNr6$E?dMRk(i>4Da?uTRDtQ9?OZmQS`n*aY(&=M8!e?zoLQ#45Uub>iC
zpfWtfJPcQuN8l>+D7=Sx3?65mfG3&v!uy!_!v~lT!iSir;KR&E;G@jP;N#3E;FHX!
z;A!U5@C@@A_$>1|c$Rq%o@YJ}UtnH<7nvjYE9ND5nfW4oiTN^oh50IcjrltKHS-Pl
zCi5-$HuD|$F7rLO#=HW5!+alJWqtrZWL|^6W&RGXGk*_1Vtx$&!2Bb;&in-4VEzei
zF#iny!u%`z8}n268T0S(AI#6;Kba*?w(u_*t_e<f6iif{e@EhNIPwbD5@N!^e1U5<
Zd@oXqHpA~*;hK`hX9d3%D5Ew_{RdGqTgLzZ

delta 163
zcmdnR|AJZc)W2Q(7#J9g7^Juum>ERb8N}HcBqoY#2yiekGBU81q*jy|GS_o3FiehT
zUc|}8z|GDe$;hBP*_TCYvI&b1Bh%zY7R3lg21W*;9FXJz8m14V8G$sb)^-NQjX(wy
p122$d0}F~U@B!I85CshU3_@UeVK6DeAPA(nfO1R>VhjQdk^mIx5xxKb

diff --git a/tools/layoutlib/bridge/tests/res/testApp/MyApplication/build/intermediates/classes/debug/com/android/layoutlib/test/myapplication/R$layout.class b/tools/layoutlib/bridge/tests/res/testApp/MyApplication/build/intermediates/classes/debug/com/android/layoutlib/test/myapplication/R$layout.class
index 816ecc88cb540e45cbf89edcda8ba5bbb025e906..36e2688c106f6eb05a2f7a06d6e87231dcb38da8 100644
GIT binary patch
delta 184
zcmaFL+|D9;>ff$?3=9lL4ANW-%nV}e3=-@Nk`qPM<hT-Za>_GP(o;){nd_Mu7#SJZ
zauO@^OG`jJritzg*?1Uu*%_oJzN=+qo}9y|m?6o)#lXq{R0lMViGdr)Vq^fS0g`+`
z5q&V9fq_+PI|JiJuo8YC$p#c=U~pj&0FpdlHY<Z5gD_ZL1WbxD2mxs>pd1r}IFObE
E0L+*c=Kufz

delta 150
zcmZo?dCDw$>ff$?3=9lL43b<7%nTyz3}WmI;uA&Hc-V3hEAvZBnCqDt7$-(9WaDDs
zW@nI?#8}J7G`WsZF@lkSkpU<MBzb`P^?@`akY?4|&cL`4$Y5gN1(IxFK?w#vAe#rG
cfPtSu5G*eQCWRRUfHW6Sj)_5(frCL304eSetN;K2

diff --git a/tools/layoutlib/bridge/tests/res/testApp/MyApplication/build/intermediates/classes/debug/com/android/layoutlib/test/myapplication/R$menu.class b/tools/layoutlib/bridge/tests/res/testApp/MyApplication/build/intermediates/classes/debug/com/android/layoutlib/test/myapplication/R$menu.class
index b034b75d0df220e44033955c55254857d6097ce3..ca438add633e4ae7fb40467164128fb9b5a0f58c 100644
GIT binary patch
delta 18
ZcmX@Ye1v&|0VBso!!$-l&&e|wbpSTK1w#M;

delta 18
ZcmX@Ye1v&|0VDfH!!$-lnaML4bpSQd1r-1Q

diff --git a/tools/layoutlib/bridge/tests/res/testApp/MyApplication/build/intermediates/classes/debug/com/android/layoutlib/test/myapplication/R$string.class b/tools/layoutlib/bridge/tests/res/testApp/MyApplication/build/intermediates/classes/debug/com/android/layoutlib/test/myapplication/R$string.class
index f86b1d3d9e6319fbe69890c3f748384280e1cc8d..a98abf57306ae2df51961cff64c1c95469cfc50f 100644
GIT binary patch
delta 53
zcmbQmGK*z`tqL0h10w@RVnIQCUSe)4b3GdaBO?QMMruw@etda;QBDd_Xk%gzBcspc
HcZ@m!Y*7x-

delta 53
zcmbQmGK*z`tqLmx10w@RVnIQCUSe)4b3H2qBO?QMMruw@etda;QBDd_Xk%gzBcuG}
HcZ@m!YZ(rp

diff --git a/tools/layoutlib/bridge/tests/res/testApp/MyApplication/build/intermediates/classes/debug/com/android/layoutlib/test/myapplication/R$style.class b/tools/layoutlib/bridge/tests/res/testApp/MyApplication/build/intermediates/classes/debug/com/android/layoutlib/test/myapplication/R$style.class
index 8bbae9035f0ec882412708cbb07c10cd96fbf96f..7d8cc846433492c1d7a163946d848216d153f3d0 100644
GIT binary patch
delta 18
ZcmX@he3p5F86*2f^Grs@z{v|4bpSZS1#|!a

delta 18
ZcmX@he3p5F86(?9^GrrYmB|YkbpSWl1x5e>

diff --git a/tools/layoutlib/bridge/tests/res/testApp/MyApplication/build/intermediates/classes/debug/com/android/layoutlib/test/myapplication/R.class b/tools/layoutlib/bridge/tests/res/testApp/MyApplication/build/intermediates/classes/debug/com/android/layoutlib/test/myapplication/R.class
index 8af745dc8d3bd45c60116abe8a25a650c0c393f0..7e6113b3aa11cebbb22d998435ee7146ba463172 100644
GIT binary patch
delta 13
UcmZo<Z)D#f!^{{sS(Z5k02qt|NdN!<

delta 13
UcmZo<Z)D#f!_25MS(Z5k02iwR8~^|S

diff --git a/tools/layoutlib/bridge/tests/res/testApp/MyApplication/golden/allwidgets.png b/tools/layoutlib/bridge/tests/res/testApp/MyApplication/golden/allwidgets.png
new file mode 100644
index 0000000000000000000000000000000000000000..c9b76bed16bf26099ad73c822d45602284e6853c
GIT binary patch
literal 11038
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
T;f@2Pdj(V#Uno?{K|}uwp8_Z@

literal 0
HcmV?d00001

diff --git a/tools/layoutlib/bridge/tests/res/testApp/MyApplication/src/main/res/layout/allwidgets.xml b/tools/layoutlib/bridge/tests/res/testApp/MyApplication/src/main/res/layout/allwidgets.xml
new file mode 100644
index 0000000000000..2da2cb983a6c9
--- /dev/null
+++ b/tools/layoutlib/bridge/tests/res/testApp/MyApplication/src/main/res/layout/allwidgets.xml
@@ -0,0 +1,393 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:ignore="HardcodedText,LabelFor,TextFields,ContentDescription,RtlHardcoded">
+
+    <FrameLayout
+        android:id="@id/frameLayout"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentEnd="true"
+        android:layout_alignParentTop="true"
+        android:layout_marginEnd="311dp">
+
+        <TextView
+            android:id="@id/textView"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="left|top"
+            android:text="New Text" />
+    </FrameLayout>
+
+    <TextView
+        android:id="@id/textView2"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentStart="true"
+        android:layout_below="@id/frameLayout"
+        android:text="Large Text"
+        android:textAppearance="?android:attr/textAppearanceLarge" />
+
+    <TextView
+        android:id="@id/textView3"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentTop="true"
+        android:layout_toEndOf="@id/textView2"
+        android:text="Medium Text"
+        android:textAppearance="?android:attr/textAppearanceMedium" />
+
+    <TextView
+        android:id="@id/textView4"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignTop="@id/textView2"
+        android:layout_toEndOf="@id/textView2"
+        android:text="Small Text"
+        android:textAppearance="?android:attr/textAppearanceSmall" />
+
+    <Button
+        android:id="@id/button"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_below="@id/textView3"
+        android:layout_toEndOf="@id/textView4"
+        android:text="New Button" />
+
+    <Button
+        android:id="@id/button2"
+        style="?android:attr/buttonStyleSmall"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentTop="true"
+        android:layout_toEndOf="@id/button"
+        android:text="New Button" />
+
+    <CheckBox
+        android:id="@id/checkBox"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignEnd="@id/button"
+        android:layout_below="@id/button"
+        android:text="New CheckBox" />
+
+    <Switch
+        android:id="@id/switch1"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentStart="true"
+        android:layout_below="@id/textView2"
+        android:text="New Switch" />
+
+    <ImageButton
+        android:id="@id/imageButton"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_below="@id/button"
+        android:layout_toEndOf="@id/switch1" />
+
+    <ImageView
+        android:id="@id/imageView"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:src="@drawable/ic_launcher"
+        android:layout_below="@id/button"
+        android:layout_toEndOf="@id/imageButton" />
+
+    <GridLayout
+        android:id="@id/gridLayout"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentStart="true"
+        android:layout_below="@id/imageButton"
+        android:columnCount="2"
+        android:rowCount="2">
+
+        <ProgressBar
+            android:id="@id/progressBar"
+            style="?android:attr/progressBarStyleLarge"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_column="0"
+            android:layout_row="0" />
+
+        <ProgressBar
+            android:id="@id/progressBar2"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_column="1"
+            android:layout_row="0" />
+
+        <ProgressBar
+            android:id="@id/progressBar3"
+            style="?android:attr/progressBarStyleSmall"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_column="0"
+            android:layout_row="1" />
+
+        <ProgressBar
+            android:id="@id/progressBar4"
+            style="?android:attr/progressBarStyleHorizontal"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_column="1"
+            android:layout_row="1" />
+    </GridLayout>
+
+    <SeekBar
+        android:id="@id/seekBar"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignTop="@id/gridLayout"
+        android:layout_toEndOf="@id/gridLayout" />
+
+    <RatingBar
+        android:id="@id/ratingBar"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_below="@id/switch2"
+        android:layout_toEndOf="@id/gridLayout" />
+
+    <Switch
+        android:id="@id/switch2"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_below="@id/seekBar"
+        android:layout_toEndOf="@id/switch1"
+        android:checked="true" />
+
+    <EditText
+        android:id="@id/editText"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignBottom="@id/ratingBar"
+        android:layout_alignParentStart="true"
+        android:text="plain text" />
+
+    <EditText
+        android:id="@id/editText2"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentStart="true"
+        android:layout_below="@id/ratingBar"
+        android:ems="3"
+        android:inputType="textPersonName"
+        android:text="Name" />
+
+    <EditText
+        android:id="@id/editText3"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_centerVertical="true"
+        android:layout_toEndOf="@id/editText2"
+        android:ems="2"
+        android:inputType="textPassword"
+        android:text="password" />
+
+    <EditText
+        android:id="@id/editText4"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignTop="@id/editText3"
+        android:layout_toEndOf="@id/editText3"
+        android:ems="3"
+        android:inputType="numberPassword"
+        android:text="numeric password" />
+
+    <EditText
+        android:id="@id/editText5"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_below="@id/editText3"
+        android:layout_toStartOf="@id/editText6"
+        android:ems="7"
+        android:inputType="textEmailAddress"
+        android:text="email@domain.com" />
+
+    <EditText
+        android:id="@id/editText6"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentEnd="true"
+        android:layout_below="@id/editText4"
+        android:ems="7"
+        android:inputType="phone"
+        android:text="+11235554344" />
+
+    <EditText
+        android:id="@id/editText7"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_below="@id/editText"
+        android:layout_toEndOf="@id/editText4"
+        android:ems="10"
+        android:inputType="textPostalAddress"
+        android:text="1600 Amphitheatre" />
+
+    <EditText
+        android:id="@id/editText9"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_below="@id/editText5"
+        android:layout_alignParentStart="true"
+        android:ems="3"
+        android:inputType="time"
+        android:text="12:12" />
+
+    <RadioGroup
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_below="@id/editText5"
+        android:layout_toEndOf="@id/editText9"
+        android:orientation="horizontal">
+
+        <RadioButton
+            android:id="@id/radioButton"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="New RadioButton" />
+
+        <RadioButton
+            android:id="@id/radioButton2"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="New RadioButton" />
+
+    </RadioGroup>
+
+    <CheckedTextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="CheckedTextView"
+        android:id="@id/checkedTextView"
+        android:layout_below="@id/button2"
+        android:layout_alignParentEnd="true"
+        android:layout_alignStart="@id/button2" />
+
+    <DialerFilter
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_below="@id/checkBox"
+        android:layout_toStartOf="@id/quickContactBadge"
+        android:id="@id/dialerFilter"
+        android:layout_above="@id/ratingBar"
+        android:layout_toEndOf="@id/seekBar">
+
+        <EditText
+            android:id="@android:id/hint"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="Hint" />
+
+        <EditText
+            android:id="@android:id/primary"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_below="@android:id/hint"
+            android:text="Primary" />
+    </DialerFilter>
+
+    <QuickContactBadge
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:id="@id/quickContactBadge"
+        android:layout_below="@id/checkedTextView"
+        android:layout_alignParentEnd="true" />
+
+    <android.inputmethodservice.ExtractEditText
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="ExtractEditText"
+        android:id="@id/extractEditText"
+        android:layout_below="@id/editText9"
+        android:layout_alignParentEnd="true"
+        android:layout_alignStart="@id/checkedTextView" />
+
+    <ZoomControls
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:id="@id/zoomControls"
+        android:layout_below="@id/editText9"
+        android:layout_alignParentStart="true" />
+
+    <TextureView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:id="@id/textureView"
+        android:layout_below="@id/zoomControls"
+        android:layout_alignParentStart="true"
+        android:layout_alignBottom="@id/extractEditText"
+        android:layout_toStartOf="@id/editText3" />
+
+    <ListView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:id="@id/listView"
+        android:layout_below="@id/textureView"
+        android:layout_alignParentStart="true"
+        android:layout_alignEnd="@id/textureView" />
+
+    <GridView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:id="@id/gridView"
+        android:layout_below="@id/extractEditText"
+        android:layout_alignParentEnd="true"
+        android:layout_alignStart="@id/extractEditText" />
+
+    <ScrollView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:id="@id/scrollView"
+        android:layout_below="@id/zoomControls"
+        android:layout_toRightOf="@id/listView"
+        android:layout_toLeftOf="@id/extractEditText">
+
+    <TabHost
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:id="@id/tabHost">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:orientation="vertical">
+
+            <TabWidget
+                android:id="@android:id/tabs"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"/>
+
+            <FrameLayout
+                android:id="@android:id/tabcontent"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent">
+
+                <LinearLayout
+                    android:id="@id/linearLayout"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:orientation="vertical"/>
+
+                <LinearLayout
+                    android:id="@id/linearLayout2"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:orientation="vertical"/>
+
+            </FrameLayout>
+        </LinearLayout>
+    </TabHost>
+</ScrollView>
+
+    <SearchView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:id="@id/searchView"
+        android:layout_alignBottom="@id/zoomControls"
+        android:layout_toEndOf="@id/seekBar" />
+
+</RelativeLayout>
diff --git a/tools/layoutlib/bridge/tests/res/testApp/MyApplication/src/main/res/values/ids.xml b/tools/layoutlib/bridge/tests/res/testApp/MyApplication/src/main/res/values/ids.xml
new file mode 100644
index 0000000000000..1dc2fa02debd1
--- /dev/null
+++ b/tools/layoutlib/bridge/tests/res/testApp/MyApplication/src/main/res/values/ids.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <item type="id" name="button" />
+    <item type="id" name="button2" />
+    <item type="id" name="checkBox" />
+    <item type="id" name="checkedTextView" />
+    <item type="id" name="dialerFilter" />
+    <item type="id" name="editText" />
+    <item type="id" name="editText2" />
+    <item type="id" name="editText3" />
+    <item type="id" name="editText4" />
+    <item type="id" name="editText5" />
+    <item type="id" name="editText6" />
+    <item type="id" name="editText7" />
+    <item type="id" name="editText8" />
+    <item type="id" name="editText9" />
+    <item type="id" name="extractEditText" />
+    <item type="id" name="frameLayout" />
+    <item type="id" name="gridLayout" />
+    <item type="id" name="gridView" />
+    <item type="id" name="imageButton" />
+    <item type="id" name="imageView" />
+    <item type="id" name="linearLayout" />
+    <item type="id" name="linearLayout2" />
+    <item type="id" name="listView" />
+    <item type="id" name="progressBar" />
+    <item type="id" name="progressBar2" />
+    <item type="id" name="progressBar3" />
+    <item type="id" name="progressBar4" />
+    <item type="id" name="quickContactBadge" />
+    <item type="id" name="radioButton" />
+    <item type="id" name="radioButton2" />
+    <item type="id" name="ratingBar" />
+    <item type="id" name="scrollView" />
+    <item type="id" name="searchView" />
+    <item type="id" name="seekBar" />
+    <item type="id" name="spinner" />
+    <item type="id" name="switch1" />
+    <item type="id" name="switch2" />
+    <item type="id" name="tabHost" />
+    <item type="id" name="textView" />
+    <item type="id" name="textView2" />
+    <item type="id" name="textView3" />
+    <item type="id" name="textView4" />
+    <item type="id" name="textureView" />
+    <item type="id" name="zoomControls" />
+</resources>
\ No newline at end of file
diff --git a/tools/layoutlib/bridge/tests/src/com/android/layoutlib/bridge/intensive/Main.java b/tools/layoutlib/bridge/tests/src/com/android/layoutlib/bridge/intensive/Main.java
index 1ddc83ecb0d0b..f2a039ebcd6eb 100644
--- a/tools/layoutlib/bridge/tests/src/com/android/layoutlib/bridge/intensive/Main.java
+++ b/tools/layoutlib/bridge/tests/src/com/android/layoutlib/bridge/intensive/Main.java
@@ -275,14 +275,27 @@ public class Main {
                 ConfigGenerator.getEnumMap(attrs), getLayoutLog());
     }
 
-    /**
-     * Create a new rendering session and test that rendering /layout/activity.xml on nexus 5
-     * doesn't throw any exceptions.
-     */
+    /** Text activity.xml */
     @Test
-    public void testRendering() throws ClassNotFoundException {
+    public void testActivity() throws ClassNotFoundException {
+        renderAndVerify("activity.xml", "activity.png");
+
+    }
+
+    /** Test allwidgets.xml */
+    @Test
+    public void testAllWidgets() throws ClassNotFoundException {
+        renderAndVerify("allwidgets.xml", "allwidgets.png");
+    }
+
+    /**
+     * Create a new rendering session and test that rendering given layout on nexus 5
+     * doesn't throw any exceptions and matches the provided image.
+     */
+    private void renderAndVerify(String layoutFileName, String goldenFileName)
+            throws ClassNotFoundException {
         // Create the layout pull parser.
-        LayoutPullParser parser = new LayoutPullParser(APP_TEST_RES + "/layout/activity.xml");
+        LayoutPullParser parser = new LayoutPullParser(APP_TEST_RES + "/layout/" + layoutFileName);
         // Create LayoutLibCallback.
         LayoutLibTestCallback layoutLibCallback = new LayoutLibTestCallback(getLogger());
         layoutLibCallback.initResources();
@@ -301,7 +314,7 @@ public class Main {
                     session.getResult().getErrorMessage());
         }
         try {
-            String goldenImagePath = APP_TEST_DIR + "/golden/activity.png";
+            String goldenImagePath = APP_TEST_DIR + "/golden/" + goldenFileName;
             ImageUtils.requireSimilar(goldenImagePath, session.getImage());
         } catch (IOException e) {
             getLogger().error(e, e.getMessage());
@@ -309,7 +322,7 @@ public class Main {
     }
 
     /**
-     * Uses Theme.Material and Target sdk version as 21.
+     * Uses Theme.Material and Target sdk version as 22.
      */
     private SessionParams getSessionParams(LayoutPullParser layoutParser,
             ConfigGenerator configGenerator, LayoutLibTestCallback layoutLibCallback) {
@@ -327,7 +340,7 @@ public class Main {
                 resourceResolver,
                 layoutLibCallback,
                 0,
-                21, // TODO: Make it more configurable to run tests for various versions.
+                22, // TODO: Make it more configurable to run tests for various versions.
                 getLayoutLog());
     }
 
diff --git a/tools/layoutlib/bridge/tests/src/com/android/layoutlib/bridge/intensive/setup/ConfigGenerator.java b/tools/layoutlib/bridge/tests/src/com/android/layoutlib/bridge/intensive/setup/ConfigGenerator.java
index a5c320294504a..1191df635a2c3 100644
--- a/tools/layoutlib/bridge/tests/src/com/android/layoutlib/bridge/intensive/setup/ConfigGenerator.java
+++ b/tools/layoutlib/bridge/tests/src/com/android/layoutlib/bridge/intensive/setup/ConfigGenerator.java
@@ -21,12 +21,11 @@ import com.android.ide.common.resources.configuration.CountryCodeQualifier;
 import com.android.ide.common.resources.configuration.DensityQualifier;
 import com.android.ide.common.resources.configuration.FolderConfiguration;
 import com.android.ide.common.resources.configuration.KeyboardStateQualifier;
-import com.android.ide.common.resources.configuration.LanguageQualifier;
 import com.android.ide.common.resources.configuration.LayoutDirectionQualifier;
+import com.android.ide.common.resources.configuration.LocaleQualifier;
 import com.android.ide.common.resources.configuration.NavigationMethodQualifier;
 import com.android.ide.common.resources.configuration.NetworkCodeQualifier;
 import com.android.ide.common.resources.configuration.NightModeQualifier;
-import com.android.ide.common.resources.configuration.RegionQualifier;
 import com.android.ide.common.resources.configuration.ScreenDimensionQualifier;
 import com.android.ide.common.resources.configuration.ScreenOrientationQualifier;
 import com.android.ide.common.resources.configuration.ScreenRatioQualifier;
@@ -158,10 +157,9 @@ public class ConfigGenerator {
         config.setUiModeQualifier(new UiModeQualifier(UiMode.NORMAL));
         config.setNightModeQualifier(new NightModeQualifier(NightMode.NOTNIGHT));
         config.setCountryCodeQualifier(new CountryCodeQualifier());
-        config.setLanguageQualifier(new LanguageQualifier());
         config.setLayoutDirectionQualifier(new LayoutDirectionQualifier());
         config.setNetworkCodeQualifier(new NetworkCodeQualifier());
-        config.setRegionQualifier(new RegionQualifier());
+        config.setLocaleQualifier(new LocaleQualifier());
         config.setVersionQualifier(new VersionQualifier());
         return config;
     }
diff --git a/tools/layoutlib/bridge/tests/src/com/android/layoutlib/bridge/intensive/setup/LayoutLibTestCallback.java b/tools/layoutlib/bridge/tests/src/com/android/layoutlib/bridge/intensive/setup/LayoutLibTestCallback.java
index 0a5e7984a336e..5b648efb10894 100644
--- a/tools/layoutlib/bridge/tests/src/com/android/layoutlib/bridge/intensive/setup/LayoutLibTestCallback.java
+++ b/tools/layoutlib/bridge/tests/src/com/android/layoutlib/bridge/intensive/setup/LayoutLibTestCallback.java
@@ -23,8 +23,8 @@ import com.android.ide.common.rendering.api.ILayoutPullParser;
 import com.android.ide.common.rendering.api.LayoutlibCallback;
 import com.android.ide.common.rendering.api.ResourceReference;
 import com.android.ide.common.rendering.api.ResourceValue;
-import com.android.resources.ResourceType;
 import com.android.ide.common.resources.IntArrayWrapper;
+import com.android.resources.ResourceType;
 import com.android.util.Pair;
 import com.android.utils.ILogger;
 
@@ -36,6 +36,8 @@ import java.util.Map;
 
 import com.google.android.collect.Maps;
 
+import static org.junit.Assert.fail;
+
 @SuppressWarnings("deprecation") // For Pair
 public class LayoutLibTestCallback extends LayoutlibCallback {
 
@@ -121,7 +123,7 @@ public class LayoutLibTestCallback extends LayoutlibCallback {
 
     @Override
     public ILayoutPullParser getParser(String layoutName) {
-        org.junit.Assert.fail("This method shouldn't be called by this version of LayoutLib.");
+        fail("This method shouldn't be called by this version of LayoutLib.");
         return null;
     }