Merge "More tests."
diff --git a/tests/AndroidManifest.xml b/tests/AndroidManifest.xml
index 03fe5a9..319f14b 100644
--- a/tests/AndroidManifest.xml
+++ b/tests/AndroidManifest.xml
@@ -966,13 +966,29 @@
                 <category android:name="android.intent.category.DEFAULT"/>
             </intent-filter>
         </activity>
-        <activity android:name="android.theme.cts.ThemeTestGeneratorActivity">
+        <activity android:name="android.theme.cts.ThemeTestGeneratorActivity"
+                  android:label="Theme Check">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN"/>
                 <category android:name="android.intent.category.DEFAULT"/>
             </intent-filter>
         </activity>
-        <activity android:name="android.theme.cts.HomeActivity"
+        <activity android:name="android.theme.cts.ThemeSelectorActivity"
+                  android:theme="@android:style/Theme.Holo"
+                  android:label="Theme Check">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+            </intent-filter>
+        </activity>
+        <activity android:name="android.theme.cts.TestListActivity"
+                  android:label="Theme Check">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+            </intent-filter>
+        </activity>
+        <activity android:name="android.theme.cts.OrientationSelectorActivity"
                   android:theme="@android:style/Theme.Holo"
                   android:label="Theme Check">
             <intent-filter>
@@ -980,12 +996,6 @@
                 <category android:name="android.intent.category.LAUNCHER"/>
             </intent-filter>
         </activity>
-        <activity android:name="android.theme.cts.TestListActivity">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN"/>
-                <category android:name="android.intent.category.DEFAULT"/>
-            </intent-filter>
-        </activity>
     </application>
 
     <!--Test for PackageManager, please put this at the very beginning-->
diff --git a/tests/res/drawable-hdpi/holo_land_alertdialog_list.png b/tests/res/drawable-hdpi/holo_land_alertdialog_list.png
new file mode 100644
index 0000000..4f0653d
--- /dev/null
+++ b/tests/res/drawable-hdpi/holo_land_alertdialog_list.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_land_alertdialog_multichoice.png b/tests/res/drawable-hdpi/holo_land_alertdialog_multichoice.png
new file mode 100644
index 0000000..f3678e7
--- /dev/null
+++ b/tests/res/drawable-hdpi/holo_land_alertdialog_multichoice.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_land_alertdialog_onebutton.png b/tests/res/drawable-hdpi/holo_land_alertdialog_onebutton.png
new file mode 100644
index 0000000..7139522
--- /dev/null
+++ b/tests/res/drawable-hdpi/holo_land_alertdialog_onebutton.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_land_alertdialog_singlechoice.png b/tests/res/drawable-hdpi/holo_land_alertdialog_singlechoice.png
new file mode 100644
index 0000000..86625b7
--- /dev/null
+++ b/tests/res/drawable-hdpi/holo_land_alertdialog_singlechoice.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_land_alertdialog_threebuttons.png b/tests/res/drawable-hdpi/holo_land_alertdialog_threebuttons.png
new file mode 100644
index 0000000..debb393
--- /dev/null
+++ b/tests/res/drawable-hdpi/holo_land_alertdialog_threebuttons.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_land_alertdialog_twobuttons.png b/tests/res/drawable-hdpi/holo_land_alertdialog_twobuttons.png
new file mode 100644
index 0000000..01aa00b
--- /dev/null
+++ b/tests/res/drawable-hdpi/holo_land_alertdialog_twobuttons.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_blue_bright.png b/tests/res/drawable-hdpi/holo_land_blue_bright.png
similarity index 100%
rename from tests/res/drawable-hdpi/holo_blue_bright.png
rename to tests/res/drawable-hdpi/holo_land_blue_bright.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_blue_dark.png b/tests/res/drawable-hdpi/holo_land_blue_dark.png
similarity index 100%
rename from tests/res/drawable-hdpi/holo_blue_dark.png
rename to tests/res/drawable-hdpi/holo_land_blue_dark.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_blue_light.png b/tests/res/drawable-hdpi/holo_land_blue_light.png
similarity index 100%
rename from tests/res/drawable-hdpi/holo_blue_light.png
rename to tests/res/drawable-hdpi/holo_land_blue_light.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_button.png b/tests/res/drawable-hdpi/holo_land_button.png
similarity index 100%
rename from tests/res/drawable-hdpi/holo_button.png
rename to tests/res/drawable-hdpi/holo_land_button.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_button_pressed.png b/tests/res/drawable-hdpi/holo_land_button_pressed.png
similarity index 100%
rename from tests/res/drawable-hdpi/holo_button_pressed.png
rename to tests/res/drawable-hdpi/holo_land_button_pressed.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_land_calendarview.png b/tests/res/drawable-hdpi/holo_land_calendarview.png
new file mode 100644
index 0000000..45243d9
--- /dev/null
+++ b/tests/res/drawable-hdpi/holo_land_calendarview.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_checkbox.png b/tests/res/drawable-hdpi/holo_land_checkbox.png
similarity index 100%
rename from tests/res/drawable-hdpi/holo_checkbox.png
rename to tests/res/drawable-hdpi/holo_land_checkbox.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_checkbox_checked.png b/tests/res/drawable-hdpi/holo_land_checkbox_checked.png
similarity index 100%
rename from tests/res/drawable-hdpi/holo_checkbox_checked.png
rename to tests/res/drawable-hdpi/holo_land_checkbox_checked.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_land_edittext.png b/tests/res/drawable-hdpi/holo_land_edittext.png
new file mode 100644
index 0000000..667da2d
--- /dev/null
+++ b/tests/res/drawable-hdpi/holo_land_edittext.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_green_dark.png b/tests/res/drawable-hdpi/holo_land_green_dark.png
similarity index 100%
rename from tests/res/drawable-hdpi/holo_green_dark.png
rename to tests/res/drawable-hdpi/holo_land_green_dark.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_green_light.png b/tests/res/drawable-hdpi/holo_land_green_light.png
similarity index 100%
rename from tests/res/drawable-hdpi/holo_green_light.png
rename to tests/res/drawable-hdpi/holo_land_green_light.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_orange_dark.png b/tests/res/drawable-hdpi/holo_land_orange_dark.png
similarity index 100%
rename from tests/res/drawable-hdpi/holo_orange_dark.png
rename to tests/res/drawable-hdpi/holo_land_orange_dark.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_orange_light.png b/tests/res/drawable-hdpi/holo_land_orange_light.png
similarity index 100%
rename from tests/res/drawable-hdpi/holo_orange_light.png
rename to tests/res/drawable-hdpi/holo_land_orange_light.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_progressbar.png b/tests/res/drawable-hdpi/holo_land_progressbar.png
similarity index 100%
rename from tests/res/drawable-hdpi/holo_progressbar.png
rename to tests/res/drawable-hdpi/holo_land_progressbar.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_progressbar_horizontal0.png b/tests/res/drawable-hdpi/holo_land_progressbar_horizontal0.png
similarity index 100%
rename from tests/res/drawable-hdpi/holo_progressbar_horizontal0.png
rename to tests/res/drawable-hdpi/holo_land_progressbar_horizontal0.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_progressbar_horizontal100.png b/tests/res/drawable-hdpi/holo_land_progressbar_horizontal100.png
similarity index 100%
rename from tests/res/drawable-hdpi/holo_progressbar_horizontal100.png
rename to tests/res/drawable-hdpi/holo_land_progressbar_horizontal100.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_progressbar_horizontal50.png b/tests/res/drawable-hdpi/holo_land_progressbar_horizontal50.png
similarity index 100%
rename from tests/res/drawable-hdpi/holo_progressbar_horizontal50.png
rename to tests/res/drawable-hdpi/holo_land_progressbar_horizontal50.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_progressbar_large.png b/tests/res/drawable-hdpi/holo_land_progressbar_large.png
similarity index 100%
rename from tests/res/drawable-hdpi/holo_progressbar_large.png
rename to tests/res/drawable-hdpi/holo_land_progressbar_large.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_progressbar_small.png b/tests/res/drawable-hdpi/holo_land_progressbar_small.png
similarity index 100%
rename from tests/res/drawable-hdpi/holo_progressbar_small.png
rename to tests/res/drawable-hdpi/holo_land_progressbar_small.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_land_progressdialog_horizontal.png b/tests/res/drawable-hdpi/holo_land_progressdialog_horizontal.png
new file mode 100644
index 0000000..152734e
--- /dev/null
+++ b/tests/res/drawable-hdpi/holo_land_progressdialog_horizontal.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_land_progressdialog_spinner.png b/tests/res/drawable-hdpi/holo_land_progressdialog_spinner.png
new file mode 100644
index 0000000..933b423
--- /dev/null
+++ b/tests/res/drawable-hdpi/holo_land_progressdialog_spinner.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_purple.png b/tests/res/drawable-hdpi/holo_land_purple.png
similarity index 100%
rename from tests/res/drawable-hdpi/holo_purple.png
rename to tests/res/drawable-hdpi/holo_land_purple.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_radiobutton.png b/tests/res/drawable-hdpi/holo_land_radiobutton.png
similarity index 100%
rename from tests/res/drawable-hdpi/holo_radiobutton.png
rename to tests/res/drawable-hdpi/holo_land_radiobutton.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_radiobutton_checked.png b/tests/res/drawable-hdpi/holo_land_radiobutton_checked.png
similarity index 100%
rename from tests/res/drawable-hdpi/holo_radiobutton_checked.png
rename to tests/res/drawable-hdpi/holo_land_radiobutton_checked.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_radiogroup_horizontal.png b/tests/res/drawable-hdpi/holo_land_radiogroup_horizontal.png
similarity index 100%
rename from tests/res/drawable-hdpi/holo_radiogroup_horizontal.png
rename to tests/res/drawable-hdpi/holo_land_radiogroup_horizontal.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_radiogroup_vertical.png b/tests/res/drawable-hdpi/holo_land_radiogroup_vertical.png
similarity index 100%
rename from tests/res/drawable-hdpi/holo_radiogroup_vertical.png
rename to tests/res/drawable-hdpi/holo_land_radiogroup_vertical.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_ratingbar_0.png b/tests/res/drawable-hdpi/holo_land_ratingbar_0.png
similarity index 100%
rename from tests/res/drawable-hdpi/holo_ratingbar_0.png
rename to tests/res/drawable-hdpi/holo_land_ratingbar_0.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_ratingbar_0_pressed.png b/tests/res/drawable-hdpi/holo_land_ratingbar_0_pressed.png
similarity index 100%
rename from tests/res/drawable-hdpi/holo_ratingbar_0_pressed.png
rename to tests/res/drawable-hdpi/holo_land_ratingbar_0_pressed.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_ratingbar_2point5.png b/tests/res/drawable-hdpi/holo_land_ratingbar_2point5.png
similarity index 100%
rename from tests/res/drawable-hdpi/holo_ratingbar_2point5.png
rename to tests/res/drawable-hdpi/holo_land_ratingbar_2point5.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_ratingbar_2point5_pressed.png b/tests/res/drawable-hdpi/holo_land_ratingbar_2point5_pressed.png
similarity index 100%
rename from tests/res/drawable-hdpi/holo_ratingbar_2point5_pressed.png
rename to tests/res/drawable-hdpi/holo_land_ratingbar_2point5_pressed.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_ratingbar_5.png b/tests/res/drawable-hdpi/holo_land_ratingbar_5.png
similarity index 100%
rename from tests/res/drawable-hdpi/holo_ratingbar_5.png
rename to tests/res/drawable-hdpi/holo_land_ratingbar_5.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_ratingbar_5_pressed.png b/tests/res/drawable-hdpi/holo_land_ratingbar_5_pressed.png
similarity index 100%
rename from tests/res/drawable-hdpi/holo_ratingbar_5_pressed.png
rename to tests/res/drawable-hdpi/holo_land_ratingbar_5_pressed.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_red_dark.png b/tests/res/drawable-hdpi/holo_land_red_dark.png
similarity index 100%
rename from tests/res/drawable-hdpi/holo_red_dark.png
rename to tests/res/drawable-hdpi/holo_land_red_dark.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_red_light.png b/tests/res/drawable-hdpi/holo_land_red_light.png
similarity index 100%
rename from tests/res/drawable-hdpi/holo_red_light.png
rename to tests/res/drawable-hdpi/holo_land_red_light.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_land_searchview.png b/tests/res/drawable-hdpi/holo_land_searchview.png
new file mode 100644
index 0000000..95351cb
--- /dev/null
+++ b/tests/res/drawable-hdpi/holo_land_searchview.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_land_searchview_query.png b/tests/res/drawable-hdpi/holo_land_searchview_query.png
new file mode 100644
index 0000000..cb18683
--- /dev/null
+++ b/tests/res/drawable-hdpi/holo_land_searchview_query.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_land_searchview_queryhint.png b/tests/res/drawable-hdpi/holo_land_searchview_queryhint.png
new file mode 100644
index 0000000..9de3f2b
--- /dev/null
+++ b/tests/res/drawable-hdpi/holo_land_searchview_queryhint.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_seekbar_0.png b/tests/res/drawable-hdpi/holo_land_seekbar_0.png
similarity index 100%
rename from tests/res/drawable-hdpi/holo_seekbar_0.png
rename to tests/res/drawable-hdpi/holo_land_seekbar_0.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_seekbar_100.png b/tests/res/drawable-hdpi/holo_land_seekbar_100.png
similarity index 100%
rename from tests/res/drawable-hdpi/holo_seekbar_100.png
rename to tests/res/drawable-hdpi/holo_land_seekbar_100.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_seekbar_50.png b/tests/res/drawable-hdpi/holo_land_seekbar_50.png
similarity index 100%
rename from tests/res/drawable-hdpi/holo_seekbar_50.png
rename to tests/res/drawable-hdpi/holo_land_seekbar_50.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_spinner.png b/tests/res/drawable-hdpi/holo_land_spinner.png
similarity index 100%
rename from tests/res/drawable-hdpi/holo_spinner.png
rename to tests/res/drawable-hdpi/holo_land_spinner.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_land_tabhost.png b/tests/res/drawable-hdpi/holo_land_tabhost.png
new file mode 100644
index 0000000..6180e01
--- /dev/null
+++ b/tests/res/drawable-hdpi/holo_land_tabhost.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_textview.png b/tests/res/drawable-hdpi/holo_land_textview.png
similarity index 100%
rename from tests/res/drawable-hdpi/holo_textview.png
rename to tests/res/drawable-hdpi/holo_land_textview.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_toggle_button.png b/tests/res/drawable-hdpi/holo_land_toggle_button.png
similarity index 100%
rename from tests/res/drawable-hdpi/holo_toggle_button.png
rename to tests/res/drawable-hdpi/holo_land_toggle_button.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_toggle_button_checked.png b/tests/res/drawable-hdpi/holo_land_toggle_button_checked.png
similarity index 100%
rename from tests/res/drawable-hdpi/holo_toggle_button_checked.png
rename to tests/res/drawable-hdpi/holo_land_toggle_button_checked.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_land_zoomcontrols.png b/tests/res/drawable-hdpi/holo_land_zoomcontrols.png
new file mode 100644
index 0000000..5763406
--- /dev/null
+++ b/tests/res/drawable-hdpi/holo_land_zoomcontrols.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_light_land_alertdialog_list.png b/tests/res/drawable-hdpi/holo_light_land_alertdialog_list.png
new file mode 100644
index 0000000..75f8335
--- /dev/null
+++ b/tests/res/drawable-hdpi/holo_light_land_alertdialog_list.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_light_land_alertdialog_multichoice.png b/tests/res/drawable-hdpi/holo_light_land_alertdialog_multichoice.png
new file mode 100644
index 0000000..11a14b8
--- /dev/null
+++ b/tests/res/drawable-hdpi/holo_light_land_alertdialog_multichoice.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_light_land_alertdialog_onebutton.png b/tests/res/drawable-hdpi/holo_light_land_alertdialog_onebutton.png
new file mode 100644
index 0000000..1d513e0
--- /dev/null
+++ b/tests/res/drawable-hdpi/holo_light_land_alertdialog_onebutton.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_light_land_alertdialog_singlechoice.png b/tests/res/drawable-hdpi/holo_light_land_alertdialog_singlechoice.png
new file mode 100644
index 0000000..5b16ebb
--- /dev/null
+++ b/tests/res/drawable-hdpi/holo_light_land_alertdialog_singlechoice.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_light_land_alertdialog_threebuttons.png b/tests/res/drawable-hdpi/holo_light_land_alertdialog_threebuttons.png
new file mode 100644
index 0000000..977eae0
--- /dev/null
+++ b/tests/res/drawable-hdpi/holo_light_land_alertdialog_threebuttons.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_light_land_alertdialog_twobuttons.png b/tests/res/drawable-hdpi/holo_light_land_alertdialog_twobuttons.png
new file mode 100644
index 0000000..ff7fe92
--- /dev/null
+++ b/tests/res/drawable-hdpi/holo_light_land_alertdialog_twobuttons.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_blue_bright.png b/tests/res/drawable-hdpi/holo_light_land_blue_bright.png
similarity index 100%
copy from tests/res/drawable-hdpi/holo_blue_bright.png
copy to tests/res/drawable-hdpi/holo_light_land_blue_bright.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_blue_dark.png b/tests/res/drawable-hdpi/holo_light_land_blue_dark.png
similarity index 100%
copy from tests/res/drawable-hdpi/holo_blue_dark.png
copy to tests/res/drawable-hdpi/holo_light_land_blue_dark.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_blue_light.png b/tests/res/drawable-hdpi/holo_light_land_blue_light.png
similarity index 100%
copy from tests/res/drawable-hdpi/holo_blue_light.png
copy to tests/res/drawable-hdpi/holo_light_land_blue_light.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_light_button.png b/tests/res/drawable-hdpi/holo_light_land_button.png
similarity index 100%
copy from tests/res/drawable-hdpi/holo_light_button.png
copy to tests/res/drawable-hdpi/holo_light_land_button.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_light_button_pressed.png b/tests/res/drawable-hdpi/holo_light_land_button_pressed.png
similarity index 100%
copy from tests/res/drawable-hdpi/holo_light_button_pressed.png
copy to tests/res/drawable-hdpi/holo_light_land_button_pressed.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_light_land_calendarview.png b/tests/res/drawable-hdpi/holo_light_land_calendarview.png
new file mode 100644
index 0000000..4d1e5d5
--- /dev/null
+++ b/tests/res/drawable-hdpi/holo_light_land_calendarview.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_light_checkbox.png b/tests/res/drawable-hdpi/holo_light_land_checkbox.png
similarity index 100%
copy from tests/res/drawable-hdpi/holo_light_checkbox.png
copy to tests/res/drawable-hdpi/holo_light_land_checkbox.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_light_checkbox_checked.png b/tests/res/drawable-hdpi/holo_light_land_checkbox_checked.png
similarity index 100%
copy from tests/res/drawable-hdpi/holo_light_checkbox_checked.png
copy to tests/res/drawable-hdpi/holo_light_land_checkbox_checked.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_light_land_edittext.png b/tests/res/drawable-hdpi/holo_light_land_edittext.png
new file mode 100644
index 0000000..783cfd0
--- /dev/null
+++ b/tests/res/drawable-hdpi/holo_light_land_edittext.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_green_dark.png b/tests/res/drawable-hdpi/holo_light_land_green_dark.png
similarity index 100%
copy from tests/res/drawable-hdpi/holo_green_dark.png
copy to tests/res/drawable-hdpi/holo_light_land_green_dark.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_green_light.png b/tests/res/drawable-hdpi/holo_light_land_green_light.png
similarity index 100%
copy from tests/res/drawable-hdpi/holo_green_light.png
copy to tests/res/drawable-hdpi/holo_light_land_green_light.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_light_orange_dark.png b/tests/res/drawable-hdpi/holo_light_land_orange_dark.png
similarity index 100%
copy from tests/res/drawable-hdpi/holo_light_orange_dark.png
copy to tests/res/drawable-hdpi/holo_light_land_orange_dark.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_light_orange_light.png b/tests/res/drawable-hdpi/holo_light_land_orange_light.png
similarity index 100%
copy from tests/res/drawable-hdpi/holo_light_orange_light.png
copy to tests/res/drawable-hdpi/holo_light_land_orange_light.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_light_progressbar.png b/tests/res/drawable-hdpi/holo_light_land_progressbar.png
similarity index 100%
copy from tests/res/drawable-hdpi/holo_light_progressbar.png
copy to tests/res/drawable-hdpi/holo_light_land_progressbar.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_light_progressbar_horizontal0.png b/tests/res/drawable-hdpi/holo_light_land_progressbar_horizontal0.png
similarity index 100%
copy from tests/res/drawable-hdpi/holo_light_progressbar_horizontal0.png
copy to tests/res/drawable-hdpi/holo_light_land_progressbar_horizontal0.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_light_progressbar_horizontal100.png b/tests/res/drawable-hdpi/holo_light_land_progressbar_horizontal100.png
similarity index 100%
copy from tests/res/drawable-hdpi/holo_light_progressbar_horizontal100.png
copy to tests/res/drawable-hdpi/holo_light_land_progressbar_horizontal100.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_light_progressbar_horizontal50.png b/tests/res/drawable-hdpi/holo_light_land_progressbar_horizontal50.png
similarity index 100%
copy from tests/res/drawable-hdpi/holo_light_progressbar_horizontal50.png
copy to tests/res/drawable-hdpi/holo_light_land_progressbar_horizontal50.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_light_progressbar_large.png b/tests/res/drawable-hdpi/holo_light_land_progressbar_large.png
similarity index 100%
copy from tests/res/drawable-hdpi/holo_light_progressbar_large.png
copy to tests/res/drawable-hdpi/holo_light_land_progressbar_large.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_light_progressbar_small.png b/tests/res/drawable-hdpi/holo_light_land_progressbar_small.png
similarity index 100%
copy from tests/res/drawable-hdpi/holo_light_progressbar_small.png
copy to tests/res/drawable-hdpi/holo_light_land_progressbar_small.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_light_land_progressdialog_horizontal.png b/tests/res/drawable-hdpi/holo_light_land_progressdialog_horizontal.png
new file mode 100644
index 0000000..3b937f2
--- /dev/null
+++ b/tests/res/drawable-hdpi/holo_light_land_progressdialog_horizontal.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_light_land_progressdialog_spinner.png b/tests/res/drawable-hdpi/holo_light_land_progressdialog_spinner.png
new file mode 100644
index 0000000..9ca32cd
--- /dev/null
+++ b/tests/res/drawable-hdpi/holo_light_land_progressdialog_spinner.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_light_purple.png b/tests/res/drawable-hdpi/holo_light_land_purple.png
similarity index 100%
copy from tests/res/drawable-hdpi/holo_light_purple.png
copy to tests/res/drawable-hdpi/holo_light_land_purple.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_light_radiobutton.png b/tests/res/drawable-hdpi/holo_light_land_radiobutton.png
similarity index 100%
copy from tests/res/drawable-hdpi/holo_light_radiobutton.png
copy to tests/res/drawable-hdpi/holo_light_land_radiobutton.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_light_radiobutton_checked.png b/tests/res/drawable-hdpi/holo_light_land_radiobutton_checked.png
similarity index 100%
copy from tests/res/drawable-hdpi/holo_light_radiobutton_checked.png
copy to tests/res/drawable-hdpi/holo_light_land_radiobutton_checked.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_light_radiogroup_horizontal.png b/tests/res/drawable-hdpi/holo_light_land_radiogroup_horizontal.png
similarity index 100%
copy from tests/res/drawable-hdpi/holo_light_radiogroup_horizontal.png
copy to tests/res/drawable-hdpi/holo_light_land_radiogroup_horizontal.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_light_radiogroup_vertical.png b/tests/res/drawable-hdpi/holo_light_land_radiogroup_vertical.png
similarity index 100%
copy from tests/res/drawable-hdpi/holo_light_radiogroup_vertical.png
copy to tests/res/drawable-hdpi/holo_light_land_radiogroup_vertical.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_light_ratingbar_0.png b/tests/res/drawable-hdpi/holo_light_land_ratingbar_0.png
similarity index 100%
copy from tests/res/drawable-hdpi/holo_light_ratingbar_0.png
copy to tests/res/drawable-hdpi/holo_light_land_ratingbar_0.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_light_ratingbar_0_pressed.png b/tests/res/drawable-hdpi/holo_light_land_ratingbar_0_pressed.png
similarity index 100%
copy from tests/res/drawable-hdpi/holo_light_ratingbar_0_pressed.png
copy to tests/res/drawable-hdpi/holo_light_land_ratingbar_0_pressed.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_light_ratingbar_2point5.png b/tests/res/drawable-hdpi/holo_light_land_ratingbar_2point5.png
similarity index 100%
copy from tests/res/drawable-hdpi/holo_light_ratingbar_2point5.png
copy to tests/res/drawable-hdpi/holo_light_land_ratingbar_2point5.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_light_ratingbar_2point5_pressed.png b/tests/res/drawable-hdpi/holo_light_land_ratingbar_2point5_pressed.png
similarity index 100%
copy from tests/res/drawable-hdpi/holo_light_ratingbar_2point5_pressed.png
copy to tests/res/drawable-hdpi/holo_light_land_ratingbar_2point5_pressed.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_light_ratingbar_5.png b/tests/res/drawable-hdpi/holo_light_land_ratingbar_5.png
similarity index 100%
copy from tests/res/drawable-hdpi/holo_light_ratingbar_5.png
copy to tests/res/drawable-hdpi/holo_light_land_ratingbar_5.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_light_ratingbar_5_pressed.png b/tests/res/drawable-hdpi/holo_light_land_ratingbar_5_pressed.png
similarity index 100%
copy from tests/res/drawable-hdpi/holo_light_ratingbar_5_pressed.png
copy to tests/res/drawable-hdpi/holo_light_land_ratingbar_5_pressed.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_light_red_dark.png b/tests/res/drawable-hdpi/holo_light_land_red_dark.png
similarity index 100%
copy from tests/res/drawable-hdpi/holo_light_red_dark.png
copy to tests/res/drawable-hdpi/holo_light_land_red_dark.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_light_red_light.png b/tests/res/drawable-hdpi/holo_light_land_red_light.png
similarity index 100%
copy from tests/res/drawable-hdpi/holo_light_red_light.png
copy to tests/res/drawable-hdpi/holo_light_land_red_light.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_light_land_searchview.png b/tests/res/drawable-hdpi/holo_light_land_searchview.png
new file mode 100644
index 0000000..10881ff
--- /dev/null
+++ b/tests/res/drawable-hdpi/holo_light_land_searchview.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_light_land_searchview_query.png b/tests/res/drawable-hdpi/holo_light_land_searchview_query.png
new file mode 100644
index 0000000..18ca496
--- /dev/null
+++ b/tests/res/drawable-hdpi/holo_light_land_searchview_query.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_light_land_searchview_queryhint.png b/tests/res/drawable-hdpi/holo_light_land_searchview_queryhint.png
new file mode 100644
index 0000000..e381b88
--- /dev/null
+++ b/tests/res/drawable-hdpi/holo_light_land_searchview_queryhint.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_light_seekbar_0.png b/tests/res/drawable-hdpi/holo_light_land_seekbar_0.png
similarity index 100%
copy from tests/res/drawable-hdpi/holo_light_seekbar_0.png
copy to tests/res/drawable-hdpi/holo_light_land_seekbar_0.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_light_seekbar_100.png b/tests/res/drawable-hdpi/holo_light_land_seekbar_100.png
similarity index 100%
copy from tests/res/drawable-hdpi/holo_light_seekbar_100.png
copy to tests/res/drawable-hdpi/holo_light_land_seekbar_100.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_light_seekbar_50.png b/tests/res/drawable-hdpi/holo_light_land_seekbar_50.png
similarity index 100%
copy from tests/res/drawable-hdpi/holo_light_seekbar_50.png
copy to tests/res/drawable-hdpi/holo_light_land_seekbar_50.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_light_spinner.png b/tests/res/drawable-hdpi/holo_light_land_spinner.png
similarity index 100%
copy from tests/res/drawable-hdpi/holo_light_spinner.png
copy to tests/res/drawable-hdpi/holo_light_land_spinner.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_light_land_tabhost.png b/tests/res/drawable-hdpi/holo_light_land_tabhost.png
new file mode 100644
index 0000000..6180e01
--- /dev/null
+++ b/tests/res/drawable-hdpi/holo_light_land_tabhost.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_light_textview.png b/tests/res/drawable-hdpi/holo_light_land_textview.png
similarity index 100%
copy from tests/res/drawable-hdpi/holo_light_textview.png
copy to tests/res/drawable-hdpi/holo_light_land_textview.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_light_toggle_button.png b/tests/res/drawable-hdpi/holo_light_land_toggle_button.png
similarity index 100%
copy from tests/res/drawable-hdpi/holo_light_toggle_button.png
copy to tests/res/drawable-hdpi/holo_light_land_toggle_button.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_light_toggle_button_checked.png b/tests/res/drawable-hdpi/holo_light_land_toggle_button_checked.png
similarity index 100%
copy from tests/res/drawable-hdpi/holo_light_toggle_button_checked.png
copy to tests/res/drawable-hdpi/holo_light_land_toggle_button_checked.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_light_land_zoomcontrols.png b/tests/res/drawable-hdpi/holo_light_land_zoomcontrols.png
new file mode 100644
index 0000000..5763406
--- /dev/null
+++ b/tests/res/drawable-hdpi/holo_light_land_zoomcontrols.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_light_port_alertdialog_list.png b/tests/res/drawable-hdpi/holo_light_port_alertdialog_list.png
new file mode 100644
index 0000000..d2edbcc
--- /dev/null
+++ b/tests/res/drawable-hdpi/holo_light_port_alertdialog_list.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_light_port_alertdialog_multichoice.png b/tests/res/drawable-hdpi/holo_light_port_alertdialog_multichoice.png
new file mode 100644
index 0000000..b6b16b9
--- /dev/null
+++ b/tests/res/drawable-hdpi/holo_light_port_alertdialog_multichoice.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_light_port_alertdialog_onebutton.png b/tests/res/drawable-hdpi/holo_light_port_alertdialog_onebutton.png
new file mode 100644
index 0000000..0b5e5c4
--- /dev/null
+++ b/tests/res/drawable-hdpi/holo_light_port_alertdialog_onebutton.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_light_port_alertdialog_singlechoice.png b/tests/res/drawable-hdpi/holo_light_port_alertdialog_singlechoice.png
new file mode 100644
index 0000000..a55f008
--- /dev/null
+++ b/tests/res/drawable-hdpi/holo_light_port_alertdialog_singlechoice.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_light_port_alertdialog_threebuttons.png b/tests/res/drawable-hdpi/holo_light_port_alertdialog_threebuttons.png
new file mode 100644
index 0000000..f8e9a3f
--- /dev/null
+++ b/tests/res/drawable-hdpi/holo_light_port_alertdialog_threebuttons.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_light_port_alertdialog_twobuttons.png b/tests/res/drawable-hdpi/holo_light_port_alertdialog_twobuttons.png
new file mode 100644
index 0000000..34fa7a1
--- /dev/null
+++ b/tests/res/drawable-hdpi/holo_light_port_alertdialog_twobuttons.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_light_blue_bright.png b/tests/res/drawable-hdpi/holo_light_port_blue_bright.png
similarity index 100%
rename from tests/res/drawable-hdpi/holo_light_blue_bright.png
rename to tests/res/drawable-hdpi/holo_light_port_blue_bright.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_light_blue_dark.png b/tests/res/drawable-hdpi/holo_light_port_blue_dark.png
similarity index 100%
copy from tests/res/drawable-hdpi/holo_light_blue_dark.png
copy to tests/res/drawable-hdpi/holo_light_port_blue_dark.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_light_blue_light.png b/tests/res/drawable-hdpi/holo_light_port_blue_light.png
similarity index 100%
copy from tests/res/drawable-hdpi/holo_light_blue_light.png
copy to tests/res/drawable-hdpi/holo_light_port_blue_light.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_light_button.png b/tests/res/drawable-hdpi/holo_light_port_button.png
similarity index 100%
rename from tests/res/drawable-hdpi/holo_light_button.png
rename to tests/res/drawable-hdpi/holo_light_port_button.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_light_button_pressed.png b/tests/res/drawable-hdpi/holo_light_port_button_pressed.png
similarity index 100%
rename from tests/res/drawable-hdpi/holo_light_button_pressed.png
rename to tests/res/drawable-hdpi/holo_light_port_button_pressed.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_light_port_calendarview.png b/tests/res/drawable-hdpi/holo_light_port_calendarview.png
new file mode 100644
index 0000000..4d1e5d5
--- /dev/null
+++ b/tests/res/drawable-hdpi/holo_light_port_calendarview.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_light_checkbox.png b/tests/res/drawable-hdpi/holo_light_port_checkbox.png
similarity index 100%
rename from tests/res/drawable-hdpi/holo_light_checkbox.png
rename to tests/res/drawable-hdpi/holo_light_port_checkbox.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_light_checkbox_checked.png b/tests/res/drawable-hdpi/holo_light_port_checkbox_checked.png
similarity index 100%
rename from tests/res/drawable-hdpi/holo_light_checkbox_checked.png
rename to tests/res/drawable-hdpi/holo_light_port_checkbox_checked.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_light_port_edittext.png b/tests/res/drawable-hdpi/holo_light_port_edittext.png
new file mode 100644
index 0000000..783cfd0
--- /dev/null
+++ b/tests/res/drawable-hdpi/holo_light_port_edittext.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_light_green_dark.png b/tests/res/drawable-hdpi/holo_light_port_green_dark.png
similarity index 100%
copy from tests/res/drawable-hdpi/holo_light_green_dark.png
copy to tests/res/drawable-hdpi/holo_light_port_green_dark.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_light_green_light.png b/tests/res/drawable-hdpi/holo_light_port_green_light.png
similarity index 100%
rename from tests/res/drawable-hdpi/holo_light_green_light.png
rename to tests/res/drawable-hdpi/holo_light_port_green_light.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_light_orange_dark.png b/tests/res/drawable-hdpi/holo_light_port_orange_dark.png
similarity index 100%
copy from tests/res/drawable-hdpi/holo_light_orange_dark.png
copy to tests/res/drawable-hdpi/holo_light_port_orange_dark.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_light_orange_light.png b/tests/res/drawable-hdpi/holo_light_port_orange_light.png
similarity index 100%
copy from tests/res/drawable-hdpi/holo_light_orange_light.png
copy to tests/res/drawable-hdpi/holo_light_port_orange_light.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_light_progressbar.png b/tests/res/drawable-hdpi/holo_light_port_progressbar.png
similarity index 100%
copy from tests/res/drawable-hdpi/holo_light_progressbar.png
copy to tests/res/drawable-hdpi/holo_light_port_progressbar.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_light_progressbar_horizontal0.png b/tests/res/drawable-hdpi/holo_light_port_progressbar_horizontal0.png
similarity index 100%
copy from tests/res/drawable-hdpi/holo_light_progressbar_horizontal0.png
copy to tests/res/drawable-hdpi/holo_light_port_progressbar_horizontal0.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_light_progressbar_horizontal100.png b/tests/res/drawable-hdpi/holo_light_port_progressbar_horizontal100.png
similarity index 100%
copy from tests/res/drawable-hdpi/holo_light_progressbar_horizontal100.png
copy to tests/res/drawable-hdpi/holo_light_port_progressbar_horizontal100.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_light_progressbar_horizontal50.png b/tests/res/drawable-hdpi/holo_light_port_progressbar_horizontal50.png
similarity index 100%
copy from tests/res/drawable-hdpi/holo_light_progressbar_horizontal50.png
copy to tests/res/drawable-hdpi/holo_light_port_progressbar_horizontal50.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_light_progressbar_large.png b/tests/res/drawable-hdpi/holo_light_port_progressbar_large.png
similarity index 100%
copy from tests/res/drawable-hdpi/holo_light_progressbar_large.png
copy to tests/res/drawable-hdpi/holo_light_port_progressbar_large.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_light_progressbar_small.png b/tests/res/drawable-hdpi/holo_light_port_progressbar_small.png
similarity index 100%
copy from tests/res/drawable-hdpi/holo_light_progressbar_small.png
copy to tests/res/drawable-hdpi/holo_light_port_progressbar_small.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_light_port_progressdialog_horizontal.png b/tests/res/drawable-hdpi/holo_light_port_progressdialog_horizontal.png
new file mode 100644
index 0000000..3533150
--- /dev/null
+++ b/tests/res/drawable-hdpi/holo_light_port_progressdialog_horizontal.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_light_port_progressdialog_spinner.png b/tests/res/drawable-hdpi/holo_light_port_progressdialog_spinner.png
new file mode 100644
index 0000000..82eb6e2
--- /dev/null
+++ b/tests/res/drawable-hdpi/holo_light_port_progressdialog_spinner.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_light_purple.png b/tests/res/drawable-hdpi/holo_light_port_purple.png
similarity index 100%
copy from tests/res/drawable-hdpi/holo_light_purple.png
copy to tests/res/drawable-hdpi/holo_light_port_purple.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_light_radiobutton.png b/tests/res/drawable-hdpi/holo_light_port_radiobutton.png
similarity index 100%
rename from tests/res/drawable-hdpi/holo_light_radiobutton.png
rename to tests/res/drawable-hdpi/holo_light_port_radiobutton.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_light_radiobutton_checked.png b/tests/res/drawable-hdpi/holo_light_port_radiobutton_checked.png
similarity index 100%
rename from tests/res/drawable-hdpi/holo_light_radiobutton_checked.png
rename to tests/res/drawable-hdpi/holo_light_port_radiobutton_checked.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_light_radiogroup_horizontal.png b/tests/res/drawable-hdpi/holo_light_port_radiogroup_horizontal.png
similarity index 100%
rename from tests/res/drawable-hdpi/holo_light_radiogroup_horizontal.png
rename to tests/res/drawable-hdpi/holo_light_port_radiogroup_horizontal.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_light_radiogroup_vertical.png b/tests/res/drawable-hdpi/holo_light_port_radiogroup_vertical.png
similarity index 100%
rename from tests/res/drawable-hdpi/holo_light_radiogroup_vertical.png
rename to tests/res/drawable-hdpi/holo_light_port_radiogroup_vertical.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_light_ratingbar_0.png b/tests/res/drawable-hdpi/holo_light_port_ratingbar_0.png
similarity index 100%
rename from tests/res/drawable-hdpi/holo_light_ratingbar_0.png
rename to tests/res/drawable-hdpi/holo_light_port_ratingbar_0.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_light_ratingbar_0_pressed.png b/tests/res/drawable-hdpi/holo_light_port_ratingbar_0_pressed.png
similarity index 100%
rename from tests/res/drawable-hdpi/holo_light_ratingbar_0_pressed.png
rename to tests/res/drawable-hdpi/holo_light_port_ratingbar_0_pressed.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_light_ratingbar_2point5.png b/tests/res/drawable-hdpi/holo_light_port_ratingbar_2point5.png
similarity index 100%
rename from tests/res/drawable-hdpi/holo_light_ratingbar_2point5.png
rename to tests/res/drawable-hdpi/holo_light_port_ratingbar_2point5.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_light_ratingbar_2point5_pressed.png b/tests/res/drawable-hdpi/holo_light_port_ratingbar_2point5_pressed.png
similarity index 100%
rename from tests/res/drawable-hdpi/holo_light_ratingbar_2point5_pressed.png
rename to tests/res/drawable-hdpi/holo_light_port_ratingbar_2point5_pressed.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_light_ratingbar_5.png b/tests/res/drawable-hdpi/holo_light_port_ratingbar_5.png
similarity index 100%
rename from tests/res/drawable-hdpi/holo_light_ratingbar_5.png
rename to tests/res/drawable-hdpi/holo_light_port_ratingbar_5.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_light_ratingbar_5_pressed.png b/tests/res/drawable-hdpi/holo_light_port_ratingbar_5_pressed.png
similarity index 100%
rename from tests/res/drawable-hdpi/holo_light_ratingbar_5_pressed.png
rename to tests/res/drawable-hdpi/holo_light_port_ratingbar_5_pressed.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_light_red_dark.png b/tests/res/drawable-hdpi/holo_light_port_red_dark.png
similarity index 100%
copy from tests/res/drawable-hdpi/holo_light_red_dark.png
copy to tests/res/drawable-hdpi/holo_light_port_red_dark.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_light_red_light.png b/tests/res/drawable-hdpi/holo_light_port_red_light.png
similarity index 100%
copy from tests/res/drawable-hdpi/holo_light_red_light.png
copy to tests/res/drawable-hdpi/holo_light_port_red_light.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_light_port_searchview.png b/tests/res/drawable-hdpi/holo_light_port_searchview.png
new file mode 100644
index 0000000..10881ff
--- /dev/null
+++ b/tests/res/drawable-hdpi/holo_light_port_searchview.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_light_port_searchview_query.png b/tests/res/drawable-hdpi/holo_light_port_searchview_query.png
new file mode 100644
index 0000000..18ca496
--- /dev/null
+++ b/tests/res/drawable-hdpi/holo_light_port_searchview_query.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_light_port_searchview_queryhint.png b/tests/res/drawable-hdpi/holo_light_port_searchview_queryhint.png
new file mode 100644
index 0000000..e381b88
--- /dev/null
+++ b/tests/res/drawable-hdpi/holo_light_port_searchview_queryhint.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_light_seekbar_0.png b/tests/res/drawable-hdpi/holo_light_port_seekbar_0.png
similarity index 100%
rename from tests/res/drawable-hdpi/holo_light_seekbar_0.png
rename to tests/res/drawable-hdpi/holo_light_port_seekbar_0.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_light_seekbar_100.png b/tests/res/drawable-hdpi/holo_light_port_seekbar_100.png
similarity index 100%
copy from tests/res/drawable-hdpi/holo_light_seekbar_100.png
copy to tests/res/drawable-hdpi/holo_light_port_seekbar_100.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_light_seekbar_50.png b/tests/res/drawable-hdpi/holo_light_port_seekbar_50.png
similarity index 100%
rename from tests/res/drawable-hdpi/holo_light_seekbar_50.png
rename to tests/res/drawable-hdpi/holo_light_port_seekbar_50.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_light_spinner.png b/tests/res/drawable-hdpi/holo_light_port_spinner.png
similarity index 100%
rename from tests/res/drawable-hdpi/holo_light_spinner.png
rename to tests/res/drawable-hdpi/holo_light_port_spinner.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_light_port_tabhost.png b/tests/res/drawable-hdpi/holo_light_port_tabhost.png
new file mode 100644
index 0000000..6180e01
--- /dev/null
+++ b/tests/res/drawable-hdpi/holo_light_port_tabhost.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_light_textview.png b/tests/res/drawable-hdpi/holo_light_port_textview.png
similarity index 100%
rename from tests/res/drawable-hdpi/holo_light_textview.png
rename to tests/res/drawable-hdpi/holo_light_port_textview.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_light_toggle_button.png b/tests/res/drawable-hdpi/holo_light_port_toggle_button.png
similarity index 100%
rename from tests/res/drawable-hdpi/holo_light_toggle_button.png
rename to tests/res/drawable-hdpi/holo_light_port_toggle_button.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_light_toggle_button_checked.png b/tests/res/drawable-hdpi/holo_light_port_toggle_button_checked.png
similarity index 100%
rename from tests/res/drawable-hdpi/holo_light_toggle_button_checked.png
rename to tests/res/drawable-hdpi/holo_light_port_toggle_button_checked.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_light_port_zoomcontrols.png b/tests/res/drawable-hdpi/holo_light_port_zoomcontrols.png
new file mode 100644
index 0000000..5763406
--- /dev/null
+++ b/tests/res/drawable-hdpi/holo_light_port_zoomcontrols.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_port_alertdialog_list.png b/tests/res/drawable-hdpi/holo_port_alertdialog_list.png
new file mode 100644
index 0000000..d1fbbc7
--- /dev/null
+++ b/tests/res/drawable-hdpi/holo_port_alertdialog_list.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_port_alertdialog_multichoice.png b/tests/res/drawable-hdpi/holo_port_alertdialog_multichoice.png
new file mode 100644
index 0000000..3dcbf4f
--- /dev/null
+++ b/tests/res/drawable-hdpi/holo_port_alertdialog_multichoice.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_port_alertdialog_onebutton.png b/tests/res/drawable-hdpi/holo_port_alertdialog_onebutton.png
new file mode 100644
index 0000000..562833a
--- /dev/null
+++ b/tests/res/drawable-hdpi/holo_port_alertdialog_onebutton.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_port_alertdialog_singlechoice.png b/tests/res/drawable-hdpi/holo_port_alertdialog_singlechoice.png
new file mode 100644
index 0000000..b433e43
--- /dev/null
+++ b/tests/res/drawable-hdpi/holo_port_alertdialog_singlechoice.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_port_alertdialog_threebuttons.png b/tests/res/drawable-hdpi/holo_port_alertdialog_threebuttons.png
new file mode 100644
index 0000000..924baab
--- /dev/null
+++ b/tests/res/drawable-hdpi/holo_port_alertdialog_threebuttons.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_port_alertdialog_twobuttons.png b/tests/res/drawable-hdpi/holo_port_alertdialog_twobuttons.png
new file mode 100644
index 0000000..fa4e7d9
--- /dev/null
+++ b/tests/res/drawable-hdpi/holo_port_alertdialog_twobuttons.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_blue_bright.png b/tests/res/drawable-hdpi/holo_port_blue_bright.png
similarity index 100%
copy from tests/res/drawable-hdpi/holo_blue_bright.png
copy to tests/res/drawable-hdpi/holo_port_blue_bright.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_light_blue_dark.png b/tests/res/drawable-hdpi/holo_port_blue_dark.png
similarity index 100%
rename from tests/res/drawable-hdpi/holo_light_blue_dark.png
rename to tests/res/drawable-hdpi/holo_port_blue_dark.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_light_blue_light.png b/tests/res/drawable-hdpi/holo_port_blue_light.png
similarity index 100%
rename from tests/res/drawable-hdpi/holo_light_blue_light.png
rename to tests/res/drawable-hdpi/holo_port_blue_light.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_button.png b/tests/res/drawable-hdpi/holo_port_button.png
similarity index 100%
copy from tests/res/drawable-hdpi/holo_button.png
copy to tests/res/drawable-hdpi/holo_port_button.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_button_pressed.png b/tests/res/drawable-hdpi/holo_port_button_pressed.png
similarity index 100%
copy from tests/res/drawable-hdpi/holo_button_pressed.png
copy to tests/res/drawable-hdpi/holo_port_button_pressed.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_port_calendarview.png b/tests/res/drawable-hdpi/holo_port_calendarview.png
new file mode 100644
index 0000000..45243d9
--- /dev/null
+++ b/tests/res/drawable-hdpi/holo_port_calendarview.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_checkbox.png b/tests/res/drawable-hdpi/holo_port_checkbox.png
similarity index 100%
copy from tests/res/drawable-hdpi/holo_checkbox.png
copy to tests/res/drawable-hdpi/holo_port_checkbox.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_checkbox_checked.png b/tests/res/drawable-hdpi/holo_port_checkbox_checked.png
similarity index 100%
copy from tests/res/drawable-hdpi/holo_checkbox_checked.png
copy to tests/res/drawable-hdpi/holo_port_checkbox_checked.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_port_edittext.png b/tests/res/drawable-hdpi/holo_port_edittext.png
new file mode 100644
index 0000000..667da2d
--- /dev/null
+++ b/tests/res/drawable-hdpi/holo_port_edittext.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_light_green_dark.png b/tests/res/drawable-hdpi/holo_port_green_dark.png
similarity index 100%
rename from tests/res/drawable-hdpi/holo_light_green_dark.png
rename to tests/res/drawable-hdpi/holo_port_green_dark.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_green_light.png b/tests/res/drawable-hdpi/holo_port_green_light.png
similarity index 100%
copy from tests/res/drawable-hdpi/holo_green_light.png
copy to tests/res/drawable-hdpi/holo_port_green_light.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_light_orange_dark.png b/tests/res/drawable-hdpi/holo_port_orange_dark.png
similarity index 100%
rename from tests/res/drawable-hdpi/holo_light_orange_dark.png
rename to tests/res/drawable-hdpi/holo_port_orange_dark.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_light_orange_light.png b/tests/res/drawable-hdpi/holo_port_orange_light.png
similarity index 100%
rename from tests/res/drawable-hdpi/holo_light_orange_light.png
rename to tests/res/drawable-hdpi/holo_port_orange_light.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_light_progressbar.png b/tests/res/drawable-hdpi/holo_port_progressbar.png
similarity index 100%
rename from tests/res/drawable-hdpi/holo_light_progressbar.png
rename to tests/res/drawable-hdpi/holo_port_progressbar.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_light_progressbar_horizontal0.png b/tests/res/drawable-hdpi/holo_port_progressbar_horizontal0.png
similarity index 100%
rename from tests/res/drawable-hdpi/holo_light_progressbar_horizontal0.png
rename to tests/res/drawable-hdpi/holo_port_progressbar_horizontal0.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_light_progressbar_horizontal100.png b/tests/res/drawable-hdpi/holo_port_progressbar_horizontal100.png
similarity index 100%
rename from tests/res/drawable-hdpi/holo_light_progressbar_horizontal100.png
rename to tests/res/drawable-hdpi/holo_port_progressbar_horizontal100.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_light_progressbar_horizontal50.png b/tests/res/drawable-hdpi/holo_port_progressbar_horizontal50.png
similarity index 100%
rename from tests/res/drawable-hdpi/holo_light_progressbar_horizontal50.png
rename to tests/res/drawable-hdpi/holo_port_progressbar_horizontal50.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_light_progressbar_large.png b/tests/res/drawable-hdpi/holo_port_progressbar_large.png
similarity index 100%
rename from tests/res/drawable-hdpi/holo_light_progressbar_large.png
rename to tests/res/drawable-hdpi/holo_port_progressbar_large.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_light_progressbar_small.png b/tests/res/drawable-hdpi/holo_port_progressbar_small.png
similarity index 100%
rename from tests/res/drawable-hdpi/holo_light_progressbar_small.png
rename to tests/res/drawable-hdpi/holo_port_progressbar_small.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_port_progressdialog_horizontal.png b/tests/res/drawable-hdpi/holo_port_progressdialog_horizontal.png
new file mode 100644
index 0000000..71d1618
--- /dev/null
+++ b/tests/res/drawable-hdpi/holo_port_progressdialog_horizontal.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_port_progressdialog_spinner.png b/tests/res/drawable-hdpi/holo_port_progressdialog_spinner.png
new file mode 100644
index 0000000..237fc28
--- /dev/null
+++ b/tests/res/drawable-hdpi/holo_port_progressdialog_spinner.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_light_purple.png b/tests/res/drawable-hdpi/holo_port_purple.png
similarity index 100%
rename from tests/res/drawable-hdpi/holo_light_purple.png
rename to tests/res/drawable-hdpi/holo_port_purple.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_radiobutton.png b/tests/res/drawable-hdpi/holo_port_radiobutton.png
similarity index 100%
copy from tests/res/drawable-hdpi/holo_radiobutton.png
copy to tests/res/drawable-hdpi/holo_port_radiobutton.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_radiobutton_checked.png b/tests/res/drawable-hdpi/holo_port_radiobutton_checked.png
similarity index 100%
copy from tests/res/drawable-hdpi/holo_radiobutton_checked.png
copy to tests/res/drawable-hdpi/holo_port_radiobutton_checked.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_radiogroup_horizontal.png b/tests/res/drawable-hdpi/holo_port_radiogroup_horizontal.png
similarity index 100%
copy from tests/res/drawable-hdpi/holo_radiogroup_horizontal.png
copy to tests/res/drawable-hdpi/holo_port_radiogroup_horizontal.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_radiogroup_vertical.png b/tests/res/drawable-hdpi/holo_port_radiogroup_vertical.png
similarity index 100%
copy from tests/res/drawable-hdpi/holo_radiogroup_vertical.png
copy to tests/res/drawable-hdpi/holo_port_radiogroup_vertical.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_ratingbar_0.png b/tests/res/drawable-hdpi/holo_port_ratingbar_0.png
similarity index 100%
copy from tests/res/drawable-hdpi/holo_ratingbar_0.png
copy to tests/res/drawable-hdpi/holo_port_ratingbar_0.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_ratingbar_0_pressed.png b/tests/res/drawable-hdpi/holo_port_ratingbar_0_pressed.png
similarity index 100%
copy from tests/res/drawable-hdpi/holo_ratingbar_0_pressed.png
copy to tests/res/drawable-hdpi/holo_port_ratingbar_0_pressed.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_ratingbar_2point5.png b/tests/res/drawable-hdpi/holo_port_ratingbar_2point5.png
similarity index 100%
copy from tests/res/drawable-hdpi/holo_ratingbar_2point5.png
copy to tests/res/drawable-hdpi/holo_port_ratingbar_2point5.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_ratingbar_2point5_pressed.png b/tests/res/drawable-hdpi/holo_port_ratingbar_2point5_pressed.png
similarity index 100%
copy from tests/res/drawable-hdpi/holo_ratingbar_2point5_pressed.png
copy to tests/res/drawable-hdpi/holo_port_ratingbar_2point5_pressed.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_ratingbar_5.png b/tests/res/drawable-hdpi/holo_port_ratingbar_5.png
similarity index 100%
copy from tests/res/drawable-hdpi/holo_ratingbar_5.png
copy to tests/res/drawable-hdpi/holo_port_ratingbar_5.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_ratingbar_5_pressed.png b/tests/res/drawable-hdpi/holo_port_ratingbar_5_pressed.png
similarity index 100%
copy from tests/res/drawable-hdpi/holo_ratingbar_5_pressed.png
copy to tests/res/drawable-hdpi/holo_port_ratingbar_5_pressed.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_light_red_dark.png b/tests/res/drawable-hdpi/holo_port_red_dark.png
similarity index 100%
rename from tests/res/drawable-hdpi/holo_light_red_dark.png
rename to tests/res/drawable-hdpi/holo_port_red_dark.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_light_red_light.png b/tests/res/drawable-hdpi/holo_port_red_light.png
similarity index 100%
rename from tests/res/drawable-hdpi/holo_light_red_light.png
rename to tests/res/drawable-hdpi/holo_port_red_light.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_port_searchview.png b/tests/res/drawable-hdpi/holo_port_searchview.png
new file mode 100644
index 0000000..95351cb
--- /dev/null
+++ b/tests/res/drawable-hdpi/holo_port_searchview.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_port_searchview_query.png b/tests/res/drawable-hdpi/holo_port_searchview_query.png
new file mode 100644
index 0000000..cb18683
--- /dev/null
+++ b/tests/res/drawable-hdpi/holo_port_searchview_query.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_port_searchview_queryhint.png b/tests/res/drawable-hdpi/holo_port_searchview_queryhint.png
new file mode 100644
index 0000000..9de3f2b
--- /dev/null
+++ b/tests/res/drawable-hdpi/holo_port_searchview_queryhint.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_seekbar_0.png b/tests/res/drawable-hdpi/holo_port_seekbar_0.png
similarity index 100%
copy from tests/res/drawable-hdpi/holo_seekbar_0.png
copy to tests/res/drawable-hdpi/holo_port_seekbar_0.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_light_seekbar_100.png b/tests/res/drawable-hdpi/holo_port_seekbar_100.png
similarity index 100%
rename from tests/res/drawable-hdpi/holo_light_seekbar_100.png
rename to tests/res/drawable-hdpi/holo_port_seekbar_100.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_seekbar_50.png b/tests/res/drawable-hdpi/holo_port_seekbar_50.png
similarity index 100%
copy from tests/res/drawable-hdpi/holo_seekbar_50.png
copy to tests/res/drawable-hdpi/holo_port_seekbar_50.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_spinner.png b/tests/res/drawable-hdpi/holo_port_spinner.png
similarity index 100%
copy from tests/res/drawable-hdpi/holo_spinner.png
copy to tests/res/drawable-hdpi/holo_port_spinner.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_port_tabhost.png b/tests/res/drawable-hdpi/holo_port_tabhost.png
new file mode 100644
index 0000000..6180e01
--- /dev/null
+++ b/tests/res/drawable-hdpi/holo_port_tabhost.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_textview.png b/tests/res/drawable-hdpi/holo_port_textview.png
similarity index 100%
copy from tests/res/drawable-hdpi/holo_textview.png
copy to tests/res/drawable-hdpi/holo_port_textview.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_toggle_button.png b/tests/res/drawable-hdpi/holo_port_toggle_button.png
similarity index 100%
copy from tests/res/drawable-hdpi/holo_toggle_button.png
copy to tests/res/drawable-hdpi/holo_port_toggle_button.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_toggle_button_checked.png b/tests/res/drawable-hdpi/holo_port_toggle_button_checked.png
similarity index 100%
copy from tests/res/drawable-hdpi/holo_toggle_button_checked.png
copy to tests/res/drawable-hdpi/holo_port_toggle_button_checked.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_port_zoomcontrols.png b/tests/res/drawable-hdpi/holo_port_zoomcontrols.png
new file mode 100644
index 0000000..5763406
--- /dev/null
+++ b/tests/res/drawable-hdpi/holo_port_zoomcontrols.png
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_land_alertdialog_list.png b/tests/res/drawable-mdpi/holo_land_alertdialog_list.png
new file mode 100644
index 0000000..efeb3af
--- /dev/null
+++ b/tests/res/drawable-mdpi/holo_land_alertdialog_list.png
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_land_alertdialog_multichoice.png b/tests/res/drawable-mdpi/holo_land_alertdialog_multichoice.png
new file mode 100644
index 0000000..22b2842
--- /dev/null
+++ b/tests/res/drawable-mdpi/holo_land_alertdialog_multichoice.png
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_land_alertdialog_onebutton.png b/tests/res/drawable-mdpi/holo_land_alertdialog_onebutton.png
new file mode 100644
index 0000000..745b47b
--- /dev/null
+++ b/tests/res/drawable-mdpi/holo_land_alertdialog_onebutton.png
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_land_alertdialog_singlechoice.png b/tests/res/drawable-mdpi/holo_land_alertdialog_singlechoice.png
new file mode 100644
index 0000000..3cd6ac8
--- /dev/null
+++ b/tests/res/drawable-mdpi/holo_land_alertdialog_singlechoice.png
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_land_alertdialog_threebuttons.png b/tests/res/drawable-mdpi/holo_land_alertdialog_threebuttons.png
new file mode 100644
index 0000000..bb85817
--- /dev/null
+++ b/tests/res/drawable-mdpi/holo_land_alertdialog_threebuttons.png
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_land_alertdialog_twobuttons.png b/tests/res/drawable-mdpi/holo_land_alertdialog_twobuttons.png
new file mode 100644
index 0000000..284f1ad
--- /dev/null
+++ b/tests/res/drawable-mdpi/holo_land_alertdialog_twobuttons.png
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_land_blue_bright.png b/tests/res/drawable-mdpi/holo_land_blue_bright.png
new file mode 100644
index 0000000..f79edea
--- /dev/null
+++ b/tests/res/drawable-mdpi/holo_land_blue_bright.png
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_land_blue_dark.png b/tests/res/drawable-mdpi/holo_land_blue_dark.png
new file mode 100644
index 0000000..1d03cc8
--- /dev/null
+++ b/tests/res/drawable-mdpi/holo_land_blue_dark.png
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_land_blue_light.png b/tests/res/drawable-mdpi/holo_land_blue_light.png
new file mode 100644
index 0000000..d974d96
--- /dev/null
+++ b/tests/res/drawable-mdpi/holo_land_blue_light.png
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_land_button.png b/tests/res/drawable-mdpi/holo_land_button.png
new file mode 100644
index 0000000..6ad6b7f
--- /dev/null
+++ b/tests/res/drawable-mdpi/holo_land_button.png
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_land_button_pressed.png b/tests/res/drawable-mdpi/holo_land_button_pressed.png
new file mode 100644
index 0000000..a376c18
--- /dev/null
+++ b/tests/res/drawable-mdpi/holo_land_button_pressed.png
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_land_calendarview.png b/tests/res/drawable-mdpi/holo_land_calendarview.png
new file mode 100644
index 0000000..1db9ebe
--- /dev/null
+++ b/tests/res/drawable-mdpi/holo_land_calendarview.png
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_land_checkbox.png b/tests/res/drawable-mdpi/holo_land_checkbox.png
new file mode 100644
index 0000000..1c8f6ed
--- /dev/null
+++ b/tests/res/drawable-mdpi/holo_land_checkbox.png
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_land_checkbox_checked.png b/tests/res/drawable-mdpi/holo_land_checkbox_checked.png
new file mode 100644
index 0000000..060da72
--- /dev/null
+++ b/tests/res/drawable-mdpi/holo_land_checkbox_checked.png
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_land_edittext.png b/tests/res/drawable-mdpi/holo_land_edittext.png
new file mode 100644
index 0000000..a47fc7d
--- /dev/null
+++ b/tests/res/drawable-mdpi/holo_land_edittext.png
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_land_green_dark.png b/tests/res/drawable-mdpi/holo_land_green_dark.png
new file mode 100644
index 0000000..02054b8
--- /dev/null
+++ b/tests/res/drawable-mdpi/holo_land_green_dark.png
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_land_green_light.png b/tests/res/drawable-mdpi/holo_land_green_light.png
new file mode 100644
index 0000000..8797128
--- /dev/null
+++ b/tests/res/drawable-mdpi/holo_land_green_light.png
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_land_orange_dark.png b/tests/res/drawable-mdpi/holo_land_orange_dark.png
new file mode 100644
index 0000000..ba73a39
--- /dev/null
+++ b/tests/res/drawable-mdpi/holo_land_orange_dark.png
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_land_orange_light.png b/tests/res/drawable-mdpi/holo_land_orange_light.png
new file mode 100644
index 0000000..09d5626
--- /dev/null
+++ b/tests/res/drawable-mdpi/holo_land_orange_light.png
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_land_progressbar.png b/tests/res/drawable-mdpi/holo_land_progressbar.png
new file mode 100644
index 0000000..77089f6
--- /dev/null
+++ b/tests/res/drawable-mdpi/holo_land_progressbar.png
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_land_progressbar_horizontal0.png b/tests/res/drawable-mdpi/holo_land_progressbar_horizontal0.png
new file mode 100644
index 0000000..9dcbbc9
--- /dev/null
+++ b/tests/res/drawable-mdpi/holo_land_progressbar_horizontal0.png
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_land_progressbar_horizontal100.png b/tests/res/drawable-mdpi/holo_land_progressbar_horizontal100.png
new file mode 100644
index 0000000..00a8b7f
--- /dev/null
+++ b/tests/res/drawable-mdpi/holo_land_progressbar_horizontal100.png
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_land_progressbar_horizontal50.png b/tests/res/drawable-mdpi/holo_land_progressbar_horizontal50.png
new file mode 100644
index 0000000..ef670dc
--- /dev/null
+++ b/tests/res/drawable-mdpi/holo_land_progressbar_horizontal50.png
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_land_progressbar_large.png b/tests/res/drawable-mdpi/holo_land_progressbar_large.png
new file mode 100644
index 0000000..9301e8a
--- /dev/null
+++ b/tests/res/drawable-mdpi/holo_land_progressbar_large.png
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_land_progressbar_small.png b/tests/res/drawable-mdpi/holo_land_progressbar_small.png
new file mode 100644
index 0000000..35cabcc
--- /dev/null
+++ b/tests/res/drawable-mdpi/holo_land_progressbar_small.png
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_land_progressdialog_horizontal.png b/tests/res/drawable-mdpi/holo_land_progressdialog_horizontal.png
new file mode 100644
index 0000000..d6d581a
--- /dev/null
+++ b/tests/res/drawable-mdpi/holo_land_progressdialog_horizontal.png
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_land_progressdialog_spinner.png b/tests/res/drawable-mdpi/holo_land_progressdialog_spinner.png
new file mode 100644
index 0000000..a3e3141
--- /dev/null
+++ b/tests/res/drawable-mdpi/holo_land_progressdialog_spinner.png
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_land_purple.png b/tests/res/drawable-mdpi/holo_land_purple.png
new file mode 100644
index 0000000..9b2b1f9
--- /dev/null
+++ b/tests/res/drawable-mdpi/holo_land_purple.png
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_land_radiobutton.png b/tests/res/drawable-mdpi/holo_land_radiobutton.png
new file mode 100644
index 0000000..51d8b24
--- /dev/null
+++ b/tests/res/drawable-mdpi/holo_land_radiobutton.png
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_land_radiobutton_checked.png b/tests/res/drawable-mdpi/holo_land_radiobutton_checked.png
new file mode 100644
index 0000000..bde1275
--- /dev/null
+++ b/tests/res/drawable-mdpi/holo_land_radiobutton_checked.png
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_land_radiogroup_horizontal.png b/tests/res/drawable-mdpi/holo_land_radiogroup_horizontal.png
new file mode 100644
index 0000000..36ab0ba
--- /dev/null
+++ b/tests/res/drawable-mdpi/holo_land_radiogroup_horizontal.png
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_land_radiogroup_vertical.png b/tests/res/drawable-mdpi/holo_land_radiogroup_vertical.png
new file mode 100644
index 0000000..fa86a42
--- /dev/null
+++ b/tests/res/drawable-mdpi/holo_land_radiogroup_vertical.png
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_land_ratingbar_0.png b/tests/res/drawable-mdpi/holo_land_ratingbar_0.png
new file mode 100644
index 0000000..79ce56d
--- /dev/null
+++ b/tests/res/drawable-mdpi/holo_land_ratingbar_0.png
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_land_ratingbar_0_pressed.png b/tests/res/drawable-mdpi/holo_land_ratingbar_0_pressed.png
new file mode 100644
index 0000000..280f112
--- /dev/null
+++ b/tests/res/drawable-mdpi/holo_land_ratingbar_0_pressed.png
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_land_ratingbar_2point5.png b/tests/res/drawable-mdpi/holo_land_ratingbar_2point5.png
new file mode 100644
index 0000000..cef353c
--- /dev/null
+++ b/tests/res/drawable-mdpi/holo_land_ratingbar_2point5.png
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_land_ratingbar_2point5_pressed.png b/tests/res/drawable-mdpi/holo_land_ratingbar_2point5_pressed.png
new file mode 100644
index 0000000..43861f0
--- /dev/null
+++ b/tests/res/drawable-mdpi/holo_land_ratingbar_2point5_pressed.png
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_land_ratingbar_5.png b/tests/res/drawable-mdpi/holo_land_ratingbar_5.png
new file mode 100644
index 0000000..c4dfb98
--- /dev/null
+++ b/tests/res/drawable-mdpi/holo_land_ratingbar_5.png
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_land_ratingbar_5_pressed.png b/tests/res/drawable-mdpi/holo_land_ratingbar_5_pressed.png
new file mode 100644
index 0000000..21394c0
--- /dev/null
+++ b/tests/res/drawable-mdpi/holo_land_ratingbar_5_pressed.png
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_land_red_dark.png b/tests/res/drawable-mdpi/holo_land_red_dark.png
new file mode 100644
index 0000000..1625976
--- /dev/null
+++ b/tests/res/drawable-mdpi/holo_land_red_dark.png
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_land_red_light.png b/tests/res/drawable-mdpi/holo_land_red_light.png
new file mode 100644
index 0000000..b9b7079
--- /dev/null
+++ b/tests/res/drawable-mdpi/holo_land_red_light.png
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_land_seekbar_0.png b/tests/res/drawable-mdpi/holo_land_seekbar_0.png
new file mode 100644
index 0000000..44648da
--- /dev/null
+++ b/tests/res/drawable-mdpi/holo_land_seekbar_0.png
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_land_seekbar_100.png b/tests/res/drawable-mdpi/holo_land_seekbar_100.png
new file mode 100644
index 0000000..644752a
--- /dev/null
+++ b/tests/res/drawable-mdpi/holo_land_seekbar_100.png
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_land_seekbar_50.png b/tests/res/drawable-mdpi/holo_land_seekbar_50.png
new file mode 100644
index 0000000..bbea8da
--- /dev/null
+++ b/tests/res/drawable-mdpi/holo_land_seekbar_50.png
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_land_spinner.png b/tests/res/drawable-mdpi/holo_land_spinner.png
new file mode 100644
index 0000000..26fe0f0
--- /dev/null
+++ b/tests/res/drawable-mdpi/holo_land_spinner.png
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_land_tabhost.png b/tests/res/drawable-mdpi/holo_land_tabhost.png
new file mode 100644
index 0000000..0111a02
--- /dev/null
+++ b/tests/res/drawable-mdpi/holo_land_tabhost.png
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_land_textview.png b/tests/res/drawable-mdpi/holo_land_textview.png
new file mode 100644
index 0000000..7e80047
--- /dev/null
+++ b/tests/res/drawable-mdpi/holo_land_textview.png
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_land_toggle_button.png b/tests/res/drawable-mdpi/holo_land_toggle_button.png
new file mode 100644
index 0000000..1a549c0
--- /dev/null
+++ b/tests/res/drawable-mdpi/holo_land_toggle_button.png
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_land_toggle_button_checked.png b/tests/res/drawable-mdpi/holo_land_toggle_button_checked.png
new file mode 100644
index 0000000..63fbbc9
--- /dev/null
+++ b/tests/res/drawable-mdpi/holo_land_toggle_button_checked.png
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_land_zoomcontrols.png b/tests/res/drawable-mdpi/holo_land_zoomcontrols.png
new file mode 100644
index 0000000..7892bcf
--- /dev/null
+++ b/tests/res/drawable-mdpi/holo_land_zoomcontrols.png
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_light_land_alertdialog_list.png b/tests/res/drawable-mdpi/holo_light_land_alertdialog_list.png
new file mode 100644
index 0000000..6932d1b
--- /dev/null
+++ b/tests/res/drawable-mdpi/holo_light_land_alertdialog_list.png
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_light_land_alertdialog_multichoice.png b/tests/res/drawable-mdpi/holo_light_land_alertdialog_multichoice.png
new file mode 100644
index 0000000..8bfb5d9
--- /dev/null
+++ b/tests/res/drawable-mdpi/holo_light_land_alertdialog_multichoice.png
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_light_land_alertdialog_onebutton.png b/tests/res/drawable-mdpi/holo_light_land_alertdialog_onebutton.png
new file mode 100644
index 0000000..0176174
--- /dev/null
+++ b/tests/res/drawable-mdpi/holo_light_land_alertdialog_onebutton.png
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_light_land_alertdialog_singlechoice.png b/tests/res/drawable-mdpi/holo_light_land_alertdialog_singlechoice.png
new file mode 100644
index 0000000..12333a2
--- /dev/null
+++ b/tests/res/drawable-mdpi/holo_light_land_alertdialog_singlechoice.png
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_light_land_alertdialog_threebuttons.png b/tests/res/drawable-mdpi/holo_light_land_alertdialog_threebuttons.png
new file mode 100644
index 0000000..57c25bb
--- /dev/null
+++ b/tests/res/drawable-mdpi/holo_light_land_alertdialog_threebuttons.png
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_light_land_alertdialog_twobuttons.png b/tests/res/drawable-mdpi/holo_light_land_alertdialog_twobuttons.png
new file mode 100644
index 0000000..b233445
--- /dev/null
+++ b/tests/res/drawable-mdpi/holo_light_land_alertdialog_twobuttons.png
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_light_land_blue_bright.png b/tests/res/drawable-mdpi/holo_light_land_blue_bright.png
new file mode 100644
index 0000000..f79edea
--- /dev/null
+++ b/tests/res/drawable-mdpi/holo_light_land_blue_bright.png
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_light_land_blue_dark.png b/tests/res/drawable-mdpi/holo_light_land_blue_dark.png
new file mode 100644
index 0000000..1d03cc8
--- /dev/null
+++ b/tests/res/drawable-mdpi/holo_light_land_blue_dark.png
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_light_land_blue_light.png b/tests/res/drawable-mdpi/holo_light_land_blue_light.png
new file mode 100644
index 0000000..d974d96
--- /dev/null
+++ b/tests/res/drawable-mdpi/holo_light_land_blue_light.png
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_light_land_button.png b/tests/res/drawable-mdpi/holo_light_land_button.png
new file mode 100644
index 0000000..68f3ed7
--- /dev/null
+++ b/tests/res/drawable-mdpi/holo_light_land_button.png
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_light_land_button_pressed.png b/tests/res/drawable-mdpi/holo_light_land_button_pressed.png
new file mode 100644
index 0000000..b17eb49
--- /dev/null
+++ b/tests/res/drawable-mdpi/holo_light_land_button_pressed.png
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_light_land_calendarview.png b/tests/res/drawable-mdpi/holo_light_land_calendarview.png
new file mode 100644
index 0000000..b1c78f7
--- /dev/null
+++ b/tests/res/drawable-mdpi/holo_light_land_calendarview.png
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_light_land_checkbox.png b/tests/res/drawable-mdpi/holo_light_land_checkbox.png
new file mode 100644
index 0000000..b4d6daf
--- /dev/null
+++ b/tests/res/drawable-mdpi/holo_light_land_checkbox.png
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_light_land_checkbox_checked.png b/tests/res/drawable-mdpi/holo_light_land_checkbox_checked.png
new file mode 100644
index 0000000..db277a2
--- /dev/null
+++ b/tests/res/drawable-mdpi/holo_light_land_checkbox_checked.png
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_light_land_edittext.png b/tests/res/drawable-mdpi/holo_light_land_edittext.png
new file mode 100644
index 0000000..ec1112f
--- /dev/null
+++ b/tests/res/drawable-mdpi/holo_light_land_edittext.png
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_light_land_green_dark.png b/tests/res/drawable-mdpi/holo_light_land_green_dark.png
new file mode 100644
index 0000000..02054b8
--- /dev/null
+++ b/tests/res/drawable-mdpi/holo_light_land_green_dark.png
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_light_land_green_light.png b/tests/res/drawable-mdpi/holo_light_land_green_light.png
new file mode 100644
index 0000000..8797128
--- /dev/null
+++ b/tests/res/drawable-mdpi/holo_light_land_green_light.png
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_light_land_orange_dark.png b/tests/res/drawable-mdpi/holo_light_land_orange_dark.png
new file mode 100644
index 0000000..ba73a39
--- /dev/null
+++ b/tests/res/drawable-mdpi/holo_light_land_orange_dark.png
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_light_land_orange_light.png b/tests/res/drawable-mdpi/holo_light_land_orange_light.png
new file mode 100644
index 0000000..09d5626
--- /dev/null
+++ b/tests/res/drawable-mdpi/holo_light_land_orange_light.png
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_light_land_progressbar.png b/tests/res/drawable-mdpi/holo_light_land_progressbar.png
new file mode 100644
index 0000000..77089f6
--- /dev/null
+++ b/tests/res/drawable-mdpi/holo_light_land_progressbar.png
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_light_land_progressbar_horizontal0.png b/tests/res/drawable-mdpi/holo_light_land_progressbar_horizontal0.png
new file mode 100644
index 0000000..9dcbbc9
--- /dev/null
+++ b/tests/res/drawable-mdpi/holo_light_land_progressbar_horizontal0.png
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_light_land_progressbar_horizontal100.png b/tests/res/drawable-mdpi/holo_light_land_progressbar_horizontal100.png
new file mode 100644
index 0000000..00a8b7f
--- /dev/null
+++ b/tests/res/drawable-mdpi/holo_light_land_progressbar_horizontal100.png
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_light_land_progressbar_horizontal50.png b/tests/res/drawable-mdpi/holo_light_land_progressbar_horizontal50.png
new file mode 100644
index 0000000..ef670dc
--- /dev/null
+++ b/tests/res/drawable-mdpi/holo_light_land_progressbar_horizontal50.png
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_light_land_progressbar_large.png b/tests/res/drawable-mdpi/holo_light_land_progressbar_large.png
new file mode 100644
index 0000000..9301e8a
--- /dev/null
+++ b/tests/res/drawable-mdpi/holo_light_land_progressbar_large.png
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_light_land_progressbar_small.png b/tests/res/drawable-mdpi/holo_light_land_progressbar_small.png
new file mode 100644
index 0000000..35cabcc
--- /dev/null
+++ b/tests/res/drawable-mdpi/holo_light_land_progressbar_small.png
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_light_land_progressdialog_horizontal.png b/tests/res/drawable-mdpi/holo_light_land_progressdialog_horizontal.png
new file mode 100644
index 0000000..aca81fe
--- /dev/null
+++ b/tests/res/drawable-mdpi/holo_light_land_progressdialog_horizontal.png
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_light_land_progressdialog_spinner.png b/tests/res/drawable-mdpi/holo_light_land_progressdialog_spinner.png
new file mode 100644
index 0000000..2f67ada
--- /dev/null
+++ b/tests/res/drawable-mdpi/holo_light_land_progressdialog_spinner.png
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_light_land_purple.png b/tests/res/drawable-mdpi/holo_light_land_purple.png
new file mode 100644
index 0000000..9b2b1f9
--- /dev/null
+++ b/tests/res/drawable-mdpi/holo_light_land_purple.png
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_light_land_radiobutton.png b/tests/res/drawable-mdpi/holo_light_land_radiobutton.png
new file mode 100644
index 0000000..9cb438e
--- /dev/null
+++ b/tests/res/drawable-mdpi/holo_light_land_radiobutton.png
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_light_land_radiobutton_checked.png b/tests/res/drawable-mdpi/holo_light_land_radiobutton_checked.png
new file mode 100644
index 0000000..2999134
--- /dev/null
+++ b/tests/res/drawable-mdpi/holo_light_land_radiobutton_checked.png
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_light_land_radiogroup_horizontal.png b/tests/res/drawable-mdpi/holo_light_land_radiogroup_horizontal.png
new file mode 100644
index 0000000..e67c2c9
--- /dev/null
+++ b/tests/res/drawable-mdpi/holo_light_land_radiogroup_horizontal.png
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_light_land_radiogroup_vertical.png b/tests/res/drawable-mdpi/holo_light_land_radiogroup_vertical.png
new file mode 100644
index 0000000..889c0a4
--- /dev/null
+++ b/tests/res/drawable-mdpi/holo_light_land_radiogroup_vertical.png
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_light_land_ratingbar_0.png b/tests/res/drawable-mdpi/holo_light_land_ratingbar_0.png
new file mode 100644
index 0000000..cc8427c
--- /dev/null
+++ b/tests/res/drawable-mdpi/holo_light_land_ratingbar_0.png
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_light_land_ratingbar_0_pressed.png b/tests/res/drawable-mdpi/holo_light_land_ratingbar_0_pressed.png
new file mode 100644
index 0000000..48a3c69
--- /dev/null
+++ b/tests/res/drawable-mdpi/holo_light_land_ratingbar_0_pressed.png
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_light_land_ratingbar_2point5.png b/tests/res/drawable-mdpi/holo_light_land_ratingbar_2point5.png
new file mode 100644
index 0000000..fd0783b
--- /dev/null
+++ b/tests/res/drawable-mdpi/holo_light_land_ratingbar_2point5.png
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_light_land_ratingbar_2point5_pressed.png b/tests/res/drawable-mdpi/holo_light_land_ratingbar_2point5_pressed.png
new file mode 100644
index 0000000..f1c344c
--- /dev/null
+++ b/tests/res/drawable-mdpi/holo_light_land_ratingbar_2point5_pressed.png
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_light_land_ratingbar_5.png b/tests/res/drawable-mdpi/holo_light_land_ratingbar_5.png
new file mode 100644
index 0000000..baedae5
--- /dev/null
+++ b/tests/res/drawable-mdpi/holo_light_land_ratingbar_5.png
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_light_land_ratingbar_5_pressed.png b/tests/res/drawable-mdpi/holo_light_land_ratingbar_5_pressed.png
new file mode 100644
index 0000000..7bd94f0
--- /dev/null
+++ b/tests/res/drawable-mdpi/holo_light_land_ratingbar_5_pressed.png
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_light_land_red_dark.png b/tests/res/drawable-mdpi/holo_light_land_red_dark.png
new file mode 100644
index 0000000..1625976
--- /dev/null
+++ b/tests/res/drawable-mdpi/holo_light_land_red_dark.png
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_light_land_red_light.png b/tests/res/drawable-mdpi/holo_light_land_red_light.png
new file mode 100644
index 0000000..b9b7079
--- /dev/null
+++ b/tests/res/drawable-mdpi/holo_light_land_red_light.png
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_light_land_seekbar_0.png b/tests/res/drawable-mdpi/holo_light_land_seekbar_0.png
new file mode 100644
index 0000000..0ea8968
--- /dev/null
+++ b/tests/res/drawable-mdpi/holo_light_land_seekbar_0.png
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_light_land_seekbar_100.png b/tests/res/drawable-mdpi/holo_light_land_seekbar_100.png
new file mode 100644
index 0000000..644752a
--- /dev/null
+++ b/tests/res/drawable-mdpi/holo_light_land_seekbar_100.png
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_light_land_seekbar_50.png b/tests/res/drawable-mdpi/holo_light_land_seekbar_50.png
new file mode 100644
index 0000000..6adaf2c
--- /dev/null
+++ b/tests/res/drawable-mdpi/holo_light_land_seekbar_50.png
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_light_land_spinner.png b/tests/res/drawable-mdpi/holo_light_land_spinner.png
new file mode 100644
index 0000000..9698eaf
--- /dev/null
+++ b/tests/res/drawable-mdpi/holo_light_land_spinner.png
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_light_land_tabhost.png b/tests/res/drawable-mdpi/holo_light_land_tabhost.png
new file mode 100644
index 0000000..0111a02
--- /dev/null
+++ b/tests/res/drawable-mdpi/holo_light_land_tabhost.png
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_light_land_textview.png b/tests/res/drawable-mdpi/holo_light_land_textview.png
new file mode 100644
index 0000000..a218a38
--- /dev/null
+++ b/tests/res/drawable-mdpi/holo_light_land_textview.png
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_light_land_toggle_button.png b/tests/res/drawable-mdpi/holo_light_land_toggle_button.png
new file mode 100644
index 0000000..13b57dd
--- /dev/null
+++ b/tests/res/drawable-mdpi/holo_light_land_toggle_button.png
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_light_land_toggle_button_checked.png b/tests/res/drawable-mdpi/holo_light_land_toggle_button_checked.png
new file mode 100644
index 0000000..e030070
--- /dev/null
+++ b/tests/res/drawable-mdpi/holo_light_land_toggle_button_checked.png
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_light_land_zoomcontrols.png b/tests/res/drawable-mdpi/holo_light_land_zoomcontrols.png
new file mode 100644
index 0000000..7892bcf
--- /dev/null
+++ b/tests/res/drawable-mdpi/holo_light_land_zoomcontrols.png
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_light_port_alertdialog_list.png b/tests/res/drawable-mdpi/holo_light_port_alertdialog_list.png
new file mode 100644
index 0000000..6932d1b
--- /dev/null
+++ b/tests/res/drawable-mdpi/holo_light_port_alertdialog_list.png
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_light_port_alertdialog_multichoice.png b/tests/res/drawable-mdpi/holo_light_port_alertdialog_multichoice.png
new file mode 100644
index 0000000..8bfb5d9
--- /dev/null
+++ b/tests/res/drawable-mdpi/holo_light_port_alertdialog_multichoice.png
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_light_port_alertdialog_onebutton.png b/tests/res/drawable-mdpi/holo_light_port_alertdialog_onebutton.png
new file mode 100644
index 0000000..0176174
--- /dev/null
+++ b/tests/res/drawable-mdpi/holo_light_port_alertdialog_onebutton.png
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_light_port_alertdialog_singlechoice.png b/tests/res/drawable-mdpi/holo_light_port_alertdialog_singlechoice.png
new file mode 100644
index 0000000..12333a2
--- /dev/null
+++ b/tests/res/drawable-mdpi/holo_light_port_alertdialog_singlechoice.png
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_light_port_alertdialog_threebuttons.png b/tests/res/drawable-mdpi/holo_light_port_alertdialog_threebuttons.png
new file mode 100644
index 0000000..57c25bb
--- /dev/null
+++ b/tests/res/drawable-mdpi/holo_light_port_alertdialog_threebuttons.png
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_light_port_alertdialog_twobuttons.png b/tests/res/drawable-mdpi/holo_light_port_alertdialog_twobuttons.png
new file mode 100644
index 0000000..b233445
--- /dev/null
+++ b/tests/res/drawable-mdpi/holo_light_port_alertdialog_twobuttons.png
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_light_port_blue_bright.png b/tests/res/drawable-mdpi/holo_light_port_blue_bright.png
new file mode 100644
index 0000000..f79edea
--- /dev/null
+++ b/tests/res/drawable-mdpi/holo_light_port_blue_bright.png
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_light_port_blue_dark.png b/tests/res/drawable-mdpi/holo_light_port_blue_dark.png
new file mode 100644
index 0000000..1d03cc8
--- /dev/null
+++ b/tests/res/drawable-mdpi/holo_light_port_blue_dark.png
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_light_port_blue_light.png b/tests/res/drawable-mdpi/holo_light_port_blue_light.png
new file mode 100644
index 0000000..d974d96
--- /dev/null
+++ b/tests/res/drawable-mdpi/holo_light_port_blue_light.png
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_light_port_button.png b/tests/res/drawable-mdpi/holo_light_port_button.png
new file mode 100644
index 0000000..68f3ed7
--- /dev/null
+++ b/tests/res/drawable-mdpi/holo_light_port_button.png
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_light_port_button_pressed.png b/tests/res/drawable-mdpi/holo_light_port_button_pressed.png
new file mode 100644
index 0000000..b17eb49
--- /dev/null
+++ b/tests/res/drawable-mdpi/holo_light_port_button_pressed.png
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_light_port_calendarview.png b/tests/res/drawable-mdpi/holo_light_port_calendarview.png
new file mode 100644
index 0000000..b1c78f7
--- /dev/null
+++ b/tests/res/drawable-mdpi/holo_light_port_calendarview.png
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_light_port_checkbox.png b/tests/res/drawable-mdpi/holo_light_port_checkbox.png
new file mode 100644
index 0000000..b4d6daf
--- /dev/null
+++ b/tests/res/drawable-mdpi/holo_light_port_checkbox.png
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_light_port_checkbox_checked.png b/tests/res/drawable-mdpi/holo_light_port_checkbox_checked.png
new file mode 100644
index 0000000..db277a2
--- /dev/null
+++ b/tests/res/drawable-mdpi/holo_light_port_checkbox_checked.png
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_light_port_edittext.png b/tests/res/drawable-mdpi/holo_light_port_edittext.png
new file mode 100644
index 0000000..ec1112f
--- /dev/null
+++ b/tests/res/drawable-mdpi/holo_light_port_edittext.png
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_light_port_green_dark.png b/tests/res/drawable-mdpi/holo_light_port_green_dark.png
new file mode 100644
index 0000000..02054b8
--- /dev/null
+++ b/tests/res/drawable-mdpi/holo_light_port_green_dark.png
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_light_port_green_light.png b/tests/res/drawable-mdpi/holo_light_port_green_light.png
new file mode 100644
index 0000000..8797128
--- /dev/null
+++ b/tests/res/drawable-mdpi/holo_light_port_green_light.png
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_light_port_orange_dark.png b/tests/res/drawable-mdpi/holo_light_port_orange_dark.png
new file mode 100644
index 0000000..ba73a39
--- /dev/null
+++ b/tests/res/drawable-mdpi/holo_light_port_orange_dark.png
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_light_port_orange_light.png b/tests/res/drawable-mdpi/holo_light_port_orange_light.png
new file mode 100644
index 0000000..09d5626
--- /dev/null
+++ b/tests/res/drawable-mdpi/holo_light_port_orange_light.png
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_light_port_progressbar.png b/tests/res/drawable-mdpi/holo_light_port_progressbar.png
new file mode 100644
index 0000000..77089f6
--- /dev/null
+++ b/tests/res/drawable-mdpi/holo_light_port_progressbar.png
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_light_port_progressbar_horizontal0.png b/tests/res/drawable-mdpi/holo_light_port_progressbar_horizontal0.png
new file mode 100644
index 0000000..9dcbbc9
--- /dev/null
+++ b/tests/res/drawable-mdpi/holo_light_port_progressbar_horizontal0.png
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_light_port_progressbar_horizontal100.png b/tests/res/drawable-mdpi/holo_light_port_progressbar_horizontal100.png
new file mode 100644
index 0000000..00a8b7f
--- /dev/null
+++ b/tests/res/drawable-mdpi/holo_light_port_progressbar_horizontal100.png
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_light_port_progressbar_horizontal50.png b/tests/res/drawable-mdpi/holo_light_port_progressbar_horizontal50.png
new file mode 100644
index 0000000..ef670dc
--- /dev/null
+++ b/tests/res/drawable-mdpi/holo_light_port_progressbar_horizontal50.png
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_light_port_progressbar_large.png b/tests/res/drawable-mdpi/holo_light_port_progressbar_large.png
new file mode 100644
index 0000000..9301e8a
--- /dev/null
+++ b/tests/res/drawable-mdpi/holo_light_port_progressbar_large.png
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_light_port_progressbar_small.png b/tests/res/drawable-mdpi/holo_light_port_progressbar_small.png
new file mode 100644
index 0000000..35cabcc
--- /dev/null
+++ b/tests/res/drawable-mdpi/holo_light_port_progressbar_small.png
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_light_port_progressdialog_horizontal.png b/tests/res/drawable-mdpi/holo_light_port_progressdialog_horizontal.png
new file mode 100644
index 0000000..aca81fe
--- /dev/null
+++ b/tests/res/drawable-mdpi/holo_light_port_progressdialog_horizontal.png
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_light_port_progressdialog_spinner.png b/tests/res/drawable-mdpi/holo_light_port_progressdialog_spinner.png
new file mode 100644
index 0000000..2f67ada
--- /dev/null
+++ b/tests/res/drawable-mdpi/holo_light_port_progressdialog_spinner.png
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_light_port_purple.png b/tests/res/drawable-mdpi/holo_light_port_purple.png
new file mode 100644
index 0000000..9b2b1f9
--- /dev/null
+++ b/tests/res/drawable-mdpi/holo_light_port_purple.png
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_light_port_radiobutton.png b/tests/res/drawable-mdpi/holo_light_port_radiobutton.png
new file mode 100644
index 0000000..9cb438e
--- /dev/null
+++ b/tests/res/drawable-mdpi/holo_light_port_radiobutton.png
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_light_port_radiobutton_checked.png b/tests/res/drawable-mdpi/holo_light_port_radiobutton_checked.png
new file mode 100644
index 0000000..2999134
--- /dev/null
+++ b/tests/res/drawable-mdpi/holo_light_port_radiobutton_checked.png
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_light_port_radiogroup_horizontal.png b/tests/res/drawable-mdpi/holo_light_port_radiogroup_horizontal.png
new file mode 100644
index 0000000..e67c2c9
--- /dev/null
+++ b/tests/res/drawable-mdpi/holo_light_port_radiogroup_horizontal.png
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_light_port_radiogroup_vertical.png b/tests/res/drawable-mdpi/holo_light_port_radiogroup_vertical.png
new file mode 100644
index 0000000..889c0a4
--- /dev/null
+++ b/tests/res/drawable-mdpi/holo_light_port_radiogroup_vertical.png
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_light_port_ratingbar_0.png b/tests/res/drawable-mdpi/holo_light_port_ratingbar_0.png
new file mode 100644
index 0000000..cc8427c
--- /dev/null
+++ b/tests/res/drawable-mdpi/holo_light_port_ratingbar_0.png
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_light_port_ratingbar_0_pressed.png b/tests/res/drawable-mdpi/holo_light_port_ratingbar_0_pressed.png
new file mode 100644
index 0000000..48a3c69
--- /dev/null
+++ b/tests/res/drawable-mdpi/holo_light_port_ratingbar_0_pressed.png
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_light_port_ratingbar_2point5.png b/tests/res/drawable-mdpi/holo_light_port_ratingbar_2point5.png
new file mode 100644
index 0000000..fd0783b
--- /dev/null
+++ b/tests/res/drawable-mdpi/holo_light_port_ratingbar_2point5.png
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_light_port_ratingbar_2point5_pressed.png b/tests/res/drawable-mdpi/holo_light_port_ratingbar_2point5_pressed.png
new file mode 100644
index 0000000..f1c344c
--- /dev/null
+++ b/tests/res/drawable-mdpi/holo_light_port_ratingbar_2point5_pressed.png
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_light_port_ratingbar_5.png b/tests/res/drawable-mdpi/holo_light_port_ratingbar_5.png
new file mode 100644
index 0000000..baedae5
--- /dev/null
+++ b/tests/res/drawable-mdpi/holo_light_port_ratingbar_5.png
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_light_port_ratingbar_5_pressed.png b/tests/res/drawable-mdpi/holo_light_port_ratingbar_5_pressed.png
new file mode 100644
index 0000000..7bd94f0
--- /dev/null
+++ b/tests/res/drawable-mdpi/holo_light_port_ratingbar_5_pressed.png
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_light_port_red_dark.png b/tests/res/drawable-mdpi/holo_light_port_red_dark.png
new file mode 100644
index 0000000..1625976
--- /dev/null
+++ b/tests/res/drawable-mdpi/holo_light_port_red_dark.png
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_light_port_red_light.png b/tests/res/drawable-mdpi/holo_light_port_red_light.png
new file mode 100644
index 0000000..b9b7079
--- /dev/null
+++ b/tests/res/drawable-mdpi/holo_light_port_red_light.png
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_light_port_seekbar_0.png b/tests/res/drawable-mdpi/holo_light_port_seekbar_0.png
new file mode 100644
index 0000000..0ea8968
--- /dev/null
+++ b/tests/res/drawable-mdpi/holo_light_port_seekbar_0.png
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_light_port_seekbar_100.png b/tests/res/drawable-mdpi/holo_light_port_seekbar_100.png
new file mode 100644
index 0000000..644752a
--- /dev/null
+++ b/tests/res/drawable-mdpi/holo_light_port_seekbar_100.png
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_light_port_seekbar_50.png b/tests/res/drawable-mdpi/holo_light_port_seekbar_50.png
new file mode 100644
index 0000000..6adaf2c
--- /dev/null
+++ b/tests/res/drawable-mdpi/holo_light_port_seekbar_50.png
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_light_port_spinner.png b/tests/res/drawable-mdpi/holo_light_port_spinner.png
new file mode 100644
index 0000000..9698eaf
--- /dev/null
+++ b/tests/res/drawable-mdpi/holo_light_port_spinner.png
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_light_port_tabhost.png b/tests/res/drawable-mdpi/holo_light_port_tabhost.png
new file mode 100644
index 0000000..0111a02
--- /dev/null
+++ b/tests/res/drawable-mdpi/holo_light_port_tabhost.png
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_light_port_textview.png b/tests/res/drawable-mdpi/holo_light_port_textview.png
new file mode 100644
index 0000000..a218a38
--- /dev/null
+++ b/tests/res/drawable-mdpi/holo_light_port_textview.png
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_light_port_toggle_button.png b/tests/res/drawable-mdpi/holo_light_port_toggle_button.png
new file mode 100644
index 0000000..13b57dd
--- /dev/null
+++ b/tests/res/drawable-mdpi/holo_light_port_toggle_button.png
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_light_port_toggle_button_checked.png b/tests/res/drawable-mdpi/holo_light_port_toggle_button_checked.png
new file mode 100644
index 0000000..e030070
--- /dev/null
+++ b/tests/res/drawable-mdpi/holo_light_port_toggle_button_checked.png
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_light_port_zoomcontrols.png b/tests/res/drawable-mdpi/holo_light_port_zoomcontrols.png
new file mode 100644
index 0000000..7892bcf
--- /dev/null
+++ b/tests/res/drawable-mdpi/holo_light_port_zoomcontrols.png
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_port_alertdialog_list.png b/tests/res/drawable-mdpi/holo_port_alertdialog_list.png
new file mode 100644
index 0000000..efeb3af
--- /dev/null
+++ b/tests/res/drawable-mdpi/holo_port_alertdialog_list.png
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_port_alertdialog_multichoice.png b/tests/res/drawable-mdpi/holo_port_alertdialog_multichoice.png
new file mode 100644
index 0000000..22b2842
--- /dev/null
+++ b/tests/res/drawable-mdpi/holo_port_alertdialog_multichoice.png
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_port_alertdialog_onebutton.png b/tests/res/drawable-mdpi/holo_port_alertdialog_onebutton.png
new file mode 100644
index 0000000..745b47b
--- /dev/null
+++ b/tests/res/drawable-mdpi/holo_port_alertdialog_onebutton.png
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_port_alertdialog_singlechoice.png b/tests/res/drawable-mdpi/holo_port_alertdialog_singlechoice.png
new file mode 100644
index 0000000..3cd6ac8
--- /dev/null
+++ b/tests/res/drawable-mdpi/holo_port_alertdialog_singlechoice.png
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_port_alertdialog_threebuttons.png b/tests/res/drawable-mdpi/holo_port_alertdialog_threebuttons.png
new file mode 100644
index 0000000..bb85817
--- /dev/null
+++ b/tests/res/drawable-mdpi/holo_port_alertdialog_threebuttons.png
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_port_alertdialog_twobuttons.png b/tests/res/drawable-mdpi/holo_port_alertdialog_twobuttons.png
new file mode 100644
index 0000000..284f1ad
--- /dev/null
+++ b/tests/res/drawable-mdpi/holo_port_alertdialog_twobuttons.png
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_port_blue_bright.png b/tests/res/drawable-mdpi/holo_port_blue_bright.png
new file mode 100644
index 0000000..f79edea
--- /dev/null
+++ b/tests/res/drawable-mdpi/holo_port_blue_bright.png
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_port_blue_dark.png b/tests/res/drawable-mdpi/holo_port_blue_dark.png
new file mode 100644
index 0000000..1d03cc8
--- /dev/null
+++ b/tests/res/drawable-mdpi/holo_port_blue_dark.png
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_port_blue_light.png b/tests/res/drawable-mdpi/holo_port_blue_light.png
new file mode 100644
index 0000000..d974d96
--- /dev/null
+++ b/tests/res/drawable-mdpi/holo_port_blue_light.png
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_port_button.png b/tests/res/drawable-mdpi/holo_port_button.png
new file mode 100644
index 0000000..6ad6b7f
--- /dev/null
+++ b/tests/res/drawable-mdpi/holo_port_button.png
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_port_button_pressed.png b/tests/res/drawable-mdpi/holo_port_button_pressed.png
new file mode 100644
index 0000000..a376c18
--- /dev/null
+++ b/tests/res/drawable-mdpi/holo_port_button_pressed.png
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_port_calendarview.png b/tests/res/drawable-mdpi/holo_port_calendarview.png
new file mode 100644
index 0000000..1db9ebe
--- /dev/null
+++ b/tests/res/drawable-mdpi/holo_port_calendarview.png
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_port_checkbox.png b/tests/res/drawable-mdpi/holo_port_checkbox.png
new file mode 100644
index 0000000..1c8f6ed
--- /dev/null
+++ b/tests/res/drawable-mdpi/holo_port_checkbox.png
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_port_checkbox_checked.png b/tests/res/drawable-mdpi/holo_port_checkbox_checked.png
new file mode 100644
index 0000000..060da72
--- /dev/null
+++ b/tests/res/drawable-mdpi/holo_port_checkbox_checked.png
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_port_edittext.png b/tests/res/drawable-mdpi/holo_port_edittext.png
new file mode 100644
index 0000000..a47fc7d
--- /dev/null
+++ b/tests/res/drawable-mdpi/holo_port_edittext.png
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_port_green_dark.png b/tests/res/drawable-mdpi/holo_port_green_dark.png
new file mode 100644
index 0000000..02054b8
--- /dev/null
+++ b/tests/res/drawable-mdpi/holo_port_green_dark.png
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_port_green_light.png b/tests/res/drawable-mdpi/holo_port_green_light.png
new file mode 100644
index 0000000..8797128
--- /dev/null
+++ b/tests/res/drawable-mdpi/holo_port_green_light.png
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_port_orange_dark.png b/tests/res/drawable-mdpi/holo_port_orange_dark.png
new file mode 100644
index 0000000..ba73a39
--- /dev/null
+++ b/tests/res/drawable-mdpi/holo_port_orange_dark.png
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_port_orange_light.png b/tests/res/drawable-mdpi/holo_port_orange_light.png
new file mode 100644
index 0000000..09d5626
--- /dev/null
+++ b/tests/res/drawable-mdpi/holo_port_orange_light.png
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_port_progressbar.png b/tests/res/drawable-mdpi/holo_port_progressbar.png
new file mode 100644
index 0000000..77089f6
--- /dev/null
+++ b/tests/res/drawable-mdpi/holo_port_progressbar.png
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_port_progressbar_horizontal0.png b/tests/res/drawable-mdpi/holo_port_progressbar_horizontal0.png
new file mode 100644
index 0000000..9dcbbc9
--- /dev/null
+++ b/tests/res/drawable-mdpi/holo_port_progressbar_horizontal0.png
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_port_progressbar_horizontal100.png b/tests/res/drawable-mdpi/holo_port_progressbar_horizontal100.png
new file mode 100644
index 0000000..00a8b7f
--- /dev/null
+++ b/tests/res/drawable-mdpi/holo_port_progressbar_horizontal100.png
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_port_progressbar_horizontal50.png b/tests/res/drawable-mdpi/holo_port_progressbar_horizontal50.png
new file mode 100644
index 0000000..ef670dc
--- /dev/null
+++ b/tests/res/drawable-mdpi/holo_port_progressbar_horizontal50.png
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_port_progressbar_large.png b/tests/res/drawable-mdpi/holo_port_progressbar_large.png
new file mode 100644
index 0000000..9301e8a
--- /dev/null
+++ b/tests/res/drawable-mdpi/holo_port_progressbar_large.png
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_port_progressbar_small.png b/tests/res/drawable-mdpi/holo_port_progressbar_small.png
new file mode 100644
index 0000000..35cabcc
--- /dev/null
+++ b/tests/res/drawable-mdpi/holo_port_progressbar_small.png
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_port_progressdialog_horizontal.png b/tests/res/drawable-mdpi/holo_port_progressdialog_horizontal.png
new file mode 100644
index 0000000..d6d581a
--- /dev/null
+++ b/tests/res/drawable-mdpi/holo_port_progressdialog_horizontal.png
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_port_progressdialog_spinner.png b/tests/res/drawable-mdpi/holo_port_progressdialog_spinner.png
new file mode 100644
index 0000000..a3e3141
--- /dev/null
+++ b/tests/res/drawable-mdpi/holo_port_progressdialog_spinner.png
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_port_purple.png b/tests/res/drawable-mdpi/holo_port_purple.png
new file mode 100644
index 0000000..9b2b1f9
--- /dev/null
+++ b/tests/res/drawable-mdpi/holo_port_purple.png
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_port_radiobutton.png b/tests/res/drawable-mdpi/holo_port_radiobutton.png
new file mode 100644
index 0000000..51d8b24
--- /dev/null
+++ b/tests/res/drawable-mdpi/holo_port_radiobutton.png
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_port_radiobutton_checked.png b/tests/res/drawable-mdpi/holo_port_radiobutton_checked.png
new file mode 100644
index 0000000..bde1275
--- /dev/null
+++ b/tests/res/drawable-mdpi/holo_port_radiobutton_checked.png
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_port_radiogroup_horizontal.png b/tests/res/drawable-mdpi/holo_port_radiogroup_horizontal.png
new file mode 100644
index 0000000..36ab0ba
--- /dev/null
+++ b/tests/res/drawable-mdpi/holo_port_radiogroup_horizontal.png
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_port_radiogroup_vertical.png b/tests/res/drawable-mdpi/holo_port_radiogroup_vertical.png
new file mode 100644
index 0000000..fa86a42
--- /dev/null
+++ b/tests/res/drawable-mdpi/holo_port_radiogroup_vertical.png
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_port_ratingbar_0.png b/tests/res/drawable-mdpi/holo_port_ratingbar_0.png
new file mode 100644
index 0000000..79ce56d
--- /dev/null
+++ b/tests/res/drawable-mdpi/holo_port_ratingbar_0.png
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_port_ratingbar_0_pressed.png b/tests/res/drawable-mdpi/holo_port_ratingbar_0_pressed.png
new file mode 100644
index 0000000..280f112
--- /dev/null
+++ b/tests/res/drawable-mdpi/holo_port_ratingbar_0_pressed.png
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_port_ratingbar_2point5.png b/tests/res/drawable-mdpi/holo_port_ratingbar_2point5.png
new file mode 100644
index 0000000..cef353c
--- /dev/null
+++ b/tests/res/drawable-mdpi/holo_port_ratingbar_2point5.png
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_port_ratingbar_2point5_pressed.png b/tests/res/drawable-mdpi/holo_port_ratingbar_2point5_pressed.png
new file mode 100644
index 0000000..43861f0
--- /dev/null
+++ b/tests/res/drawable-mdpi/holo_port_ratingbar_2point5_pressed.png
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_port_ratingbar_5.png b/tests/res/drawable-mdpi/holo_port_ratingbar_5.png
new file mode 100644
index 0000000..c4dfb98
--- /dev/null
+++ b/tests/res/drawable-mdpi/holo_port_ratingbar_5.png
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_port_ratingbar_5_pressed.png b/tests/res/drawable-mdpi/holo_port_ratingbar_5_pressed.png
new file mode 100644
index 0000000..21394c0
--- /dev/null
+++ b/tests/res/drawable-mdpi/holo_port_ratingbar_5_pressed.png
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_port_red_dark.png b/tests/res/drawable-mdpi/holo_port_red_dark.png
new file mode 100644
index 0000000..1625976
--- /dev/null
+++ b/tests/res/drawable-mdpi/holo_port_red_dark.png
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_port_red_light.png b/tests/res/drawable-mdpi/holo_port_red_light.png
new file mode 100644
index 0000000..b9b7079
--- /dev/null
+++ b/tests/res/drawable-mdpi/holo_port_red_light.png
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_port_seekbar_0.png b/tests/res/drawable-mdpi/holo_port_seekbar_0.png
new file mode 100644
index 0000000..44648da
--- /dev/null
+++ b/tests/res/drawable-mdpi/holo_port_seekbar_0.png
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_port_seekbar_100.png b/tests/res/drawable-mdpi/holo_port_seekbar_100.png
new file mode 100644
index 0000000..644752a
--- /dev/null
+++ b/tests/res/drawable-mdpi/holo_port_seekbar_100.png
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_port_seekbar_50.png b/tests/res/drawable-mdpi/holo_port_seekbar_50.png
new file mode 100644
index 0000000..bbea8da
--- /dev/null
+++ b/tests/res/drawable-mdpi/holo_port_seekbar_50.png
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_port_spinner.png b/tests/res/drawable-mdpi/holo_port_spinner.png
new file mode 100644
index 0000000..26fe0f0
--- /dev/null
+++ b/tests/res/drawable-mdpi/holo_port_spinner.png
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_port_tabhost.png b/tests/res/drawable-mdpi/holo_port_tabhost.png
new file mode 100644
index 0000000..0111a02
--- /dev/null
+++ b/tests/res/drawable-mdpi/holo_port_tabhost.png
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_port_textview.png b/tests/res/drawable-mdpi/holo_port_textview.png
new file mode 100644
index 0000000..7e80047
--- /dev/null
+++ b/tests/res/drawable-mdpi/holo_port_textview.png
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_port_toggle_button.png b/tests/res/drawable-mdpi/holo_port_toggle_button.png
new file mode 100644
index 0000000..1a549c0
--- /dev/null
+++ b/tests/res/drawable-mdpi/holo_port_toggle_button.png
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_port_toggle_button_checked.png b/tests/res/drawable-mdpi/holo_port_toggle_button_checked.png
new file mode 100644
index 0000000..63fbbc9
--- /dev/null
+++ b/tests/res/drawable-mdpi/holo_port_toggle_button_checked.png
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_port_zoomcontrols.png b/tests/res/drawable-mdpi/holo_port_zoomcontrols.png
new file mode 100644
index 0000000..7892bcf
--- /dev/null
+++ b/tests/res/drawable-mdpi/holo_port_zoomcontrols.png
Binary files differ
diff --git a/tests/res/layout/calendarview.xml b/tests/res/layout/calendarview.xml
new file mode 100644
index 0000000..2a2303e
--- /dev/null
+++ b/tests/res/layout/calendarview.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2011 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.
+-->
+    <CalendarView android:id="@+id/calendarView1"
+                  android:layout_width="match_parent"
+                  android:layout_height="match_parent"
+                  xmlns:android="http://schemas.android.com/apk/res/android">
+    </CalendarView>
diff --git a/tests/res/layout/datepicker.xml b/tests/res/layout/datepicker.xml
new file mode 100644
index 0000000..6a7b51c
--- /dev/null
+++ b/tests/res/layout/datepicker.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2011 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.
+-->
+    <DatePicker android:id="@+id/datePicker1"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:spinnersShown="false"
+                xmlns:android="http://schemas.android.com/apk/res/android">
+    </DatePicker>
diff --git a/tests/res/layout/edittext.xml b/tests/res/layout/edittext.xml
new file mode 100644
index 0000000..cd19470
--- /dev/null
+++ b/tests/res/layout/edittext.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2011 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.
+-->
+    <EditText android:id="@+id/editText1"
+              android:layout_width="match_parent"
+              android:layout_height="wrap_content"
+              xmlns:android="http://schemas.android.com/apk/res/android">
+    </EditText>
diff --git a/tests/res/layout/empty_for_dialog.xml b/tests/res/layout/empty_for_dialog.xml
new file mode 100644
index 0000000..b7f4e63
--- /dev/null
+++ b/tests/res/layout/empty_for_dialog.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2011 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.
+-->
+    <FrameLayout android:id="@+id/frameLayout1"
+        android:layout_width="0dip"
+        android:layout_height="0dip"
+        xmlns:android="http://schemas.android.com/apk/res/android">
+    </FrameLayout>
diff --git a/tests/res/layout/searchview.xml b/tests/res/layout/searchview.xml
new file mode 100644
index 0000000..dba105a
--- /dev/null
+++ b/tests/res/layout/searchview.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2011 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.
+-->
+    <SearchView android:id="@+id/searchView1"
+                android:layout_width="fill_parent"
+                android:layout_height="fill_parent"
+                xmlns:android="http://schemas.android.com/apk/res/android">
+    </SearchView>
diff --git a/tests/res/layout/tabhost.xml b/tests/res/layout/tabhost.xml
new file mode 100644
index 0000000..ab3a55c
--- /dev/null
+++ b/tests/res/layout/tabhost.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2011 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.
+-->
+    <TabHost android:id="@+id/tabHost1"
+             android:layout_width="fill_parent"
+             android:layout_height="fill_parent"
+             xmlns:android="http://schemas.android.com/apk/res/android">
+        <LinearLayout
+            android:orientation="vertical"
+            android:layout_width="fill_parent"
+            android:layout_height="fill_parent"
+            android:padding="5dp">
+            <TabWidget
+                android:id="@android:id/tabs"
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content" />
+            <FrameLayout
+                android:id="@android:id/tabcontent"
+                android:layout_width="fill_parent"
+                android:layout_height="fill_parent"
+                android:padding="5dp">
+                <LinearLayout android:id="@+id/tabInnerView"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content">
+                </LinearLayout>
+            </FrameLayout>
+        </LinearLayout>
+    </TabHost>
diff --git a/tests/res/layout/zoomcontrols.xml b/tests/res/layout/zoomcontrols.xml
new file mode 100644
index 0000000..f4acc6e
--- /dev/null
+++ b/tests/res/layout/zoomcontrols.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2011 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.
+-->
+    <ZoomControls android:id="@+id/zoomControls1"
+                  android:layout_width="wrap_content"
+                  android:layout_height="wrap_content"
+                  xmlns:android="http://schemas.android.com/apk/res/android">
+    </ZoomControls>
diff --git a/tests/src/android/theme/cts/AlertDialogBuilder.java b/tests/src/android/theme/cts/AlertDialogBuilder.java
new file mode 100644
index 0000000..040d1b5
--- /dev/null
+++ b/tests/src/android/theme/cts/AlertDialogBuilder.java
@@ -0,0 +1,104 @@
+/*
+ * Copyright (C) 2011 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.
+ */
+
+package android.theme.cts;
+
+import android.app.AlertDialog;
+import android.app.Dialog;
+import android.view.View;
+
+/**
+ * Implements the {@link DialogBuilder} interface to build and show
+ * {@link AlertDialog}s for the purposes of testing. In order to reuse
+ * as much as possible, the constructor takes a flag that describes the
+ * type of AlertDialog to build for the test.
+ *
+ * If you want to create another {@link AlertDialog} test, simply
+ * add another flag and add another case to the switch statement
+ * in {link buildDialog()}
+ */
+public class AlertDialogBuilder implements DialogBuilder {
+    /**
+     * Build an {@link AlertDialog} with one button.
+     */
+    public static final int ONE_BUTTON = 0;
+    /**
+     * Build an {@link AlertDialog} with two buttons.
+     */
+    public static final int TWO_BUTTONS = 1;
+    /**
+     * Build an {@link AlertDialog} with three buttons.
+     */
+    public static final int THREE_BUTTONS = 2;
+    /**
+     * Build an {@link AlertDialog} with a list of items.
+     */
+    public static final int LIST = 3;
+    /**
+     * Build an {@link AlertDialog} with a single-choice list of items.
+     */
+    public static final int SINGLE_CHOICE = 4;
+    /**
+     * Build an {@link AlertDialog} with a multi-choice list of items.
+     */
+    public static final int MULTI_CHOICE = 5;
+
+    private int mDialogType;
+
+    private static final CharSequence[] ITEMS = {"Red", "Green", "Blue"};
+
+    public AlertDialogBuilder(int dialogType) {
+        mDialogType = dialogType;
+    }
+
+    @Override
+    public Dialog buildDialog(View view) {
+        AlertDialog.Builder builder = new AlertDialog.Builder(view.getContext());
+
+        switch (mDialogType) {
+            case ONE_BUTTON:
+                builder.setTitle("Exit Dialog")
+                        .setMessage("Are you sure you want to exit?")
+                        .setPositiveButton("Exit", null);
+                break;
+            case TWO_BUTTONS:
+                builder.setMessage("Are you sure you want to exit?")
+                        .setPositiveButton("Exit", null)
+                        .setNegativeButton("Cancel", null);
+                break;
+            case THREE_BUTTONS:
+                builder.setMessage("Are you sure you want to exit?")
+                        .setPositiveButton("Exit", null)
+                        .setNeutralButton("Neutral", null)
+                        .setNegativeButton("Cancel", null);
+                break;
+            case LIST:
+                builder.setTitle("Pick a Color")
+                        .setItems(ITEMS, null);
+                break;
+            case SINGLE_CHOICE:
+                builder.setTitle("Pick a Color")
+                        .setSingleChoiceItems(ITEMS, 1, null);
+                break;
+            case MULTI_CHOICE:
+                builder.setTitle("Pick a Color")
+                        .setMultiChoiceItems(ITEMS, new boolean[]{false, true, false}, null);
+                break;
+        }
+
+        return builder.show();
+    }
+}
\ No newline at end of file
diff --git a/tests/src/android/theme/cts/CalendarViewModifier.java b/tests/src/android/theme/cts/CalendarViewModifier.java
new file mode 100644
index 0000000..0f3be46
--- /dev/null
+++ b/tests/src/android/theme/cts/CalendarViewModifier.java
@@ -0,0 +1,37 @@
+/*
+ * Copyright (C) 2011 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.
+ */
+
+package android.theme.cts;
+
+import android.view.View;
+import android.widget.CalendarView;
+
+/**
+ * Modifies the CalendarView widget in order to set a precise date.
+ */
+public class CalendarViewModifier implements ThemeTestModifier {
+    /**
+     * Long representation of a date that is 30 years in milliseconds from
+     * Unix epoch (January 1, 1970 00:00:00).
+     */
+    private static final long DATE = 946707779241L;
+
+    @Override
+    public View modifyView(View view) {
+        ((CalendarView) view).setDate(DATE);
+        return view;
+    }
+}
diff --git a/tests/src/android/theme/cts/DatePickerModifier.java b/tests/src/android/theme/cts/DatePickerModifier.java
new file mode 100644
index 0000000..b3d2002
--- /dev/null
+++ b/tests/src/android/theme/cts/DatePickerModifier.java
@@ -0,0 +1,33 @@
+/*
+ * Copyright (C) 2011 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.
+ */
+
+package android.theme.cts;
+
+import android.view.View;
+import android.widget.DatePicker;
+
+/**
+ * Modifies a DatePicker widget to set a precise date.
+ */
+public class DatePickerModifier implements ThemeTestModifier {
+
+    @Override
+    public View modifyView(View view) {
+        DatePicker tp = (DatePicker) view;
+        tp.updateDate(2011, 6, 21);
+        return view;
+    }
+}
diff --git a/tests/src/android/theme/cts/DialogBuilder.java b/tests/src/android/theme/cts/DialogBuilder.java
new file mode 100644
index 0000000..a870895
--- /dev/null
+++ b/tests/src/android/theme/cts/DialogBuilder.java
@@ -0,0 +1,34 @@
+/*
+ * Copyright (C) 2011 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.
+ */
+
+package android.theme.cts;
+
+import android.app.Dialog;
+import android.view.View;
+
+/**
+ * Interface to implement should you want to write a test that uses
+ * a Dialog. Since a Dialog shows in a new window, implementation
+ * of this interface is required in order to appropriately save
+ * the Dialog for testing.
+ */
+public interface DialogBuilder {
+    /**
+     * Builds and shows a Dialog to be saved.
+     * @return The Dialog to save.
+     */
+    public Dialog buildDialog(View view);
+}
\ No newline at end of file
diff --git a/tests/src/android/theme/cts/DialogModifier.java b/tests/src/android/theme/cts/DialogModifier.java
new file mode 100644
index 0000000..bf37f4d
--- /dev/null
+++ b/tests/src/android/theme/cts/DialogModifier.java
@@ -0,0 +1,55 @@
+/*
+ * Copyright (C) 2011 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.
+ */
+
+package android.theme.cts;
+
+import android.app.Dialog;
+import android.view.View;
+import android.view.ViewGroup;
+
+/**
+ * This class builds and modifies a Dialog (or its derived classes)
+ * in order to use in the Theme Testing framework. To create a new
+ * Dialog test, either create a new class that implements {@link DialogBuilder}
+ * or add another test to the existing implementations of {@link DialogBuilder}.
+ *
+ * See {@link AlertDialogBuilder} for an existing implementation.
+ */
+public class DialogModifier implements ThemeTestModifier {
+    private DialogBuilder mBuilder;
+
+    public DialogModifier(DialogBuilder builder) {
+        mBuilder = builder;
+    }
+
+    @Override
+    public View modifyView(View view) {
+        Dialog alert = mBuilder.buildDialog(view);
+        ViewGroup parent = (ViewGroup) view.getParent();
+        parent.removeView(view); // remove the filler view
+
+        // get the dialog as a view
+        View newView = alert.getWindow().getDecorView();
+
+        // remove it from the dialog
+        alert.getWindow().getWindowManager().removeView(newView);
+
+        // so we can add it to our ViewGroup
+        parent.addView(newView);
+
+        return newView;
+    }
+}
diff --git a/tests/src/android/theme/cts/HomeActivity.java b/tests/src/android/theme/cts/OrientationSelectorActivity.java
similarity index 67%
copy from tests/src/android/theme/cts/HomeActivity.java
copy to tests/src/android/theme/cts/OrientationSelectorActivity.java
index a89f614..72aa425 100644
--- a/tests/src/android/theme/cts/HomeActivity.java
+++ b/tests/src/android/theme/cts/OrientationSelectorActivity.java
@@ -14,7 +14,6 @@
  * limitations under the License.
  */
 
-
 package android.theme.cts;
 
 import com.android.cts.stub.R;
@@ -24,14 +23,18 @@
 import android.os.Bundle;
 import android.view.View;
 import android.widget.AdapterView;
-import android.widget.ListView;
 import android.widget.AdapterView.OnItemClickListener;
+import android.widget.ArrayAdapter;
+import android.widget.ListView;
 
 /**
- * This activity exists solely for debugging purposes.
+ * This activity exists solely for debugging purposes. It is
+ * the first activity seen when launching the manual viewer of tests.
+ * It allows the user to select whether they want to see the tests
+ * in portrait or landscape mode.
  */
-public class HomeActivity extends Activity {
-    private ThemeInfo[] mThemes;
+public class OrientationSelectorActivity extends Activity {
+    private static final String[] mOrientations = {"landscape", "portrait"};
     /**
      * Called with the activity is first created.
      */
@@ -42,18 +45,17 @@
 
         ListView lv = (ListView) findViewById(R.id.tests_list);
 
-        mThemes = ThemeTests.getThemes();
-        lv.setAdapter(new ThemesAdapter(this, mThemes));
+        lv.setAdapter(
+                new ArrayAdapter<String>(this, android.R.layout.simple_list_item_1, mOrientations));
 
         lv.setOnItemClickListener(mTestClickedListener);
     }
 
     private OnItemClickListener mTestClickedListener = new OnItemClickListener() {
         public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
-            Intent intent = new Intent(HomeActivity.this, TestListActivity.class);
-            ThemeInfo theme = mThemes[position];
-            intent.putExtra(ThemeTests.EXTRA_THEME_ID, theme.getResourceId());
-            intent.putExtra(ThemeTests.EXTRA_THEME_NAME, theme.getThemeName());
+            Intent intent =
+                new Intent(OrientationSelectorActivity.this, ThemeSelectorActivity.class);
+            intent.putExtra(ThemeTests.EXTRA_ORIENTATION, position);
             startActivity(intent);
         }
     };
diff --git a/tests/src/android/theme/cts/ProgressDialogBuilder.java b/tests/src/android/theme/cts/ProgressDialogBuilder.java
new file mode 100644
index 0000000..18decd9
--- /dev/null
+++ b/tests/src/android/theme/cts/ProgressDialogBuilder.java
@@ -0,0 +1,68 @@
+/*
+ * Copyright (C) 2011 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.
+ */
+
+package android.theme.cts;
+
+import android.app.Dialog;
+import android.app.ProgressDialog;
+import android.view.View;
+
+/**
+ * This class implements the {@link DialogBuilder} interface
+ * in order to build {@link ProgressDialog}s for testing purposes.
+ *
+ * <p>In order to add more tests of {@link ProgressDialog}, simply
+ * add another case inside {@link ProgressDialogBuilder#buildDialog}.
+ */
+public class ProgressDialogBuilder implements DialogBuilder {
+    /**
+     * Builds a {@link ProgressDialog} that contains a circular
+     * {@link ProgressBar}.
+     */
+    public static final int SPINNER = 0;
+
+    /**
+     * Builds a {@link ProgressDialog} that contains a horizontal
+     * {@link ProgressBar}.
+     */
+    public static final int HORIZONTAL = 1;
+
+    private int mDialogType;
+
+    public ProgressDialogBuilder(int dialogType) {
+        mDialogType = dialogType;
+    }
+
+    @Override
+    public Dialog buildDialog(View view) {
+        ProgressDialog progressDialog = new ProgressDialog(view.getContext());
+        progressDialog.setMessage("Loading...");
+
+        switch (mDialogType) {
+            case SPINNER:
+                progressDialog.setProgressStyle(ProgressDialog.STYLE_SPINNER);
+                break;
+            case HORIZONTAL:
+                progressDialog.setProgressStyle(ProgressDialog.STYLE_HORIZONTAL);
+                progressDialog.setMax(100);
+                break;
+        }
+
+        progressDialog.show();
+        return progressDialog;
+    }
+
+}
diff --git a/tests/src/android/theme/cts/SearchViewModifier.java b/tests/src/android/theme/cts/SearchViewModifier.java
new file mode 100644
index 0000000..dc2c024
--- /dev/null
+++ b/tests/src/android/theme/cts/SearchViewModifier.java
@@ -0,0 +1,52 @@
+/*
+ * Copyright (C) 2011 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.
+ */
+
+package android.theme.cts;
+
+import android.view.View;
+import android.widget.SearchView;
+
+/**
+ * This class modifies {@link SearchView} for the various tests that test
+ * the look of it.
+ */
+public class SearchViewModifier implements ThemeTestModifier {
+    public static final int QUERY_HINT = 0;
+    public static final int QUERY = 1;
+
+    private int mSearchViewType;
+
+    public SearchViewModifier(int searchViewType) {
+        mSearchViewType = searchViewType;
+    }
+
+    @Override
+    public View modifyView(View view) {
+        SearchView sv = (SearchView) view;
+
+        switch (mSearchViewType) {
+            case QUERY_HINT:
+                sv.setQueryHint("Query Hint");
+                break;
+            case QUERY:
+                sv.setQuery("Query", false);
+                break;
+        }
+
+        sv.setIconifiedByDefault(false);
+        return sv;
+    }
+}
diff --git a/tests/src/android/theme/cts/TabHostModifier.java b/tests/src/android/theme/cts/TabHostModifier.java
new file mode 100644
index 0000000..86197f5
--- /dev/null
+++ b/tests/src/android/theme/cts/TabHostModifier.java
@@ -0,0 +1,50 @@
+/*
+ * Copyright (C) 2011 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.
+ */
+
+package android.theme.cts;
+
+import com.android.cts.stub.R;
+
+import android.view.View;
+import android.widget.TabHost;
+
+/**
+ * Modifies {@link TabHost} widget for use in testing.
+ */
+public class TabHostModifier implements ThemeTestModifier {
+
+    @Override
+    public View modifyView(View view) {
+        TabHost tabHost = (TabHost) view;
+        tabHost.setup();
+        TabHost.TabSpec spec;  // Reusable TabSpec for each tab
+
+        // Initialize a TabSpec for each tab and add it to the TabHost
+        spec = tabHost.newTabSpec("artists").setIndicator("Artists").setContent(R.id.tabInnerView);
+        tabHost.addTab(spec);
+
+        // Do the same for the other tabs
+        spec = tabHost.newTabSpec("albums").setIndicator("Albums").setContent(R.id.tabInnerView);
+        tabHost.addTab(spec);
+
+        spec = tabHost.newTabSpec("songs").setIndicator("Songs").setContent(R.id.tabInnerView);
+        tabHost.addTab(spec);
+
+        tabHost.setCurrentTab(2);
+
+        return view;
+    }
+}
diff --git a/tests/src/android/theme/cts/TestListActivity.java b/tests/src/android/theme/cts/TestListActivity.java
index e1085f5..380adab 100644
--- a/tests/src/android/theme/cts/TestListActivity.java
+++ b/tests/src/android/theme/cts/TestListActivity.java
@@ -20,18 +20,25 @@
 
 import android.app.Activity;
 import android.content.Intent;
-import android.database.Cursor;
+import android.content.pm.ActivityInfo;
 import android.os.Bundle;
 import android.view.View;
 import android.widget.AdapterView;
-import android.widget.ListView;
 import android.widget.AdapterView.OnItemClickListener;
+import android.widget.ListView;
 
 import junit.framework.Assert;
 
+/**
+ * Exists for debugging purposes. Allows the manual verifier
+ * to select which test to look at. Displays a list of all of the
+ * tests. Selecting one shows the reference and generated images
+ * for that specific test.
+ */
 public class TestListActivity extends Activity {
     private int mThemeId;
     private String mThemeName;
+    private int mOrientation;
 
     /**
      * Called with the activity is first created.
@@ -56,6 +63,9 @@
         lv.setAdapter(new ThemeTestAdapter(this, ThemeTests.getTests()));
 
         lv.setOnItemClickListener(mTestClickedListener);
+
+        mOrientation = intent.getIntExtra(ThemeTests.EXTRA_ORIENTATION,
+                ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED);
     }
 
     private OnItemClickListener mTestClickedListener = new OnItemClickListener() {
@@ -64,6 +74,7 @@
             intent.putExtra(ThemeTests.EXTRA_THEME_ID, mThemeId);
             intent.putExtra(ThemeTests.EXTRA_THEME_NAME, mThemeName);
             intent.putExtra(ThemeTests.EXTRA_RUN_INDIVIDUAL_TEST, position);
+            intent.putExtra(ThemeTests.EXTRA_ORIENTATION, mOrientation);
             startActivity(intent);
         }
     };
diff --git a/tests/src/android/theme/cts/HomeActivity.java b/tests/src/android/theme/cts/ThemeSelectorActivity.java
similarity index 77%
rename from tests/src/android/theme/cts/HomeActivity.java
rename to tests/src/android/theme/cts/ThemeSelectorActivity.java
index a89f614..d9c05d6 100644
--- a/tests/src/android/theme/cts/HomeActivity.java
+++ b/tests/src/android/theme/cts/ThemeSelectorActivity.java
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-
 package android.theme.cts;
 
 import com.android.cts.stub.R;
 
 import android.app.Activity;
 import android.content.Intent;
+import android.content.pm.ActivityInfo;
 import android.os.Bundle;
 import android.view.View;
 import android.widget.AdapterView;
@@ -28,10 +28,12 @@
 import android.widget.AdapterView.OnItemClickListener;
 
 /**
- * This activity exists solely for debugging purposes.
+ * This activity exists solely for debugging purposes. It allows the manual
+ * verifier to select which theme to test.
  */
-public class HomeActivity extends Activity {
+public class ThemeSelectorActivity extends Activity {
     private ThemeInfo[] mThemes;
+    private int mOrientation;
     /**
      * Called with the activity is first created.
      */
@@ -46,14 +48,18 @@
         lv.setAdapter(new ThemesAdapter(this, mThemes));
 
         lv.setOnItemClickListener(mTestClickedListener);
+
+        mOrientation = getIntent().getIntExtra(ThemeTests.EXTRA_ORIENTATION,
+                ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED);
     }
 
     private OnItemClickListener mTestClickedListener = new OnItemClickListener() {
         public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
-            Intent intent = new Intent(HomeActivity.this, TestListActivity.class);
+            Intent intent = new Intent(ThemeSelectorActivity.this, TestListActivity.class);
             ThemeInfo theme = mThemes[position];
             intent.putExtra(ThemeTests.EXTRA_THEME_ID, theme.getResourceId());
             intent.putExtra(ThemeTests.EXTRA_THEME_NAME, theme.getThemeName());
+            intent.putExtra(ThemeTests.EXTRA_ORIENTATION, mOrientation);
             startActivity(intent);
         }
     };
diff --git a/tests/src/android/theme/cts/ThemeTestGeneratorActivity.java b/tests/src/android/theme/cts/ThemeTestGeneratorActivity.java
index 770eea1..f770b5a 100644
--- a/tests/src/android/theme/cts/ThemeTestGeneratorActivity.java
+++ b/tests/src/android/theme/cts/ThemeTestGeneratorActivity.java
@@ -20,10 +20,15 @@
 
 import android.app.Activity;
 import android.content.Intent;
+import android.content.pm.ActivityInfo;
 import android.os.Bundle;
 
 import junit.framework.Assert;
 
+/**
+ * Generates the master bitmaps for all of the tests for the specific
+ * theme and orientation requested via the intent.
+ */
 public class ThemeTestGeneratorActivity extends Activity {
     private ThemeTester mTester;
 
@@ -45,7 +50,19 @@
         setTheme(themeId);
         setContentView(R.layout.testing_activity);
 
-        mTester = new ThemeTester(this, themeName);
+        int orientation = intent.getIntExtra(ThemeTests.EXTRA_ORIENTATION,
+                ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED);
+
+        setRequestedOrientation(orientation);
+
+        String oriented = "";
+        if (orientation == ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE) {
+            oriented = "land";
+        } else if (orientation == ActivityInfo.SCREEN_ORIENTATION_PORTRAIT) {
+            oriented = "port";
+        }
+
+        mTester = new ThemeTester(this, themeName + "_" + oriented);
     }
 
     public void generateTests() {
diff --git a/tests/src/android/theme/cts/ThemeTestModifier.java b/tests/src/android/theme/cts/ThemeTestModifier.java
index 436b2e2..b5e3345 100644
--- a/tests/src/android/theme/cts/ThemeTestModifier.java
+++ b/tests/src/android/theme/cts/ThemeTestModifier.java
@@ -28,6 +28,9 @@
      * Define this function in order to modify the layout for your test.
      * The View that is passed in is the root of layout that is specified in the test.
      * @param view The root view of the layout.
+     * @return The view that will be saved as a bitmap. This view does not necessarily
+     * have to be the view that was passed into modifyView, however most implementations
+     * probably will return the original view.
      */
-    public void modifyView(View view);
+    public View modifyView(View view);
 }
diff --git a/tests/src/android/theme/cts/ThemeTestRunnerActivity.java b/tests/src/android/theme/cts/ThemeTestRunnerActivity.java
index 3a2a0fd..d337231 100644
--- a/tests/src/android/theme/cts/ThemeTestRunnerActivity.java
+++ b/tests/src/android/theme/cts/ThemeTestRunnerActivity.java
@@ -20,10 +20,15 @@
 
 import android.app.Activity;
 import android.content.Intent;
+import android.content.pm.ActivityInfo;
 import android.os.Bundle;
 
 import junit.framework.Assert;
 
+/**
+ * Builds the bitmaps for all of the tests on the fly and
+ * compares them to the known master versions.
+ */
 public class ThemeTestRunnerActivity extends Activity {
     private ThemeTester mTester;
     /**
@@ -44,7 +49,19 @@
         setTheme(themeId);
         setContentView(R.layout.testing_activity);
 
-        mTester = new ThemeTester(this, themeName);
+        int orientation = intent.getIntExtra(ThemeTests.EXTRA_ORIENTATION,
+                ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED);
+
+        setRequestedOrientation(orientation);
+
+        String oriented = "";
+        if (orientation == ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE) {
+            oriented = "land";
+        } else if (orientation == ActivityInfo.SCREEN_ORIENTATION_PORTRAIT) {
+            oriented = "port";
+        }
+
+        mTester = new ThemeTester(this, themeName + "_" + oriented);
 
         if (intent.getBooleanExtra(ThemeTests.EXTRA_RUN_TESTS, false)) {
             mTester.runTests();
diff --git a/tests/src/android/theme/cts/ThemeTester.java b/tests/src/android/theme/cts/ThemeTester.java
index 42c6b11..2491cb3 100644
--- a/tests/src/android/theme/cts/ThemeTester.java
+++ b/tests/src/android/theme/cts/ThemeTester.java
@@ -155,12 +155,14 @@
         View view = inflater.inflate(resid, mRoot, false);
         mRoot.addView(view);
 
+        if (modifier != null) {
+            view = modifier.modifyView(view);
+        }
+
         mRoot.measure(0, 0); // don't care about the input values - we build our reference size
         mRoot.layout(0, 0, mRoot.getMeasuredWidth(), mRoot.getMeasuredHeight());
 
-        if (modifier != null) {
-            modifier.modifyView(view);
-        }
+        view.setFocusable(false);
 
         return view;
     }
@@ -202,8 +204,14 @@
             Bitmap bmp2 = drawable.getBitmap();
             mReferenceImage.setImageBitmap(bmp2);
 
+            boolean identical = bmp2.sameAs(bitmap);
+
             if (mShouldAssert) {
-                Assert.assertTrue("Test failed: " + mBitmapIdName, bmp2.sameAs(bitmap));
+                Assert.assertTrue("Test failed: " + mBitmapIdName, identical);
+            } else if (identical) {
+                ((TextView) mActivity.findViewById(R.id.text)).setText("Bitmaps identical");
+            } else {
+                ((TextView) mActivity.findViewById(R.id.text)).setText("Bitmaps differ");
             }
 
             return true;
diff --git a/tests/src/android/theme/cts/ThemeTests.java b/tests/src/android/theme/cts/ThemeTests.java
index 20ee132..f9c2f71 100644
--- a/tests/src/android/theme/cts/ThemeTests.java
+++ b/tests/src/android/theme/cts/ThemeTests.java
@@ -18,6 +18,8 @@
 
 import com.android.cts.stub.R;
 
+import android.content.pm.ActivityInfo;
+
 public class ThemeTests {
     /**
      * Theme name to test.
@@ -29,6 +31,9 @@
      */
     public static final String EXTRA_THEME_ID = "android.intent.extra.THEME_ID";
 
+    /**
+     * Runs only the test supplied (by position number).
+     */
     public static final String EXTRA_RUN_INDIVIDUAL_TEST
             = "android.intent.extra.RUN_INDIVIDUAL_TEST";
 
@@ -38,6 +43,13 @@
     public static final String EXTRA_RUN_TESTS = "android.intent.extra.RUN_TESTS";
 
     /**
+     * Sets the orientation of the tests. Options are
+     * {@link ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE} or
+     * {@link ActivityInfo.SCREEN_ORIENTATION_PORTRAIT}.
+     */
+    public static final String EXTRA_ORIENTATION = "android.intent.extra.ORIENTATION";
+
+    /**
      * The list of tests to run for each theme.
      * In order to create a new test, follow these steps.<p>
      * 1. Create a layout file for the test you wish to run.<br>
@@ -88,7 +100,51 @@
             new ThemeTestInfo(R.layout.purple, null, "purple"),
             new ThemeTestInfo(R.layout.orange_light, null, "orange_light"),
             new ThemeTestInfo(R.layout.orange_dark, null, "orange_dark"),
-            new ThemeTestInfo(R.layout.blue_bright, null, "blue_bright")};
+            new ThemeTestInfo(R.layout.blue_bright, null, "blue_bright"),
+            new ThemeTestInfo(R.layout.edittext, null, "edittext"),
+            new ThemeTestInfo(R.layout.calendarview, new CalendarViewModifier(), "calendarview"),
+            new ThemeTestInfo(R.layout.zoomcontrols, null, "zoomcontrols"),
+            new ThemeTestInfo(R.layout.tabhost, new TabHostModifier(), "tabhost"),
+            new ThemeTestInfo(R.layout.empty_for_dialog,
+                    new DialogModifier(
+                            new AlertDialogBuilder(
+                                    AlertDialogBuilder.ONE_BUTTON)), "alertdialog_onebutton"),
+            new ThemeTestInfo(R.layout.empty_for_dialog,
+                    new DialogModifier(
+                            new AlertDialogBuilder(
+                                    AlertDialogBuilder.TWO_BUTTONS)), "alertdialog_twobuttons"),
+            new ThemeTestInfo(R.layout.empty_for_dialog,
+                    new DialogModifier(
+                            new AlertDialogBuilder(
+                                    AlertDialogBuilder.THREE_BUTTONS)), "alertdialog_threebuttons"),
+            new ThemeTestInfo(R.layout.empty_for_dialog,
+                    new DialogModifier(
+                            new AlertDialogBuilder(
+                                    AlertDialogBuilder.LIST)), "alertdialog_list"),
+            new ThemeTestInfo(R.layout.empty_for_dialog,
+                    new DialogModifier(
+                            new AlertDialogBuilder(
+                                    AlertDialogBuilder.SINGLE_CHOICE)), "alertdialog_singlechoice"),
+            new ThemeTestInfo(R.layout.empty_for_dialog,
+                    new DialogModifier(
+                            new AlertDialogBuilder(
+                                    AlertDialogBuilder.MULTI_CHOICE)), "alertdialog_multichoice"),
+            new ThemeTestInfo(R.layout.empty_for_dialog,
+                    new DialogModifier(
+                            new ProgressDialogBuilder(
+                                    ProgressDialogBuilder.SPINNER)), "progressdialog_spinner"),
+            new ThemeTestInfo(R.layout.empty_for_dialog,
+                    new DialogModifier(
+                            new ProgressDialogBuilder(
+                                    ProgressDialogBuilder.HORIZONTAL)),
+                                    "progressdialog_horizontal"),
+            new ThemeTestInfo(R.layout.searchview, null, "searchview"),
+            new ThemeTestInfo(R.layout.searchview,
+                    new SearchViewModifier(SearchViewModifier.QUERY_HINT),
+                    "searchview_queryhint"),
+            new ThemeTestInfo(R.layout.searchview,
+                    new SearchViewModifier(SearchViewModifier.QUERY),
+                    "searchview_query")};
 
     /**
      * Returns the list of tests to run on a particular theme.
diff --git a/tests/src/android/theme/cts/TimePickerModifier.java b/tests/src/android/theme/cts/TimePickerModifier.java
new file mode 100644
index 0000000..9a370fc
--- /dev/null
+++ b/tests/src/android/theme/cts/TimePickerModifier.java
@@ -0,0 +1,35 @@
+/*
+ * Copyright (C) 2011 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.
+ */
+
+package android.theme.cts;
+
+import android.view.View;
+import android.widget.TimePicker;
+
+/**
+ * Modifies the {@link TimePicker} widget to set a precise time.
+ */
+public class TimePickerModifier implements ThemeTestModifier {
+
+    @Override
+    public View modifyView(View view) {
+        TimePicker tp = (TimePicker) view;
+        tp.setCurrentHour(10);
+        tp.setCurrentMinute(40);
+
+        return view;
+    }
+}
diff --git a/tests/src/android/theme/cts/ViewPressedModifier.java b/tests/src/android/theme/cts/ViewPressedModifier.java
index 76b792f..2330c82 100644
--- a/tests/src/android/theme/cts/ViewPressedModifier.java
+++ b/tests/src/android/theme/cts/ViewPressedModifier.java
@@ -24,8 +24,8 @@
 public class ViewPressedModifier implements ThemeTestModifier {
 
     @Override
-    public void modifyView(View view) {
+    public View modifyView(View view) {
         view.setPressed(true);
+        return view;
     }
-
 }
diff --git a/tests/tests/theme/src/android/theme/cts/ThemeGenerator.java b/tests/tests/theme/src/android/theme/cts/ThemeGenerator.java
index c2a27b5..3a0986e 100644
--- a/tests/tests/theme/src/android/theme/cts/ThemeGenerator.java
+++ b/tests/tests/theme/src/android/theme/cts/ThemeGenerator.java
@@ -18,6 +18,7 @@
 
 import android.app.Instrumentation;
 import android.content.Intent;
+import android.content.pm.ActivityInfo;
 import android.test.ActivityInstrumentationTestCase2;
 
 public class ThemeGenerator extends ActivityInstrumentationTestCase2<ThemeTestGeneratorActivity> {
@@ -42,11 +43,14 @@
         ThemeInfo[] themes = ThemeTests.getThemes();
 
         for (ThemeInfo theme : themes) {
-            generateThemeTest(theme.getResourceId(), theme.getThemeName());
+            generateThemeTest(theme.getResourceId(), theme.getThemeName(),
+                    ActivityInfo.SCREEN_ORIENTATION_PORTRAIT);
+            generateThemeTest(theme.getResourceId(), theme.getThemeName(),
+                    ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE);
         }
     }
 
-    private void generateThemeTest(int resourceId, String themeName) {
+    private void generateThemeTest(int resourceId, String themeName, int orientation) {
         if (mInstrumentation == null) {
             mInstrumentation = getInstrumentation();
         }
@@ -54,6 +58,7 @@
         Intent intent = new Intent();
         intent.putExtra(ThemeTests.EXTRA_THEME_ID, resourceId);
         intent.putExtra(ThemeTests.EXTRA_THEME_NAME, themeName);
+        intent.putExtra(ThemeTests.EXTRA_ORIENTATION, orientation);
         setActivityIntent(intent);
 
         final ThemeTestGeneratorActivity activity = getActivity();
diff --git a/tests/tests/theme/src/android/theme/cts/ThemeTest.java b/tests/tests/theme/src/android/theme/cts/ThemeTest.java
index 7197a5f..589ef8f 100644
--- a/tests/tests/theme/src/android/theme/cts/ThemeTest.java
+++ b/tests/tests/theme/src/android/theme/cts/ThemeTest.java
@@ -18,6 +18,7 @@
 
 import android.app.Instrumentation;
 import android.content.Intent;
+import android.content.pm.ActivityInfo;
 import android.test.ActivityInstrumentationTestCase2;
 
 /**
@@ -41,7 +42,10 @@
         ThemeInfo[] themes = ThemeTests.getThemes();
 
         for (ThemeInfo theme : themes) {
-            runThemeTest(theme.getResourceId(), theme.getThemeName());
+            runThemeTest(theme.getResourceId(), theme.getThemeName(),
+                    ActivityInfo.SCREEN_ORIENTATION_PORTRAIT);
+            runThemeTest(theme.getResourceId(), theme.getThemeName(),
+                    ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE);
         }
     }
 
@@ -50,7 +54,7 @@
      * @param resourceId Resource ID of the theme being tested.
      * @param themeName Name of the theme being tested, e.g., "holo", "holo_light", etc
      */
-    private void runThemeTest(int resourceId, String themeName) {
+    private void runThemeTest(int resourceId, String themeName, int orientation) {
         if (mInstrumentation == null) {
             mInstrumentation = getInstrumentation();
         }
@@ -58,6 +62,7 @@
         Intent intent = new Intent();
         intent.putExtra(ThemeTests.EXTRA_THEME_ID, resourceId);
         intent.putExtra(ThemeTests.EXTRA_THEME_NAME, themeName);
+        intent.putExtra(ThemeTests.EXTRA_ORIENTATION, orientation);
         setActivityIntent(intent);
 
         final ThemeTestRunnerActivity activity = getActivity();