diff --git a/apps/CtsVerifier/AndroidManifest.xml b/apps/CtsVerifier/AndroidManifest.xml
index 945419b..94dfeb0 100644
--- a/apps/CtsVerifier/AndroidManifest.xml
+++ b/apps/CtsVerifier/AndroidManifest.xml
@@ -257,7 +257,6 @@
                 android:label="@string/aq_verifier">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.cts.intent.category.MANUAL_TEST" />
             </intent-filter>
             <meta-data android:name="test_category" android:value="@string/test_category_audio" />
             <meta-data android:name="test_required_features" android:value="android.hardware.microphone" />
diff --git a/tests/appsecurity-tests/test-apps/CtsMonkeyApp/Android.mk b/tests/appsecurity-tests/test-apps/CtsMonkeyApp/Android.mk
index 85a82d8..9365af3 100644
--- a/tests/appsecurity-tests/test-apps/CtsMonkeyApp/Android.mk
+++ b/tests/appsecurity-tests/test-apps/CtsMonkeyApp/Android.mk
@@ -24,4 +24,6 @@
 
 LOCAL_PACKAGE_NAME := CtsMonkeyApp
 
+LOCAL_PROGUARD_ENABLED := disabled
+
 include $(BUILD_PACKAGE)
diff --git a/tests/appsecurity-tests/test-apps/CtsMonkeyApp2/Android.mk b/tests/appsecurity-tests/test-apps/CtsMonkeyApp2/Android.mk
index 2f3abd2..0d76f2d 100644
--- a/tests/appsecurity-tests/test-apps/CtsMonkeyApp2/Android.mk
+++ b/tests/appsecurity-tests/test-apps/CtsMonkeyApp2/Android.mk
@@ -24,4 +24,6 @@
 
 LOCAL_PACKAGE_NAME := CtsMonkeyApp2
 
+LOCAL_PROGUARD_ENABLED := disabled
+
 include $(BUILD_PACKAGE)
diff --git a/tests/res/layout-land/mediaplayer.xml b/tests/res/layout-land/mediaplayer.xml
index 28ec039..5dafdb9 100644
--- a/tests/res/layout-land/mediaplayer.xml
+++ b/tests/res/layout-land/mediaplayer.xml
@@ -37,5 +37,4 @@
         android:layout_weight="1">
     </SurfaceView>
 
-
 </LinearLayout>
diff --git a/tests/tests/holo/Android.mk b/tests/tests/holo/Android.mk
index 22afc85..55d3758 100644
--- a/tests/tests/holo/Android.mk
+++ b/tests/tests/holo/Android.mk
@@ -24,7 +24,7 @@
 
 LOCAL_SRC_FILES := $(call all-java-files-under, src)
 
-LOCAL_AAPT_FLAGS = -c xx_YY -c cs -c 320dpi -c 240dpi -c 213dpi -c 160dpi -c 120dpi
+LOCAL_AAPT_FLAGS = -c land -c xx_YY -c cs -c 320dpi -c 240dpi -c 213dpi -c 160dpi -c 120dpi
 
 LOCAL_PACKAGE_NAME := CtsHoloTestCases
 
diff --git a/tests/tests/holo/res/drawable-land-hdpi/holo_dialog_minwidth_searchview.png b/tests/tests/holo/res/drawable-land-hdpi/holo_dialog_minwidth_searchview.png
new file mode 100644
index 0000000..da19499
--- /dev/null
+++ b/tests/tests/holo/res/drawable-land-hdpi/holo_dialog_minwidth_searchview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-land-hdpi/holo_dialog_minwidth_tabhost.png b/tests/tests/holo/res/drawable-land-hdpi/holo_dialog_minwidth_tabhost.png
new file mode 100644
index 0000000..85881ce
--- /dev/null
+++ b/tests/tests/holo/res/drawable-land-hdpi/holo_dialog_minwidth_tabhost.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-land-hdpi/holo_dialog_noactionbar_minwidth_searchview.png b/tests/tests/holo/res/drawable-land-hdpi/holo_dialog_noactionbar_minwidth_searchview.png
new file mode 100644
index 0000000..da19499
--- /dev/null
+++ b/tests/tests/holo/res/drawable-land-hdpi/holo_dialog_noactionbar_minwidth_searchview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-land-hdpi/holo_dialog_noactionbar_minwidth_tabhost.png b/tests/tests/holo/res/drawable-land-hdpi/holo_dialog_noactionbar_minwidth_tabhost.png
new file mode 100644
index 0000000..85881ce
--- /dev/null
+++ b/tests/tests/holo/res/drawable-land-hdpi/holo_dialog_noactionbar_minwidth_tabhost.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-land-hdpi/holo_dialog_noactionbar_searchview.png b/tests/tests/holo/res/drawable-land-hdpi/holo_dialog_noactionbar_searchview.png
new file mode 100644
index 0000000..da19499
--- /dev/null
+++ b/tests/tests/holo/res/drawable-land-hdpi/holo_dialog_noactionbar_searchview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-land-hdpi/holo_dialog_noactionbar_tabhost.png b/tests/tests/holo/res/drawable-land-hdpi/holo_dialog_noactionbar_tabhost.png
new file mode 100644
index 0000000..85881ce
--- /dev/null
+++ b/tests/tests/holo/res/drawable-land-hdpi/holo_dialog_noactionbar_tabhost.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-land-hdpi/holo_dialog_searchview.png b/tests/tests/holo/res/drawable-land-hdpi/holo_dialog_searchview.png
new file mode 100644
index 0000000..da19499
--- /dev/null
+++ b/tests/tests/holo/res/drawable-land-hdpi/holo_dialog_searchview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-land-hdpi/holo_dialog_tabhost.png b/tests/tests/holo/res/drawable-land-hdpi/holo_dialog_tabhost.png
new file mode 100644
index 0000000..85881ce
--- /dev/null
+++ b/tests/tests/holo/res/drawable-land-hdpi/holo_dialog_tabhost.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-land-hdpi/holo_dialogwhenlarge_noactionbar_searchview.png b/tests/tests/holo/res/drawable-land-hdpi/holo_dialogwhenlarge_noactionbar_searchview.png
new file mode 100644
index 0000000..da19499
--- /dev/null
+++ b/tests/tests/holo/res/drawable-land-hdpi/holo_dialogwhenlarge_noactionbar_searchview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-land-hdpi/holo_dialogwhenlarge_noactionbar_tabhost.png b/tests/tests/holo/res/drawable-land-hdpi/holo_dialogwhenlarge_noactionbar_tabhost.png
new file mode 100644
index 0000000..85881ce
--- /dev/null
+++ b/tests/tests/holo/res/drawable-land-hdpi/holo_dialogwhenlarge_noactionbar_tabhost.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-land-hdpi/holo_dialogwhenlarge_searchview.png b/tests/tests/holo/res/drawable-land-hdpi/holo_dialogwhenlarge_searchview.png
new file mode 100644
index 0000000..da19499
--- /dev/null
+++ b/tests/tests/holo/res/drawable-land-hdpi/holo_dialogwhenlarge_searchview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-land-hdpi/holo_dialogwhenlarge_tabhost.png b/tests/tests/holo/res/drawable-land-hdpi/holo_dialogwhenlarge_tabhost.png
new file mode 100644
index 0000000..85881ce
--- /dev/null
+++ b/tests/tests/holo/res/drawable-land-hdpi/holo_dialogwhenlarge_tabhost.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-land-hdpi/holo_inputmethod_searchview.png b/tests/tests/holo/res/drawable-land-hdpi/holo_inputmethod_searchview.png
new file mode 100644
index 0000000..dc730b4
--- /dev/null
+++ b/tests/tests/holo/res/drawable-land-hdpi/holo_inputmethod_searchview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-land-hdpi/holo_inputmethod_tabhost.png b/tests/tests/holo/res/drawable-land-hdpi/holo_inputmethod_tabhost.png
new file mode 100644
index 0000000..a784c34
--- /dev/null
+++ b/tests/tests/holo/res/drawable-land-hdpi/holo_inputmethod_tabhost.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-land-hdpi/holo_light_darkactionbar_searchview.png b/tests/tests/holo/res/drawable-land-hdpi/holo_light_darkactionbar_searchview.png
new file mode 100644
index 0000000..dc730b4
--- /dev/null
+++ b/tests/tests/holo/res/drawable-land-hdpi/holo_light_darkactionbar_searchview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-land-hdpi/holo_light_darkactionbar_tabhost.png b/tests/tests/holo/res/drawable-land-hdpi/holo_light_darkactionbar_tabhost.png
new file mode 100644
index 0000000..a784c34
--- /dev/null
+++ b/tests/tests/holo/res/drawable-land-hdpi/holo_light_darkactionbar_tabhost.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-land-hdpi/holo_light_dialog_minwidth_searchview.png b/tests/tests/holo/res/drawable-land-hdpi/holo_light_dialog_minwidth_searchview.png
new file mode 100644
index 0000000..dc730b4
--- /dev/null
+++ b/tests/tests/holo/res/drawable-land-hdpi/holo_light_dialog_minwidth_searchview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-land-hdpi/holo_light_dialog_minwidth_tabhost.png b/tests/tests/holo/res/drawable-land-hdpi/holo_light_dialog_minwidth_tabhost.png
new file mode 100644
index 0000000..a784c34
--- /dev/null
+++ b/tests/tests/holo/res/drawable-land-hdpi/holo_light_dialog_minwidth_tabhost.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-land-hdpi/holo_light_dialog_noactionbar_minwidth_searchview.png b/tests/tests/holo/res/drawable-land-hdpi/holo_light_dialog_noactionbar_minwidth_searchview.png
new file mode 100644
index 0000000..dc730b4
--- /dev/null
+++ b/tests/tests/holo/res/drawable-land-hdpi/holo_light_dialog_noactionbar_minwidth_searchview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-land-hdpi/holo_light_dialog_noactionbar_minwidth_tabhost.png b/tests/tests/holo/res/drawable-land-hdpi/holo_light_dialog_noactionbar_minwidth_tabhost.png
new file mode 100644
index 0000000..a784c34
--- /dev/null
+++ b/tests/tests/holo/res/drawable-land-hdpi/holo_light_dialog_noactionbar_minwidth_tabhost.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-land-hdpi/holo_light_dialog_noactionbar_searchview.png b/tests/tests/holo/res/drawable-land-hdpi/holo_light_dialog_noactionbar_searchview.png
new file mode 100644
index 0000000..dc730b4
--- /dev/null
+++ b/tests/tests/holo/res/drawable-land-hdpi/holo_light_dialog_noactionbar_searchview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-land-hdpi/holo_light_dialog_noactionbar_tabhost.png b/tests/tests/holo/res/drawable-land-hdpi/holo_light_dialog_noactionbar_tabhost.png
new file mode 100644
index 0000000..a784c34
--- /dev/null
+++ b/tests/tests/holo/res/drawable-land-hdpi/holo_light_dialog_noactionbar_tabhost.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-land-hdpi/holo_light_dialog_searchview.png b/tests/tests/holo/res/drawable-land-hdpi/holo_light_dialog_searchview.png
new file mode 100644
index 0000000..dc730b4
--- /dev/null
+++ b/tests/tests/holo/res/drawable-land-hdpi/holo_light_dialog_searchview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-land-hdpi/holo_light_dialog_tabhost.png b/tests/tests/holo/res/drawable-land-hdpi/holo_light_dialog_tabhost.png
new file mode 100644
index 0000000..a784c34
--- /dev/null
+++ b/tests/tests/holo/res/drawable-land-hdpi/holo_light_dialog_tabhost.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-land-hdpi/holo_light_dialogwhenlarge_noactionbar_searchview.png b/tests/tests/holo/res/drawable-land-hdpi/holo_light_dialogwhenlarge_noactionbar_searchview.png
new file mode 100644
index 0000000..dc730b4
--- /dev/null
+++ b/tests/tests/holo/res/drawable-land-hdpi/holo_light_dialogwhenlarge_noactionbar_searchview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-land-hdpi/holo_light_dialogwhenlarge_noactionbar_tabhost.png b/tests/tests/holo/res/drawable-land-hdpi/holo_light_dialogwhenlarge_noactionbar_tabhost.png
new file mode 100644
index 0000000..a784c34
--- /dev/null
+++ b/tests/tests/holo/res/drawable-land-hdpi/holo_light_dialogwhenlarge_noactionbar_tabhost.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-land-hdpi/holo_light_dialogwhenlarge_searchview.png b/tests/tests/holo/res/drawable-land-hdpi/holo_light_dialogwhenlarge_searchview.png
new file mode 100644
index 0000000..dc730b4
--- /dev/null
+++ b/tests/tests/holo/res/drawable-land-hdpi/holo_light_dialogwhenlarge_searchview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-land-hdpi/holo_light_dialogwhenlarge_tabhost.png b/tests/tests/holo/res/drawable-land-hdpi/holo_light_dialogwhenlarge_tabhost.png
new file mode 100644
index 0000000..a784c34
--- /dev/null
+++ b/tests/tests/holo/res/drawable-land-hdpi/holo_light_dialogwhenlarge_tabhost.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-land-hdpi/holo_light_noactionbar_fullscreen_searchview.png b/tests/tests/holo/res/drawable-land-hdpi/holo_light_noactionbar_fullscreen_searchview.png
new file mode 100644
index 0000000..dc730b4
--- /dev/null
+++ b/tests/tests/holo/res/drawable-land-hdpi/holo_light_noactionbar_fullscreen_searchview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-land-hdpi/holo_light_noactionbar_fullscreen_tabhost.png b/tests/tests/holo/res/drawable-land-hdpi/holo_light_noactionbar_fullscreen_tabhost.png
new file mode 100644
index 0000000..a784c34
--- /dev/null
+++ b/tests/tests/holo/res/drawable-land-hdpi/holo_light_noactionbar_fullscreen_tabhost.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-land-hdpi/holo_light_noactionbar_searchview.png b/tests/tests/holo/res/drawable-land-hdpi/holo_light_noactionbar_searchview.png
new file mode 100644
index 0000000..dc730b4
--- /dev/null
+++ b/tests/tests/holo/res/drawable-land-hdpi/holo_light_noactionbar_searchview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-land-hdpi/holo_light_noactionbar_tabhost.png b/tests/tests/holo/res/drawable-land-hdpi/holo_light_noactionbar_tabhost.png
new file mode 100644
index 0000000..a784c34
--- /dev/null
+++ b/tests/tests/holo/res/drawable-land-hdpi/holo_light_noactionbar_tabhost.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-land-hdpi/holo_light_panel_searchview.png b/tests/tests/holo/res/drawable-land-hdpi/holo_light_panel_searchview.png
new file mode 100644
index 0000000..dc730b4
--- /dev/null
+++ b/tests/tests/holo/res/drawable-land-hdpi/holo_light_panel_searchview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-land-hdpi/holo_light_panel_tabhost.png b/tests/tests/holo/res/drawable-land-hdpi/holo_light_panel_tabhost.png
new file mode 100644
index 0000000..a784c34
--- /dev/null
+++ b/tests/tests/holo/res/drawable-land-hdpi/holo_light_panel_tabhost.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-land-hdpi/holo_light_searchview.png b/tests/tests/holo/res/drawable-land-hdpi/holo_light_searchview.png
new file mode 100644
index 0000000..dc730b4
--- /dev/null
+++ b/tests/tests/holo/res/drawable-land-hdpi/holo_light_searchview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-land-hdpi/holo_light_tabhost.png b/tests/tests/holo/res/drawable-land-hdpi/holo_light_tabhost.png
new file mode 100644
index 0000000..a784c34
--- /dev/null
+++ b/tests/tests/holo/res/drawable-land-hdpi/holo_light_tabhost.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-land-hdpi/holo_noactionbar_fullscreen_searchview.png b/tests/tests/holo/res/drawable-land-hdpi/holo_noactionbar_fullscreen_searchview.png
new file mode 100644
index 0000000..da19499
--- /dev/null
+++ b/tests/tests/holo/res/drawable-land-hdpi/holo_noactionbar_fullscreen_searchview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-land-hdpi/holo_noactionbar_fullscreen_tabhost.png b/tests/tests/holo/res/drawable-land-hdpi/holo_noactionbar_fullscreen_tabhost.png
new file mode 100644
index 0000000..85881ce
--- /dev/null
+++ b/tests/tests/holo/res/drawable-land-hdpi/holo_noactionbar_fullscreen_tabhost.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-land-hdpi/holo_noactionbar_searchview.png b/tests/tests/holo/res/drawable-land-hdpi/holo_noactionbar_searchview.png
new file mode 100644
index 0000000..da19499
--- /dev/null
+++ b/tests/tests/holo/res/drawable-land-hdpi/holo_noactionbar_searchview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-land-hdpi/holo_noactionbar_tabhost.png b/tests/tests/holo/res/drawable-land-hdpi/holo_noactionbar_tabhost.png
new file mode 100644
index 0000000..85881ce
--- /dev/null
+++ b/tests/tests/holo/res/drawable-land-hdpi/holo_noactionbar_tabhost.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-land-hdpi/holo_panel_searchview.png b/tests/tests/holo/res/drawable-land-hdpi/holo_panel_searchview.png
new file mode 100644
index 0000000..da19499
--- /dev/null
+++ b/tests/tests/holo/res/drawable-land-hdpi/holo_panel_searchview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-land-hdpi/holo_panel_tabhost.png b/tests/tests/holo/res/drawable-land-hdpi/holo_panel_tabhost.png
new file mode 100644
index 0000000..85881ce
--- /dev/null
+++ b/tests/tests/holo/res/drawable-land-hdpi/holo_panel_tabhost.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-land-hdpi/holo_searchview.png b/tests/tests/holo/res/drawable-land-hdpi/holo_searchview.png
new file mode 100644
index 0000000..da19499
--- /dev/null
+++ b/tests/tests/holo/res/drawable-land-hdpi/holo_searchview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-land-hdpi/holo_tabhost.png b/tests/tests/holo/res/drawable-land-hdpi/holo_tabhost.png
new file mode 100644
index 0000000..85881ce
--- /dev/null
+++ b/tests/tests/holo/res/drawable-land-hdpi/holo_tabhost.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-land-hdpi/holo_wallpaper_notitlebar_searchview.png b/tests/tests/holo/res/drawable-land-hdpi/holo_wallpaper_notitlebar_searchview.png
new file mode 100644
index 0000000..da19499
--- /dev/null
+++ b/tests/tests/holo/res/drawable-land-hdpi/holo_wallpaper_notitlebar_searchview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-land-hdpi/holo_wallpaper_notitlebar_tabhost.png b/tests/tests/holo/res/drawable-land-hdpi/holo_wallpaper_notitlebar_tabhost.png
new file mode 100644
index 0000000..85881ce
--- /dev/null
+++ b/tests/tests/holo/res/drawable-land-hdpi/holo_wallpaper_notitlebar_tabhost.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-land-hdpi/holo_wallpaper_searchview.png b/tests/tests/holo/res/drawable-land-hdpi/holo_wallpaper_searchview.png
new file mode 100644
index 0000000..da19499
--- /dev/null
+++ b/tests/tests/holo/res/drawable-land-hdpi/holo_wallpaper_searchview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-land-hdpi/holo_wallpaper_tabhost.png b/tests/tests/holo/res/drawable-land-hdpi/holo_wallpaper_tabhost.png
new file mode 100644
index 0000000..85881ce
--- /dev/null
+++ b/tests/tests/holo/res/drawable-land-hdpi/holo_wallpaper_tabhost.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-land-ldpi/holo_dialog_minwidth_tabhost.png b/tests/tests/holo/res/drawable-land-ldpi/holo_dialog_minwidth_tabhost.png
new file mode 100644
index 0000000..b6e0589
--- /dev/null
+++ b/tests/tests/holo/res/drawable-land-ldpi/holo_dialog_minwidth_tabhost.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-land-ldpi/holo_dialog_noactionbar_minwidth_tabhost.png b/tests/tests/holo/res/drawable-land-ldpi/holo_dialog_noactionbar_minwidth_tabhost.png
new file mode 100644
index 0000000..b6e0589
--- /dev/null
+++ b/tests/tests/holo/res/drawable-land-ldpi/holo_dialog_noactionbar_minwidth_tabhost.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-land-ldpi/holo_dialog_noactionbar_tabhost.png b/tests/tests/holo/res/drawable-land-ldpi/holo_dialog_noactionbar_tabhost.png
new file mode 100644
index 0000000..b6e0589
--- /dev/null
+++ b/tests/tests/holo/res/drawable-land-ldpi/holo_dialog_noactionbar_tabhost.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-land-ldpi/holo_dialog_tabhost.png b/tests/tests/holo/res/drawable-land-ldpi/holo_dialog_tabhost.png
new file mode 100644
index 0000000..b6e0589
--- /dev/null
+++ b/tests/tests/holo/res/drawable-land-ldpi/holo_dialog_tabhost.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-land-ldpi/holo_dialogwhenlarge_noactionbar_tabhost.png b/tests/tests/holo/res/drawable-land-ldpi/holo_dialogwhenlarge_noactionbar_tabhost.png
new file mode 100644
index 0000000..b6e0589
--- /dev/null
+++ b/tests/tests/holo/res/drawable-land-ldpi/holo_dialogwhenlarge_noactionbar_tabhost.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-land-ldpi/holo_dialogwhenlarge_tabhost.png b/tests/tests/holo/res/drawable-land-ldpi/holo_dialogwhenlarge_tabhost.png
new file mode 100644
index 0000000..b6e0589
--- /dev/null
+++ b/tests/tests/holo/res/drawable-land-ldpi/holo_dialogwhenlarge_tabhost.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-land-ldpi/holo_inputmethod_tabhost.png b/tests/tests/holo/res/drawable-land-ldpi/holo_inputmethod_tabhost.png
new file mode 100644
index 0000000..1da3ddf
--- /dev/null
+++ b/tests/tests/holo/res/drawable-land-ldpi/holo_inputmethod_tabhost.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-land-ldpi/holo_light_darkactionbar_tabhost.png b/tests/tests/holo/res/drawable-land-ldpi/holo_light_darkactionbar_tabhost.png
new file mode 100644
index 0000000..1da3ddf
--- /dev/null
+++ b/tests/tests/holo/res/drawable-land-ldpi/holo_light_darkactionbar_tabhost.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-land-ldpi/holo_light_dialog_minwidth_tabhost.png b/tests/tests/holo/res/drawable-land-ldpi/holo_light_dialog_minwidth_tabhost.png
new file mode 100644
index 0000000..1da3ddf
--- /dev/null
+++ b/tests/tests/holo/res/drawable-land-ldpi/holo_light_dialog_minwidth_tabhost.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-land-ldpi/holo_light_dialog_noactionbar_minwidth_tabhost.png b/tests/tests/holo/res/drawable-land-ldpi/holo_light_dialog_noactionbar_minwidth_tabhost.png
new file mode 100644
index 0000000..1da3ddf
--- /dev/null
+++ b/tests/tests/holo/res/drawable-land-ldpi/holo_light_dialog_noactionbar_minwidth_tabhost.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-land-ldpi/holo_light_dialog_noactionbar_tabhost.png b/tests/tests/holo/res/drawable-land-ldpi/holo_light_dialog_noactionbar_tabhost.png
new file mode 100644
index 0000000..1da3ddf
--- /dev/null
+++ b/tests/tests/holo/res/drawable-land-ldpi/holo_light_dialog_noactionbar_tabhost.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-land-ldpi/holo_light_dialog_tabhost.png b/tests/tests/holo/res/drawable-land-ldpi/holo_light_dialog_tabhost.png
new file mode 100644
index 0000000..1da3ddf
--- /dev/null
+++ b/tests/tests/holo/res/drawable-land-ldpi/holo_light_dialog_tabhost.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-land-ldpi/holo_light_dialogwhenlarge_noactionbar_tabhost.png b/tests/tests/holo/res/drawable-land-ldpi/holo_light_dialogwhenlarge_noactionbar_tabhost.png
new file mode 100644
index 0000000..1da3ddf
--- /dev/null
+++ b/tests/tests/holo/res/drawable-land-ldpi/holo_light_dialogwhenlarge_noactionbar_tabhost.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-land-ldpi/holo_light_dialogwhenlarge_tabhost.png b/tests/tests/holo/res/drawable-land-ldpi/holo_light_dialogwhenlarge_tabhost.png
new file mode 100644
index 0000000..1da3ddf
--- /dev/null
+++ b/tests/tests/holo/res/drawable-land-ldpi/holo_light_dialogwhenlarge_tabhost.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-land-ldpi/holo_light_noactionbar_fullscreen_tabhost.png b/tests/tests/holo/res/drawable-land-ldpi/holo_light_noactionbar_fullscreen_tabhost.png
new file mode 100644
index 0000000..1da3ddf
--- /dev/null
+++ b/tests/tests/holo/res/drawable-land-ldpi/holo_light_noactionbar_fullscreen_tabhost.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-land-ldpi/holo_light_noactionbar_tabhost.png b/tests/tests/holo/res/drawable-land-ldpi/holo_light_noactionbar_tabhost.png
new file mode 100644
index 0000000..1da3ddf
--- /dev/null
+++ b/tests/tests/holo/res/drawable-land-ldpi/holo_light_noactionbar_tabhost.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-land-ldpi/holo_light_panel_tabhost.png b/tests/tests/holo/res/drawable-land-ldpi/holo_light_panel_tabhost.png
new file mode 100644
index 0000000..1da3ddf
--- /dev/null
+++ b/tests/tests/holo/res/drawable-land-ldpi/holo_light_panel_tabhost.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-land-ldpi/holo_light_tabhost.png b/tests/tests/holo/res/drawable-land-ldpi/holo_light_tabhost.png
new file mode 100644
index 0000000..1da3ddf
--- /dev/null
+++ b/tests/tests/holo/res/drawable-land-ldpi/holo_light_tabhost.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-land-ldpi/holo_noactionbar_fullscreen_tabhost.png b/tests/tests/holo/res/drawable-land-ldpi/holo_noactionbar_fullscreen_tabhost.png
new file mode 100644
index 0000000..b6e0589
--- /dev/null
+++ b/tests/tests/holo/res/drawable-land-ldpi/holo_noactionbar_fullscreen_tabhost.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-land-ldpi/holo_noactionbar_tabhost.png b/tests/tests/holo/res/drawable-land-ldpi/holo_noactionbar_tabhost.png
new file mode 100644
index 0000000..b6e0589
--- /dev/null
+++ b/tests/tests/holo/res/drawable-land-ldpi/holo_noactionbar_tabhost.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-land-ldpi/holo_panel_tabhost.png b/tests/tests/holo/res/drawable-land-ldpi/holo_panel_tabhost.png
new file mode 100644
index 0000000..b6e0589
--- /dev/null
+++ b/tests/tests/holo/res/drawable-land-ldpi/holo_panel_tabhost.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-land-ldpi/holo_tabhost.png b/tests/tests/holo/res/drawable-land-ldpi/holo_tabhost.png
new file mode 100644
index 0000000..b6e0589
--- /dev/null
+++ b/tests/tests/holo/res/drawable-land-ldpi/holo_tabhost.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-land-ldpi/holo_wallpaper_notitlebar_tabhost.png b/tests/tests/holo/res/drawable-land-ldpi/holo_wallpaper_notitlebar_tabhost.png
new file mode 100644
index 0000000..b6e0589
--- /dev/null
+++ b/tests/tests/holo/res/drawable-land-ldpi/holo_wallpaper_notitlebar_tabhost.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-land-ldpi/holo_wallpaper_tabhost.png b/tests/tests/holo/res/drawable-land-ldpi/holo_wallpaper_tabhost.png
new file mode 100644
index 0000000..b6e0589
--- /dev/null
+++ b/tests/tests/holo/res/drawable-land-ldpi/holo_wallpaper_tabhost.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-land-mdpi/holo_dialog_minwidth_searchview.png b/tests/tests/holo/res/drawable-land-mdpi/holo_dialog_minwidth_searchview.png
new file mode 100644
index 0000000..a4ed4e6
--- /dev/null
+++ b/tests/tests/holo/res/drawable-land-mdpi/holo_dialog_minwidth_searchview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-land-mdpi/holo_dialog_minwidth_tabhost.png b/tests/tests/holo/res/drawable-land-mdpi/holo_dialog_minwidth_tabhost.png
new file mode 100644
index 0000000..3ace071
--- /dev/null
+++ b/tests/tests/holo/res/drawable-land-mdpi/holo_dialog_minwidth_tabhost.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-land-mdpi/holo_dialog_noactionbar_minwidth_searchview.png b/tests/tests/holo/res/drawable-land-mdpi/holo_dialog_noactionbar_minwidth_searchview.png
new file mode 100644
index 0000000..a4ed4e6
--- /dev/null
+++ b/tests/tests/holo/res/drawable-land-mdpi/holo_dialog_noactionbar_minwidth_searchview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-land-mdpi/holo_dialog_noactionbar_minwidth_tabhost.png b/tests/tests/holo/res/drawable-land-mdpi/holo_dialog_noactionbar_minwidth_tabhost.png
new file mode 100644
index 0000000..3ace071
--- /dev/null
+++ b/tests/tests/holo/res/drawable-land-mdpi/holo_dialog_noactionbar_minwidth_tabhost.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-land-mdpi/holo_dialog_noactionbar_searchview.png b/tests/tests/holo/res/drawable-land-mdpi/holo_dialog_noactionbar_searchview.png
new file mode 100644
index 0000000..a4ed4e6
--- /dev/null
+++ b/tests/tests/holo/res/drawable-land-mdpi/holo_dialog_noactionbar_searchview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-land-mdpi/holo_dialog_noactionbar_tabhost.png b/tests/tests/holo/res/drawable-land-mdpi/holo_dialog_noactionbar_tabhost.png
new file mode 100644
index 0000000..3ace071
--- /dev/null
+++ b/tests/tests/holo/res/drawable-land-mdpi/holo_dialog_noactionbar_tabhost.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-land-mdpi/holo_dialog_searchview.png b/tests/tests/holo/res/drawable-land-mdpi/holo_dialog_searchview.png
new file mode 100644
index 0000000..a4ed4e6
--- /dev/null
+++ b/tests/tests/holo/res/drawable-land-mdpi/holo_dialog_searchview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-land-mdpi/holo_dialog_tabhost.png b/tests/tests/holo/res/drawable-land-mdpi/holo_dialog_tabhost.png
new file mode 100644
index 0000000..3ace071
--- /dev/null
+++ b/tests/tests/holo/res/drawable-land-mdpi/holo_dialog_tabhost.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-land-mdpi/holo_dialogwhenlarge_noactionbar_searchview.png b/tests/tests/holo/res/drawable-land-mdpi/holo_dialogwhenlarge_noactionbar_searchview.png
new file mode 100644
index 0000000..a4ed4e6
--- /dev/null
+++ b/tests/tests/holo/res/drawable-land-mdpi/holo_dialogwhenlarge_noactionbar_searchview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-land-mdpi/holo_dialogwhenlarge_noactionbar_tabhost.png b/tests/tests/holo/res/drawable-land-mdpi/holo_dialogwhenlarge_noactionbar_tabhost.png
new file mode 100644
index 0000000..3ace071
--- /dev/null
+++ b/tests/tests/holo/res/drawable-land-mdpi/holo_dialogwhenlarge_noactionbar_tabhost.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-land-mdpi/holo_dialogwhenlarge_searchview.png b/tests/tests/holo/res/drawable-land-mdpi/holo_dialogwhenlarge_searchview.png
new file mode 100644
index 0000000..a4ed4e6
--- /dev/null
+++ b/tests/tests/holo/res/drawable-land-mdpi/holo_dialogwhenlarge_searchview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-land-mdpi/holo_dialogwhenlarge_tabhost.png b/tests/tests/holo/res/drawable-land-mdpi/holo_dialogwhenlarge_tabhost.png
new file mode 100644
index 0000000..3ace071
--- /dev/null
+++ b/tests/tests/holo/res/drawable-land-mdpi/holo_dialogwhenlarge_tabhost.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-land-mdpi/holo_inputmethod_searchview.png b/tests/tests/holo/res/drawable-land-mdpi/holo_inputmethod_searchview.png
new file mode 100644
index 0000000..133fa96
--- /dev/null
+++ b/tests/tests/holo/res/drawable-land-mdpi/holo_inputmethod_searchview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-land-mdpi/holo_inputmethod_tabhost.png b/tests/tests/holo/res/drawable-land-mdpi/holo_inputmethod_tabhost.png
new file mode 100644
index 0000000..c657c1a
--- /dev/null
+++ b/tests/tests/holo/res/drawable-land-mdpi/holo_inputmethod_tabhost.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-land-mdpi/holo_light_darkactionbar_searchview.png b/tests/tests/holo/res/drawable-land-mdpi/holo_light_darkactionbar_searchview.png
new file mode 100644
index 0000000..133fa96
--- /dev/null
+++ b/tests/tests/holo/res/drawable-land-mdpi/holo_light_darkactionbar_searchview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-land-mdpi/holo_light_darkactionbar_tabhost.png b/tests/tests/holo/res/drawable-land-mdpi/holo_light_darkactionbar_tabhost.png
new file mode 100644
index 0000000..c657c1a
--- /dev/null
+++ b/tests/tests/holo/res/drawable-land-mdpi/holo_light_darkactionbar_tabhost.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-land-mdpi/holo_light_dialog_minwidth_searchview.png b/tests/tests/holo/res/drawable-land-mdpi/holo_light_dialog_minwidth_searchview.png
new file mode 100644
index 0000000..133fa96
--- /dev/null
+++ b/tests/tests/holo/res/drawable-land-mdpi/holo_light_dialog_minwidth_searchview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-land-mdpi/holo_light_dialog_minwidth_tabhost.png b/tests/tests/holo/res/drawable-land-mdpi/holo_light_dialog_minwidth_tabhost.png
new file mode 100644
index 0000000..c657c1a
--- /dev/null
+++ b/tests/tests/holo/res/drawable-land-mdpi/holo_light_dialog_minwidth_tabhost.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-land-mdpi/holo_light_dialog_noactionbar_minwidth_searchview.png b/tests/tests/holo/res/drawable-land-mdpi/holo_light_dialog_noactionbar_minwidth_searchview.png
new file mode 100644
index 0000000..133fa96
--- /dev/null
+++ b/tests/tests/holo/res/drawable-land-mdpi/holo_light_dialog_noactionbar_minwidth_searchview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-land-mdpi/holo_light_dialog_noactionbar_minwidth_tabhost.png b/tests/tests/holo/res/drawable-land-mdpi/holo_light_dialog_noactionbar_minwidth_tabhost.png
new file mode 100644
index 0000000..c657c1a
--- /dev/null
+++ b/tests/tests/holo/res/drawable-land-mdpi/holo_light_dialog_noactionbar_minwidth_tabhost.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-land-mdpi/holo_light_dialog_noactionbar_searchview.png b/tests/tests/holo/res/drawable-land-mdpi/holo_light_dialog_noactionbar_searchview.png
new file mode 100644
index 0000000..133fa96
--- /dev/null
+++ b/tests/tests/holo/res/drawable-land-mdpi/holo_light_dialog_noactionbar_searchview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-land-mdpi/holo_light_dialog_noactionbar_tabhost.png b/tests/tests/holo/res/drawable-land-mdpi/holo_light_dialog_noactionbar_tabhost.png
new file mode 100644
index 0000000..c657c1a
--- /dev/null
+++ b/tests/tests/holo/res/drawable-land-mdpi/holo_light_dialog_noactionbar_tabhost.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-land-mdpi/holo_light_dialog_searchview.png b/tests/tests/holo/res/drawable-land-mdpi/holo_light_dialog_searchview.png
new file mode 100644
index 0000000..133fa96
--- /dev/null
+++ b/tests/tests/holo/res/drawable-land-mdpi/holo_light_dialog_searchview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-land-mdpi/holo_light_dialog_tabhost.png b/tests/tests/holo/res/drawable-land-mdpi/holo_light_dialog_tabhost.png
new file mode 100644
index 0000000..c657c1a
--- /dev/null
+++ b/tests/tests/holo/res/drawable-land-mdpi/holo_light_dialog_tabhost.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-land-mdpi/holo_light_dialogwhenlarge_noactionbar_searchview.png b/tests/tests/holo/res/drawable-land-mdpi/holo_light_dialogwhenlarge_noactionbar_searchview.png
new file mode 100644
index 0000000..133fa96
--- /dev/null
+++ b/tests/tests/holo/res/drawable-land-mdpi/holo_light_dialogwhenlarge_noactionbar_searchview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-land-mdpi/holo_light_dialogwhenlarge_noactionbar_tabhost.png b/tests/tests/holo/res/drawable-land-mdpi/holo_light_dialogwhenlarge_noactionbar_tabhost.png
new file mode 100644
index 0000000..c657c1a
--- /dev/null
+++ b/tests/tests/holo/res/drawable-land-mdpi/holo_light_dialogwhenlarge_noactionbar_tabhost.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-land-mdpi/holo_light_dialogwhenlarge_searchview.png b/tests/tests/holo/res/drawable-land-mdpi/holo_light_dialogwhenlarge_searchview.png
new file mode 100644
index 0000000..133fa96
--- /dev/null
+++ b/tests/tests/holo/res/drawable-land-mdpi/holo_light_dialogwhenlarge_searchview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-land-mdpi/holo_light_dialogwhenlarge_tabhost.png b/tests/tests/holo/res/drawable-land-mdpi/holo_light_dialogwhenlarge_tabhost.png
new file mode 100644
index 0000000..c657c1a
--- /dev/null
+++ b/tests/tests/holo/res/drawable-land-mdpi/holo_light_dialogwhenlarge_tabhost.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-land-mdpi/holo_light_noactionbar_fullscreen_searchview.png b/tests/tests/holo/res/drawable-land-mdpi/holo_light_noactionbar_fullscreen_searchview.png
new file mode 100644
index 0000000..133fa96
--- /dev/null
+++ b/tests/tests/holo/res/drawable-land-mdpi/holo_light_noactionbar_fullscreen_searchview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-land-mdpi/holo_light_noactionbar_fullscreen_tabhost.png b/tests/tests/holo/res/drawable-land-mdpi/holo_light_noactionbar_fullscreen_tabhost.png
new file mode 100644
index 0000000..c657c1a
--- /dev/null
+++ b/tests/tests/holo/res/drawable-land-mdpi/holo_light_noactionbar_fullscreen_tabhost.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-land-mdpi/holo_light_noactionbar_searchview.png b/tests/tests/holo/res/drawable-land-mdpi/holo_light_noactionbar_searchview.png
new file mode 100644
index 0000000..133fa96
--- /dev/null
+++ b/tests/tests/holo/res/drawable-land-mdpi/holo_light_noactionbar_searchview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-land-mdpi/holo_light_noactionbar_tabhost.png b/tests/tests/holo/res/drawable-land-mdpi/holo_light_noactionbar_tabhost.png
new file mode 100644
index 0000000..c657c1a
--- /dev/null
+++ b/tests/tests/holo/res/drawable-land-mdpi/holo_light_noactionbar_tabhost.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-land-mdpi/holo_light_panel_searchview.png b/tests/tests/holo/res/drawable-land-mdpi/holo_light_panel_searchview.png
new file mode 100644
index 0000000..133fa96
--- /dev/null
+++ b/tests/tests/holo/res/drawable-land-mdpi/holo_light_panel_searchview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-land-mdpi/holo_light_panel_tabhost.png b/tests/tests/holo/res/drawable-land-mdpi/holo_light_panel_tabhost.png
new file mode 100644
index 0000000..c657c1a
--- /dev/null
+++ b/tests/tests/holo/res/drawable-land-mdpi/holo_light_panel_tabhost.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-land-mdpi/holo_light_searchview.png b/tests/tests/holo/res/drawable-land-mdpi/holo_light_searchview.png
new file mode 100644
index 0000000..133fa96
--- /dev/null
+++ b/tests/tests/holo/res/drawable-land-mdpi/holo_light_searchview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-land-mdpi/holo_light_tabhost.png b/tests/tests/holo/res/drawable-land-mdpi/holo_light_tabhost.png
new file mode 100644
index 0000000..c657c1a
--- /dev/null
+++ b/tests/tests/holo/res/drawable-land-mdpi/holo_light_tabhost.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-land-mdpi/holo_noactionbar_fullscreen_searchview.png b/tests/tests/holo/res/drawable-land-mdpi/holo_noactionbar_fullscreen_searchview.png
new file mode 100644
index 0000000..a4ed4e6
--- /dev/null
+++ b/tests/tests/holo/res/drawable-land-mdpi/holo_noactionbar_fullscreen_searchview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-land-mdpi/holo_noactionbar_fullscreen_tabhost.png b/tests/tests/holo/res/drawable-land-mdpi/holo_noactionbar_fullscreen_tabhost.png
new file mode 100644
index 0000000..3ace071
--- /dev/null
+++ b/tests/tests/holo/res/drawable-land-mdpi/holo_noactionbar_fullscreen_tabhost.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-land-mdpi/holo_noactionbar_searchview.png b/tests/tests/holo/res/drawable-land-mdpi/holo_noactionbar_searchview.png
new file mode 100644
index 0000000..a4ed4e6
--- /dev/null
+++ b/tests/tests/holo/res/drawable-land-mdpi/holo_noactionbar_searchview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-land-mdpi/holo_noactionbar_tabhost.png b/tests/tests/holo/res/drawable-land-mdpi/holo_noactionbar_tabhost.png
new file mode 100644
index 0000000..3ace071
--- /dev/null
+++ b/tests/tests/holo/res/drawable-land-mdpi/holo_noactionbar_tabhost.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-land-mdpi/holo_panel_searchview.png b/tests/tests/holo/res/drawable-land-mdpi/holo_panel_searchview.png
new file mode 100644
index 0000000..a4ed4e6
--- /dev/null
+++ b/tests/tests/holo/res/drawable-land-mdpi/holo_panel_searchview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-land-mdpi/holo_panel_tabhost.png b/tests/tests/holo/res/drawable-land-mdpi/holo_panel_tabhost.png
new file mode 100644
index 0000000..3ace071
--- /dev/null
+++ b/tests/tests/holo/res/drawable-land-mdpi/holo_panel_tabhost.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-land-mdpi/holo_searchview.png b/tests/tests/holo/res/drawable-land-mdpi/holo_searchview.png
new file mode 100644
index 0000000..a4ed4e6
--- /dev/null
+++ b/tests/tests/holo/res/drawable-land-mdpi/holo_searchview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-land-mdpi/holo_tabhost.png b/tests/tests/holo/res/drawable-land-mdpi/holo_tabhost.png
new file mode 100644
index 0000000..3ace071
--- /dev/null
+++ b/tests/tests/holo/res/drawable-land-mdpi/holo_tabhost.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-land-mdpi/holo_wallpaper_notitlebar_searchview.png b/tests/tests/holo/res/drawable-land-mdpi/holo_wallpaper_notitlebar_searchview.png
new file mode 100644
index 0000000..a4ed4e6
--- /dev/null
+++ b/tests/tests/holo/res/drawable-land-mdpi/holo_wallpaper_notitlebar_searchview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-land-mdpi/holo_wallpaper_notitlebar_tabhost.png b/tests/tests/holo/res/drawable-land-mdpi/holo_wallpaper_notitlebar_tabhost.png
new file mode 100644
index 0000000..3ace071
--- /dev/null
+++ b/tests/tests/holo/res/drawable-land-mdpi/holo_wallpaper_notitlebar_tabhost.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-land-mdpi/holo_wallpaper_searchview.png b/tests/tests/holo/res/drawable-land-mdpi/holo_wallpaper_searchview.png
new file mode 100644
index 0000000..a4ed4e6
--- /dev/null
+++ b/tests/tests/holo/res/drawable-land-mdpi/holo_wallpaper_searchview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-land-mdpi/holo_wallpaper_tabhost.png b/tests/tests/holo/res/drawable-land-mdpi/holo_wallpaper_tabhost.png
new file mode 100644
index 0000000..3ace071
--- /dev/null
+++ b/tests/tests/holo/res/drawable-land-mdpi/holo_wallpaper_tabhost.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-land-tvdpi/holo_dialog_minwidth_searchview.png b/tests/tests/holo/res/drawable-land-tvdpi/holo_dialog_minwidth_searchview.png
new file mode 100644
index 0000000..7320b98
--- /dev/null
+++ b/tests/tests/holo/res/drawable-land-tvdpi/holo_dialog_minwidth_searchview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-land-tvdpi/holo_dialog_minwidth_tabhost.png b/tests/tests/holo/res/drawable-land-tvdpi/holo_dialog_minwidth_tabhost.png
new file mode 100644
index 0000000..edd794a
--- /dev/null
+++ b/tests/tests/holo/res/drawable-land-tvdpi/holo_dialog_minwidth_tabhost.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-land-tvdpi/holo_dialog_noactionbar_minwidth_searchview.png b/tests/tests/holo/res/drawable-land-tvdpi/holo_dialog_noactionbar_minwidth_searchview.png
new file mode 100644
index 0000000..7320b98
--- /dev/null
+++ b/tests/tests/holo/res/drawable-land-tvdpi/holo_dialog_noactionbar_minwidth_searchview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-land-tvdpi/holo_dialog_noactionbar_minwidth_tabhost.png b/tests/tests/holo/res/drawable-land-tvdpi/holo_dialog_noactionbar_minwidth_tabhost.png
new file mode 100644
index 0000000..edd794a
--- /dev/null
+++ b/tests/tests/holo/res/drawable-land-tvdpi/holo_dialog_noactionbar_minwidth_tabhost.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-land-tvdpi/holo_dialog_noactionbar_searchview.png b/tests/tests/holo/res/drawable-land-tvdpi/holo_dialog_noactionbar_searchview.png
new file mode 100644
index 0000000..7320b98
--- /dev/null
+++ b/tests/tests/holo/res/drawable-land-tvdpi/holo_dialog_noactionbar_searchview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-land-tvdpi/holo_dialog_noactionbar_tabhost.png b/tests/tests/holo/res/drawable-land-tvdpi/holo_dialog_noactionbar_tabhost.png
new file mode 100644
index 0000000..edd794a
--- /dev/null
+++ b/tests/tests/holo/res/drawable-land-tvdpi/holo_dialog_noactionbar_tabhost.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-land-tvdpi/holo_dialog_searchview.png b/tests/tests/holo/res/drawable-land-tvdpi/holo_dialog_searchview.png
new file mode 100644
index 0000000..7320b98
--- /dev/null
+++ b/tests/tests/holo/res/drawable-land-tvdpi/holo_dialog_searchview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-land-tvdpi/holo_dialog_tabhost.png b/tests/tests/holo/res/drawable-land-tvdpi/holo_dialog_tabhost.png
new file mode 100644
index 0000000..edd794a
--- /dev/null
+++ b/tests/tests/holo/res/drawable-land-tvdpi/holo_dialog_tabhost.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-land-tvdpi/holo_dialogwhenlarge_noactionbar_searchview.png b/tests/tests/holo/res/drawable-land-tvdpi/holo_dialogwhenlarge_noactionbar_searchview.png
new file mode 100644
index 0000000..7320b98
--- /dev/null
+++ b/tests/tests/holo/res/drawable-land-tvdpi/holo_dialogwhenlarge_noactionbar_searchview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-land-tvdpi/holo_dialogwhenlarge_noactionbar_tabhost.png b/tests/tests/holo/res/drawable-land-tvdpi/holo_dialogwhenlarge_noactionbar_tabhost.png
new file mode 100644
index 0000000..edd794a
--- /dev/null
+++ b/tests/tests/holo/res/drawable-land-tvdpi/holo_dialogwhenlarge_noactionbar_tabhost.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-land-tvdpi/holo_dialogwhenlarge_searchview.png b/tests/tests/holo/res/drawable-land-tvdpi/holo_dialogwhenlarge_searchview.png
new file mode 100644
index 0000000..7320b98
--- /dev/null
+++ b/tests/tests/holo/res/drawable-land-tvdpi/holo_dialogwhenlarge_searchview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-land-tvdpi/holo_dialogwhenlarge_tabhost.png b/tests/tests/holo/res/drawable-land-tvdpi/holo_dialogwhenlarge_tabhost.png
new file mode 100644
index 0000000..edd794a
--- /dev/null
+++ b/tests/tests/holo/res/drawable-land-tvdpi/holo_dialogwhenlarge_tabhost.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-land-tvdpi/holo_inputmethod_searchview.png b/tests/tests/holo/res/drawable-land-tvdpi/holo_inputmethod_searchview.png
new file mode 100644
index 0000000..9ff0a17
--- /dev/null
+++ b/tests/tests/holo/res/drawable-land-tvdpi/holo_inputmethod_searchview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-land-tvdpi/holo_inputmethod_tabhost.png b/tests/tests/holo/res/drawable-land-tvdpi/holo_inputmethod_tabhost.png
new file mode 100644
index 0000000..592f520
--- /dev/null
+++ b/tests/tests/holo/res/drawable-land-tvdpi/holo_inputmethod_tabhost.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-land-tvdpi/holo_light_darkactionbar_searchview.png b/tests/tests/holo/res/drawable-land-tvdpi/holo_light_darkactionbar_searchview.png
new file mode 100644
index 0000000..9ff0a17
--- /dev/null
+++ b/tests/tests/holo/res/drawable-land-tvdpi/holo_light_darkactionbar_searchview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-land-tvdpi/holo_light_darkactionbar_tabhost.png b/tests/tests/holo/res/drawable-land-tvdpi/holo_light_darkactionbar_tabhost.png
new file mode 100644
index 0000000..592f520
--- /dev/null
+++ b/tests/tests/holo/res/drawable-land-tvdpi/holo_light_darkactionbar_tabhost.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-land-tvdpi/holo_light_dialog_minwidth_searchview.png b/tests/tests/holo/res/drawable-land-tvdpi/holo_light_dialog_minwidth_searchview.png
new file mode 100644
index 0000000..9ff0a17
--- /dev/null
+++ b/tests/tests/holo/res/drawable-land-tvdpi/holo_light_dialog_minwidth_searchview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-land-tvdpi/holo_light_dialog_minwidth_tabhost.png b/tests/tests/holo/res/drawable-land-tvdpi/holo_light_dialog_minwidth_tabhost.png
new file mode 100644
index 0000000..592f520
--- /dev/null
+++ b/tests/tests/holo/res/drawable-land-tvdpi/holo_light_dialog_minwidth_tabhost.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-land-tvdpi/holo_light_dialog_noactionbar_minwidth_searchview.png b/tests/tests/holo/res/drawable-land-tvdpi/holo_light_dialog_noactionbar_minwidth_searchview.png
new file mode 100644
index 0000000..9ff0a17
--- /dev/null
+++ b/tests/tests/holo/res/drawable-land-tvdpi/holo_light_dialog_noactionbar_minwidth_searchview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-land-tvdpi/holo_light_dialog_noactionbar_minwidth_tabhost.png b/tests/tests/holo/res/drawable-land-tvdpi/holo_light_dialog_noactionbar_minwidth_tabhost.png
new file mode 100644
index 0000000..592f520
--- /dev/null
+++ b/tests/tests/holo/res/drawable-land-tvdpi/holo_light_dialog_noactionbar_minwidth_tabhost.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-land-tvdpi/holo_light_dialog_noactionbar_searchview.png b/tests/tests/holo/res/drawable-land-tvdpi/holo_light_dialog_noactionbar_searchview.png
new file mode 100644
index 0000000..9ff0a17
--- /dev/null
+++ b/tests/tests/holo/res/drawable-land-tvdpi/holo_light_dialog_noactionbar_searchview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-land-tvdpi/holo_light_dialog_noactionbar_tabhost.png b/tests/tests/holo/res/drawable-land-tvdpi/holo_light_dialog_noactionbar_tabhost.png
new file mode 100644
index 0000000..592f520
--- /dev/null
+++ b/tests/tests/holo/res/drawable-land-tvdpi/holo_light_dialog_noactionbar_tabhost.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-land-tvdpi/holo_light_dialog_searchview.png b/tests/tests/holo/res/drawable-land-tvdpi/holo_light_dialog_searchview.png
new file mode 100644
index 0000000..9ff0a17
--- /dev/null
+++ b/tests/tests/holo/res/drawable-land-tvdpi/holo_light_dialog_searchview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-land-tvdpi/holo_light_dialog_tabhost.png b/tests/tests/holo/res/drawable-land-tvdpi/holo_light_dialog_tabhost.png
new file mode 100644
index 0000000..592f520
--- /dev/null
+++ b/tests/tests/holo/res/drawable-land-tvdpi/holo_light_dialog_tabhost.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-land-tvdpi/holo_light_dialogwhenlarge_noactionbar_searchview.png b/tests/tests/holo/res/drawable-land-tvdpi/holo_light_dialogwhenlarge_noactionbar_searchview.png
new file mode 100644
index 0000000..9ff0a17
--- /dev/null
+++ b/tests/tests/holo/res/drawable-land-tvdpi/holo_light_dialogwhenlarge_noactionbar_searchview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-land-tvdpi/holo_light_dialogwhenlarge_noactionbar_tabhost.png b/tests/tests/holo/res/drawable-land-tvdpi/holo_light_dialogwhenlarge_noactionbar_tabhost.png
new file mode 100644
index 0000000..592f520
--- /dev/null
+++ b/tests/tests/holo/res/drawable-land-tvdpi/holo_light_dialogwhenlarge_noactionbar_tabhost.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-land-tvdpi/holo_light_dialogwhenlarge_searchview.png b/tests/tests/holo/res/drawable-land-tvdpi/holo_light_dialogwhenlarge_searchview.png
new file mode 100644
index 0000000..9ff0a17
--- /dev/null
+++ b/tests/tests/holo/res/drawable-land-tvdpi/holo_light_dialogwhenlarge_searchview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-land-tvdpi/holo_light_dialogwhenlarge_tabhost.png b/tests/tests/holo/res/drawable-land-tvdpi/holo_light_dialogwhenlarge_tabhost.png
new file mode 100644
index 0000000..592f520
--- /dev/null
+++ b/tests/tests/holo/res/drawable-land-tvdpi/holo_light_dialogwhenlarge_tabhost.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-land-tvdpi/holo_light_noactionbar_fullscreen_searchview.png b/tests/tests/holo/res/drawable-land-tvdpi/holo_light_noactionbar_fullscreen_searchview.png
new file mode 100644
index 0000000..9ff0a17
--- /dev/null
+++ b/tests/tests/holo/res/drawable-land-tvdpi/holo_light_noactionbar_fullscreen_searchview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-land-tvdpi/holo_light_noactionbar_fullscreen_tabhost.png b/tests/tests/holo/res/drawable-land-tvdpi/holo_light_noactionbar_fullscreen_tabhost.png
new file mode 100644
index 0000000..592f520
--- /dev/null
+++ b/tests/tests/holo/res/drawable-land-tvdpi/holo_light_noactionbar_fullscreen_tabhost.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-land-tvdpi/holo_light_noactionbar_searchview.png b/tests/tests/holo/res/drawable-land-tvdpi/holo_light_noactionbar_searchview.png
new file mode 100644
index 0000000..9ff0a17
--- /dev/null
+++ b/tests/tests/holo/res/drawable-land-tvdpi/holo_light_noactionbar_searchview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-land-tvdpi/holo_light_noactionbar_tabhost.png b/tests/tests/holo/res/drawable-land-tvdpi/holo_light_noactionbar_tabhost.png
new file mode 100644
index 0000000..592f520
--- /dev/null
+++ b/tests/tests/holo/res/drawable-land-tvdpi/holo_light_noactionbar_tabhost.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-land-tvdpi/holo_light_panel_searchview.png b/tests/tests/holo/res/drawable-land-tvdpi/holo_light_panel_searchview.png
new file mode 100644
index 0000000..9ff0a17
--- /dev/null
+++ b/tests/tests/holo/res/drawable-land-tvdpi/holo_light_panel_searchview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-land-tvdpi/holo_light_panel_tabhost.png b/tests/tests/holo/res/drawable-land-tvdpi/holo_light_panel_tabhost.png
new file mode 100644
index 0000000..592f520
--- /dev/null
+++ b/tests/tests/holo/res/drawable-land-tvdpi/holo_light_panel_tabhost.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-land-tvdpi/holo_light_searchview.png b/tests/tests/holo/res/drawable-land-tvdpi/holo_light_searchview.png
new file mode 100644
index 0000000..9ff0a17
--- /dev/null
+++ b/tests/tests/holo/res/drawable-land-tvdpi/holo_light_searchview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-land-tvdpi/holo_light_tabhost.png b/tests/tests/holo/res/drawable-land-tvdpi/holo_light_tabhost.png
new file mode 100644
index 0000000..592f520
--- /dev/null
+++ b/tests/tests/holo/res/drawable-land-tvdpi/holo_light_tabhost.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-land-tvdpi/holo_noactionbar_fullscreen_searchview.png b/tests/tests/holo/res/drawable-land-tvdpi/holo_noactionbar_fullscreen_searchview.png
new file mode 100644
index 0000000..7320b98
--- /dev/null
+++ b/tests/tests/holo/res/drawable-land-tvdpi/holo_noactionbar_fullscreen_searchview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-land-tvdpi/holo_noactionbar_fullscreen_tabhost.png b/tests/tests/holo/res/drawable-land-tvdpi/holo_noactionbar_fullscreen_tabhost.png
new file mode 100644
index 0000000..edd794a
--- /dev/null
+++ b/tests/tests/holo/res/drawable-land-tvdpi/holo_noactionbar_fullscreen_tabhost.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-land-tvdpi/holo_noactionbar_searchview.png b/tests/tests/holo/res/drawable-land-tvdpi/holo_noactionbar_searchview.png
new file mode 100644
index 0000000..7320b98
--- /dev/null
+++ b/tests/tests/holo/res/drawable-land-tvdpi/holo_noactionbar_searchview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-land-tvdpi/holo_noactionbar_tabhost.png b/tests/tests/holo/res/drawable-land-tvdpi/holo_noactionbar_tabhost.png
new file mode 100644
index 0000000..edd794a
--- /dev/null
+++ b/tests/tests/holo/res/drawable-land-tvdpi/holo_noactionbar_tabhost.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-land-tvdpi/holo_panel_searchview.png b/tests/tests/holo/res/drawable-land-tvdpi/holo_panel_searchview.png
new file mode 100644
index 0000000..7320b98
--- /dev/null
+++ b/tests/tests/holo/res/drawable-land-tvdpi/holo_panel_searchview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-land-tvdpi/holo_panel_tabhost.png b/tests/tests/holo/res/drawable-land-tvdpi/holo_panel_tabhost.png
new file mode 100644
index 0000000..edd794a
--- /dev/null
+++ b/tests/tests/holo/res/drawable-land-tvdpi/holo_panel_tabhost.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-land-tvdpi/holo_searchview.png b/tests/tests/holo/res/drawable-land-tvdpi/holo_searchview.png
new file mode 100644
index 0000000..7320b98
--- /dev/null
+++ b/tests/tests/holo/res/drawable-land-tvdpi/holo_searchview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-land-tvdpi/holo_tabhost.png b/tests/tests/holo/res/drawable-land-tvdpi/holo_tabhost.png
new file mode 100644
index 0000000..edd794a
--- /dev/null
+++ b/tests/tests/holo/res/drawable-land-tvdpi/holo_tabhost.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-land-tvdpi/holo_wallpaper_notitlebar_searchview.png b/tests/tests/holo/res/drawable-land-tvdpi/holo_wallpaper_notitlebar_searchview.png
new file mode 100644
index 0000000..7320b98
--- /dev/null
+++ b/tests/tests/holo/res/drawable-land-tvdpi/holo_wallpaper_notitlebar_searchview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-land-tvdpi/holo_wallpaper_notitlebar_tabhost.png b/tests/tests/holo/res/drawable-land-tvdpi/holo_wallpaper_notitlebar_tabhost.png
new file mode 100644
index 0000000..edd794a
--- /dev/null
+++ b/tests/tests/holo/res/drawable-land-tvdpi/holo_wallpaper_notitlebar_tabhost.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-land-tvdpi/holo_wallpaper_searchview.png b/tests/tests/holo/res/drawable-land-tvdpi/holo_wallpaper_searchview.png
new file mode 100644
index 0000000..7320b98
--- /dev/null
+++ b/tests/tests/holo/res/drawable-land-tvdpi/holo_wallpaper_searchview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-land-tvdpi/holo_wallpaper_tabhost.png b/tests/tests/holo/res/drawable-land-tvdpi/holo_wallpaper_tabhost.png
new file mode 100644
index 0000000..edd794a
--- /dev/null
+++ b/tests/tests/holo/res/drawable-land-tvdpi/holo_wallpaper_tabhost.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-land-xhdpi/holo_dialog_minwidth_searchview.png b/tests/tests/holo/res/drawable-land-xhdpi/holo_dialog_minwidth_searchview.png
new file mode 100644
index 0000000..de97e9f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-land-xhdpi/holo_dialog_minwidth_searchview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-land-xhdpi/holo_dialog_minwidth_tabhost.png b/tests/tests/holo/res/drawable-land-xhdpi/holo_dialog_minwidth_tabhost.png
new file mode 100644
index 0000000..748e8e7
--- /dev/null
+++ b/tests/tests/holo/res/drawable-land-xhdpi/holo_dialog_minwidth_tabhost.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-land-xhdpi/holo_dialog_noactionbar_minwidth_searchview.png b/tests/tests/holo/res/drawable-land-xhdpi/holo_dialog_noactionbar_minwidth_searchview.png
new file mode 100644
index 0000000..de97e9f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-land-xhdpi/holo_dialog_noactionbar_minwidth_searchview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-land-xhdpi/holo_dialog_noactionbar_minwidth_tabhost.png b/tests/tests/holo/res/drawable-land-xhdpi/holo_dialog_noactionbar_minwidth_tabhost.png
new file mode 100644
index 0000000..748e8e7
--- /dev/null
+++ b/tests/tests/holo/res/drawable-land-xhdpi/holo_dialog_noactionbar_minwidth_tabhost.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-land-xhdpi/holo_dialog_noactionbar_searchview.png b/tests/tests/holo/res/drawable-land-xhdpi/holo_dialog_noactionbar_searchview.png
new file mode 100644
index 0000000..de97e9f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-land-xhdpi/holo_dialog_noactionbar_searchview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-land-xhdpi/holo_dialog_noactionbar_tabhost.png b/tests/tests/holo/res/drawable-land-xhdpi/holo_dialog_noactionbar_tabhost.png
new file mode 100644
index 0000000..748e8e7
--- /dev/null
+++ b/tests/tests/holo/res/drawable-land-xhdpi/holo_dialog_noactionbar_tabhost.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-land-xhdpi/holo_dialog_searchview.png b/tests/tests/holo/res/drawable-land-xhdpi/holo_dialog_searchview.png
new file mode 100644
index 0000000..de97e9f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-land-xhdpi/holo_dialog_searchview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-land-xhdpi/holo_dialog_tabhost.png b/tests/tests/holo/res/drawable-land-xhdpi/holo_dialog_tabhost.png
new file mode 100644
index 0000000..748e8e7
--- /dev/null
+++ b/tests/tests/holo/res/drawable-land-xhdpi/holo_dialog_tabhost.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-land-xhdpi/holo_dialogwhenlarge_noactionbar_searchview.png b/tests/tests/holo/res/drawable-land-xhdpi/holo_dialogwhenlarge_noactionbar_searchview.png
new file mode 100644
index 0000000..de97e9f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-land-xhdpi/holo_dialogwhenlarge_noactionbar_searchview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-land-xhdpi/holo_dialogwhenlarge_noactionbar_tabhost.png b/tests/tests/holo/res/drawable-land-xhdpi/holo_dialogwhenlarge_noactionbar_tabhost.png
new file mode 100644
index 0000000..748e8e7
--- /dev/null
+++ b/tests/tests/holo/res/drawable-land-xhdpi/holo_dialogwhenlarge_noactionbar_tabhost.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-land-xhdpi/holo_dialogwhenlarge_searchview.png b/tests/tests/holo/res/drawable-land-xhdpi/holo_dialogwhenlarge_searchview.png
new file mode 100644
index 0000000..de97e9f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-land-xhdpi/holo_dialogwhenlarge_searchview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-land-xhdpi/holo_dialogwhenlarge_tabhost.png b/tests/tests/holo/res/drawable-land-xhdpi/holo_dialogwhenlarge_tabhost.png
new file mode 100644
index 0000000..748e8e7
--- /dev/null
+++ b/tests/tests/holo/res/drawable-land-xhdpi/holo_dialogwhenlarge_tabhost.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-land-xhdpi/holo_inputmethod_searchview.png b/tests/tests/holo/res/drawable-land-xhdpi/holo_inputmethod_searchview.png
new file mode 100644
index 0000000..1997d62
--- /dev/null
+++ b/tests/tests/holo/res/drawable-land-xhdpi/holo_inputmethod_searchview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-land-xhdpi/holo_inputmethod_tabhost.png b/tests/tests/holo/res/drawable-land-xhdpi/holo_inputmethod_tabhost.png
new file mode 100644
index 0000000..4a41bfd
--- /dev/null
+++ b/tests/tests/holo/res/drawable-land-xhdpi/holo_inputmethod_tabhost.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-land-xhdpi/holo_light_darkactionbar_searchview.png b/tests/tests/holo/res/drawable-land-xhdpi/holo_light_darkactionbar_searchview.png
new file mode 100644
index 0000000..1997d62
--- /dev/null
+++ b/tests/tests/holo/res/drawable-land-xhdpi/holo_light_darkactionbar_searchview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-land-xhdpi/holo_light_darkactionbar_tabhost.png b/tests/tests/holo/res/drawable-land-xhdpi/holo_light_darkactionbar_tabhost.png
new file mode 100644
index 0000000..4a41bfd
--- /dev/null
+++ b/tests/tests/holo/res/drawable-land-xhdpi/holo_light_darkactionbar_tabhost.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-land-xhdpi/holo_light_dialog_minwidth_searchview.png b/tests/tests/holo/res/drawable-land-xhdpi/holo_light_dialog_minwidth_searchview.png
new file mode 100644
index 0000000..1997d62
--- /dev/null
+++ b/tests/tests/holo/res/drawable-land-xhdpi/holo_light_dialog_minwidth_searchview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-land-xhdpi/holo_light_dialog_minwidth_tabhost.png b/tests/tests/holo/res/drawable-land-xhdpi/holo_light_dialog_minwidth_tabhost.png
new file mode 100644
index 0000000..4a41bfd
--- /dev/null
+++ b/tests/tests/holo/res/drawable-land-xhdpi/holo_light_dialog_minwidth_tabhost.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-land-xhdpi/holo_light_dialog_noactionbar_minwidth_searchview.png b/tests/tests/holo/res/drawable-land-xhdpi/holo_light_dialog_noactionbar_minwidth_searchview.png
new file mode 100644
index 0000000..1997d62
--- /dev/null
+++ b/tests/tests/holo/res/drawable-land-xhdpi/holo_light_dialog_noactionbar_minwidth_searchview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-land-xhdpi/holo_light_dialog_noactionbar_minwidth_tabhost.png b/tests/tests/holo/res/drawable-land-xhdpi/holo_light_dialog_noactionbar_minwidth_tabhost.png
new file mode 100644
index 0000000..4a41bfd
--- /dev/null
+++ b/tests/tests/holo/res/drawable-land-xhdpi/holo_light_dialog_noactionbar_minwidth_tabhost.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-land-xhdpi/holo_light_dialog_noactionbar_searchview.png b/tests/tests/holo/res/drawable-land-xhdpi/holo_light_dialog_noactionbar_searchview.png
new file mode 100644
index 0000000..1997d62
--- /dev/null
+++ b/tests/tests/holo/res/drawable-land-xhdpi/holo_light_dialog_noactionbar_searchview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-land-xhdpi/holo_light_dialog_noactionbar_tabhost.png b/tests/tests/holo/res/drawable-land-xhdpi/holo_light_dialog_noactionbar_tabhost.png
new file mode 100644
index 0000000..4a41bfd
--- /dev/null
+++ b/tests/tests/holo/res/drawable-land-xhdpi/holo_light_dialog_noactionbar_tabhost.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-land-xhdpi/holo_light_dialog_searchview.png b/tests/tests/holo/res/drawable-land-xhdpi/holo_light_dialog_searchview.png
new file mode 100644
index 0000000..1997d62
--- /dev/null
+++ b/tests/tests/holo/res/drawable-land-xhdpi/holo_light_dialog_searchview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-land-xhdpi/holo_light_dialog_tabhost.png b/tests/tests/holo/res/drawable-land-xhdpi/holo_light_dialog_tabhost.png
new file mode 100644
index 0000000..4a41bfd
--- /dev/null
+++ b/tests/tests/holo/res/drawable-land-xhdpi/holo_light_dialog_tabhost.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-land-xhdpi/holo_light_dialogwhenlarge_noactionbar_searchview.png b/tests/tests/holo/res/drawable-land-xhdpi/holo_light_dialogwhenlarge_noactionbar_searchview.png
new file mode 100644
index 0000000..1997d62
--- /dev/null
+++ b/tests/tests/holo/res/drawable-land-xhdpi/holo_light_dialogwhenlarge_noactionbar_searchview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-land-xhdpi/holo_light_dialogwhenlarge_noactionbar_tabhost.png b/tests/tests/holo/res/drawable-land-xhdpi/holo_light_dialogwhenlarge_noactionbar_tabhost.png
new file mode 100644
index 0000000..4a41bfd
--- /dev/null
+++ b/tests/tests/holo/res/drawable-land-xhdpi/holo_light_dialogwhenlarge_noactionbar_tabhost.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-land-xhdpi/holo_light_dialogwhenlarge_searchview.png b/tests/tests/holo/res/drawable-land-xhdpi/holo_light_dialogwhenlarge_searchview.png
new file mode 100644
index 0000000..1997d62
--- /dev/null
+++ b/tests/tests/holo/res/drawable-land-xhdpi/holo_light_dialogwhenlarge_searchview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-land-xhdpi/holo_light_dialogwhenlarge_tabhost.png b/tests/tests/holo/res/drawable-land-xhdpi/holo_light_dialogwhenlarge_tabhost.png
new file mode 100644
index 0000000..4a41bfd
--- /dev/null
+++ b/tests/tests/holo/res/drawable-land-xhdpi/holo_light_dialogwhenlarge_tabhost.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-land-xhdpi/holo_light_noactionbar_fullscreen_searchview.png b/tests/tests/holo/res/drawable-land-xhdpi/holo_light_noactionbar_fullscreen_searchview.png
new file mode 100644
index 0000000..1997d62
--- /dev/null
+++ b/tests/tests/holo/res/drawable-land-xhdpi/holo_light_noactionbar_fullscreen_searchview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-land-xhdpi/holo_light_noactionbar_fullscreen_tabhost.png b/tests/tests/holo/res/drawable-land-xhdpi/holo_light_noactionbar_fullscreen_tabhost.png
new file mode 100644
index 0000000..4a41bfd
--- /dev/null
+++ b/tests/tests/holo/res/drawable-land-xhdpi/holo_light_noactionbar_fullscreen_tabhost.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-land-xhdpi/holo_light_noactionbar_searchview.png b/tests/tests/holo/res/drawable-land-xhdpi/holo_light_noactionbar_searchview.png
new file mode 100644
index 0000000..1997d62
--- /dev/null
+++ b/tests/tests/holo/res/drawable-land-xhdpi/holo_light_noactionbar_searchview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-land-xhdpi/holo_light_noactionbar_tabhost.png b/tests/tests/holo/res/drawable-land-xhdpi/holo_light_noactionbar_tabhost.png
new file mode 100644
index 0000000..4a41bfd
--- /dev/null
+++ b/tests/tests/holo/res/drawable-land-xhdpi/holo_light_noactionbar_tabhost.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-land-xhdpi/holo_light_panel_searchview.png b/tests/tests/holo/res/drawable-land-xhdpi/holo_light_panel_searchview.png
new file mode 100644
index 0000000..1997d62
--- /dev/null
+++ b/tests/tests/holo/res/drawable-land-xhdpi/holo_light_panel_searchview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-land-xhdpi/holo_light_panel_tabhost.png b/tests/tests/holo/res/drawable-land-xhdpi/holo_light_panel_tabhost.png
new file mode 100644
index 0000000..4a41bfd
--- /dev/null
+++ b/tests/tests/holo/res/drawable-land-xhdpi/holo_light_panel_tabhost.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-land-xhdpi/holo_light_searchview.png b/tests/tests/holo/res/drawable-land-xhdpi/holo_light_searchview.png
new file mode 100644
index 0000000..1997d62
--- /dev/null
+++ b/tests/tests/holo/res/drawable-land-xhdpi/holo_light_searchview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-land-xhdpi/holo_light_tabhost.png b/tests/tests/holo/res/drawable-land-xhdpi/holo_light_tabhost.png
new file mode 100644
index 0000000..4a41bfd
--- /dev/null
+++ b/tests/tests/holo/res/drawable-land-xhdpi/holo_light_tabhost.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-land-xhdpi/holo_noactionbar_fullscreen_searchview.png b/tests/tests/holo/res/drawable-land-xhdpi/holo_noactionbar_fullscreen_searchview.png
new file mode 100644
index 0000000..de97e9f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-land-xhdpi/holo_noactionbar_fullscreen_searchview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-land-xhdpi/holo_noactionbar_fullscreen_tabhost.png b/tests/tests/holo/res/drawable-land-xhdpi/holo_noactionbar_fullscreen_tabhost.png
new file mode 100644
index 0000000..748e8e7
--- /dev/null
+++ b/tests/tests/holo/res/drawable-land-xhdpi/holo_noactionbar_fullscreen_tabhost.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-land-xhdpi/holo_noactionbar_searchview.png b/tests/tests/holo/res/drawable-land-xhdpi/holo_noactionbar_searchview.png
new file mode 100644
index 0000000..de97e9f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-land-xhdpi/holo_noactionbar_searchview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-land-xhdpi/holo_noactionbar_tabhost.png b/tests/tests/holo/res/drawable-land-xhdpi/holo_noactionbar_tabhost.png
new file mode 100644
index 0000000..748e8e7
--- /dev/null
+++ b/tests/tests/holo/res/drawable-land-xhdpi/holo_noactionbar_tabhost.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-land-xhdpi/holo_panel_searchview.png b/tests/tests/holo/res/drawable-land-xhdpi/holo_panel_searchview.png
new file mode 100644
index 0000000..de97e9f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-land-xhdpi/holo_panel_searchview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-land-xhdpi/holo_panel_tabhost.png b/tests/tests/holo/res/drawable-land-xhdpi/holo_panel_tabhost.png
new file mode 100644
index 0000000..748e8e7
--- /dev/null
+++ b/tests/tests/holo/res/drawable-land-xhdpi/holo_panel_tabhost.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-land-xhdpi/holo_searchview.png b/tests/tests/holo/res/drawable-land-xhdpi/holo_searchview.png
new file mode 100644
index 0000000..de97e9f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-land-xhdpi/holo_searchview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-land-xhdpi/holo_tabhost.png b/tests/tests/holo/res/drawable-land-xhdpi/holo_tabhost.png
new file mode 100644
index 0000000..748e8e7
--- /dev/null
+++ b/tests/tests/holo/res/drawable-land-xhdpi/holo_tabhost.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-land-xhdpi/holo_wallpaper_notitlebar_searchview.png b/tests/tests/holo/res/drawable-land-xhdpi/holo_wallpaper_notitlebar_searchview.png
new file mode 100644
index 0000000..de97e9f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-land-xhdpi/holo_wallpaper_notitlebar_searchview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-land-xhdpi/holo_wallpaper_notitlebar_tabhost.png b/tests/tests/holo/res/drawable-land-xhdpi/holo_wallpaper_notitlebar_tabhost.png
new file mode 100644
index 0000000..748e8e7
--- /dev/null
+++ b/tests/tests/holo/res/drawable-land-xhdpi/holo_wallpaper_notitlebar_tabhost.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-land-xhdpi/holo_wallpaper_searchview.png b/tests/tests/holo/res/drawable-land-xhdpi/holo_wallpaper_searchview.png
new file mode 100644
index 0000000..de97e9f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-land-xhdpi/holo_wallpaper_searchview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-land-xhdpi/holo_wallpaper_tabhost.png b/tests/tests/holo/res/drawable-land-xhdpi/holo_wallpaper_tabhost.png
new file mode 100644
index 0000000..748e8e7
--- /dev/null
+++ b/tests/tests/holo/res/drawable-land-xhdpi/holo_wallpaper_tabhost.png
Binary files differ
diff --git a/tests/tests/mediastress/src/android/mediastress/cts/MediaRecorderStressTest.java b/tests/tests/mediastress/src/android/mediastress/cts/MediaRecorderStressTest.java
index fd4e3b3..6c3f848 100644
--- a/tests/tests/mediastress/src/android/mediastress/cts/MediaRecorderStressTest.java
+++ b/tests/tests/mediastress/src/android/mediastress/cts/MediaRecorderStressTest.java
@@ -16,6 +16,7 @@
 
 package android.mediastress.cts;
 
+import android.content.pm.PackageManager;
 import android.hardware.Camera;
 import android.media.CamcorderProfile;
 import android.media.MediaPlayer;
@@ -43,7 +44,7 @@
     private static final int NUMBER_OF_SWTICHING_LOOPS_BW_CAMERA_AND_RECORDER = 50;
     private static final long WAIT_TIME_CAMERA_TEST = 3000;  // in ms
     private static final long WAIT_TIME_RECORDER_TEST = 5000;  // in ms
-    private static final String OUTPUT_FILE = WorkDir.getTopDirString() + "temp";
+    private final String OUTPUT_FILE = WorkDir.getTopDirString() + "temp";
     private static final String OUTPUT_FILE_EXT = ".3gp";
     private static final String MEDIA_STRESS_OUTPUT ="mediaStressOutput.txt";
     private final CameraErrorCallback mCameraErrorCallback = new CameraErrorCallback();
@@ -69,11 +70,18 @@
     private boolean mRemoveVideo = true;
     private int mRecordDuration = 5000;
 
+    private boolean mHasRearCamera = false;
+    private boolean mHasFrontCamera = false;
+
     public MediaRecorderStressTest() {
         super(MediaFrameworkTest.class);
     }
 
     protected void setUp() throws Exception {
+        PackageManager packageManager =
+                getInstrumentation().getTargetContext().getPackageManager();
+        mHasRearCamera = packageManager.hasSystemFeature(PackageManager.FEATURE_CAMERA);
+        mHasFrontCamera = packageManager.hasSystemFeature(PackageManager.FEATURE_CAMERA_FRONT);
         int cameraId = 0;
         CamcorderProfile profile = CamcorderProfile.get(cameraId, CamcorderProfile.QUALITY_HIGH);
         mVideoEncoder = profile.videoCodec;
@@ -170,9 +178,18 @@
             runOnLooper(new Runnable() {
                 @Override
                 public void run() {
-                    mCamera = Camera.open();
+                    if (mHasRearCamera) {
+                        mCamera = Camera.open();
+                    } else if (mHasFrontCamera) {
+                        mCamera = Camera.open(0);
+                    } else {
+                        mCamera = null;
+                    }
                 }
             });
+            if (mCamera == null) {
+                break;
+            }
             mCamera.setErrorCallback(mCameraErrorCallback);
             mCamera.setPreviewDisplay(mSurfaceHolder);
             mCamera.startPreview();
@@ -252,9 +269,18 @@
             runOnLooper(new Runnable() {
                 @Override
                 public void run() {
-                    mCamera = Camera.open();
+                    if (mHasRearCamera) {
+                        mCamera = Camera.open();
+                    } else if (mHasFrontCamera) {
+                        mCamera = Camera.open(0);
+                    } else {
+                        mCamera = null;
+                    }
                 }
             });
+            if (mCamera == null) {
+                break;
+            }
             mCamera.setErrorCallback(mCameraErrorCallback);
             mCamera.setPreviewDisplay(mSurfaceHolder);
             mCamera.startPreview();
diff --git a/tests/tests/permission/src/android/permission/cts/FileSystemPermissionTest.java b/tests/tests/permission/src/android/permission/cts/FileSystemPermissionTest.java
index 7572ff2..f00fd70 100644
--- a/tests/tests/permission/src/android/permission/cts/FileSystemPermissionTest.java
+++ b/tests/tests/permission/src/android/permission/cts/FileSystemPermissionTest.java
@@ -229,8 +229,8 @@
                     "/data/drm",
                     "/data/drm/rights",
                     "/data/dump",
-                    "/data/fota",
                     "/data/emt",
+                    "/data/fota",
                     "/data/gpscfg",
                     "/data/hwvefs",
                     "/data/htcfs",
@@ -261,6 +261,7 @@
                     "/data/misc/dhcp",
                     "/data/misc/wifi",
                     "/data/misc/wifi/sockets",
+                    "/data/misc/wminput",
                     "/data/misc/wpa_supplicant",
                     "/data/nvcam",
                     "/data/panicreports",
@@ -286,6 +287,7 @@
                     "/data/xt9",
                     "/dbdata/databases",
                     "/efs/.android",
+                    "/mnt/usbdrive",
                     "/mnt_ext",
                     "/mnt_ext/badablk2",
                     "/mnt_ext/badablk3",
diff --git a/tests/tests/textureview/AndroidManifest.xml b/tests/tests/textureview/AndroidManifest.xml
index 0ed1d46..05e0ba6 100644
--- a/tests/tests/textureview/AndroidManifest.xml
+++ b/tests/tests/textureview/AndroidManifest.xml
@@ -37,6 +37,14 @@
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
+        <activity
+            android:name="android.textureview.cts.TextureViewSnapshotTestActivity"
+            android:label="@string/app_name" >
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
         <uses-library android:name="android.test.runner" />
     </application>
 
diff --git a/tests/tests/textureview/src/android/textureview/cts/GLProducerThread.java b/tests/tests/textureview/src/android/textureview/cts/GLProducerThread.java
index 3248597..b3b1c3c 100644
--- a/tests/tests/textureview/src/android/textureview/cts/GLProducerThread.java
+++ b/tests/tests/textureview/src/android/textureview/cts/GLProducerThread.java
@@ -19,6 +19,7 @@
 import android.opengl.GLUtils;
 
 import java.lang.Thread;
+import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.Semaphore;
 
 import junit.framework.Assert;
@@ -38,6 +39,8 @@
     private final int mDelayMs;
     private final Semaphore mSemaphore;
     private final SurfaceTexture mSurfaceTexture;
+    private final AtomicBoolean mShouldRender;
+    private final GLRenderer mRenderer;
 
     private EGL10 mEgl;
     private EGLDisplay mEglDisplay = EGL10.EGL_NO_DISPLAY;
@@ -48,11 +51,28 @@
     private static final int EGL_CONTEXT_CLIENT_VERSION = 0x3098;
     private static final int EGL_OPENGL_ES2_BIT = 4;
 
-    GLProducerThread(SurfaceTexture surfaceTexture, int frames, int delayMs, Semaphore semaphore) {
+    public interface GLRenderer {
+        public void drawFrame(int frame);
+    }
+
+    GLProducerThread(SurfaceTexture surfaceTexture, GLRenderer renderer, AtomicBoolean shouldRender,
+            int frames, int delayMs, Semaphore semaphore) {
+        mShouldRender = shouldRender;
         mFrames = frames;
         mDelayMs = delayMs;
         mSemaphore = semaphore;
         mSurfaceTexture = surfaceTexture;
+        mRenderer = renderer;
+    }
+
+    GLProducerThread(SurfaceTexture surfaceTexture, GLRenderer renderer, int frames, int delayMs,
+            Semaphore semaphore) {
+        this(surfaceTexture, renderer, null, frames, delayMs, semaphore);
+    }
+
+    GLProducerThread(SurfaceTexture surfaceTexture, GLRenderer renderer, AtomicBoolean shouldRender,
+            int delayMs, Semaphore semaphore) {
+        this(surfaceTexture, renderer, shouldRender, 0, delayMs, semaphore);
     }
 
     private void initGL() {
@@ -122,23 +142,19 @@
     @Override
     public void run() {
         initGL();
-        final int numColors = 4;
-        final float[][] color =
-            { { 1.0f, 0.0f, 0.0f },
-              { 0.0f, 1.0f, 0.0f },
-              { 0.0f, 0.0f, 1.0f },
-              { 1.0f, 1.0f, 1.0f } };
 
-        for (int index = 0, frame = 0;
-             frame < mFrames; index = (index + 1) % numColors, frame++) {
-            glClearColor(color[index][0], color[index][1], color[index][2], 1.0f);
-            glClear(GL_COLOR_BUFFER_BIT);
+        int frame = 0;
+        while (frame < mFrames || (mShouldRender != null && mShouldRender.get())) {
+            if (mRenderer != null) {
+                mRenderer.drawFrame(frame);
+            }
             mEgl.eglSwapBuffers(mEglDisplay, mEglSurface);
             Assert.assertEquals(EGL10.EGL_SUCCESS, mEgl.eglGetError());
             try {
                 sleep(mDelayMs);
             } catch (InterruptedException e) {
             }
+            frame++;
         }
 
         mSemaphore.release();
diff --git a/tests/tests/textureview/src/android/textureview/cts/TextureViewSnapshotTest.java b/tests/tests/textureview/src/android/textureview/cts/TextureViewSnapshotTest.java
new file mode 100644
index 0000000..6195e5c
--- /dev/null
+++ b/tests/tests/textureview/src/android/textureview/cts/TextureViewSnapshotTest.java
@@ -0,0 +1,32 @@
+/** Copyright (C) 2012 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.textureview.cts;
+
+import android.test.ActivityInstrumentationTestCase2;
+
+public class TextureViewSnapshotTest extends
+        ActivityInstrumentationTestCase2<TextureViewSnapshotTestActivity> {
+
+    public TextureViewSnapshotTest() {
+        super(TextureViewSnapshotTestActivity.class);
+    }
+
+    public void testTextureViewGrabSnapshot() {
+        TextureViewSnapshotTestActivity.mMaxWaitDelayMs = 750;
+        if (!getActivity().waitForCompletion())
+            fail("Did not complete complete test.");
+    }
+}
\ No newline at end of file
diff --git a/tests/tests/textureview/src/android/textureview/cts/TextureViewSnapshotTestActivity.java b/tests/tests/textureview/src/android/textureview/cts/TextureViewSnapshotTestActivity.java
new file mode 100644
index 0000000..2c3118d
--- /dev/null
+++ b/tests/tests/textureview/src/android/textureview/cts/TextureViewSnapshotTestActivity.java
@@ -0,0 +1,97 @@
+/*
+ * Copyright (C) 2012 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.textureview.cts;
+
+import android.app.Activity;
+import android.graphics.Bitmap;
+import android.graphics.Color;
+import android.graphics.SurfaceTexture;
+import android.os.Bundle;
+import android.view.TextureView;
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.concurrent.Semaphore;
+import java.util.concurrent.TimeUnit;
+import junit.framework.Assert;
+
+import static android.opengl.GLES20.*;
+
+public class TextureViewSnapshotTestActivity extends Activity
+        implements TextureView.SurfaceTextureListener {
+    public static int mMaxWaitDelayMs = -1;
+
+    private TextureView mTexView;
+    private Thread mProducerThread;
+    private final Semaphore mSemaphore = new Semaphore(0);
+    private final AtomicBoolean mShouldRender = new AtomicBoolean(true);
+    private boolean mPostedSnapshotGrab = false;
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        Assert.assertTrue(mMaxWaitDelayMs > 0);
+        mTexView = new TextureView(this);
+        mTexView.setSurfaceTextureListener(this);
+        setContentView(mTexView);
+    }
+
+    public Boolean waitForCompletion() {
+        Boolean success = false;
+        try {
+            success = mSemaphore.tryAcquire(mMaxWaitDelayMs, TimeUnit.MILLISECONDS);
+        } catch (InterruptedException e) {
+            Assert.fail();
+        }
+        return success;
+    }
+
+    @Override
+    public void onSurfaceTextureAvailable(SurfaceTexture surface, int width, int height) {
+        mProducerThread = new GLProducerThread(surface, new GLRendererImpl(),
+                mShouldRender, 1000/48, mSemaphore);
+        mProducerThread.start();
+    }
+
+    @Override
+    public void onSurfaceTextureSizeChanged(SurfaceTexture surface, int width, int height) {
+    }
+
+    @Override
+    public boolean onSurfaceTextureDestroyed(SurfaceTexture surface) {
+        mProducerThread = null;
+        return true;
+    }
+
+    @Override
+    public void onSurfaceTextureUpdated(SurfaceTexture surface) {
+        if (!mPostedSnapshotGrab) {
+            Bitmap bitmap = mTexView.getBitmap();
+            Assert.assertNotNull(bitmap);
+            Assert.assertEquals(mTexView.getWidth(), bitmap.getWidth());
+            Assert.assertEquals(mTexView.getHeight(), bitmap.getHeight());
+            Assert.assertEquals(Color.RED, bitmap.getPixel(0, 0));
+            mShouldRender.set(false);
+            mPostedSnapshotGrab = true;
+        }
+    }
+
+    private static class GLRendererImpl implements GLProducerThread.GLRenderer {
+        @Override
+        public void drawFrame(int frame) {
+            glClearColor(1.0f, 0.0f, 0.0f, 1.0f);
+            glClear(GL_COLOR_BUFFER_BIT);
+        }
+    }
+}
\ No newline at end of file
diff --git a/tests/tests/textureview/src/android/textureview/cts/TextureViewTestActivity.java b/tests/tests/textureview/src/android/textureview/cts/TextureViewTestActivity.java
index f2a698b..92d9f89 100644
--- a/tests/tests/textureview/src/android/textureview/cts/TextureViewTestActivity.java
+++ b/tests/tests/textureview/src/android/textureview/cts/TextureViewTestActivity.java
@@ -25,6 +25,8 @@
 import java.util.concurrent.TimeUnit;
 import junit.framework.Assert;
 
+import static android.opengl.GLES20.*;
+
 public class TextureViewTestActivity extends Activity implements TextureView.SurfaceTextureListener {
     public static int mFrames = -1;
     public static int mDelayMs = -1;
@@ -63,7 +65,8 @@
 
     @Override
     public void onSurfaceTextureAvailable(SurfaceTexture surface, int width, int height) {
-        mProducerThread = new GLProducerThread(surface, mFrames, mDelayMs, mSemaphore);
+        mProducerThread = new GLProducerThread(surface, new GLRendererImpl(),
+                mFrames, mDelayMs, mSemaphore);
         mProducerThread.start();
     }
 
@@ -80,4 +83,20 @@
     @Override
     public void onSurfaceTextureUpdated(SurfaceTexture surface) {
     }
+
+    public static class GLRendererImpl implements GLProducerThread.GLRenderer {
+        private final int numColors = 4;
+        private final float[][] color =
+            { { 1.0f, 0.0f, 0.0f },
+              { 0.0f, 1.0f, 0.0f },
+              { 0.0f, 0.0f, 1.0f },
+              { 1.0f, 1.0f, 1.0f } };
+
+        @Override
+        public void drawFrame(int frame) {
+            int index = frame % numColors;
+            glClearColor(color[index][0], color[index][1], color[index][2], 1.0f);
+            glClear(GL_COLOR_BUFFER_BIT);
+        }
+    }
 }
diff --git a/tests/tests/widget/src/android/widget/cts/AbsListViewTest.java b/tests/tests/widget/src/android/widget/cts/AbsListViewTest.java
index 2539a18..4dad7f8 100644
--- a/tests/tests/widget/src/android/widget/cts/AbsListViewTest.java
+++ b/tests/tests/widget/src/android/widget/cts/AbsListViewTest.java
@@ -40,17 +40,18 @@
 import android.text.SpannableStringBuilder;
 import android.util.AttributeSet;
 import android.util.Xml;
+import android.view.ContextMenu.ContextMenuInfo;
 import android.view.View;
 import android.view.ViewGroup;
-import android.view.ContextMenu.ContextMenuInfo;
 import android.widget.AbsListView;
-import android.widget.AdapterView;
-import android.widget.ArrayAdapter;
-import android.widget.ListView;
-import android.widget.TextView;
 import android.widget.AbsListView.OnScrollListener;
 import android.widget.AbsListView.RecyclerListener;
+import android.widget.AdapterView;
 import android.widget.AdapterView.OnItemLongClickListener;
+import android.widget.ArrayAdapter;
+import android.widget.ListAdapter;
+import android.widget.ListView;
+import android.widget.TextView;
 
 import java.io.IOException;
 import java.util.ArrayList;
@@ -58,6 +59,9 @@
 
 @TestTargetClass(AbsListView.class)
 public class AbsListViewTest extends ActivityInstrumentationTestCase2<ListViewStubActivity> {
+    private final String[] mShortList = new String[] {
+        "This", "is", "short", "!",
+    };
     private final String[] mCountryList = new String[] {
         "Argentina", "Australia", "China", "France", "Germany", "Italy", "Japan", "United States",
         "Argentina", "Australia", "China", "France", "Germany", "Italy", "Japan", "United States",
@@ -68,6 +72,7 @@
     private Activity mActivity;
     private Instrumentation mInstrumentation;
     private AttributeSet mAttributeSet;
+    private ArrayAdapter<String> mAdapter_short;
     private ArrayAdapter<String> mAdapter_countries;
 
     private static final float DELTA = 0.001f;
@@ -92,6 +97,8 @@
         WidgetTestUtils.beginDocument(parser, "LinearLayout");
         mAttributeSet = Xml.asAttributeSet(parser);
 
+        mAdapter_short = new ArrayAdapter<String>(mActivity,
+                android.R.layout.simple_list_item_1, mShortList);
         mAdapter_countries = new ArrayAdapter<String>(mActivity,
                 android.R.layout.simple_list_item_1, mCountryList);
 
@@ -183,9 +190,13 @@
     }
 
     private void setAdapter() throws Throwable {
+        setAdapter(mAdapter_countries);
+    }
+
+    private void setAdapter(final ListAdapter adapter) throws Throwable {
         runTestOnUiThread(new Runnable() {
             public void run() {
-                mListView.setAdapter(mAdapter_countries);
+                mListView.setAdapter(adapter);
             }
         });
         mInstrumentation.waitForIdleSync();
@@ -257,7 +268,7 @@
         args = {android.graphics.Rect.class}
     )
     public void testGetFocusedRect() throws Throwable {
-        setAdapter();
+        setAdapter(mAdapter_short);
         setListSelection(0);
 
         Rect r1 = new Rect();
@@ -268,7 +279,7 @@
         assertEquals(0, r1.left);
         assertTrue(r1.right > 0);
 
-        setListSelection(7);
+        setListSelection(3);
         Rect r2 = new Rect();
         mListView.getFocusedRect(r2);
         assertTrue(r2.top > 0);