diff --git a/Android.mk b/Android.mk
index e3f9ba8..159bda0 100644
--- a/Android.mk
+++ b/Android.mk
@@ -14,6 +14,6 @@
 # limitations under the License.
 #
 
+include cts/CtsNativeTestCase.mk
 include cts/CtsTestCoverage.mk
-
 include $(call all-subdir-makefiles)
diff --git a/CtsNativeTestCase.mk b/CtsNativeTestCase.mk
new file mode 100644
index 0000000..f70ec0c
--- /dev/null
+++ b/CtsNativeTestCase.mk
@@ -0,0 +1,32 @@
+# Copyright (C) 2011 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# Include this file to gain access to functions to build native CTS
+# test packages. Replace "include $(BUILD_EXECUTABLE)" with
+# "include $(BUILD_CTS_EXECUTABLE)".
+
+LOCAL_PATH := $(call my-dir)
+BUILD_CTS_EXECUTABLE := $(LOCAL_PATH)/tools/build/test_executable.mk
+
+CTS_NATIVE_XML_OUT := $(HOST_OUT)/cts-native-xml
+
+CTS_NATIVE_XML_GENERATOR := $(HOST_OUT_EXECUTABLES)/cts-native-xml-generator
+
+define cts-get-native-paths
+	$(foreach exe,$(1),$(call intermediates-dir-for,EXECUTABLES,$(exe))/$(exe))
+endef
+
+define cts-get-native-xmls
+	$(foreach exe,$(1),$(CTS_NATIVE_XML_OUT)/$(exe).xml)
+endef
diff --git a/CtsTestCaseList.mk b/CtsTestCaseList.mk
index fe3d540..8a38564 100644
--- a/CtsTestCaseList.mk
+++ b/CtsTestCaseList.mk
@@ -43,6 +43,7 @@
 	CtsGestureTestCases \
 	CtsGraphicsTestCases \
 	CtsHardwareTestCases \
+	CtsHoloTestCases \
 	CtsJniTestCases \
 	CtsLocationTestCases \
 	CtsMediaStressTestCases \
@@ -62,7 +63,6 @@
 	CtsTelephonyTestCases \
 	CtsTestStubs \
 	CtsTextTestCases \
-	CtsThemeTestCases \
 	CtsUtilTestCases \
 	CtsViewTestCases \
 	CtsWebkitTestCases \
@@ -72,12 +72,19 @@
 	TestDeviceSetup \
 	CtsDelegatingAccessibilityService \
 	CtsDeviceAdmin \
-	replicaisland \
+	com.replica.replicaisland \
 	SignatureTest \
 	ApiDemos \
 	ApiDemosReferenceTest \
 	$(CTS_COVERAGE_TEST_CASE_LIST) \
 	$(CTS_SECURITY_APPS_LIST)
 
+CTS_NATIVE_EXES := \
+	CtsNativeMediaTestCases
+
+CTS_TEST_CASES := $(call cts-get-native-paths,$(CTS_NATIVE_EXES))
+
+CTS_TEST_XMLS := $(call cts-get-native-xmls,$(CTS_NATIVE_EXES))
+
 # The following files will be placed in the tools directory of the CTS distribution
 CTS_TOOLS_LIST :=
diff --git a/apps/CtsVerifier/AndroidManifest.xml b/apps/CtsVerifier/AndroidManifest.xml
index e5c52fb..945419b 100644
--- a/apps/CtsVerifier/AndroidManifest.xml
+++ b/apps/CtsVerifier/AndroidManifest.xml
@@ -18,7 +18,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
       package="com.android.cts.verifier"
       android:versionCode="1"
-      android:versionName="4.0_r1">
+      android:versionName="4.0.3_r1">
 
     <!-- Using 10 for more complete NFC support... -->
     <uses-sdk android:minSdkVersion="10"></uses-sdk>
diff --git a/apps/CtsVerifier/res/layout/pass_fail_list.xml b/apps/CtsVerifier/res/layout/pass_fail_list.xml
index 3c1f9d0..0b247f4 100644
--- a/apps/CtsVerifier/res/layout/pass_fail_list.xml
+++ b/apps/CtsVerifier/res/layout/pass_fail_list.xml
@@ -28,6 +28,7 @@
     <TextView android:id="@id/android:empty"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
+            android:layout_weight="1"
             />
 
     <include layout="@layout/pass_fail_buttons" />
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/streamquality/StreamingVideoActivity.java b/apps/CtsVerifier/src/com/android/cts/verifier/streamquality/StreamingVideoActivity.java
index d575e5f..d122dec 100644
--- a/apps/CtsVerifier/src/com/android/cts/verifier/streamquality/StreamingVideoActivity.java
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/streamquality/StreamingVideoActivity.java
@@ -140,10 +140,10 @@
     private TestListAdapter getStreamAdapter() {
         ArrayTestListAdapter adapter = new ArrayTestListAdapter(this);
 
-        adapter.add(TestListItem.newCategory("RTSP"));
-        for (Stream stream : RTSP_STREAMS) {
-            addStreamToTests(adapter, stream);
-        }
+//        adapter.add(TestListItem.newCategory("RTSP"));
+//        for (Stream stream : RTSP_STREAMS) {
+//            addStreamToTests(adapter, stream);
+//        }
 
         adapter.add(TestListItem.newCategory("HTTP Progressive"));
         for (Stream stream : HTTP_STREAMS) {
diff --git a/development/ide/eclipse/.classpath b/development/ide/eclipse/.classpath
index 7000f64..30c63d8 100644
--- a/development/ide/eclipse/.classpath
+++ b/development/ide/eclipse/.classpath
@@ -33,6 +33,7 @@
     <classpathentry kind="src" path="cts/tests/tests/gesture/src"/>
     <classpathentry kind="src" path="cts/tests/tests/graphics/src"/>
     <classpathentry kind="src" path="cts/tests/tests/hardware/src"/>
+    <classpathentry kind="src" path="cts/tests/tests/holo/src"/>
     <classpathentry kind="src" path="cts/tests/tests/jni/src"/>
     <classpathentry kind="src" path="cts/tests/tests/location/src"/>
     <classpathentry kind="src" path="cts/tests/tests/media/src"/>
@@ -52,12 +53,12 @@
     <classpathentry kind="src" path="cts/tests/tests/speech/src"/>
     <classpathentry kind="src" path="cts/tests/tests/telephony/src"/>
     <classpathentry kind="src" path="cts/tests/tests/text/src"/>
-    <classpathentry kind="src" path="cts/tests/tests/theme/src"/>
     <classpathentry kind="src" path="cts/tests/tests/util/src"/>
     <classpathentry kind="src" path="cts/tests/tests/view/src"/>
     <classpathentry kind="src" path="cts/tests/tests/webkit/src"/>
     <classpathentry kind="src" path="cts/tests/tests/widget/src"/>
     <classpathentry kind="src" path="cts/tools/cts-api-coverage/src"/>
+    <classpathentry kind="src" path="cts/tools/cts-native-xml-generator/src"/>
     <classpathentry kind="src" path="cts/tools/cts-reference-app-lib/src"/>
     <classpathentry kind="src" path="cts/tools/dasm/src"/>
     <classpathentry kind="src" path="cts/tools/device-setup/TestDeviceSetup/src"/>
diff --git a/tests/Android.mk b/tests/Android.mk
index 641d053..cfaeb57 100644
--- a/tests/Android.mk
+++ b/tests/Android.mk
@@ -28,7 +28,9 @@
 LOCAL_JNI_SHARED_LIBRARIES := libcts_jni
 
 # Resource unit tests use a private locale and some densities
-LOCAL_AAPT_FLAGS = -c xx_YY -c cs -c 32dpi -c 240dpi -c 160dpi
+LOCAL_AAPT_FLAGS = -c xx_YY -c cs -c 320dpi -c 240dpi -c 160dpi -c 32dpi \
+        --preferred-configurations 320dpi --preferred-configurations 240dpi \
+        --preferred-configurations 160dpi --preferred-configurations 32dpi
 
 LOCAL_PACKAGE_NAME := CtsTestStubs
 
diff --git a/tests/AndroidManifest.xml b/tests/AndroidManifest.xml
index 687a7d7..22ba384 100644
--- a/tests/AndroidManifest.xml
+++ b/tests/AndroidManifest.xml
@@ -28,12 +28,14 @@
         <meta-data android:name="android.app.cts.float" android:value="100.1" />
         <meta-data android:name="android.app.cts.reference" android:resource="@xml/metadata" />
     </permission>
-
+    
     <uses-permission android:name="android.permission.GET_TASKS" />
     <uses-permission android:name="android.permission.SET_WALLPAPER" />
     <uses-permission android:name="android.permission.SET_TIME_ZONE" />
-    <uses-permission android:name="android.permission.WRITE_CONTACTS" />
+    <uses-permission android:name="android.permission.WRITE_CONTACTS" />        
+    <uses-permission android:name="android.permission.WRITE_SOCIAL_STREAM" />    
     <uses-permission android:name="android.permission.READ_CONTACTS" />
+    <uses-permission android:name="android.permission.READ_SOCIAL_STREAM" />
     <uses-permission android:name="android.permission.WRITE_CALENDAR" />
     <uses-permission android:name="android.permission.READ_CALENDAR" />
     <uses-permission android:name="android.permission.DEVICE_POWER" />
@@ -128,7 +130,8 @@
         </activity>
 
         <activity android:name="android.media.cts.MediaStubActivity"
-            android:label="MediaStubActivity">
+            android:label="MediaStubActivity"
+            android:screenOrientation="nosensor">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
@@ -168,7 +171,8 @@
         </activity>
 
         <activity android:name="android.app.cts.DialogStubActivity"
-            android:label="DialogStubActivity">
+            android:label="DialogStubActivity"
+            android:configChanges="keyboardHidden|orientation|screenSize">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
@@ -917,7 +921,7 @@
         <service android:name="android.app.cts.IntentServiceStub"/>
 
         <activity android:name="android.app.cts.LaunchpadActivity" 
-                  android:configChanges="keyboardHidden|orientation"
+                  android:configChanges="keyboardHidden|orientation|screenSize"
                   android:multiprocess="true">
         </activity>
 
@@ -966,56 +970,6 @@
             </intent-filter>
         </service>
 
-        <activity android:name="android.theme.cts.ThemeTestRunnerActivity">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN"/>
-                <category android:name="android.intent.category.DEFAULT"/>
-            </intent-filter>
-        </activity>
-        <activity android:name="android.theme.cts.ThemeTestGeneratorActivity"
-                  android:label="Theme Check">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN"/>
-                <category android:name="android.intent.category.DEFAULT"/>
-            </intent-filter>
-        </activity>
-        <activity android:name="android.theme.cts.ThemeSelectorActivity"
-                  android:theme="@android:style/Theme.Holo"
-                  android:label="Theme Check">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN"/>
-                <category android:name="android.intent.category.DEFAULT"/>
-            </intent-filter>
-        </activity>
-        <activity android:name="android.theme.cts.TestListActivity"
-                  android:label="Theme Check">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN"/>
-                <category android:name="android.intent.category.DEFAULT"/>
-            </intent-filter>
-        </activity>
-        <activity android:name="android.theme.cts.OrientationSelectorActivity"
-                  android:theme="@android:style/Theme.Holo"
-                  android:label="Theme Check">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN"/>
-                <category android:name="android.intent.category.LAUNCHER"/>
-            </intent-filter>
-        </activity>
-        <activity android:name="android.theme.cts.SnapshotActivity">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN"/>
-                <category android:name="android.intent.category.DEFAULT"/>
-            </intent-filter>
-        </activity>
-        <activity android:name="android.theme.cts.SplitSnapshotActivity"
-                  android:uiOptions="splitActionBarWhenNarrow">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN"/>
-                <category android:name="android.intent.category.DEFAULT"/>
-            </intent-filter>
-        </activity>
-
         <activity android:name="android.renderscript.cts.RenderscriptGLStubActivity"
                   android:label="RenderscriptGLStub"/>
     </application>
diff --git a/tests/accessibilityservice/src/android/accessibilityservice/IAccessibilityServiceDelegateConnection.aidl b/tests/accessibilityservice/src/android/accessibilityservice/IAccessibilityServiceDelegateConnection.aidl
index 62703dc..c1fe57b 100644
--- a/tests/accessibilityservice/src/android/accessibilityservice/IAccessibilityServiceDelegateConnection.aidl
+++ b/tests/accessibilityservice/src/android/accessibilityservice/IAccessibilityServiceDelegateConnection.aidl
@@ -16,15 +16,27 @@
 package android.accessibilityservice;
 
 import android.os.IBinder;
+import android.view.accessibility.AccessibilityEvent;
+import android.view.accessibility.AccessibilityNodeInfo;
+
+import java.util.List;
 
 /**
- * Interface for registering an accessibility service delegate.
+ * Interface for registering an accessibility service delegate
+ * and asking it to perform some querying of the window for us.
  */
-oneway interface IAccessibilityServiceDelegateConnection {
+interface IAccessibilityServiceDelegateConnection {
 
-    /**
-     * Sets the delegate interface to which the
-     * {@link DelegatingAccessibilityService} to delegate.
-     */
     void setAccessibilityServiceDelegate(in IBinder binder);
+
+    List<AccessibilityNodeInfo> findAccessibilityNodeInfosByText(in AccessibilityNodeInfo root,
+        String text);
+
+    AccessibilityNodeInfo getParent(in AccessibilityNodeInfo child);
+
+    AccessibilityNodeInfo getChild(in AccessibilityNodeInfo parent, int index);
+
+    boolean performAccessibilityAction(in AccessibilityNodeInfo target, int action);
+
+    AccessibilityNodeInfo getSource(in AccessibilityEvent event);
 }
diff --git a/tests/accessibilityservice/src/android/accessibilityservice/delegate/DelegatingAccessibilityService.java b/tests/accessibilityservice/src/android/accessibilityservice/delegate/DelegatingAccessibilityService.java
index 5680b7c..21069b8 100644
--- a/tests/accessibilityservice/src/android/accessibilityservice/delegate/DelegatingAccessibilityService.java
+++ b/tests/accessibilityservice/src/android/accessibilityservice/delegate/DelegatingAccessibilityService.java
@@ -25,6 +25,9 @@
 import android.os.RemoteException;
 import android.util.Log;
 import android.view.accessibility.AccessibilityEvent;
+import android.view.accessibility.AccessibilityNodeInfo;
+
+import java.util.List;
 
 /**
  * This class is an accessibility service mock to which the system is bound and
@@ -127,10 +130,37 @@
         private class AccessibilityServiceDelegateConnection extends
                 IAccessibilityServiceDelegateConnection.Stub {
 
+            @Override
             public void setAccessibilityServiceDelegate(IBinder binder) {
                 sServiceDelegate.setDelegateInterface(IAccessibilityServiceDelegate.Stub
                         .asInterface(binder));
             }
+
+            @Override
+            public List<AccessibilityNodeInfo> findAccessibilityNodeInfosByText(
+                    AccessibilityNodeInfo root, String text) {
+                return root.findAccessibilityNodeInfosByText(text);
+            }
+
+            @Override
+            public AccessibilityNodeInfo getChild(AccessibilityNodeInfo parent, int index) {
+                return parent.getChild(index);
+            }
+
+            @Override
+            public AccessibilityNodeInfo getParent(AccessibilityNodeInfo child) {
+                return child.getParent();
+            }
+
+            @Override
+            public AccessibilityNodeInfo getSource(AccessibilityEvent event) {
+                return event.getSource();
+            }
+
+            @Override
+            public boolean performAccessibilityAction(AccessibilityNodeInfo target, int action) {
+                return target.performAction(action);
+            }
         }
     }
 }
diff --git a/tests/appsecurity-tests/Android.mk b/tests/appsecurity-tests/Android.mk
index 4ec9922..b5ce83c 100644
--- a/tests/appsecurity-tests/Android.mk
+++ b/tests/appsecurity-tests/Android.mk
@@ -23,7 +23,7 @@
 
 LOCAL_MODULE := CtsAppSecurityTests
 
-LOCAL_JAVA_LIBRARIES := hosttestlib ddmlib-prebuilt junit
+LOCAL_JAVA_LIBRARIES := cts-tradefed tradefed-prebuilt ddmlib-prebuilt junit
 
 include $(BUILD_HOST_JAVA_LIBRARY)
 
diff --git a/tests/appsecurity-tests/src/com/android/cts/appsecurity/AppSecurityTests.java b/tests/appsecurity-tests/src/com/android/cts/appsecurity/AppSecurityTests.java
index 106f1af..7eb3a33 100644
--- a/tests/appsecurity-tests/src/com/android/cts/appsecurity/AppSecurityTests.java
+++ b/tests/appsecurity-tests/src/com/android/cts/appsecurity/AppSecurityTests.java
@@ -16,28 +16,23 @@
 
 package com.android.cts.appsecurity;
 
-import java.io.File;
-import java.io.IOException;
-import java.util.Map;
-
-import junit.framework.Test;
-
-import com.android.ddmlib.AdbCommandRejectedException;
-import com.android.ddmlib.InstallException;
+import com.android.cts.tradefed.build.CtsBuildHelper;
 import com.android.ddmlib.Log;
-import com.android.ddmlib.Log.LogLevel;
-import com.android.ddmlib.ShellCommandUnresponsiveException;
-import com.android.ddmlib.TimeoutException;
-import com.android.ddmlib.testrunner.ITestRunListener;
 import com.android.ddmlib.testrunner.RemoteAndroidTestRunner;
-import com.android.ddmlib.testrunner.TestIdentifier;
-import com.android.hosttest.DeviceTestCase;
-import com.android.hosttest.DeviceTestSuite;
+import com.android.tradefed.build.IBuildInfo;
+import com.android.tradefed.device.DeviceNotAvailableException;
+import com.android.tradefed.result.CollectingTestListener;
+import com.android.tradefed.result.TestRunResult;
+import com.android.tradefed.testtype.DeviceTestCase;
+import com.android.tradefed.testtype.IBuildReceiver;
+
+import java.io.File;
+import java.io.FileNotFoundException;
 
 /**
  * Set of tests that verify various security checks involving multiple apps are properly enforced.
  */
-public class AppSecurityTests extends DeviceTestCase {
+public class AppSecurityTests extends DeviceTestCase implements IBuildReceiver {
 
     // testSharedUidDifferentCerts constants
     private static final String SHARED_UI_APK = "CtsSharedUidInstall.apk";
@@ -79,28 +74,43 @@
 
     private static final String LOG_TAG = "AppSecurityTests";
 
+    private CtsBuildHelper mCtsBuild;
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public void setBuild(IBuildInfo buildInfo) {
+        mCtsBuild = CtsBuildHelper.createBuildHelper(buildInfo);
+    }
+
+    private File getTestAppFile(String fileName) throws FileNotFoundException {
+        return mCtsBuild.getTestApp(fileName);
+    }
+
     @Override
     protected void setUp() throws Exception {
         super.setUp();
-        // ensure apk path has been set before test is run
-        assertNotNull(getTestAppPath());
+        // ensure build has been set before test is run
+        assertNotNull(mCtsBuild);
     }
 
     /**
      * Test that an app that declares the same shared uid as an existing app, cannot be installed
      * if it is signed with a different certificate.
      */
-    public void testSharedUidDifferentCerts() throws InstallException {
+    public void testSharedUidDifferentCerts() throws Exception {
         Log.i(LOG_TAG, "installing apks with shared uid, but different certs");
         try {
             // cleanup test apps that might be installed from previous partial test run
             getDevice().uninstallPackage(SHARED_UI_PKG);
             getDevice().uninstallPackage(SHARED_UI_DIFF_CERT_PKG);
 
-            String installResult = getDevice().installPackage(getTestAppFilePath(SHARED_UI_APK),
+            String installResult = getDevice().installPackage(getTestAppFile(SHARED_UI_APK),
                     false);
-            assertNull("failed to install shared uid app", installResult);
-            installResult = getDevice().installPackage(getTestAppFilePath(SHARED_UI_DIFF_CERT_APK),
+            assertNull(String.format("failed to install shared uid app, Reason: %s", installResult),
+                    installResult);
+            installResult = getDevice().installPackage(getTestAppFile(SHARED_UI_DIFF_CERT_APK),
                     false);
             assertNotNull("shared uid app with different cert than existing app installed " +
                     "successfully", installResult);
@@ -116,16 +126,17 @@
      * Test that an app update cannot be installed over an existing app if it has a different
      * certificate.
      */
-    public void testAppUpgradeDifferentCerts() throws InstallException {
+    public void testAppUpgradeDifferentCerts() throws Exception {
         Log.i(LOG_TAG, "installing app upgrade with different certs");
         try {
             // cleanup test app that might be installed from previous partial test run
             getDevice().uninstallPackage(SIMPLE_APP_PKG);
 
-            String installResult = getDevice().installPackage(getTestAppFilePath(SIMPLE_APP_APK),
+            String installResult = getDevice().installPackage(getTestAppFile(SIMPLE_APP_APK),
                     false);
-            assertNull("failed to install simple app", installResult);
-            installResult = getDevice().installPackage(getTestAppFilePath(SIMPLE_APP_DIFF_CERT_APK),
+            assertNull(String.format("failed to install simple app. Reason: %s", installResult),
+                    installResult);
+            installResult = getDevice().installPackage(getTestAppFile(SIMPLE_APP_DIFF_CERT_APK),
                     true /* reinstall */);
             assertNotNull("app upgrade with different cert than existing app installed " +
                     "successfully", installResult);
@@ -139,24 +150,25 @@
     /**
      * Test that an app cannot access another app's private data.
      */
-    public void testAppFailAccessPrivateData() throws InstallException, TimeoutException,
-            AdbCommandRejectedException, ShellCommandUnresponsiveException, IOException {
+    public void testAppFailAccessPrivateData() throws Exception {
         Log.i(LOG_TAG, "installing app that attempts to access another app's private data");
         try {
             // cleanup test app that might be installed from previous partial test run
             getDevice().uninstallPackage(APP_WITH_DATA_PKG);
             getDevice().uninstallPackage(APP_ACCESS_DATA_PKG);
 
-            String installResult = getDevice().installPackage(getTestAppFilePath(APP_WITH_DATA_APK),
+            String installResult = getDevice().installPackage(getTestAppFile(APP_WITH_DATA_APK),
                     false);
-            assertNull("failed to install app with data", installResult);
+            assertNull(String.format("failed to install app with data. Reason: %s", installResult),
+                    installResult);
             // run appwithdata's tests to create private data
             assertTrue("failed to create app's private data", runDeviceTests(APP_WITH_DATA_PKG,
                     APP_WITH_DATA_CLASS, APP_WITH_DATA_CREATE_METHOD));
 
-            installResult = getDevice().installPackage(getTestAppFilePath(APP_ACCESS_DATA_APK),
+            installResult = getDevice().installPackage(getTestAppFile(APP_ACCESS_DATA_APK),
                     false);
-            assertNull("failed to install app access data", installResult);
+            assertNull(String.format("failed to install app access data. Reason: %s",
+                    installResult), installResult);
             // run appaccessdata's tests which attempt to access appwithdata's private data
             assertTrue("could access app's private data", runDeviceTests(APP_ACCESS_DATA_PKG));
         }
@@ -175,18 +187,20 @@
             // cleanup test app that might be installed from previous partial test run
             getDevice().uninstallPackage(APP_WITH_DATA_PKG);
 
-            String installResult = getDevice().installPackage(getTestAppFilePath(APP_WITH_DATA_APK),
+            String installResult = getDevice().installPackage(getTestAppFile(APP_WITH_DATA_APK),
                     false);
-            assertNull("failed to install app with data", installResult);
+            assertNull(String.format("failed to install app with data. Reason: %s", installResult),
+                    installResult);
             // run appwithdata's tests to create private data
             assertTrue("failed to create app's private data", runDeviceTests(APP_WITH_DATA_PKG,
                     APP_WITH_DATA_CLASS, APP_WITH_DATA_CREATE_METHOD));
 
             getDevice().uninstallPackage(APP_WITH_DATA_PKG);
 
-            installResult = getDevice().installPackage(getTestAppFilePath(APP_WITH_DATA_APK),
+            installResult = getDevice().installPackage(getTestAppFile(APP_WITH_DATA_APK),
                     false);
-            assertNull("failed to install app with data second time", installResult);
+            assertNull(String.format("failed to install app with data second time. Reason: %s",
+                    installResult), installResult);
             // run appwithdata's 'check if file exists' test
             assertTrue("app's private data still exists after install", runDeviceTests(
                     APP_WITH_DATA_PKG, APP_WITH_DATA_CLASS, APP_WITH_DATA_CHECK_NOEXIST_METHOD));
@@ -200,8 +214,7 @@
     /**
      * Test that an app cannot instrument another app that is signed with different certificate.
      */
-    public void testInstrumentationDiffCert() throws InstallException, TimeoutException,
-            AdbCommandRejectedException, ShellCommandUnresponsiveException, IOException {
+    public void testInstrumentationDiffCert() throws Exception {
         Log.i(LOG_TAG, "installing app that attempts to instrument another app");
         try {
             // cleanup test app that might be installed from previous partial test run
@@ -209,16 +222,19 @@
             getDevice().uninstallPackage(INSTRUMENT_DIFF_CERT_PKG);
 
             String installResult = getDevice().installPackage(
-                    getTestAppFilePath(TARGET_INSTRUMENT_APK), false);
-            assertNull("failed to install target instrumentation app", installResult);
+                    getTestAppFile(TARGET_INSTRUMENT_APK), false);
+            assertNull(String.format("failed to install target instrumentation app. Reason: %s",
+                    installResult), installResult);
 
             // the app will install, but will get error at runtime when starting instrumentation
-            installResult = getDevice().installPackage(getTestAppFilePath(INSTRUMENT_DIFF_CERT_APK),
+            installResult = getDevice().installPackage(getTestAppFile(INSTRUMENT_DIFF_CERT_APK),
                     false);
-            assertNull("failed to install instrumentation app with diff cert", installResult);
+            assertNull(String.format(
+                    "failed to install instrumentation app with diff cert. Reason: %s",
+                    installResult), installResult);
             // run INSTRUMENT_DIFF_CERT_PKG tests
             // this test will attempt to call startInstrumentation directly and verify
-            // SecurityException is thrown 
+            // SecurityException is thrown
             assertTrue("running instrumentation with diff cert unexpectedly succeeded",
                     runDeviceTests(INSTRUMENT_DIFF_CERT_PKG));
         }
@@ -232,8 +248,7 @@
      * Test that an app cannot use a signature-enforced permission if it is signed with a different
      * certificate than the app that declared the permission.
      */
-    public void testPermissionDiffCert() throws InstallException, TimeoutException,
-            AdbCommandRejectedException, ShellCommandUnresponsiveException, IOException {
+    public void testPermissionDiffCert() throws Exception {
         Log.i(LOG_TAG, "installing app that attempts to use permission of another app");
         try {
             // cleanup test app that might be installed from previous partial test run
@@ -241,13 +256,15 @@
             getDevice().uninstallPackage(PERMISSION_DIFF_CERT_PKG);
 
             String installResult = getDevice().installPackage(
-                    getTestAppFilePath(DECLARE_PERMISSION_APK), false);
-            assertNull("failed to install declare permission app", installResult);
+                    getTestAppFile(DECLARE_PERMISSION_APK), false);
+            assertNull(String.format("failed to install declare permission app. Reason: %s",
+                    installResult), installResult);
 
             // the app will install, but will get error at runtime
-            installResult = getDevice().installPackage(getTestAppFilePath(PERMISSION_DIFF_CERT_APK),
+            installResult = getDevice().installPackage(getTestAppFile(PERMISSION_DIFF_CERT_APK),
                     false);
-            assertNull("failed to install permission app with diff cert", installResult);
+            assertNull(String.format("failed to install permission app with diff cert. Reason: %s",
+                    installResult), installResult);
             // run PERMISSION_DIFF_CERT_PKG tests which try to access the permission
             assertTrue("unexpected result when running permission tests",
                     runDeviceTests(PERMISSION_DIFF_CERT_PKG));
@@ -259,12 +276,14 @@
     }
 
     /**
-     * Get the absolute file system location of test app with given filename
-     * @param fileName the file name of the test app apk
-     * @return {@link String} of absolute file path
+     * Helper method that will the specified packages tests on device.
+     *
+     * @param pkgName Android application package for tests
+     * @return <code>true</code> if all tests passed.
+     * @throws DeviceNotAvailableException if connection to device was lost.
      */
-    private String getTestAppFilePath(String fileName) {
-        return String.format("%s%s%s", getTestAppPath(), File.separator, fileName);
+    private boolean runDeviceTests(String pkgName) throws DeviceNotAvailableException {
+        return runDeviceTests(pkgName, null, null);
     }
 
     /**
@@ -272,106 +291,32 @@
      *
      * @param pkgName Android application package for tests
      * @return <code>true</code> if all tests passed.
-     * @throws TimeoutException in case of a timeout on the connection.
-     * @throws AdbCommandRejectedException if adb rejects the command
-     * @throws ShellCommandUnresponsiveException if the device did not output any test result for
-     * a period longer than the max time to output.
-     * @throws IOException if connection to device was lost.
-     */
-    private boolean runDeviceTests(String pkgName) throws AdbCommandRejectedException,
-            ShellCommandUnresponsiveException, IOException, TimeoutException {
-    	return runDeviceTests(pkgName, null, null);
-    }
-
-    /**
-     * Helper method that will the specified packages tests on device.
-     *
-     * @param pkgName Android application package for tests
-     * @return <code>true</code> if all tests passed.
+     * @throws DeviceNotAvailableException if connection to device was lost.
      */
     private boolean runDeviceTests(String pkgName, String testClassName, String testMethodName)
-            throws AdbCommandRejectedException, IOException, ShellCommandUnresponsiveException,
-                   TimeoutException {
-        CollectingTestRunListener listener = doRunTests(pkgName, testClassName, testMethodName);
-        return listener.didAllTestsPass();
+            throws DeviceNotAvailableException {
+        TestRunResult runResult = doRunTests(pkgName, testClassName, testMethodName);
+        return !runResult.hasFailedTests();
     }
 
     /**
      * Helper method to run tests and return the listener that collected the results.
+     *
      * @param pkgName Android application package for tests
-     * @return the {@link CollectingTestRunListener}
-     * @throws TimeoutException in case of a timeout on the connection.
-     * @throws AdbCommandRejectedException if adb rejects the command
-     * @throws ShellCommandUnresponsiveException if the device did not output any test result for
-     * a period longer than the max time to output.
-     * @throws IOException if connection to device was lost.
+     * @return the {@link TestRunResult}
+     * @throws DeviceNotAvailableException if connection to device was lost.
      */
-    private CollectingTestRunListener doRunTests(String pkgName, String testClassName,
-            String testMethodName) throws AdbCommandRejectedException, IOException,
-                    ShellCommandUnresponsiveException, TimeoutException {
-        RemoteAndroidTestRunner testRunner = new RemoteAndroidTestRunner(pkgName, getDevice());
+    private TestRunResult doRunTests(String pkgName, String testClassName,
+            String testMethodName) throws DeviceNotAvailableException {
+
+        RemoteAndroidTestRunner testRunner = new RemoteAndroidTestRunner(pkgName,
+                getDevice().getIDevice());
         if (testClassName != null && testMethodName != null) {
             testRunner.setMethodName(testClassName, testMethodName);
         }
-        CollectingTestRunListener listener = new CollectingTestRunListener();
-        testRunner.run(listener);
-        return listener;
+        CollectingTestListener listener = new CollectingTestListener();
+        getDevice().runInstrumentationTests(testRunner, listener);
+        return listener.getCurrentRunResults();
     }
 
-    private static class CollectingTestRunListener implements ITestRunListener {
-
-        private boolean mAllTestsPassed = true;
-        private String mTestRunErrorMessage = null;
-
-        public void testEnded(TestIdentifier test, Map<String, String> metrics) {
-            // ignore
-        }
-
-        public void testFailed(TestFailure status, TestIdentifier test,
-                String trace) {
-            Log.logAndDisplay(LogLevel.WARN, LOG_TAG, String.format("%s#%s failed: %s",
-                    test.getClassName(),
-                    test.getTestName(), trace));
-            mAllTestsPassed = false;
-        }
-
-        public void testRunEnded(long elapsedTime, Map<String, String> resultBundle) {
-            // ignore
-        }
-
-        public void testRunFailed(String errorMessage) {
-            Log.logAndDisplay(LogLevel.WARN, LOG_TAG, String.format("test run failed: %s",
-                    errorMessage));
-            mAllTestsPassed = false;
-            mTestRunErrorMessage = errorMessage;
-        }
-
-        public void testRunStarted(String runName, int testCount) {
-            // ignore
-        }
-
-        public void testRunStopped(long elapsedTime) {
-            // ignore
-        }
-
-        public void testStarted(TestIdentifier test) {
-            // ignore
-        }
-
-        boolean didAllTestsPass() {
-            return mAllTestsPassed;
-        }
-
-        /**
-         * Get the test run failure error message.
-         * @return the test run failure error message or <code>null</code> if test run completed.
-         */
-        String getTestRunErrorMessage() {
-            return mTestRunErrorMessage;
-        }
-    }
-
-    public static Test suite() {
-        return new DeviceTestSuite(AppSecurityTests.class);
-    }
 }
diff --git a/tests/expectations/knownfailures.txt b/tests/expectations/knownfailures.txt
index b8dfec9..b8621a7 100644
--- a/tests/expectations/knownfailures.txt
+++ b/tests/expectations/knownfailures.txt
@@ -1,39 +1,5 @@
 [
 {
-  name: "android.graphics.drawable.cts.AnimationDrawableTest#testStart",
-  bug: 5513533
-},
-{
-  name: "android.hardware.cts.CameraGLTest#testCameraToSurfaceTextureMetadata",
-  bug: 5544055
-},
-{
-  name: "android.hardware.cts.CameraGLTest#testSetPreviewTextureBothCallbacks",
-  bug: 5534460
-},
-{
-  name: "android.hardware.cts.CameraGLTest#testSetPreviewTexturePreviewCallback",
-  bug: 5534170
-},
-{
-  name: "android.hardware.cts.CameraTest#testVideoSnapshot",
-  bug: 5492725
-},
-{
-  names: [
-    "android.media.cts.VisualizerTest#test2_0PollingCapture",
-    "android.media.cts.VisualizerTest#test2_1ListenerCapture"
-  ],
-  bug: 5519606
-},
-{
-  names: [
-    "android.net.cts.ListeningPortsTest#testNoListeningTcp6Ports",
-    "android.net.cts.ListeningPortsTest#testNoListeningUdp6Ports"
-  ],
-  bug: 5477538
-},
-{
   name: "android.telephony.cts.PhoneNumberFormattingTextWatcherTest#testPhoneNumberFormattingTextWatcher",
   bug: 3198578
 },
@@ -42,26 +8,14 @@
   bug: 4371654
 },
 {
-  names: [
-    "android.theme.cts.ActivitySnapshotTests",
-    "android.theme.cts.SplitActivitySnapshotTests",
-    "android.theme.cts.ThemeTest"
-  ],
-  bug: 5404694
+  name: "android.openglperf.cts.GlVboPerfTest#testVboWithVaryingIndexBufferNumbers",
+  bug: 5898262
 },
 {
   name: "android.webkit.cts.WebViewTest#testRequestFocusNodeHref",
   bug: 3241968
 },
 {
-  name: "android.webkit.cts.WebViewTest#testGetHitTestResult",
-  bug: 5361502
-},
-{
-  name: "android.widget.cts.ViewFlipperTest#testViewFlipper",
-  bug: 5051682
-},
-{
   names: [
     "libcore.java.net.URLConnectionTest#testServerClosesSocket",
     "libcore.java.net.URLConnectionTest#testServerShutdownInput",
@@ -70,33 +24,15 @@
   bug: 5534202
 },
 {
-  name: "dalvik.system.DexClassLoaderTest#test_twoJar_callInstanceMethod",
-  bug: 5534165
-},
-{
   names: [
     "libcore.java.net.ConcurrentCloseTest#test_read",
-    "libcore.java.util.logging.OldFormatterTest",
-    "libcore.java.util.prefs.OldPreferencesTest#testAddNodeChangeListener",
     "libcore.net.http.HttpResponseCacheTest#testClientPrematureDisconnectWithChunkedEncoding"
   ],
   bug: 5498103
 },
 {
-  description: "Test exceeds Tradefed's 10 minute timeout",
-  name: "libcore.java.security.KeyPairGeneratorTest",
+  name: "libcore.java.security.KeyPairGeneratorTest#test_getInstance",
   bug: 5513723
-},
-{
-  description: "Reevaluate these tests for the next release",
-  names: [
-    "android.content.cts.ContextWrapperTest#testAccessTheme",
-    "android.provider.cts.Contacts_PeopleTest#testAddToGroup",
-    "android.view.cts.GestureDetectorTest#testOnTouchEvent",
-    "android.view.cts.ViewTest#testWindowVisibilityChanged",
-    "android.widget.cts.AbsListViewTest#testGetContextMenuInfo",
-    "android.webkit.cts.WebChromeClientTest#testOnReceivedIcon",
-    "android.webkit.cts.WebViewTest#testRequestImageRef"
-  ]
 }
 ]
+
diff --git a/tests/res/drawable-hdpi/holo_land_actionbar.png b/tests/res/drawable-hdpi/holo_land_actionbar.png
deleted file mode 100644
index 617f9bc..0000000
--- a/tests/res/drawable-hdpi/holo_land_actionbar.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_land_actionbar_action_items.png b/tests/res/drawable-hdpi/holo_land_actionbar_action_items.png
deleted file mode 100644
index 3f7ee8c..0000000
--- a/tests/res/drawable-hdpi/holo_land_actionbar_action_items.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_land_actionbar_action_items_split.png b/tests/res/drawable-hdpi/holo_land_actionbar_action_items_split.png
deleted file mode 100644
index 3f7ee8c..0000000
--- a/tests/res/drawable-hdpi/holo_land_actionbar_action_items_split.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_land_actionbar_action_view.png b/tests/res/drawable-hdpi/holo_land_actionbar_action_view.png
deleted file mode 100644
index 1141977..0000000
--- a/tests/res/drawable-hdpi/holo_land_actionbar_action_view.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_land_actionbar_action_view_split.png b/tests/res/drawable-hdpi/holo_land_actionbar_action_view_split.png
deleted file mode 100644
index 1141977..0000000
--- a/tests/res/drawable-hdpi/holo_land_actionbar_action_view_split.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_land_actionbar_home_as_up.png b/tests/res/drawable-hdpi/holo_land_actionbar_home_as_up.png
deleted file mode 100644
index 38369f8..0000000
--- a/tests/res/drawable-hdpi/holo_land_actionbar_home_as_up.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_land_actionbar_home_as_up_split.png b/tests/res/drawable-hdpi/holo_land_actionbar_home_as_up_split.png
deleted file mode 100644
index 38369f8..0000000
--- a/tests/res/drawable-hdpi/holo_land_actionbar_home_as_up_split.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_land_actionbar_list.png b/tests/res/drawable-hdpi/holo_land_actionbar_list.png
deleted file mode 100644
index 3961b00..0000000
--- a/tests/res/drawable-hdpi/holo_land_actionbar_list.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_land_actionbar_list_split.png b/tests/res/drawable-hdpi/holo_land_actionbar_list_split.png
deleted file mode 100644
index 3961b00..0000000
--- a/tests/res/drawable-hdpi/holo_land_actionbar_list_split.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_land_actionbar_no_icon.png b/tests/res/drawable-hdpi/holo_land_actionbar_no_icon.png
deleted file mode 100644
index 8cd6f73..0000000
--- a/tests/res/drawable-hdpi/holo_land_actionbar_no_icon.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_land_actionbar_no_icon_split.png b/tests/res/drawable-hdpi/holo_land_actionbar_no_icon_split.png
deleted file mode 100644
index 8cd6f73..0000000
--- a/tests/res/drawable-hdpi/holo_land_actionbar_no_icon_split.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_land_actionbar_no_title.png b/tests/res/drawable-hdpi/holo_land_actionbar_no_title.png
deleted file mode 100644
index 3d0e0ea..0000000
--- a/tests/res/drawable-hdpi/holo_land_actionbar_no_title.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_land_actionbar_no_title_split.png b/tests/res/drawable-hdpi/holo_land_actionbar_no_title_split.png
deleted file mode 100644
index 3d0e0ea..0000000
--- a/tests/res/drawable-hdpi/holo_land_actionbar_no_title_split.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_land_actionbar_split.png b/tests/res/drawable-hdpi/holo_land_actionbar_split.png
deleted file mode 100644
index 617f9bc..0000000
--- a/tests/res/drawable-hdpi/holo_land_actionbar_split.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_land_actionbar_tabs.png b/tests/res/drawable-hdpi/holo_land_actionbar_tabs.png
deleted file mode 100644
index 641bd01..0000000
--- a/tests/res/drawable-hdpi/holo_land_actionbar_tabs.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_land_actionbar_tabs_split.png b/tests/res/drawable-hdpi/holo_land_actionbar_tabs_split.png
deleted file mode 100644
index 641bd01..0000000
--- a/tests/res/drawable-hdpi/holo_land_actionbar_tabs_split.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_land_alertdialog_list.png b/tests/res/drawable-hdpi/holo_land_alertdialog_list.png
deleted file mode 100644
index d9872f7..0000000
--- a/tests/res/drawable-hdpi/holo_land_alertdialog_list.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_land_alertdialog_multichoice.png b/tests/res/drawable-hdpi/holo_land_alertdialog_multichoice.png
deleted file mode 100644
index 4623c0a..0000000
--- a/tests/res/drawable-hdpi/holo_land_alertdialog_multichoice.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_land_alertdialog_onebutton.png b/tests/res/drawable-hdpi/holo_land_alertdialog_onebutton.png
deleted file mode 100644
index 6e52a98..0000000
--- a/tests/res/drawable-hdpi/holo_land_alertdialog_onebutton.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_land_alertdialog_singlechoice.png b/tests/res/drawable-hdpi/holo_land_alertdialog_singlechoice.png
deleted file mode 100644
index a610945..0000000
--- a/tests/res/drawable-hdpi/holo_land_alertdialog_singlechoice.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_land_alertdialog_threebuttons.png b/tests/res/drawable-hdpi/holo_land_alertdialog_threebuttons.png
deleted file mode 100644
index 2d4d34c..0000000
--- a/tests/res/drawable-hdpi/holo_land_alertdialog_threebuttons.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_land_alertdialog_twobuttons.png b/tests/res/drawable-hdpi/holo_land_alertdialog_twobuttons.png
deleted file mode 100644
index 1874e22..0000000
--- a/tests/res/drawable-hdpi/holo_land_alertdialog_twobuttons.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_land_blue_bright.png b/tests/res/drawable-hdpi/holo_land_blue_bright.png
deleted file mode 100644
index 2b362a9..0000000
--- a/tests/res/drawable-hdpi/holo_land_blue_bright.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_land_blue_dark.png b/tests/res/drawable-hdpi/holo_land_blue_dark.png
deleted file mode 100644
index 3c8e3b5..0000000
--- a/tests/res/drawable-hdpi/holo_land_blue_dark.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_land_blue_light.png b/tests/res/drawable-hdpi/holo_land_blue_light.png
deleted file mode 100644
index c7e6589..0000000
--- a/tests/res/drawable-hdpi/holo_land_blue_light.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_land_button.png b/tests/res/drawable-hdpi/holo_land_button.png
deleted file mode 100644
index 929630d..0000000
--- a/tests/res/drawable-hdpi/holo_land_button.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_land_button_pressed.png b/tests/res/drawable-hdpi/holo_land_button_pressed.png
deleted file mode 100644
index 69793ba..0000000
--- a/tests/res/drawable-hdpi/holo_land_button_pressed.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_land_calendarview.png b/tests/res/drawable-hdpi/holo_land_calendarview.png
deleted file mode 100644
index 689cd28..0000000
--- a/tests/res/drawable-hdpi/holo_land_calendarview.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_land_checkbox.png b/tests/res/drawable-hdpi/holo_land_checkbox.png
deleted file mode 100644
index 12b94f1..0000000
--- a/tests/res/drawable-hdpi/holo_land_checkbox.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_land_checkbox_checked.png b/tests/res/drawable-hdpi/holo_land_checkbox_checked.png
deleted file mode 100644
index bdb86fd..0000000
--- a/tests/res/drawable-hdpi/holo_land_checkbox_checked.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_land_edittext.png b/tests/res/drawable-hdpi/holo_land_edittext.png
deleted file mode 100644
index 9c72d9e..0000000
--- a/tests/res/drawable-hdpi/holo_land_edittext.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_land_green_dark.png b/tests/res/drawable-hdpi/holo_land_green_dark.png
deleted file mode 100644
index ca42e5d..0000000
--- a/tests/res/drawable-hdpi/holo_land_green_dark.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_land_green_light.png b/tests/res/drawable-hdpi/holo_land_green_light.png
deleted file mode 100644
index 5212b70..0000000
--- a/tests/res/drawable-hdpi/holo_land_green_light.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_land_orange_dark.png b/tests/res/drawable-hdpi/holo_land_orange_dark.png
deleted file mode 100644
index 0f03396..0000000
--- a/tests/res/drawable-hdpi/holo_land_orange_dark.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_land_orange_light.png b/tests/res/drawable-hdpi/holo_land_orange_light.png
deleted file mode 100644
index 91c2153..0000000
--- a/tests/res/drawable-hdpi/holo_land_orange_light.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_land_progressbar.png b/tests/res/drawable-hdpi/holo_land_progressbar.png
deleted file mode 100644
index f5d1226..0000000
--- a/tests/res/drawable-hdpi/holo_land_progressbar.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_land_progressbar_horizontal0.png b/tests/res/drawable-hdpi/holo_land_progressbar_horizontal0.png
deleted file mode 100644
index 043a6ce..0000000
--- a/tests/res/drawable-hdpi/holo_land_progressbar_horizontal0.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_land_progressbar_horizontal100.png b/tests/res/drawable-hdpi/holo_land_progressbar_horizontal100.png
deleted file mode 100644
index b733fdb..0000000
--- a/tests/res/drawable-hdpi/holo_land_progressbar_horizontal100.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_land_progressbar_horizontal50.png b/tests/res/drawable-hdpi/holo_land_progressbar_horizontal50.png
deleted file mode 100644
index 8caa7c2..0000000
--- a/tests/res/drawable-hdpi/holo_land_progressbar_horizontal50.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_land_progressbar_large.png b/tests/res/drawable-hdpi/holo_land_progressbar_large.png
deleted file mode 100644
index 82bfaab..0000000
--- a/tests/res/drawable-hdpi/holo_land_progressbar_large.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_land_progressbar_small.png b/tests/res/drawable-hdpi/holo_land_progressbar_small.png
deleted file mode 100644
index d2a3672..0000000
--- a/tests/res/drawable-hdpi/holo_land_progressbar_small.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_land_progressdialog_horizontal.png b/tests/res/drawable-hdpi/holo_land_progressdialog_horizontal.png
deleted file mode 100644
index 9c6e7ca..0000000
--- a/tests/res/drawable-hdpi/holo_land_progressdialog_horizontal.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_land_progressdialog_spinner.png b/tests/res/drawable-hdpi/holo_land_progressdialog_spinner.png
deleted file mode 100644
index d0d842f..0000000
--- a/tests/res/drawable-hdpi/holo_land_progressdialog_spinner.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_land_purple.png b/tests/res/drawable-hdpi/holo_land_purple.png
deleted file mode 100644
index 6f0b611..0000000
--- a/tests/res/drawable-hdpi/holo_land_purple.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_land_radiobutton.png b/tests/res/drawable-hdpi/holo_land_radiobutton.png
deleted file mode 100644
index 277a74c..0000000
--- a/tests/res/drawable-hdpi/holo_land_radiobutton.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_land_radiobutton_checked.png b/tests/res/drawable-hdpi/holo_land_radiobutton_checked.png
deleted file mode 100644
index 4b27a6b..0000000
--- a/tests/res/drawable-hdpi/holo_land_radiobutton_checked.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_land_radiogroup_horizontal.png b/tests/res/drawable-hdpi/holo_land_radiogroup_horizontal.png
deleted file mode 100644
index 82b726e..0000000
--- a/tests/res/drawable-hdpi/holo_land_radiogroup_horizontal.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_land_radiogroup_vertical.png b/tests/res/drawable-hdpi/holo_land_radiogroup_vertical.png
deleted file mode 100644
index 6bb138c..0000000
--- a/tests/res/drawable-hdpi/holo_land_radiogroup_vertical.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_land_red_dark.png b/tests/res/drawable-hdpi/holo_land_red_dark.png
deleted file mode 100644
index c5925a5..0000000
--- a/tests/res/drawable-hdpi/holo_land_red_dark.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_land_red_light.png b/tests/res/drawable-hdpi/holo_land_red_light.png
deleted file mode 100644
index 4552be9..0000000
--- a/tests/res/drawable-hdpi/holo_land_red_light.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_land_searchview.png b/tests/res/drawable-hdpi/holo_land_searchview.png
deleted file mode 100644
index 504ff3a..0000000
--- a/tests/res/drawable-hdpi/holo_land_searchview.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_land_searchview_query.png b/tests/res/drawable-hdpi/holo_land_searchview_query.png
deleted file mode 100644
index 79c3ba8..0000000
--- a/tests/res/drawable-hdpi/holo_land_searchview_query.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_land_searchview_queryhint.png b/tests/res/drawable-hdpi/holo_land_searchview_queryhint.png
deleted file mode 100644
index 2650b44..0000000
--- a/tests/res/drawable-hdpi/holo_land_searchview_queryhint.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_land_seekbar_0.png b/tests/res/drawable-hdpi/holo_land_seekbar_0.png
deleted file mode 100644
index 94a55b8..0000000
--- a/tests/res/drawable-hdpi/holo_land_seekbar_0.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_land_seekbar_100.png b/tests/res/drawable-hdpi/holo_land_seekbar_100.png
deleted file mode 100644
index 3564320..0000000
--- a/tests/res/drawable-hdpi/holo_land_seekbar_100.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_land_seekbar_50.png b/tests/res/drawable-hdpi/holo_land_seekbar_50.png
deleted file mode 100644
index dca7f37..0000000
--- a/tests/res/drawable-hdpi/holo_land_seekbar_50.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_land_spinner.png b/tests/res/drawable-hdpi/holo_land_spinner.png
deleted file mode 100644
index 34c323c..0000000
--- a/tests/res/drawable-hdpi/holo_land_spinner.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_land_tabhost.png b/tests/res/drawable-hdpi/holo_land_tabhost.png
deleted file mode 100644
index a7140a5..0000000
--- a/tests/res/drawable-hdpi/holo_land_tabhost.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_land_textview.png b/tests/res/drawable-hdpi/holo_land_textview.png
deleted file mode 100644
index 8d26809..0000000
--- a/tests/res/drawable-hdpi/holo_land_textview.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_land_toggle_button.png b/tests/res/drawable-hdpi/holo_land_toggle_button.png
deleted file mode 100644
index 3f36871..0000000
--- a/tests/res/drawable-hdpi/holo_land_toggle_button.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_land_toggle_button_checked.png b/tests/res/drawable-hdpi/holo_land_toggle_button_checked.png
deleted file mode 100644
index f55486a..0000000
--- a/tests/res/drawable-hdpi/holo_land_toggle_button_checked.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_light_land_actionbar.png b/tests/res/drawable-hdpi/holo_light_land_actionbar.png
deleted file mode 100644
index aea3de7..0000000
--- a/tests/res/drawable-hdpi/holo_light_land_actionbar.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_light_land_actionbar_action_items.png b/tests/res/drawable-hdpi/holo_light_land_actionbar_action_items.png
deleted file mode 100644
index eb9173e..0000000
--- a/tests/res/drawable-hdpi/holo_light_land_actionbar_action_items.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_light_land_actionbar_action_items_split.png b/tests/res/drawable-hdpi/holo_light_land_actionbar_action_items_split.png
deleted file mode 100644
index eb9173e..0000000
--- a/tests/res/drawable-hdpi/holo_light_land_actionbar_action_items_split.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_light_land_actionbar_action_view.png b/tests/res/drawable-hdpi/holo_light_land_actionbar_action_view.png
deleted file mode 100644
index b34252d..0000000
--- a/tests/res/drawable-hdpi/holo_light_land_actionbar_action_view.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_light_land_actionbar_action_view_split.png b/tests/res/drawable-hdpi/holo_light_land_actionbar_action_view_split.png
deleted file mode 100644
index b34252d..0000000
--- a/tests/res/drawable-hdpi/holo_light_land_actionbar_action_view_split.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_light_land_actionbar_home_as_up.png b/tests/res/drawable-hdpi/holo_light_land_actionbar_home_as_up.png
deleted file mode 100644
index a61e861..0000000
--- a/tests/res/drawable-hdpi/holo_light_land_actionbar_home_as_up.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_light_land_actionbar_home_as_up_split.png b/tests/res/drawable-hdpi/holo_light_land_actionbar_home_as_up_split.png
deleted file mode 100644
index a61e861..0000000
--- a/tests/res/drawable-hdpi/holo_light_land_actionbar_home_as_up_split.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_light_land_actionbar_list.png b/tests/res/drawable-hdpi/holo_light_land_actionbar_list.png
deleted file mode 100644
index ab7e774..0000000
--- a/tests/res/drawable-hdpi/holo_light_land_actionbar_list.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_light_land_actionbar_list_split.png b/tests/res/drawable-hdpi/holo_light_land_actionbar_list_split.png
deleted file mode 100644
index ab7e774..0000000
--- a/tests/res/drawable-hdpi/holo_light_land_actionbar_list_split.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_light_land_actionbar_no_icon.png b/tests/res/drawable-hdpi/holo_light_land_actionbar_no_icon.png
deleted file mode 100644
index ef4ab6b..0000000
--- a/tests/res/drawable-hdpi/holo_light_land_actionbar_no_icon.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_light_land_actionbar_no_icon_split.png b/tests/res/drawable-hdpi/holo_light_land_actionbar_no_icon_split.png
deleted file mode 100644
index ef4ab6b..0000000
--- a/tests/res/drawable-hdpi/holo_light_land_actionbar_no_icon_split.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_light_land_actionbar_no_title.png b/tests/res/drawable-hdpi/holo_light_land_actionbar_no_title.png
deleted file mode 100644
index 42c8f04..0000000
--- a/tests/res/drawable-hdpi/holo_light_land_actionbar_no_title.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_light_land_actionbar_no_title_split.png b/tests/res/drawable-hdpi/holo_light_land_actionbar_no_title_split.png
deleted file mode 100644
index 42c8f04..0000000
--- a/tests/res/drawable-hdpi/holo_light_land_actionbar_no_title_split.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_light_land_actionbar_split.png b/tests/res/drawable-hdpi/holo_light_land_actionbar_split.png
deleted file mode 100644
index aea3de7..0000000
--- a/tests/res/drawable-hdpi/holo_light_land_actionbar_split.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_light_land_actionbar_tabs.png b/tests/res/drawable-hdpi/holo_light_land_actionbar_tabs.png
deleted file mode 100644
index c0c49b4..0000000
--- a/tests/res/drawable-hdpi/holo_light_land_actionbar_tabs.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_light_land_actionbar_tabs_split.png b/tests/res/drawable-hdpi/holo_light_land_actionbar_tabs_split.png
deleted file mode 100644
index c0c49b4..0000000
--- a/tests/res/drawable-hdpi/holo_light_land_actionbar_tabs_split.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_light_land_alertdialog_list.png b/tests/res/drawable-hdpi/holo_light_land_alertdialog_list.png
deleted file mode 100644
index 2929cb3..0000000
--- a/tests/res/drawable-hdpi/holo_light_land_alertdialog_list.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_light_land_alertdialog_multichoice.png b/tests/res/drawable-hdpi/holo_light_land_alertdialog_multichoice.png
deleted file mode 100644
index 494cb36..0000000
--- a/tests/res/drawable-hdpi/holo_light_land_alertdialog_multichoice.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_light_land_alertdialog_onebutton.png b/tests/res/drawable-hdpi/holo_light_land_alertdialog_onebutton.png
deleted file mode 100644
index 02504c8..0000000
--- a/tests/res/drawable-hdpi/holo_light_land_alertdialog_onebutton.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_light_land_alertdialog_singlechoice.png b/tests/res/drawable-hdpi/holo_light_land_alertdialog_singlechoice.png
deleted file mode 100644
index 793e907..0000000
--- a/tests/res/drawable-hdpi/holo_light_land_alertdialog_singlechoice.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_light_land_alertdialog_threebuttons.png b/tests/res/drawable-hdpi/holo_light_land_alertdialog_threebuttons.png
deleted file mode 100644
index 954611b..0000000
--- a/tests/res/drawable-hdpi/holo_light_land_alertdialog_threebuttons.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_light_land_alertdialog_twobuttons.png b/tests/res/drawable-hdpi/holo_light_land_alertdialog_twobuttons.png
deleted file mode 100644
index 26034a2..0000000
--- a/tests/res/drawable-hdpi/holo_light_land_alertdialog_twobuttons.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_light_land_blue_bright.png b/tests/res/drawable-hdpi/holo_light_land_blue_bright.png
deleted file mode 100644
index 2b362a9..0000000
--- a/tests/res/drawable-hdpi/holo_light_land_blue_bright.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_light_land_blue_dark.png b/tests/res/drawable-hdpi/holo_light_land_blue_dark.png
deleted file mode 100644
index 3c8e3b5..0000000
--- a/tests/res/drawable-hdpi/holo_light_land_blue_dark.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_light_land_blue_light.png b/tests/res/drawable-hdpi/holo_light_land_blue_light.png
deleted file mode 100644
index c7e6589..0000000
--- a/tests/res/drawable-hdpi/holo_light_land_blue_light.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_light_land_button.png b/tests/res/drawable-hdpi/holo_light_land_button.png
deleted file mode 100644
index b65c7b5..0000000
--- a/tests/res/drawable-hdpi/holo_light_land_button.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_light_land_button_pressed.png b/tests/res/drawable-hdpi/holo_light_land_button_pressed.png
deleted file mode 100644
index e1c3088..0000000
--- a/tests/res/drawable-hdpi/holo_light_land_button_pressed.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_light_land_calendarview.png b/tests/res/drawable-hdpi/holo_light_land_calendarview.png
deleted file mode 100644
index a1a423f..0000000
--- a/tests/res/drawable-hdpi/holo_light_land_calendarview.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_light_land_checkbox.png b/tests/res/drawable-hdpi/holo_light_land_checkbox.png
deleted file mode 100644
index 403f003..0000000
--- a/tests/res/drawable-hdpi/holo_light_land_checkbox.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_light_land_checkbox_checked.png b/tests/res/drawable-hdpi/holo_light_land_checkbox_checked.png
deleted file mode 100644
index 4fddac2..0000000
--- a/tests/res/drawable-hdpi/holo_light_land_checkbox_checked.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_light_land_edittext.png b/tests/res/drawable-hdpi/holo_light_land_edittext.png
deleted file mode 100644
index 3b79df1..0000000
--- a/tests/res/drawable-hdpi/holo_light_land_edittext.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_light_land_green_dark.png b/tests/res/drawable-hdpi/holo_light_land_green_dark.png
deleted file mode 100644
index ca42e5d..0000000
--- a/tests/res/drawable-hdpi/holo_light_land_green_dark.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_light_land_green_light.png b/tests/res/drawable-hdpi/holo_light_land_green_light.png
deleted file mode 100644
index 5212b70..0000000
--- a/tests/res/drawable-hdpi/holo_light_land_green_light.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_light_land_orange_dark.png b/tests/res/drawable-hdpi/holo_light_land_orange_dark.png
deleted file mode 100644
index 0f03396..0000000
--- a/tests/res/drawable-hdpi/holo_light_land_orange_dark.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_light_land_orange_light.png b/tests/res/drawable-hdpi/holo_light_land_orange_light.png
deleted file mode 100644
index 91c2153..0000000
--- a/tests/res/drawable-hdpi/holo_light_land_orange_light.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_light_land_progressbar.png b/tests/res/drawable-hdpi/holo_light_land_progressbar.png
deleted file mode 100644
index f5d1226..0000000
--- a/tests/res/drawable-hdpi/holo_light_land_progressbar.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_light_land_progressbar_horizontal0.png b/tests/res/drawable-hdpi/holo_light_land_progressbar_horizontal0.png
deleted file mode 100644
index 2dde5f3..0000000
--- a/tests/res/drawable-hdpi/holo_light_land_progressbar_horizontal0.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_light_land_progressbar_horizontal100.png b/tests/res/drawable-hdpi/holo_light_land_progressbar_horizontal100.png
deleted file mode 100644
index 4202fce..0000000
--- a/tests/res/drawable-hdpi/holo_light_land_progressbar_horizontal100.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_light_land_progressbar_horizontal50.png b/tests/res/drawable-hdpi/holo_light_land_progressbar_horizontal50.png
deleted file mode 100644
index c0efc97..0000000
--- a/tests/res/drawable-hdpi/holo_light_land_progressbar_horizontal50.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_light_land_progressbar_large.png b/tests/res/drawable-hdpi/holo_light_land_progressbar_large.png
deleted file mode 100644
index 82bfaab..0000000
--- a/tests/res/drawable-hdpi/holo_light_land_progressbar_large.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_light_land_progressbar_small.png b/tests/res/drawable-hdpi/holo_light_land_progressbar_small.png
deleted file mode 100644
index d2a3672..0000000
--- a/tests/res/drawable-hdpi/holo_light_land_progressbar_small.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_light_land_progressdialog_horizontal.png b/tests/res/drawable-hdpi/holo_light_land_progressdialog_horizontal.png
deleted file mode 100644
index d7ed0ce..0000000
--- a/tests/res/drawable-hdpi/holo_light_land_progressdialog_horizontal.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_light_land_progressdialog_spinner.png b/tests/res/drawable-hdpi/holo_light_land_progressdialog_spinner.png
deleted file mode 100644
index f171ff1..0000000
--- a/tests/res/drawable-hdpi/holo_light_land_progressdialog_spinner.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_light_land_purple.png b/tests/res/drawable-hdpi/holo_light_land_purple.png
deleted file mode 100644
index 6f0b611..0000000
--- a/tests/res/drawable-hdpi/holo_light_land_purple.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_light_land_radiobutton.png b/tests/res/drawable-hdpi/holo_light_land_radiobutton.png
deleted file mode 100644
index 94b3ee7..0000000
--- a/tests/res/drawable-hdpi/holo_light_land_radiobutton.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_light_land_radiobutton_checked.png b/tests/res/drawable-hdpi/holo_light_land_radiobutton_checked.png
deleted file mode 100644
index d2d58a5..0000000
--- a/tests/res/drawable-hdpi/holo_light_land_radiobutton_checked.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_light_land_radiogroup_horizontal.png b/tests/res/drawable-hdpi/holo_light_land_radiogroup_horizontal.png
deleted file mode 100644
index d98797c..0000000
--- a/tests/res/drawable-hdpi/holo_light_land_radiogroup_horizontal.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_light_land_radiogroup_vertical.png b/tests/res/drawable-hdpi/holo_light_land_radiogroup_vertical.png
deleted file mode 100644
index 3e84a9c..0000000
--- a/tests/res/drawable-hdpi/holo_light_land_radiogroup_vertical.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_light_land_red_dark.png b/tests/res/drawable-hdpi/holo_light_land_red_dark.png
deleted file mode 100644
index c5925a5..0000000
--- a/tests/res/drawable-hdpi/holo_light_land_red_dark.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_light_land_red_light.png b/tests/res/drawable-hdpi/holo_light_land_red_light.png
deleted file mode 100644
index 4552be9..0000000
--- a/tests/res/drawable-hdpi/holo_light_land_red_light.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_light_land_searchview.png b/tests/res/drawable-hdpi/holo_light_land_searchview.png
deleted file mode 100644
index dfd917a..0000000
--- a/tests/res/drawable-hdpi/holo_light_land_searchview.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_light_land_searchview_query.png b/tests/res/drawable-hdpi/holo_light_land_searchview_query.png
deleted file mode 100644
index 28e30d2..0000000
--- a/tests/res/drawable-hdpi/holo_light_land_searchview_query.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_light_land_searchview_queryhint.png b/tests/res/drawable-hdpi/holo_light_land_searchview_queryhint.png
deleted file mode 100644
index f37980e..0000000
--- a/tests/res/drawable-hdpi/holo_light_land_searchview_queryhint.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_light_land_seekbar_0.png b/tests/res/drawable-hdpi/holo_light_land_seekbar_0.png
deleted file mode 100644
index 083c27c..0000000
--- a/tests/res/drawable-hdpi/holo_light_land_seekbar_0.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_light_land_seekbar_100.png b/tests/res/drawable-hdpi/holo_light_land_seekbar_100.png
deleted file mode 100644
index 3564320..0000000
--- a/tests/res/drawable-hdpi/holo_light_land_seekbar_100.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_light_land_seekbar_50.png b/tests/res/drawable-hdpi/holo_light_land_seekbar_50.png
deleted file mode 100644
index c0d10a4..0000000
--- a/tests/res/drawable-hdpi/holo_light_land_seekbar_50.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_light_land_spinner.png b/tests/res/drawable-hdpi/holo_light_land_spinner.png
deleted file mode 100644
index a50870d..0000000
--- a/tests/res/drawable-hdpi/holo_light_land_spinner.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_light_land_tabhost.png b/tests/res/drawable-hdpi/holo_light_land_tabhost.png
deleted file mode 100644
index a7140a5..0000000
--- a/tests/res/drawable-hdpi/holo_light_land_tabhost.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_light_land_textview.png b/tests/res/drawable-hdpi/holo_light_land_textview.png
deleted file mode 100644
index 4cdbf1b..0000000
--- a/tests/res/drawable-hdpi/holo_light_land_textview.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_light_land_toggle_button.png b/tests/res/drawable-hdpi/holo_light_land_toggle_button.png
deleted file mode 100644
index e74a8f7..0000000
--- a/tests/res/drawable-hdpi/holo_light_land_toggle_button.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_light_land_toggle_button_checked.png b/tests/res/drawable-hdpi/holo_light_land_toggle_button_checked.png
deleted file mode 100644
index 429de23..0000000
--- a/tests/res/drawable-hdpi/holo_light_land_toggle_button_checked.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_light_land_zoomcontrols.png b/tests/res/drawable-hdpi/holo_light_land_zoomcontrols.png
deleted file mode 100644
index 5763406..0000000
--- a/tests/res/drawable-hdpi/holo_light_land_zoomcontrols.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_light_port_actionbar.png b/tests/res/drawable-hdpi/holo_light_port_actionbar.png
deleted file mode 100644
index 6d3a0bd..0000000
--- a/tests/res/drawable-hdpi/holo_light_port_actionbar.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_light_port_actionbar_action_items.png b/tests/res/drawable-hdpi/holo_light_port_actionbar_action_items.png
deleted file mode 100644
index 43d3888..0000000
--- a/tests/res/drawable-hdpi/holo_light_port_actionbar_action_items.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_light_port_actionbar_action_items_split.png b/tests/res/drawable-hdpi/holo_light_port_actionbar_action_items_split.png
deleted file mode 100644
index 2032458..0000000
--- a/tests/res/drawable-hdpi/holo_light_port_actionbar_action_items_split.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_light_port_actionbar_action_view.png b/tests/res/drawable-hdpi/holo_light_port_actionbar_action_view.png
deleted file mode 100644
index e246ba5..0000000
--- a/tests/res/drawable-hdpi/holo_light_port_actionbar_action_view.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_light_port_actionbar_action_view_split.png b/tests/res/drawable-hdpi/holo_light_port_actionbar_action_view_split.png
deleted file mode 100644
index 04f8407..0000000
--- a/tests/res/drawable-hdpi/holo_light_port_actionbar_action_view_split.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_light_port_actionbar_home_as_up.png b/tests/res/drawable-hdpi/holo_light_port_actionbar_home_as_up.png
deleted file mode 100644
index e02a300..0000000
--- a/tests/res/drawable-hdpi/holo_light_port_actionbar_home_as_up.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_light_port_actionbar_home_as_up_split.png b/tests/res/drawable-hdpi/holo_light_port_actionbar_home_as_up_split.png
deleted file mode 100644
index e02a300..0000000
--- a/tests/res/drawable-hdpi/holo_light_port_actionbar_home_as_up_split.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_light_port_actionbar_list.png b/tests/res/drawable-hdpi/holo_light_port_actionbar_list.png
deleted file mode 100644
index 614b6fa..0000000
--- a/tests/res/drawable-hdpi/holo_light_port_actionbar_list.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_light_port_actionbar_list_split.png b/tests/res/drawable-hdpi/holo_light_port_actionbar_list_split.png
deleted file mode 100644
index 614b6fa..0000000
--- a/tests/res/drawable-hdpi/holo_light_port_actionbar_list_split.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_light_port_actionbar_no_icon.png b/tests/res/drawable-hdpi/holo_light_port_actionbar_no_icon.png
deleted file mode 100644
index 93c94f8..0000000
--- a/tests/res/drawable-hdpi/holo_light_port_actionbar_no_icon.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_light_port_actionbar_no_icon_split.png b/tests/res/drawable-hdpi/holo_light_port_actionbar_no_icon_split.png
deleted file mode 100644
index 93c94f8..0000000
--- a/tests/res/drawable-hdpi/holo_light_port_actionbar_no_icon_split.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_light_port_actionbar_no_title.png b/tests/res/drawable-hdpi/holo_light_port_actionbar_no_title.png
deleted file mode 100644
index 2532002..0000000
--- a/tests/res/drawable-hdpi/holo_light_port_actionbar_no_title.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_light_port_actionbar_no_title_split.png b/tests/res/drawable-hdpi/holo_light_port_actionbar_no_title_split.png
deleted file mode 100644
index 2532002..0000000
--- a/tests/res/drawable-hdpi/holo_light_port_actionbar_no_title_split.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_light_port_actionbar_split.png b/tests/res/drawable-hdpi/holo_light_port_actionbar_split.png
deleted file mode 100644
index 6d3a0bd..0000000
--- a/tests/res/drawable-hdpi/holo_light_port_actionbar_split.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_light_port_actionbar_tabs.png b/tests/res/drawable-hdpi/holo_light_port_actionbar_tabs.png
deleted file mode 100644
index 6251b45..0000000
--- a/tests/res/drawable-hdpi/holo_light_port_actionbar_tabs.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_light_port_actionbar_tabs_split.png b/tests/res/drawable-hdpi/holo_light_port_actionbar_tabs_split.png
deleted file mode 100644
index 6251b45..0000000
--- a/tests/res/drawable-hdpi/holo_light_port_actionbar_tabs_split.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_light_port_alertdialog_list.png b/tests/res/drawable-hdpi/holo_light_port_alertdialog_list.png
deleted file mode 100644
index 008da70..0000000
--- a/tests/res/drawable-hdpi/holo_light_port_alertdialog_list.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_light_port_alertdialog_multichoice.png b/tests/res/drawable-hdpi/holo_light_port_alertdialog_multichoice.png
deleted file mode 100644
index 9da8a38..0000000
--- a/tests/res/drawable-hdpi/holo_light_port_alertdialog_multichoice.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_light_port_alertdialog_onebutton.png b/tests/res/drawable-hdpi/holo_light_port_alertdialog_onebutton.png
deleted file mode 100644
index b8f5e8a..0000000
--- a/tests/res/drawable-hdpi/holo_light_port_alertdialog_onebutton.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_light_port_alertdialog_singlechoice.png b/tests/res/drawable-hdpi/holo_light_port_alertdialog_singlechoice.png
deleted file mode 100644
index 676dd35..0000000
--- a/tests/res/drawable-hdpi/holo_light_port_alertdialog_singlechoice.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_light_port_alertdialog_threebuttons.png b/tests/res/drawable-hdpi/holo_light_port_alertdialog_threebuttons.png
deleted file mode 100644
index a05d2eb..0000000
--- a/tests/res/drawable-hdpi/holo_light_port_alertdialog_threebuttons.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_light_port_alertdialog_twobuttons.png b/tests/res/drawable-hdpi/holo_light_port_alertdialog_twobuttons.png
deleted file mode 100644
index b2bcc69..0000000
--- a/tests/res/drawable-hdpi/holo_light_port_alertdialog_twobuttons.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_light_port_blue_bright.png b/tests/res/drawable-hdpi/holo_light_port_blue_bright.png
deleted file mode 100644
index 98cac49..0000000
--- a/tests/res/drawable-hdpi/holo_light_port_blue_bright.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_light_port_blue_dark.png b/tests/res/drawable-hdpi/holo_light_port_blue_dark.png
deleted file mode 100644
index 62c9e62..0000000
--- a/tests/res/drawable-hdpi/holo_light_port_blue_dark.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_light_port_blue_light.png b/tests/res/drawable-hdpi/holo_light_port_blue_light.png
deleted file mode 100644
index e9cc213..0000000
--- a/tests/res/drawable-hdpi/holo_light_port_blue_light.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_light_port_button.png b/tests/res/drawable-hdpi/holo_light_port_button.png
deleted file mode 100644
index b65c7b5..0000000
--- a/tests/res/drawable-hdpi/holo_light_port_button.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_light_port_button_pressed.png b/tests/res/drawable-hdpi/holo_light_port_button_pressed.png
deleted file mode 100644
index e1c3088..0000000
--- a/tests/res/drawable-hdpi/holo_light_port_button_pressed.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_light_port_calendarview.png b/tests/res/drawable-hdpi/holo_light_port_calendarview.png
deleted file mode 100644
index 4d1e5d5..0000000
--- a/tests/res/drawable-hdpi/holo_light_port_calendarview.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_light_port_checkbox.png b/tests/res/drawable-hdpi/holo_light_port_checkbox.png
deleted file mode 100644
index 403f003..0000000
--- a/tests/res/drawable-hdpi/holo_light_port_checkbox.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_light_port_checkbox_checked.png b/tests/res/drawable-hdpi/holo_light_port_checkbox_checked.png
deleted file mode 100644
index 4fddac2..0000000
--- a/tests/res/drawable-hdpi/holo_light_port_checkbox_checked.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_light_port_edittext.png b/tests/res/drawable-hdpi/holo_light_port_edittext.png
deleted file mode 100644
index 28e0c47..0000000
--- a/tests/res/drawable-hdpi/holo_light_port_edittext.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_light_port_green_dark.png b/tests/res/drawable-hdpi/holo_light_port_green_dark.png
deleted file mode 100644
index e482e29..0000000
--- a/tests/res/drawable-hdpi/holo_light_port_green_dark.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_light_port_green_light.png b/tests/res/drawable-hdpi/holo_light_port_green_light.png
deleted file mode 100644
index 8711996..0000000
--- a/tests/res/drawable-hdpi/holo_light_port_green_light.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_light_port_orange_dark.png b/tests/res/drawable-hdpi/holo_light_port_orange_dark.png
deleted file mode 100644
index 547b3bd..0000000
--- a/tests/res/drawable-hdpi/holo_light_port_orange_dark.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_light_port_orange_light.png b/tests/res/drawable-hdpi/holo_light_port_orange_light.png
deleted file mode 100644
index 468947c..0000000
--- a/tests/res/drawable-hdpi/holo_light_port_orange_light.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_light_port_progressbar.png b/tests/res/drawable-hdpi/holo_light_port_progressbar.png
deleted file mode 100644
index f5d1226..0000000
--- a/tests/res/drawable-hdpi/holo_light_port_progressbar.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_light_port_progressbar_horizontal0.png b/tests/res/drawable-hdpi/holo_light_port_progressbar_horizontal0.png
deleted file mode 100644
index 6fb4cde..0000000
--- a/tests/res/drawable-hdpi/holo_light_port_progressbar_horizontal0.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_light_port_progressbar_horizontal100.png b/tests/res/drawable-hdpi/holo_light_port_progressbar_horizontal100.png
deleted file mode 100644
index 3b2d1ea..0000000
--- a/tests/res/drawable-hdpi/holo_light_port_progressbar_horizontal100.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_light_port_progressbar_horizontal50.png b/tests/res/drawable-hdpi/holo_light_port_progressbar_horizontal50.png
deleted file mode 100644
index eeb8fdf..0000000
--- a/tests/res/drawable-hdpi/holo_light_port_progressbar_horizontal50.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_light_port_progressbar_large.png b/tests/res/drawable-hdpi/holo_light_port_progressbar_large.png
deleted file mode 100644
index 82bfaab..0000000
--- a/tests/res/drawable-hdpi/holo_light_port_progressbar_large.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_light_port_progressbar_small.png b/tests/res/drawable-hdpi/holo_light_port_progressbar_small.png
deleted file mode 100644
index d2a3672..0000000
--- a/tests/res/drawable-hdpi/holo_light_port_progressbar_small.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_light_port_progressdialog_horizontal.png b/tests/res/drawable-hdpi/holo_light_port_progressdialog_horizontal.png
deleted file mode 100644
index faf6dde..0000000
--- a/tests/res/drawable-hdpi/holo_light_port_progressdialog_horizontal.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_light_port_progressdialog_spinner.png b/tests/res/drawable-hdpi/holo_light_port_progressdialog_spinner.png
deleted file mode 100644
index fe1eff5..0000000
--- a/tests/res/drawable-hdpi/holo_light_port_progressdialog_spinner.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_light_port_purple.png b/tests/res/drawable-hdpi/holo_light_port_purple.png
deleted file mode 100644
index eaac999..0000000
--- a/tests/res/drawable-hdpi/holo_light_port_purple.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_light_port_radiobutton.png b/tests/res/drawable-hdpi/holo_light_port_radiobutton.png
deleted file mode 100644
index 94b3ee7..0000000
--- a/tests/res/drawable-hdpi/holo_light_port_radiobutton.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_light_port_radiobutton_checked.png b/tests/res/drawable-hdpi/holo_light_port_radiobutton_checked.png
deleted file mode 100644
index d2d58a5..0000000
--- a/tests/res/drawable-hdpi/holo_light_port_radiobutton_checked.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_light_port_radiogroup_horizontal.png b/tests/res/drawable-hdpi/holo_light_port_radiogroup_horizontal.png
deleted file mode 100644
index d98797c..0000000
--- a/tests/res/drawable-hdpi/holo_light_port_radiogroup_horizontal.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_light_port_radiogroup_vertical.png b/tests/res/drawable-hdpi/holo_light_port_radiogroup_vertical.png
deleted file mode 100644
index 3e84a9c..0000000
--- a/tests/res/drawable-hdpi/holo_light_port_radiogroup_vertical.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_light_port_red_dark.png b/tests/res/drawable-hdpi/holo_light_port_red_dark.png
deleted file mode 100644
index cdfaf7a..0000000
--- a/tests/res/drawable-hdpi/holo_light_port_red_dark.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_light_port_red_light.png b/tests/res/drawable-hdpi/holo_light_port_red_light.png
deleted file mode 100644
index 9bd867c..0000000
--- a/tests/res/drawable-hdpi/holo_light_port_red_light.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_light_port_searchview.png b/tests/res/drawable-hdpi/holo_light_port_searchview.png
deleted file mode 100644
index 10881ff..0000000
--- a/tests/res/drawable-hdpi/holo_light_port_searchview.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_light_port_searchview_query.png b/tests/res/drawable-hdpi/holo_light_port_searchview_query.png
deleted file mode 100644
index 1d4950b..0000000
--- a/tests/res/drawable-hdpi/holo_light_port_searchview_query.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_light_port_searchview_queryhint.png b/tests/res/drawable-hdpi/holo_light_port_searchview_queryhint.png
deleted file mode 100644
index 46d05a2..0000000
--- a/tests/res/drawable-hdpi/holo_light_port_searchview_queryhint.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_light_port_seekbar_0.png b/tests/res/drawable-hdpi/holo_light_port_seekbar_0.png
deleted file mode 100644
index 0141a89..0000000
--- a/tests/res/drawable-hdpi/holo_light_port_seekbar_0.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_light_port_seekbar_100.png b/tests/res/drawable-hdpi/holo_light_port_seekbar_100.png
deleted file mode 100644
index 6410b44..0000000
--- a/tests/res/drawable-hdpi/holo_light_port_seekbar_100.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_light_port_seekbar_50.png b/tests/res/drawable-hdpi/holo_light_port_seekbar_50.png
deleted file mode 100644
index 304efdb..0000000
--- a/tests/res/drawable-hdpi/holo_light_port_seekbar_50.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_light_port_spinner.png b/tests/res/drawable-hdpi/holo_light_port_spinner.png
deleted file mode 100644
index 81629b8..0000000
--- a/tests/res/drawable-hdpi/holo_light_port_spinner.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_light_port_tabhost.png b/tests/res/drawable-hdpi/holo_light_port_tabhost.png
deleted file mode 100644
index 9e34d46..0000000
--- a/tests/res/drawable-hdpi/holo_light_port_tabhost.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_light_port_textview.png b/tests/res/drawable-hdpi/holo_light_port_textview.png
deleted file mode 100644
index 48ee68d..0000000
--- a/tests/res/drawable-hdpi/holo_light_port_textview.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_light_port_toggle_button.png b/tests/res/drawable-hdpi/holo_light_port_toggle_button.png
deleted file mode 100644
index e74a8f7..0000000
--- a/tests/res/drawable-hdpi/holo_light_port_toggle_button.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_light_port_toggle_button_checked.png b/tests/res/drawable-hdpi/holo_light_port_toggle_button_checked.png
deleted file mode 100644
index 429de23..0000000
--- a/tests/res/drawable-hdpi/holo_light_port_toggle_button_checked.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_light_port_zoomcontrols.png b/tests/res/drawable-hdpi/holo_light_port_zoomcontrols.png
deleted file mode 100644
index 5763406..0000000
--- a/tests/res/drawable-hdpi/holo_light_port_zoomcontrols.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_port_actionbar.png b/tests/res/drawable-hdpi/holo_port_actionbar.png
deleted file mode 100644
index 90e54bd..0000000
--- a/tests/res/drawable-hdpi/holo_port_actionbar.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_port_actionbar_action_items.png b/tests/res/drawable-hdpi/holo_port_actionbar_action_items.png
deleted file mode 100644
index 58abebf..0000000
--- a/tests/res/drawable-hdpi/holo_port_actionbar_action_items.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_port_actionbar_action_items_split.png b/tests/res/drawable-hdpi/holo_port_actionbar_action_items_split.png
deleted file mode 100644
index 8049154..0000000
--- a/tests/res/drawable-hdpi/holo_port_actionbar_action_items_split.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_port_actionbar_action_view.png b/tests/res/drawable-hdpi/holo_port_actionbar_action_view.png
deleted file mode 100644
index 6c4e482..0000000
--- a/tests/res/drawable-hdpi/holo_port_actionbar_action_view.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_port_actionbar_action_view_split.png b/tests/res/drawable-hdpi/holo_port_actionbar_action_view_split.png
deleted file mode 100644
index aff9241..0000000
--- a/tests/res/drawable-hdpi/holo_port_actionbar_action_view_split.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_port_actionbar_home_as_up.png b/tests/res/drawable-hdpi/holo_port_actionbar_home_as_up.png
deleted file mode 100644
index 39857b8..0000000
--- a/tests/res/drawable-hdpi/holo_port_actionbar_home_as_up.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_port_actionbar_home_as_up_split.png b/tests/res/drawable-hdpi/holo_port_actionbar_home_as_up_split.png
deleted file mode 100644
index 39857b8..0000000
--- a/tests/res/drawable-hdpi/holo_port_actionbar_home_as_up_split.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_port_actionbar_list.png b/tests/res/drawable-hdpi/holo_port_actionbar_list.png
deleted file mode 100644
index 341109f..0000000
--- a/tests/res/drawable-hdpi/holo_port_actionbar_list.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_port_actionbar_list_split.png b/tests/res/drawable-hdpi/holo_port_actionbar_list_split.png
deleted file mode 100644
index 341109f..0000000
--- a/tests/res/drawable-hdpi/holo_port_actionbar_list_split.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_port_actionbar_no_icon.png b/tests/res/drawable-hdpi/holo_port_actionbar_no_icon.png
deleted file mode 100644
index ae9b08c..0000000
--- a/tests/res/drawable-hdpi/holo_port_actionbar_no_icon.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_port_actionbar_no_icon_split.png b/tests/res/drawable-hdpi/holo_port_actionbar_no_icon_split.png
deleted file mode 100644
index ae9b08c..0000000
--- a/tests/res/drawable-hdpi/holo_port_actionbar_no_icon_split.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_port_actionbar_no_title.png b/tests/res/drawable-hdpi/holo_port_actionbar_no_title.png
deleted file mode 100644
index 4fbdc43..0000000
--- a/tests/res/drawable-hdpi/holo_port_actionbar_no_title.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_port_actionbar_no_title_split.png b/tests/res/drawable-hdpi/holo_port_actionbar_no_title_split.png
deleted file mode 100644
index 4fbdc43..0000000
--- a/tests/res/drawable-hdpi/holo_port_actionbar_no_title_split.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_port_actionbar_split.png b/tests/res/drawable-hdpi/holo_port_actionbar_split.png
deleted file mode 100644
index 90e54bd..0000000
--- a/tests/res/drawable-hdpi/holo_port_actionbar_split.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_port_actionbar_tabs.png b/tests/res/drawable-hdpi/holo_port_actionbar_tabs.png
deleted file mode 100644
index 7923a71..0000000
--- a/tests/res/drawable-hdpi/holo_port_actionbar_tabs.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_port_actionbar_tabs_split.png b/tests/res/drawable-hdpi/holo_port_actionbar_tabs_split.png
deleted file mode 100644
index 7923a71..0000000
--- a/tests/res/drawable-hdpi/holo_port_actionbar_tabs_split.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_port_alertdialog_list.png b/tests/res/drawable-hdpi/holo_port_alertdialog_list.png
deleted file mode 100644
index d7242fe..0000000
--- a/tests/res/drawable-hdpi/holo_port_alertdialog_list.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_port_alertdialog_multichoice.png b/tests/res/drawable-hdpi/holo_port_alertdialog_multichoice.png
deleted file mode 100644
index b3096f8..0000000
--- a/tests/res/drawable-hdpi/holo_port_alertdialog_multichoice.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_port_alertdialog_onebutton.png b/tests/res/drawable-hdpi/holo_port_alertdialog_onebutton.png
deleted file mode 100644
index 2338644..0000000
--- a/tests/res/drawable-hdpi/holo_port_alertdialog_onebutton.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_port_alertdialog_singlechoice.png b/tests/res/drawable-hdpi/holo_port_alertdialog_singlechoice.png
deleted file mode 100644
index 52d24d0..0000000
--- a/tests/res/drawable-hdpi/holo_port_alertdialog_singlechoice.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_port_alertdialog_threebuttons.png b/tests/res/drawable-hdpi/holo_port_alertdialog_threebuttons.png
deleted file mode 100644
index 1bb0a4e..0000000
--- a/tests/res/drawable-hdpi/holo_port_alertdialog_threebuttons.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_port_alertdialog_twobuttons.png b/tests/res/drawable-hdpi/holo_port_alertdialog_twobuttons.png
deleted file mode 100644
index 4a6c5d7..0000000
--- a/tests/res/drawable-hdpi/holo_port_alertdialog_twobuttons.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_port_blue_bright.png b/tests/res/drawable-hdpi/holo_port_blue_bright.png
deleted file mode 100644
index 98cac49..0000000
--- a/tests/res/drawable-hdpi/holo_port_blue_bright.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_port_blue_dark.png b/tests/res/drawable-hdpi/holo_port_blue_dark.png
deleted file mode 100644
index 62c9e62..0000000
--- a/tests/res/drawable-hdpi/holo_port_blue_dark.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_port_blue_light.png b/tests/res/drawable-hdpi/holo_port_blue_light.png
deleted file mode 100644
index e9cc213..0000000
--- a/tests/res/drawable-hdpi/holo_port_blue_light.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_port_button.png b/tests/res/drawable-hdpi/holo_port_button.png
deleted file mode 100644
index 929630d..0000000
--- a/tests/res/drawable-hdpi/holo_port_button.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_port_button_pressed.png b/tests/res/drawable-hdpi/holo_port_button_pressed.png
deleted file mode 100644
index 69793ba..0000000
--- a/tests/res/drawable-hdpi/holo_port_button_pressed.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_port_calendarview.png b/tests/res/drawable-hdpi/holo_port_calendarview.png
deleted file mode 100644
index 45243d9..0000000
--- a/tests/res/drawable-hdpi/holo_port_calendarview.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_port_checkbox.png b/tests/res/drawable-hdpi/holo_port_checkbox.png
deleted file mode 100644
index 12b94f1..0000000
--- a/tests/res/drawable-hdpi/holo_port_checkbox.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_port_checkbox_checked.png b/tests/res/drawable-hdpi/holo_port_checkbox_checked.png
deleted file mode 100644
index bdb86fd..0000000
--- a/tests/res/drawable-hdpi/holo_port_checkbox_checked.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_port_edittext.png b/tests/res/drawable-hdpi/holo_port_edittext.png
deleted file mode 100644
index fee4a77..0000000
--- a/tests/res/drawable-hdpi/holo_port_edittext.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_port_green_dark.png b/tests/res/drawable-hdpi/holo_port_green_dark.png
deleted file mode 100644
index e482e29..0000000
--- a/tests/res/drawable-hdpi/holo_port_green_dark.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_port_green_light.png b/tests/res/drawable-hdpi/holo_port_green_light.png
deleted file mode 100644
index 8711996..0000000
--- a/tests/res/drawable-hdpi/holo_port_green_light.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_port_orange_dark.png b/tests/res/drawable-hdpi/holo_port_orange_dark.png
deleted file mode 100644
index 547b3bd..0000000
--- a/tests/res/drawable-hdpi/holo_port_orange_dark.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_port_orange_light.png b/tests/res/drawable-hdpi/holo_port_orange_light.png
deleted file mode 100644
index 468947c..0000000
--- a/tests/res/drawable-hdpi/holo_port_orange_light.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_port_progressbar.png b/tests/res/drawable-hdpi/holo_port_progressbar.png
deleted file mode 100644
index f5d1226..0000000
--- a/tests/res/drawable-hdpi/holo_port_progressbar.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_port_progressbar_horizontal0.png b/tests/res/drawable-hdpi/holo_port_progressbar_horizontal0.png
deleted file mode 100644
index 10f47bb..0000000
--- a/tests/res/drawable-hdpi/holo_port_progressbar_horizontal0.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_port_progressbar_horizontal100.png b/tests/res/drawable-hdpi/holo_port_progressbar_horizontal100.png
deleted file mode 100644
index 687cc1d..0000000
--- a/tests/res/drawable-hdpi/holo_port_progressbar_horizontal100.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_port_progressbar_horizontal50.png b/tests/res/drawable-hdpi/holo_port_progressbar_horizontal50.png
deleted file mode 100644
index 6d7d857..0000000
--- a/tests/res/drawable-hdpi/holo_port_progressbar_horizontal50.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_port_progressbar_large.png b/tests/res/drawable-hdpi/holo_port_progressbar_large.png
deleted file mode 100644
index 82bfaab..0000000
--- a/tests/res/drawable-hdpi/holo_port_progressbar_large.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_port_progressbar_small.png b/tests/res/drawable-hdpi/holo_port_progressbar_small.png
deleted file mode 100644
index d2a3672..0000000
--- a/tests/res/drawable-hdpi/holo_port_progressbar_small.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_port_progressdialog_horizontal.png b/tests/res/drawable-hdpi/holo_port_progressdialog_horizontal.png
deleted file mode 100644
index cc06ee7..0000000
--- a/tests/res/drawable-hdpi/holo_port_progressdialog_horizontal.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_port_progressdialog_spinner.png b/tests/res/drawable-hdpi/holo_port_progressdialog_spinner.png
deleted file mode 100644
index cff3930..0000000
--- a/tests/res/drawable-hdpi/holo_port_progressdialog_spinner.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_port_purple.png b/tests/res/drawable-hdpi/holo_port_purple.png
deleted file mode 100644
index eaac999..0000000
--- a/tests/res/drawable-hdpi/holo_port_purple.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_port_radiobutton.png b/tests/res/drawable-hdpi/holo_port_radiobutton.png
deleted file mode 100644
index 277a74c..0000000
--- a/tests/res/drawable-hdpi/holo_port_radiobutton.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_port_radiobutton_checked.png b/tests/res/drawable-hdpi/holo_port_radiobutton_checked.png
deleted file mode 100644
index 4b27a6b..0000000
--- a/tests/res/drawable-hdpi/holo_port_radiobutton_checked.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_port_radiogroup_horizontal.png b/tests/res/drawable-hdpi/holo_port_radiogroup_horizontal.png
deleted file mode 100644
index 82b726e..0000000
--- a/tests/res/drawable-hdpi/holo_port_radiogroup_horizontal.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_port_radiogroup_vertical.png b/tests/res/drawable-hdpi/holo_port_radiogroup_vertical.png
deleted file mode 100644
index 6bb138c..0000000
--- a/tests/res/drawable-hdpi/holo_port_radiogroup_vertical.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_port_ratingbar_0.png b/tests/res/drawable-hdpi/holo_port_ratingbar_0.png
deleted file mode 100644
index 3ab433c..0000000
--- a/tests/res/drawable-hdpi/holo_port_ratingbar_0.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_port_ratingbar_0_pressed.png b/tests/res/drawable-hdpi/holo_port_ratingbar_0_pressed.png
deleted file mode 100644
index 4dc4b05..0000000
--- a/tests/res/drawable-hdpi/holo_port_ratingbar_0_pressed.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_port_ratingbar_2point5.png b/tests/res/drawable-hdpi/holo_port_ratingbar_2point5.png
deleted file mode 100644
index 2ca1852..0000000
--- a/tests/res/drawable-hdpi/holo_port_ratingbar_2point5.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_port_ratingbar_2point5_pressed.png b/tests/res/drawable-hdpi/holo_port_ratingbar_2point5_pressed.png
deleted file mode 100644
index 84d8b8c..0000000
--- a/tests/res/drawable-hdpi/holo_port_ratingbar_2point5_pressed.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_port_ratingbar_5.png b/tests/res/drawable-hdpi/holo_port_ratingbar_5.png
deleted file mode 100644
index 87c629e..0000000
--- a/tests/res/drawable-hdpi/holo_port_ratingbar_5.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_port_ratingbar_5_pressed.png b/tests/res/drawable-hdpi/holo_port_ratingbar_5_pressed.png
deleted file mode 100644
index 1122d5e..0000000
--- a/tests/res/drawable-hdpi/holo_port_ratingbar_5_pressed.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_port_red_dark.png b/tests/res/drawable-hdpi/holo_port_red_dark.png
deleted file mode 100644
index cdfaf7a..0000000
--- a/tests/res/drawable-hdpi/holo_port_red_dark.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_port_red_light.png b/tests/res/drawable-hdpi/holo_port_red_light.png
deleted file mode 100644
index 9bd867c..0000000
--- a/tests/res/drawable-hdpi/holo_port_red_light.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_port_searchview.png b/tests/res/drawable-hdpi/holo_port_searchview.png
deleted file mode 100644
index 95351cb..0000000
--- a/tests/res/drawable-hdpi/holo_port_searchview.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_port_searchview_query.png b/tests/res/drawable-hdpi/holo_port_searchview_query.png
deleted file mode 100644
index e83dc10..0000000
--- a/tests/res/drawable-hdpi/holo_port_searchview_query.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_port_searchview_queryhint.png b/tests/res/drawable-hdpi/holo_port_searchview_queryhint.png
deleted file mode 100644
index bdffa8b..0000000
--- a/tests/res/drawable-hdpi/holo_port_searchview_queryhint.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_port_seekbar_0.png b/tests/res/drawable-hdpi/holo_port_seekbar_0.png
deleted file mode 100644
index 61f09a3..0000000
--- a/tests/res/drawable-hdpi/holo_port_seekbar_0.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_port_seekbar_100.png b/tests/res/drawable-hdpi/holo_port_seekbar_100.png
deleted file mode 100644
index 6410b44..0000000
--- a/tests/res/drawable-hdpi/holo_port_seekbar_100.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_port_seekbar_50.png b/tests/res/drawable-hdpi/holo_port_seekbar_50.png
deleted file mode 100644
index a9d5988..0000000
--- a/tests/res/drawable-hdpi/holo_port_seekbar_50.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_port_spinner.png b/tests/res/drawable-hdpi/holo_port_spinner.png
deleted file mode 100644
index 6c04244..0000000
--- a/tests/res/drawable-hdpi/holo_port_spinner.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_port_tabhost.png b/tests/res/drawable-hdpi/holo_port_tabhost.png
deleted file mode 100644
index 9e34d46..0000000
--- a/tests/res/drawable-hdpi/holo_port_tabhost.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_port_textview.png b/tests/res/drawable-hdpi/holo_port_textview.png
deleted file mode 100644
index ac0aa44..0000000
--- a/tests/res/drawable-hdpi/holo_port_textview.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_port_toggle_button.png b/tests/res/drawable-hdpi/holo_port_toggle_button.png
deleted file mode 100644
index 3f36871..0000000
--- a/tests/res/drawable-hdpi/holo_port_toggle_button.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_port_toggle_button_checked.png b/tests/res/drawable-hdpi/holo_port_toggle_button_checked.png
deleted file mode 100644
index f55486a..0000000
--- a/tests/res/drawable-hdpi/holo_port_toggle_button_checked.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-large-mdpi/holo_land_actionbar.png b/tests/res/drawable-large-mdpi/holo_land_actionbar.png
deleted file mode 100644
index 51b2929..0000000
--- a/tests/res/drawable-large-mdpi/holo_land_actionbar.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-large-mdpi/holo_land_actionbar_action_items.png b/tests/res/drawable-large-mdpi/holo_land_actionbar_action_items.png
deleted file mode 100644
index b0fa76a..0000000
--- a/tests/res/drawable-large-mdpi/holo_land_actionbar_action_items.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-large-mdpi/holo_land_actionbar_action_view.png b/tests/res/drawable-large-mdpi/holo_land_actionbar_action_view.png
deleted file mode 100644
index 10daf41..0000000
--- a/tests/res/drawable-large-mdpi/holo_land_actionbar_action_view.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-large-mdpi/holo_land_actionbar_home_as_up.png b/tests/res/drawable-large-mdpi/holo_land_actionbar_home_as_up.png
deleted file mode 100644
index a8c8ae5..0000000
--- a/tests/res/drawable-large-mdpi/holo_land_actionbar_home_as_up.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-large-mdpi/holo_land_actionbar_list.png b/tests/res/drawable-large-mdpi/holo_land_actionbar_list.png
deleted file mode 100644
index 83483bc..0000000
--- a/tests/res/drawable-large-mdpi/holo_land_actionbar_list.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-large-mdpi/holo_land_actionbar_no_icon.png b/tests/res/drawable-large-mdpi/holo_land_actionbar_no_icon.png
deleted file mode 100644
index 9dbb4e3..0000000
--- a/tests/res/drawable-large-mdpi/holo_land_actionbar_no_icon.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-large-mdpi/holo_land_actionbar_no_title.png b/tests/res/drawable-large-mdpi/holo_land_actionbar_no_title.png
deleted file mode 100644
index 45eed99..0000000
--- a/tests/res/drawable-large-mdpi/holo_land_actionbar_no_title.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-large-mdpi/holo_land_actionbar_tabs.png b/tests/res/drawable-large-mdpi/holo_land_actionbar_tabs.png
deleted file mode 100644
index ab6be33..0000000
--- a/tests/res/drawable-large-mdpi/holo_land_actionbar_tabs.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-large-mdpi/holo_land_alertdialog_list.png b/tests/res/drawable-large-mdpi/holo_land_alertdialog_list.png
deleted file mode 100644
index 091f5c6..0000000
--- a/tests/res/drawable-large-mdpi/holo_land_alertdialog_list.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-large-mdpi/holo_land_alertdialog_multichoice.png b/tests/res/drawable-large-mdpi/holo_land_alertdialog_multichoice.png
deleted file mode 100644
index fa2616e..0000000
--- a/tests/res/drawable-large-mdpi/holo_land_alertdialog_multichoice.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-large-mdpi/holo_land_alertdialog_onebutton.png b/tests/res/drawable-large-mdpi/holo_land_alertdialog_onebutton.png
deleted file mode 100644
index 43d40eb..0000000
--- a/tests/res/drawable-large-mdpi/holo_land_alertdialog_onebutton.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-large-mdpi/holo_land_alertdialog_singlechoice.png b/tests/res/drawable-large-mdpi/holo_land_alertdialog_singlechoice.png
deleted file mode 100644
index 5682bc8..0000000
--- a/tests/res/drawable-large-mdpi/holo_land_alertdialog_singlechoice.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-large-mdpi/holo_land_alertdialog_threebuttons.png b/tests/res/drawable-large-mdpi/holo_land_alertdialog_threebuttons.png
deleted file mode 100644
index 78b7029..0000000
--- a/tests/res/drawable-large-mdpi/holo_land_alertdialog_threebuttons.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-large-mdpi/holo_land_alertdialog_twobuttons.png b/tests/res/drawable-large-mdpi/holo_land_alertdialog_twobuttons.png
deleted file mode 100644
index 3fbcc9c..0000000
--- a/tests/res/drawable-large-mdpi/holo_land_alertdialog_twobuttons.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-large-mdpi/holo_land_blue_bright.png b/tests/res/drawable-large-mdpi/holo_land_blue_bright.png
deleted file mode 100644
index 2c9b47a..0000000
--- a/tests/res/drawable-large-mdpi/holo_land_blue_bright.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-large-mdpi/holo_land_blue_dark.png b/tests/res/drawable-large-mdpi/holo_land_blue_dark.png
deleted file mode 100644
index 2f9446c..0000000
--- a/tests/res/drawable-large-mdpi/holo_land_blue_dark.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-large-mdpi/holo_land_blue_light.png b/tests/res/drawable-large-mdpi/holo_land_blue_light.png
deleted file mode 100644
index ce14078..0000000
--- a/tests/res/drawable-large-mdpi/holo_land_blue_light.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-large-mdpi/holo_land_button.png b/tests/res/drawable-large-mdpi/holo_land_button.png
deleted file mode 100644
index 25cfc2d..0000000
--- a/tests/res/drawable-large-mdpi/holo_land_button.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-large-mdpi/holo_land_button_pressed.png b/tests/res/drawable-large-mdpi/holo_land_button_pressed.png
deleted file mode 100644
index 6b1e5d2..0000000
--- a/tests/res/drawable-large-mdpi/holo_land_button_pressed.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-large-mdpi/holo_land_calendarview.png b/tests/res/drawable-large-mdpi/holo_land_calendarview.png
deleted file mode 100644
index 4d57001..0000000
--- a/tests/res/drawable-large-mdpi/holo_land_calendarview.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-large-mdpi/holo_land_checkbox.png b/tests/res/drawable-large-mdpi/holo_land_checkbox.png
deleted file mode 100644
index 1c8f6ed..0000000
--- a/tests/res/drawable-large-mdpi/holo_land_checkbox.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-large-mdpi/holo_land_checkbox_checked.png b/tests/res/drawable-large-mdpi/holo_land_checkbox_checked.png
deleted file mode 100644
index 2df82f3..0000000
--- a/tests/res/drawable-large-mdpi/holo_land_checkbox_checked.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-large-mdpi/holo_land_edittext.png b/tests/res/drawable-large-mdpi/holo_land_edittext.png
deleted file mode 100644
index c21bb8e..0000000
--- a/tests/res/drawable-large-mdpi/holo_land_edittext.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-large-mdpi/holo_land_green_dark.png b/tests/res/drawable-large-mdpi/holo_land_green_dark.png
deleted file mode 100644
index f9ae8c4..0000000
--- a/tests/res/drawable-large-mdpi/holo_land_green_dark.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-large-mdpi/holo_land_green_light.png b/tests/res/drawable-large-mdpi/holo_land_green_light.png
deleted file mode 100644
index ec19ed9..0000000
--- a/tests/res/drawable-large-mdpi/holo_land_green_light.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-large-mdpi/holo_land_orange_dark.png b/tests/res/drawable-large-mdpi/holo_land_orange_dark.png
deleted file mode 100644
index 33f5bae..0000000
--- a/tests/res/drawable-large-mdpi/holo_land_orange_dark.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-large-mdpi/holo_land_orange_light.png b/tests/res/drawable-large-mdpi/holo_land_orange_light.png
deleted file mode 100644
index d4184b7..0000000
--- a/tests/res/drawable-large-mdpi/holo_land_orange_light.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-large-mdpi/holo_land_progressbar.png b/tests/res/drawable-large-mdpi/holo_land_progressbar.png
deleted file mode 100644
index e4dd24d..0000000
--- a/tests/res/drawable-large-mdpi/holo_land_progressbar.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-large-mdpi/holo_land_progressbar_horizontal0.png b/tests/res/drawable-large-mdpi/holo_land_progressbar_horizontal0.png
deleted file mode 100644
index 37674f5..0000000
--- a/tests/res/drawable-large-mdpi/holo_land_progressbar_horizontal0.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-large-mdpi/holo_land_progressbar_horizontal100.png b/tests/res/drawable-large-mdpi/holo_land_progressbar_horizontal100.png
deleted file mode 100644
index 3d90314..0000000
--- a/tests/res/drawable-large-mdpi/holo_land_progressbar_horizontal100.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-large-mdpi/holo_land_progressbar_horizontal50.png b/tests/res/drawable-large-mdpi/holo_land_progressbar_horizontal50.png
deleted file mode 100644
index 42d3bf1..0000000
--- a/tests/res/drawable-large-mdpi/holo_land_progressbar_horizontal50.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-large-mdpi/holo_land_progressbar_large.png b/tests/res/drawable-large-mdpi/holo_land_progressbar_large.png
deleted file mode 100644
index a266699..0000000
--- a/tests/res/drawable-large-mdpi/holo_land_progressbar_large.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-large-mdpi/holo_land_progressbar_small.png b/tests/res/drawable-large-mdpi/holo_land_progressbar_small.png
deleted file mode 100644
index 495c73a..0000000
--- a/tests/res/drawable-large-mdpi/holo_land_progressbar_small.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-large-mdpi/holo_land_progressdialog_horizontal.png b/tests/res/drawable-large-mdpi/holo_land_progressdialog_horizontal.png
deleted file mode 100644
index d6d581a..0000000
--- a/tests/res/drawable-large-mdpi/holo_land_progressdialog_horizontal.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-large-mdpi/holo_land_progressdialog_spinner.png b/tests/res/drawable-large-mdpi/holo_land_progressdialog_spinner.png
deleted file mode 100644
index 2760cac..0000000
--- a/tests/res/drawable-large-mdpi/holo_land_progressdialog_spinner.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-large-mdpi/holo_land_purple.png b/tests/res/drawable-large-mdpi/holo_land_purple.png
deleted file mode 100644
index bd675cf..0000000
--- a/tests/res/drawable-large-mdpi/holo_land_purple.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-large-mdpi/holo_land_radiobutton.png b/tests/res/drawable-large-mdpi/holo_land_radiobutton.png
deleted file mode 100644
index 51d8b24..0000000
--- a/tests/res/drawable-large-mdpi/holo_land_radiobutton.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-large-mdpi/holo_land_radiobutton_checked.png b/tests/res/drawable-large-mdpi/holo_land_radiobutton_checked.png
deleted file mode 100644
index bde1275..0000000
--- a/tests/res/drawable-large-mdpi/holo_land_radiobutton_checked.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-large-mdpi/holo_land_radiogroup_horizontal.png b/tests/res/drawable-large-mdpi/holo_land_radiogroup_horizontal.png
deleted file mode 100644
index 36ab0ba..0000000
--- a/tests/res/drawable-large-mdpi/holo_land_radiogroup_horizontal.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-large-mdpi/holo_land_radiogroup_vertical.png b/tests/res/drawable-large-mdpi/holo_land_radiogroup_vertical.png
deleted file mode 100644
index fa86a42..0000000
--- a/tests/res/drawable-large-mdpi/holo_land_radiogroup_vertical.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-large-mdpi/holo_land_ratingbar_0.png b/tests/res/drawable-large-mdpi/holo_land_ratingbar_0.png
deleted file mode 100644
index 79ce56d..0000000
--- a/tests/res/drawable-large-mdpi/holo_land_ratingbar_0.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-large-mdpi/holo_land_ratingbar_0_pressed.png b/tests/res/drawable-large-mdpi/holo_land_ratingbar_0_pressed.png
deleted file mode 100644
index 280f112..0000000
--- a/tests/res/drawable-large-mdpi/holo_land_ratingbar_0_pressed.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-large-mdpi/holo_land_ratingbar_2point5.png b/tests/res/drawable-large-mdpi/holo_land_ratingbar_2point5.png
deleted file mode 100644
index cef353c..0000000
--- a/tests/res/drawable-large-mdpi/holo_land_ratingbar_2point5.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-large-mdpi/holo_land_ratingbar_2point5_pressed.png b/tests/res/drawable-large-mdpi/holo_land_ratingbar_2point5_pressed.png
deleted file mode 100644
index 43861f0..0000000
--- a/tests/res/drawable-large-mdpi/holo_land_ratingbar_2point5_pressed.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-large-mdpi/holo_land_ratingbar_5.png b/tests/res/drawable-large-mdpi/holo_land_ratingbar_5.png
deleted file mode 100644
index c4dfb98..0000000
--- a/tests/res/drawable-large-mdpi/holo_land_ratingbar_5.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-large-mdpi/holo_land_ratingbar_5_pressed.png b/tests/res/drawable-large-mdpi/holo_land_ratingbar_5_pressed.png
deleted file mode 100644
index 21394c0..0000000
--- a/tests/res/drawable-large-mdpi/holo_land_ratingbar_5_pressed.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-large-mdpi/holo_land_red_dark.png b/tests/res/drawable-large-mdpi/holo_land_red_dark.png
deleted file mode 100644
index d1cd083..0000000
--- a/tests/res/drawable-large-mdpi/holo_land_red_dark.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-large-mdpi/holo_land_red_light.png b/tests/res/drawable-large-mdpi/holo_land_red_light.png
deleted file mode 100644
index be9c322..0000000
--- a/tests/res/drawable-large-mdpi/holo_land_red_light.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-large-mdpi/holo_land_searchview.png b/tests/res/drawable-large-mdpi/holo_land_searchview.png
deleted file mode 100644
index 03cca52..0000000
--- a/tests/res/drawable-large-mdpi/holo_land_searchview.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-large-mdpi/holo_land_searchview_query.png b/tests/res/drawable-large-mdpi/holo_land_searchview_query.png
deleted file mode 100644
index 6648294..0000000
--- a/tests/res/drawable-large-mdpi/holo_land_searchview_query.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-large-mdpi/holo_land_searchview_queryhint.png b/tests/res/drawable-large-mdpi/holo_land_searchview_queryhint.png
deleted file mode 100644
index 9310fb2..0000000
--- a/tests/res/drawable-large-mdpi/holo_land_searchview_queryhint.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-large-mdpi/holo_land_seekbar_0.png b/tests/res/drawable-large-mdpi/holo_land_seekbar_0.png
deleted file mode 100644
index d108ed8..0000000
--- a/tests/res/drawable-large-mdpi/holo_land_seekbar_0.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-large-mdpi/holo_land_seekbar_100.png b/tests/res/drawable-large-mdpi/holo_land_seekbar_100.png
deleted file mode 100644
index cffc154..0000000
--- a/tests/res/drawable-large-mdpi/holo_land_seekbar_100.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-large-mdpi/holo_land_seekbar_50.png b/tests/res/drawable-large-mdpi/holo_land_seekbar_50.png
deleted file mode 100644
index 4ac8cb1..0000000
--- a/tests/res/drawable-large-mdpi/holo_land_seekbar_50.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-large-mdpi/holo_land_spinner.png b/tests/res/drawable-large-mdpi/holo_land_spinner.png
deleted file mode 100644
index 26fe0f0..0000000
--- a/tests/res/drawable-large-mdpi/holo_land_spinner.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-large-mdpi/holo_land_tabhost.png b/tests/res/drawable-large-mdpi/holo_land_tabhost.png
deleted file mode 100644
index 1f40246..0000000
--- a/tests/res/drawable-large-mdpi/holo_land_tabhost.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-large-mdpi/holo_land_textview.png b/tests/res/drawable-large-mdpi/holo_land_textview.png
deleted file mode 100644
index 4c8960c..0000000
--- a/tests/res/drawable-large-mdpi/holo_land_textview.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-large-mdpi/holo_land_toggle_button.png b/tests/res/drawable-large-mdpi/holo_land_toggle_button.png
deleted file mode 100644
index 1efa0d2..0000000
--- a/tests/res/drawable-large-mdpi/holo_land_toggle_button.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-large-mdpi/holo_land_toggle_button_checked.png b/tests/res/drawable-large-mdpi/holo_land_toggle_button_checked.png
deleted file mode 100644
index b63a5cc..0000000
--- a/tests/res/drawable-large-mdpi/holo_land_toggle_button_checked.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-large-mdpi/holo_land_zoomcontrols.png b/tests/res/drawable-large-mdpi/holo_land_zoomcontrols.png
deleted file mode 100644
index 7892bcf..0000000
--- a/tests/res/drawable-large-mdpi/holo_land_zoomcontrols.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-large-mdpi/holo_light_land_actionbar.png b/tests/res/drawable-large-mdpi/holo_light_land_actionbar.png
deleted file mode 100644
index 304d729..0000000
--- a/tests/res/drawable-large-mdpi/holo_light_land_actionbar.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-large-mdpi/holo_light_land_actionbar_action_items.png b/tests/res/drawable-large-mdpi/holo_light_land_actionbar_action_items.png
deleted file mode 100644
index fdb6255..0000000
--- a/tests/res/drawable-large-mdpi/holo_light_land_actionbar_action_items.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-large-mdpi/holo_light_land_actionbar_action_view.png b/tests/res/drawable-large-mdpi/holo_light_land_actionbar_action_view.png
deleted file mode 100644
index e82723a..0000000
--- a/tests/res/drawable-large-mdpi/holo_light_land_actionbar_action_view.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-large-mdpi/holo_light_land_actionbar_home_as_up.png b/tests/res/drawable-large-mdpi/holo_light_land_actionbar_home_as_up.png
deleted file mode 100644
index 10726a7..0000000
--- a/tests/res/drawable-large-mdpi/holo_light_land_actionbar_home_as_up.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-large-mdpi/holo_light_land_actionbar_list.png b/tests/res/drawable-large-mdpi/holo_light_land_actionbar_list.png
deleted file mode 100644
index ac4b719..0000000
--- a/tests/res/drawable-large-mdpi/holo_light_land_actionbar_list.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-large-mdpi/holo_light_land_actionbar_no_icon.png b/tests/res/drawable-large-mdpi/holo_light_land_actionbar_no_icon.png
deleted file mode 100644
index 3c87b08..0000000
--- a/tests/res/drawable-large-mdpi/holo_light_land_actionbar_no_icon.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-large-mdpi/holo_light_land_actionbar_no_title.png b/tests/res/drawable-large-mdpi/holo_light_land_actionbar_no_title.png
deleted file mode 100644
index c4f845f..0000000
--- a/tests/res/drawable-large-mdpi/holo_light_land_actionbar_no_title.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-large-mdpi/holo_light_land_actionbar_tabs.png b/tests/res/drawable-large-mdpi/holo_light_land_actionbar_tabs.png
deleted file mode 100644
index 4cd9e51..0000000
--- a/tests/res/drawable-large-mdpi/holo_light_land_actionbar_tabs.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-large-mdpi/holo_light_land_alertdialog_list.png b/tests/res/drawable-large-mdpi/holo_light_land_alertdialog_list.png
deleted file mode 100644
index 2a8fe43..0000000
--- a/tests/res/drawable-large-mdpi/holo_light_land_alertdialog_list.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-large-mdpi/holo_light_land_alertdialog_multichoice.png b/tests/res/drawable-large-mdpi/holo_light_land_alertdialog_multichoice.png
deleted file mode 100644
index 37317cf..0000000
--- a/tests/res/drawable-large-mdpi/holo_light_land_alertdialog_multichoice.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-large-mdpi/holo_light_land_alertdialog_onebutton.png b/tests/res/drawable-large-mdpi/holo_light_land_alertdialog_onebutton.png
deleted file mode 100644
index 2b4f033..0000000
--- a/tests/res/drawable-large-mdpi/holo_light_land_alertdialog_onebutton.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-large-mdpi/holo_light_land_alertdialog_singlechoice.png b/tests/res/drawable-large-mdpi/holo_light_land_alertdialog_singlechoice.png
deleted file mode 100644
index 077bad6..0000000
--- a/tests/res/drawable-large-mdpi/holo_light_land_alertdialog_singlechoice.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-large-mdpi/holo_light_land_alertdialog_threebuttons.png b/tests/res/drawable-large-mdpi/holo_light_land_alertdialog_threebuttons.png
deleted file mode 100644
index d1ddec3..0000000
--- a/tests/res/drawable-large-mdpi/holo_light_land_alertdialog_threebuttons.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-large-mdpi/holo_light_land_alertdialog_twobuttons.png b/tests/res/drawable-large-mdpi/holo_light_land_alertdialog_twobuttons.png
deleted file mode 100644
index 38b5627..0000000
--- a/tests/res/drawable-large-mdpi/holo_light_land_alertdialog_twobuttons.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-large-mdpi/holo_light_land_blue_bright.png b/tests/res/drawable-large-mdpi/holo_light_land_blue_bright.png
deleted file mode 100644
index 2c9b47a..0000000
--- a/tests/res/drawable-large-mdpi/holo_light_land_blue_bright.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-large-mdpi/holo_light_land_blue_dark.png b/tests/res/drawable-large-mdpi/holo_light_land_blue_dark.png
deleted file mode 100644
index 2f9446c..0000000
--- a/tests/res/drawable-large-mdpi/holo_light_land_blue_dark.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-large-mdpi/holo_light_land_blue_light.png b/tests/res/drawable-large-mdpi/holo_light_land_blue_light.png
deleted file mode 100644
index ce14078..0000000
--- a/tests/res/drawable-large-mdpi/holo_light_land_blue_light.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-large-mdpi/holo_light_land_button.png b/tests/res/drawable-large-mdpi/holo_light_land_button.png
deleted file mode 100644
index 98e6d5f..0000000
--- a/tests/res/drawable-large-mdpi/holo_light_land_button.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-large-mdpi/holo_light_land_button_pressed.png b/tests/res/drawable-large-mdpi/holo_light_land_button_pressed.png
deleted file mode 100644
index 94c82b2..0000000
--- a/tests/res/drawable-large-mdpi/holo_light_land_button_pressed.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-large-mdpi/holo_light_land_calendarview.png b/tests/res/drawable-large-mdpi/holo_light_land_calendarview.png
deleted file mode 100644
index 3c2ed47..0000000
--- a/tests/res/drawable-large-mdpi/holo_light_land_calendarview.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-large-mdpi/holo_light_land_checkbox.png b/tests/res/drawable-large-mdpi/holo_light_land_checkbox.png
deleted file mode 100644
index b4d6daf..0000000
--- a/tests/res/drawable-large-mdpi/holo_light_land_checkbox.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-large-mdpi/holo_light_land_checkbox_checked.png b/tests/res/drawable-large-mdpi/holo_light_land_checkbox_checked.png
deleted file mode 100644
index 5e27734..0000000
--- a/tests/res/drawable-large-mdpi/holo_light_land_checkbox_checked.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-large-mdpi/holo_light_land_edittext.png b/tests/res/drawable-large-mdpi/holo_light_land_edittext.png
deleted file mode 100644
index 0a41325..0000000
--- a/tests/res/drawable-large-mdpi/holo_light_land_edittext.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-large-mdpi/holo_light_land_green_dark.png b/tests/res/drawable-large-mdpi/holo_light_land_green_dark.png
deleted file mode 100644
index f9ae8c4..0000000
--- a/tests/res/drawable-large-mdpi/holo_light_land_green_dark.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-large-mdpi/holo_light_land_green_light.png b/tests/res/drawable-large-mdpi/holo_light_land_green_light.png
deleted file mode 100644
index ec19ed9..0000000
--- a/tests/res/drawable-large-mdpi/holo_light_land_green_light.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-large-mdpi/holo_light_land_orange_dark.png b/tests/res/drawable-large-mdpi/holo_light_land_orange_dark.png
deleted file mode 100644
index 33f5bae..0000000
--- a/tests/res/drawable-large-mdpi/holo_light_land_orange_dark.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-large-mdpi/holo_light_land_orange_light.png b/tests/res/drawable-large-mdpi/holo_light_land_orange_light.png
deleted file mode 100644
index d4184b7..0000000
--- a/tests/res/drawable-large-mdpi/holo_light_land_orange_light.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-large-mdpi/holo_light_land_progressbar.png b/tests/res/drawable-large-mdpi/holo_light_land_progressbar.png
deleted file mode 100644
index e4dd24d..0000000
--- a/tests/res/drawable-large-mdpi/holo_light_land_progressbar.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-large-mdpi/holo_light_land_progressbar_horizontal0.png b/tests/res/drawable-large-mdpi/holo_light_land_progressbar_horizontal0.png
deleted file mode 100644
index 37674f5..0000000
--- a/tests/res/drawable-large-mdpi/holo_light_land_progressbar_horizontal0.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-large-mdpi/holo_light_land_progressbar_horizontal100.png b/tests/res/drawable-large-mdpi/holo_light_land_progressbar_horizontal100.png
deleted file mode 100644
index 3d90314..0000000
--- a/tests/res/drawable-large-mdpi/holo_light_land_progressbar_horizontal100.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-large-mdpi/holo_light_land_progressbar_horizontal50.png b/tests/res/drawable-large-mdpi/holo_light_land_progressbar_horizontal50.png
deleted file mode 100644
index 42d3bf1..0000000
--- a/tests/res/drawable-large-mdpi/holo_light_land_progressbar_horizontal50.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-large-mdpi/holo_light_land_progressbar_large.png b/tests/res/drawable-large-mdpi/holo_light_land_progressbar_large.png
deleted file mode 100644
index a266699..0000000
--- a/tests/res/drawable-large-mdpi/holo_light_land_progressbar_large.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-large-mdpi/holo_light_land_progressbar_small.png b/tests/res/drawable-large-mdpi/holo_light_land_progressbar_small.png
deleted file mode 100644
index 495c73a..0000000
--- a/tests/res/drawable-large-mdpi/holo_light_land_progressbar_small.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-large-mdpi/holo_light_land_progressdialog_horizontal.png b/tests/res/drawable-large-mdpi/holo_light_land_progressdialog_horizontal.png
deleted file mode 100644
index aca81fe..0000000
--- a/tests/res/drawable-large-mdpi/holo_light_land_progressdialog_horizontal.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-large-mdpi/holo_light_land_progressdialog_spinner.png b/tests/res/drawable-large-mdpi/holo_light_land_progressdialog_spinner.png
deleted file mode 100644
index c2a43b6..0000000
--- a/tests/res/drawable-large-mdpi/holo_light_land_progressdialog_spinner.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-large-mdpi/holo_light_land_purple.png b/tests/res/drawable-large-mdpi/holo_light_land_purple.png
deleted file mode 100644
index bd675cf..0000000
--- a/tests/res/drawable-large-mdpi/holo_light_land_purple.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-large-mdpi/holo_light_land_radiobutton.png b/tests/res/drawable-large-mdpi/holo_light_land_radiobutton.png
deleted file mode 100644
index 9cb438e..0000000
--- a/tests/res/drawable-large-mdpi/holo_light_land_radiobutton.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-large-mdpi/holo_light_land_radiobutton_checked.png b/tests/res/drawable-large-mdpi/holo_light_land_radiobutton_checked.png
deleted file mode 100644
index 2999134..0000000
--- a/tests/res/drawable-large-mdpi/holo_light_land_radiobutton_checked.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-large-mdpi/holo_light_land_radiogroup_horizontal.png b/tests/res/drawable-large-mdpi/holo_light_land_radiogroup_horizontal.png
deleted file mode 100644
index e67c2c9..0000000
--- a/tests/res/drawable-large-mdpi/holo_light_land_radiogroup_horizontal.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-large-mdpi/holo_light_land_radiogroup_vertical.png b/tests/res/drawable-large-mdpi/holo_light_land_radiogroup_vertical.png
deleted file mode 100644
index 889c0a4..0000000
--- a/tests/res/drawable-large-mdpi/holo_light_land_radiogroup_vertical.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-large-mdpi/holo_light_land_ratingbar_0.png b/tests/res/drawable-large-mdpi/holo_light_land_ratingbar_0.png
deleted file mode 100644
index cc8427c..0000000
--- a/tests/res/drawable-large-mdpi/holo_light_land_ratingbar_0.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-large-mdpi/holo_light_land_ratingbar_0_pressed.png b/tests/res/drawable-large-mdpi/holo_light_land_ratingbar_0_pressed.png
deleted file mode 100644
index 48a3c69..0000000
--- a/tests/res/drawable-large-mdpi/holo_light_land_ratingbar_0_pressed.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-large-mdpi/holo_light_land_ratingbar_2point5.png b/tests/res/drawable-large-mdpi/holo_light_land_ratingbar_2point5.png
deleted file mode 100644
index fd0783b..0000000
--- a/tests/res/drawable-large-mdpi/holo_light_land_ratingbar_2point5.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-large-mdpi/holo_light_land_ratingbar_2point5_pressed.png b/tests/res/drawable-large-mdpi/holo_light_land_ratingbar_2point5_pressed.png
deleted file mode 100644
index f1c344c..0000000
--- a/tests/res/drawable-large-mdpi/holo_light_land_ratingbar_2point5_pressed.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-large-mdpi/holo_light_land_ratingbar_5.png b/tests/res/drawable-large-mdpi/holo_light_land_ratingbar_5.png
deleted file mode 100644
index baedae5..0000000
--- a/tests/res/drawable-large-mdpi/holo_light_land_ratingbar_5.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-large-mdpi/holo_light_land_ratingbar_5_pressed.png b/tests/res/drawable-large-mdpi/holo_light_land_ratingbar_5_pressed.png
deleted file mode 100644
index 7bd94f0..0000000
--- a/tests/res/drawable-large-mdpi/holo_light_land_ratingbar_5_pressed.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-large-mdpi/holo_light_land_red_dark.png b/tests/res/drawable-large-mdpi/holo_light_land_red_dark.png
deleted file mode 100644
index d1cd083..0000000
--- a/tests/res/drawable-large-mdpi/holo_light_land_red_dark.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-large-mdpi/holo_light_land_red_light.png b/tests/res/drawable-large-mdpi/holo_light_land_red_light.png
deleted file mode 100644
index be9c322..0000000
--- a/tests/res/drawable-large-mdpi/holo_light_land_red_light.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-large-mdpi/holo_light_land_searchview.png b/tests/res/drawable-large-mdpi/holo_light_land_searchview.png
deleted file mode 100644
index 4c7706a..0000000
--- a/tests/res/drawable-large-mdpi/holo_light_land_searchview.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-large-mdpi/holo_light_land_searchview_query.png b/tests/res/drawable-large-mdpi/holo_light_land_searchview_query.png
deleted file mode 100644
index d8fdfb2..0000000
--- a/tests/res/drawable-large-mdpi/holo_light_land_searchview_query.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-large-mdpi/holo_light_land_searchview_queryhint.png b/tests/res/drawable-large-mdpi/holo_light_land_searchview_queryhint.png
deleted file mode 100644
index 29ee7f4..0000000
--- a/tests/res/drawable-large-mdpi/holo_light_land_searchview_queryhint.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-large-mdpi/holo_light_land_seekbar_0.png b/tests/res/drawable-large-mdpi/holo_light_land_seekbar_0.png
deleted file mode 100644
index ad094a5..0000000
--- a/tests/res/drawable-large-mdpi/holo_light_land_seekbar_0.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-large-mdpi/holo_light_land_seekbar_100.png b/tests/res/drawable-large-mdpi/holo_light_land_seekbar_100.png
deleted file mode 100644
index cffc154..0000000
--- a/tests/res/drawable-large-mdpi/holo_light_land_seekbar_100.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-large-mdpi/holo_light_land_seekbar_50.png b/tests/res/drawable-large-mdpi/holo_light_land_seekbar_50.png
deleted file mode 100644
index e1d4f60..0000000
--- a/tests/res/drawable-large-mdpi/holo_light_land_seekbar_50.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-large-mdpi/holo_light_land_spinner.png b/tests/res/drawable-large-mdpi/holo_light_land_spinner.png
deleted file mode 100644
index 9698eaf..0000000
--- a/tests/res/drawable-large-mdpi/holo_light_land_spinner.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-large-mdpi/holo_light_land_tabhost.png b/tests/res/drawable-large-mdpi/holo_light_land_tabhost.png
deleted file mode 100644
index 1f40246..0000000
--- a/tests/res/drawable-large-mdpi/holo_light_land_tabhost.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-large-mdpi/holo_light_land_textview.png b/tests/res/drawable-large-mdpi/holo_light_land_textview.png
deleted file mode 100644
index 7ca9613..0000000
--- a/tests/res/drawable-large-mdpi/holo_light_land_textview.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-large-mdpi/holo_light_land_toggle_button.png b/tests/res/drawable-large-mdpi/holo_light_land_toggle_button.png
deleted file mode 100644
index 9660382..0000000
--- a/tests/res/drawable-large-mdpi/holo_light_land_toggle_button.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-large-mdpi/holo_light_land_toggle_button_checked.png b/tests/res/drawable-large-mdpi/holo_light_land_toggle_button_checked.png
deleted file mode 100644
index 0facd90..0000000
--- a/tests/res/drawable-large-mdpi/holo_light_land_toggle_button_checked.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-large-mdpi/holo_light_land_zoomcontrols.png b/tests/res/drawable-large-mdpi/holo_light_land_zoomcontrols.png
deleted file mode 100644
index 7892bcf..0000000
--- a/tests/res/drawable-large-mdpi/holo_light_land_zoomcontrols.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-large-mdpi/holo_light_port_actionbar.png b/tests/res/drawable-large-mdpi/holo_light_port_actionbar.png
deleted file mode 100644
index 583f7f5..0000000
--- a/tests/res/drawable-large-mdpi/holo_light_port_actionbar.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-large-mdpi/holo_light_port_actionbar_action_items.png b/tests/res/drawable-large-mdpi/holo_light_port_actionbar_action_items.png
deleted file mode 100644
index 275bb0a..0000000
--- a/tests/res/drawable-large-mdpi/holo_light_port_actionbar_action_items.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-large-mdpi/holo_light_port_actionbar_action_view.png b/tests/res/drawable-large-mdpi/holo_light_port_actionbar_action_view.png
deleted file mode 100644
index 68f80ea..0000000
--- a/tests/res/drawable-large-mdpi/holo_light_port_actionbar_action_view.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-large-mdpi/holo_light_port_actionbar_home_as_up.png b/tests/res/drawable-large-mdpi/holo_light_port_actionbar_home_as_up.png
deleted file mode 100644
index 2d0bed1..0000000
--- a/tests/res/drawable-large-mdpi/holo_light_port_actionbar_home_as_up.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-large-mdpi/holo_light_port_actionbar_list.png b/tests/res/drawable-large-mdpi/holo_light_port_actionbar_list.png
deleted file mode 100644
index 503c417..0000000
--- a/tests/res/drawable-large-mdpi/holo_light_port_actionbar_list.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-large-mdpi/holo_light_port_actionbar_no_icon.png b/tests/res/drawable-large-mdpi/holo_light_port_actionbar_no_icon.png
deleted file mode 100644
index e01e29b..0000000
--- a/tests/res/drawable-large-mdpi/holo_light_port_actionbar_no_icon.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-large-mdpi/holo_light_port_actionbar_no_title.png b/tests/res/drawable-large-mdpi/holo_light_port_actionbar_no_title.png
deleted file mode 100644
index 45e8e6e..0000000
--- a/tests/res/drawable-large-mdpi/holo_light_port_actionbar_no_title.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-large-mdpi/holo_light_port_actionbar_tabs.png b/tests/res/drawable-large-mdpi/holo_light_port_actionbar_tabs.png
deleted file mode 100644
index 5478aaf..0000000
--- a/tests/res/drawable-large-mdpi/holo_light_port_actionbar_tabs.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-large-mdpi/holo_light_port_alertdialog_list.png b/tests/res/drawable-large-mdpi/holo_light_port_alertdialog_list.png
deleted file mode 100644
index 2a8fe43..0000000
--- a/tests/res/drawable-large-mdpi/holo_light_port_alertdialog_list.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-large-mdpi/holo_light_port_alertdialog_multichoice.png b/tests/res/drawable-large-mdpi/holo_light_port_alertdialog_multichoice.png
deleted file mode 100644
index 37317cf..0000000
--- a/tests/res/drawable-large-mdpi/holo_light_port_alertdialog_multichoice.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-large-mdpi/holo_light_port_alertdialog_onebutton.png b/tests/res/drawable-large-mdpi/holo_light_port_alertdialog_onebutton.png
deleted file mode 100644
index 2b4f033..0000000
--- a/tests/res/drawable-large-mdpi/holo_light_port_alertdialog_onebutton.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-large-mdpi/holo_light_port_alertdialog_singlechoice.png b/tests/res/drawable-large-mdpi/holo_light_port_alertdialog_singlechoice.png
deleted file mode 100644
index 077bad6..0000000
--- a/tests/res/drawable-large-mdpi/holo_light_port_alertdialog_singlechoice.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-large-mdpi/holo_light_port_alertdialog_threebuttons.png b/tests/res/drawable-large-mdpi/holo_light_port_alertdialog_threebuttons.png
deleted file mode 100644
index d1ddec3..0000000
--- a/tests/res/drawable-large-mdpi/holo_light_port_alertdialog_threebuttons.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-large-mdpi/holo_light_port_alertdialog_twobuttons.png b/tests/res/drawable-large-mdpi/holo_light_port_alertdialog_twobuttons.png
deleted file mode 100644
index 38b5627..0000000
--- a/tests/res/drawable-large-mdpi/holo_light_port_alertdialog_twobuttons.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-large-mdpi/holo_light_port_blue_bright.png b/tests/res/drawable-large-mdpi/holo_light_port_blue_bright.png
deleted file mode 100644
index 2c9b47a..0000000
--- a/tests/res/drawable-large-mdpi/holo_light_port_blue_bright.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-large-mdpi/holo_light_port_blue_dark.png b/tests/res/drawable-large-mdpi/holo_light_port_blue_dark.png
deleted file mode 100644
index 2f9446c..0000000
--- a/tests/res/drawable-large-mdpi/holo_light_port_blue_dark.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-large-mdpi/holo_light_port_blue_light.png b/tests/res/drawable-large-mdpi/holo_light_port_blue_light.png
deleted file mode 100644
index ce14078..0000000
--- a/tests/res/drawable-large-mdpi/holo_light_port_blue_light.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-large-mdpi/holo_light_port_button.png b/tests/res/drawable-large-mdpi/holo_light_port_button.png
deleted file mode 100644
index 98e6d5f..0000000
--- a/tests/res/drawable-large-mdpi/holo_light_port_button.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-large-mdpi/holo_light_port_button_pressed.png b/tests/res/drawable-large-mdpi/holo_light_port_button_pressed.png
deleted file mode 100644
index 94c82b2..0000000
--- a/tests/res/drawable-large-mdpi/holo_light_port_button_pressed.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-large-mdpi/holo_light_port_calendarview.png b/tests/res/drawable-large-mdpi/holo_light_port_calendarview.png
deleted file mode 100644
index 09dac3f..0000000
--- a/tests/res/drawable-large-mdpi/holo_light_port_calendarview.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-large-mdpi/holo_light_port_checkbox.png b/tests/res/drawable-large-mdpi/holo_light_port_checkbox.png
deleted file mode 100644
index b4d6daf..0000000
--- a/tests/res/drawable-large-mdpi/holo_light_port_checkbox.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-large-mdpi/holo_light_port_checkbox_checked.png b/tests/res/drawable-large-mdpi/holo_light_port_checkbox_checked.png
deleted file mode 100644
index 5e27734..0000000
--- a/tests/res/drawable-large-mdpi/holo_light_port_checkbox_checked.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-large-mdpi/holo_light_port_edittext.png b/tests/res/drawable-large-mdpi/holo_light_port_edittext.png
deleted file mode 100644
index ef0b07f..0000000
--- a/tests/res/drawable-large-mdpi/holo_light_port_edittext.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-large-mdpi/holo_light_port_green_dark.png b/tests/res/drawable-large-mdpi/holo_light_port_green_dark.png
deleted file mode 100644
index f9ae8c4..0000000
--- a/tests/res/drawable-large-mdpi/holo_light_port_green_dark.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-large-mdpi/holo_light_port_green_light.png b/tests/res/drawable-large-mdpi/holo_light_port_green_light.png
deleted file mode 100644
index ec19ed9..0000000
--- a/tests/res/drawable-large-mdpi/holo_light_port_green_light.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-large-mdpi/holo_light_port_orange_dark.png b/tests/res/drawable-large-mdpi/holo_light_port_orange_dark.png
deleted file mode 100644
index 33f5bae..0000000
--- a/tests/res/drawable-large-mdpi/holo_light_port_orange_dark.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-large-mdpi/holo_light_port_orange_light.png b/tests/res/drawable-large-mdpi/holo_light_port_orange_light.png
deleted file mode 100644
index d4184b7..0000000
--- a/tests/res/drawable-large-mdpi/holo_light_port_orange_light.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-large-mdpi/holo_light_port_progressbar.png b/tests/res/drawable-large-mdpi/holo_light_port_progressbar.png
deleted file mode 100644
index e4dd24d..0000000
--- a/tests/res/drawable-large-mdpi/holo_light_port_progressbar.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-large-mdpi/holo_light_port_progressbar_horizontal0.png b/tests/res/drawable-large-mdpi/holo_light_port_progressbar_horizontal0.png
deleted file mode 100644
index 81a357c..0000000
--- a/tests/res/drawable-large-mdpi/holo_light_port_progressbar_horizontal0.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-large-mdpi/holo_light_port_progressbar_horizontal100.png b/tests/res/drawable-large-mdpi/holo_light_port_progressbar_horizontal100.png
deleted file mode 100644
index 7e7f0db..0000000
--- a/tests/res/drawable-large-mdpi/holo_light_port_progressbar_horizontal100.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-large-mdpi/holo_light_port_progressbar_horizontal50.png b/tests/res/drawable-large-mdpi/holo_light_port_progressbar_horizontal50.png
deleted file mode 100644
index d5e813b..0000000
--- a/tests/res/drawable-large-mdpi/holo_light_port_progressbar_horizontal50.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-large-mdpi/holo_light_port_progressbar_large.png b/tests/res/drawable-large-mdpi/holo_light_port_progressbar_large.png
deleted file mode 100644
index a266699..0000000
--- a/tests/res/drawable-large-mdpi/holo_light_port_progressbar_large.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-large-mdpi/holo_light_port_progressbar_small.png b/tests/res/drawable-large-mdpi/holo_light_port_progressbar_small.png
deleted file mode 100644
index 495c73a..0000000
--- a/tests/res/drawable-large-mdpi/holo_light_port_progressbar_small.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-large-mdpi/holo_light_port_progressdialog_horizontal.png b/tests/res/drawable-large-mdpi/holo_light_port_progressdialog_horizontal.png
deleted file mode 100644
index aca81fe..0000000
--- a/tests/res/drawable-large-mdpi/holo_light_port_progressdialog_horizontal.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-large-mdpi/holo_light_port_progressdialog_spinner.png b/tests/res/drawable-large-mdpi/holo_light_port_progressdialog_spinner.png
deleted file mode 100644
index c2a43b6..0000000
--- a/tests/res/drawable-large-mdpi/holo_light_port_progressdialog_spinner.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-large-mdpi/holo_light_port_purple.png b/tests/res/drawable-large-mdpi/holo_light_port_purple.png
deleted file mode 100644
index bd675cf..0000000
--- a/tests/res/drawable-large-mdpi/holo_light_port_purple.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-large-mdpi/holo_light_port_radiobutton.png b/tests/res/drawable-large-mdpi/holo_light_port_radiobutton.png
deleted file mode 100644
index 9cb438e..0000000
--- a/tests/res/drawable-large-mdpi/holo_light_port_radiobutton.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-large-mdpi/holo_light_port_radiobutton_checked.png b/tests/res/drawable-large-mdpi/holo_light_port_radiobutton_checked.png
deleted file mode 100644
index 2999134..0000000
--- a/tests/res/drawable-large-mdpi/holo_light_port_radiobutton_checked.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-large-mdpi/holo_light_port_radiogroup_horizontal.png b/tests/res/drawable-large-mdpi/holo_light_port_radiogroup_horizontal.png
deleted file mode 100644
index e67c2c9..0000000
--- a/tests/res/drawable-large-mdpi/holo_light_port_radiogroup_horizontal.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-large-mdpi/holo_light_port_radiogroup_vertical.png b/tests/res/drawable-large-mdpi/holo_light_port_radiogroup_vertical.png
deleted file mode 100644
index 889c0a4..0000000
--- a/tests/res/drawable-large-mdpi/holo_light_port_radiogroup_vertical.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-large-mdpi/holo_light_port_ratingbar_0.png b/tests/res/drawable-large-mdpi/holo_light_port_ratingbar_0.png
deleted file mode 100644
index cc8427c..0000000
--- a/tests/res/drawable-large-mdpi/holo_light_port_ratingbar_0.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-large-mdpi/holo_light_port_ratingbar_0_pressed.png b/tests/res/drawable-large-mdpi/holo_light_port_ratingbar_0_pressed.png
deleted file mode 100644
index 48a3c69..0000000
--- a/tests/res/drawable-large-mdpi/holo_light_port_ratingbar_0_pressed.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-large-mdpi/holo_light_port_ratingbar_2point5.png b/tests/res/drawable-large-mdpi/holo_light_port_ratingbar_2point5.png
deleted file mode 100644
index fd0783b..0000000
--- a/tests/res/drawable-large-mdpi/holo_light_port_ratingbar_2point5.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-large-mdpi/holo_light_port_ratingbar_2point5_pressed.png b/tests/res/drawable-large-mdpi/holo_light_port_ratingbar_2point5_pressed.png
deleted file mode 100644
index f1c344c..0000000
--- a/tests/res/drawable-large-mdpi/holo_light_port_ratingbar_2point5_pressed.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-large-mdpi/holo_light_port_ratingbar_5.png b/tests/res/drawable-large-mdpi/holo_light_port_ratingbar_5.png
deleted file mode 100644
index baedae5..0000000
--- a/tests/res/drawable-large-mdpi/holo_light_port_ratingbar_5.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-large-mdpi/holo_light_port_ratingbar_5_pressed.png b/tests/res/drawable-large-mdpi/holo_light_port_ratingbar_5_pressed.png
deleted file mode 100644
index 7bd94f0..0000000
--- a/tests/res/drawable-large-mdpi/holo_light_port_ratingbar_5_pressed.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-large-mdpi/holo_light_port_red_dark.png b/tests/res/drawable-large-mdpi/holo_light_port_red_dark.png
deleted file mode 100644
index d1cd083..0000000
--- a/tests/res/drawable-large-mdpi/holo_light_port_red_dark.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-large-mdpi/holo_light_port_red_light.png b/tests/res/drawable-large-mdpi/holo_light_port_red_light.png
deleted file mode 100644
index be9c322..0000000
--- a/tests/res/drawable-large-mdpi/holo_light_port_red_light.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-large-mdpi/holo_light_port_searchview.png b/tests/res/drawable-large-mdpi/holo_light_port_searchview.png
deleted file mode 100644
index 20b35c4..0000000
--- a/tests/res/drawable-large-mdpi/holo_light_port_searchview.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-large-mdpi/holo_light_port_searchview_query.png b/tests/res/drawable-large-mdpi/holo_light_port_searchview_query.png
deleted file mode 100644
index 177a521..0000000
--- a/tests/res/drawable-large-mdpi/holo_light_port_searchview_query.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-large-mdpi/holo_light_port_searchview_queryhint.png b/tests/res/drawable-large-mdpi/holo_light_port_searchview_queryhint.png
deleted file mode 100644
index 71958f0..0000000
--- a/tests/res/drawable-large-mdpi/holo_light_port_searchview_queryhint.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-large-mdpi/holo_light_port_seekbar_0.png b/tests/res/drawable-large-mdpi/holo_light_port_seekbar_0.png
deleted file mode 100644
index 029c0d4..0000000
--- a/tests/res/drawable-large-mdpi/holo_light_port_seekbar_0.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-large-mdpi/holo_light_port_seekbar_100.png b/tests/res/drawable-large-mdpi/holo_light_port_seekbar_100.png
deleted file mode 100644
index 439732c..0000000
--- a/tests/res/drawable-large-mdpi/holo_light_port_seekbar_100.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-large-mdpi/holo_light_port_seekbar_50.png b/tests/res/drawable-large-mdpi/holo_light_port_seekbar_50.png
deleted file mode 100644
index dc66874..0000000
--- a/tests/res/drawable-large-mdpi/holo_light_port_seekbar_50.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-large-mdpi/holo_light_port_spinner.png b/tests/res/drawable-large-mdpi/holo_light_port_spinner.png
deleted file mode 100644
index 9698eaf..0000000
--- a/tests/res/drawable-large-mdpi/holo_light_port_spinner.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-large-mdpi/holo_light_port_tabhost.png b/tests/res/drawable-large-mdpi/holo_light_port_tabhost.png
deleted file mode 100644
index e0dc779..0000000
--- a/tests/res/drawable-large-mdpi/holo_light_port_tabhost.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-large-mdpi/holo_light_port_textview.png b/tests/res/drawable-large-mdpi/holo_light_port_textview.png
deleted file mode 100644
index 7ca9613..0000000
--- a/tests/res/drawable-large-mdpi/holo_light_port_textview.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-large-mdpi/holo_light_port_toggle_button.png b/tests/res/drawable-large-mdpi/holo_light_port_toggle_button.png
deleted file mode 100644
index 9660382..0000000
--- a/tests/res/drawable-large-mdpi/holo_light_port_toggle_button.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-large-mdpi/holo_light_port_toggle_button_checked.png b/tests/res/drawable-large-mdpi/holo_light_port_toggle_button_checked.png
deleted file mode 100644
index 0facd90..0000000
--- a/tests/res/drawable-large-mdpi/holo_light_port_toggle_button_checked.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-large-mdpi/holo_light_port_zoomcontrols.png b/tests/res/drawable-large-mdpi/holo_light_port_zoomcontrols.png
deleted file mode 100644
index 7892bcf..0000000
--- a/tests/res/drawable-large-mdpi/holo_light_port_zoomcontrols.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-large-mdpi/holo_port_actionbar.png b/tests/res/drawable-large-mdpi/holo_port_actionbar.png
deleted file mode 100644
index 239cb23..0000000
--- a/tests/res/drawable-large-mdpi/holo_port_actionbar.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-large-mdpi/holo_port_actionbar_action_items.png b/tests/res/drawable-large-mdpi/holo_port_actionbar_action_items.png
deleted file mode 100644
index c6388af..0000000
--- a/tests/res/drawable-large-mdpi/holo_port_actionbar_action_items.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-large-mdpi/holo_port_actionbar_action_view.png b/tests/res/drawable-large-mdpi/holo_port_actionbar_action_view.png
deleted file mode 100644
index 1120c27..0000000
--- a/tests/res/drawable-large-mdpi/holo_port_actionbar_action_view.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-large-mdpi/holo_port_actionbar_home_as_up.png b/tests/res/drawable-large-mdpi/holo_port_actionbar_home_as_up.png
deleted file mode 100644
index c3870dc..0000000
--- a/tests/res/drawable-large-mdpi/holo_port_actionbar_home_as_up.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-large-mdpi/holo_port_actionbar_list.png b/tests/res/drawable-large-mdpi/holo_port_actionbar_list.png
deleted file mode 100644
index 8fb0c92..0000000
--- a/tests/res/drawable-large-mdpi/holo_port_actionbar_list.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-large-mdpi/holo_port_actionbar_no_icon.png b/tests/res/drawable-large-mdpi/holo_port_actionbar_no_icon.png
deleted file mode 100644
index 2042c83..0000000
--- a/tests/res/drawable-large-mdpi/holo_port_actionbar_no_icon.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-large-mdpi/holo_port_actionbar_no_title.png b/tests/res/drawable-large-mdpi/holo_port_actionbar_no_title.png
deleted file mode 100644
index 1738684..0000000
--- a/tests/res/drawable-large-mdpi/holo_port_actionbar_no_title.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-large-mdpi/holo_port_actionbar_tabs.png b/tests/res/drawable-large-mdpi/holo_port_actionbar_tabs.png
deleted file mode 100644
index 8936215..0000000
--- a/tests/res/drawable-large-mdpi/holo_port_actionbar_tabs.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-large-mdpi/holo_port_alertdialog_list.png b/tests/res/drawable-large-mdpi/holo_port_alertdialog_list.png
deleted file mode 100644
index 091f5c6..0000000
--- a/tests/res/drawable-large-mdpi/holo_port_alertdialog_list.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-large-mdpi/holo_port_alertdialog_multichoice.png b/tests/res/drawable-large-mdpi/holo_port_alertdialog_multichoice.png
deleted file mode 100644
index fa2616e..0000000
--- a/tests/res/drawable-large-mdpi/holo_port_alertdialog_multichoice.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-large-mdpi/holo_port_alertdialog_onebutton.png b/tests/res/drawable-large-mdpi/holo_port_alertdialog_onebutton.png
deleted file mode 100644
index 43d40eb..0000000
--- a/tests/res/drawable-large-mdpi/holo_port_alertdialog_onebutton.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-large-mdpi/holo_port_alertdialog_singlechoice.png b/tests/res/drawable-large-mdpi/holo_port_alertdialog_singlechoice.png
deleted file mode 100644
index 5682bc8..0000000
--- a/tests/res/drawable-large-mdpi/holo_port_alertdialog_singlechoice.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-large-mdpi/holo_port_alertdialog_threebuttons.png b/tests/res/drawable-large-mdpi/holo_port_alertdialog_threebuttons.png
deleted file mode 100644
index 78b7029..0000000
--- a/tests/res/drawable-large-mdpi/holo_port_alertdialog_threebuttons.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-large-mdpi/holo_port_alertdialog_twobuttons.png b/tests/res/drawable-large-mdpi/holo_port_alertdialog_twobuttons.png
deleted file mode 100644
index 3fbcc9c..0000000
--- a/tests/res/drawable-large-mdpi/holo_port_alertdialog_twobuttons.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-large-mdpi/holo_port_blue_bright.png b/tests/res/drawable-large-mdpi/holo_port_blue_bright.png
deleted file mode 100644
index 2c9b47a..0000000
--- a/tests/res/drawable-large-mdpi/holo_port_blue_bright.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-large-mdpi/holo_port_blue_dark.png b/tests/res/drawable-large-mdpi/holo_port_blue_dark.png
deleted file mode 100644
index 2f9446c..0000000
--- a/tests/res/drawable-large-mdpi/holo_port_blue_dark.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-large-mdpi/holo_port_blue_light.png b/tests/res/drawable-large-mdpi/holo_port_blue_light.png
deleted file mode 100644
index ce14078..0000000
--- a/tests/res/drawable-large-mdpi/holo_port_blue_light.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-large-mdpi/holo_port_button.png b/tests/res/drawable-large-mdpi/holo_port_button.png
deleted file mode 100644
index 25cfc2d..0000000
--- a/tests/res/drawable-large-mdpi/holo_port_button.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-large-mdpi/holo_port_button_pressed.png b/tests/res/drawable-large-mdpi/holo_port_button_pressed.png
deleted file mode 100644
index 6b1e5d2..0000000
--- a/tests/res/drawable-large-mdpi/holo_port_button_pressed.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-large-mdpi/holo_port_calendarview.png b/tests/res/drawable-large-mdpi/holo_port_calendarview.png
deleted file mode 100644
index 6801de6..0000000
--- a/tests/res/drawable-large-mdpi/holo_port_calendarview.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-large-mdpi/holo_port_checkbox.png b/tests/res/drawable-large-mdpi/holo_port_checkbox.png
deleted file mode 100644
index 1c8f6ed..0000000
--- a/tests/res/drawable-large-mdpi/holo_port_checkbox.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-large-mdpi/holo_port_checkbox_checked.png b/tests/res/drawable-large-mdpi/holo_port_checkbox_checked.png
deleted file mode 100644
index 2df82f3..0000000
--- a/tests/res/drawable-large-mdpi/holo_port_checkbox_checked.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-large-mdpi/holo_port_edittext.png b/tests/res/drawable-large-mdpi/holo_port_edittext.png
deleted file mode 100644
index 9cc62f0..0000000
--- a/tests/res/drawable-large-mdpi/holo_port_edittext.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-large-mdpi/holo_port_green_dark.png b/tests/res/drawable-large-mdpi/holo_port_green_dark.png
deleted file mode 100644
index f9ae8c4..0000000
--- a/tests/res/drawable-large-mdpi/holo_port_green_dark.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-large-mdpi/holo_port_green_light.png b/tests/res/drawable-large-mdpi/holo_port_green_light.png
deleted file mode 100644
index ec19ed9..0000000
--- a/tests/res/drawable-large-mdpi/holo_port_green_light.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-large-mdpi/holo_port_orange_dark.png b/tests/res/drawable-large-mdpi/holo_port_orange_dark.png
deleted file mode 100644
index 33f5bae..0000000
--- a/tests/res/drawable-large-mdpi/holo_port_orange_dark.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-large-mdpi/holo_port_orange_light.png b/tests/res/drawable-large-mdpi/holo_port_orange_light.png
deleted file mode 100644
index d4184b7..0000000
--- a/tests/res/drawable-large-mdpi/holo_port_orange_light.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-large-mdpi/holo_port_progressbar.png b/tests/res/drawable-large-mdpi/holo_port_progressbar.png
deleted file mode 100644
index e4dd24d..0000000
--- a/tests/res/drawable-large-mdpi/holo_port_progressbar.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-large-mdpi/holo_port_progressbar_horizontal0.png b/tests/res/drawable-large-mdpi/holo_port_progressbar_horizontal0.png
deleted file mode 100644
index 81a357c..0000000
--- a/tests/res/drawable-large-mdpi/holo_port_progressbar_horizontal0.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-large-mdpi/holo_port_progressbar_horizontal100.png b/tests/res/drawable-large-mdpi/holo_port_progressbar_horizontal100.png
deleted file mode 100644
index 7e7f0db..0000000
--- a/tests/res/drawable-large-mdpi/holo_port_progressbar_horizontal100.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-large-mdpi/holo_port_progressbar_horizontal50.png b/tests/res/drawable-large-mdpi/holo_port_progressbar_horizontal50.png
deleted file mode 100644
index d5e813b..0000000
--- a/tests/res/drawable-large-mdpi/holo_port_progressbar_horizontal50.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-large-mdpi/holo_port_progressbar_large.png b/tests/res/drawable-large-mdpi/holo_port_progressbar_large.png
deleted file mode 100644
index a266699..0000000
--- a/tests/res/drawable-large-mdpi/holo_port_progressbar_large.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-large-mdpi/holo_port_progressbar_small.png b/tests/res/drawable-large-mdpi/holo_port_progressbar_small.png
deleted file mode 100644
index 495c73a..0000000
--- a/tests/res/drawable-large-mdpi/holo_port_progressbar_small.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-large-mdpi/holo_port_progressdialog_horizontal.png b/tests/res/drawable-large-mdpi/holo_port_progressdialog_horizontal.png
deleted file mode 100644
index d6d581a..0000000
--- a/tests/res/drawable-large-mdpi/holo_port_progressdialog_horizontal.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-large-mdpi/holo_port_progressdialog_spinner.png b/tests/res/drawable-large-mdpi/holo_port_progressdialog_spinner.png
deleted file mode 100644
index 2760cac..0000000
--- a/tests/res/drawable-large-mdpi/holo_port_progressdialog_spinner.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-large-mdpi/holo_port_purple.png b/tests/res/drawable-large-mdpi/holo_port_purple.png
deleted file mode 100644
index bd675cf..0000000
--- a/tests/res/drawable-large-mdpi/holo_port_purple.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-large-mdpi/holo_port_radiobutton.png b/tests/res/drawable-large-mdpi/holo_port_radiobutton.png
deleted file mode 100644
index 51d8b24..0000000
--- a/tests/res/drawable-large-mdpi/holo_port_radiobutton.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-large-mdpi/holo_port_radiobutton_checked.png b/tests/res/drawable-large-mdpi/holo_port_radiobutton_checked.png
deleted file mode 100644
index bde1275..0000000
--- a/tests/res/drawable-large-mdpi/holo_port_radiobutton_checked.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-large-mdpi/holo_port_radiogroup_horizontal.png b/tests/res/drawable-large-mdpi/holo_port_radiogroup_horizontal.png
deleted file mode 100644
index 36ab0ba..0000000
--- a/tests/res/drawable-large-mdpi/holo_port_radiogroup_horizontal.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-large-mdpi/holo_port_radiogroup_vertical.png b/tests/res/drawable-large-mdpi/holo_port_radiogroup_vertical.png
deleted file mode 100644
index fa86a42..0000000
--- a/tests/res/drawable-large-mdpi/holo_port_radiogroup_vertical.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-large-mdpi/holo_port_ratingbar_0.png b/tests/res/drawable-large-mdpi/holo_port_ratingbar_0.png
deleted file mode 100644
index 79ce56d..0000000
--- a/tests/res/drawable-large-mdpi/holo_port_ratingbar_0.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-large-mdpi/holo_port_ratingbar_0_pressed.png b/tests/res/drawable-large-mdpi/holo_port_ratingbar_0_pressed.png
deleted file mode 100644
index 280f112..0000000
--- a/tests/res/drawable-large-mdpi/holo_port_ratingbar_0_pressed.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-large-mdpi/holo_port_ratingbar_2point5.png b/tests/res/drawable-large-mdpi/holo_port_ratingbar_2point5.png
deleted file mode 100644
index cef353c..0000000
--- a/tests/res/drawable-large-mdpi/holo_port_ratingbar_2point5.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-large-mdpi/holo_port_ratingbar_2point5_pressed.png b/tests/res/drawable-large-mdpi/holo_port_ratingbar_2point5_pressed.png
deleted file mode 100644
index 43861f0..0000000
--- a/tests/res/drawable-large-mdpi/holo_port_ratingbar_2point5_pressed.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-large-mdpi/holo_port_ratingbar_5.png b/tests/res/drawable-large-mdpi/holo_port_ratingbar_5.png
deleted file mode 100644
index c4dfb98..0000000
--- a/tests/res/drawable-large-mdpi/holo_port_ratingbar_5.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-large-mdpi/holo_port_ratingbar_5_pressed.png b/tests/res/drawable-large-mdpi/holo_port_ratingbar_5_pressed.png
deleted file mode 100644
index 21394c0..0000000
--- a/tests/res/drawable-large-mdpi/holo_port_ratingbar_5_pressed.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-large-mdpi/holo_port_red_dark.png b/tests/res/drawable-large-mdpi/holo_port_red_dark.png
deleted file mode 100644
index d1cd083..0000000
--- a/tests/res/drawable-large-mdpi/holo_port_red_dark.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-large-mdpi/holo_port_red_light.png b/tests/res/drawable-large-mdpi/holo_port_red_light.png
deleted file mode 100644
index be9c322..0000000
--- a/tests/res/drawable-large-mdpi/holo_port_red_light.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-large-mdpi/holo_port_searchview.png b/tests/res/drawable-large-mdpi/holo_port_searchview.png
deleted file mode 100644
index 6204058..0000000
--- a/tests/res/drawable-large-mdpi/holo_port_searchview.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-large-mdpi/holo_port_searchview_query.png b/tests/res/drawable-large-mdpi/holo_port_searchview_query.png
deleted file mode 100644
index d7b0665..0000000
--- a/tests/res/drawable-large-mdpi/holo_port_searchview_query.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-large-mdpi/holo_port_searchview_queryhint.png b/tests/res/drawable-large-mdpi/holo_port_searchview_queryhint.png
deleted file mode 100644
index 75d8821..0000000
--- a/tests/res/drawable-large-mdpi/holo_port_searchview_queryhint.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-large-mdpi/holo_port_seekbar_0.png b/tests/res/drawable-large-mdpi/holo_port_seekbar_0.png
deleted file mode 100644
index 8eb7f64..0000000
--- a/tests/res/drawable-large-mdpi/holo_port_seekbar_0.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-large-mdpi/holo_port_seekbar_100.png b/tests/res/drawable-large-mdpi/holo_port_seekbar_100.png
deleted file mode 100644
index 439732c..0000000
--- a/tests/res/drawable-large-mdpi/holo_port_seekbar_100.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-large-mdpi/holo_port_seekbar_50.png b/tests/res/drawable-large-mdpi/holo_port_seekbar_50.png
deleted file mode 100644
index 1bd6de0..0000000
--- a/tests/res/drawable-large-mdpi/holo_port_seekbar_50.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-large-mdpi/holo_port_spinner.png b/tests/res/drawable-large-mdpi/holo_port_spinner.png
deleted file mode 100644
index 26fe0f0..0000000
--- a/tests/res/drawable-large-mdpi/holo_port_spinner.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-large-mdpi/holo_port_tabhost.png b/tests/res/drawable-large-mdpi/holo_port_tabhost.png
deleted file mode 100644
index e0dc779..0000000
--- a/tests/res/drawable-large-mdpi/holo_port_tabhost.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-large-mdpi/holo_port_textview.png b/tests/res/drawable-large-mdpi/holo_port_textview.png
deleted file mode 100644
index 4c8960c..0000000
--- a/tests/res/drawable-large-mdpi/holo_port_textview.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-large-mdpi/holo_port_toggle_button.png b/tests/res/drawable-large-mdpi/holo_port_toggle_button.png
deleted file mode 100644
index 1efa0d2..0000000
--- a/tests/res/drawable-large-mdpi/holo_port_toggle_button.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-large-mdpi/holo_port_toggle_button_checked.png b/tests/res/drawable-large-mdpi/holo_port_toggle_button_checked.png
deleted file mode 100644
index b63a5cc..0000000
--- a/tests/res/drawable-large-mdpi/holo_port_toggle_button_checked.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-large-mdpi/holo_port_zoomcontrols.png b/tests/res/drawable-large-mdpi/holo_port_zoomcontrols.png
deleted file mode 100644
index 7892bcf..0000000
--- a/tests/res/drawable-large-mdpi/holo_port_zoomcontrols.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_land_actionbar.png b/tests/res/drawable-mdpi/holo_land_actionbar.png
deleted file mode 100644
index 629f7db..0000000
--- a/tests/res/drawable-mdpi/holo_land_actionbar.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_land_actionbar_action_items.png b/tests/res/drawable-mdpi/holo_land_actionbar_action_items.png
deleted file mode 100644
index 494e7af..0000000
--- a/tests/res/drawable-mdpi/holo_land_actionbar_action_items.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_land_actionbar_action_view.png b/tests/res/drawable-mdpi/holo_land_actionbar_action_view.png
deleted file mode 100644
index f843280..0000000
--- a/tests/res/drawable-mdpi/holo_land_actionbar_action_view.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_land_actionbar_home_as_up.png b/tests/res/drawable-mdpi/holo_land_actionbar_home_as_up.png
deleted file mode 100644
index 9e13a33..0000000
--- a/tests/res/drawable-mdpi/holo_land_actionbar_home_as_up.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_land_actionbar_list.png b/tests/res/drawable-mdpi/holo_land_actionbar_list.png
deleted file mode 100644
index 48d60e1..0000000
--- a/tests/res/drawable-mdpi/holo_land_actionbar_list.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_land_actionbar_no_icon.png b/tests/res/drawable-mdpi/holo_land_actionbar_no_icon.png
deleted file mode 100644
index c5fd6f9..0000000
--- a/tests/res/drawable-mdpi/holo_land_actionbar_no_icon.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_land_actionbar_no_title.png b/tests/res/drawable-mdpi/holo_land_actionbar_no_title.png
deleted file mode 100644
index 90bf752..0000000
--- a/tests/res/drawable-mdpi/holo_land_actionbar_no_title.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_land_actionbar_tabs.png b/tests/res/drawable-mdpi/holo_land_actionbar_tabs.png
deleted file mode 100644
index a15b528..0000000
--- a/tests/res/drawable-mdpi/holo_land_actionbar_tabs.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_land_alertdialog_list.png b/tests/res/drawable-mdpi/holo_land_alertdialog_list.png
deleted file mode 100644
index 03b2e0f..0000000
--- a/tests/res/drawable-mdpi/holo_land_alertdialog_list.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_land_alertdialog_multichoice.png b/tests/res/drawable-mdpi/holo_land_alertdialog_multichoice.png
deleted file mode 100644
index 0badbb7..0000000
--- a/tests/res/drawable-mdpi/holo_land_alertdialog_multichoice.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_land_alertdialog_onebutton.png b/tests/res/drawable-mdpi/holo_land_alertdialog_onebutton.png
deleted file mode 100644
index b2fe321..0000000
--- a/tests/res/drawable-mdpi/holo_land_alertdialog_onebutton.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_land_alertdialog_singlechoice.png b/tests/res/drawable-mdpi/holo_land_alertdialog_singlechoice.png
deleted file mode 100644
index fa91e62..0000000
--- a/tests/res/drawable-mdpi/holo_land_alertdialog_singlechoice.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_land_alertdialog_threebuttons.png b/tests/res/drawable-mdpi/holo_land_alertdialog_threebuttons.png
deleted file mode 100644
index a55987a..0000000
--- a/tests/res/drawable-mdpi/holo_land_alertdialog_threebuttons.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_land_alertdialog_twobuttons.png b/tests/res/drawable-mdpi/holo_land_alertdialog_twobuttons.png
deleted file mode 100644
index 7731a1c..0000000
--- a/tests/res/drawable-mdpi/holo_land_alertdialog_twobuttons.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_land_blue_bright.png b/tests/res/drawable-mdpi/holo_land_blue_bright.png
deleted file mode 100644
index 6037326..0000000
--- a/tests/res/drawable-mdpi/holo_land_blue_bright.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_land_blue_dark.png b/tests/res/drawable-mdpi/holo_land_blue_dark.png
deleted file mode 100644
index 289c582..0000000
--- a/tests/res/drawable-mdpi/holo_land_blue_dark.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_land_blue_light.png b/tests/res/drawable-mdpi/holo_land_blue_light.png
deleted file mode 100644
index aecb9df..0000000
--- a/tests/res/drawable-mdpi/holo_land_blue_light.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_land_button.png b/tests/res/drawable-mdpi/holo_land_button.png
deleted file mode 100644
index 25cfc2d..0000000
--- a/tests/res/drawable-mdpi/holo_land_button.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_land_button_pressed.png b/tests/res/drawable-mdpi/holo_land_button_pressed.png
deleted file mode 100644
index 6b1e5d2..0000000
--- a/tests/res/drawable-mdpi/holo_land_button_pressed.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_land_calendarview.png b/tests/res/drawable-mdpi/holo_land_calendarview.png
deleted file mode 100644
index 34008c2..0000000
--- a/tests/res/drawable-mdpi/holo_land_calendarview.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_land_checkbox.png b/tests/res/drawable-mdpi/holo_land_checkbox.png
deleted file mode 100644
index 1c8f6ed..0000000
--- a/tests/res/drawable-mdpi/holo_land_checkbox.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_land_checkbox_checked.png b/tests/res/drawable-mdpi/holo_land_checkbox_checked.png
deleted file mode 100644
index 2df82f3..0000000
--- a/tests/res/drawable-mdpi/holo_land_checkbox_checked.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_land_edittext.png b/tests/res/drawable-mdpi/holo_land_edittext.png
deleted file mode 100644
index 0d1095c..0000000
--- a/tests/res/drawable-mdpi/holo_land_edittext.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_land_green_dark.png b/tests/res/drawable-mdpi/holo_land_green_dark.png
deleted file mode 100644
index b231719..0000000
--- a/tests/res/drawable-mdpi/holo_land_green_dark.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_land_green_light.png b/tests/res/drawable-mdpi/holo_land_green_light.png
deleted file mode 100644
index e8e86c1..0000000
--- a/tests/res/drawable-mdpi/holo_land_green_light.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_land_orange_dark.png b/tests/res/drawable-mdpi/holo_land_orange_dark.png
deleted file mode 100644
index 44961ec..0000000
--- a/tests/res/drawable-mdpi/holo_land_orange_dark.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_land_orange_light.png b/tests/res/drawable-mdpi/holo_land_orange_light.png
deleted file mode 100644
index 3f8dfb3..0000000
--- a/tests/res/drawable-mdpi/holo_land_orange_light.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_land_progressbar.png b/tests/res/drawable-mdpi/holo_land_progressbar.png
deleted file mode 100644
index e4dd24d..0000000
--- a/tests/res/drawable-mdpi/holo_land_progressbar.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_land_progressbar_horizontal0.png b/tests/res/drawable-mdpi/holo_land_progressbar_horizontal0.png
deleted file mode 100644
index 6387f3d..0000000
--- a/tests/res/drawable-mdpi/holo_land_progressbar_horizontal0.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_land_progressbar_horizontal100.png b/tests/res/drawable-mdpi/holo_land_progressbar_horizontal100.png
deleted file mode 100644
index 21ed2ca..0000000
--- a/tests/res/drawable-mdpi/holo_land_progressbar_horizontal100.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_land_progressbar_horizontal50.png b/tests/res/drawable-mdpi/holo_land_progressbar_horizontal50.png
deleted file mode 100644
index 6ee425f..0000000
--- a/tests/res/drawable-mdpi/holo_land_progressbar_horizontal50.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_land_progressbar_large.png b/tests/res/drawable-mdpi/holo_land_progressbar_large.png
deleted file mode 100644
index a266699..0000000
--- a/tests/res/drawable-mdpi/holo_land_progressbar_large.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_land_progressbar_small.png b/tests/res/drawable-mdpi/holo_land_progressbar_small.png
deleted file mode 100644
index 495c73a..0000000
--- a/tests/res/drawable-mdpi/holo_land_progressbar_small.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_land_progressdialog_horizontal.png b/tests/res/drawable-mdpi/holo_land_progressdialog_horizontal.png
deleted file mode 100644
index a8c1ac3..0000000
--- a/tests/res/drawable-mdpi/holo_land_progressdialog_horizontal.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_land_progressdialog_spinner.png b/tests/res/drawable-mdpi/holo_land_progressdialog_spinner.png
deleted file mode 100644
index 439518a..0000000
--- a/tests/res/drawable-mdpi/holo_land_progressdialog_spinner.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_land_purple.png b/tests/res/drawable-mdpi/holo_land_purple.png
deleted file mode 100644
index d2a004e..0000000
--- a/tests/res/drawable-mdpi/holo_land_purple.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_land_radiobutton.png b/tests/res/drawable-mdpi/holo_land_radiobutton.png
deleted file mode 100644
index 51d8b24..0000000
--- a/tests/res/drawable-mdpi/holo_land_radiobutton.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_land_radiobutton_checked.png b/tests/res/drawable-mdpi/holo_land_radiobutton_checked.png
deleted file mode 100644
index bde1275..0000000
--- a/tests/res/drawable-mdpi/holo_land_radiobutton_checked.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_land_radiogroup_horizontal.png b/tests/res/drawable-mdpi/holo_land_radiogroup_horizontal.png
deleted file mode 100644
index 36ab0ba..0000000
--- a/tests/res/drawable-mdpi/holo_land_radiogroup_horizontal.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_land_radiogroup_vertical.png b/tests/res/drawable-mdpi/holo_land_radiogroup_vertical.png
deleted file mode 100644
index fa86a42..0000000
--- a/tests/res/drawable-mdpi/holo_land_radiogroup_vertical.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_land_ratingbar_0.png b/tests/res/drawable-mdpi/holo_land_ratingbar_0.png
deleted file mode 100644
index 79ce56d..0000000
--- a/tests/res/drawable-mdpi/holo_land_ratingbar_0.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_land_ratingbar_0_pressed.png b/tests/res/drawable-mdpi/holo_land_ratingbar_0_pressed.png
deleted file mode 100644
index 280f112..0000000
--- a/tests/res/drawable-mdpi/holo_land_ratingbar_0_pressed.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_land_ratingbar_2point5.png b/tests/res/drawable-mdpi/holo_land_ratingbar_2point5.png
deleted file mode 100644
index cef353c..0000000
--- a/tests/res/drawable-mdpi/holo_land_ratingbar_2point5.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_land_ratingbar_2point5_pressed.png b/tests/res/drawable-mdpi/holo_land_ratingbar_2point5_pressed.png
deleted file mode 100644
index 43861f0..0000000
--- a/tests/res/drawable-mdpi/holo_land_ratingbar_2point5_pressed.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_land_ratingbar_5.png b/tests/res/drawable-mdpi/holo_land_ratingbar_5.png
deleted file mode 100644
index c4dfb98..0000000
--- a/tests/res/drawable-mdpi/holo_land_ratingbar_5.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_land_ratingbar_5_pressed.png b/tests/res/drawable-mdpi/holo_land_ratingbar_5_pressed.png
deleted file mode 100644
index 21394c0..0000000
--- a/tests/res/drawable-mdpi/holo_land_ratingbar_5_pressed.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_land_red_dark.png b/tests/res/drawable-mdpi/holo_land_red_dark.png
deleted file mode 100644
index fd9aced..0000000
--- a/tests/res/drawable-mdpi/holo_land_red_dark.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_land_red_light.png b/tests/res/drawable-mdpi/holo_land_red_light.png
deleted file mode 100644
index 2555dc7..0000000
--- a/tests/res/drawable-mdpi/holo_land_red_light.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_land_searchview.png b/tests/res/drawable-mdpi/holo_land_searchview.png
deleted file mode 100644
index 7e48423..0000000
--- a/tests/res/drawable-mdpi/holo_land_searchview.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_land_searchview_query.png b/tests/res/drawable-mdpi/holo_land_searchview_query.png
deleted file mode 100644
index 57a66a1..0000000
--- a/tests/res/drawable-mdpi/holo_land_searchview_query.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_land_searchview_queryhint.png b/tests/res/drawable-mdpi/holo_land_searchview_queryhint.png
deleted file mode 100644
index 69cc2b2..0000000
--- a/tests/res/drawable-mdpi/holo_land_searchview_queryhint.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_land_seekbar_0.png b/tests/res/drawable-mdpi/holo_land_seekbar_0.png
deleted file mode 100644
index c4dddbb..0000000
--- a/tests/res/drawable-mdpi/holo_land_seekbar_0.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_land_seekbar_100.png b/tests/res/drawable-mdpi/holo_land_seekbar_100.png
deleted file mode 100644
index 1979fb4..0000000
--- a/tests/res/drawable-mdpi/holo_land_seekbar_100.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_land_seekbar_50.png b/tests/res/drawable-mdpi/holo_land_seekbar_50.png
deleted file mode 100644
index 79b91ae..0000000
--- a/tests/res/drawable-mdpi/holo_land_seekbar_50.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_land_spinner.png b/tests/res/drawable-mdpi/holo_land_spinner.png
deleted file mode 100644
index c1f5c6a..0000000
--- a/tests/res/drawable-mdpi/holo_land_spinner.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_land_tabhost.png b/tests/res/drawable-mdpi/holo_land_tabhost.png
deleted file mode 100644
index 8739702..0000000
--- a/tests/res/drawable-mdpi/holo_land_tabhost.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_land_textview.png b/tests/res/drawable-mdpi/holo_land_textview.png
deleted file mode 100644
index 076f242..0000000
--- a/tests/res/drawable-mdpi/holo_land_textview.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_land_toggle_button.png b/tests/res/drawable-mdpi/holo_land_toggle_button.png
deleted file mode 100644
index 1efa0d2..0000000
--- a/tests/res/drawable-mdpi/holo_land_toggle_button.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_land_toggle_button_checked.png b/tests/res/drawable-mdpi/holo_land_toggle_button_checked.png
deleted file mode 100644
index b63a5cc..0000000
--- a/tests/res/drawable-mdpi/holo_land_toggle_button_checked.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_light_land_actionbar.png b/tests/res/drawable-mdpi/holo_light_land_actionbar.png
deleted file mode 100644
index 46d4c4f..0000000
--- a/tests/res/drawable-mdpi/holo_light_land_actionbar.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_light_land_actionbar_action_items.png b/tests/res/drawable-mdpi/holo_light_land_actionbar_action_items.png
deleted file mode 100644
index 7063cb3..0000000
--- a/tests/res/drawable-mdpi/holo_light_land_actionbar_action_items.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_light_land_actionbar_action_view.png b/tests/res/drawable-mdpi/holo_light_land_actionbar_action_view.png
deleted file mode 100644
index 880bda1..0000000
--- a/tests/res/drawable-mdpi/holo_light_land_actionbar_action_view.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_light_land_actionbar_home_as_up.png b/tests/res/drawable-mdpi/holo_light_land_actionbar_home_as_up.png
deleted file mode 100644
index 1e53bb1..0000000
--- a/tests/res/drawable-mdpi/holo_light_land_actionbar_home_as_up.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_light_land_actionbar_list.png b/tests/res/drawable-mdpi/holo_light_land_actionbar_list.png
deleted file mode 100644
index bc63fb4..0000000
--- a/tests/res/drawable-mdpi/holo_light_land_actionbar_list.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_light_land_actionbar_no_icon.png b/tests/res/drawable-mdpi/holo_light_land_actionbar_no_icon.png
deleted file mode 100644
index 5dbaa9e..0000000
--- a/tests/res/drawable-mdpi/holo_light_land_actionbar_no_icon.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_light_land_actionbar_no_title.png b/tests/res/drawable-mdpi/holo_light_land_actionbar_no_title.png
deleted file mode 100644
index 9c0cc5f..0000000
--- a/tests/res/drawable-mdpi/holo_light_land_actionbar_no_title.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_light_land_actionbar_tabs.png b/tests/res/drawable-mdpi/holo_light_land_actionbar_tabs.png
deleted file mode 100644
index 06bbdaa..0000000
--- a/tests/res/drawable-mdpi/holo_light_land_actionbar_tabs.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_light_land_alertdialog_list.png b/tests/res/drawable-mdpi/holo_light_land_alertdialog_list.png
deleted file mode 100644
index b3791c4..0000000
--- a/tests/res/drawable-mdpi/holo_light_land_alertdialog_list.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_light_land_alertdialog_multichoice.png b/tests/res/drawable-mdpi/holo_light_land_alertdialog_multichoice.png
deleted file mode 100644
index 702acac..0000000
--- a/tests/res/drawable-mdpi/holo_light_land_alertdialog_multichoice.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_light_land_alertdialog_onebutton.png b/tests/res/drawable-mdpi/holo_light_land_alertdialog_onebutton.png
deleted file mode 100644
index 5e1e0c2..0000000
--- a/tests/res/drawable-mdpi/holo_light_land_alertdialog_onebutton.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_light_land_alertdialog_singlechoice.png b/tests/res/drawable-mdpi/holo_light_land_alertdialog_singlechoice.png
deleted file mode 100644
index 3150212..0000000
--- a/tests/res/drawable-mdpi/holo_light_land_alertdialog_singlechoice.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_light_land_alertdialog_threebuttons.png b/tests/res/drawable-mdpi/holo_light_land_alertdialog_threebuttons.png
deleted file mode 100644
index f343b0b..0000000
--- a/tests/res/drawable-mdpi/holo_light_land_alertdialog_threebuttons.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_light_land_alertdialog_twobuttons.png b/tests/res/drawable-mdpi/holo_light_land_alertdialog_twobuttons.png
deleted file mode 100644
index 579a23c..0000000
--- a/tests/res/drawable-mdpi/holo_light_land_alertdialog_twobuttons.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_light_land_blue_bright.png b/tests/res/drawable-mdpi/holo_light_land_blue_bright.png
deleted file mode 100644
index 6037326..0000000
--- a/tests/res/drawable-mdpi/holo_light_land_blue_bright.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_light_land_blue_dark.png b/tests/res/drawable-mdpi/holo_light_land_blue_dark.png
deleted file mode 100644
index 289c582..0000000
--- a/tests/res/drawable-mdpi/holo_light_land_blue_dark.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_light_land_blue_light.png b/tests/res/drawable-mdpi/holo_light_land_blue_light.png
deleted file mode 100644
index aecb9df..0000000
--- a/tests/res/drawable-mdpi/holo_light_land_blue_light.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_light_land_button.png b/tests/res/drawable-mdpi/holo_light_land_button.png
deleted file mode 100644
index 98e6d5f..0000000
--- a/tests/res/drawable-mdpi/holo_light_land_button.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_light_land_button_pressed.png b/tests/res/drawable-mdpi/holo_light_land_button_pressed.png
deleted file mode 100644
index 94c82b2..0000000
--- a/tests/res/drawable-mdpi/holo_light_land_button_pressed.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_light_land_calendarview.png b/tests/res/drawable-mdpi/holo_light_land_calendarview.png
deleted file mode 100644
index 23a3584..0000000
--- a/tests/res/drawable-mdpi/holo_light_land_calendarview.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_light_land_checkbox.png b/tests/res/drawable-mdpi/holo_light_land_checkbox.png
deleted file mode 100644
index b4d6daf..0000000
--- a/tests/res/drawable-mdpi/holo_light_land_checkbox.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_light_land_checkbox_checked.png b/tests/res/drawable-mdpi/holo_light_land_checkbox_checked.png
deleted file mode 100644
index 5e27734..0000000
--- a/tests/res/drawable-mdpi/holo_light_land_checkbox_checked.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_light_land_edittext.png b/tests/res/drawable-mdpi/holo_light_land_edittext.png
deleted file mode 100644
index a660c8b..0000000
--- a/tests/res/drawable-mdpi/holo_light_land_edittext.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_light_land_green_dark.png b/tests/res/drawable-mdpi/holo_light_land_green_dark.png
deleted file mode 100644
index b231719..0000000
--- a/tests/res/drawable-mdpi/holo_light_land_green_dark.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_light_land_green_light.png b/tests/res/drawable-mdpi/holo_light_land_green_light.png
deleted file mode 100644
index e8e86c1..0000000
--- a/tests/res/drawable-mdpi/holo_light_land_green_light.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_light_land_orange_dark.png b/tests/res/drawable-mdpi/holo_light_land_orange_dark.png
deleted file mode 100644
index 44961ec..0000000
--- a/tests/res/drawable-mdpi/holo_light_land_orange_dark.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_light_land_orange_light.png b/tests/res/drawable-mdpi/holo_light_land_orange_light.png
deleted file mode 100644
index 3f8dfb3..0000000
--- a/tests/res/drawable-mdpi/holo_light_land_orange_light.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_light_land_progressbar.png b/tests/res/drawable-mdpi/holo_light_land_progressbar.png
deleted file mode 100644
index e4dd24d..0000000
--- a/tests/res/drawable-mdpi/holo_light_land_progressbar.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_light_land_progressbar_horizontal0.png b/tests/res/drawable-mdpi/holo_light_land_progressbar_horizontal0.png
deleted file mode 100644
index 6387f3d..0000000
--- a/tests/res/drawable-mdpi/holo_light_land_progressbar_horizontal0.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_light_land_progressbar_horizontal100.png b/tests/res/drawable-mdpi/holo_light_land_progressbar_horizontal100.png
deleted file mode 100644
index 21ed2ca..0000000
--- a/tests/res/drawable-mdpi/holo_light_land_progressbar_horizontal100.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_light_land_progressbar_horizontal50.png b/tests/res/drawable-mdpi/holo_light_land_progressbar_horizontal50.png
deleted file mode 100644
index 6ee425f..0000000
--- a/tests/res/drawable-mdpi/holo_light_land_progressbar_horizontal50.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_light_land_progressbar_large.png b/tests/res/drawable-mdpi/holo_light_land_progressbar_large.png
deleted file mode 100644
index a266699..0000000
--- a/tests/res/drawable-mdpi/holo_light_land_progressbar_large.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_light_land_progressbar_small.png b/tests/res/drawable-mdpi/holo_light_land_progressbar_small.png
deleted file mode 100644
index 495c73a..0000000
--- a/tests/res/drawable-mdpi/holo_light_land_progressbar_small.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_light_land_progressdialog_horizontal.png b/tests/res/drawable-mdpi/holo_light_land_progressdialog_horizontal.png
deleted file mode 100644
index 13c2291..0000000
--- a/tests/res/drawable-mdpi/holo_light_land_progressdialog_horizontal.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_light_land_progressdialog_spinner.png b/tests/res/drawable-mdpi/holo_light_land_progressdialog_spinner.png
deleted file mode 100644
index dc5267e..0000000
--- a/tests/res/drawable-mdpi/holo_light_land_progressdialog_spinner.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_light_land_purple.png b/tests/res/drawable-mdpi/holo_light_land_purple.png
deleted file mode 100644
index d2a004e..0000000
--- a/tests/res/drawable-mdpi/holo_light_land_purple.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_light_land_radiobutton.png b/tests/res/drawable-mdpi/holo_light_land_radiobutton.png
deleted file mode 100644
index 9cb438e..0000000
--- a/tests/res/drawable-mdpi/holo_light_land_radiobutton.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_light_land_radiobutton_checked.png b/tests/res/drawable-mdpi/holo_light_land_radiobutton_checked.png
deleted file mode 100644
index 2999134..0000000
--- a/tests/res/drawable-mdpi/holo_light_land_radiobutton_checked.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_light_land_radiogroup_horizontal.png b/tests/res/drawable-mdpi/holo_light_land_radiogroup_horizontal.png
deleted file mode 100644
index e67c2c9..0000000
--- a/tests/res/drawable-mdpi/holo_light_land_radiogroup_horizontal.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_light_land_radiogroup_vertical.png b/tests/res/drawable-mdpi/holo_light_land_radiogroup_vertical.png
deleted file mode 100644
index 889c0a4..0000000
--- a/tests/res/drawable-mdpi/holo_light_land_radiogroup_vertical.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_light_land_ratingbar_0.png b/tests/res/drawable-mdpi/holo_light_land_ratingbar_0.png
deleted file mode 100644
index cc8427c..0000000
--- a/tests/res/drawable-mdpi/holo_light_land_ratingbar_0.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_light_land_ratingbar_0_pressed.png b/tests/res/drawable-mdpi/holo_light_land_ratingbar_0_pressed.png
deleted file mode 100644
index 48a3c69..0000000
--- a/tests/res/drawable-mdpi/holo_light_land_ratingbar_0_pressed.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_light_land_ratingbar_2point5.png b/tests/res/drawable-mdpi/holo_light_land_ratingbar_2point5.png
deleted file mode 100644
index fd0783b..0000000
--- a/tests/res/drawable-mdpi/holo_light_land_ratingbar_2point5.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_light_land_ratingbar_2point5_pressed.png b/tests/res/drawable-mdpi/holo_light_land_ratingbar_2point5_pressed.png
deleted file mode 100644
index f1c344c..0000000
--- a/tests/res/drawable-mdpi/holo_light_land_ratingbar_2point5_pressed.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_light_land_ratingbar_5.png b/tests/res/drawable-mdpi/holo_light_land_ratingbar_5.png
deleted file mode 100644
index baedae5..0000000
--- a/tests/res/drawable-mdpi/holo_light_land_ratingbar_5.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_light_land_ratingbar_5_pressed.png b/tests/res/drawable-mdpi/holo_light_land_ratingbar_5_pressed.png
deleted file mode 100644
index 7bd94f0..0000000
--- a/tests/res/drawable-mdpi/holo_light_land_ratingbar_5_pressed.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_light_land_red_dark.png b/tests/res/drawable-mdpi/holo_light_land_red_dark.png
deleted file mode 100644
index fd9aced..0000000
--- a/tests/res/drawable-mdpi/holo_light_land_red_dark.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_light_land_red_light.png b/tests/res/drawable-mdpi/holo_light_land_red_light.png
deleted file mode 100644
index 2555dc7..0000000
--- a/tests/res/drawable-mdpi/holo_light_land_red_light.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_light_land_searchview.png b/tests/res/drawable-mdpi/holo_light_land_searchview.png
deleted file mode 100644
index 561dc26..0000000
--- a/tests/res/drawable-mdpi/holo_light_land_searchview.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_light_land_searchview_query.png b/tests/res/drawable-mdpi/holo_light_land_searchview_query.png
deleted file mode 100644
index 35968cc..0000000
--- a/tests/res/drawable-mdpi/holo_light_land_searchview_query.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_light_land_searchview_queryhint.png b/tests/res/drawable-mdpi/holo_light_land_searchview_queryhint.png
deleted file mode 100644
index d36c8c9..0000000
--- a/tests/res/drawable-mdpi/holo_light_land_searchview_queryhint.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_light_land_seekbar_0.png b/tests/res/drawable-mdpi/holo_light_land_seekbar_0.png
deleted file mode 100644
index 2ce5c4c..0000000
--- a/tests/res/drawable-mdpi/holo_light_land_seekbar_0.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_light_land_seekbar_100.png b/tests/res/drawable-mdpi/holo_light_land_seekbar_100.png
deleted file mode 100644
index 1979fb4..0000000
--- a/tests/res/drawable-mdpi/holo_light_land_seekbar_100.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_light_land_seekbar_50.png b/tests/res/drawable-mdpi/holo_light_land_seekbar_50.png
deleted file mode 100644
index 9e3aa7d..0000000
--- a/tests/res/drawable-mdpi/holo_light_land_seekbar_50.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_light_land_spinner.png b/tests/res/drawable-mdpi/holo_light_land_spinner.png
deleted file mode 100644
index a1761c0..0000000
--- a/tests/res/drawable-mdpi/holo_light_land_spinner.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_light_land_tabhost.png b/tests/res/drawable-mdpi/holo_light_land_tabhost.png
deleted file mode 100644
index 8739702..0000000
--- a/tests/res/drawable-mdpi/holo_light_land_tabhost.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_light_land_textview.png b/tests/res/drawable-mdpi/holo_light_land_textview.png
deleted file mode 100644
index 468f328..0000000
--- a/tests/res/drawable-mdpi/holo_light_land_textview.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_light_land_toggle_button.png b/tests/res/drawable-mdpi/holo_light_land_toggle_button.png
deleted file mode 100644
index 9660382..0000000
--- a/tests/res/drawable-mdpi/holo_light_land_toggle_button.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_light_land_toggle_button_checked.png b/tests/res/drawable-mdpi/holo_light_land_toggle_button_checked.png
deleted file mode 100644
index 0facd90..0000000
--- a/tests/res/drawable-mdpi/holo_light_land_toggle_button_checked.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_light_land_zoomcontrols.png b/tests/res/drawable-mdpi/holo_light_land_zoomcontrols.png
deleted file mode 100644
index 7892bcf..0000000
--- a/tests/res/drawable-mdpi/holo_light_land_zoomcontrols.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_light_port_actionbar.png b/tests/res/drawable-mdpi/holo_light_port_actionbar.png
deleted file mode 100644
index 0828481..0000000
--- a/tests/res/drawable-mdpi/holo_light_port_actionbar.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_light_port_actionbar_action_items.png b/tests/res/drawable-mdpi/holo_light_port_actionbar_action_items.png
deleted file mode 100644
index d3882c8..0000000
--- a/tests/res/drawable-mdpi/holo_light_port_actionbar_action_items.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_light_port_actionbar_action_view.png b/tests/res/drawable-mdpi/holo_light_port_actionbar_action_view.png
deleted file mode 100644
index 9473190..0000000
--- a/tests/res/drawable-mdpi/holo_light_port_actionbar_action_view.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_light_port_actionbar_home_as_up.png b/tests/res/drawable-mdpi/holo_light_port_actionbar_home_as_up.png
deleted file mode 100644
index ce2ac08..0000000
--- a/tests/res/drawable-mdpi/holo_light_port_actionbar_home_as_up.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_light_port_actionbar_list.png b/tests/res/drawable-mdpi/holo_light_port_actionbar_list.png
deleted file mode 100644
index bcffdfb..0000000
--- a/tests/res/drawable-mdpi/holo_light_port_actionbar_list.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_light_port_actionbar_no_icon.png b/tests/res/drawable-mdpi/holo_light_port_actionbar_no_icon.png
deleted file mode 100644
index 71520b9..0000000
--- a/tests/res/drawable-mdpi/holo_light_port_actionbar_no_icon.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_light_port_actionbar_no_title.png b/tests/res/drawable-mdpi/holo_light_port_actionbar_no_title.png
deleted file mode 100644
index 2c876b2..0000000
--- a/tests/res/drawable-mdpi/holo_light_port_actionbar_no_title.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_light_port_actionbar_tabs.png b/tests/res/drawable-mdpi/holo_light_port_actionbar_tabs.png
deleted file mode 100644
index 01d7f15..0000000
--- a/tests/res/drawable-mdpi/holo_light_port_actionbar_tabs.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_light_port_alertdialog_list.png b/tests/res/drawable-mdpi/holo_light_port_alertdialog_list.png
deleted file mode 100644
index b3791c4..0000000
--- a/tests/res/drawable-mdpi/holo_light_port_alertdialog_list.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_light_port_alertdialog_multichoice.png b/tests/res/drawable-mdpi/holo_light_port_alertdialog_multichoice.png
deleted file mode 100644
index 702acac..0000000
--- a/tests/res/drawable-mdpi/holo_light_port_alertdialog_multichoice.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_light_port_alertdialog_onebutton.png b/tests/res/drawable-mdpi/holo_light_port_alertdialog_onebutton.png
deleted file mode 100644
index 1eef9d0..0000000
--- a/tests/res/drawable-mdpi/holo_light_port_alertdialog_onebutton.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_light_port_alertdialog_singlechoice.png b/tests/res/drawable-mdpi/holo_light_port_alertdialog_singlechoice.png
deleted file mode 100644
index 3150212..0000000
--- a/tests/res/drawable-mdpi/holo_light_port_alertdialog_singlechoice.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_light_port_alertdialog_threebuttons.png b/tests/res/drawable-mdpi/holo_light_port_alertdialog_threebuttons.png
deleted file mode 100644
index a5a74e0..0000000
--- a/tests/res/drawable-mdpi/holo_light_port_alertdialog_threebuttons.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_light_port_alertdialog_twobuttons.png b/tests/res/drawable-mdpi/holo_light_port_alertdialog_twobuttons.png
deleted file mode 100644
index 26f4744..0000000
--- a/tests/res/drawable-mdpi/holo_light_port_alertdialog_twobuttons.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_light_port_blue_bright.png b/tests/res/drawable-mdpi/holo_light_port_blue_bright.png
deleted file mode 100644
index c310278..0000000
--- a/tests/res/drawable-mdpi/holo_light_port_blue_bright.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_light_port_blue_dark.png b/tests/res/drawable-mdpi/holo_light_port_blue_dark.png
deleted file mode 100644
index c08b66b..0000000
--- a/tests/res/drawable-mdpi/holo_light_port_blue_dark.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_light_port_blue_light.png b/tests/res/drawable-mdpi/holo_light_port_blue_light.png
deleted file mode 100644
index 6c0f7ec..0000000
--- a/tests/res/drawable-mdpi/holo_light_port_blue_light.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_light_port_button.png b/tests/res/drawable-mdpi/holo_light_port_button.png
deleted file mode 100644
index 98e6d5f..0000000
--- a/tests/res/drawable-mdpi/holo_light_port_button.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_light_port_button_pressed.png b/tests/res/drawable-mdpi/holo_light_port_button_pressed.png
deleted file mode 100644
index 94c82b2..0000000
--- a/tests/res/drawable-mdpi/holo_light_port_button_pressed.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_light_port_calendarview.png b/tests/res/drawable-mdpi/holo_light_port_calendarview.png
deleted file mode 100644
index 28ea91a..0000000
--- a/tests/res/drawable-mdpi/holo_light_port_calendarview.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_light_port_checkbox.png b/tests/res/drawable-mdpi/holo_light_port_checkbox.png
deleted file mode 100644
index b4d6daf..0000000
--- a/tests/res/drawable-mdpi/holo_light_port_checkbox.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_light_port_checkbox_checked.png b/tests/res/drawable-mdpi/holo_light_port_checkbox_checked.png
deleted file mode 100644
index 5e27734..0000000
--- a/tests/res/drawable-mdpi/holo_light_port_checkbox_checked.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_light_port_edittext.png b/tests/res/drawable-mdpi/holo_light_port_edittext.png
deleted file mode 100644
index ec1112f..0000000
--- a/tests/res/drawable-mdpi/holo_light_port_edittext.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_light_port_green_dark.png b/tests/res/drawable-mdpi/holo_light_port_green_dark.png
deleted file mode 100644
index ff55a01..0000000
--- a/tests/res/drawable-mdpi/holo_light_port_green_dark.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_light_port_green_light.png b/tests/res/drawable-mdpi/holo_light_port_green_light.png
deleted file mode 100644
index 8e2a205..0000000
--- a/tests/res/drawable-mdpi/holo_light_port_green_light.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_light_port_orange_dark.png b/tests/res/drawable-mdpi/holo_light_port_orange_dark.png
deleted file mode 100644
index f2f3a6e..0000000
--- a/tests/res/drawable-mdpi/holo_light_port_orange_dark.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_light_port_orange_light.png b/tests/res/drawable-mdpi/holo_light_port_orange_light.png
deleted file mode 100644
index 64e8147..0000000
--- a/tests/res/drawable-mdpi/holo_light_port_orange_light.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_light_port_progressbar.png b/tests/res/drawable-mdpi/holo_light_port_progressbar.png
deleted file mode 100644
index e4dd24d..0000000
--- a/tests/res/drawable-mdpi/holo_light_port_progressbar.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_light_port_progressbar_horizontal0.png b/tests/res/drawable-mdpi/holo_light_port_progressbar_horizontal0.png
deleted file mode 100644
index 9dcbbc9..0000000
--- a/tests/res/drawable-mdpi/holo_light_port_progressbar_horizontal0.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_light_port_progressbar_horizontal100.png b/tests/res/drawable-mdpi/holo_light_port_progressbar_horizontal100.png
deleted file mode 100644
index cf993dd..0000000
--- a/tests/res/drawable-mdpi/holo_light_port_progressbar_horizontal100.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_light_port_progressbar_horizontal50.png b/tests/res/drawable-mdpi/holo_light_port_progressbar_horizontal50.png
deleted file mode 100644
index 345aa49..0000000
--- a/tests/res/drawable-mdpi/holo_light_port_progressbar_horizontal50.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_light_port_progressbar_large.png b/tests/res/drawable-mdpi/holo_light_port_progressbar_large.png
deleted file mode 100644
index a266699..0000000
--- a/tests/res/drawable-mdpi/holo_light_port_progressbar_large.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_light_port_progressbar_small.png b/tests/res/drawable-mdpi/holo_light_port_progressbar_small.png
deleted file mode 100644
index 495c73a..0000000
--- a/tests/res/drawable-mdpi/holo_light_port_progressbar_small.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_light_port_progressdialog_horizontal.png b/tests/res/drawable-mdpi/holo_light_port_progressdialog_horizontal.png
deleted file mode 100644
index 11bb468..0000000
--- a/tests/res/drawable-mdpi/holo_light_port_progressdialog_horizontal.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_light_port_progressdialog_spinner.png b/tests/res/drawable-mdpi/holo_light_port_progressdialog_spinner.png
deleted file mode 100644
index 8e29aad..0000000
--- a/tests/res/drawable-mdpi/holo_light_port_progressdialog_spinner.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_light_port_purple.png b/tests/res/drawable-mdpi/holo_light_port_purple.png
deleted file mode 100644
index 93ca138..0000000
--- a/tests/res/drawable-mdpi/holo_light_port_purple.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_light_port_radiobutton.png b/tests/res/drawable-mdpi/holo_light_port_radiobutton.png
deleted file mode 100644
index 9cb438e..0000000
--- a/tests/res/drawable-mdpi/holo_light_port_radiobutton.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_light_port_radiobutton_checked.png b/tests/res/drawable-mdpi/holo_light_port_radiobutton_checked.png
deleted file mode 100644
index 2999134..0000000
--- a/tests/res/drawable-mdpi/holo_light_port_radiobutton_checked.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_light_port_radiogroup_horizontal.png b/tests/res/drawable-mdpi/holo_light_port_radiogroup_horizontal.png
deleted file mode 100644
index e67c2c9..0000000
--- a/tests/res/drawable-mdpi/holo_light_port_radiogroup_horizontal.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_light_port_radiogroup_vertical.png b/tests/res/drawable-mdpi/holo_light_port_radiogroup_vertical.png
deleted file mode 100644
index 889c0a4..0000000
--- a/tests/res/drawable-mdpi/holo_light_port_radiogroup_vertical.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_light_port_ratingbar_0.png b/tests/res/drawable-mdpi/holo_light_port_ratingbar_0.png
deleted file mode 100644
index cc8427c..0000000
--- a/tests/res/drawable-mdpi/holo_light_port_ratingbar_0.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_light_port_ratingbar_0_pressed.png b/tests/res/drawable-mdpi/holo_light_port_ratingbar_0_pressed.png
deleted file mode 100644
index 48a3c69..0000000
--- a/tests/res/drawable-mdpi/holo_light_port_ratingbar_0_pressed.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_light_port_ratingbar_2point5.png b/tests/res/drawable-mdpi/holo_light_port_ratingbar_2point5.png
deleted file mode 100644
index fd0783b..0000000
--- a/tests/res/drawable-mdpi/holo_light_port_ratingbar_2point5.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_light_port_ratingbar_2point5_pressed.png b/tests/res/drawable-mdpi/holo_light_port_ratingbar_2point5_pressed.png
deleted file mode 100644
index f1c344c..0000000
--- a/tests/res/drawable-mdpi/holo_light_port_ratingbar_2point5_pressed.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_light_port_ratingbar_5.png b/tests/res/drawable-mdpi/holo_light_port_ratingbar_5.png
deleted file mode 100644
index baedae5..0000000
--- a/tests/res/drawable-mdpi/holo_light_port_ratingbar_5.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_light_port_ratingbar_5_pressed.png b/tests/res/drawable-mdpi/holo_light_port_ratingbar_5_pressed.png
deleted file mode 100644
index 7bd94f0..0000000
--- a/tests/res/drawable-mdpi/holo_light_port_ratingbar_5_pressed.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_light_port_red_dark.png b/tests/res/drawable-mdpi/holo_light_port_red_dark.png
deleted file mode 100644
index dbd0e74..0000000
--- a/tests/res/drawable-mdpi/holo_light_port_red_dark.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_light_port_red_light.png b/tests/res/drawable-mdpi/holo_light_port_red_light.png
deleted file mode 100644
index 9af9d58..0000000
--- a/tests/res/drawable-mdpi/holo_light_port_red_light.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_light_port_searchview.png b/tests/res/drawable-mdpi/holo_light_port_searchview.png
deleted file mode 100644
index dc67ca3..0000000
--- a/tests/res/drawable-mdpi/holo_light_port_searchview.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_light_port_searchview_query.png b/tests/res/drawable-mdpi/holo_light_port_searchview_query.png
deleted file mode 100644
index 36ccef9..0000000
--- a/tests/res/drawable-mdpi/holo_light_port_searchview_query.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_light_port_searchview_queryhint.png b/tests/res/drawable-mdpi/holo_light_port_searchview_queryhint.png
deleted file mode 100644
index bec1630..0000000
--- a/tests/res/drawable-mdpi/holo_light_port_searchview_queryhint.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_light_port_seekbar_0.png b/tests/res/drawable-mdpi/holo_light_port_seekbar_0.png
deleted file mode 100644
index 0ea8968..0000000
--- a/tests/res/drawable-mdpi/holo_light_port_seekbar_0.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_light_port_seekbar_100.png b/tests/res/drawable-mdpi/holo_light_port_seekbar_100.png
deleted file mode 100644
index 6755249..0000000
--- a/tests/res/drawable-mdpi/holo_light_port_seekbar_100.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_light_port_seekbar_50.png b/tests/res/drawable-mdpi/holo_light_port_seekbar_50.png
deleted file mode 100644
index a59d571..0000000
--- a/tests/res/drawable-mdpi/holo_light_port_seekbar_50.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_light_port_spinner.png b/tests/res/drawable-mdpi/holo_light_port_spinner.png
deleted file mode 100644
index 9698eaf..0000000
--- a/tests/res/drawable-mdpi/holo_light_port_spinner.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_light_port_tabhost.png b/tests/res/drawable-mdpi/holo_light_port_tabhost.png
deleted file mode 100644
index 3b1f999..0000000
--- a/tests/res/drawable-mdpi/holo_light_port_tabhost.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_light_port_textview.png b/tests/res/drawable-mdpi/holo_light_port_textview.png
deleted file mode 100644
index 8a491d2..0000000
--- a/tests/res/drawable-mdpi/holo_light_port_textview.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_light_port_toggle_button.png b/tests/res/drawable-mdpi/holo_light_port_toggle_button.png
deleted file mode 100644
index 9660382..0000000
--- a/tests/res/drawable-mdpi/holo_light_port_toggle_button.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_light_port_toggle_button_checked.png b/tests/res/drawable-mdpi/holo_light_port_toggle_button_checked.png
deleted file mode 100644
index 0facd90..0000000
--- a/tests/res/drawable-mdpi/holo_light_port_toggle_button_checked.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_light_port_zoomcontrols.png b/tests/res/drawable-mdpi/holo_light_port_zoomcontrols.png
deleted file mode 100644
index 7892bcf..0000000
--- a/tests/res/drawable-mdpi/holo_light_port_zoomcontrols.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_port_actionbar.png b/tests/res/drawable-mdpi/holo_port_actionbar.png
deleted file mode 100644
index 196081a..0000000
--- a/tests/res/drawable-mdpi/holo_port_actionbar.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_port_actionbar_action_items.png b/tests/res/drawable-mdpi/holo_port_actionbar_action_items.png
deleted file mode 100644
index b6bcaa7..0000000
--- a/tests/res/drawable-mdpi/holo_port_actionbar_action_items.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_port_actionbar_action_view.png b/tests/res/drawable-mdpi/holo_port_actionbar_action_view.png
deleted file mode 100644
index acfb67e..0000000
--- a/tests/res/drawable-mdpi/holo_port_actionbar_action_view.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_port_actionbar_home_as_up.png b/tests/res/drawable-mdpi/holo_port_actionbar_home_as_up.png
deleted file mode 100644
index 1b043e8..0000000
--- a/tests/res/drawable-mdpi/holo_port_actionbar_home_as_up.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_port_actionbar_list.png b/tests/res/drawable-mdpi/holo_port_actionbar_list.png
deleted file mode 100644
index 8e9d231..0000000
--- a/tests/res/drawable-mdpi/holo_port_actionbar_list.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_port_actionbar_no_icon.png b/tests/res/drawable-mdpi/holo_port_actionbar_no_icon.png
deleted file mode 100644
index 247c6d3..0000000
--- a/tests/res/drawable-mdpi/holo_port_actionbar_no_icon.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_port_actionbar_no_title.png b/tests/res/drawable-mdpi/holo_port_actionbar_no_title.png
deleted file mode 100644
index 77f8034..0000000
--- a/tests/res/drawable-mdpi/holo_port_actionbar_no_title.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_port_actionbar_tabs.png b/tests/res/drawable-mdpi/holo_port_actionbar_tabs.png
deleted file mode 100644
index dba0980..0000000
--- a/tests/res/drawable-mdpi/holo_port_actionbar_tabs.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_port_alertdialog_list.png b/tests/res/drawable-mdpi/holo_port_alertdialog_list.png
deleted file mode 100644
index 03b2e0f..0000000
--- a/tests/res/drawable-mdpi/holo_port_alertdialog_list.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_port_alertdialog_multichoice.png b/tests/res/drawable-mdpi/holo_port_alertdialog_multichoice.png
deleted file mode 100644
index 0badbb7..0000000
--- a/tests/res/drawable-mdpi/holo_port_alertdialog_multichoice.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_port_alertdialog_onebutton.png b/tests/res/drawable-mdpi/holo_port_alertdialog_onebutton.png
deleted file mode 100644
index 718ac43..0000000
--- a/tests/res/drawable-mdpi/holo_port_alertdialog_onebutton.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_port_alertdialog_singlechoice.png b/tests/res/drawable-mdpi/holo_port_alertdialog_singlechoice.png
deleted file mode 100644
index fa91e62..0000000
--- a/tests/res/drawable-mdpi/holo_port_alertdialog_singlechoice.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_port_alertdialog_threebuttons.png b/tests/res/drawable-mdpi/holo_port_alertdialog_threebuttons.png
deleted file mode 100644
index 8cd9da8..0000000
--- a/tests/res/drawable-mdpi/holo_port_alertdialog_threebuttons.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_port_alertdialog_twobuttons.png b/tests/res/drawable-mdpi/holo_port_alertdialog_twobuttons.png
deleted file mode 100644
index 55cc279..0000000
--- a/tests/res/drawable-mdpi/holo_port_alertdialog_twobuttons.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_port_blue_bright.png b/tests/res/drawable-mdpi/holo_port_blue_bright.png
deleted file mode 100644
index c310278..0000000
--- a/tests/res/drawable-mdpi/holo_port_blue_bright.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_port_blue_dark.png b/tests/res/drawable-mdpi/holo_port_blue_dark.png
deleted file mode 100644
index c08b66b..0000000
--- a/tests/res/drawable-mdpi/holo_port_blue_dark.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_port_blue_light.png b/tests/res/drawable-mdpi/holo_port_blue_light.png
deleted file mode 100644
index 6c0f7ec..0000000
--- a/tests/res/drawable-mdpi/holo_port_blue_light.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_port_button.png b/tests/res/drawable-mdpi/holo_port_button.png
deleted file mode 100644
index 25cfc2d..0000000
--- a/tests/res/drawable-mdpi/holo_port_button.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_port_button_pressed.png b/tests/res/drawable-mdpi/holo_port_button_pressed.png
deleted file mode 100644
index 6b1e5d2..0000000
--- a/tests/res/drawable-mdpi/holo_port_button_pressed.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_port_calendarview.png b/tests/res/drawable-mdpi/holo_port_calendarview.png
deleted file mode 100644
index 6595dbd..0000000
--- a/tests/res/drawable-mdpi/holo_port_calendarview.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_port_checkbox.png b/tests/res/drawable-mdpi/holo_port_checkbox.png
deleted file mode 100644
index 1c8f6ed..0000000
--- a/tests/res/drawable-mdpi/holo_port_checkbox.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_port_checkbox_checked.png b/tests/res/drawable-mdpi/holo_port_checkbox_checked.png
deleted file mode 100644
index 2df82f3..0000000
--- a/tests/res/drawable-mdpi/holo_port_checkbox_checked.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_port_edittext.png b/tests/res/drawable-mdpi/holo_port_edittext.png
deleted file mode 100644
index a47fc7d..0000000
--- a/tests/res/drawable-mdpi/holo_port_edittext.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_port_green_dark.png b/tests/res/drawable-mdpi/holo_port_green_dark.png
deleted file mode 100644
index ff55a01..0000000
--- a/tests/res/drawable-mdpi/holo_port_green_dark.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_port_green_light.png b/tests/res/drawable-mdpi/holo_port_green_light.png
deleted file mode 100644
index 8e2a205..0000000
--- a/tests/res/drawable-mdpi/holo_port_green_light.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_port_orange_dark.png b/tests/res/drawable-mdpi/holo_port_orange_dark.png
deleted file mode 100644
index f2f3a6e..0000000
--- a/tests/res/drawable-mdpi/holo_port_orange_dark.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_port_orange_light.png b/tests/res/drawable-mdpi/holo_port_orange_light.png
deleted file mode 100644
index 64e8147..0000000
--- a/tests/res/drawable-mdpi/holo_port_orange_light.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_port_progressbar.png b/tests/res/drawable-mdpi/holo_port_progressbar.png
deleted file mode 100644
index e4dd24d..0000000
--- a/tests/res/drawable-mdpi/holo_port_progressbar.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_port_progressbar_horizontal0.png b/tests/res/drawable-mdpi/holo_port_progressbar_horizontal0.png
deleted file mode 100644
index 9dcbbc9..0000000
--- a/tests/res/drawable-mdpi/holo_port_progressbar_horizontal0.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_port_progressbar_horizontal100.png b/tests/res/drawable-mdpi/holo_port_progressbar_horizontal100.png
deleted file mode 100644
index cf993dd..0000000
--- a/tests/res/drawable-mdpi/holo_port_progressbar_horizontal100.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_port_progressbar_horizontal50.png b/tests/res/drawable-mdpi/holo_port_progressbar_horizontal50.png
deleted file mode 100644
index 345aa49..0000000
--- a/tests/res/drawable-mdpi/holo_port_progressbar_horizontal50.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_port_progressbar_large.png b/tests/res/drawable-mdpi/holo_port_progressbar_large.png
deleted file mode 100644
index a266699..0000000
--- a/tests/res/drawable-mdpi/holo_port_progressbar_large.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_port_progressbar_small.png b/tests/res/drawable-mdpi/holo_port_progressbar_small.png
deleted file mode 100644
index 495c73a..0000000
--- a/tests/res/drawable-mdpi/holo_port_progressbar_small.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_port_progressdialog_horizontal.png b/tests/res/drawable-mdpi/holo_port_progressdialog_horizontal.png
deleted file mode 100644
index 225f008..0000000
--- a/tests/res/drawable-mdpi/holo_port_progressdialog_horizontal.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_port_progressdialog_spinner.png b/tests/res/drawable-mdpi/holo_port_progressdialog_spinner.png
deleted file mode 100644
index 93a399d..0000000
--- a/tests/res/drawable-mdpi/holo_port_progressdialog_spinner.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_port_purple.png b/tests/res/drawable-mdpi/holo_port_purple.png
deleted file mode 100644
index 93ca138..0000000
--- a/tests/res/drawable-mdpi/holo_port_purple.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_port_radiobutton.png b/tests/res/drawable-mdpi/holo_port_radiobutton.png
deleted file mode 100644
index 51d8b24..0000000
--- a/tests/res/drawable-mdpi/holo_port_radiobutton.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_port_radiobutton_checked.png b/tests/res/drawable-mdpi/holo_port_radiobutton_checked.png
deleted file mode 100644
index bde1275..0000000
--- a/tests/res/drawable-mdpi/holo_port_radiobutton_checked.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_port_radiogroup_horizontal.png b/tests/res/drawable-mdpi/holo_port_radiogroup_horizontal.png
deleted file mode 100644
index 36ab0ba..0000000
--- a/tests/res/drawable-mdpi/holo_port_radiogroup_horizontal.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_port_radiogroup_vertical.png b/tests/res/drawable-mdpi/holo_port_radiogroup_vertical.png
deleted file mode 100644
index fa86a42..0000000
--- a/tests/res/drawable-mdpi/holo_port_radiogroup_vertical.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_port_ratingbar_0.png b/tests/res/drawable-mdpi/holo_port_ratingbar_0.png
deleted file mode 100644
index 79ce56d..0000000
--- a/tests/res/drawable-mdpi/holo_port_ratingbar_0.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_port_ratingbar_0_pressed.png b/tests/res/drawable-mdpi/holo_port_ratingbar_0_pressed.png
deleted file mode 100644
index 280f112..0000000
--- a/tests/res/drawable-mdpi/holo_port_ratingbar_0_pressed.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_port_ratingbar_2point5.png b/tests/res/drawable-mdpi/holo_port_ratingbar_2point5.png
deleted file mode 100644
index cef353c..0000000
--- a/tests/res/drawable-mdpi/holo_port_ratingbar_2point5.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_port_ratingbar_2point5_pressed.png b/tests/res/drawable-mdpi/holo_port_ratingbar_2point5_pressed.png
deleted file mode 100644
index 43861f0..0000000
--- a/tests/res/drawable-mdpi/holo_port_ratingbar_2point5_pressed.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_port_ratingbar_5.png b/tests/res/drawable-mdpi/holo_port_ratingbar_5.png
deleted file mode 100644
index c4dfb98..0000000
--- a/tests/res/drawable-mdpi/holo_port_ratingbar_5.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_port_ratingbar_5_pressed.png b/tests/res/drawable-mdpi/holo_port_ratingbar_5_pressed.png
deleted file mode 100644
index 21394c0..0000000
--- a/tests/res/drawable-mdpi/holo_port_ratingbar_5_pressed.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_port_red_dark.png b/tests/res/drawable-mdpi/holo_port_red_dark.png
deleted file mode 100644
index dbd0e74..0000000
--- a/tests/res/drawable-mdpi/holo_port_red_dark.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_port_red_light.png b/tests/res/drawable-mdpi/holo_port_red_light.png
deleted file mode 100644
index 9af9d58..0000000
--- a/tests/res/drawable-mdpi/holo_port_red_light.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_port_searchview.png b/tests/res/drawable-mdpi/holo_port_searchview.png
deleted file mode 100644
index b673bef..0000000
--- a/tests/res/drawable-mdpi/holo_port_searchview.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_port_searchview_query.png b/tests/res/drawable-mdpi/holo_port_searchview_query.png
deleted file mode 100644
index de6e974..0000000
--- a/tests/res/drawable-mdpi/holo_port_searchview_query.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_port_searchview_queryhint.png b/tests/res/drawable-mdpi/holo_port_searchview_queryhint.png
deleted file mode 100644
index e68faf0..0000000
--- a/tests/res/drawable-mdpi/holo_port_searchview_queryhint.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_port_seekbar_0.png b/tests/res/drawable-mdpi/holo_port_seekbar_0.png
deleted file mode 100644
index 44648da..0000000
--- a/tests/res/drawable-mdpi/holo_port_seekbar_0.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_port_seekbar_100.png b/tests/res/drawable-mdpi/holo_port_seekbar_100.png
deleted file mode 100644
index 6755249..0000000
--- a/tests/res/drawable-mdpi/holo_port_seekbar_100.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_port_seekbar_50.png b/tests/res/drawable-mdpi/holo_port_seekbar_50.png
deleted file mode 100644
index 1767fd0..0000000
--- a/tests/res/drawable-mdpi/holo_port_seekbar_50.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_port_spinner.png b/tests/res/drawable-mdpi/holo_port_spinner.png
deleted file mode 100644
index 26fe0f0..0000000
--- a/tests/res/drawable-mdpi/holo_port_spinner.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_port_tabhost.png b/tests/res/drawable-mdpi/holo_port_tabhost.png
deleted file mode 100644
index 3b1f999..0000000
--- a/tests/res/drawable-mdpi/holo_port_tabhost.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_port_textview.png b/tests/res/drawable-mdpi/holo_port_textview.png
deleted file mode 100644
index 50b2487..0000000
--- a/tests/res/drawable-mdpi/holo_port_textview.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_port_toggle_button.png b/tests/res/drawable-mdpi/holo_port_toggle_button.png
deleted file mode 100644
index 1efa0d2..0000000
--- a/tests/res/drawable-mdpi/holo_port_toggle_button.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_port_toggle_button_checked.png b/tests/res/drawable-mdpi/holo_port_toggle_button_checked.png
deleted file mode 100644
index b63a5cc..0000000
--- a/tests/res/drawable-mdpi/holo_port_toggle_button_checked.png
+++ /dev/null
Binary files differ
diff --git a/tests/res/layout/blue_bright.xml b/tests/res/layout/blue_bright.xml
deleted file mode 100644
index b2ea8aa..0000000
--- a/tests/res/layout/blue_bright.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2011 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-    <TextView android:id="@+id/textView1"
-              android:layout_width="wrap_content"
-              android:layout_height="wrap_content"
-              android:text="@string/sample_text"
-              android:textColor="@android:color/holo_blue_bright"
-              xmlns:android="http://schemas.android.com/apk/res/android">
-    </TextView>
diff --git a/tests/res/layout/blue_dark.xml b/tests/res/layout/blue_dark.xml
deleted file mode 100644
index 1c0860b..0000000
--- a/tests/res/layout/blue_dark.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2011 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-    <TextView android:id="@+id/textView1"
-              android:layout_width="wrap_content"
-              android:layout_height="wrap_content"
-              android:text="@string/sample_text"
-              android:textColor="@android:color/holo_blue_dark"
-              xmlns:android="http://schemas.android.com/apk/res/android">
-    </TextView>
diff --git a/tests/res/layout/blue_light.xml b/tests/res/layout/blue_light.xml
deleted file mode 100644
index 849e4ab..0000000
--- a/tests/res/layout/blue_light.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2011 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-    <TextView android:id="@+id/textView1"
-              android:layout_width="wrap_content"
-              android:layout_height="wrap_content"
-              android:text="@string/sample_text"
-              android:textColor="@android:color/holo_blue_light"
-              xmlns:android="http://schemas.android.com/apk/res/android">
-    </TextView>
diff --git a/tests/res/layout/button.xml b/tests/res/layout/button.xml
deleted file mode 100644
index ea0aec9..0000000
--- a/tests/res/layout/button.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2011 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-    <Button xmlns:android="http://schemas.android.com/apk/res/android"
-            android:text="@string/button"
-            android:id="@+id/button"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content">
-    </Button>
diff --git a/tests/res/layout/calendarview.xml b/tests/res/layout/calendarview.xml
deleted file mode 100644
index 2a2303e..0000000
--- a/tests/res/layout/calendarview.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2011 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-    <CalendarView android:id="@+id/calendarView1"
-                  android:layout_width="match_parent"
-                  android:layout_height="match_parent"
-                  xmlns:android="http://schemas.android.com/apk/res/android">
-    </CalendarView>
diff --git a/tests/res/layout/checkbox.xml b/tests/res/layout/checkbox.xml
deleted file mode 100644
index 3fc6b17..0000000
--- a/tests/res/layout/checkbox.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- * Copyright (C) 2011 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- -->
-    <CheckBox xmlns:android="http://schemas.android.com/apk/res/android"
-              android:id="@+id/checkBox1"
-              android:text="CheckBox"
-              android:layout_width="wrap_content"
-              android:layout_height="wrap_content">
-    </CheckBox>
diff --git a/tests/res/layout/checkbox_checked.xml b/tests/res/layout/checkbox_checked.xml
deleted file mode 100644
index e1d8c02..0000000
--- a/tests/res/layout/checkbox_checked.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- * Copyright (C) 2011 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- -->
-    <CheckBox xmlns:android="http://schemas.android.com/apk/res/android"
-              android:checked="true"
-              android:id="@+id/checkBox1"
-              android:text="CheckBox"
-              android:layout_width="wrap_content"
-              android:layout_height="wrap_content">
-    </CheckBox>
diff --git a/tests/res/layout/edittext.xml b/tests/res/layout/edittext.xml
deleted file mode 100644
index cd19470..0000000
--- a/tests/res/layout/edittext.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2011 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-    <EditText android:id="@+id/editText1"
-              android:layout_width="match_parent"
-              android:layout_height="wrap_content"
-              xmlns:android="http://schemas.android.com/apk/res/android">
-    </EditText>
diff --git a/tests/res/layout/empty.xml b/tests/res/layout/empty.xml
deleted file mode 100644
index b7f4e63..0000000
--- a/tests/res/layout/empty.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2011 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-    <FrameLayout android:id="@+id/frameLayout1"
-        android:layout_width="0dip"
-        android:layout_height="0dip"
-        xmlns:android="http://schemas.android.com/apk/res/android">
-    </FrameLayout>
diff --git a/tests/res/layout/green_dark.xml b/tests/res/layout/green_dark.xml
deleted file mode 100644
index f71edb8..0000000
--- a/tests/res/layout/green_dark.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2011 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-    <TextView android:id="@+id/textView1"
-              android:layout_width="wrap_content"
-              android:layout_height="wrap_content"
-              android:text="@string/sample_text"
-              android:textColor="@android:color/holo_green_dark"
-              xmlns:android="http://schemas.android.com/apk/res/android">
-    </TextView>
diff --git a/tests/res/layout/green_light.xml b/tests/res/layout/green_light.xml
deleted file mode 100644
index 65bdfe5..0000000
--- a/tests/res/layout/green_light.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2011 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-    <TextView android:id="@+id/textView1"
-              android:layout_width="wrap_content"
-              android:layout_height="wrap_content"
-              android:text="@string/sample_text"
-              android:textColor="@android:color/holo_green_light"
-              xmlns:android="http://schemas.android.com/apk/res/android">
-    </TextView>
diff --git a/tests/res/layout/orange_dark.xml b/tests/res/layout/orange_dark.xml
deleted file mode 100644
index 3bed6ce..0000000
--- a/tests/res/layout/orange_dark.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2011 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-    <TextView android:id="@+id/textView1"
-              android:layout_width="wrap_content"
-              android:layout_height="wrap_content"
-              android:text="@string/sample_text"
-              android:textColor="@android:color/holo_orange_dark"
-              xmlns:android="http://schemas.android.com/apk/res/android">
-    </TextView>
diff --git a/tests/res/layout/orange_light.xml b/tests/res/layout/orange_light.xml
deleted file mode 100644
index f4e4724..0000000
--- a/tests/res/layout/orange_light.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2011 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-    <TextView android:id="@+id/textView1"
-              android:layout_width="wrap_content"
-              android:layout_height="wrap_content"
-              android:text="@string/sample_text"
-              android:textColor="@android:color/holo_orange_light"
-              xmlns:android="http://schemas.android.com/apk/res/android">
-    </TextView>
diff --git a/tests/res/layout/progressbar.xml b/tests/res/layout/progressbar.xml
deleted file mode 100644
index e54b4b0..0000000
--- a/tests/res/layout/progressbar.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- * Copyright (C) 2011 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- -->
-    <ProgressBar xmlns:android="http://schemas.android.com/apk/res/android"
-                 android:id="@+id/progressBar1"
-                 android:layout_width="wrap_content"
-                 android:layout_height="wrap_content">
-    </ProgressBar>
diff --git a/tests/res/layout/progressbar_horizontal0.xml b/tests/res/layout/progressbar_horizontal0.xml
deleted file mode 100644
index f946b7a..0000000
--- a/tests/res/layout/progressbar_horizontal0.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- * Copyright (C) 2011 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- -->
-    <ProgressBar android:id="@+id/progressBar1"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    style="?android:attr/progressBarStyleHorizontal"
-    android:max="100"
-    android:progress="0"
-    xmlns:android="http://schemas.android.com/apk/res/android"></ProgressBar>
diff --git a/tests/res/layout/progressbar_horizontal100.xml b/tests/res/layout/progressbar_horizontal100.xml
deleted file mode 100644
index 034cc83..0000000
--- a/tests/res/layout/progressbar_horizontal100.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- * Copyright (C) 2011 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- -->
-    <ProgressBar android:id="@+id/progressBar1"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    style="?android:attr/progressBarStyleHorizontal"
-    android:max="100"
-    android:progress="100"
-    xmlns:android="http://schemas.android.com/apk/res/android"></ProgressBar>
diff --git a/tests/res/layout/progressbar_horizontal50.xml b/tests/res/layout/progressbar_horizontal50.xml
deleted file mode 100644
index 0c093ae..0000000
--- a/tests/res/layout/progressbar_horizontal50.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- * Copyright (C) 2011 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- -->
-    <ProgressBar android:id="@+id/progressBar1"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    style="?android:attr/progressBarStyleHorizontal"
-    android:max="100"
-    android:progress="50"
-    xmlns:android="http://schemas.android.com/apk/res/android"></ProgressBar>
diff --git a/tests/res/layout/progressbar_large.xml b/tests/res/layout/progressbar_large.xml
deleted file mode 100644
index 9eb26ad..0000000
--- a/tests/res/layout/progressbar_large.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- * Copyright (C) 2011 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- -->
-    <ProgressBar xmlns:android="http://schemas.android.com/apk/res/android"
-                 android:id="@+id/progressBar1"
-                 style="?android:attr/progressBarStyleLarge"
-                 android:layout_width="wrap_content"
-                 android:layout_height="wrap_content">
-    </ProgressBar>
diff --git a/tests/res/layout/progressbar_small.xml b/tests/res/layout/progressbar_small.xml
deleted file mode 100644
index ae2b561..0000000
--- a/tests/res/layout/progressbar_small.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- * Copyright (C) 2011 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- -->
-    <ProgressBar xmlns:android="http://schemas.android.com/apk/res/android"
-                 android:id="@+id/progressBar1"
-                 style="?android:attr/progressBarStyleSmall"
-                 android:layout_width="wrap_content"
-                 android:layout_height="wrap_content">
-    </ProgressBar>
diff --git a/tests/res/layout/purple.xml b/tests/res/layout/purple.xml
deleted file mode 100644
index 507c485..0000000
--- a/tests/res/layout/purple.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2011 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-    <TextView android:id="@+id/textView1"
-              android:layout_width="wrap_content"
-              android:layout_height="wrap_content"
-              android:text="@string/sample_text"
-              android:textColor="@android:color/holo_purple"
-              xmlns:android="http://schemas.android.com/apk/res/android">
-    </TextView>
diff --git a/tests/res/layout/radiobutton.xml b/tests/res/layout/radiobutton.xml
deleted file mode 100644
index 6b832bf..0000000
--- a/tests/res/layout/radiobutton.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- * Copyright (C) 2011 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- -->
-    <RadioButton xmlns:android="http://schemas.android.com/apk/res/android"
-                 android:id="@+id/radioButton1"
-                 android:text="RadioButton"
-                 android:layout_width="wrap_content"
-                 android:layout_height="wrap_content">
-    </RadioButton>
diff --git a/tests/res/layout/radiobutton_checked.xml b/tests/res/layout/radiobutton_checked.xml
deleted file mode 100644
index 8f76f6a..0000000
--- a/tests/res/layout/radiobutton_checked.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- * Copyright (C) 2011 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- -->
-    <RadioButton xmlns:android="http://schemas.android.com/apk/res/android"
-                 android:id="@+id/radioButton1"
-                 android:checked="true"
-                 android:text="RadioButton"
-                 android:layout_width="wrap_content"
-                 android:layout_height="wrap_content">
-    </RadioButton>
diff --git a/tests/res/layout/radiogroup.xml b/tests/res/layout/radiogroup.xml
deleted file mode 100644
index 7f55387..0000000
--- a/tests/res/layout/radiogroup.xml
+++ /dev/null
@@ -1,104 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 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.
--->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical">
-
-    <RadioGroup android:id="@+id/radioGroup_checkedButton_default"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content">
-
-        <RadioButton android:id="@+id/radioGroup_checkedButton_defalt_button0"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"/>
-        <RadioButton android:id="@+id/radioGroup_checkedButton_defalt_button1"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"/>
-
-    </RadioGroup>
-
-    <RadioGroup android:id="@+id/radioGroup_checkedButton_normal"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:checkedButton="@+id/radioGroup_checkedButton_normal_button0">
-
-        <RadioButton android:id="@id/radioGroup_checkedButton_normal_button0"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"/>
-        <RadioButton android:id="@+id/radioGroup_checkedButton_normal_button1"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"/>
-
-    </RadioGroup>
-
-    <RadioGroup android:id="@+id/radioGroup_checkedButton_nonExist"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:checkedButton="100">
-
-        <RadioButton android:id="@+id/radioGroup_checkedButton_nonExist_button0"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"/>
-        <RadioButton android:id="@+id/radioGroup_checkedButton_nonExist_button1"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"/>
-
-    </RadioGroup>
-
-    <RadioGroup android:id="@+id/radioGroup_orientation_default"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content">
-
-        <RadioButton android:id="@+id/radioGroup_orientation_default_button0"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"/>
-        <RadioButton android:id="@+id/radioGroup_orientation_default_button0"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"/>
-
-    </RadioGroup>
-
-    <RadioGroup android:id="@+id/radioGroup_orientation_vertical"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:orientation="vertical">
-
-        <RadioButton android:id="@+id/radioGroup_orientation_vertical_button0"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"/>
-        <RadioButton android:id="@+id/radioGroup_orientation_vertical_button0"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"/>
-
-    </RadioGroup>
-
-    <RadioGroup android:id="@+id/radioGroup_orientation_horizontal"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:orientation="horizontal">
-
-        <RadioButton android:id="@+id/radioGroup_orientation_horizontal_button0"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"/>
-        <RadioButton android:id="@+id/radioGroup_orientation_horizontal_button1"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"/>
-
-    </RadioGroup>
-
-</LinearLayout>
diff --git a/tests/res/layout/radiogroup_horizontal.xml b/tests/res/layout/radiogroup_horizontal.xml
deleted file mode 100644
index 32cfc8a..0000000
--- a/tests/res/layout/radiogroup_horizontal.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2011 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-    <RadioGroup android:id="@+id/radioGroup1"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:orientation="horizontal"
-                xmlns:android="http://schemas.android.com/apk/res/android">
-      <RadioButton android:id="@+id/radio_red"
-                   android:layout_width="wrap_content"
-                   android:layout_height="wrap_content"
-                   android:text="Red" />
-      <RadioButton android:id="@+id/radio_blue"
-                   android:layout_width="wrap_content"
-                   android:layout_height="wrap_content"
-                   android:text="Blue" />
-    </RadioGroup>
diff --git a/tests/res/layout/radiogroup_vertical.xml b/tests/res/layout/radiogroup_vertical.xml
deleted file mode 100644
index 71987d7..0000000
--- a/tests/res/layout/radiogroup_vertical.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2011 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-    <RadioGroup android:id="@+id/radioGroup1"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:orientation="vertical"
-                xmlns:android="http://schemas.android.com/apk/res/android">
-      <RadioButton android:id="@+id/radio_red"
-                   android:layout_width="wrap_content"
-                   android:layout_height="wrap_content"
-                   android:text="Red" />
-      <RadioButton android:id="@+id/radio_blue"
-                   android:layout_width="wrap_content"
-                   android:layout_height="wrap_content"
-                   android:text="Blue" />
-    </RadioGroup>
diff --git a/tests/res/layout/ratingbar_0.xml b/tests/res/layout/ratingbar_0.xml
deleted file mode 100644
index 232a573..0000000
--- a/tests/res/layout/ratingbar_0.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2011 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-    <RatingBar android:id="@+id/ratingBar1"
-               android:layout_width="wrap_content"
-               android:layout_height="wrap_content"
-               android:numStars="5"
-               android:rating="0"
-               xmlns:android="http://schemas.android.com/apk/res/android">
-    </RatingBar>
diff --git a/tests/res/layout/ratingbar_2point5.xml b/tests/res/layout/ratingbar_2point5.xml
deleted file mode 100644
index e5e9dbe..0000000
--- a/tests/res/layout/ratingbar_2point5.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2011 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-    <RatingBar android:id="@+id/ratingBar1"
-               android:layout_width="wrap_content"
-               android:layout_height="wrap_content"
-               android:numStars="5"
-               android:rating="2.5"
-               xmlns:android="http://schemas.android.com/apk/res/android">
-    </RatingBar>
diff --git a/tests/res/layout/ratingbar_5.xml b/tests/res/layout/ratingbar_5.xml
deleted file mode 100644
index 4169a53..0000000
--- a/tests/res/layout/ratingbar_5.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2011 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-    <RatingBar android:id="@+id/ratingBar1"
-               android:layout_width="wrap_content"
-               android:layout_height="wrap_content"
-               android:numStars="5"
-               android:rating="5"
-               xmlns:android="http://schemas.android.com/apk/res/android">
-    </RatingBar>
diff --git a/tests/res/layout/red_dark.xml b/tests/res/layout/red_dark.xml
deleted file mode 100644
index 9a7b0bc..0000000
--- a/tests/res/layout/red_dark.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2011 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-    <TextView android:id="@+id/textView1"
-              android:layout_width="wrap_content"
-              android:layout_height="wrap_content"
-              android:text="@string/sample_text"
-              android:textColor="@android:color/holo_red_dark"
-              xmlns:android="http://schemas.android.com/apk/res/android">
-    </TextView>
diff --git a/tests/res/layout/red_light.xml b/tests/res/layout/red_light.xml
deleted file mode 100644
index 469751d..0000000
--- a/tests/res/layout/red_light.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2011 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-    <TextView android:id="@+id/textView1"
-              android:layout_width="wrap_content"
-              android:layout_height="wrap_content"
-              android:text="@string/sample_text"
-              android:textColor="@android:color/holo_red_light"
-              xmlns:android="http://schemas.android.com/apk/res/android">
-    </TextView>
diff --git a/tests/res/layout/seekbar_0.xml b/tests/res/layout/seekbar_0.xml
deleted file mode 100644
index bac53e2..0000000
--- a/tests/res/layout/seekbar_0.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- * Copyright (C) 2011 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- -->
-    <SeekBar xmlns:android="http://schemas.android.com/apk/res/android"
-             android:id="@+id/seekBar1"
-             android:layout_width="match_parent"
-             android:layout_height="wrap_content"
-             android:max="100"
-             android:progress="0">
-    </SeekBar>
diff --git a/tests/res/layout/seekbar_100.xml b/tests/res/layout/seekbar_100.xml
deleted file mode 100644
index 9114ac0..0000000
--- a/tests/res/layout/seekbar_100.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- * Copyright (C) 2011 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- -->
-    <SeekBar xmlns:android="http://schemas.android.com/apk/res/android"
-             android:id="@+id/seekBar1"
-             android:layout_width="match_parent"
-             android:layout_height="wrap_content"
-             android:max="100"
-             android:progress="100">
-    </SeekBar>
diff --git a/tests/res/layout/seekbar_50.xml b/tests/res/layout/seekbar_50.xml
deleted file mode 100644
index f10d4ee..0000000
--- a/tests/res/layout/seekbar_50.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- * Copyright (C) 2011 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- -->
-    <SeekBar xmlns:android="http://schemas.android.com/apk/res/android"
-             android:id="@+id/seekBar1"
-             android:layout_width="match_parent"
-             android:layout_height="wrap_content"
-             android:max="100"
-             android:progress="50">
-    </SeekBar>
diff --git a/tests/res/layout/spinner.xml b/tests/res/layout/spinner.xml
deleted file mode 100644
index d0b453f..0000000
--- a/tests/res/layout/spinner.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- * Copyright (C) 2011 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- -->
-    <Spinner xmlns:android="http://schemas.android.com/apk/res/android"
-             android:id="@+id/spinner1"
-             android:prompt="@string/themes_prompt"
-             android:entries="@array/themes_array"
-             android:layout_width="wrap_content"
-             android:layout_height="wrap_content">
-    </Spinner>
diff --git a/tests/res/layout/tabhost.xml b/tests/res/layout/tabhost.xml
deleted file mode 100644
index ab3a55c..0000000
--- a/tests/res/layout/tabhost.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2011 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-    <TabHost android:id="@+id/tabHost1"
-             android:layout_width="fill_parent"
-             android:layout_height="fill_parent"
-             xmlns:android="http://schemas.android.com/apk/res/android">
-        <LinearLayout
-            android:orientation="vertical"
-            android:layout_width="fill_parent"
-            android:layout_height="fill_parent"
-            android:padding="5dp">
-            <TabWidget
-                android:id="@android:id/tabs"
-                android:layout_width="fill_parent"
-                android:layout_height="wrap_content" />
-            <FrameLayout
-                android:id="@android:id/tabcontent"
-                android:layout_width="fill_parent"
-                android:layout_height="fill_parent"
-                android:padding="5dp">
-                <LinearLayout android:id="@+id/tabInnerView"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content">
-                </LinearLayout>
-            </FrameLayout>
-        </LinearLayout>
-    </TabHost>
diff --git a/tests/res/layout/testing_activity.xml b/tests/res/layout/testing_activity.xml
deleted file mode 100644
index 8b9a47a..0000000
--- a/tests/res/layout/testing_activity.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2011 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent">
-    <TextView android:id="@+id/text"
-              android:layout_width="wrap_content"
-              android:layout_height="wrap_content">
-    </TextView>
-    <TextView android:id="@+id/text_reference"
-              android:text="@string/reference_image"
-              android:layout_width="wrap_content"
-              android:layout_height="wrap_content"
-              android:layout_below="@+id/text">
-    </TextView>
-    <ImageView android:id="@+id/reference_image"
-               android:layout_width="wrap_content"
-               android:layout_height="wrap_content"
-               android:layout_toRightOf="@+id/text_reference"
-               android:layout_below="@+id/text"/>
-    <TextView android:id="@+id/text_generated"
-              android:text="@string/generated_image"
-              android:layout_width="wrap_content"
-              android:layout_height="wrap_content"
-              android:layout_toLeftOf="@+id/generated_image"
-              android:layout_alignTop="@+id/generated_image">
-    </TextView>
-    <ImageView android:id="@+id/generated_image"
-               android:layout_width="wrap_content"
-               android:layout_height="wrap_content"
-               android:layout_below="@+id/reference_image"
-               android:layout_alignLeft="@+id/reference_image"/>
-    <android.theme.cts.TesterViewGroup android:id="@+id/test_group"
-                                       android:layout_width="wrap_content"
-                                       android:layout_height="wrap_content"
-                                       android:layout_below="@+id/generated_image"/>
-</RelativeLayout>
diff --git a/tests/res/layout/textview.xml b/tests/res/layout/textview.xml
deleted file mode 100644
index 41fd0df..0000000
--- a/tests/res/layout/textview.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2011 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-    <TextView android:id="@+id/textView1"
-              android:layout_width="wrap_content"
-              android:layout_height="wrap_content"
-              android:text="@string/sample_text"
-              xmlns:android="http://schemas.android.com/apk/res/android">
-    </TextView>
diff --git a/tests/res/layout/themetestlistactivity.xml b/tests/res/layout/themetestlistactivity.xml
deleted file mode 100644
index beb7f8c..0000000
--- a/tests/res/layout/themetestlistactivity.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2011 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-    <ListView android:id="@+id/tests_list"
-              android:layout_width="fill_parent"
-              android:layout_height="fill_parent"
-              xmlns:android="http://schemas.android.com/apk/res/android">
-    </ListView>
diff --git a/tests/res/layout/toggle_button.xml b/tests/res/layout/toggle_button.xml
deleted file mode 100644
index 87104f2..0000000
--- a/tests/res/layout/toggle_button.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- * Copyright (C) 2011 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- -->
-    <ToggleButton xmlns:android="http://schemas.android.com/apk/res/android"
-                  android:id="@+id/toggleButton1"
-                  android:layout_width="wrap_content"
-                  android:layout_height="wrap_content">
-    </ToggleButton>
diff --git a/tests/res/layout/toggle_button_checked.xml b/tests/res/layout/toggle_button_checked.xml
deleted file mode 100644
index 5832f4c..0000000
--- a/tests/res/layout/toggle_button_checked.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- * Copyright (C) 2011 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- -->
-    <ToggleButton xmlns:android="http://schemas.android.com/apk/res/android"
-                  android:id="@+id/toggleButton1"
-                  android:checked="true"
-                  android:layout_width="wrap_content"
-                  android:layout_height="wrap_content">
-    </ToggleButton>
diff --git a/tests/res/layout/webview_layout.xml b/tests/res/layout/webview_layout.xml
index d266d21..7a0ed0d 100644
--- a/tests/res/layout/webview_layout.xml
+++ b/tests/res/layout/webview_layout.xml
@@ -17,9 +17,9 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:orientation="vertical"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="wrap_content">
 
     <WebView android:id="@+id/web_page"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent" />
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content" />
 </LinearLayout>
diff --git a/tests/res/layout/zoomcontrols.xml b/tests/res/layout/zoomcontrols.xml
deleted file mode 100644
index f4acc6e..0000000
--- a/tests/res/layout/zoomcontrols.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2011 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-    <ZoomControls android:id="@+id/zoomControls1"
-                  android:layout_width="wrap_content"
-                  android:layout_height="wrap_content"
-                  xmlns:android="http://schemas.android.com/apk/res/android">
-    </ZoomControls>
diff --git a/tests/res/values/arrays.xml b/tests/res/values/arrays.xml
index af4c129..71e0133 100644
--- a/tests/res/values/arrays.xml
+++ b/tests/res/values/arrays.xml
@@ -54,16 +54,4 @@
         <item>9</item>
         <item>10</item>
     </integer-array>
-
-    <string-array name="themes_array">
-        <item>holo</item>
-        <item>holo_light</item>
-        <item>holo_solidactionbar</item>
-        <item>holo_light_solidactionbar</item>
-        <item>holo_light_solidactionbar_inverse</item>
-        <item>holo_solidactionbar_splitactionbarwhennarrow</item>
-        <item>holo_light_solidactionbar_splitactionbarwhennarrow</item>
-        <item>holo_noactionbar</item>
-        <item>holo_light_noactionbar</item>
-    </string-array>
 </resources>
diff --git a/tests/res/values/dimens.xml b/tests/res/values/dimens.xml
index f0c57c2..bae216f 100755
--- a/tests/res/values/dimens.xml
+++ b/tests/res/values/dimens.xml
@@ -39,8 +39,5 @@
     <item name="frac25610pperc" type="dimen" format="fraction">25610%p</item>
     <item name="frac6553510pperc" type="dimen" format="fraction">6553510%p</item>
     <item name="frac6553610pperc" type="dimen" format="fraction">6553610%p</item>
-
-    <dimen name="reference_width">320dp</dimen>
-    <dimen name="reference_height">480dp</dimen>
 </resources>
 
diff --git a/tests/src/android/media/cts/VideoSurfaceView.java b/tests/src/android/media/cts/VideoSurfaceView.java
index 0f23a2d..ae3da1a 100644
--- a/tests/src/android/media/cts/VideoSurfaceView.java
+++ b/tests/src/android/media/cts/VideoSurfaceView.java
@@ -37,7 +37,7 @@
 
 class VideoSurfaceView extends GLSurfaceView {
     private static final String TAG = "VideoSurfaceView";
-    private static final int SLEEP_TIME = 1000;
+    private static final int SLEEP_TIME_MS = 1000;
 
     VideoRender mRenderer;
     private MediaPlayer mMediaPlayer = null;
@@ -62,26 +62,14 @@
     }
 
     public void startTest() throws Exception {
-        Thread.sleep(SLEEP_TIME);
+        Thread.sleep(SLEEP_TIME_MS);
         mMediaPlayer.start();
 
-        Thread.sleep(SLEEP_TIME * 5);
+        Thread.sleep(SLEEP_TIME_MS * 5);
         mMediaPlayer.setSurface(null);
 
-        Thread.sleep(SLEEP_TIME * 1);
-        SurfaceTexture surfaceTexture = new SurfaceTexture(0);
-        Surface surface = new Surface(surfaceTexture);
-        surface.release();
-        try {
-            mMediaPlayer.setSurface(surface);
-            throw new RuntimeException("setSurface with released Surface object didn't throw " +
-                    "IllegalArgumentException");
-        } catch (IllegalArgumentException e) {
-            // Expected
-        }
-
         while (mMediaPlayer.isPlaying()) {
-            Thread.sleep(SLEEP_TIME);
+            Thread.sleep(SLEEP_TIME_MS);
         }
     }
 
diff --git a/tests/src/android/provider/cts/FileCopyHelper.java b/tests/src/android/provider/cts/FileCopyHelper.java
index 4ee93ac..114c3ad 100644
--- a/tests/src/android/provider/cts/FileCopyHelper.java
+++ b/tests/src/android/provider/cts/FileCopyHelper.java
@@ -19,6 +19,7 @@
 import android.content.Context;
 
 import java.io.File;
+import java.io.FileNotFoundException;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
@@ -57,36 +58,36 @@
      * @param fileName the file name
      *
      * @return the absolute path of the destination file
+     * @throws IOException
      */
-    public String copy(int resId, String fileName) {
-        InputStream source = null;
-        OutputStream target = null;
+    public String copy(int resId, String fileName) throws IOException {
+        InputStream source = mContext.getResources().openRawResource(resId);
+        OutputStream target = mContext.openFileOutput(fileName, Context.MODE_WORLD_READABLE);
+        copyFile(source, target);
+        mFilesList.add(fileName);
+        return mContext.getFileStreamPath(fileName).getAbsolutePath();
+    }
 
+    public void copyToExternalStorage(int resId, File path) throws IOException {
+        InputStream source = mContext.getResources().openRawResource(resId);
+        OutputStream target = new FileOutputStream(path);
+        copyFile(source, target);
+    }
+
+    private void copyFile(InputStream source, OutputStream target) throws IOException {
         try {
-            source = mContext.getResources().openRawResource(resId);
-            target = mContext.openFileOutput(fileName, Context.MODE_WORLD_READABLE);
-
             byte[] buffer = new byte[1024];
             for (int len = source.read(buffer); len > 0; len = source.read(buffer)) {
                 target.write(buffer, 0, len);
             }
-        } catch (IOException e) {
-            e.printStackTrace();
         } finally {
-            try {
-                if (source != null) {
-                    source.close();
-                }
-                if (target != null) {
-                    target.close();
-                }
-            } catch (IOException e) {
-                // Ignore the IOException.
+            if (source != null) {
+                source.close();
+            }
+            if (target != null) {
+                target.close();
             }
         }
-
-        mFilesList.add(fileName);
-        return mContext.getFileStreamPath(fileName).getAbsolutePath();
     }
 
     /**
diff --git a/tests/src/android/renderscript/cts/RenderscriptGLStubActivity.java b/tests/src/android/renderscript/cts/RenderscriptGLStubActivity.java
index 3bb6212..d6d05ac 100644
--- a/tests/src/android/renderscript/cts/RenderscriptGLStubActivity.java
+++ b/tests/src/android/renderscript/cts/RenderscriptGLStubActivity.java
@@ -87,10 +87,15 @@
                 destroyRenderScriptGL();
             }
         }
+
+        public void forceDestroy() {
+            onDetachedFromWindow();
+        }
     }
 
     // Custom view to use with RenderScript
     private HelloWorldView mView;
+    private HelloWorldView mView2;
 
     @Override
     public void onCreate(Bundle icicle) {
@@ -102,16 +107,28 @@
     }
 
     public void recreateView() {
+        HelloWorldView oldView = mView;
         mView = new HelloWorldView(this);
         setContentView(mView);
+        oldView.forceDestroy();
+    }
+    
+    public void destroyAll() {
+        if (mView != null) {
+            mView.forceDestroy();
+        }
+        if (mView2 != null) {
+            mView2.forceDestroy();
+        }
     }
 
     public void recreateMultiView() {
-        HelloWorldView view1 = new HelloWorldView(this);
-        HelloWorldView view2 = new HelloWorldView(this);
-        setContentView(view1);
-        setContentView(view2);
-        mView = view2;
+        HelloWorldView oldView = mView;
+        mView = new HelloWorldView(this);
+        mView2 = new HelloWorldView(this);
+        setContentView(mView);
+        setContentView(mView2);
+        oldView.forceDestroy();
     }
 
     @Override
diff --git a/tests/src/android/renderscript/cts/utils.rs b/tests/src/android/renderscript/cts/utils.rs
new file mode 100755
index 0000000..86e7997
--- /dev/null
+++ b/tests/src/android/renderscript/cts/utils.rs
@@ -0,0 +1,39 @@
+#include "shared.rsh"
+
+static bool test_color_pack_unpack() {
+    bool failed = false;
+    start();
+
+    for(uint i = 0; i < 256; i ++) {
+        uchar4 v = (uchar)i;
+        float4 f = rsUnpackColor8888(v);
+        uchar4 res = rsPackColorTo8888(f);
+        _RS_ASSERT(v.x == res.x);
+        _RS_ASSERT(v.y == res.y);
+        _RS_ASSERT(v.z == res.z);
+        _RS_ASSERT(v.w == res.w);
+    }
+
+    float time = end();
+
+    if (failed) {
+        rsDebug("test_color_pack_unpack FAILED", time);
+    }
+    else {
+        rsDebug("test_color_pack_unpack PASSED", time);
+    }
+
+    return failed;
+}
+void test() {
+    bool failed = false;
+    failed |= test_color_pack_unpack();
+
+    if (failed) {
+        rsSendToClientBlocking(RS_MSG_TEST_FAILED);
+    }
+    else {
+        rsSendToClientBlocking(RS_MSG_TEST_PASSED);
+    }
+}
+
diff --git a/tests/src/android/theme/cts/ActionBarModifier.java b/tests/src/android/theme/cts/ActionBarModifier.java
deleted file mode 100644
index 2f33a79..0000000
--- a/tests/src/android/theme/cts/ActionBarModifier.java
+++ /dev/null
@@ -1,150 +0,0 @@
-/*
- * Copyright (C) 2011 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package android.theme.cts;
-
-import android.app.ActionBar;
-import android.app.ActionBar.Tab;
-import android.app.FragmentTransaction;
-
-/**
- * Implementation of the {@link ActivityTestInfo} interface for {@link ActionBar} tests.
- */
-public class ActionBarModifier implements ActivityTestInfo {
-    /**
-     * Runs the basic test case that performs no modifications on the {@link ActionBar}.
-     */
-    public static final int BASIC = 0;
-
-    /**
-     * Runs the test that turns the icon on the {@link ActionBar} into the up icon version.
-     */
-    public static final int DISPLAY_HOME_AS_UP = 1;
-
-    /**
-     * Runs the test that displays tabs in the {@link ActionBar}.
-     */
-    public static final int TABS = 2;
-
-    /**
-     * Runs the test that displays a list ({@link Spinner}-style) in the {@link ActionBar}.
-     */
-    public static final int LIST = 3;
-
-    /**
-     * Runs the test that displays only the icon and not the title in the {@link ActionBar}.
-     */
-    public static final int NO_TITLE = 4;
-
-    /**
-     * Runs the test that displays only the icon in the {@link ActionBar}.
-     */
-    public static final int NO_ICON = 5;
-
-    /**
-     * Runs the test that displays action items in the {@link ActionBar}.
-     */
-    public static final int ACTION_ITEMS = 6;
-
-    /**
-     * Runs the test that displays a {@link SearchView} as an action view in the {@link ActionBar}.
-     */
-    public static final int ACTION_VIEW = 7;
-
-    /**
-     * Runs the test that displays a {@link SearchView} as a collapsable action view (opened) in
-     * the {@link ActionBar}.
-     */
-    public static final int COLLAPSED_ACTION_VIEW = 8;
-
-    private String mTestname;
-    private int mTestType;
-
-    /**
-     * Creates an ActionBarModifier with the specified testname and test type.
-     * @param testname The unique name of hte test.
-     * @param testType The type of test to run based on the public constants of ActionBarModifier.
-     */
-    public ActionBarModifier(String testname, int testType) {
-        mTestname = testname;
-        mTestType = testType;
-    }
-
-    public String getTestName() {
-        return mTestname;
-    }
-    @Override
-    public void modifyActivity(SnapshotActivity activity) {
-        ActionBar actionBar = activity.getActionBar();
-
-        if (actionBar == null) {
-            return;
-        }
-
-        // based on which test was asked, performs a different sequence of actions
-        switch (mTestType) {
-            case BASIC:
-                break;
-            case DISPLAY_HOME_AS_UP:
-                actionBar.setDisplayHomeAsUpEnabled(true);
-                break;
-            case TABS:
-                actionBar.setNavigationMode(ActionBar.NAVIGATION_MODE_TABS);
-                actionBar.setDisplayShowTitleEnabled(false);
-                actionBar.addTab(actionBar.newTab().setText("First")
-                        .setTabListener(new MyTabListener()));
-                actionBar.addTab(actionBar.newTab().setText("Second")
-                        .setTabListener(new MyTabListener()));
-                actionBar.addTab(actionBar.newTab().setText("Third")
-                        .setTabListener(new MyTabListener()));
-                break;
-            case LIST:
-                actionBar.setNavigationMode(ActionBar.NAVIGATION_MODE_LIST);
-                break;
-            case NO_TITLE:
-                actionBar.setDisplayShowTitleEnabled(false);
-                break;
-            case NO_ICON:
-                actionBar.setDisplayShowHomeEnabled(false);
-                break;
-            // for the last three test, a state is set because these ones must be set up
-            // in Activity.onCreateOptionsMenu. A flag is sent that is then checked later
-            // in the Activity lifecycle
-            case ACTION_ITEMS:
-            case ACTION_VIEW:
-            case COLLAPSED_ACTION_VIEW:
-                activity.setActionItemState(mTestType);
-        }
-    }
-
-    /**
-     * Stub class that exists since tabs need to have a listener. Does nothing.
-     */
-    private class MyTabListener implements ActionBar.TabListener {
-        public void onTabSelected(Tab tab, FragmentTransaction ft) {
-            // do nothing
-        }
-
-        public void onTabUnselected(Tab tab, FragmentTransaction ft) {
-            // do nothing
-        }
-
-        public void onTabReselected(Tab tab, FragmentTransaction ft) {
-            // do nothing
-        }
-    }
-
-}
diff --git a/tests/src/android/theme/cts/ActivitySnapshotTester.java b/tests/src/android/theme/cts/ActivitySnapshotTester.java
deleted file mode 100644
index 3040954..0000000
--- a/tests/src/android/theme/cts/ActivitySnapshotTester.java
+++ /dev/null
@@ -1,218 +0,0 @@
-/*
- * Copyright (C) 2011 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package android.theme.cts;
-
-import android.app.Activity;
-import android.app.Instrumentation;
-import android.content.Intent;
-import android.content.pm.ActivityInfo;
-import android.content.res.Configuration;
-import android.graphics.Bitmap;
-import android.os.Handler;
-import android.test.ActivityInstrumentationTestCase2;
-import android.view.View;
-import android.view.View.MeasureSpec;
-
-/**
- * This class serves as the main driver for the activity screenshot tests.
- */
-public class ActivitySnapshotTester {
-    private ActivityInstrumentationTestCase2<? extends SnapshotActivity> mTestCases;
-    private boolean mSplitMode;
-    private boolean mShouldRetryTest;
-
-    /**
-     * Creates an {@link ActivitySnapshotTester} to run all of the tests in the given
-     * configuration as determined by the parameters passed to it.
-     * @param testCases The ActivityInstrumentationTestCase2 that provides the activity
-     * to test.
-     * @param splitMode true if the test should use SplitActionBarWhenNarrow as a uiOption.
-     * Note that this flag does not actually enable that feature, it merely labels
-     * the tests appropriately.
-     */
-    public ActivitySnapshotTester(
-            ActivityInstrumentationTestCase2<? extends SnapshotActivity> testCases,
-            boolean splitMode) {
-        mTestCases = testCases;
-        mSplitMode = splitMode;
-    }
-
-    /**
-     * This function either generates the known-good versions of the activity screenshot tests
-     * or runs the tests in either portrait or landscape orientation
-     * mode based upon the parameters.
-     * @param generate true if the known good versions of the tests should be generated.
-     * @param portrait true if the tests should be run in portrait orientation.
-     */
-    public void genOrTestActivityBitmaps(boolean generate, boolean portrait) {
-        ThemeInfo[] themes = ThemeTests.getThemes();
-        ActivityTestInfo[] activityTests = ThemeTests.getActivityTests();
-
-        int numActivityTests = activityTests.length;
-
-        // iterate through all of the themes
-        for (ThemeInfo theme : themes) {
-            // iterate through all of the tests
-            for (int i = 0; i < numActivityTests; i++) {
-                // run in portrait
-                if (portrait) {
-                    genOrTestActivityBitmap(
-                            theme, activityTests[i], i,
-                            ActivityInfo.SCREEN_ORIENTATION_PORTRAIT, generate);
-                } else { // landscape
-                    genOrTestActivityBitmap(
-                            theme, activityTests[i], i,
-                            ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE, generate);
-                }
-            }
-        }
-    }
-
-    private void genOrTestActivityBitmap(
-            final ThemeInfo theme, final ActivityTestInfo test, final int testIndex,
-            final int orientation, final boolean generate) {
-        mShouldRetryTest = true;
-        while (mShouldRetryTest) {
-            mShouldRetryTest = false;
-
-            Instrumentation instrumentation = mTestCases.getInstrumentation();
-
-            // build the intent to send to the activity
-            Intent intent = new Intent();
-            intent.putExtra(ThemeTests.EXTRA_THEME_ID, theme.getResourceId());
-            intent.putExtra(ThemeTests.EXTRA_THEME_NAME, theme.getThemeName());
-            intent.putExtra(ThemeTests.EXTRA_ORIENTATION, orientation);
-            intent.putExtra(ThemeTests.EXTRA_ACTIVITY_TEST_INDEX, testIndex);
-            intent.setFlags(Intent.FLAG_ACTIVITY_NO_ANIMATION);
-            mTestCases.setActivityIntent(intent);
-
-            SnapshotActivity activity = mTestCases.getActivity();
-
-            // run the test
-            activity.runOnUiThread(
-                    new ActivitySnapshotRunnable(theme, test, orientation, generate));
-
-            instrumentation.waitForIdleSync();
-
-            ((TestReset) mTestCases).reset();
-        }
-
-    }
-
-    /**
-     * This class exists so that we can delay testing until we are certain that our orientation
-     * and window size are correct. We check the values and then, if we're not in a stable state,
-     * just post another Runnable for the future.
-     */
-    private class ActivitySnapshotRunnable implements Runnable {
-        private ThemeInfo mTheme;
-        private ActivityTestInfo mTest;
-        private int mOrientation;
-        private boolean mGenerate;
-        private boolean mShouldRequestLayout;
-
-        /**
-         * Creates a new ActivitySnapshotRunnable.
-         * @param theme The {@link ThemeInfo} to test.
-         * @param test The {@link ActivityTestInfo} to test.
-         * @param orientation The orientation in which the test should be.
-         * @param generate Whether we should be generating a known-good version
-         * or comparing to the previously generated version.
-         */
-        public ActivitySnapshotRunnable(ThemeInfo theme, ActivityTestInfo test,
-                int orientation, boolean generate) {
-            this(theme, test, orientation, generate, true);
-        }
-
-        /**
-         * Creates a new ActivitySnapshotRunnable.
-         * @param theme The {@link ThemeInfo} to test.
-         * @param test The {@link ActivityTestInfo} to test.
-         * @param orientation The orientation in which the test should be.
-         * @param generate Whether we should be generating a known-good version
-         * or comparing to the previously generated version.
-         * @param shouldRequestLayout true if, before testing or saving the bitmap,
-         * another layout pass should occur.
-         */
-        private ActivitySnapshotRunnable(ThemeInfo theme, ActivityTestInfo test,
-                int orientation, boolean generate, boolean shouldRequestLayout) {
-            mTheme = theme;
-            mTest = test;
-            mOrientation = orientation;
-            mGenerate = generate;
-            mShouldRequestLayout = shouldRequestLayout;
-        }
-
-        public void run() {
-            SnapshotActivity activity = mTestCases.getActivity();
-
-            String orientationString = (mOrientation == ActivityInfo.SCREEN_ORIENTATION_PORTRAIT)
-                    ? "port" : "land";
-            String testName = mTheme.getThemeName() + "_" + orientationString +
-                    "_" + mTest.getTestName();
-
-            Configuration config = activity.getResources().getConfiguration();
-
-            int realOrientation;
-            switch (config.orientation) {
-                case Configuration.ORIENTATION_LANDSCAPE:
-                    realOrientation = ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE;
-                    break;
-                case Configuration.ORIENTATION_PORTRAIT:
-                    realOrientation = ActivityInfo.SCREEN_ORIENTATION_PORTRAIT;
-                    break;
-                default:
-                    realOrientation = -1;
-                    break;
-            }
-
-            // seems more stable if we make sure to request the layout again
-            // can't hurt if it's just one more time
-            if (mShouldRequestLayout) {
-                delaySnapshot(activity, false);
-                return;
-            }
-
-            BitmapProcessor processor;
-
-            // whether we should generate the bitmap or compare it to the good version
-            if (mGenerate) {
-                processor = new BitmapSaver(activity, testName, mSplitMode);
-            } else {
-                processor = new BitmapComparer(activity, null, testName, true, mSplitMode);
-            }
-
-            Bitmap bmp = activity.getBitmapOfWindow();
-            processor.processBitmap(bmp);
-            bmp.recycle();
-        }
-
-        /**
-         * Delays taking a snapshot for a bit longer.
-         */
-        private void delaySnapshot(Activity activity, final boolean shouldRequestLayout) {
-            View view = activity.getWindow().getDecorView();
-
-            view.measure(MeasureSpec.makeMeasureSpec(view.getWidth(), MeasureSpec.EXACTLY),
-                    MeasureSpec.makeMeasureSpec(view.getHeight(), MeasureSpec.EXACTLY));
-            view.layout(0, 0, view.getWidth(), view.getHeight());
-
-            new Handler().post(new ActivitySnapshotRunnable(mTheme, mTest,
-                    mOrientation, mGenerate, shouldRequestLayout));
-        }
-    }
-}
diff --git a/tests/src/android/theme/cts/ActivityTestInfo.java b/tests/src/android/theme/cts/ActivityTestInfo.java
deleted file mode 100644
index 1eeaaec..0000000
--- a/tests/src/android/theme/cts/ActivityTestInfo.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Copyright (C) 2011 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package android.theme.cts;
-
-/**
- * Interface that exists so as to use one piece of code to run all of the
- * activity snapshot tests. Note that each test must have a unique test name
- * as returned by {@link #getTestName()}. If you wish to modify the activity,
- * make sure to do any changes within {@link #modifyActivity(SnapshotActivity)}.<p>
- *
- * If absolutely necessary, you can edit the lifecycle methods of {@link SnapshotActivity}.
- */
-public interface ActivityTestInfo {
-    /**
-     * Returns the unique name of the test. Note that this name must be unique
-     * among all of the activity tests and all of the theme tests.
-     * @return The unique name of the test.
-     */
-    public String getTestName();
-
-    /**
-     * Performs some manipulations on the activity. Essentially, this function
-     * is the test's sandbox to do whatever is needed to change the look of the
-     * activity.
-     * @param activity The {@link SnapshotActivity} to modify.
-     */
-    public void modifyActivity(SnapshotActivity activity);
-}
diff --git a/tests/src/android/theme/cts/AlertDialogBuilder.java b/tests/src/android/theme/cts/AlertDialogBuilder.java
deleted file mode 100644
index 040d1b5..0000000
--- a/tests/src/android/theme/cts/AlertDialogBuilder.java
+++ /dev/null
@@ -1,104 +0,0 @@
-/*
- * Copyright (C) 2011 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package android.theme.cts;
-
-import android.app.AlertDialog;
-import android.app.Dialog;
-import android.view.View;
-
-/**
- * Implements the {@link DialogBuilder} interface to build and show
- * {@link AlertDialog}s for the purposes of testing. In order to reuse
- * as much as possible, the constructor takes a flag that describes the
- * type of AlertDialog to build for the test.
- *
- * If you want to create another {@link AlertDialog} test, simply
- * add another flag and add another case to the switch statement
- * in {link buildDialog()}
- */
-public class AlertDialogBuilder implements DialogBuilder {
-    /**
-     * Build an {@link AlertDialog} with one button.
-     */
-    public static final int ONE_BUTTON = 0;
-    /**
-     * Build an {@link AlertDialog} with two buttons.
-     */
-    public static final int TWO_BUTTONS = 1;
-    /**
-     * Build an {@link AlertDialog} with three buttons.
-     */
-    public static final int THREE_BUTTONS = 2;
-    /**
-     * Build an {@link AlertDialog} with a list of items.
-     */
-    public static final int LIST = 3;
-    /**
-     * Build an {@link AlertDialog} with a single-choice list of items.
-     */
-    public static final int SINGLE_CHOICE = 4;
-    /**
-     * Build an {@link AlertDialog} with a multi-choice list of items.
-     */
-    public static final int MULTI_CHOICE = 5;
-
-    private int mDialogType;
-
-    private static final CharSequence[] ITEMS = {"Red", "Green", "Blue"};
-
-    public AlertDialogBuilder(int dialogType) {
-        mDialogType = dialogType;
-    }
-
-    @Override
-    public Dialog buildDialog(View view) {
-        AlertDialog.Builder builder = new AlertDialog.Builder(view.getContext());
-
-        switch (mDialogType) {
-            case ONE_BUTTON:
-                builder.setTitle("Exit Dialog")
-                        .setMessage("Are you sure you want to exit?")
-                        .setPositiveButton("Exit", null);
-                break;
-            case TWO_BUTTONS:
-                builder.setMessage("Are you sure you want to exit?")
-                        .setPositiveButton("Exit", null)
-                        .setNegativeButton("Cancel", null);
-                break;
-            case THREE_BUTTONS:
-                builder.setMessage("Are you sure you want to exit?")
-                        .setPositiveButton("Exit", null)
-                        .setNeutralButton("Neutral", null)
-                        .setNegativeButton("Cancel", null);
-                break;
-            case LIST:
-                builder.setTitle("Pick a Color")
-                        .setItems(ITEMS, null);
-                break;
-            case SINGLE_CHOICE:
-                builder.setTitle("Pick a Color")
-                        .setSingleChoiceItems(ITEMS, 1, null);
-                break;
-            case MULTI_CHOICE:
-                builder.setTitle("Pick a Color")
-                        .setMultiChoiceItems(ITEMS, new boolean[]{false, true, false}, null);
-                break;
-        }
-
-        return builder.show();
-    }
-}
\ No newline at end of file
diff --git a/tests/src/android/theme/cts/BitmapComparer.java b/tests/src/android/theme/cts/BitmapComparer.java
deleted file mode 100644
index 7171690..0000000
--- a/tests/src/android/theme/cts/BitmapComparer.java
+++ /dev/null
@@ -1,93 +0,0 @@
-/*
- * Copyright (C) 2011 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package android.theme.cts;
-
-import com.android.cts.stub.R;
-
-import android.app.Activity;
-import android.content.res.Resources;
-import android.content.res.Resources.NotFoundException;
-import android.graphics.Bitmap;
-import android.graphics.drawable.BitmapDrawable;
-import android.widget.ImageView;
-import android.widget.TextView;
-
-import junit.framework.Assert;
-
-/**
- * Implementation of {@link BitmapProcessor} that compares the created bitmap
- * to a known good version based on pixel-perfect matching
- * (specifically {@link Bitmap#sameAs(Bitmap)}. Asserts if the bitmaps do not compare.
- */
-public class BitmapComparer implements BitmapProcessor {
-    private String mBitmapIdName;
-    private boolean mShouldAssert;
-    private Activity mActivity;
-    private ImageView mReferenceImage;
-
-    public BitmapComparer(Activity activity, ImageView referenceImage,
-            String filename, boolean shouldAssert, boolean splitMode) {
-        mActivity = activity;
-        mReferenceImage = referenceImage;
-        mShouldAssert = shouldAssert;
-
-        if (splitMode) {
-            mBitmapIdName = filename + "_split";
-        } else {
-            mBitmapIdName = filename;
-        }
-    }
-
-    @Override
-    public void processBitmap(Bitmap bitmap) {
-        // get the bitmap from the resource system
-        // since we only have the name, not the resource ID,
-        // we need to look up the ID first
-        Resources r = mActivity.getResources();
-        int resourceId = r.getIdentifier(mBitmapIdName, "drawable", mActivity.getPackageName());
-
-        BitmapDrawable drawable = null;
-
-        try {
-            drawable = (BitmapDrawable) r.getDrawable(resourceId);
-        } catch (NotFoundException e) {
-            Assert.fail("Test Failed: Resource not found - " + mBitmapIdName);
-        }
-
-        Bitmap bmp2 = drawable.getBitmap();
-
-        if (mReferenceImage != null) {
-            mReferenceImage.setImageBitmap(bmp2);
-        }
-
-        // pixel-perfect matching - could easily re-write to use a fuzzy-matching algorithm
-        boolean identical = bmp2.sameAs(bitmap);
-
-        // the second and third options are for the manual lookup version
-        if (mShouldAssert) {
-            if (!identical) {
-                BitmapSaver saver = new BitmapSaver(mActivity, "failed_image_" + mBitmapIdName, false);
-                saver.processBitmap(bitmap);
-            }
-            Assert.assertTrue("Test failed: " + mBitmapIdName, identical);
-        } else if (identical) {
-            ((TextView) mActivity.findViewById(R.id.text)).setText("Bitmaps identical");
-        } else {
-            ((TextView) mActivity.findViewById(R.id.text)).setText("Bitmaps differ");
-        }
-    }
-}
\ No newline at end of file
diff --git a/tests/src/android/theme/cts/BitmapProcessor.java b/tests/src/android/theme/cts/BitmapProcessor.java
deleted file mode 100644
index 4031471..0000000
--- a/tests/src/android/theme/cts/BitmapProcessor.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Copyright (C) 2011 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package android.theme.cts;
-
-import android.graphics.Bitmap;
-
-/**
- * Simple interface in order to share code between the bitmap comparison and bitmap generation
- * steps.
- */
-public interface BitmapProcessor {
-    /**
-     * Processes the bitmap that is passed into this function, either saving it or comparing
-     * it against a previously generated version.
-     * @param bitmap The bitmap to process.
-     */
-    public void processBitmap(Bitmap bitmap);
-}
\ No newline at end of file
diff --git a/tests/src/android/theme/cts/BitmapSaver.java b/tests/src/android/theme/cts/BitmapSaver.java
deleted file mode 100644
index a28944d..0000000
--- a/tests/src/android/theme/cts/BitmapSaver.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * Copyright (C) 2011 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package android.theme.cts;
-
-import android.app.Activity;
-import android.content.Context;
-import android.graphics.Bitmap;
-
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.IOException;
-
-import junit.framework.Assert;
-
-/**
- * Implementation of {@link BitmapProcessor} that saves a known-good version of a
- * bitmap and saves it to the application's data folder.
- */
-public class BitmapSaver implements BitmapProcessor {
-    private String mFilename;
-    private Activity mActivity;
-
-    public BitmapSaver(Activity activity, String filename, boolean splitMode) {
-        mActivity = activity;
-
-        if (splitMode) {
-            mFilename = filename + "_split.png";
-        } else {
-            mFilename = filename + ".png";
-        }
-    }
-
-    @Override
-    public void processBitmap(Bitmap bitmap) {
-        try {
-            FileOutputStream fos = mActivity.openFileOutput(mFilename, Context.MODE_PRIVATE);
-            bitmap.compress(Bitmap.CompressFormat.PNG, 100, fos);
-            fos.close();
-        } catch (FileNotFoundException e) {
-            Assert.fail("Test Failed: FileNotFoundException thrown");
-        } catch (IOException e) {
-            Assert.fail("Test Failed: IOException thrown");
-        }
-    }
-}
\ No newline at end of file
diff --git a/tests/src/android/theme/cts/CalendarViewModifier.java b/tests/src/android/theme/cts/CalendarViewModifier.java
deleted file mode 100644
index 0f3be46..0000000
--- a/tests/src/android/theme/cts/CalendarViewModifier.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright (C) 2011 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package android.theme.cts;
-
-import android.view.View;
-import android.widget.CalendarView;
-
-/**
- * Modifies the CalendarView widget in order to set a precise date.
- */
-public class CalendarViewModifier implements ThemeTestModifier {
-    /**
-     * Long representation of a date that is 30 years in milliseconds from
-     * Unix epoch (January 1, 1970 00:00:00).
-     */
-    private static final long DATE = 946707779241L;
-
-    @Override
-    public View modifyView(View view) {
-        ((CalendarView) view).setDate(DATE);
-        return view;
-    }
-}
diff --git a/tests/src/android/theme/cts/DatePickerModifier.java b/tests/src/android/theme/cts/DatePickerModifier.java
deleted file mode 100644
index b3d2002..0000000
--- a/tests/src/android/theme/cts/DatePickerModifier.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Copyright (C) 2011 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package android.theme.cts;
-
-import android.view.View;
-import android.widget.DatePicker;
-
-/**
- * Modifies a DatePicker widget to set a precise date.
- */
-public class DatePickerModifier implements ThemeTestModifier {
-
-    @Override
-    public View modifyView(View view) {
-        DatePicker tp = (DatePicker) view;
-        tp.updateDate(2011, 6, 21);
-        return view;
-    }
-}
diff --git a/tests/src/android/theme/cts/DialogBuilder.java b/tests/src/android/theme/cts/DialogBuilder.java
deleted file mode 100644
index a870895..0000000
--- a/tests/src/android/theme/cts/DialogBuilder.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Copyright (C) 2011 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package android.theme.cts;
-
-import android.app.Dialog;
-import android.view.View;
-
-/**
- * Interface to implement should you want to write a test that uses
- * a Dialog. Since a Dialog shows in a new window, implementation
- * of this interface is required in order to appropriately save
- * the Dialog for testing.
- */
-public interface DialogBuilder {
-    /**
-     * Builds and shows a Dialog to be saved.
-     * @return The Dialog to save.
-     */
-    public Dialog buildDialog(View view);
-}
\ No newline at end of file
diff --git a/tests/src/android/theme/cts/DialogModifier.java b/tests/src/android/theme/cts/DialogModifier.java
deleted file mode 100644
index bf37f4d..0000000
--- a/tests/src/android/theme/cts/DialogModifier.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Copyright (C) 2011 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package android.theme.cts;
-
-import android.app.Dialog;
-import android.view.View;
-import android.view.ViewGroup;
-
-/**
- * This class builds and modifies a Dialog (or its derived classes)
- * in order to use in the Theme Testing framework. To create a new
- * Dialog test, either create a new class that implements {@link DialogBuilder}
- * or add another test to the existing implementations of {@link DialogBuilder}.
- *
- * See {@link AlertDialogBuilder} for an existing implementation.
- */
-public class DialogModifier implements ThemeTestModifier {
-    private DialogBuilder mBuilder;
-
-    public DialogModifier(DialogBuilder builder) {
-        mBuilder = builder;
-    }
-
-    @Override
-    public View modifyView(View view) {
-        Dialog alert = mBuilder.buildDialog(view);
-        ViewGroup parent = (ViewGroup) view.getParent();
-        parent.removeView(view); // remove the filler view
-
-        // get the dialog as a view
-        View newView = alert.getWindow().getDecorView();
-
-        // remove it from the dialog
-        alert.getWindow().getWindowManager().removeView(newView);
-
-        // so we can add it to our ViewGroup
-        parent.addView(newView);
-
-        return newView;
-    }
-}
diff --git a/tests/src/android/theme/cts/OrientationSelectorActivity.java b/tests/src/android/theme/cts/OrientationSelectorActivity.java
deleted file mode 100644
index 72aa425..0000000
--- a/tests/src/android/theme/cts/OrientationSelectorActivity.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * Copyright (C) 2011 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package android.theme.cts;
-
-import com.android.cts.stub.R;
-
-import android.app.Activity;
-import android.content.Intent;
-import android.os.Bundle;
-import android.view.View;
-import android.widget.AdapterView;
-import android.widget.AdapterView.OnItemClickListener;
-import android.widget.ArrayAdapter;
-import android.widget.ListView;
-
-/**
- * This activity exists solely for debugging purposes. It is
- * the first activity seen when launching the manual viewer of tests.
- * It allows the user to select whether they want to see the tests
- * in portrait or landscape mode.
- */
-public class OrientationSelectorActivity extends Activity {
-    private static final String[] mOrientations = {"landscape", "portrait"};
-    /**
-     * Called with the activity is first created.
-     */
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.themetestlistactivity);
-
-        ListView lv = (ListView) findViewById(R.id.tests_list);
-
-        lv.setAdapter(
-                new ArrayAdapter<String>(this, android.R.layout.simple_list_item_1, mOrientations));
-
-        lv.setOnItemClickListener(mTestClickedListener);
-    }
-
-    private OnItemClickListener mTestClickedListener = new OnItemClickListener() {
-        public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
-            Intent intent =
-                new Intent(OrientationSelectorActivity.this, ThemeSelectorActivity.class);
-            intent.putExtra(ThemeTests.EXTRA_ORIENTATION, position);
-            startActivity(intent);
-        }
-    };
-}
diff --git a/tests/src/android/theme/cts/ProgressDialogBuilder.java b/tests/src/android/theme/cts/ProgressDialogBuilder.java
deleted file mode 100644
index 18decd9..0000000
--- a/tests/src/android/theme/cts/ProgressDialogBuilder.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * Copyright (C) 2011 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package android.theme.cts;
-
-import android.app.Dialog;
-import android.app.ProgressDialog;
-import android.view.View;
-
-/**
- * This class implements the {@link DialogBuilder} interface
- * in order to build {@link ProgressDialog}s for testing purposes.
- *
- * <p>In order to add more tests of {@link ProgressDialog}, simply
- * add another case inside {@link ProgressDialogBuilder#buildDialog}.
- */
-public class ProgressDialogBuilder implements DialogBuilder {
-    /**
-     * Builds a {@link ProgressDialog} that contains a circular
-     * {@link ProgressBar}.
-     */
-    public static final int SPINNER = 0;
-
-    /**
-     * Builds a {@link ProgressDialog} that contains a horizontal
-     * {@link ProgressBar}.
-     */
-    public static final int HORIZONTAL = 1;
-
-    private int mDialogType;
-
-    public ProgressDialogBuilder(int dialogType) {
-        mDialogType = dialogType;
-    }
-
-    @Override
-    public Dialog buildDialog(View view) {
-        ProgressDialog progressDialog = new ProgressDialog(view.getContext());
-        progressDialog.setMessage("Loading...");
-
-        switch (mDialogType) {
-            case SPINNER:
-                progressDialog.setProgressStyle(ProgressDialog.STYLE_SPINNER);
-                break;
-            case HORIZONTAL:
-                progressDialog.setProgressStyle(ProgressDialog.STYLE_HORIZONTAL);
-                progressDialog.setMax(100);
-                break;
-        }
-
-        progressDialog.show();
-        return progressDialog;
-    }
-
-}
diff --git a/tests/src/android/theme/cts/SearchViewModifier.java b/tests/src/android/theme/cts/SearchViewModifier.java
deleted file mode 100644
index dc2c024..0000000
--- a/tests/src/android/theme/cts/SearchViewModifier.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Copyright (C) 2011 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package android.theme.cts;
-
-import android.view.View;
-import android.widget.SearchView;
-
-/**
- * This class modifies {@link SearchView} for the various tests that test
- * the look of it.
- */
-public class SearchViewModifier implements ThemeTestModifier {
-    public static final int QUERY_HINT = 0;
-    public static final int QUERY = 1;
-
-    private int mSearchViewType;
-
-    public SearchViewModifier(int searchViewType) {
-        mSearchViewType = searchViewType;
-    }
-
-    @Override
-    public View modifyView(View view) {
-        SearchView sv = (SearchView) view;
-
-        switch (mSearchViewType) {
-            case QUERY_HINT:
-                sv.setQueryHint("Query Hint");
-                break;
-            case QUERY:
-                sv.setQuery("Query", false);
-                break;
-        }
-
-        sv.setIconifiedByDefault(false);
-        return sv;
-    }
-}
diff --git a/tests/src/android/theme/cts/SnapshotActivity.java b/tests/src/android/theme/cts/SnapshotActivity.java
deleted file mode 100644
index 1344600..0000000
--- a/tests/src/android/theme/cts/SnapshotActivity.java
+++ /dev/null
@@ -1,166 +0,0 @@
-/*
- * Copyright (C) 2011 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package android.theme.cts;
-
-import com.android.cts.stub.R;
-
-import android.app.ActionBar;
-import android.app.Activity;
-import android.content.Intent;
-import android.content.pm.ActivityInfo;
-import android.content.res.Configuration;
-import android.content.res.Resources;
-import android.graphics.Bitmap;
-import android.graphics.Canvas;
-import android.os.Bundle;
-import android.view.Menu;
-import android.view.MenuItem;
-import android.view.View;
-import android.view.WindowManager.LayoutParams;
-import android.widget.SearchView;
-
-/**
- * This class is an Activity that knows how to set its orientation and theme (via intent
- * extras being passed, as well as calling
- * {@link ActivityTestInfo#modifyActivity(SnapshotActivity)} in order to
- * perform some modification on the activity itself that is different for
- * each test.
- */
-public class SnapshotActivity extends Activity {
-    private int mActionItemState;
-
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-
-        mActionItemState = -1;
-
-        updateWindowSize();
-
-        Intent intent = getIntent();
-
-        // set the orientation
-        int orientation = intent.getIntExtra(ThemeTests.EXTRA_ORIENTATION,
-                ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED);
-
-        setRequestedOrientation(orientation);
-
-        // set the theme
-        int themeId = intent.getIntExtra(ThemeTests.EXTRA_THEME_ID, 0);
-
-        setTheme(themeId);
-
-        setContentView(R.layout.empty);
-
-        int testIndex = intent.getIntExtra(ThemeTests.EXTRA_ACTIVITY_TEST_INDEX, -1);
-
-        if (testIndex < 0) {
-            return;
-        }
-
-        // modify the Activity in some way
-        ThemeTests.getActivityTests()[testIndex].modifyActivity(this);
-    }
-
-    @Override
-    public void onConfigurationChanged(Configuration newConfig) {
-        super.onConfigurationChanged(newConfig);
-
-        updateWindowSize();
-    }
-
-    public void updateWindowSize() {
-        Resources resources = getResources();
-
-        // set the window to a known size so that we don't have issues with different
-        // screen sizes
-        int referenceWidthDp = resources.getDimensionPixelSize(R.dimen.reference_width);
-        int referenceHeightDp = resources.getDimensionPixelSize(R.dimen.reference_height);
-
-        LayoutParams attrs = getWindow().getAttributes();
-
-        // set layout when the orientation has changed
-        if (attrs.width != referenceWidthDp || attrs.height != referenceHeightDp) {
-            getWindow().setLayout(referenceWidthDp, referenceHeightDp);
-        }
-    }
-
-    /**
-     * Returns a {@link Bitmap} of the Activity's decor view.
-     * @return A {@link Bitmap} of the Activity's decor view.
-     */
-    public Bitmap getBitmapOfWindow() {
-        View decorView = getWindow().getDecorView();
-
-        decorView.setFocusable(false);
-
-        Bitmap bitmap = Bitmap.createBitmap(
-                decorView.getWidth(), decorView.getHeight(), Bitmap.Config.ARGB_8888);
-
-        Canvas canvas = new Canvas(bitmap);
-        decorView.draw(canvas);
-
-        return bitmap;
-    }
-
-
-    @Override
-    public boolean onCreateOptionsMenu(Menu menu) {
-        MenuItem actionItem;
-        SearchView searchView;
-        switch (mActionItemState) {
-            case ActionBarModifier.ACTION_ITEMS:
-                actionItem = menu.add("Share").setIcon(android.R.drawable.ic_menu_share);
-                actionItem.setShowAsAction(
-                        MenuItem.SHOW_AS_ACTION_IF_ROOM | MenuItem.SHOW_AS_ACTION_WITH_TEXT);
-
-                actionItem = menu.add("Add").setIcon(android.R.drawable.ic_menu_add);
-                actionItem.setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM);
-
-                actionItem = menu.add("Save").setIcon(android.R.drawable.ic_menu_save);
-                actionItem.setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM);
-
-                return true;
-            case ActionBarModifier.ACTION_VIEW:
-                getMenuInflater().inflate(R.menu.menu_searchview, menu);
-                searchView
-                        = (SearchView) menu.findItem(R.id.menu_search).getActionView();
-                searchView.setIconifiedByDefault(false);
-                return super.onCreateOptionsMenu(menu);
-            case ActionBarModifier.COLLAPSED_ACTION_VIEW: // TODO - fix this test: currently broken
-                getMenuInflater().inflate(R.menu.menu_searchview, menu);
-                actionItem = menu.findItem(R.id.menu_search);
-                actionItem.setShowAsAction(MenuItem.SHOW_AS_ACTION_COLLAPSE_ACTION_VIEW);
-                searchView = (SearchView) actionItem.getActionView();
-                searchView.setFocusable(false);
-                actionItem.expandActionView();
-                return super.onCreateOptionsMenu(menu);
-            default:
-                return false;
-        }
-    }
-
-    /**
-     * Sets the actionItemState that will be used to figure out how to
-     * modify the {@link ActionBar}'s action items in {@link Activity#onCreateOptionsMenu}.
-     * @param actionItemState The actionItemState to use. Corrensponds to the public
-     * constants in {@link ActionBarModifier}.
-     */
-    public void setActionItemState(int actionItemState) {
-        mActionItemState = actionItemState;
-    }
-}
diff --git a/tests/src/android/theme/cts/SplitSnapshotActivity.java b/tests/src/android/theme/cts/SplitSnapshotActivity.java
deleted file mode 100644
index f97c638..0000000
--- a/tests/src/android/theme/cts/SplitSnapshotActivity.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Copyright (C) 2011 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package android.theme.cts;
-
-/**
- * This class is a stub so that we can run the Activity tests using the
- * uiOption SplitActionBarWhenNarrow. Its implementation is deliberately empty
- * since it is supposed to run the same tests as those carried out by its
- * base class {@link SnapshotActivity}. Changes to the tests, if necessary,
- * should be carried out there.
- */
-public class SplitSnapshotActivity extends SnapshotActivity {
-    // EMPTY BY DESIGN
-}
diff --git a/tests/src/android/theme/cts/TabHostModifier.java b/tests/src/android/theme/cts/TabHostModifier.java
deleted file mode 100644
index 86197f5..0000000
--- a/tests/src/android/theme/cts/TabHostModifier.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Copyright (C) 2011 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package android.theme.cts;
-
-import com.android.cts.stub.R;
-
-import android.view.View;
-import android.widget.TabHost;
-
-/**
- * Modifies {@link TabHost} widget for use in testing.
- */
-public class TabHostModifier implements ThemeTestModifier {
-
-    @Override
-    public View modifyView(View view) {
-        TabHost tabHost = (TabHost) view;
-        tabHost.setup();
-        TabHost.TabSpec spec;  // Reusable TabSpec for each tab
-
-        // Initialize a TabSpec for each tab and add it to the TabHost
-        spec = tabHost.newTabSpec("artists").setIndicator("Artists").setContent(R.id.tabInnerView);
-        tabHost.addTab(spec);
-
-        // Do the same for the other tabs
-        spec = tabHost.newTabSpec("albums").setIndicator("Albums").setContent(R.id.tabInnerView);
-        tabHost.addTab(spec);
-
-        spec = tabHost.newTabSpec("songs").setIndicator("Songs").setContent(R.id.tabInnerView);
-        tabHost.addTab(spec);
-
-        tabHost.setCurrentTab(2);
-
-        return view;
-    }
-}
diff --git a/tests/src/android/theme/cts/TestListActivity.java b/tests/src/android/theme/cts/TestListActivity.java
deleted file mode 100644
index 380adab..0000000
--- a/tests/src/android/theme/cts/TestListActivity.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- * Copyright (C) 2011 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package android.theme.cts;
-
-import com.android.cts.stub.R;
-
-import android.app.Activity;
-import android.content.Intent;
-import android.content.pm.ActivityInfo;
-import android.os.Bundle;
-import android.view.View;
-import android.widget.AdapterView;
-import android.widget.AdapterView.OnItemClickListener;
-import android.widget.ListView;
-
-import junit.framework.Assert;
-
-/**
- * Exists for debugging purposes. Allows the manual verifier
- * to select which test to look at. Displays a list of all of the
- * tests. Selecting one shows the reference and generated images
- * for that specific test.
- */
-public class TestListActivity extends Activity {
-    private int mThemeId;
-    private String mThemeName;
-    private int mOrientation;
-
-    /**
-     * Called with the activity is first created.
-     */
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-
-        Intent intent = getIntent();
-        mThemeId = intent.getIntExtra(ThemeTests.EXTRA_THEME_ID, 0);
-
-        // test should fail if no theme is set
-        Assert.assertTrue("No Theme Resource ID set", mThemeId != 0);
-
-        mThemeName = intent.getStringExtra(ThemeTests.EXTRA_THEME_NAME);
-
-        setTheme(mThemeId);
-
-        setContentView(R.layout.themetestlistactivity);
-
-        ListView lv = (ListView) findViewById(R.id.tests_list);
-        lv.setAdapter(new ThemeTestAdapter(this, ThemeTests.getTests()));
-
-        lv.setOnItemClickListener(mTestClickedListener);
-
-        mOrientation = intent.getIntExtra(ThemeTests.EXTRA_ORIENTATION,
-                ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED);
-    }
-
-    private OnItemClickListener mTestClickedListener = new OnItemClickListener() {
-        public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
-            Intent intent = new Intent(TestListActivity.this, ThemeTestRunnerActivity.class);
-            intent.putExtra(ThemeTests.EXTRA_THEME_ID, mThemeId);
-            intent.putExtra(ThemeTests.EXTRA_THEME_NAME, mThemeName);
-            intent.putExtra(ThemeTests.EXTRA_RUN_INDIVIDUAL_TEST, position);
-            intent.putExtra(ThemeTests.EXTRA_ORIENTATION, mOrientation);
-            startActivity(intent);
-        }
-    };
-}
diff --git a/tests/src/android/theme/cts/TestReset.java b/tests/src/android/theme/cts/TestReset.java
deleted file mode 100644
index 78e0fa0..0000000
--- a/tests/src/android/theme/cts/TestReset.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Copyright (C) 2011 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package android.theme.cts;
-
-/**
- * This interface exists for the sole purpose of separating the
- * {@link ActivityInstrumentationTestCase2} that runs the activity
- * screenshot tests from the actual code. In order to work properly
- * with multiple activities, the {@link ActivityInstrumentationTestCase2}
- * must {@link ActivityInstrumentationTestCase2#tearDown} and
- * {@link ActivityInstrumentationTestCase2#setUp} itself after
- * each test. Since those methods are protected, this interface
- * serves as a way to implement that functionality while allowing
- * two separate {@link ActivityInstrumentationTestCase2}s to exist,
- * one for the regular activity screenshot tests and the other one for
- * the while sharing code between both for most of the test framework.
- */
-public interface TestReset {
-    public void reset();
-}
diff --git a/tests/src/android/theme/cts/TesterViewGroup.java b/tests/src/android/theme/cts/TesterViewGroup.java
deleted file mode 100644
index aa42724..0000000
--- a/tests/src/android/theme/cts/TesterViewGroup.java
+++ /dev/null
@@ -1,89 +0,0 @@
-/*
- * Copyright (C) 2011 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-
-package android.theme.cts;
-
-import com.android.cts.stub.R;
-
-import android.content.Context;
-import android.content.res.Resources;
-import android.util.AttributeSet;
-import android.view.View;
-import android.view.ViewGroup;
-
-/**
- * Custom view group to handle density changes while maintaining screen independence.
- */
-public class TesterViewGroup extends ViewGroup {
-    private int mReferenceWidthDp;
-    private int mReferenceHeightDp;
-
-    public TesterViewGroup(Context context) {
-        this(context, null);
-    }
-
-    public TesterViewGroup(Context context, AttributeSet attrs) {
-        super(context, attrs);
-
-        Resources resources = context.getResources();
-
-        mReferenceWidthDp = resources.getDimensionPixelSize(R.dimen.reference_width);
-        mReferenceHeightDp = resources.getDimensionPixelSize(R.dimen.reference_height);
-    }
-
-    @Override
-    protected void onLayout(boolean changed, int l, int t, int r, int b) {
-        if (!changed) {
-            return;
-        }
-
-        int childCount = getChildCount();
-        for (int i = 0; i < childCount; i++) {
-            View child = getChildAt(i);
-            child.layout(0, 0, child.getMeasuredWidth(), child.getMeasuredHeight());
-        }
-    }
-
-    @Override
-    protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
-        widthMeasureSpec = getMeasureSpec(LayoutParams.MATCH_PARENT, mReferenceWidthDp);
-        heightMeasureSpec = getMeasureSpec(LayoutParams.MATCH_PARENT, mReferenceHeightDp);
-
-        super.onMeasure(widthMeasureSpec, heightMeasureSpec);
-
-        int childCount = getChildCount();
-        for (int i = 0; i < childCount; i++) {
-            View child = getChildAt(i);
-
-            LayoutParams params = child.getLayoutParams();
-
-            int height = getMeasureSpec(params.height, mReferenceWidthDp);
-            int width = getMeasureSpec(params.width, mReferenceHeightDp);
-            child.measure(width, height);
-        }
-    }
-
-    private int getMeasureSpec(int val, int referenceSize) {
-        if (val == LayoutParams.MATCH_PARENT) {
-            return MeasureSpec.makeMeasureSpec(referenceSize, MeasureSpec.EXACTLY);
-        } else if (val == LayoutParams.WRAP_CONTENT) {
-            return MeasureSpec.makeMeasureSpec(referenceSize, MeasureSpec.AT_MOST);
-        } else {
-            return val;
-        }
-    }
-}
diff --git a/tests/src/android/theme/cts/ThemeInfo.java b/tests/src/android/theme/cts/ThemeInfo.java
deleted file mode 100644
index a2556e0..0000000
--- a/tests/src/android/theme/cts/ThemeInfo.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Copyright (C) 2011 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package android.theme.cts;
-
-public class ThemeInfo {
-    private int mResourceId;
-    private String mThemeName;
-
-    public ThemeInfo(int resourceId, String themeName) {
-        mResourceId = resourceId;
-        mThemeName = themeName;
-    }
-
-    public int getResourceId() {
-        return mResourceId;
-    }
-
-    public String getThemeName() {
-        return mThemeName;
-    }
-}
diff --git a/tests/src/android/theme/cts/ThemeSelectorActivity.java b/tests/src/android/theme/cts/ThemeSelectorActivity.java
deleted file mode 100644
index d9c05d6..0000000
--- a/tests/src/android/theme/cts/ThemeSelectorActivity.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * Copyright (C) 2011 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package android.theme.cts;
-
-import com.android.cts.stub.R;
-
-import android.app.Activity;
-import android.content.Intent;
-import android.content.pm.ActivityInfo;
-import android.os.Bundle;
-import android.view.View;
-import android.widget.AdapterView;
-import android.widget.ListView;
-import android.widget.AdapterView.OnItemClickListener;
-
-/**
- * This activity exists solely for debugging purposes. It allows the manual
- * verifier to select which theme to test.
- */
-public class ThemeSelectorActivity extends Activity {
-    private ThemeInfo[] mThemes;
-    private int mOrientation;
-    /**
-     * Called with the activity is first created.
-     */
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.themetestlistactivity);
-
-        ListView lv = (ListView) findViewById(R.id.tests_list);
-
-        mThemes = ThemeTests.getThemes();
-        lv.setAdapter(new ThemesAdapter(this, mThemes));
-
-        lv.setOnItemClickListener(mTestClickedListener);
-
-        mOrientation = getIntent().getIntExtra(ThemeTests.EXTRA_ORIENTATION,
-                ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED);
-    }
-
-    private OnItemClickListener mTestClickedListener = new OnItemClickListener() {
-        public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
-            Intent intent = new Intent(ThemeSelectorActivity.this, TestListActivity.class);
-            ThemeInfo theme = mThemes[position];
-            intent.putExtra(ThemeTests.EXTRA_THEME_ID, theme.getResourceId());
-            intent.putExtra(ThemeTests.EXTRA_THEME_NAME, theme.getThemeName());
-            intent.putExtra(ThemeTests.EXTRA_ORIENTATION, mOrientation);
-            startActivity(intent);
-        }
-    };
-}
diff --git a/tests/src/android/theme/cts/ThemeTestAdapter.java b/tests/src/android/theme/cts/ThemeTestAdapter.java
deleted file mode 100644
index 2172d24..0000000
--- a/tests/src/android/theme/cts/ThemeTestAdapter.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Copyright (C) 2011 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package android.theme.cts;
-
-import android.app.Activity;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.BaseAdapter;
-import android.widget.TextView;
-
-public class ThemeTestAdapter extends BaseAdapter {
-    private LayoutInflater mInflater;
-    private ThemeTestInfo[] mTests;
-
-    public ThemeTestAdapter(Activity activity, ThemeTestInfo[] tests) {
-        mTests = tests;
-        mInflater = activity.getLayoutInflater();
-    }
-
-    @Override
-    public int getCount() {
-        return mTests.length;
-    }
-
-    @Override
-    public Object getItem(int position) {
-        return mTests[position];
-    }
-
-    @Override
-    public long getItemId(int position) {
-        return position;
-    }
-
-    @Override
-    public View getView(int position, View convertView, ViewGroup parent) {
-        if (convertView == null) {
-            convertView = mInflater.inflate(android.R.layout.simple_list_item_1, parent, false);
-        }
-
-        ((TextView) convertView).setText(mTests[position].getTestName());
-
-        return convertView;
-    }
-}
diff --git a/tests/src/android/theme/cts/ThemeTestGeneratorActivity.java b/tests/src/android/theme/cts/ThemeTestGeneratorActivity.java
deleted file mode 100644
index f770b5a..0000000
--- a/tests/src/android/theme/cts/ThemeTestGeneratorActivity.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * Copyright (C) 2011 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package android.theme.cts;
-
-import com.android.cts.stub.R;
-
-import android.app.Activity;
-import android.content.Intent;
-import android.content.pm.ActivityInfo;
-import android.os.Bundle;
-
-import junit.framework.Assert;
-
-/**
- * Generates the master bitmaps for all of the tests for the specific
- * theme and orientation requested via the intent.
- */
-public class ThemeTestGeneratorActivity extends Activity {
-    private ThemeTester mTester;
-
-    /**
-     * Called with the activity is first created.
-     */
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-
-        Intent intent = getIntent();
-        int themeId = intent.getIntExtra(ThemeTests.EXTRA_THEME_ID, 0);
-
-        // test should fail if no theme is set
-        Assert.assertTrue("No Theme Resource ID set", themeId != 0);
-
-        String themeName = intent.getStringExtra(ThemeTests.EXTRA_THEME_NAME);
-
-        setTheme(themeId);
-        setContentView(R.layout.testing_activity);
-
-        int orientation = intent.getIntExtra(ThemeTests.EXTRA_ORIENTATION,
-                ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED);
-
-        setRequestedOrientation(orientation);
-
-        String oriented = "";
-        if (orientation == ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE) {
-            oriented = "land";
-        } else if (orientation == ActivityInfo.SCREEN_ORIENTATION_PORTRAIT) {
-            oriented = "port";
-        }
-
-        mTester = new ThemeTester(this, themeName + "_" + oriented);
-    }
-
-    public void generateTests() {
-        mTester.generateTests();
-    }
-}
diff --git a/tests/src/android/theme/cts/ThemeTestInfo.java b/tests/src/android/theme/cts/ThemeTestInfo.java
deleted file mode 100644
index eb28299..0000000
--- a/tests/src/android/theme/cts/ThemeTestInfo.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Copyright (C) 2011 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package android.theme.cts;
-
-/**
- * Class that represents a test case. Add a new one to the list of tests in ThemeTests.java
- * in order to create a new test.
- */
-public class ThemeTestInfo {
-    private int mResourceId;
-    private ThemeTestModifier mModifier;
-    private String mTestname;
-
-    /**
-     * Creates a new theme test.
-     * @param layoutResourceId The resource ID of the layout to use for this test.
-     * @param modifier The {@link ThemeTestModifier} to use in order to modify the layout
-     * of the test.
-     * @param testname The UNIQUE name of the test.
-     */
-    public ThemeTestInfo(int layoutResourceId, ThemeTestModifier modifier, String testname) {
-        mResourceId = layoutResourceId;
-        mModifier = modifier;
-        mTestname = testname;
-    }
-
-    public int getLayoutResourceId() {
-        return mResourceId;
-    }
-
-    public ThemeTestModifier getThemeModifier() {
-        return mModifier;
-    }
-
-    public String getTestName() {
-        return mTestname;
-    }
-}
diff --git a/tests/src/android/theme/cts/ThemeTestModifier.java b/tests/src/android/theme/cts/ThemeTestModifier.java
deleted file mode 100644
index b5e3345..0000000
--- a/tests/src/android/theme/cts/ThemeTestModifier.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright (C) 2011 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package android.theme.cts;
-
-import android.view.View;
-
-/**
- * Interface that should be implemented if you want to modify the view being tested.
- *
- * For a sample implementation, see {@link ViewPressedModifier}.
- */
-public interface ThemeTestModifier {
-    /**
-     * Define this function in order to modify the layout for your test.
-     * The View that is passed in is the root of layout that is specified in the test.
-     * @param view The root view of the layout.
-     * @return The view that will be saved as a bitmap. This view does not necessarily
-     * have to be the view that was passed into modifyView, however most implementations
-     * probably will return the original view.
-     */
-    public View modifyView(View view);
-}
diff --git a/tests/src/android/theme/cts/ThemeTestRunnerActivity.java b/tests/src/android/theme/cts/ThemeTestRunnerActivity.java
deleted file mode 100644
index d337231..0000000
--- a/tests/src/android/theme/cts/ThemeTestRunnerActivity.java
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
- * Copyright (C) 2011 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package android.theme.cts;
-
-import com.android.cts.stub.R;
-
-import android.app.Activity;
-import android.content.Intent;
-import android.content.pm.ActivityInfo;
-import android.os.Bundle;
-
-import junit.framework.Assert;
-
-/**
- * Builds the bitmaps for all of the tests on the fly and
- * compares them to the known master versions.
- */
-public class ThemeTestRunnerActivity extends Activity {
-    private ThemeTester mTester;
-    /**
-     * Called with the activity is first created.
-     */
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-
-        Intent intent = getIntent();
-        int themeId = intent.getIntExtra(ThemeTests.EXTRA_THEME_ID, 0);
-
-        // test should fail if no theme is set
-        Assert.assertTrue("No Theme Resource ID set", themeId != 0);
-
-        String themeName = intent.getStringExtra(ThemeTests.EXTRA_THEME_NAME);
-
-        setTheme(themeId);
-        setContentView(R.layout.testing_activity);
-
-        int orientation = intent.getIntExtra(ThemeTests.EXTRA_ORIENTATION,
-                ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED);
-
-        setRequestedOrientation(orientation);
-
-        String oriented = "";
-        if (orientation == ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE) {
-            oriented = "land";
-        } else if (orientation == ActivityInfo.SCREEN_ORIENTATION_PORTRAIT) {
-            oriented = "port";
-        }
-
-        mTester = new ThemeTester(this, themeName + "_" + oriented);
-
-        if (intent.getBooleanExtra(ThemeTests.EXTRA_RUN_TESTS, false)) {
-            mTester.runTests();
-        }
-
-        int position = intent.getIntExtra(ThemeTests.EXTRA_RUN_INDIVIDUAL_TEST, -1);
-        if (position != -1) {
-            mTester.setShouldAssert(false);
-            mTester.runTest(position);
-        }
-    }
-
-    /**
-     * Runs the theme tests for the theme that was created.
-     */
-    public void runTests() {
-        mTester.runTests();
-    }
-}
diff --git a/tests/src/android/theme/cts/ThemeTester.java b/tests/src/android/theme/cts/ThemeTester.java
deleted file mode 100644
index a69934f..0000000
--- a/tests/src/android/theme/cts/ThemeTester.java
+++ /dev/null
@@ -1,175 +0,0 @@
-/*
- * Copyright (C) 2011 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package android.theme.cts;
-
-import com.android.cts.stub.R;
-
-import android.app.Activity;
-import android.content.Context;
-import android.content.res.Resources;
-import android.content.res.Resources.NotFoundException;
-import android.graphics.Bitmap;
-import android.graphics.Canvas;
-import android.graphics.drawable.BitmapDrawable;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.widget.ImageView;
-import android.widget.TextView;
-
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.IOException;
-
-import junit.framework.Assert;
-
-/**
- * This class runs the series of tests for a specific theme in the activity.
- *
- * <p>
- * Additionally, this class can also generate the good versions of bitmaps to use for testing.
- */
-public class ThemeTester {
-    private Activity mActivity;
-    private String mThemeName;
-    private ImageView mReferenceImage;
-    private ImageView mGeneratedImage;
-    private TesterViewGroup mRoot;
-    private boolean mShouldAssert;
-
-    /**
-     * Creates a ThemeTester to run all of the tests.
-     * @param activity Activity that serves as a test harness for this theme test.
-     * @param themeName Name of the theme being tested.
-     */
-    public ThemeTester(Activity activity, String themeName) {
-        mActivity = activity;
-        mThemeName = themeName;
-        mRoot = (TesterViewGroup) mActivity.findViewById(R.id.test_group);
-        mShouldAssert = true;
-
-        mReferenceImage = (ImageView) mActivity.findViewById(R.id.reference_image);
-        mGeneratedImage = (ImageView) mActivity.findViewById(R.id.generated_image);
-    }
-
-    public void setShouldAssert(boolean shouldAssert) {
-        mShouldAssert = shouldAssert;
-    }
-
-    /**
-     * Run all of the tests.
-     */
-    public void runTests() {
-        ThemeTestInfo[] tests = ThemeTests.getTests();
-        for (final ThemeTestInfo test : tests) {
-            runTest(test);
-        }
-    }
-
-    /**
-     * Run an individual test based upon its position in the tests.
-     * @param position The position of the test that you wish to run.
-     */
-    public void runTest(int position) {
-        runTest(ThemeTests.getTests()[position]);
-    }
-
-    /**
-     * Run an individual test.
-     * @param test The {@link ThemeTestInfo} to use for this test.
-     */
-    private void runTest(final ThemeTestInfo test) {
-        mRoot.post(new Runnable() {
-            public void run() {
-                testViewFromId(test);
-            }
-        });
-    }
-
-    /**
-     * Generate all of the tests, saving them to Bitmaps in the application's data folder.
-     */
-    public void generateTests() {
-        ThemeTestInfo[] tests = ThemeTests.getTests();
-        for (final ThemeTestInfo test : tests) {
-            mRoot.post(new Runnable() {
-                public void run() {
-                    generateViewFromId(test);
-                }
-            });
-        }
-    }
-
-    private void testViewFromId(ThemeTestInfo test) {
-        processBitmapFromViewId(test.getLayoutResourceId(), test.getThemeModifier(),
-                new BitmapComparer(mActivity, mReferenceImage,
-                        mThemeName + "_" + test.getTestName(), mShouldAssert, false));
-    }
-
-    private void generateViewFromId(ThemeTestInfo test) {
-        processBitmapFromViewId(test.getLayoutResourceId(), test.getThemeModifier(),
-                new BitmapSaver(mActivity, mThemeName + "_" + test.getTestName(), false));
-    }
-
-    private void processBitmapFromViewId(
-            int resid, ThemeTestModifier modifier, final BitmapProcessor processor) {
-        final View view = constructViewFromLayoutId(resid, modifier);
-
-        view.post(new Runnable() {
-            public void run() {
-                Bitmap bitmap = Bitmap.createBitmap(
-                        view.getWidth(), view.getHeight(), Bitmap.Config.ARGB_8888);
-
-                Canvas canvas = new Canvas(bitmap);
-                view.draw(canvas);
-                mGeneratedImage.setImageBitmap(bitmap);
-
-                processor.processBitmap(bitmap);
-                bitmap.recycle();
-
-                mRoot.removeView(view);
-            }
-        });
-    }
-
-    /**
-     * Inflates and returns the view and performs and modifications of it as required by the test.
-     * @param resid The resource id of the layout that will be constructed.
-     * @param modifier The ThemeTestModifier to modify the layout being tested.
-     * @return The root view of the layout being tested.
-     */
-    private View constructViewFromLayoutId(int resid, ThemeTestModifier modifier) {
-        LayoutInflater inflater = LayoutInflater.from(mActivity);
-
-        View view = inflater.inflate(resid, mRoot, false);
-        mRoot.addView(view);
-
-        if (modifier != null) {
-            view = modifier.modifyView(view);
-        }
-
-        mRoot.measure(0, 0); // don't care about the input values - we build our reference size
-        mRoot.layout(0, 0, mRoot.getMeasuredWidth(), mRoot.getMeasuredHeight());
-
-        view.setFocusable(false);
-
-        return view;
-    }
-
-
-
-
-}
diff --git a/tests/src/android/theme/cts/ThemeTests.java b/tests/src/android/theme/cts/ThemeTests.java
deleted file mode 100644
index 7dce779..0000000
--- a/tests/src/android/theme/cts/ThemeTests.java
+++ /dev/null
@@ -1,262 +0,0 @@
-/*
- * Copyright (C) 2011 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package android.theme.cts;
-
-import com.android.cts.stub.R;
-
-import android.content.pm.ActivityInfo;
-
-public class ThemeTests {
-    /**
-     * Theme name to test.
-     */
-    public static final String EXTRA_THEME_NAME = "android.intent.extra.THEME_NAME";
-
-    /**
-     * Theme ID to test.
-     */
-    public static final String EXTRA_THEME_ID = "android.intent.extra.THEME_ID";
-
-    /**
-     * Runs only the test supplied (by position number).
-     */
-    public static final String EXTRA_RUN_INDIVIDUAL_TEST
-            = "android.intent.extra.RUN_INDIVIDUAL_TEST";
-
-    /**
-     * Use solely for debugging. The actual intent that runs the tests will not have this flag.
-     */
-    public static final String EXTRA_RUN_TESTS = "android.intent.extra.RUN_TESTS";
-
-    /**
-     * Sets the orientation of the tests. Options are
-     * {@link ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE} or
-     * {@link ActivityInfo.SCREEN_ORIENTATION_PORTRAIT}.
-     */
-    public static final String EXTRA_ORIENTATION = "android.intent.extra.ORIENTATION";
-
-    /**
-     * The index of the current activity test that is being run so that it can be
-     * read on both sides of an intent.
-     */
-    public static final String EXTRA_ACTIVITY_TEST_INDEX
-            = "android.intent.extra.ACTIVITY_TEST_INDEX";
-
-    /**
-     * The list of tests to run for each theme.<p>
-     * In order to create a new test, follow these steps.<p>
-     * 1. Create a layout file for the test you wish to run.<br>
-     * 2. (Optional) Create a class that derives from ThemeTestModifier
-     * that will modify the root view of your created layout. Set to null if you do not want
-     * to modify the view from the layout version.<br>
-     * 3. Create a unique String for the name of the test.<br>
-     * 4. Add all of the above to the list of tests. as a new {@link ThemeTestInfo}.
-     */
-    private static final ThemeTestInfo[] TESTS = new ThemeTestInfo[] {
-            new ThemeTestInfo(R.layout.button, null, "button"),
-            new ThemeTestInfo(R.layout.button, new ViewPressedModifier(), "button_pressed"),
-            new ThemeTestInfo(R.layout.toggle_button, null, "toggle_button"),
-            new ThemeTestInfo(R.layout.toggle_button_checked, null, "toggle_button_checked"),
-            new ThemeTestInfo(R.layout.checkbox, null, "checkbox"),
-            new ThemeTestInfo(R.layout.checkbox_checked, null, "checkbox_checked"),
-            new ThemeTestInfo(R.layout.radiobutton, null, "radiobutton"),
-            new ThemeTestInfo(R.layout.radiobutton_checked, null, "radiobutton_checked"),
-            new ThemeTestInfo(R.layout.spinner, null, "spinner"),
-            new ThemeTestInfo(R.layout.progressbar, null, "progressbar"),
-            new ThemeTestInfo(R.layout.progressbar_small, null, "progressbar_small"),
-            new ThemeTestInfo(R.layout.progressbar_large, null, "progressbar_large"),
-            new ThemeTestInfo(R.layout.progressbar_horizontal0, null, "progressbar_horizontal0"),
-            new ThemeTestInfo(R.layout.progressbar_horizontal50, null, "progressbar_horizontal50"),
-            new ThemeTestInfo(R.layout.progressbar_horizontal100,
-                    null, "progressbar_horizontal100"),
-            new ThemeTestInfo(R.layout.seekbar_0, null, "seekbar_0"),
-            new ThemeTestInfo(R.layout.seekbar_50, null, "seekbar_50"),
-            new ThemeTestInfo(R.layout.seekbar_100, null, "seekbar_100"),
-            new ThemeTestInfo(R.layout.radiogroup_vertical, null, "radiogroup_vertical"),
-            new ThemeTestInfo(R.layout.radiogroup_horizontal, null, "radiogroup_horizontal"),
-            new ThemeTestInfo(R.layout.ratingbar_0, null, "ratingbar_0"),
-            new ThemeTestInfo(R.layout.ratingbar_2point5, null, "ratingbar_2point5"),
-            new ThemeTestInfo(R.layout.ratingbar_5, null, "ratingbar_5"),
-            new ThemeTestInfo(R.layout.ratingbar_0,
-                    new ViewPressedModifier(), "ratingbar_0_pressed"),
-            new ThemeTestInfo(R.layout.ratingbar_2point5,
-                    new ViewPressedModifier(),"ratingbar_2point5_pressed"),
-            new ThemeTestInfo(R.layout.ratingbar_5,
-                    new ViewPressedModifier(), "ratingbar_5_pressed"),
-            new ThemeTestInfo(R.layout.textview, null, "textview"),
-            new ThemeTestInfo(R.layout.blue_light, null, "blue_light"),
-            new ThemeTestInfo(R.layout.green_light, null, "green_light"),
-            new ThemeTestInfo(R.layout.red_light, null, "red_light"),
-            new ThemeTestInfo(R.layout.blue_dark, null, "blue_dark"),
-            new ThemeTestInfo(R.layout.green_dark, null, "green_dark"),
-            new ThemeTestInfo(R.layout.red_dark, null, "red_dark"),
-            new ThemeTestInfo(R.layout.purple, null, "purple"),
-            new ThemeTestInfo(R.layout.orange_light, null, "orange_light"),
-            new ThemeTestInfo(R.layout.orange_dark, null, "orange_dark"),
-            new ThemeTestInfo(R.layout.blue_bright, null, "blue_bright"),
-            new ThemeTestInfo(R.layout.edittext, null, "edittext"),
-            new ThemeTestInfo(R.layout.calendarview, new CalendarViewModifier(), "calendarview"),
-            new ThemeTestInfo(R.layout.zoomcontrols, null, "zoomcontrols"),
-            new ThemeTestInfo(R.layout.tabhost, new TabHostModifier(), "tabhost"),
-            new ThemeTestInfo(R.layout.empty,
-                    new DialogModifier(
-                            new AlertDialogBuilder(
-                                    AlertDialogBuilder.ONE_BUTTON)), "alertdialog_onebutton"),
-            new ThemeTestInfo(R.layout.empty,
-                    new DialogModifier(
-                            new AlertDialogBuilder(
-                                    AlertDialogBuilder.TWO_BUTTONS)), "alertdialog_twobuttons"),
-            new ThemeTestInfo(R.layout.empty,
-                    new DialogModifier(
-                            new AlertDialogBuilder(
-                                    AlertDialogBuilder.THREE_BUTTONS)), "alertdialog_threebuttons"),
-            new ThemeTestInfo(R.layout.empty,
-                    new DialogModifier(
-                            new AlertDialogBuilder(
-                                    AlertDialogBuilder.LIST)), "alertdialog_list"),
-            new ThemeTestInfo(R.layout.empty,
-                    new DialogModifier(
-                            new AlertDialogBuilder(
-                                    AlertDialogBuilder.SINGLE_CHOICE)), "alertdialog_singlechoice"),
-            new ThemeTestInfo(R.layout.empty,
-                    new DialogModifier(
-                            new AlertDialogBuilder(
-                                    AlertDialogBuilder.MULTI_CHOICE)), "alertdialog_multichoice"),
-            new ThemeTestInfo(R.layout.empty,
-                    new DialogModifier(
-                            new ProgressDialogBuilder(
-                                    ProgressDialogBuilder.SPINNER)), "progressdialog_spinner"),
-            new ThemeTestInfo(R.layout.empty,
-                    new DialogModifier(
-                            new ProgressDialogBuilder(
-                                    ProgressDialogBuilder.HORIZONTAL)),
-                                    "progressdialog_horizontal"),
-            new ThemeTestInfo(R.layout.searchview, null, "searchview"),
-            new ThemeTestInfo(R.layout.searchview,
-                    new SearchViewModifier(SearchViewModifier.QUERY_HINT),
-                    "searchview_queryhint"),
-            new ThemeTestInfo(R.layout.searchview,
-                    new SearchViewModifier(SearchViewModifier.QUERY),
-                    "searchview_query")};
-
-    /**
-     * Returns the list of tests to run on a particular theme. <p>
-     *
-     * In order to create a new test, follow these steps.<p>
-     * 1. Create a layout file for the test you wish to run.<br>
-     * 2. (Optional) Create a class that derives from ThemeTestModifier
-     * that will modify the root view of your created layout. Set to null if you do not want
-     * to modify the view from the layout version.<br>
-     * 3. Create a unique String for the name of the test.<br>
-     * 4. Add all of the above to the list of tests. as a new {@link ThemeTestInfo}.
-     * @return The list of tests.
-     */
-    public static ThemeTestInfo[] getTests() {
-        return TESTS;
-    }
-
-    /**
-     * The list of themes to test. In order to add a new theme, follow these steps.<p>
-     * 1. Add a new Theme to the array of Themes in
-     * cts/tests/src/android/theme/cts/ThemeTests.java.
-     * Make sure the "theme name" String is unique.<br>
-     * 2. There is no step 2. You're done. Congrats.
-     */
-    private static final ThemeInfo[] THEMES = new ThemeInfo[] {
-        // The themes marked with asterisks seem to blow up when generating a 0x0 bitmap...
-        new ThemeInfo(android.R.style.Theme_Holo, "holo"),
-        new ThemeInfo(android.R.style.Theme_Holo_Dialog, "holo_dialog"),
-        new ThemeInfo(android.R.style.Theme_Holo_Dialog_MinWidth, "holo_dialog_minwidth"),
-        new ThemeInfo(android.R.style.Theme_Holo_Dialog_NoActionBar,
-                "holo_dialog_noactionbar"),
-        new ThemeInfo(android.R.style.Theme_Holo_Dialog_NoActionBar_MinWidth,
-                "holo_dialog_noactionbar_minwidth"),
-        new ThemeInfo(android.R.style.Theme_Holo_DialogWhenLarge, "holo_dialogwhenlarge"),
-        new ThemeInfo(android.R.style.Theme_Holo_DialogWhenLarge_NoActionBar,
-                "holo_dialogwhenlarge_noactionbar"),
-        new ThemeInfo(android.R.style.Theme_Holo_InputMethod, "holo_inputmethod"), // *
-        new ThemeInfo(android.R.style.Theme_Holo_Light, "holo_light"),
-        new ThemeInfo(android.R.style.Theme_Holo_Light_DarkActionBar, "holo_light_darkactionbar"),
-        new ThemeInfo(android.R.style.Theme_Holo_Light_Dialog, "holo_light_dialog"),
-        new ThemeInfo(android.R.style.Theme_Holo_Light_Dialog_MinWidth,
-                "holo_light_dialog_minwidth"),
-        new ThemeInfo(android.R.style.Theme_Holo_Light_Dialog_NoActionBar,
-                "holo_light_dialog_noactionbar"),
-        new ThemeInfo(android.R.style.Theme_Holo_Light_Dialog_NoActionBar_MinWidth,
-                "holo_light_dialog_noactionbar_minwidth"),
-        new ThemeInfo(android.R.style.Theme_Holo_Light_DialogWhenLarge,
-                "holo_light_dialogwhenlarge"),
-        new ThemeInfo(android.R.style.Theme_Holo_Light_DialogWhenLarge_NoActionBar,
-                "holo_light_dialogwhenlarge_noactionbar"),
-        new ThemeInfo(android.R.style.Theme_Holo_Light_NoActionBar, "holo_light_noactionbar"),
-        new ThemeInfo(android.R.style.Theme_Holo_Light_NoActionBar_Fullscreen,
-                "holo_light_noactionbar_fullscreen"),
-        new ThemeInfo(android.R.style.Theme_Holo_Light_Panel, "holo_light_panel"), // *
-        new ThemeInfo(android.R.style.Theme_Holo_NoActionBar, "holo_noactionbar"),
-        new ThemeInfo(android.R.style.Theme_Holo_NoActionBar_Fullscreen,
-                "holo_noactionbar_fullscreen"),
-        new ThemeInfo(android.R.style.Theme_Holo_Panel, "holo_panel"), // *
-        new ThemeInfo(android.R.style.Theme_Holo_Wallpaper, "holo_wallpaper"),
-        new ThemeInfo(android.R.style.Theme_Holo_Wallpaper_NoTitleBar, "holo_wallpaper_notitlebar")
-    };
-
-    /**
-     * Returns the list of themes to test. In order to add a new theme, follow these steps.<p>
-     * 1. Add a new Theme to the array of Themes in
-     * cts/tests/src/android/theme/cts/ThemeTests.java.
-     * Make sure the "theme name" String is unique.<br>
-     * 2. There is no step 2. You're done. Congrats.
-     * @return The list of themes.
-     */
-    public static ThemeInfo[] getThemes() {
-        return THEMES;
-    }
-
-    /**
-     * The list of Activity snapshot tests.<p>
-     * In order to create a new test, follow these steps.<p>
-     * 1. Create a class that inherits from {@link ActivitytestInfo}.<br>
-     * 2. Add an initialization of that class to the array below.<br>
-     * 3. Done.
-     */
-    private static final ActivityTestInfo[] ACTIVITY_TESTS = new ActivityTestInfo[] {
-        new ActionBarModifier("actionbar", ActionBarModifier.BASIC),
-        new ActionBarModifier("actionbar_home_as_up", ActionBarModifier.DISPLAY_HOME_AS_UP),
-        new ActionBarModifier("actionbar_tabs", ActionBarModifier.TABS),
-        new ActionBarModifier("actionbar_list", ActionBarModifier.LIST),
-        new ActionBarModifier("actionbar_no_title", ActionBarModifier.NO_TITLE),
-        new ActionBarModifier("actionbar_no_icon", ActionBarModifier.NO_ICON),
-        new ActionBarModifier("actionbar_action_items", ActionBarModifier.ACTION_ITEMS),
-        new ActionBarModifier("actionbar_action_view", ActionBarModifier.ACTION_VIEW)//,
-        // TODO - fix this test - I think this one is particularly susceptible
-        // to the orientation bug so for now i'm just leaving it commented out
-        /*new ActionBarModifier(
-                "actionbar_collapsed_action_view", ActionBarModifier.COLLAPSED_ACTION_VIEW)*/
-    };
-
-    /**
-     * Returns the list of Activity snapshot tests.<p>
-     * In order to create a new test, follow these steps.<p>
-     * 1. Create a class that inherits from {@link ActivitytestInfo}.<br>
-     * 2. Add an initialization of that class to the array below.<br>
-     * 3. Done.
-     * @return The list of Activity snapshot tests.
-     */
-    public static ActivityTestInfo[] getActivityTests() {
-        return ACTIVITY_TESTS;
-    }
-}
diff --git a/tests/src/android/theme/cts/ThemesAdapter.java b/tests/src/android/theme/cts/ThemesAdapter.java
deleted file mode 100644
index 15d535f..0000000
--- a/tests/src/android/theme/cts/ThemesAdapter.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * Copyright (C) 2011 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package android.theme.cts;
-
-import android.app.Activity;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.BaseAdapter;
-import android.widget.TextView;
-
-public class ThemesAdapter extends BaseAdapter {
-    private LayoutInflater mInflater;
-    private ThemeInfo[] mThemes;
-
-    public ThemesAdapter(Activity activity, ThemeInfo[] themes) {
-        mThemes = themes;
-        mInflater = activity.getLayoutInflater();
-    }
-
-    @Override
-    public int getCount() {
-        return mThemes.length;
-    }
-
-    @Override
-    public Object getItem(int position) {
-        return mThemes[position];
-    }
-
-    @Override
-    public long getItemId(int position) {
-        return position;
-    }
-
-    @Override
-    public View getView(int position, View convertView, ViewGroup parent) {
-        if (convertView == null) {
-            convertView = mInflater.inflate(android.R.layout.simple_list_item_1, parent, false);
-        }
-
-        ((TextView) convertView).setText(mThemes[position].getThemeName());
-
-        return convertView;
-    }
-
-}
diff --git a/tests/src/android/theme/cts/TimePickerModifier.java b/tests/src/android/theme/cts/TimePickerModifier.java
deleted file mode 100644
index 9a370fc..0000000
--- a/tests/src/android/theme/cts/TimePickerModifier.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Copyright (C) 2011 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package android.theme.cts;
-
-import android.view.View;
-import android.widget.TimePicker;
-
-/**
- * Modifies the {@link TimePicker} widget to set a precise time.
- */
-public class TimePickerModifier implements ThemeTestModifier {
-
-    @Override
-    public View modifyView(View view) {
-        TimePicker tp = (TimePicker) view;
-        tp.setCurrentHour(10);
-        tp.setCurrentMinute(40);
-
-        return view;
-    }
-}
diff --git a/tests/src/android/theme/cts/ViewPressedModifier.java b/tests/src/android/theme/cts/ViewPressedModifier.java
deleted file mode 100644
index 2330c82..0000000
--- a/tests/src/android/theme/cts/ViewPressedModifier.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Copyright (C) 2011 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package android.theme.cts;
-
-import android.view.View;
-
-/**
- * Modifies the root view of a test so that it is in the pressed state.
- */
-public class ViewPressedModifier implements ThemeTestModifier {
-
-    @Override
-    public View modifyView(View view) {
-        view.setPressed(true);
-        return view;
-    }
-}
diff --git a/tests/src/android/webkit/cts/WebViewStubActivity.java b/tests/src/android/webkit/cts/WebViewStubActivity.java
index 0bb58e2..fcf260f 100644
--- a/tests/src/android/webkit/cts/WebViewStubActivity.java
+++ b/tests/src/android/webkit/cts/WebViewStubActivity.java
@@ -35,4 +35,10 @@
     public WebView getWebView() {
         return mWebView;
     }
+
+    @Override
+    public void onDestroy() {
+        mWebView.destroy();
+        super.onDestroy();
+    }
 }
diff --git a/tests/tests/accessibilityservice/src/android/accessibilityservice/IAccessibilityServiceDelegateConnection.aidl b/tests/tests/accessibilityservice/src/android/accessibilityservice/IAccessibilityServiceDelegateConnection.aidl
index 62703dc..c1fe57b 100644
--- a/tests/tests/accessibilityservice/src/android/accessibilityservice/IAccessibilityServiceDelegateConnection.aidl
+++ b/tests/tests/accessibilityservice/src/android/accessibilityservice/IAccessibilityServiceDelegateConnection.aidl
@@ -16,15 +16,27 @@
 package android.accessibilityservice;
 
 import android.os.IBinder;
+import android.view.accessibility.AccessibilityEvent;
+import android.view.accessibility.AccessibilityNodeInfo;
+
+import java.util.List;
 
 /**
- * Interface for registering an accessibility service delegate.
+ * Interface for registering an accessibility service delegate
+ * and asking it to perform some querying of the window for us.
  */
-oneway interface IAccessibilityServiceDelegateConnection {
+interface IAccessibilityServiceDelegateConnection {
 
-    /**
-     * Sets the delegate interface to which the
-     * {@link DelegatingAccessibilityService} to delegate.
-     */
     void setAccessibilityServiceDelegate(in IBinder binder);
+
+    List<AccessibilityNodeInfo> findAccessibilityNodeInfosByText(in AccessibilityNodeInfo root,
+        String text);
+
+    AccessibilityNodeInfo getParent(in AccessibilityNodeInfo child);
+
+    AccessibilityNodeInfo getChild(in AccessibilityNodeInfo parent, int index);
+
+    boolean performAccessibilityAction(in AccessibilityNodeInfo target, int action);
+
+    AccessibilityNodeInfo getSource(in AccessibilityEvent event);
 }
diff --git a/tests/tests/accessibilityservice/src/android/accessibilityservice/cts/AccessibilityDelegateHelper.java b/tests/tests/accessibilityservice/src/android/accessibilityservice/cts/AccessibilityDelegateHelper.java
index 1e7c625..211f67b 100644
--- a/tests/tests/accessibilityservice/src/android/accessibilityservice/cts/AccessibilityDelegateHelper.java
+++ b/tests/tests/accessibilityservice/src/android/accessibilityservice/cts/AccessibilityDelegateHelper.java
@@ -92,6 +92,11 @@
     private boolean mInitialized;
 
     /**
+     * Query connection to the delegating accessibility service.
+     */
+    private IAccessibilityServiceDelegateConnection mQueryConnection;
+
+    /**
      * Creates a new instance.
      *
      * @param service The service to which to delegate.
@@ -180,10 +185,10 @@
      * {@inheritDoc ServiceConnection#onServiceConnected(ComponentName,IBinder)}
      */
     public void onServiceConnected(ComponentName name, IBinder service) {
-        IAccessibilityServiceDelegateConnection connection =
-            IAccessibilityServiceDelegateConnection.Stub.asInterface(service);
+        mQueryConnection = IAccessibilityServiceDelegateConnection.Stub.asInterface(service);
         try {
-            connection.setAccessibilityServiceDelegate(new IAccessibilityServiceDelegate.Stub() {
+            mQueryConnection.setAccessibilityServiceDelegate(
+                    new IAccessibilityServiceDelegate.Stub() {
                 @Override
                 public void onAccessibilityEvent(AccessibilityEvent event) {
                     mAccessibilityService.onAccessibilityEvent(event);
@@ -209,4 +214,13 @@
         mInitialized = false;
         /* do nothing */
     }
+
+    /**
+     * Gets the query connection to the delegating accessibility service.
+     *
+     * @return The connection.
+     */
+    public IAccessibilityServiceDelegateConnection getQueryConnection() {
+        return mQueryConnection;
+    }
 }
diff --git a/tests/tests/accessibilityservice/src/android/accessibilityservice/cts/AccessibilityWindowQueryActivityTest.java b/tests/tests/accessibilityservice/src/android/accessibilityservice/cts/AccessibilityWindowQueryActivityTest.java
index d798052..3b41b6c 100644
--- a/tests/tests/accessibilityservice/src/android/accessibilityservice/cts/AccessibilityWindowQueryActivityTest.java
+++ b/tests/tests/accessibilityservice/src/android/accessibilityservice/cts/AccessibilityWindowQueryActivityTest.java
@@ -22,6 +22,7 @@
 import android.accessibilityservice.AccessibilityService;
 import android.content.Context;
 import android.graphics.Rect;
+import android.os.RemoteException;
 import android.test.ActivityInstrumentationTestCase2;
 import android.test.suitebuilder.annotation.LargeTest;
 import android.view.accessibility.AccessibilityEvent;
@@ -65,6 +66,8 @@
 public class AccessibilityWindowQueryActivityTest
         extends ActivityInstrumentationTestCase2<AccessibilityWindowQueryActivity> {
 
+    private static AccessibilityQueryBridge sQueryBridge;
+
     private interface AccessibilityEventFilter {
         public boolean accept(AccessibilityEvent event);
     }
@@ -82,16 +85,16 @@
     @LargeTest
     public void testFindByText() throws Exception {
         // find a view by text
-        List<AccessibilityNodeInfo> buttons = findAccessibilityNodeInfosByText(
-                getAwaitedAccessibilityEventSource(), "butto");
+        List<AccessibilityNodeInfo> buttons =
+            getQueryBridge().findAccessibilityNodeInfosByText("butto");
         assertEquals(9, buttons.size());
     }
 
     @LargeTest
     public void testFindByContentDescription() throws Exception {
         // find a view by text
-        AccessibilityNodeInfo button = findAccessibilityNodeInfoByText(
-                getAwaitedAccessibilityEventSource(), R.string.contentDescription);
+        AccessibilityNodeInfo button = getQueryBridge().findAccessibilityNodeInfoByTextFromRoot(
+                getString(R.string.contentDescription));
         assertNotNull(button);
     }
 
@@ -117,7 +120,7 @@
         classNameAndTextList.add("android.widget.ButtonButton9");
 
         Queue<AccessibilityNodeInfo> fringe = new LinkedList<AccessibilityNodeInfo>();
-        fringe.add(getAwaitedAccessibilityEventSource());
+        fringe.add(getQueryBridge().getAwaitedAccessibilityEventSource());
 
         // do a BFS traversal and check nodes
         while (!fringe.isEmpty()) {
@@ -133,7 +136,7 @@
 
             final int childCount = current.getChildCount();
             for (int i = 0; i < childCount; i++) {
-                AccessibilityNodeInfo child = current.getChild(i);
+                AccessibilityNodeInfo child = getQueryBridge().getChild(current, i);
                 fringe.add(child);
             }
         }
@@ -142,99 +145,97 @@
     @LargeTest
     public void testPerformActionFocus() throws Exception {
         // find a view and make sure it is not focused
-        AccessibilityNodeInfo button = findAccessibilityNodeInfoByText(
-                getAwaitedAccessibilityEventSource(), R.string.button5);
+        AccessibilityNodeInfo button = getQueryBridge().findAccessibilityNodeInfoByTextFromRoot(
+                getString(R.string.button5));
         assertFalse(button.isFocused());
 
         // focus the view
-        assertTrue(button.performAction(ACTION_FOCUS));
+        assertTrue(getQueryBridge().performAction(button, ACTION_FOCUS));
 
         // find the view again and make sure it is focused
-        button = findAccessibilityNodeInfoByText(getAwaitedAccessibilityEventSource(),
-                R.string.button5);
+        button = getQueryBridge().findAccessibilityNodeInfoByTextFromRoot(
+                getString(R.string.button5));
         assertTrue(button.isFocused());
     }
 
     @LargeTest
     public void testPerformActionClearFocus() throws Exception {
         // find a view and make sure it is not focused
-        AccessibilityNodeInfo button = findAccessibilityNodeInfoByText(
-                getAwaitedAccessibilityEventSource(), R.string.button5);
+        AccessibilityNodeInfo button = getQueryBridge().findAccessibilityNodeInfoByTextFromRoot(
+                getString(R.string.button5));
         assertFalse(button.isFocused());
 
         // focus the view
-        assertTrue(button.performAction(ACTION_FOCUS));
+        assertTrue(getQueryBridge().performAction(button, ACTION_FOCUS));
 
         // find the view again and make sure it is focused
-        button = findAccessibilityNodeInfoByText(getAwaitedAccessibilityEventSource(),
-                R.string.button5);
+        button = getQueryBridge().findAccessibilityNodeInfoByTextFromRoot(
+                getString(R.string.button5));
         assertTrue(button.isFocused());
 
         // unfocus the view
-        assertTrue(button.performAction(ACTION_CLEAR_FOCUS));
+        assertTrue(getQueryBridge().performAction(button, ACTION_CLEAR_FOCUS));
 
         // find the view again and make sure it is not focused
-        button = findAccessibilityNodeInfoByText(getAwaitedAccessibilityEventSource(),
-                R.string.button5);
+        button = getQueryBridge().findAccessibilityNodeInfoByTextFromRoot(getString(
+                R.string.button5));
         assertFalse(button.isFocused());
     }
 
     @LargeTest
     public void testPerformActionSelect() throws Exception {
         // find a view and make sure it is not selected
-        AccessibilityNodeInfo button = findAccessibilityNodeInfoByText(
-                getAwaitedAccessibilityEventSource(), R.string.button5);
+        AccessibilityNodeInfo button = getQueryBridge().findAccessibilityNodeInfoByTextFromRoot(
+                getString(R.string.button5));
         assertFalse(button.isSelected());
 
         // select the view
-        assertTrue(button.performAction(ACTION_SELECT));
+        assertTrue(sQueryBridge.performAction(button, ACTION_SELECT));
 
         // find the view again and make sure it is selected
-        button = findAccessibilityNodeInfoByText(getAwaitedAccessibilityEventSource(),
-                R.string.button5);
+        button = getQueryBridge().findAccessibilityNodeInfoByTextFromRoot(
+                getString(R.string.button5));
         assertTrue(button.isSelected());
     }
 
     @LargeTest
     public void testPerformActionClearSelection() throws Exception {
         // find a view and make sure it is not selected
-        AccessibilityNodeInfo button = findAccessibilityNodeInfoByText(
-                getAwaitedAccessibilityEventSource(), R.string.button5);
+        AccessibilityNodeInfo button = getQueryBridge().findAccessibilityNodeInfoByTextFromRoot(
+                getString(R.string.button5));
         assertFalse(button.isSelected());
 
         // select the view
-        assertTrue(button.performAction(ACTION_SELECT));
+        assertTrue(sQueryBridge.performAction(button, ACTION_SELECT));
 
         // find the view again and make sure it is selected
-        button = findAccessibilityNodeInfoByText(getAwaitedAccessibilityEventSource(),R
-                .string.button5);
+        button = getQueryBridge().findAccessibilityNodeInfoByTextFromRoot(
+                getString(R.string.button5));
 
         assertTrue(button.isSelected());
 
         // unselect the view
-        assertTrue(button.performAction(ACTION_CLEAR_SELECTION));
+        assertTrue(getQueryBridge().performAction(button, ACTION_CLEAR_SELECTION));
 
         // find the view again and make sure it is not selected
-        button = findAccessibilityNodeInfoByText(getAwaitedAccessibilityEventSource(),
-                R.string.button5);
+        button = getQueryBridge().findAccessibilityNodeInfoByTextFromRoot(
+                getString(R.string.button5));
         assertFalse(button.isSelected());
     }
 
     @LargeTest
     public void testGetEventSource() throws Exception {
         // find a view and make sure it is not focused
-        final AccessibilityNodeInfo button = findAccessibilityNodeInfoByText(
-                getAwaitedAccessibilityEventSource(), R.string.button5);
+        final AccessibilityNodeInfo button =
+            getQueryBridge().findAccessibilityNodeInfoByTextFromRoot(getString(R.string.button5));
         assertFalse(button.isSelected());
 
         // focus and wait for the event
-        AccessibilityQueryBridge bridge = AccessibilityQueryBridge.getInstance(
-                getInstrumentation().getContext());
-        bridge.perfromActionAndWaitForEvent(
+        getQueryBridge().perfromActionAndWaitForEvent(
                 new Runnable() {
             @Override
             public void run() {
-                assertTrue(button.performAction(ACTION_FOCUS));
+                assertTrue(getQueryBridge().performAction(button, ACTION_FOCUS));
             }
         },
                 new AccessibilityEventFilter() {
@@ -245,7 +246,7 @@
         });
 
         // check that last event source
-        AccessibilityNodeInfo source = getAwaitedAccessibilityEventSource();
+        AccessibilityNodeInfo source = getQueryBridge().getAwaitedAccessibilityEventSource();
         assertNotNull(source);
 
         // bounds
@@ -280,12 +281,12 @@
     @LargeTest
     public void testObjectContract() throws Exception {
         // find a view and make sure it is not focused
-        AccessibilityNodeInfo button = findAccessibilityNodeInfoByText(
-                getAwaitedAccessibilityEventSource(), R.string.button5);
-        AccessibilityNodeInfo parent = button.getParent();
+        AccessibilityNodeInfo button = getQueryBridge().findAccessibilityNodeInfoByTextFromRoot(
+               getString(R.string.button5));
+        AccessibilityNodeInfo parent = getQueryBridge().getParent(button);
         final int childCount = parent.getChildCount();
         for (int i = 0; i < childCount; i++) {
-            AccessibilityNodeInfo child = parent.getChild(i);
+            AccessibilityNodeInfo child = getQueryBridge().getChild(parent, i);
             assertNotNull(child);
             if (child.equals(button)) {
                 assertEquals("Equal objects must have same hasCode.", button.hashCode(),
@@ -301,14 +302,19 @@
         /* intentionally do not scrub */
     }
 
+    private AccessibilityQueryBridge getQueryBridge() {
+        if (sQueryBridge == null) {
+            sQueryBridge = new AccessibilityQueryBridge(getInstrumentation().getContext());
+        }
+        return sQueryBridge;
+    }
+
     /**
      * Starts the activity under tests and waits for the first accessibility
      * event from that activity.
      */
     private void startActivityAndWaitForFirstEvent() {
-        AccessibilityQueryBridge bridge = AccessibilityQueryBridge.getInstance(
-                getInstrumentation().getContext());
-        bridge.perfromActionAndWaitForEvent(
+        getQueryBridge().perfromActionAndWaitForEvent(
                 new Runnable() {
             @Override
             public void run() {
@@ -328,55 +334,10 @@
     }
 
     /**
-     * @return The source of the last accessibility event.
+     * @return The string for a given <code>resId</code>.
      */
-    private AccessibilityNodeInfo getAwaitedAccessibilityEventSource() {
-        AccessibilityQueryBridge bridge = AccessibilityQueryBridge.getInstance(
-                getInstrumentation().getContext());
-        AccessibilityEvent event = bridge.getAwaitedAccessibilityEvent();
-        if (event != null) {
-            return event.getSource();
-        }
-        return null;
-    }
-
-    private List<AccessibilityNodeInfo> findAccessibilityNodeInfosByText(AccessibilityNodeInfo root,
-            String text) {
-        if (root != null) {
-            return root.findAccessibilityNodeInfosByText(text);
-        }
-        return Collections.emptyList();
-    }
-
-    /**
-     * Finds the first accessibility info that contains text. The search starts
-     * from the given <code>root</code>
-     *
-     * @param root Node from which to start the search.
-     * @param resId Resource id of the searched text.
-     * @return The node with this text or null.
-     */
-    private AccessibilityNodeInfo findAccessibilityNodeInfoByText(AccessibilityNodeInfo root,
-            int resId) {
-        return findAccessibilityNodeInfoByText(root,
-                getInstrumentation().getContext().getString(resId));
-    }
-
-    /**
-     * Finds the first accessibility info that contains text. The search starts
-     * from the given <code>root</code>
-     *
-     * @param root Node from which to start the search.
-     * @param text The searched text.
-     * @return The node with this text or null.
-     */
-    private AccessibilityNodeInfo findAccessibilityNodeInfoByText(AccessibilityNodeInfo root,
-            String text) {
-        List<AccessibilityNodeInfo> nodes = findAccessibilityNodeInfosByText(root, text);
-        if (nodes != null && !nodes.isEmpty()) {
-            return nodes.get(0);
-        }
-        return null;
+    private String getString(int resId) {
+        return getInstrumentation().getContext().getString(resId);
     }
 
     /**
@@ -386,11 +347,6 @@
     static class AccessibilityQueryBridge extends AccessibilityService {
 
         /**
-         * The singleton instance.
-         */
-        private static AccessibilityQueryBridge sInstance;
-
-        /**
          * Helper for connecting to the delegating accessibility service.
          */
         private final AccessibilityDelegateHelper mAccessibilityDelegateHelper;
@@ -410,23 +366,6 @@
          */
         private AccessibilityEventFilter mWaitedFilter;
 
-        /**
-         * Gets the {@link AccessibilityQueryBridge} singleton.
-         *
-         * @param context A context handle.
-         * @return The mock service.
-         */
-        public static AccessibilityQueryBridge getInstance(Context context) {
-            if (sInstance == null) {
-                // since we do bind once and do not unbind from the delegating
-                // service and JUnit3 does not support @BeforeTest and @AfterTest,
-                // we will leak a service connection after the test but this
-                // does not affect the test results and the test is twice as fast
-                sInstance = new AccessibilityQueryBridge(context);
-            }
-            return sInstance;
-        }
-
         private AccessibilityQueryBridge(Context context) {
             mAccessibilityDelegateHelper = new AccessibilityDelegateHelper(this);
             mAccessibilityDelegateHelper.bindToDelegatingAccessibilityService(context);
@@ -446,10 +385,91 @@
         }
 
         /**
+         * Finds the first accessibility info that contains text. The search starts
+         * from the given <code>root</code>
+         *
+         * @param text The searched text.
+         * @return The node with this text or null.
+         */
+        public AccessibilityNodeInfo findAccessibilityNodeInfoByTextFromRoot(String text) {
+            List<AccessibilityNodeInfo> nodes = findAccessibilityNodeInfosByText(text);
+            if (nodes != null && !nodes.isEmpty()) {
+                return nodes.get(0);
+            }
+            return null;
+        }
+
+        /**
          * @return The event that was waited for.
          */
-        public AccessibilityEvent getAwaitedAccessibilityEvent() {
-            return mAwaitedAccessbiliyEvent;
+        public AccessibilityNodeInfo getAwaitedAccessibilityEventSource() {
+            if (mAwaitedAccessbiliyEvent != null) {
+                return getSource(mAwaitedAccessbiliyEvent);
+            }
+            return null;
+        }
+
+        public List<AccessibilityNodeInfo> findAccessibilityNodeInfosByText(String text) {
+            AccessibilityNodeInfo root = getAwaitedAccessibilityEventSource();
+            if (root != null) {
+                // Sending a node info across processes recycles
+                // it so use a clone to avoid losing state
+                AccessibilityNodeInfo rootClone = AccessibilityNodeInfo.obtain(root);
+                try {
+                     return mAccessibilityDelegateHelper.getQueryConnection()
+                            .findAccessibilityNodeInfosByText(rootClone, text);
+                } catch (RemoteException re) {
+                    /* ignore */
+                }
+            }
+            return Collections.emptyList();
+        }
+
+        public AccessibilityNodeInfo getParent(AccessibilityNodeInfo child) {
+            try {
+                // Sending a node info across processes recycles
+                // it so use a clone to avoid losing state
+                AccessibilityNodeInfo childClone = AccessibilityNodeInfo.obtain(child);
+                return mAccessibilityDelegateHelper.getQueryConnection().getParent(childClone);
+            } catch (RemoteException re) {
+                /* ignore */
+            }
+            return null;
+        }
+
+        public AccessibilityNodeInfo getChild(AccessibilityNodeInfo parent, int index) {
+            try {
+                // Sending a node info across processes recycles
+                // it so use a clone to avoid losing state
+                AccessibilityNodeInfo parentClone = AccessibilityNodeInfo.obtain(parent);
+                return mAccessibilityDelegateHelper.getQueryConnection().getChild(parentClone,
+                        index);
+            } catch (RemoteException re) {
+                /* ignore */
+            }
+            return null;
+        }
+
+        public boolean performAction(AccessibilityNodeInfo target, int action) {
+            try {
+                // Sending a node info across processes recycles
+                // it so use a clone to avoid losing state
+                AccessibilityNodeInfo targetClone = AccessibilityNodeInfo.obtain(target);
+                return mAccessibilityDelegateHelper.getQueryConnection().performAccessibilityAction(
+                        targetClone, action);
+            } catch (RemoteException re) {
+                /* ignore */
+            }
+            return false;
+        }
+
+        private AccessibilityNodeInfo getSource(AccessibilityEvent event) {
+            try {
+                return mAccessibilityDelegateHelper.getQueryConnection().getSource(event);
+            } catch (RemoteException re) {
+                /* ignore */
+            }
+            return null;
         }
 
         /**
diff --git a/tests/tests/app/src/android/app/cts/DialogTest.java b/tests/tests/app/src/android/app/cts/DialogTest.java
index fdcd395..37ded56 100644
--- a/tests/tests/app/src/android/app/cts/DialogTest.java
+++ b/tests/tests/app/src/android/app/cts/DialogTest.java
@@ -1214,11 +1214,17 @@
 
     private static class MockView extends View {
         public boolean isShowContextMenuCalled;
+        protected OnCreateContextMenuListener mOnCreateContextMenuListener;
 
         public MockView(Context context) {
             super(context);
         }
 
+        public void setOnCreateContextMenuListener(OnCreateContextMenuListener l) {
+            super.setOnCreateContextMenuListener(l);
+            mOnCreateContextMenuListener = l;
+        }
+
         public OnCreateContextMenuListener getOnCreateContextMenuListener() {
             return mOnCreateContextMenuListener;
         }
diff --git a/tests/tests/app/src/android/app/cts/SystemFeaturesTest.java b/tests/tests/app/src/android/app/cts/SystemFeaturesTest.java
index bb7cc4b..41a5224 100644
--- a/tests/tests/app/src/android/app/cts/SystemFeaturesTest.java
+++ b/tests/tests/app/src/android/app/cts/SystemFeaturesTest.java
@@ -64,7 +64,7 @@
     protected void setUp() throws Exception {
         super.setUp();
         Instrumentation instrumentation = getInstrumentation();
-        mContext = instrumentation.getContext();
+        mContext = instrumentation.getTargetContext();
         mPackageManager = mContext.getPackageManager();
         mAvailableFeatures = new HashSet<String>();
         if (mPackageManager.getSystemAvailableFeatures() != null) {
diff --git a/tests/tests/database/src/android/database/cts/CursorWindowTest.java b/tests/tests/database/src/android/database/cts/CursorWindowTest.java
index 1febfd0..9156d02 100644
--- a/tests/tests/database/src/android/database/cts/CursorWindowTest.java
+++ b/tests/tests/database/src/android/database/cts/CursorWindowTest.java
@@ -16,7 +16,6 @@
 
 package android.database.cts;
 
-import com.android.common.ArrayListCursor;
 import com.google.android.collect.Lists;
 
 import dalvik.annotation.TestLevel;
@@ -28,6 +27,7 @@
 import android.database.AbstractCursor;
 import android.database.CharArrayBuffer;
 import android.database.CursorWindow;
+import android.database.MatrixCursor;
 import android.database.sqlite.SQLiteException;
 import android.os.Parcel;
 import android.test.AndroidTestCase;
@@ -81,10 +81,13 @@
     })
     public void testWriteCursorToWindow() throws Exception {
         // create cursor
-        String[] colNames = new String[]{"name", "number", "profit"};
+        String[] colNames = new String[]{"_id", "name", "number", "profit"};
         int colsize = colNames.length;
         ArrayList<ArrayList> list = createTestList(10, colsize);
-        AbstractCursor cursor = new ArrayListCursor(colNames, list);
+        MatrixCursor cursor = new MatrixCursor(colNames, list.size());
+        for (ArrayList row : list) {
+            cursor.addRow(row);
+        }
 
         // fill window
         CursorWindow window = new CursorWindow(false);
@@ -674,8 +677,7 @@
             list.add(col);
             for (int j = 0; j < cols; j++) {
                 // generate random number
-                Integer r = generator.nextInt();
-                col.add(r);
+                col.add(j == 0 ? i : generator.nextInt());
             }
         }
         return list;
diff --git a/tests/tests/dpi/AndroidManifest.xml b/tests/tests/dpi/AndroidManifest.xml
index 7206d00..6e141ac 100644
--- a/tests/tests/dpi/AndroidManifest.xml
+++ b/tests/tests/dpi/AndroidManifest.xml
@@ -20,6 +20,9 @@
 
     <application>
         <uses-library android:name="android.test.runner" />
+
+        <activity android:name="android.dpi.cts.OrientationActivity"
+                android:configChanges="orientation" />
     </application>
 
     <instrumentation android:name="android.test.InstrumentationTestRunner"
diff --git a/tests/tests/dpi/src/android/dpi/cts/AspectRatioTest.java b/tests/tests/dpi/src/android/dpi/cts/AspectRatioTest.java
new file mode 100644
index 0000000..74a9f22
--- /dev/null
+++ b/tests/tests/dpi/src/android/dpi/cts/AspectRatioTest.java
@@ -0,0 +1,85 @@
+/*
+ * Copyright (C) 2011 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package android.dpi.cts;
+
+import android.app.Activity;
+import android.content.Context;
+import android.content.Intent;
+import android.content.pm.ActivityInfo;
+import android.test.ActivityInstrumentationTestCase2;
+import android.util.DisplayMetrics;
+import android.view.Display;
+import android.view.WindowManager;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class AspectRatioTest extends ActivityInstrumentationTestCase2<OrientationActivity> {
+
+    private static final int[] ORIENTATIONS = new int[] {
+        ActivityInfo.SCREEN_ORIENTATION_PORTRAIT,
+        ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE,
+    };
+
+    public AspectRatioTest() {
+        super(OrientationActivity.class);
+    }
+
+    /**
+     * Get all the aspect rations in different orientations. They could be
+     * different due to the system bar being different sizes. Test that
+     * one of the aspect ratios is within the range.
+     */
+    public void testAspectRatio() throws Exception {
+        List<Double> aspectRatios = getAllAspectRatios();
+        for (double aspectRatio : aspectRatios) {
+            if (aspectRatio >= 1.333 && aspectRatio <= 1.86) {
+                return;
+            }
+        }
+        fail("Aspect ratios were not between 1.333 and 1.86: " + aspectRatios);
+    }
+
+    private List<Double> getAllAspectRatios() throws Exception {
+        List<Double> aspectRatios = new ArrayList<Double>();
+        for (int i = 0; i < ORIENTATIONS.length; i++) {
+            Activity activity = startOrientationActivity(ORIENTATIONS[i]);
+            aspectRatios.add(getAspectRatio(activity));
+            tearDown();
+        }
+        return aspectRatios;
+    }
+
+    private double getAspectRatio(Context context) {
+        WindowManager windowManager =
+                (WindowManager) context.getSystemService(Context.WINDOW_SERVICE);
+        Display display = windowManager.getDefaultDisplay();
+        DisplayMetrics metrics = new DisplayMetrics();
+        display.getMetrics(metrics);
+
+        int max = Math.max(metrics.widthPixels, metrics.heightPixels);
+        int min = Math.min(metrics.widthPixels, metrics.heightPixels);
+        return (double) max / min;
+    }
+
+    private Activity startOrientationActivity(int orientation) {
+        Intent intent = new Intent();
+        intent.putExtra(OrientationActivity.EXTRA_ORIENTATION, orientation);
+        setActivityIntent(intent);
+        return getActivity();
+    }
+}
diff --git a/tests/tests/dpi/src/android/dpi/cts/ConfigurationScreenLayoutTest.java b/tests/tests/dpi/src/android/dpi/cts/ConfigurationScreenLayoutTest.java
new file mode 100644
index 0000000..d4c3611
--- /dev/null
+++ b/tests/tests/dpi/src/android/dpi/cts/ConfigurationScreenLayoutTest.java
@@ -0,0 +1,136 @@
+/*
+ * Copyright (C) 2011 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package android.dpi.cts;
+
+import android.app.Activity;
+import android.content.Context;
+import android.content.Intent;
+import android.content.pm.ActivityInfo;
+import android.content.res.Configuration;
+import android.test.ActivityInstrumentationTestCase2;
+import android.util.DisplayMetrics;
+import android.view.Display;
+import android.view.WindowManager;
+
+public class ConfigurationScreenLayoutTest
+        extends ActivityInstrumentationTestCase2<OrientationActivity> {
+
+    private static final int[] ORIENTATIONS = new int[] {
+            ActivityInfo.SCREEN_ORIENTATION_PORTRAIT,
+            ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE,
+            ActivityInfo.SCREEN_ORIENTATION_REVERSE_PORTRAIT,
+            ActivityInfo.SCREEN_ORIENTATION_REVERSE_LANDSCAPE,
+    };
+
+    public ConfigurationScreenLayoutTest() {
+        super(OrientationActivity.class);
+    }
+
+    public void testScreenLayout() throws Exception {
+        int expectedScreenLayout = computeScreenLayout();
+        int expectedSize = expectedScreenLayout & Configuration.SCREENLAYOUT_SIZE_MASK;
+        int expectedLong = expectedScreenLayout & Configuration.SCREENLAYOUT_LONG_MASK;
+
+        // Check that all four orientations report the same configuration value.
+        for (int i = 0; i < ORIENTATIONS.length; i++) {
+            Activity activity = startOrientationActivity(ORIENTATIONS[i]);
+            Configuration mConfig = activity.getResources().getConfiguration();
+            int actualSize = mConfig.screenLayout & Configuration.SCREENLAYOUT_SIZE_MASK;
+            int actualLong = mConfig.screenLayout & Configuration.SCREENLAYOUT_LONG_MASK;
+
+            assertEquals("Expected screen size value of " + expectedSize + " but got " + actualSize
+                    + " for orientation " + ORIENTATIONS[i], expectedSize, actualSize);
+            assertEquals("Expected screen long value of " + expectedLong + " but got " + actualLong
+                    + " for orientation " + ORIENTATIONS[i], expectedLong, actualLong);
+            tearDown();
+        }
+    }
+
+    /**
+     * @return expected value of {@link Configuration#screenLayout} with the
+     *         {@link Configuration#SCREENLAYOUT_LONG_MASK} and
+     *         {@link Configuration#SCREENLAYOUT_SIZE_MASK} defined
+     */
+    private int computeScreenLayout() throws Exception {
+        // 1. Start with the biggest configuration possible.
+        // 2. For each orientation start an activity and compute what it's screenLayout value is
+        // 3. Reduce the screenLayout values if they are smaller
+        // 4. Return the reduced value which is what should be reported
+        int screenLayout = Configuration.SCREENLAYOUT_SIZE_XLARGE
+                | Configuration.SCREENLAYOUT_LONG_YES;
+        for (int i = 0; i < ORIENTATIONS.length; i++) {
+            Activity activity = startOrientationActivity(ORIENTATIONS[i]);
+            screenLayout = reduceScreenLayout(activity, screenLayout);
+            tearDown();
+        }
+        return screenLayout;
+    }
+
+    private Activity startOrientationActivity(int orientation) {
+        Intent intent = new Intent();
+        intent.putExtra(OrientationActivity.EXTRA_ORIENTATION, orientation);
+        setActivityIntent(intent);
+        return getActivity();
+    }
+
+    // Logic copied from WindowManagerService but using DisplayMetrics instead of internal APIs
+    private int reduceScreenLayout(Context context, int screenLayout) {
+        int screenLayoutSize;
+        boolean screenLayoutLong;
+
+        WindowManager windowManager =
+                (WindowManager) context.getSystemService(Context.WINDOW_SERVICE);
+        Display display = windowManager.getDefaultDisplay();
+        DisplayMetrics metrics = new DisplayMetrics();
+        display.getMetrics(metrics);
+
+        int max = Math.max(metrics.widthPixels, metrics.heightPixels);
+        int min = Math.min(metrics.widthPixels, metrics.heightPixels);
+        int longSize = (int) (max / metrics.density);
+        int shortSize = (int) (min / metrics.density);
+
+        if (longSize < 470) {
+            screenLayoutSize = Configuration.SCREENLAYOUT_SIZE_SMALL;
+            screenLayoutLong = false;
+        } else {
+            if (longSize >= 960 && shortSize >= 720) {
+                screenLayoutSize = Configuration.SCREENLAYOUT_SIZE_XLARGE;
+            } else if (longSize >= 640 && shortSize >= 480) {
+                screenLayoutSize = Configuration.SCREENLAYOUT_SIZE_LARGE;
+            } else {
+                screenLayoutSize = Configuration.SCREENLAYOUT_SIZE_NORMAL;
+            }
+
+            if (((longSize * 3) / 5) >= (shortSize - 1)) {
+                screenLayoutLong = true;
+            } else {
+                screenLayoutLong = false;
+            }
+        }
+
+        if (!screenLayoutLong) {
+            screenLayout = (screenLayout & ~Configuration.SCREENLAYOUT_LONG_MASK)
+                    | Configuration.SCREENLAYOUT_LONG_NO;
+        }
+        int curSize = screenLayout&Configuration.SCREENLAYOUT_SIZE_MASK;
+        if (screenLayoutSize < curSize) {
+            screenLayout = (screenLayout&~Configuration.SCREENLAYOUT_SIZE_MASK)
+                    | screenLayoutSize;
+        }
+        return screenLayout;
+    }
+}
diff --git a/tests/tests/dpi/src/android/dpi/cts/ConfigurationTest.java b/tests/tests/dpi/src/android/dpi/cts/ConfigurationTest.java
index 316933d..937d8f8 100644
--- a/tests/tests/dpi/src/android/dpi/cts/ConfigurationTest.java
+++ b/tests/tests/dpi/src/android/dpi/cts/ConfigurationTest.java
@@ -17,7 +17,6 @@
 package android.dpi.cts;
 
 import android.content.Context;
-import android.content.res.Configuration;
 import android.test.AndroidTestCase;
 import android.util.DisplayMetrics;
 import android.view.Display;
@@ -47,12 +46,6 @@
         double density = 160.0d * metrics.density;
         assertTrue("Screen density must be at least 100 dpi: " + density, density >= 100.0d);
 
-        int max = Math.max(metrics.widthPixels, metrics.heightPixels);
-        int min = Math.min(metrics.widthPixels, metrics.heightPixels);
-        double aspectRatio = (double) max / min;
-        assertTrue("Aspect ratio must be between 1.333 and 1.86. It was " + aspectRatio,
-                aspectRatio >= 1.333 && aspectRatio <= 1.86);
-
         Set<Integer> allowedDensities = new HashSet<Integer>();
         allowedDensities.add(DisplayMetrics.DENSITY_LOW);
         allowedDensities.add(DisplayMetrics.DENSITY_MEDIUM);
@@ -65,32 +58,5 @@
         assertEquals(metrics.density,
                 (float) metrics.densityDpi / DisplayMetrics.DENSITY_DEFAULT,
                 0.5f / DisplayMetrics.DENSITY_DEFAULT);
-
-        Configuration mConfig = mContext.getResources().getConfiguration();
-        int screenLayout = mConfig.screenLayout & Configuration.SCREENLAYOUT_SIZE_MASK;
-        int screenLayoutLong = mConfig.screenLayout & Configuration.SCREENLAYOUT_LONG_MASK;
-
-        int longSize = (int) (max / metrics.density);
-        int shortSize = (int) (min / metrics.density);
-
-        // Logic copied from WindowManagerService...
-        if (longSize < 470) {
-            assertEquals(Configuration.SCREENLAYOUT_SIZE_SMALL, screenLayout);
-            assertEquals(Configuration.SCREENLAYOUT_LONG_NO, screenLayoutLong);
-        } else {
-            if (longSize >= 960 && shortSize >= 720) {
-                assertEquals(Configuration.SCREENLAYOUT_SIZE_XLARGE, screenLayout);
-            } else if (longSize >= 640 && shortSize >= 480) {
-                assertEquals(Configuration.SCREENLAYOUT_SIZE_LARGE, screenLayout);
-            } else {
-                assertEquals(Configuration.SCREENLAYOUT_SIZE_NORMAL, screenLayout);
-            }
-
-            if (((longSize * 3) / 5) >= (shortSize - 1)) {
-                assertEquals(Configuration.SCREENLAYOUT_LONG_YES, screenLayoutLong);
-            } else {
-                assertEquals(Configuration.SCREENLAYOUT_LONG_NO, screenLayoutLong);
-            }
-        }
     }
 }
diff --git a/tests/tests/dpi/src/android/dpi/cts/OrientationActivity.java b/tests/tests/dpi/src/android/dpi/cts/OrientationActivity.java
new file mode 100644
index 0000000..3bd76b6
--- /dev/null
+++ b/tests/tests/dpi/src/android/dpi/cts/OrientationActivity.java
@@ -0,0 +1,39 @@
+/*
+ * Copyright (C) 2011 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package android.dpi.cts;
+
+import android.app.Activity;
+import android.os.Bundle;
+import android.view.Window;
+import android.view.WindowManager;
+
+/** {@link Activity} that calls {@link #setRequestedOrientation(int)} with the extra value. */
+public class OrientationActivity extends Activity {
+
+    static final String EXTRA_ORIENTATION = "orientation";
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        Window window = getWindow();
+        window.addFlags(WindowManager.LayoutParams.FLAG_DISMISS_KEYGUARD);
+
+        int orientation = getIntent().getIntExtra(EXTRA_ORIENTATION, -1);
+        setRequestedOrientation(orientation);
+    }
+}
diff --git a/tests/tests/graphics/src/android/graphics/cts/PaintTest.java b/tests/tests/graphics/src/android/graphics/cts/PaintTest.java
index 42c5f58..169fb56 100644
--- a/tests/tests/graphics/src/android/graphics/cts/PaintTest.java
+++ b/tests/tests/graphics/src/android/graphics/cts/PaintTest.java
@@ -1247,6 +1247,18 @@
         assertMeasureText(text, textChars, textSpan, 4, 7, widths[4] + widths[5] + widths[6]);
     }
 
+    public void testMeasureTextWithLongText() {
+        final int MAX_COUNT = 65535;
+        char[] longText = new char[MAX_COUNT];
+        for (int n = 0; n < MAX_COUNT; n++) {
+            longText[n] = 'm';
+        }
+
+        Paint p = new Paint();
+        float width = p.measureText(longText, 0, 1);
+        assertEquals(true, width > 0);
+    }
+
     /** Tests that all four overloads of measureText are the same and match some value. */
     private void assertMeasureText(String text, char[] textChars, SpannedString textSpan,
             int start, int end, float expectedWidth) {
diff --git a/tests/tests/hardware/src/android/hardware/cts/CameraGLTest.java b/tests/tests/hardware/src/android/hardware/cts/CameraGLTest.java
index 816ffaa..ebb97d8 100644
--- a/tests/tests/hardware/src/android/hardware/cts/CameraGLTest.java
+++ b/tests/tests/hardware/src/android/hardware/cts/CameraGLTest.java
@@ -345,7 +345,7 @@
             // Check the order: startPreview->setPreviewTexture, with a PreviewCallback as well
             mPreviewDone.close();
             initializeMessageLooper(cameraId);
-            mCamera.setPreviewCallback(mPreviewCallback);
+            mCamera.setOneShotPreviewCallback(mPreviewCallback);
             mCamera.startPreview();
             mCamera.setPreviewTexture(mSurfaceTexture);
             noTimeout = waitForPreviewDone();
@@ -354,7 +354,7 @@
 
             // Check the order: setPreviewTexture->startPreview.
             initializeMessageLooper(cameraId);
-            mCamera.setPreviewCallback(mPreviewCallback);
+            mCamera.setOneShotPreviewCallback(mPreviewCallback);
             mCamera.setPreviewTexture(mSurfaceTexture);
             mCamera.startPreview();
             noTimeout = waitForPreviewDone();
@@ -362,7 +362,7 @@
 
             // Check the order: setting preview display to null->startPreview->
             // setPreviewTexture.
-            mCamera.setPreviewCallback(mPreviewCallback);
+            mCamera.setOneShotPreviewCallback(mPreviewCallback);
             mCamera.setPreviewTexture(null);
             mCamera.startPreview();
             mCamera.setPreviewTexture(mSurfaceTexture);
@@ -387,7 +387,7 @@
             mSurfaceTextureDone.close();
             initializeMessageLooper(cameraId);
             mRenderer.setCameraSizing(mCamera.getParameters().getPreviewSize());
-            mCamera.setPreviewCallback(mPreviewCallback);
+            mCamera.setOneShotPreviewCallback(mPreviewCallback);
             mSurfaceTexture.setOnFrameAvailableListener(mSurfaceTextureCallback);
             mCamera.setPreviewTexture(mSurfaceTexture);
             mCamera.startPreview();
@@ -404,7 +404,7 @@
             mSurfaceTextureDone.close();
             initializeMessageLooper(cameraId);
             mRenderer.setCameraSizing(mCamera.getParameters().getPreviewSize());
-            mCamera.setPreviewCallback(mPreviewCallback);
+            mCamera.setOneShotPreviewCallback(mPreviewCallback);
             mSurfaceTexture.setOnFrameAvailableListener(mSurfaceTextureCallback);
             mCamera.startPreview();
             mCamera.setPreviewTexture(mSurfaceTexture);
@@ -417,7 +417,7 @@
             mGLView.requestRender();
 
             // Check the order: setting preview to null->startPreview->setPreviewTexture
-            mCamera.setPreviewCallback(mPreviewCallback);
+            mCamera.setOneShotPreviewCallback(mPreviewCallback);
             mCamera.setPreviewTexture(null);
             mSurfaceTexture.setOnFrameAvailableListener(mSurfaceTextureCallback);
             mCamera.startPreview();
@@ -493,7 +493,9 @@
     };
 
     /** Test all preview sizes and framerates along with SurfaceTexture-provided metadata (texture
-     * transforms and timestamps) */
+     * transforms and timestamps).
+     * TODO: This should be made stricter once SurfaceTexture timestamps are generated by the drivers.
+     */
     @UiThreadTest
     public void testCameraToSurfaceTextureMetadata() throws Exception {
         runForAllCameras(testCameraToSurfaceTextureMetadataByCamera);
@@ -503,12 +505,14 @@
         public void run(int cameraId) throws Exception {
             // Number of frames to test over
             int kLoopCount = 100;
+            // Number of frames that can be out of bounds before calling this a failure
+            int kMaxOutOfBoundsFrames = kLoopCount / 25; // 4% of frames
             // Ignore timestamp issues before this frame
             int kFirstTestedFrame = 10;
             // Slop in timestamp testing, needed because timestamps are not
             // currently being set by driver-level code so are subject to
-            // lots of variability
-            float kTestSlopMargin = 30; // ms
+            // user-space timing variability
+            float kTestSlopMargin = 20; // ms
 
             boolean noTimeout;
             initializeMessageLooper(cameraId);
@@ -540,7 +544,8 @@
                     assertEquals(fps[Parameters.PREVIEW_FPS_MAX_INDEX],
                                  actualFps[Parameters.PREVIEW_FPS_MAX_INDEX]);
 
-                    mSurfaceTextureBurstCallback.setBurstCount(kLoopCount);
+                    mSurfaceTextureBurstCallback.
+                            setBurstCount(kLoopCount + kFirstTestedFrame);
                     mSurfaceTextureCallbackResult = false;
                     mSurfaceTextureDone.close();
 
@@ -550,7 +555,7 @@
                     if (LOGVV) Log.v(TAG, "Preview started");
 
                     long[] timestamps = new long[kLoopCount];
-                    for (int i = 0; i < kLoopCount; i++) {
+                    for (int i = 0; i < kLoopCount + kFirstTestedFrame; i++) {
                         noTimeout = waitForSurfaceTextureDone();
                         assertTrue("Timeout waiting for frame " + i +
                                    " (burst callback thinks " +
@@ -569,7 +574,10 @@
                         assertTrue(noTimeout);
 
                         // Store timestamps for later
-                        timestamps[i] = mSurfaceTexture.getTimestamp();
+                        if (i >= kFirstTestedFrame) {
+                            timestamps[i - kFirstTestedFrame] =
+                                    mSurfaceTexture.getTimestamp();
+                        }
                         // Verify that the surfaceTexture transform has at least one non-zero
                         // entry
                         float[] transform = new float[16];
@@ -594,21 +602,29 @@
                     float slopMinFrameDurationMs = expectedMinFrameDurationMs  -
                             kTestSlopMargin;
 
-                    for (int i = kFirstTestedFrame; i < kLoopCount; i++) {
-                        float frameDurationMs = (timestamps[i] - timestamps[i - 1]) / 1000000.f;
+                    int outOfBoundsCount = 0;
+                    for (int i = 1; i < kLoopCount; i++) {
+                        float frameDurationMs =
+                                (timestamps[i] - timestamps[i-1]) / 1000000.f;
                         if (LOGVV) {
                             Log.v(TAG, "Frame " + i + " duration: " + frameDurationMs +
                                   " ms, expecting [" + expectedMinFrameDurationMs + "," +
-                                  expectedMaxFrameDurationMs + "], slop range [" +
-                                  slopMinFrameDurationMs + "," + slopMaxFrameDurationMs + "].");
+                                    expectedMaxFrameDurationMs + "], slop range [" +
+                                    slopMinFrameDurationMs + "," + slopMaxFrameDurationMs + "].");
                         }
-                        assertTrue("Frame " + i + " duration out of bounds! ("+
-                                   frameDurationMs + " ms, expecting [" +
-                                   slopMinFrameDurationMs + "," +
-                                   slopMaxFrameDurationMs + "] ms)",
-                                   (frameDurationMs > slopMinFrameDurationMs) &&
-                                   (frameDurationMs < slopMaxFrameDurationMs) );
+                        if ( frameDurationMs > slopMaxFrameDurationMs ||
+                                frameDurationMs < slopMinFrameDurationMs ) {
+                            if (LOGVV) {
+                                Log.v(TAG, "  Out of bounds!!");
+                            }
+                            outOfBoundsCount++;
+                        }
                     }
+                    assertTrue(
+                            "Too many frame intervals out of frame rate bounds: "
+                            + outOfBoundsCount +
+                            ", limit " + kMaxOutOfBoundsFrames,
+                            outOfBoundsCount <= kMaxOutOfBoundsFrames);
                 }
             }
             terminateMessageLooper();
diff --git a/tests/tests/hardware/src/android/hardware/cts/CameraTest.java b/tests/tests/hardware/src/android/hardware/cts/CameraTest.java
index 309bfc7..3b29f6a 100644
--- a/tests/tests/hardware/src/android/hardware/cts/CameraTest.java
+++ b/tests/tests/hardware/src/android/hardware/cts/CameraTest.java
@@ -2626,8 +2626,13 @@
             parameters.setWhiteBalance(wbMode);
             mCamera.setParameters(parameters);
 
-            assert3ALockState("Changing WB mode did not clear AWB lock!",
-                    AUTOWHITEBALANCE_LOCK, false);
+            if (firstWb == wbMode) {
+                assert3ALockState("AWB lock was cleared when WB mode was unchanged!",
+                        AUTOWHITEBALANCE_LOCK, true);
+            } else {
+                assert3ALockState("Changing WB mode did not clear AWB lock!",
+                        AUTOWHITEBALANCE_LOCK, false);
+            }
         }
         mCamera.stopPreview();
     }
@@ -2835,7 +2840,10 @@
     private void testVideoSnapshotByCamera(int cameraId) throws Exception {
         initializeMessageLooper(cameraId);
         Camera.Parameters parameters = mCamera.getParameters();
-        if (!parameters.isVideoSnapshotSupported()) return;
+        if (!parameters.isVideoSnapshotSupported()) {
+            terminateMessageLooper();
+            return;
+        }
 
         SurfaceHolder holder = getActivity().getSurfaceView().getHolder();
 
diff --git a/tests/tests/holo/Android.mk b/tests/tests/holo/Android.mk
new file mode 100644
index 0000000..22afc85
--- /dev/null
+++ b/tests/tests/holo/Android.mk
@@ -0,0 +1,35 @@
+# Copyright (C) 2011 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+LOCAL_PATH:= $(call my-dir)
+include $(CLEAR_VARS)
+
+# don't include this package in any target
+LOCAL_MODULE_TAGS := optional
+# and when built explicitly put it in the data partition
+LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS)
+
+LOCAL_JAVA_LIBRARIES := android.test.runner
+
+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_PACKAGE_NAME := CtsHoloTestCases
+
+LOCAL_MODULE_TAGS := tests
+
+LOCAL_SDK_VERSION := current
+
+include $(BUILD_PACKAGE)
diff --git a/tests/tests/holo/AndroidManifest.xml b/tests/tests/holo/AndroidManifest.xml
new file mode 100644
index 0000000..bd02fcb
--- /dev/null
+++ b/tests/tests/holo/AndroidManifest.xml
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2011 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+        package="com.android.cts.holo">
+
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+
+    <application>
+        <uses-library android:name="android.test.runner" />
+
+        <activity android:name="android.holo.cts.HoloTestUtilitiesActivity" 
+                android:label="@string/holo_test_utilities">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
+        
+        <activity android:name="android.holo.cts.DisplayInfoActivity"
+                android:label="@string/display_info" />
+
+        <activity android:name="android.holo.cts.ThemePickerActivity" 
+                android:label="@string/pick_theme" />
+
+        <activity android:name="android.holo.cts.LayoutPickerActivity" 
+                android:label="@string/pick_layout" />
+
+        <activity android:name="android.holo.cts.ThemeTestActivity"
+                android:configChanges="keyboardHidden|orientation|screenSize"
+                android:screenOrientation="nosensor"
+                android:theme="@android:style/Theme.Translucent.NoTitleBar" />
+
+        <activity android:name="android.holo.cts.LayoutTestActivity"
+                android:configChanges="keyboardHidden|orientation|screenSize"
+                android:screenOrientation="nosensor" />
+
+        <activity android:name="android.holo.cts.BitmapDeletionActivity"
+                android:theme="@android:style/Theme.Translucent.NoTitleBar" />
+
+    </application>
+    
+    <instrumentation android:name="android.test.InstrumentationTestRunner"
+            android:targetPackage="com.android.cts.holo"
+            android:label="CTS tests for the Holo theme" />
+
+</manifest>
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_alertdialog_list.png b/tests/tests/holo/res/drawable-hdpi/holo_alertdialog_list.png
new file mode 100644
index 0000000..aa074c1
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_alertdialog_list.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_alertdialog_multichoice.png b/tests/tests/holo/res/drawable-hdpi/holo_alertdialog_multichoice.png
new file mode 100644
index 0000000..205b855
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_alertdialog_multichoice.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_alertdialog_onebutton.png b/tests/tests/holo/res/drawable-hdpi/holo_alertdialog_onebutton.png
new file mode 100644
index 0000000..356c230
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_alertdialog_onebutton.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_alertdialog_singlechoice.png b/tests/tests/holo/res/drawable-hdpi/holo_alertdialog_singlechoice.png
new file mode 100644
index 0000000..4d0d20c
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_alertdialog_singlechoice.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_alertdialog_threebuttons.png b/tests/tests/holo/res/drawable-hdpi/holo_alertdialog_threebuttons.png
new file mode 100644
index 0000000..33d0641
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_alertdialog_threebuttons.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_alertdialog_twobuttons.png b/tests/tests/holo/res/drawable-hdpi/holo_alertdialog_twobuttons.png
new file mode 100644
index 0000000..5969402
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_alertdialog_twobuttons.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_button.png b/tests/tests/holo/res/drawable-hdpi/holo_button.png
new file mode 100644
index 0000000..1c65266
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_button_pressed.png b/tests/tests/holo/res/drawable-hdpi/holo_button_pressed.png
new file mode 100644
index 0000000..797dccc
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_button_pressed.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_calendar_view.png b/tests/tests/holo/res/drawable-hdpi/holo_calendar_view.png
new file mode 100644
index 0000000..bf1aaa5
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_calendar_view.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_calendar_view_feb.png b/tests/tests/holo/res/drawable-hdpi/holo_calendar_view_feb.png
new file mode 100644
index 0000000..1421fbc
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_calendar_view_feb.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_checkbox.png b/tests/tests/holo/res/drawable-hdpi/holo_checkbox.png
new file mode 100644
index 0000000..97e83b6
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_checkbox.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_checkbox_checked.png b/tests/tests/holo/res/drawable-hdpi/holo_checkbox_checked.png
new file mode 100644
index 0000000..88934c2
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_checkbox_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_chronometer.png b/tests/tests/holo/res/drawable-hdpi/holo_chronometer.png
new file mode 100644
index 0000000..65af9b3
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_chronometer.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_color_blue_bright.png b/tests/tests/holo/res/drawable-hdpi/holo_color_blue_bright.png
new file mode 100644
index 0000000..2d1e63f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_color_blue_bright.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_color_blue_dark.png b/tests/tests/holo/res/drawable-hdpi/holo_color_blue_dark.png
new file mode 100644
index 0000000..914e522
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_color_blue_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_color_blue_light.png b/tests/tests/holo/res/drawable-hdpi/holo_color_blue_light.png
new file mode 100644
index 0000000..a6f2f65
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_color_blue_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_color_green_dark.png b/tests/tests/holo/res/drawable-hdpi/holo_color_green_dark.png
new file mode 100644
index 0000000..2cf79d0
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_color_green_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_color_green_light.png b/tests/tests/holo/res/drawable-hdpi/holo_color_green_light.png
new file mode 100644
index 0000000..508a96e
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_color_green_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_color_orange_dark.png b/tests/tests/holo/res/drawable-hdpi/holo_color_orange_dark.png
new file mode 100644
index 0000000..4a0157f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_color_orange_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_color_orange_light.png b/tests/tests/holo/res/drawable-hdpi/holo_color_orange_light.png
new file mode 100644
index 0000000..0bdb9be
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_color_orange_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_color_purple.png b/tests/tests/holo/res/drawable-hdpi/holo_color_purple.png
new file mode 100644
index 0000000..97071db
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_color_purple.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_color_red_dark.png b/tests/tests/holo/res/drawable-hdpi/holo_color_red_dark.png
new file mode 100644
index 0000000..dbcef9d
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_color_red_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_color_red_light.png b/tests/tests/holo/res/drawable-hdpi/holo_color_red_light.png
new file mode 100644
index 0000000..c60546f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_color_red_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_dialog_alertdialog_list.png b/tests/tests/holo/res/drawable-hdpi/holo_dialog_alertdialog_list.png
new file mode 100644
index 0000000..aa074c1
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_dialog_alertdialog_list.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_dialog_alertdialog_multichoice.png b/tests/tests/holo/res/drawable-hdpi/holo_dialog_alertdialog_multichoice.png
new file mode 100644
index 0000000..205b855
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_dialog_alertdialog_multichoice.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_dialog_alertdialog_onebutton.png b/tests/tests/holo/res/drawable-hdpi/holo_dialog_alertdialog_onebutton.png
new file mode 100644
index 0000000..356c230
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_dialog_alertdialog_onebutton.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_dialog_alertdialog_singlechoice.png b/tests/tests/holo/res/drawable-hdpi/holo_dialog_alertdialog_singlechoice.png
new file mode 100644
index 0000000..4d0d20c
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_dialog_alertdialog_singlechoice.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_dialog_alertdialog_threebuttons.png b/tests/tests/holo/res/drawable-hdpi/holo_dialog_alertdialog_threebuttons.png
new file mode 100644
index 0000000..33d0641
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_dialog_alertdialog_threebuttons.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_dialog_alertdialog_twobuttons.png b/tests/tests/holo/res/drawable-hdpi/holo_dialog_alertdialog_twobuttons.png
new file mode 100644
index 0000000..5969402
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_dialog_alertdialog_twobuttons.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_dialog_button.png b/tests/tests/holo/res/drawable-hdpi/holo_dialog_button.png
new file mode 100644
index 0000000..1c65266
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_dialog_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_dialog_button_pressed.png b/tests/tests/holo/res/drawable-hdpi/holo_dialog_button_pressed.png
new file mode 100644
index 0000000..797dccc
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_dialog_button_pressed.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_dialog_calendar_view.png b/tests/tests/holo/res/drawable-hdpi/holo_dialog_calendar_view.png
new file mode 100644
index 0000000..bf1aaa5
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_dialog_calendar_view.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_dialog_calendar_view_feb.png b/tests/tests/holo/res/drawable-hdpi/holo_dialog_calendar_view_feb.png
new file mode 100644
index 0000000..1421fbc
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_dialog_calendar_view_feb.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_dialog_checkbox.png b/tests/tests/holo/res/drawable-hdpi/holo_dialog_checkbox.png
new file mode 100644
index 0000000..97e83b6
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_dialog_checkbox.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_dialog_checkbox_checked.png b/tests/tests/holo/res/drawable-hdpi/holo_dialog_checkbox_checked.png
new file mode 100644
index 0000000..88934c2
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_dialog_checkbox_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_dialog_chronometer.png b/tests/tests/holo/res/drawable-hdpi/holo_dialog_chronometer.png
new file mode 100644
index 0000000..65af9b3
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_dialog_chronometer.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_dialog_color_blue_bright.png b/tests/tests/holo/res/drawable-hdpi/holo_dialog_color_blue_bright.png
new file mode 100644
index 0000000..2d1e63f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_dialog_color_blue_bright.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_dialog_color_blue_dark.png b/tests/tests/holo/res/drawable-hdpi/holo_dialog_color_blue_dark.png
new file mode 100644
index 0000000..914e522
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_dialog_color_blue_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_dialog_color_blue_light.png b/tests/tests/holo/res/drawable-hdpi/holo_dialog_color_blue_light.png
new file mode 100644
index 0000000..a6f2f65
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_dialog_color_blue_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_dialog_color_green_dark.png b/tests/tests/holo/res/drawable-hdpi/holo_dialog_color_green_dark.png
new file mode 100644
index 0000000..2cf79d0
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_dialog_color_green_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_dialog_color_green_light.png b/tests/tests/holo/res/drawable-hdpi/holo_dialog_color_green_light.png
new file mode 100644
index 0000000..508a96e
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_dialog_color_green_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_dialog_color_orange_dark.png b/tests/tests/holo/res/drawable-hdpi/holo_dialog_color_orange_dark.png
new file mode 100644
index 0000000..4a0157f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_dialog_color_orange_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_dialog_color_orange_light.png b/tests/tests/holo/res/drawable-hdpi/holo_dialog_color_orange_light.png
new file mode 100644
index 0000000..0bdb9be
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_dialog_color_orange_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_dialog_color_purple.png b/tests/tests/holo/res/drawable-hdpi/holo_dialog_color_purple.png
new file mode 100644
index 0000000..97071db
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_dialog_color_purple.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_dialog_color_red_dark.png b/tests/tests/holo/res/drawable-hdpi/holo_dialog_color_red_dark.png
new file mode 100644
index 0000000..dbcef9d
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_dialog_color_red_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_dialog_color_red_light.png b/tests/tests/holo/res/drawable-hdpi/holo_dialog_color_red_light.png
new file mode 100644
index 0000000..c60546f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_dialog_color_red_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_dialog_edittext.png b/tests/tests/holo/res/drawable-hdpi/holo_dialog_edittext.png
new file mode 100644
index 0000000..369d7b4
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_dialog_edittext.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_dialog_minwidth_alertdialog_list.png b/tests/tests/holo/res/drawable-hdpi/holo_dialog_minwidth_alertdialog_list.png
new file mode 100644
index 0000000..aa074c1
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_dialog_minwidth_alertdialog_list.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_dialog_minwidth_alertdialog_multichoice.png b/tests/tests/holo/res/drawable-hdpi/holo_dialog_minwidth_alertdialog_multichoice.png
new file mode 100644
index 0000000..205b855
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_dialog_minwidth_alertdialog_multichoice.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_dialog_minwidth_alertdialog_onebutton.png b/tests/tests/holo/res/drawable-hdpi/holo_dialog_minwidth_alertdialog_onebutton.png
new file mode 100644
index 0000000..356c230
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_dialog_minwidth_alertdialog_onebutton.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_dialog_minwidth_alertdialog_singlechoice.png b/tests/tests/holo/res/drawable-hdpi/holo_dialog_minwidth_alertdialog_singlechoice.png
new file mode 100644
index 0000000..4d0d20c
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_dialog_minwidth_alertdialog_singlechoice.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_dialog_minwidth_alertdialog_threebuttons.png b/tests/tests/holo/res/drawable-hdpi/holo_dialog_minwidth_alertdialog_threebuttons.png
new file mode 100644
index 0000000..33d0641
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_dialog_minwidth_alertdialog_threebuttons.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_dialog_minwidth_alertdialog_twobuttons.png b/tests/tests/holo/res/drawable-hdpi/holo_dialog_minwidth_alertdialog_twobuttons.png
new file mode 100644
index 0000000..5969402
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_dialog_minwidth_alertdialog_twobuttons.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_dialog_minwidth_button.png b/tests/tests/holo/res/drawable-hdpi/holo_dialog_minwidth_button.png
new file mode 100644
index 0000000..1c65266
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_dialog_minwidth_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_dialog_minwidth_button_pressed.png b/tests/tests/holo/res/drawable-hdpi/holo_dialog_minwidth_button_pressed.png
new file mode 100644
index 0000000..797dccc
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_dialog_minwidth_button_pressed.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_dialog_minwidth_calendar_view.png b/tests/tests/holo/res/drawable-hdpi/holo_dialog_minwidth_calendar_view.png
new file mode 100644
index 0000000..bf1aaa5
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_dialog_minwidth_calendar_view.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_dialog_minwidth_calendar_view_feb.png b/tests/tests/holo/res/drawable-hdpi/holo_dialog_minwidth_calendar_view_feb.png
new file mode 100644
index 0000000..1421fbc
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_dialog_minwidth_calendar_view_feb.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_dialog_minwidth_checkbox.png b/tests/tests/holo/res/drawable-hdpi/holo_dialog_minwidth_checkbox.png
new file mode 100644
index 0000000..97e83b6
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_dialog_minwidth_checkbox.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_dialog_minwidth_checkbox_checked.png b/tests/tests/holo/res/drawable-hdpi/holo_dialog_minwidth_checkbox_checked.png
new file mode 100644
index 0000000..88934c2
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_dialog_minwidth_checkbox_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_dialog_minwidth_chronometer.png b/tests/tests/holo/res/drawable-hdpi/holo_dialog_minwidth_chronometer.png
new file mode 100644
index 0000000..65af9b3
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_dialog_minwidth_chronometer.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_dialog_minwidth_color_blue_bright.png b/tests/tests/holo/res/drawable-hdpi/holo_dialog_minwidth_color_blue_bright.png
new file mode 100644
index 0000000..2d1e63f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_dialog_minwidth_color_blue_bright.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_dialog_minwidth_color_blue_dark.png b/tests/tests/holo/res/drawable-hdpi/holo_dialog_minwidth_color_blue_dark.png
new file mode 100644
index 0000000..914e522
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_dialog_minwidth_color_blue_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_dialog_minwidth_color_blue_light.png b/tests/tests/holo/res/drawable-hdpi/holo_dialog_minwidth_color_blue_light.png
new file mode 100644
index 0000000..a6f2f65
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_dialog_minwidth_color_blue_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_dialog_minwidth_color_green_dark.png b/tests/tests/holo/res/drawable-hdpi/holo_dialog_minwidth_color_green_dark.png
new file mode 100644
index 0000000..2cf79d0
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_dialog_minwidth_color_green_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_dialog_minwidth_color_green_light.png b/tests/tests/holo/res/drawable-hdpi/holo_dialog_minwidth_color_green_light.png
new file mode 100644
index 0000000..508a96e
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_dialog_minwidth_color_green_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_dialog_minwidth_color_orange_dark.png b/tests/tests/holo/res/drawable-hdpi/holo_dialog_minwidth_color_orange_dark.png
new file mode 100644
index 0000000..4a0157f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_dialog_minwidth_color_orange_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_dialog_minwidth_color_orange_light.png b/tests/tests/holo/res/drawable-hdpi/holo_dialog_minwidth_color_orange_light.png
new file mode 100644
index 0000000..0bdb9be
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_dialog_minwidth_color_orange_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_dialog_minwidth_color_purple.png b/tests/tests/holo/res/drawable-hdpi/holo_dialog_minwidth_color_purple.png
new file mode 100644
index 0000000..97071db
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_dialog_minwidth_color_purple.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_dialog_minwidth_color_red_dark.png b/tests/tests/holo/res/drawable-hdpi/holo_dialog_minwidth_color_red_dark.png
new file mode 100644
index 0000000..dbcef9d
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_dialog_minwidth_color_red_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_dialog_minwidth_color_red_light.png b/tests/tests/holo/res/drawable-hdpi/holo_dialog_minwidth_color_red_light.png
new file mode 100644
index 0000000..c60546f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_dialog_minwidth_color_red_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_dialog_minwidth_edittext.png b/tests/tests/holo/res/drawable-hdpi/holo_dialog_minwidth_edittext.png
new file mode 100644
index 0000000..369d7b4
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_dialog_minwidth_edittext.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_dialog_minwidth_progressbar.png b/tests/tests/holo/res/drawable-hdpi/holo_dialog_minwidth_progressbar.png
new file mode 100644
index 0000000..41e958c
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_dialog_minwidth_progressbar.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_dialog_minwidth_progressbar_horizontal_0.png b/tests/tests/holo/res/drawable-hdpi/holo_dialog_minwidth_progressbar_horizontal_0.png
new file mode 100644
index 0000000..7923142
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_dialog_minwidth_progressbar_horizontal_0.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_dialog_minwidth_progressbar_horizontal_100.png b/tests/tests/holo/res/drawable-hdpi/holo_dialog_minwidth_progressbar_horizontal_100.png
new file mode 100644
index 0000000..d94e0ec
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_dialog_minwidth_progressbar_horizontal_100.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_dialog_minwidth_progressbar_horizontal_50.png b/tests/tests/holo/res/drawable-hdpi/holo_dialog_minwidth_progressbar_horizontal_50.png
new file mode 100644
index 0000000..0891a0b
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_dialog_minwidth_progressbar_horizontal_50.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_dialog_minwidth_progressbar_large.png b/tests/tests/holo/res/drawable-hdpi/holo_dialog_minwidth_progressbar_large.png
new file mode 100644
index 0000000..0fd63d2
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_dialog_minwidth_progressbar_large.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_dialog_minwidth_progressbar_small.png b/tests/tests/holo/res/drawable-hdpi/holo_dialog_minwidth_progressbar_small.png
new file mode 100644
index 0000000..1a270f9
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_dialog_minwidth_progressbar_small.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_dialog_minwidth_progressdialog_horizontal.png b/tests/tests/holo/res/drawable-hdpi/holo_dialog_minwidth_progressdialog_horizontal.png
new file mode 100644
index 0000000..168b54f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_dialog_minwidth_progressdialog_horizontal.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_dialog_minwidth_radio_button.png b/tests/tests/holo/res/drawable-hdpi/holo_dialog_minwidth_radio_button.png
new file mode 100644
index 0000000..50c99a6
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_dialog_minwidth_radio_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_dialog_minwidth_radio_button_checked.png b/tests/tests/holo/res/drawable-hdpi/holo_dialog_minwidth_radio_button_checked.png
new file mode 100644
index 0000000..5959f1b
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_dialog_minwidth_radio_button_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_dialog_minwidth_radiogroup_horizontal.png b/tests/tests/holo/res/drawable-hdpi/holo_dialog_minwidth_radiogroup_horizontal.png
new file mode 100644
index 0000000..bfe6918
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_dialog_minwidth_radiogroup_horizontal.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_dialog_minwidth_radiogroup_vertical.png b/tests/tests/holo/res/drawable-hdpi/holo_dialog_minwidth_radiogroup_vertical.png
new file mode 100644
index 0000000..5a74bfb
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_dialog_minwidth_radiogroup_vertical.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_land_ratingbar_0.png b/tests/tests/holo/res/drawable-hdpi/holo_dialog_minwidth_ratingbar_0.png
similarity index 100%
copy from tests/res/drawable-hdpi/holo_land_ratingbar_0.png
copy to tests/tests/holo/res/drawable-hdpi/holo_dialog_minwidth_ratingbar_0.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_land_ratingbar_0_pressed.png b/tests/tests/holo/res/drawable-hdpi/holo_dialog_minwidth_ratingbar_0_pressed.png
similarity index 100%
copy from tests/res/drawable-hdpi/holo_land_ratingbar_0_pressed.png
copy to tests/tests/holo/res/drawable-hdpi/holo_dialog_minwidth_ratingbar_0_pressed.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_land_ratingbar_2point5.png b/tests/tests/holo/res/drawable-hdpi/holo_dialog_minwidth_ratingbar_2point5.png
similarity index 100%
copy from tests/res/drawable-hdpi/holo_land_ratingbar_2point5.png
copy to tests/tests/holo/res/drawable-hdpi/holo_dialog_minwidth_ratingbar_2point5.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_land_ratingbar_2point5_pressed.png b/tests/tests/holo/res/drawable-hdpi/holo_dialog_minwidth_ratingbar_2point5_pressed.png
similarity index 100%
copy from tests/res/drawable-hdpi/holo_land_ratingbar_2point5_pressed.png
copy to tests/tests/holo/res/drawable-hdpi/holo_dialog_minwidth_ratingbar_2point5_pressed.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_land_ratingbar_5.png b/tests/tests/holo/res/drawable-hdpi/holo_dialog_minwidth_ratingbar_5.png
similarity index 100%
copy from tests/res/drawable-hdpi/holo_land_ratingbar_5.png
copy to tests/tests/holo/res/drawable-hdpi/holo_dialog_minwidth_ratingbar_5.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_land_ratingbar_5_pressed.png b/tests/tests/holo/res/drawable-hdpi/holo_dialog_minwidth_ratingbar_5_pressed.png
similarity index 100%
copy from tests/res/drawable-hdpi/holo_land_ratingbar_5_pressed.png
copy to tests/tests/holo/res/drawable-hdpi/holo_dialog_minwidth_ratingbar_5_pressed.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_dialog_minwidth_searchview.png b/tests/tests/holo/res/drawable-hdpi/holo_dialog_minwidth_searchview.png
new file mode 100644
index 0000000..2316e8a
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_dialog_minwidth_searchview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_dialog_minwidth_searchview_query.png b/tests/tests/holo/res/drawable-hdpi/holo_dialog_minwidth_searchview_query.png
new file mode 100644
index 0000000..1eb04da
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_dialog_minwidth_searchview_query.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_dialog_minwidth_searchview_query_hint.png b/tests/tests/holo/res/drawable-hdpi/holo_dialog_minwidth_searchview_query_hint.png
new file mode 100644
index 0000000..bdf014a
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_dialog_minwidth_searchview_query_hint.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_dialog_minwidth_seekbar_0.png b/tests/tests/holo/res/drawable-hdpi/holo_dialog_minwidth_seekbar_0.png
new file mode 100644
index 0000000..b194d4e
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_dialog_minwidth_seekbar_0.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_dialog_minwidth_seekbar_100.png b/tests/tests/holo/res/drawable-hdpi/holo_dialog_minwidth_seekbar_100.png
new file mode 100644
index 0000000..b89ea7d
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_dialog_minwidth_seekbar_100.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_dialog_minwidth_seekbar_50.png b/tests/tests/holo/res/drawable-hdpi/holo_dialog_minwidth_seekbar_50.png
new file mode 100644
index 0000000..3100469
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_dialog_minwidth_seekbar_50.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_dialog_minwidth_spinner.png b/tests/tests/holo/res/drawable-hdpi/holo_dialog_minwidth_spinner.png
new file mode 100644
index 0000000..9aaac14
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_dialog_minwidth_spinner.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_dialog_minwidth_switch.png b/tests/tests/holo/res/drawable-hdpi/holo_dialog_minwidth_switch.png
new file mode 100644
index 0000000..38fe4e7
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_dialog_minwidth_switch.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_dialog_minwidth_switch_checked.png b/tests/tests/holo/res/drawable-hdpi/holo_dialog_minwidth_switch_checked.png
new file mode 100644
index 0000000..d85ceaa
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_dialog_minwidth_switch_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_dialog_minwidth_tabhost.png b/tests/tests/holo/res/drawable-hdpi/holo_dialog_minwidth_tabhost.png
new file mode 100644
index 0000000..27698b0
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_dialog_minwidth_tabhost.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_dialog_minwidth_textview.png b/tests/tests/holo/res/drawable-hdpi/holo_dialog_minwidth_textview.png
new file mode 100644
index 0000000..85547e3
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_dialog_minwidth_textview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_dialog_minwidth_timepicker.png b/tests/tests/holo/res/drawable-hdpi/holo_dialog_minwidth_timepicker.png
new file mode 100644
index 0000000..427cc55
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_dialog_minwidth_timepicker.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_dialog_minwidth_toggle_button.png b/tests/tests/holo/res/drawable-hdpi/holo_dialog_minwidth_toggle_button.png
new file mode 100644
index 0000000..e101854
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_dialog_minwidth_toggle_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_dialog_minwidth_toggle_button_checked.png b/tests/tests/holo/res/drawable-hdpi/holo_dialog_minwidth_toggle_button_checked.png
new file mode 100644
index 0000000..2daed75
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_dialog_minwidth_toggle_button_checked.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_land_zoomcontrols.png b/tests/tests/holo/res/drawable-hdpi/holo_dialog_minwidth_zoomcontrols.png
similarity index 100%
copy from tests/res/drawable-hdpi/holo_land_zoomcontrols.png
copy to tests/tests/holo/res/drawable-hdpi/holo_dialog_minwidth_zoomcontrols.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_dialog_noactionbar_alertdialog_list.png b/tests/tests/holo/res/drawable-hdpi/holo_dialog_noactionbar_alertdialog_list.png
new file mode 100644
index 0000000..aa074c1
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_dialog_noactionbar_alertdialog_list.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_dialog_noactionbar_alertdialog_multichoice.png b/tests/tests/holo/res/drawable-hdpi/holo_dialog_noactionbar_alertdialog_multichoice.png
new file mode 100644
index 0000000..205b855
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_dialog_noactionbar_alertdialog_multichoice.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_dialog_noactionbar_alertdialog_onebutton.png b/tests/tests/holo/res/drawable-hdpi/holo_dialog_noactionbar_alertdialog_onebutton.png
new file mode 100644
index 0000000..356c230
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_dialog_noactionbar_alertdialog_onebutton.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_dialog_noactionbar_alertdialog_singlechoice.png b/tests/tests/holo/res/drawable-hdpi/holo_dialog_noactionbar_alertdialog_singlechoice.png
new file mode 100644
index 0000000..4d0d20c
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_dialog_noactionbar_alertdialog_singlechoice.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_dialog_noactionbar_alertdialog_threebuttons.png b/tests/tests/holo/res/drawable-hdpi/holo_dialog_noactionbar_alertdialog_threebuttons.png
new file mode 100644
index 0000000..33d0641
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_dialog_noactionbar_alertdialog_threebuttons.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_dialog_noactionbar_alertdialog_twobuttons.png b/tests/tests/holo/res/drawable-hdpi/holo_dialog_noactionbar_alertdialog_twobuttons.png
new file mode 100644
index 0000000..5969402
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_dialog_noactionbar_alertdialog_twobuttons.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_dialog_noactionbar_button.png b/tests/tests/holo/res/drawable-hdpi/holo_dialog_noactionbar_button.png
new file mode 100644
index 0000000..1c65266
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_dialog_noactionbar_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_dialog_noactionbar_button_pressed.png b/tests/tests/holo/res/drawable-hdpi/holo_dialog_noactionbar_button_pressed.png
new file mode 100644
index 0000000..797dccc
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_dialog_noactionbar_button_pressed.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_dialog_noactionbar_calendar_view.png b/tests/tests/holo/res/drawable-hdpi/holo_dialog_noactionbar_calendar_view.png
new file mode 100644
index 0000000..bf1aaa5
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_dialog_noactionbar_calendar_view.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_dialog_noactionbar_calendar_view_feb.png b/tests/tests/holo/res/drawable-hdpi/holo_dialog_noactionbar_calendar_view_feb.png
new file mode 100644
index 0000000..1421fbc
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_dialog_noactionbar_calendar_view_feb.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_dialog_noactionbar_checkbox.png b/tests/tests/holo/res/drawable-hdpi/holo_dialog_noactionbar_checkbox.png
new file mode 100644
index 0000000..97e83b6
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_dialog_noactionbar_checkbox.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_dialog_noactionbar_checkbox_checked.png b/tests/tests/holo/res/drawable-hdpi/holo_dialog_noactionbar_checkbox_checked.png
new file mode 100644
index 0000000..88934c2
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_dialog_noactionbar_checkbox_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_dialog_noactionbar_chronometer.png b/tests/tests/holo/res/drawable-hdpi/holo_dialog_noactionbar_chronometer.png
new file mode 100644
index 0000000..65af9b3
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_dialog_noactionbar_chronometer.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_dialog_noactionbar_color_blue_bright.png b/tests/tests/holo/res/drawable-hdpi/holo_dialog_noactionbar_color_blue_bright.png
new file mode 100644
index 0000000..2d1e63f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_dialog_noactionbar_color_blue_bright.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_dialog_noactionbar_color_blue_dark.png b/tests/tests/holo/res/drawable-hdpi/holo_dialog_noactionbar_color_blue_dark.png
new file mode 100644
index 0000000..914e522
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_dialog_noactionbar_color_blue_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_dialog_noactionbar_color_blue_light.png b/tests/tests/holo/res/drawable-hdpi/holo_dialog_noactionbar_color_blue_light.png
new file mode 100644
index 0000000..a6f2f65
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_dialog_noactionbar_color_blue_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_dialog_noactionbar_color_green_dark.png b/tests/tests/holo/res/drawable-hdpi/holo_dialog_noactionbar_color_green_dark.png
new file mode 100644
index 0000000..2cf79d0
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_dialog_noactionbar_color_green_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_dialog_noactionbar_color_green_light.png b/tests/tests/holo/res/drawable-hdpi/holo_dialog_noactionbar_color_green_light.png
new file mode 100644
index 0000000..508a96e
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_dialog_noactionbar_color_green_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_dialog_noactionbar_color_orange_dark.png b/tests/tests/holo/res/drawable-hdpi/holo_dialog_noactionbar_color_orange_dark.png
new file mode 100644
index 0000000..4a0157f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_dialog_noactionbar_color_orange_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_dialog_noactionbar_color_orange_light.png b/tests/tests/holo/res/drawable-hdpi/holo_dialog_noactionbar_color_orange_light.png
new file mode 100644
index 0000000..0bdb9be
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_dialog_noactionbar_color_orange_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_dialog_noactionbar_color_purple.png b/tests/tests/holo/res/drawable-hdpi/holo_dialog_noactionbar_color_purple.png
new file mode 100644
index 0000000..97071db
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_dialog_noactionbar_color_purple.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_dialog_noactionbar_color_red_dark.png b/tests/tests/holo/res/drawable-hdpi/holo_dialog_noactionbar_color_red_dark.png
new file mode 100644
index 0000000..dbcef9d
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_dialog_noactionbar_color_red_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_dialog_noactionbar_color_red_light.png b/tests/tests/holo/res/drawable-hdpi/holo_dialog_noactionbar_color_red_light.png
new file mode 100644
index 0000000..c60546f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_dialog_noactionbar_color_red_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_dialog_noactionbar_edittext.png b/tests/tests/holo/res/drawable-hdpi/holo_dialog_noactionbar_edittext.png
new file mode 100644
index 0000000..369d7b4
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_dialog_noactionbar_edittext.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_dialog_noactionbar_minwidth_alertdialog_list.png b/tests/tests/holo/res/drawable-hdpi/holo_dialog_noactionbar_minwidth_alertdialog_list.png
new file mode 100644
index 0000000..aa074c1
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_dialog_noactionbar_minwidth_alertdialog_list.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_dialog_noactionbar_minwidth_alertdialog_multichoice.png b/tests/tests/holo/res/drawable-hdpi/holo_dialog_noactionbar_minwidth_alertdialog_multichoice.png
new file mode 100644
index 0000000..205b855
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_dialog_noactionbar_minwidth_alertdialog_multichoice.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_dialog_noactionbar_minwidth_alertdialog_onebutton.png b/tests/tests/holo/res/drawable-hdpi/holo_dialog_noactionbar_minwidth_alertdialog_onebutton.png
new file mode 100644
index 0000000..356c230
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_dialog_noactionbar_minwidth_alertdialog_onebutton.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_dialog_noactionbar_minwidth_alertdialog_singlechoice.png b/tests/tests/holo/res/drawable-hdpi/holo_dialog_noactionbar_minwidth_alertdialog_singlechoice.png
new file mode 100644
index 0000000..4d0d20c
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_dialog_noactionbar_minwidth_alertdialog_singlechoice.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_dialog_noactionbar_minwidth_alertdialog_threebuttons.png b/tests/tests/holo/res/drawable-hdpi/holo_dialog_noactionbar_minwidth_alertdialog_threebuttons.png
new file mode 100644
index 0000000..33d0641
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_dialog_noactionbar_minwidth_alertdialog_threebuttons.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_dialog_noactionbar_minwidth_alertdialog_twobuttons.png b/tests/tests/holo/res/drawable-hdpi/holo_dialog_noactionbar_minwidth_alertdialog_twobuttons.png
new file mode 100644
index 0000000..5969402
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_dialog_noactionbar_minwidth_alertdialog_twobuttons.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_dialog_noactionbar_minwidth_button.png b/tests/tests/holo/res/drawable-hdpi/holo_dialog_noactionbar_minwidth_button.png
new file mode 100644
index 0000000..1c65266
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_dialog_noactionbar_minwidth_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_dialog_noactionbar_minwidth_button_pressed.png b/tests/tests/holo/res/drawable-hdpi/holo_dialog_noactionbar_minwidth_button_pressed.png
new file mode 100644
index 0000000..797dccc
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_dialog_noactionbar_minwidth_button_pressed.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_dialog_noactionbar_minwidth_calendar_view.png b/tests/tests/holo/res/drawable-hdpi/holo_dialog_noactionbar_minwidth_calendar_view.png
new file mode 100644
index 0000000..bf1aaa5
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_dialog_noactionbar_minwidth_calendar_view.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_dialog_noactionbar_minwidth_calendar_view_feb.png b/tests/tests/holo/res/drawable-hdpi/holo_dialog_noactionbar_minwidth_calendar_view_feb.png
new file mode 100644
index 0000000..1421fbc
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_dialog_noactionbar_minwidth_calendar_view_feb.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_dialog_noactionbar_minwidth_checkbox.png b/tests/tests/holo/res/drawable-hdpi/holo_dialog_noactionbar_minwidth_checkbox.png
new file mode 100644
index 0000000..97e83b6
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_dialog_noactionbar_minwidth_checkbox.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_dialog_noactionbar_minwidth_checkbox_checked.png b/tests/tests/holo/res/drawable-hdpi/holo_dialog_noactionbar_minwidth_checkbox_checked.png
new file mode 100644
index 0000000..88934c2
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_dialog_noactionbar_minwidth_checkbox_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_dialog_noactionbar_minwidth_chronometer.png b/tests/tests/holo/res/drawable-hdpi/holo_dialog_noactionbar_minwidth_chronometer.png
new file mode 100644
index 0000000..65af9b3
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_dialog_noactionbar_minwidth_chronometer.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_dialog_noactionbar_minwidth_color_blue_bright.png b/tests/tests/holo/res/drawable-hdpi/holo_dialog_noactionbar_minwidth_color_blue_bright.png
new file mode 100644
index 0000000..2d1e63f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_dialog_noactionbar_minwidth_color_blue_bright.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_dialog_noactionbar_minwidth_color_blue_dark.png b/tests/tests/holo/res/drawable-hdpi/holo_dialog_noactionbar_minwidth_color_blue_dark.png
new file mode 100644
index 0000000..914e522
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_dialog_noactionbar_minwidth_color_blue_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_dialog_noactionbar_minwidth_color_blue_light.png b/tests/tests/holo/res/drawable-hdpi/holo_dialog_noactionbar_minwidth_color_blue_light.png
new file mode 100644
index 0000000..a6f2f65
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_dialog_noactionbar_minwidth_color_blue_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_dialog_noactionbar_minwidth_color_green_dark.png b/tests/tests/holo/res/drawable-hdpi/holo_dialog_noactionbar_minwidth_color_green_dark.png
new file mode 100644
index 0000000..2cf79d0
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_dialog_noactionbar_minwidth_color_green_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_dialog_noactionbar_minwidth_color_green_light.png b/tests/tests/holo/res/drawable-hdpi/holo_dialog_noactionbar_minwidth_color_green_light.png
new file mode 100644
index 0000000..508a96e
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_dialog_noactionbar_minwidth_color_green_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_dialog_noactionbar_minwidth_color_orange_dark.png b/tests/tests/holo/res/drawable-hdpi/holo_dialog_noactionbar_minwidth_color_orange_dark.png
new file mode 100644
index 0000000..4a0157f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_dialog_noactionbar_minwidth_color_orange_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_dialog_noactionbar_minwidth_color_orange_light.png b/tests/tests/holo/res/drawable-hdpi/holo_dialog_noactionbar_minwidth_color_orange_light.png
new file mode 100644
index 0000000..0bdb9be
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_dialog_noactionbar_minwidth_color_orange_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_dialog_noactionbar_minwidth_color_purple.png b/tests/tests/holo/res/drawable-hdpi/holo_dialog_noactionbar_minwidth_color_purple.png
new file mode 100644
index 0000000..97071db
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_dialog_noactionbar_minwidth_color_purple.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_dialog_noactionbar_minwidth_color_red_dark.png b/tests/tests/holo/res/drawable-hdpi/holo_dialog_noactionbar_minwidth_color_red_dark.png
new file mode 100644
index 0000000..dbcef9d
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_dialog_noactionbar_minwidth_color_red_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_dialog_noactionbar_minwidth_color_red_light.png b/tests/tests/holo/res/drawable-hdpi/holo_dialog_noactionbar_minwidth_color_red_light.png
new file mode 100644
index 0000000..c60546f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_dialog_noactionbar_minwidth_color_red_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_dialog_noactionbar_minwidth_edittext.png b/tests/tests/holo/res/drawable-hdpi/holo_dialog_noactionbar_minwidth_edittext.png
new file mode 100644
index 0000000..369d7b4
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_dialog_noactionbar_minwidth_edittext.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_dialog_noactionbar_minwidth_progressbar.png b/tests/tests/holo/res/drawable-hdpi/holo_dialog_noactionbar_minwidth_progressbar.png
new file mode 100644
index 0000000..41e958c
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_dialog_noactionbar_minwidth_progressbar.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_dialog_noactionbar_minwidth_progressbar_horizontal_0.png b/tests/tests/holo/res/drawable-hdpi/holo_dialog_noactionbar_minwidth_progressbar_horizontal_0.png
new file mode 100644
index 0000000..7923142
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_dialog_noactionbar_minwidth_progressbar_horizontal_0.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_dialog_noactionbar_minwidth_progressbar_horizontal_100.png b/tests/tests/holo/res/drawable-hdpi/holo_dialog_noactionbar_minwidth_progressbar_horizontal_100.png
new file mode 100644
index 0000000..d94e0ec
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_dialog_noactionbar_minwidth_progressbar_horizontal_100.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_dialog_noactionbar_minwidth_progressbar_horizontal_50.png b/tests/tests/holo/res/drawable-hdpi/holo_dialog_noactionbar_minwidth_progressbar_horizontal_50.png
new file mode 100644
index 0000000..0891a0b
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_dialog_noactionbar_minwidth_progressbar_horizontal_50.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_dialog_noactionbar_minwidth_progressbar_large.png b/tests/tests/holo/res/drawable-hdpi/holo_dialog_noactionbar_minwidth_progressbar_large.png
new file mode 100644
index 0000000..0fd63d2
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_dialog_noactionbar_minwidth_progressbar_large.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_dialog_noactionbar_minwidth_progressbar_small.png b/tests/tests/holo/res/drawable-hdpi/holo_dialog_noactionbar_minwidth_progressbar_small.png
new file mode 100644
index 0000000..1a270f9
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_dialog_noactionbar_minwidth_progressbar_small.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_dialog_noactionbar_minwidth_progressdialog_horizontal.png b/tests/tests/holo/res/drawable-hdpi/holo_dialog_noactionbar_minwidth_progressdialog_horizontal.png
new file mode 100644
index 0000000..168b54f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_dialog_noactionbar_minwidth_progressdialog_horizontal.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_dialog_noactionbar_minwidth_radio_button.png b/tests/tests/holo/res/drawable-hdpi/holo_dialog_noactionbar_minwidth_radio_button.png
new file mode 100644
index 0000000..50c99a6
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_dialog_noactionbar_minwidth_radio_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_dialog_noactionbar_minwidth_radio_button_checked.png b/tests/tests/holo/res/drawable-hdpi/holo_dialog_noactionbar_minwidth_radio_button_checked.png
new file mode 100644
index 0000000..5959f1b
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_dialog_noactionbar_minwidth_radio_button_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_dialog_noactionbar_minwidth_radiogroup_horizontal.png b/tests/tests/holo/res/drawable-hdpi/holo_dialog_noactionbar_minwidth_radiogroup_horizontal.png
new file mode 100644
index 0000000..bfe6918
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_dialog_noactionbar_minwidth_radiogroup_horizontal.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_dialog_noactionbar_minwidth_radiogroup_vertical.png b/tests/tests/holo/res/drawable-hdpi/holo_dialog_noactionbar_minwidth_radiogroup_vertical.png
new file mode 100644
index 0000000..5a74bfb
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_dialog_noactionbar_minwidth_radiogroup_vertical.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_land_ratingbar_0.png b/tests/tests/holo/res/drawable-hdpi/holo_dialog_noactionbar_minwidth_ratingbar_0.png
similarity index 100%
copy from tests/res/drawable-hdpi/holo_land_ratingbar_0.png
copy to tests/tests/holo/res/drawable-hdpi/holo_dialog_noactionbar_minwidth_ratingbar_0.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_land_ratingbar_0_pressed.png b/tests/tests/holo/res/drawable-hdpi/holo_dialog_noactionbar_minwidth_ratingbar_0_pressed.png
similarity index 100%
copy from tests/res/drawable-hdpi/holo_land_ratingbar_0_pressed.png
copy to tests/tests/holo/res/drawable-hdpi/holo_dialog_noactionbar_minwidth_ratingbar_0_pressed.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_land_ratingbar_2point5.png b/tests/tests/holo/res/drawable-hdpi/holo_dialog_noactionbar_minwidth_ratingbar_2point5.png
similarity index 100%
copy from tests/res/drawable-hdpi/holo_land_ratingbar_2point5.png
copy to tests/tests/holo/res/drawable-hdpi/holo_dialog_noactionbar_minwidth_ratingbar_2point5.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_land_ratingbar_2point5_pressed.png b/tests/tests/holo/res/drawable-hdpi/holo_dialog_noactionbar_minwidth_ratingbar_2point5_pressed.png
similarity index 100%
copy from tests/res/drawable-hdpi/holo_land_ratingbar_2point5_pressed.png
copy to tests/tests/holo/res/drawable-hdpi/holo_dialog_noactionbar_minwidth_ratingbar_2point5_pressed.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_land_ratingbar_5.png b/tests/tests/holo/res/drawable-hdpi/holo_dialog_noactionbar_minwidth_ratingbar_5.png
similarity index 100%
copy from tests/res/drawable-hdpi/holo_land_ratingbar_5.png
copy to tests/tests/holo/res/drawable-hdpi/holo_dialog_noactionbar_minwidth_ratingbar_5.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_land_ratingbar_5_pressed.png b/tests/tests/holo/res/drawable-hdpi/holo_dialog_noactionbar_minwidth_ratingbar_5_pressed.png
similarity index 100%
copy from tests/res/drawable-hdpi/holo_land_ratingbar_5_pressed.png
copy to tests/tests/holo/res/drawable-hdpi/holo_dialog_noactionbar_minwidth_ratingbar_5_pressed.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_dialog_noactionbar_minwidth_searchview.png b/tests/tests/holo/res/drawable-hdpi/holo_dialog_noactionbar_minwidth_searchview.png
new file mode 100644
index 0000000..2316e8a
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_dialog_noactionbar_minwidth_searchview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_dialog_noactionbar_minwidth_searchview_query.png b/tests/tests/holo/res/drawable-hdpi/holo_dialog_noactionbar_minwidth_searchview_query.png
new file mode 100644
index 0000000..1eb04da
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_dialog_noactionbar_minwidth_searchview_query.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_dialog_noactionbar_minwidth_searchview_query_hint.png b/tests/tests/holo/res/drawable-hdpi/holo_dialog_noactionbar_minwidth_searchview_query_hint.png
new file mode 100644
index 0000000..bdf014a
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_dialog_noactionbar_minwidth_searchview_query_hint.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_dialog_noactionbar_minwidth_seekbar_0.png b/tests/tests/holo/res/drawable-hdpi/holo_dialog_noactionbar_minwidth_seekbar_0.png
new file mode 100644
index 0000000..b194d4e
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_dialog_noactionbar_minwidth_seekbar_0.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_dialog_noactionbar_minwidth_seekbar_100.png b/tests/tests/holo/res/drawable-hdpi/holo_dialog_noactionbar_minwidth_seekbar_100.png
new file mode 100644
index 0000000..b89ea7d
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_dialog_noactionbar_minwidth_seekbar_100.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_dialog_noactionbar_minwidth_seekbar_50.png b/tests/tests/holo/res/drawable-hdpi/holo_dialog_noactionbar_minwidth_seekbar_50.png
new file mode 100644
index 0000000..3100469
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_dialog_noactionbar_minwidth_seekbar_50.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_dialog_noactionbar_minwidth_spinner.png b/tests/tests/holo/res/drawable-hdpi/holo_dialog_noactionbar_minwidth_spinner.png
new file mode 100644
index 0000000..9aaac14
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_dialog_noactionbar_minwidth_spinner.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_dialog_noactionbar_minwidth_switch.png b/tests/tests/holo/res/drawable-hdpi/holo_dialog_noactionbar_minwidth_switch.png
new file mode 100644
index 0000000..38fe4e7
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_dialog_noactionbar_minwidth_switch.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_dialog_noactionbar_minwidth_switch_checked.png b/tests/tests/holo/res/drawable-hdpi/holo_dialog_noactionbar_minwidth_switch_checked.png
new file mode 100644
index 0000000..d85ceaa
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_dialog_noactionbar_minwidth_switch_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_dialog_noactionbar_minwidth_tabhost.png b/tests/tests/holo/res/drawable-hdpi/holo_dialog_noactionbar_minwidth_tabhost.png
new file mode 100644
index 0000000..27698b0
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_dialog_noactionbar_minwidth_tabhost.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_dialog_noactionbar_minwidth_textview.png b/tests/tests/holo/res/drawable-hdpi/holo_dialog_noactionbar_minwidth_textview.png
new file mode 100644
index 0000000..85547e3
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_dialog_noactionbar_minwidth_textview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_dialog_noactionbar_minwidth_timepicker.png b/tests/tests/holo/res/drawable-hdpi/holo_dialog_noactionbar_minwidth_timepicker.png
new file mode 100644
index 0000000..427cc55
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_dialog_noactionbar_minwidth_timepicker.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_dialog_noactionbar_minwidth_toggle_button.png b/tests/tests/holo/res/drawable-hdpi/holo_dialog_noactionbar_minwidth_toggle_button.png
new file mode 100644
index 0000000..e101854
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_dialog_noactionbar_minwidth_toggle_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_dialog_noactionbar_minwidth_toggle_button_checked.png b/tests/tests/holo/res/drawable-hdpi/holo_dialog_noactionbar_minwidth_toggle_button_checked.png
new file mode 100644
index 0000000..2daed75
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_dialog_noactionbar_minwidth_toggle_button_checked.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_land_zoomcontrols.png b/tests/tests/holo/res/drawable-hdpi/holo_dialog_noactionbar_minwidth_zoomcontrols.png
similarity index 100%
copy from tests/res/drawable-hdpi/holo_land_zoomcontrols.png
copy to tests/tests/holo/res/drawable-hdpi/holo_dialog_noactionbar_minwidth_zoomcontrols.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_dialog_noactionbar_progressbar.png b/tests/tests/holo/res/drawable-hdpi/holo_dialog_noactionbar_progressbar.png
new file mode 100644
index 0000000..41e958c
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_dialog_noactionbar_progressbar.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_dialog_noactionbar_progressbar_horizontal_0.png b/tests/tests/holo/res/drawable-hdpi/holo_dialog_noactionbar_progressbar_horizontal_0.png
new file mode 100644
index 0000000..7923142
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_dialog_noactionbar_progressbar_horizontal_0.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_dialog_noactionbar_progressbar_horizontal_100.png b/tests/tests/holo/res/drawable-hdpi/holo_dialog_noactionbar_progressbar_horizontal_100.png
new file mode 100644
index 0000000..d94e0ec
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_dialog_noactionbar_progressbar_horizontal_100.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_dialog_noactionbar_progressbar_horizontal_50.png b/tests/tests/holo/res/drawable-hdpi/holo_dialog_noactionbar_progressbar_horizontal_50.png
new file mode 100644
index 0000000..0891a0b
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_dialog_noactionbar_progressbar_horizontal_50.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_dialog_noactionbar_progressbar_large.png b/tests/tests/holo/res/drawable-hdpi/holo_dialog_noactionbar_progressbar_large.png
new file mode 100644
index 0000000..0fd63d2
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_dialog_noactionbar_progressbar_large.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_dialog_noactionbar_progressbar_small.png b/tests/tests/holo/res/drawable-hdpi/holo_dialog_noactionbar_progressbar_small.png
new file mode 100644
index 0000000..1a270f9
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_dialog_noactionbar_progressbar_small.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_dialog_noactionbar_progressdialog_horizontal.png b/tests/tests/holo/res/drawable-hdpi/holo_dialog_noactionbar_progressdialog_horizontal.png
new file mode 100644
index 0000000..168b54f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_dialog_noactionbar_progressdialog_horizontal.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_dialog_noactionbar_radio_button.png b/tests/tests/holo/res/drawable-hdpi/holo_dialog_noactionbar_radio_button.png
new file mode 100644
index 0000000..50c99a6
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_dialog_noactionbar_radio_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_dialog_noactionbar_radio_button_checked.png b/tests/tests/holo/res/drawable-hdpi/holo_dialog_noactionbar_radio_button_checked.png
new file mode 100644
index 0000000..5959f1b
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_dialog_noactionbar_radio_button_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_dialog_noactionbar_radiogroup_horizontal.png b/tests/tests/holo/res/drawable-hdpi/holo_dialog_noactionbar_radiogroup_horizontal.png
new file mode 100644
index 0000000..bfe6918
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_dialog_noactionbar_radiogroup_horizontal.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_dialog_noactionbar_radiogroup_vertical.png b/tests/tests/holo/res/drawable-hdpi/holo_dialog_noactionbar_radiogroup_vertical.png
new file mode 100644
index 0000000..5a74bfb
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_dialog_noactionbar_radiogroup_vertical.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_land_ratingbar_0.png b/tests/tests/holo/res/drawable-hdpi/holo_dialog_noactionbar_ratingbar_0.png
similarity index 100%
copy from tests/res/drawable-hdpi/holo_land_ratingbar_0.png
copy to tests/tests/holo/res/drawable-hdpi/holo_dialog_noactionbar_ratingbar_0.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_land_ratingbar_0_pressed.png b/tests/tests/holo/res/drawable-hdpi/holo_dialog_noactionbar_ratingbar_0_pressed.png
similarity index 100%
copy from tests/res/drawable-hdpi/holo_land_ratingbar_0_pressed.png
copy to tests/tests/holo/res/drawable-hdpi/holo_dialog_noactionbar_ratingbar_0_pressed.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_land_ratingbar_2point5.png b/tests/tests/holo/res/drawable-hdpi/holo_dialog_noactionbar_ratingbar_2point5.png
similarity index 100%
copy from tests/res/drawable-hdpi/holo_land_ratingbar_2point5.png
copy to tests/tests/holo/res/drawable-hdpi/holo_dialog_noactionbar_ratingbar_2point5.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_land_ratingbar_2point5_pressed.png b/tests/tests/holo/res/drawable-hdpi/holo_dialog_noactionbar_ratingbar_2point5_pressed.png
similarity index 100%
copy from tests/res/drawable-hdpi/holo_land_ratingbar_2point5_pressed.png
copy to tests/tests/holo/res/drawable-hdpi/holo_dialog_noactionbar_ratingbar_2point5_pressed.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_land_ratingbar_5.png b/tests/tests/holo/res/drawable-hdpi/holo_dialog_noactionbar_ratingbar_5.png
similarity index 100%
copy from tests/res/drawable-hdpi/holo_land_ratingbar_5.png
copy to tests/tests/holo/res/drawable-hdpi/holo_dialog_noactionbar_ratingbar_5.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_land_ratingbar_5_pressed.png b/tests/tests/holo/res/drawable-hdpi/holo_dialog_noactionbar_ratingbar_5_pressed.png
similarity index 100%
copy from tests/res/drawable-hdpi/holo_land_ratingbar_5_pressed.png
copy to tests/tests/holo/res/drawable-hdpi/holo_dialog_noactionbar_ratingbar_5_pressed.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_dialog_noactionbar_searchview.png b/tests/tests/holo/res/drawable-hdpi/holo_dialog_noactionbar_searchview.png
new file mode 100644
index 0000000..2316e8a
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_dialog_noactionbar_searchview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_dialog_noactionbar_searchview_query.png b/tests/tests/holo/res/drawable-hdpi/holo_dialog_noactionbar_searchview_query.png
new file mode 100644
index 0000000..1eb04da
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_dialog_noactionbar_searchview_query.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_dialog_noactionbar_searchview_query_hint.png b/tests/tests/holo/res/drawable-hdpi/holo_dialog_noactionbar_searchview_query_hint.png
new file mode 100644
index 0000000..bdf014a
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_dialog_noactionbar_searchview_query_hint.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_dialog_noactionbar_seekbar_0.png b/tests/tests/holo/res/drawable-hdpi/holo_dialog_noactionbar_seekbar_0.png
new file mode 100644
index 0000000..b194d4e
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_dialog_noactionbar_seekbar_0.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_dialog_noactionbar_seekbar_100.png b/tests/tests/holo/res/drawable-hdpi/holo_dialog_noactionbar_seekbar_100.png
new file mode 100644
index 0000000..b89ea7d
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_dialog_noactionbar_seekbar_100.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_dialog_noactionbar_seekbar_50.png b/tests/tests/holo/res/drawable-hdpi/holo_dialog_noactionbar_seekbar_50.png
new file mode 100644
index 0000000..3100469
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_dialog_noactionbar_seekbar_50.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_dialog_noactionbar_spinner.png b/tests/tests/holo/res/drawable-hdpi/holo_dialog_noactionbar_spinner.png
new file mode 100644
index 0000000..9aaac14
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_dialog_noactionbar_spinner.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_dialog_noactionbar_switch.png b/tests/tests/holo/res/drawable-hdpi/holo_dialog_noactionbar_switch.png
new file mode 100644
index 0000000..38fe4e7
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_dialog_noactionbar_switch.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_dialog_noactionbar_switch_checked.png b/tests/tests/holo/res/drawable-hdpi/holo_dialog_noactionbar_switch_checked.png
new file mode 100644
index 0000000..d85ceaa
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_dialog_noactionbar_switch_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_dialog_noactionbar_tabhost.png b/tests/tests/holo/res/drawable-hdpi/holo_dialog_noactionbar_tabhost.png
new file mode 100644
index 0000000..27698b0
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_dialog_noactionbar_tabhost.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_dialog_noactionbar_textview.png b/tests/tests/holo/res/drawable-hdpi/holo_dialog_noactionbar_textview.png
new file mode 100644
index 0000000..85547e3
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_dialog_noactionbar_textview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_dialog_noactionbar_timepicker.png b/tests/tests/holo/res/drawable-hdpi/holo_dialog_noactionbar_timepicker.png
new file mode 100644
index 0000000..427cc55
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_dialog_noactionbar_timepicker.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_dialog_noactionbar_toggle_button.png b/tests/tests/holo/res/drawable-hdpi/holo_dialog_noactionbar_toggle_button.png
new file mode 100644
index 0000000..e101854
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_dialog_noactionbar_toggle_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_dialog_noactionbar_toggle_button_checked.png b/tests/tests/holo/res/drawable-hdpi/holo_dialog_noactionbar_toggle_button_checked.png
new file mode 100644
index 0000000..2daed75
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_dialog_noactionbar_toggle_button_checked.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_land_zoomcontrols.png b/tests/tests/holo/res/drawable-hdpi/holo_dialog_noactionbar_zoomcontrols.png
similarity index 100%
copy from tests/res/drawable-hdpi/holo_land_zoomcontrols.png
copy to tests/tests/holo/res/drawable-hdpi/holo_dialog_noactionbar_zoomcontrols.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_dialog_progressbar.png b/tests/tests/holo/res/drawable-hdpi/holo_dialog_progressbar.png
new file mode 100644
index 0000000..41e958c
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_dialog_progressbar.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_dialog_progressbar_horizontal_0.png b/tests/tests/holo/res/drawable-hdpi/holo_dialog_progressbar_horizontal_0.png
new file mode 100644
index 0000000..7923142
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_dialog_progressbar_horizontal_0.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_dialog_progressbar_horizontal_100.png b/tests/tests/holo/res/drawable-hdpi/holo_dialog_progressbar_horizontal_100.png
new file mode 100644
index 0000000..d94e0ec
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_dialog_progressbar_horizontal_100.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_dialog_progressbar_horizontal_50.png b/tests/tests/holo/res/drawable-hdpi/holo_dialog_progressbar_horizontal_50.png
new file mode 100644
index 0000000..0891a0b
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_dialog_progressbar_horizontal_50.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_dialog_progressbar_large.png b/tests/tests/holo/res/drawable-hdpi/holo_dialog_progressbar_large.png
new file mode 100644
index 0000000..0fd63d2
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_dialog_progressbar_large.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_dialog_progressbar_small.png b/tests/tests/holo/res/drawable-hdpi/holo_dialog_progressbar_small.png
new file mode 100644
index 0000000..1a270f9
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_dialog_progressbar_small.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_dialog_progressdialog_horizontal.png b/tests/tests/holo/res/drawable-hdpi/holo_dialog_progressdialog_horizontal.png
new file mode 100644
index 0000000..168b54f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_dialog_progressdialog_horizontal.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_dialog_radio_button.png b/tests/tests/holo/res/drawable-hdpi/holo_dialog_radio_button.png
new file mode 100644
index 0000000..50c99a6
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_dialog_radio_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_dialog_radio_button_checked.png b/tests/tests/holo/res/drawable-hdpi/holo_dialog_radio_button_checked.png
new file mode 100644
index 0000000..5959f1b
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_dialog_radio_button_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_dialog_radiogroup_horizontal.png b/tests/tests/holo/res/drawable-hdpi/holo_dialog_radiogroup_horizontal.png
new file mode 100644
index 0000000..bfe6918
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_dialog_radiogroup_horizontal.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_dialog_radiogroup_vertical.png b/tests/tests/holo/res/drawable-hdpi/holo_dialog_radiogroup_vertical.png
new file mode 100644
index 0000000..5a74bfb
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_dialog_radiogroup_vertical.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_land_ratingbar_0.png b/tests/tests/holo/res/drawable-hdpi/holo_dialog_ratingbar_0.png
similarity index 100%
copy from tests/res/drawable-hdpi/holo_land_ratingbar_0.png
copy to tests/tests/holo/res/drawable-hdpi/holo_dialog_ratingbar_0.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_land_ratingbar_0_pressed.png b/tests/tests/holo/res/drawable-hdpi/holo_dialog_ratingbar_0_pressed.png
similarity index 100%
copy from tests/res/drawable-hdpi/holo_land_ratingbar_0_pressed.png
copy to tests/tests/holo/res/drawable-hdpi/holo_dialog_ratingbar_0_pressed.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_land_ratingbar_2point5.png b/tests/tests/holo/res/drawable-hdpi/holo_dialog_ratingbar_2point5.png
similarity index 100%
copy from tests/res/drawable-hdpi/holo_land_ratingbar_2point5.png
copy to tests/tests/holo/res/drawable-hdpi/holo_dialog_ratingbar_2point5.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_land_ratingbar_2point5_pressed.png b/tests/tests/holo/res/drawable-hdpi/holo_dialog_ratingbar_2point5_pressed.png
similarity index 100%
copy from tests/res/drawable-hdpi/holo_land_ratingbar_2point5_pressed.png
copy to tests/tests/holo/res/drawable-hdpi/holo_dialog_ratingbar_2point5_pressed.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_land_ratingbar_5.png b/tests/tests/holo/res/drawable-hdpi/holo_dialog_ratingbar_5.png
similarity index 100%
copy from tests/res/drawable-hdpi/holo_land_ratingbar_5.png
copy to tests/tests/holo/res/drawable-hdpi/holo_dialog_ratingbar_5.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_land_ratingbar_5_pressed.png b/tests/tests/holo/res/drawable-hdpi/holo_dialog_ratingbar_5_pressed.png
similarity index 100%
copy from tests/res/drawable-hdpi/holo_land_ratingbar_5_pressed.png
copy to tests/tests/holo/res/drawable-hdpi/holo_dialog_ratingbar_5_pressed.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_dialog_searchview.png b/tests/tests/holo/res/drawable-hdpi/holo_dialog_searchview.png
new file mode 100644
index 0000000..2316e8a
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_dialog_searchview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_dialog_searchview_query.png b/tests/tests/holo/res/drawable-hdpi/holo_dialog_searchview_query.png
new file mode 100644
index 0000000..1eb04da
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_dialog_searchview_query.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_dialog_searchview_query_hint.png b/tests/tests/holo/res/drawable-hdpi/holo_dialog_searchview_query_hint.png
new file mode 100644
index 0000000..bdf014a
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_dialog_searchview_query_hint.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_dialog_seekbar_0.png b/tests/tests/holo/res/drawable-hdpi/holo_dialog_seekbar_0.png
new file mode 100644
index 0000000..b194d4e
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_dialog_seekbar_0.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_dialog_seekbar_100.png b/tests/tests/holo/res/drawable-hdpi/holo_dialog_seekbar_100.png
new file mode 100644
index 0000000..b89ea7d
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_dialog_seekbar_100.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_dialog_seekbar_50.png b/tests/tests/holo/res/drawable-hdpi/holo_dialog_seekbar_50.png
new file mode 100644
index 0000000..3100469
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_dialog_seekbar_50.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_dialog_spinner.png b/tests/tests/holo/res/drawable-hdpi/holo_dialog_spinner.png
new file mode 100644
index 0000000..9aaac14
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_dialog_spinner.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_dialog_switch.png b/tests/tests/holo/res/drawable-hdpi/holo_dialog_switch.png
new file mode 100644
index 0000000..38fe4e7
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_dialog_switch.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_dialog_switch_checked.png b/tests/tests/holo/res/drawable-hdpi/holo_dialog_switch_checked.png
new file mode 100644
index 0000000..d85ceaa
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_dialog_switch_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_dialog_tabhost.png b/tests/tests/holo/res/drawable-hdpi/holo_dialog_tabhost.png
new file mode 100644
index 0000000..27698b0
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_dialog_tabhost.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_dialog_textview.png b/tests/tests/holo/res/drawable-hdpi/holo_dialog_textview.png
new file mode 100644
index 0000000..85547e3
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_dialog_textview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_dialog_timepicker.png b/tests/tests/holo/res/drawable-hdpi/holo_dialog_timepicker.png
new file mode 100644
index 0000000..427cc55
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_dialog_timepicker.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_dialog_toggle_button.png b/tests/tests/holo/res/drawable-hdpi/holo_dialog_toggle_button.png
new file mode 100644
index 0000000..e101854
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_dialog_toggle_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_dialog_toggle_button_checked.png b/tests/tests/holo/res/drawable-hdpi/holo_dialog_toggle_button_checked.png
new file mode 100644
index 0000000..2daed75
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_dialog_toggle_button_checked.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_land_zoomcontrols.png b/tests/tests/holo/res/drawable-hdpi/holo_dialog_zoomcontrols.png
similarity index 100%
copy from tests/res/drawable-hdpi/holo_land_zoomcontrols.png
copy to tests/tests/holo/res/drawable-hdpi/holo_dialog_zoomcontrols.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_dialogwhenlarge_alertdialog_list.png b/tests/tests/holo/res/drawable-hdpi/holo_dialogwhenlarge_alertdialog_list.png
new file mode 100644
index 0000000..aa074c1
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_dialogwhenlarge_alertdialog_list.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_dialogwhenlarge_alertdialog_multichoice.png b/tests/tests/holo/res/drawable-hdpi/holo_dialogwhenlarge_alertdialog_multichoice.png
new file mode 100644
index 0000000..205b855
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_dialogwhenlarge_alertdialog_multichoice.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_dialogwhenlarge_alertdialog_onebutton.png b/tests/tests/holo/res/drawable-hdpi/holo_dialogwhenlarge_alertdialog_onebutton.png
new file mode 100644
index 0000000..356c230
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_dialogwhenlarge_alertdialog_onebutton.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_dialogwhenlarge_alertdialog_singlechoice.png b/tests/tests/holo/res/drawable-hdpi/holo_dialogwhenlarge_alertdialog_singlechoice.png
new file mode 100644
index 0000000..4d0d20c
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_dialogwhenlarge_alertdialog_singlechoice.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_dialogwhenlarge_alertdialog_threebuttons.png b/tests/tests/holo/res/drawable-hdpi/holo_dialogwhenlarge_alertdialog_threebuttons.png
new file mode 100644
index 0000000..33d0641
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_dialogwhenlarge_alertdialog_threebuttons.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_dialogwhenlarge_alertdialog_twobuttons.png b/tests/tests/holo/res/drawable-hdpi/holo_dialogwhenlarge_alertdialog_twobuttons.png
new file mode 100644
index 0000000..5969402
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_dialogwhenlarge_alertdialog_twobuttons.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_dialogwhenlarge_button.png b/tests/tests/holo/res/drawable-hdpi/holo_dialogwhenlarge_button.png
new file mode 100644
index 0000000..1c65266
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_dialogwhenlarge_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_dialogwhenlarge_button_pressed.png b/tests/tests/holo/res/drawable-hdpi/holo_dialogwhenlarge_button_pressed.png
new file mode 100644
index 0000000..797dccc
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_dialogwhenlarge_button_pressed.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_dialogwhenlarge_calendar_view.png b/tests/tests/holo/res/drawable-hdpi/holo_dialogwhenlarge_calendar_view.png
new file mode 100644
index 0000000..bf1aaa5
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_dialogwhenlarge_calendar_view.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_dialogwhenlarge_calendar_view_feb.png b/tests/tests/holo/res/drawable-hdpi/holo_dialogwhenlarge_calendar_view_feb.png
new file mode 100644
index 0000000..1421fbc
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_dialogwhenlarge_calendar_view_feb.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_dialogwhenlarge_checkbox.png b/tests/tests/holo/res/drawable-hdpi/holo_dialogwhenlarge_checkbox.png
new file mode 100644
index 0000000..97e83b6
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_dialogwhenlarge_checkbox.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_dialogwhenlarge_checkbox_checked.png b/tests/tests/holo/res/drawable-hdpi/holo_dialogwhenlarge_checkbox_checked.png
new file mode 100644
index 0000000..88934c2
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_dialogwhenlarge_checkbox_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_dialogwhenlarge_chronometer.png b/tests/tests/holo/res/drawable-hdpi/holo_dialogwhenlarge_chronometer.png
new file mode 100644
index 0000000..65af9b3
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_dialogwhenlarge_chronometer.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_dialogwhenlarge_color_blue_bright.png b/tests/tests/holo/res/drawable-hdpi/holo_dialogwhenlarge_color_blue_bright.png
new file mode 100644
index 0000000..2d1e63f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_dialogwhenlarge_color_blue_bright.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_dialogwhenlarge_color_blue_dark.png b/tests/tests/holo/res/drawable-hdpi/holo_dialogwhenlarge_color_blue_dark.png
new file mode 100644
index 0000000..914e522
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_dialogwhenlarge_color_blue_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_dialogwhenlarge_color_blue_light.png b/tests/tests/holo/res/drawable-hdpi/holo_dialogwhenlarge_color_blue_light.png
new file mode 100644
index 0000000..a6f2f65
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_dialogwhenlarge_color_blue_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_dialogwhenlarge_color_green_dark.png b/tests/tests/holo/res/drawable-hdpi/holo_dialogwhenlarge_color_green_dark.png
new file mode 100644
index 0000000..2cf79d0
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_dialogwhenlarge_color_green_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_dialogwhenlarge_color_green_light.png b/tests/tests/holo/res/drawable-hdpi/holo_dialogwhenlarge_color_green_light.png
new file mode 100644
index 0000000..508a96e
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_dialogwhenlarge_color_green_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_dialogwhenlarge_color_orange_dark.png b/tests/tests/holo/res/drawable-hdpi/holo_dialogwhenlarge_color_orange_dark.png
new file mode 100644
index 0000000..4a0157f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_dialogwhenlarge_color_orange_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_dialogwhenlarge_color_orange_light.png b/tests/tests/holo/res/drawable-hdpi/holo_dialogwhenlarge_color_orange_light.png
new file mode 100644
index 0000000..0bdb9be
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_dialogwhenlarge_color_orange_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_dialogwhenlarge_color_purple.png b/tests/tests/holo/res/drawable-hdpi/holo_dialogwhenlarge_color_purple.png
new file mode 100644
index 0000000..97071db
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_dialogwhenlarge_color_purple.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_dialogwhenlarge_color_red_dark.png b/tests/tests/holo/res/drawable-hdpi/holo_dialogwhenlarge_color_red_dark.png
new file mode 100644
index 0000000..dbcef9d
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_dialogwhenlarge_color_red_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_dialogwhenlarge_color_red_light.png b/tests/tests/holo/res/drawable-hdpi/holo_dialogwhenlarge_color_red_light.png
new file mode 100644
index 0000000..c60546f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_dialogwhenlarge_color_red_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_dialogwhenlarge_edittext.png b/tests/tests/holo/res/drawable-hdpi/holo_dialogwhenlarge_edittext.png
new file mode 100644
index 0000000..369d7b4
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_dialogwhenlarge_edittext.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_dialogwhenlarge_noactionbar_alertdialog_list.png b/tests/tests/holo/res/drawable-hdpi/holo_dialogwhenlarge_noactionbar_alertdialog_list.png
new file mode 100644
index 0000000..aa074c1
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_dialogwhenlarge_noactionbar_alertdialog_list.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_dialogwhenlarge_noactionbar_alertdialog_multichoice.png b/tests/tests/holo/res/drawable-hdpi/holo_dialogwhenlarge_noactionbar_alertdialog_multichoice.png
new file mode 100644
index 0000000..205b855
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_dialogwhenlarge_noactionbar_alertdialog_multichoice.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_dialogwhenlarge_noactionbar_alertdialog_onebutton.png b/tests/tests/holo/res/drawable-hdpi/holo_dialogwhenlarge_noactionbar_alertdialog_onebutton.png
new file mode 100644
index 0000000..356c230
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_dialogwhenlarge_noactionbar_alertdialog_onebutton.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_dialogwhenlarge_noactionbar_alertdialog_singlechoice.png b/tests/tests/holo/res/drawable-hdpi/holo_dialogwhenlarge_noactionbar_alertdialog_singlechoice.png
new file mode 100644
index 0000000..4d0d20c
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_dialogwhenlarge_noactionbar_alertdialog_singlechoice.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_dialogwhenlarge_noactionbar_alertdialog_threebuttons.png b/tests/tests/holo/res/drawable-hdpi/holo_dialogwhenlarge_noactionbar_alertdialog_threebuttons.png
new file mode 100644
index 0000000..33d0641
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_dialogwhenlarge_noactionbar_alertdialog_threebuttons.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_dialogwhenlarge_noactionbar_alertdialog_twobuttons.png b/tests/tests/holo/res/drawable-hdpi/holo_dialogwhenlarge_noactionbar_alertdialog_twobuttons.png
new file mode 100644
index 0000000..5969402
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_dialogwhenlarge_noactionbar_alertdialog_twobuttons.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_dialogwhenlarge_noactionbar_button.png b/tests/tests/holo/res/drawable-hdpi/holo_dialogwhenlarge_noactionbar_button.png
new file mode 100644
index 0000000..1c65266
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_dialogwhenlarge_noactionbar_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_dialogwhenlarge_noactionbar_button_pressed.png b/tests/tests/holo/res/drawable-hdpi/holo_dialogwhenlarge_noactionbar_button_pressed.png
new file mode 100644
index 0000000..797dccc
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_dialogwhenlarge_noactionbar_button_pressed.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_dialogwhenlarge_noactionbar_calendar_view.png b/tests/tests/holo/res/drawable-hdpi/holo_dialogwhenlarge_noactionbar_calendar_view.png
new file mode 100644
index 0000000..bf1aaa5
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_dialogwhenlarge_noactionbar_calendar_view.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_dialogwhenlarge_noactionbar_calendar_view_feb.png b/tests/tests/holo/res/drawable-hdpi/holo_dialogwhenlarge_noactionbar_calendar_view_feb.png
new file mode 100644
index 0000000..1421fbc
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_dialogwhenlarge_noactionbar_calendar_view_feb.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_dialogwhenlarge_noactionbar_checkbox.png b/tests/tests/holo/res/drawable-hdpi/holo_dialogwhenlarge_noactionbar_checkbox.png
new file mode 100644
index 0000000..97e83b6
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_dialogwhenlarge_noactionbar_checkbox.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_dialogwhenlarge_noactionbar_checkbox_checked.png b/tests/tests/holo/res/drawable-hdpi/holo_dialogwhenlarge_noactionbar_checkbox_checked.png
new file mode 100644
index 0000000..88934c2
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_dialogwhenlarge_noactionbar_checkbox_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_dialogwhenlarge_noactionbar_chronometer.png b/tests/tests/holo/res/drawable-hdpi/holo_dialogwhenlarge_noactionbar_chronometer.png
new file mode 100644
index 0000000..65af9b3
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_dialogwhenlarge_noactionbar_chronometer.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_dialogwhenlarge_noactionbar_color_blue_bright.png b/tests/tests/holo/res/drawable-hdpi/holo_dialogwhenlarge_noactionbar_color_blue_bright.png
new file mode 100644
index 0000000..2d1e63f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_dialogwhenlarge_noactionbar_color_blue_bright.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_dialogwhenlarge_noactionbar_color_blue_dark.png b/tests/tests/holo/res/drawable-hdpi/holo_dialogwhenlarge_noactionbar_color_blue_dark.png
new file mode 100644
index 0000000..914e522
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_dialogwhenlarge_noactionbar_color_blue_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_dialogwhenlarge_noactionbar_color_blue_light.png b/tests/tests/holo/res/drawable-hdpi/holo_dialogwhenlarge_noactionbar_color_blue_light.png
new file mode 100644
index 0000000..a6f2f65
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_dialogwhenlarge_noactionbar_color_blue_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_dialogwhenlarge_noactionbar_color_green_dark.png b/tests/tests/holo/res/drawable-hdpi/holo_dialogwhenlarge_noactionbar_color_green_dark.png
new file mode 100644
index 0000000..2cf79d0
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_dialogwhenlarge_noactionbar_color_green_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_dialogwhenlarge_noactionbar_color_green_light.png b/tests/tests/holo/res/drawable-hdpi/holo_dialogwhenlarge_noactionbar_color_green_light.png
new file mode 100644
index 0000000..508a96e
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_dialogwhenlarge_noactionbar_color_green_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_dialogwhenlarge_noactionbar_color_orange_dark.png b/tests/tests/holo/res/drawable-hdpi/holo_dialogwhenlarge_noactionbar_color_orange_dark.png
new file mode 100644
index 0000000..4a0157f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_dialogwhenlarge_noactionbar_color_orange_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_dialogwhenlarge_noactionbar_color_orange_light.png b/tests/tests/holo/res/drawable-hdpi/holo_dialogwhenlarge_noactionbar_color_orange_light.png
new file mode 100644
index 0000000..0bdb9be
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_dialogwhenlarge_noactionbar_color_orange_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_dialogwhenlarge_noactionbar_color_purple.png b/tests/tests/holo/res/drawable-hdpi/holo_dialogwhenlarge_noactionbar_color_purple.png
new file mode 100644
index 0000000..97071db
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_dialogwhenlarge_noactionbar_color_purple.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_dialogwhenlarge_noactionbar_color_red_dark.png b/tests/tests/holo/res/drawable-hdpi/holo_dialogwhenlarge_noactionbar_color_red_dark.png
new file mode 100644
index 0000000..dbcef9d
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_dialogwhenlarge_noactionbar_color_red_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_dialogwhenlarge_noactionbar_color_red_light.png b/tests/tests/holo/res/drawable-hdpi/holo_dialogwhenlarge_noactionbar_color_red_light.png
new file mode 100644
index 0000000..c60546f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_dialogwhenlarge_noactionbar_color_red_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_dialogwhenlarge_noactionbar_edittext.png b/tests/tests/holo/res/drawable-hdpi/holo_dialogwhenlarge_noactionbar_edittext.png
new file mode 100644
index 0000000..369d7b4
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_dialogwhenlarge_noactionbar_edittext.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_dialogwhenlarge_noactionbar_progressbar.png b/tests/tests/holo/res/drawable-hdpi/holo_dialogwhenlarge_noactionbar_progressbar.png
new file mode 100644
index 0000000..41e958c
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_dialogwhenlarge_noactionbar_progressbar.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_dialogwhenlarge_noactionbar_progressbar_horizontal_0.png b/tests/tests/holo/res/drawable-hdpi/holo_dialogwhenlarge_noactionbar_progressbar_horizontal_0.png
new file mode 100644
index 0000000..7923142
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_dialogwhenlarge_noactionbar_progressbar_horizontal_0.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_dialogwhenlarge_noactionbar_progressbar_horizontal_100.png b/tests/tests/holo/res/drawable-hdpi/holo_dialogwhenlarge_noactionbar_progressbar_horizontal_100.png
new file mode 100644
index 0000000..d94e0ec
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_dialogwhenlarge_noactionbar_progressbar_horizontal_100.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_dialogwhenlarge_noactionbar_progressbar_horizontal_50.png b/tests/tests/holo/res/drawable-hdpi/holo_dialogwhenlarge_noactionbar_progressbar_horizontal_50.png
new file mode 100644
index 0000000..0891a0b
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_dialogwhenlarge_noactionbar_progressbar_horizontal_50.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_dialogwhenlarge_noactionbar_progressbar_large.png b/tests/tests/holo/res/drawable-hdpi/holo_dialogwhenlarge_noactionbar_progressbar_large.png
new file mode 100644
index 0000000..0fd63d2
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_dialogwhenlarge_noactionbar_progressbar_large.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_dialogwhenlarge_noactionbar_progressbar_small.png b/tests/tests/holo/res/drawable-hdpi/holo_dialogwhenlarge_noactionbar_progressbar_small.png
new file mode 100644
index 0000000..1a270f9
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_dialogwhenlarge_noactionbar_progressbar_small.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_dialogwhenlarge_noactionbar_progressdialog_horizontal.png b/tests/tests/holo/res/drawable-hdpi/holo_dialogwhenlarge_noactionbar_progressdialog_horizontal.png
new file mode 100644
index 0000000..168b54f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_dialogwhenlarge_noactionbar_progressdialog_horizontal.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_dialogwhenlarge_noactionbar_radio_button.png b/tests/tests/holo/res/drawable-hdpi/holo_dialogwhenlarge_noactionbar_radio_button.png
new file mode 100644
index 0000000..50c99a6
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_dialogwhenlarge_noactionbar_radio_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_dialogwhenlarge_noactionbar_radio_button_checked.png b/tests/tests/holo/res/drawable-hdpi/holo_dialogwhenlarge_noactionbar_radio_button_checked.png
new file mode 100644
index 0000000..5959f1b
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_dialogwhenlarge_noactionbar_radio_button_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_dialogwhenlarge_noactionbar_radiogroup_horizontal.png b/tests/tests/holo/res/drawable-hdpi/holo_dialogwhenlarge_noactionbar_radiogroup_horizontal.png
new file mode 100644
index 0000000..bfe6918
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_dialogwhenlarge_noactionbar_radiogroup_horizontal.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_dialogwhenlarge_noactionbar_radiogroup_vertical.png b/tests/tests/holo/res/drawable-hdpi/holo_dialogwhenlarge_noactionbar_radiogroup_vertical.png
new file mode 100644
index 0000000..5a74bfb
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_dialogwhenlarge_noactionbar_radiogroup_vertical.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_land_ratingbar_0.png b/tests/tests/holo/res/drawable-hdpi/holo_dialogwhenlarge_noactionbar_ratingbar_0.png
similarity index 100%
copy from tests/res/drawable-hdpi/holo_land_ratingbar_0.png
copy to tests/tests/holo/res/drawable-hdpi/holo_dialogwhenlarge_noactionbar_ratingbar_0.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_land_ratingbar_0_pressed.png b/tests/tests/holo/res/drawable-hdpi/holo_dialogwhenlarge_noactionbar_ratingbar_0_pressed.png
similarity index 100%
copy from tests/res/drawable-hdpi/holo_land_ratingbar_0_pressed.png
copy to tests/tests/holo/res/drawable-hdpi/holo_dialogwhenlarge_noactionbar_ratingbar_0_pressed.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_land_ratingbar_2point5.png b/tests/tests/holo/res/drawable-hdpi/holo_dialogwhenlarge_noactionbar_ratingbar_2point5.png
similarity index 100%
copy from tests/res/drawable-hdpi/holo_land_ratingbar_2point5.png
copy to tests/tests/holo/res/drawable-hdpi/holo_dialogwhenlarge_noactionbar_ratingbar_2point5.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_land_ratingbar_2point5_pressed.png b/tests/tests/holo/res/drawable-hdpi/holo_dialogwhenlarge_noactionbar_ratingbar_2point5_pressed.png
similarity index 100%
copy from tests/res/drawable-hdpi/holo_land_ratingbar_2point5_pressed.png
copy to tests/tests/holo/res/drawable-hdpi/holo_dialogwhenlarge_noactionbar_ratingbar_2point5_pressed.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_land_ratingbar_5.png b/tests/tests/holo/res/drawable-hdpi/holo_dialogwhenlarge_noactionbar_ratingbar_5.png
similarity index 100%
copy from tests/res/drawable-hdpi/holo_land_ratingbar_5.png
copy to tests/tests/holo/res/drawable-hdpi/holo_dialogwhenlarge_noactionbar_ratingbar_5.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_land_ratingbar_5_pressed.png b/tests/tests/holo/res/drawable-hdpi/holo_dialogwhenlarge_noactionbar_ratingbar_5_pressed.png
similarity index 100%
copy from tests/res/drawable-hdpi/holo_land_ratingbar_5_pressed.png
copy to tests/tests/holo/res/drawable-hdpi/holo_dialogwhenlarge_noactionbar_ratingbar_5_pressed.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_dialogwhenlarge_noactionbar_searchview.png b/tests/tests/holo/res/drawable-hdpi/holo_dialogwhenlarge_noactionbar_searchview.png
new file mode 100644
index 0000000..2316e8a
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_dialogwhenlarge_noactionbar_searchview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_dialogwhenlarge_noactionbar_searchview_query.png b/tests/tests/holo/res/drawable-hdpi/holo_dialogwhenlarge_noactionbar_searchview_query.png
new file mode 100644
index 0000000..1eb04da
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_dialogwhenlarge_noactionbar_searchview_query.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_dialogwhenlarge_noactionbar_searchview_query_hint.png b/tests/tests/holo/res/drawable-hdpi/holo_dialogwhenlarge_noactionbar_searchview_query_hint.png
new file mode 100644
index 0000000..bdf014a
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_dialogwhenlarge_noactionbar_searchview_query_hint.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_dialogwhenlarge_noactionbar_seekbar_0.png b/tests/tests/holo/res/drawable-hdpi/holo_dialogwhenlarge_noactionbar_seekbar_0.png
new file mode 100644
index 0000000..b194d4e
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_dialogwhenlarge_noactionbar_seekbar_0.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_dialogwhenlarge_noactionbar_seekbar_100.png b/tests/tests/holo/res/drawable-hdpi/holo_dialogwhenlarge_noactionbar_seekbar_100.png
new file mode 100644
index 0000000..b89ea7d
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_dialogwhenlarge_noactionbar_seekbar_100.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_dialogwhenlarge_noactionbar_seekbar_50.png b/tests/tests/holo/res/drawable-hdpi/holo_dialogwhenlarge_noactionbar_seekbar_50.png
new file mode 100644
index 0000000..3100469
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_dialogwhenlarge_noactionbar_seekbar_50.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_dialogwhenlarge_noactionbar_spinner.png b/tests/tests/holo/res/drawable-hdpi/holo_dialogwhenlarge_noactionbar_spinner.png
new file mode 100644
index 0000000..9aaac14
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_dialogwhenlarge_noactionbar_spinner.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_dialogwhenlarge_noactionbar_switch.png b/tests/tests/holo/res/drawable-hdpi/holo_dialogwhenlarge_noactionbar_switch.png
new file mode 100644
index 0000000..38fe4e7
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_dialogwhenlarge_noactionbar_switch.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_dialogwhenlarge_noactionbar_switch_checked.png b/tests/tests/holo/res/drawable-hdpi/holo_dialogwhenlarge_noactionbar_switch_checked.png
new file mode 100644
index 0000000..d85ceaa
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_dialogwhenlarge_noactionbar_switch_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_dialogwhenlarge_noactionbar_tabhost.png b/tests/tests/holo/res/drawable-hdpi/holo_dialogwhenlarge_noactionbar_tabhost.png
new file mode 100644
index 0000000..27698b0
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_dialogwhenlarge_noactionbar_tabhost.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_dialogwhenlarge_noactionbar_textview.png b/tests/tests/holo/res/drawable-hdpi/holo_dialogwhenlarge_noactionbar_textview.png
new file mode 100644
index 0000000..85547e3
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_dialogwhenlarge_noactionbar_textview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_dialogwhenlarge_noactionbar_timepicker.png b/tests/tests/holo/res/drawable-hdpi/holo_dialogwhenlarge_noactionbar_timepicker.png
new file mode 100644
index 0000000..427cc55
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_dialogwhenlarge_noactionbar_timepicker.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_dialogwhenlarge_noactionbar_toggle_button.png b/tests/tests/holo/res/drawable-hdpi/holo_dialogwhenlarge_noactionbar_toggle_button.png
new file mode 100644
index 0000000..e101854
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_dialogwhenlarge_noactionbar_toggle_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_dialogwhenlarge_noactionbar_toggle_button_checked.png b/tests/tests/holo/res/drawable-hdpi/holo_dialogwhenlarge_noactionbar_toggle_button_checked.png
new file mode 100644
index 0000000..2daed75
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_dialogwhenlarge_noactionbar_toggle_button_checked.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_land_zoomcontrols.png b/tests/tests/holo/res/drawable-hdpi/holo_dialogwhenlarge_noactionbar_zoomcontrols.png
similarity index 100%
copy from tests/res/drawable-hdpi/holo_land_zoomcontrols.png
copy to tests/tests/holo/res/drawable-hdpi/holo_dialogwhenlarge_noactionbar_zoomcontrols.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_dialogwhenlarge_progressbar.png b/tests/tests/holo/res/drawable-hdpi/holo_dialogwhenlarge_progressbar.png
new file mode 100644
index 0000000..41e958c
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_dialogwhenlarge_progressbar.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_dialogwhenlarge_progressbar_horizontal_0.png b/tests/tests/holo/res/drawable-hdpi/holo_dialogwhenlarge_progressbar_horizontal_0.png
new file mode 100644
index 0000000..7923142
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_dialogwhenlarge_progressbar_horizontal_0.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_dialogwhenlarge_progressbar_horizontal_100.png b/tests/tests/holo/res/drawable-hdpi/holo_dialogwhenlarge_progressbar_horizontal_100.png
new file mode 100644
index 0000000..d94e0ec
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_dialogwhenlarge_progressbar_horizontal_100.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_dialogwhenlarge_progressbar_horizontal_50.png b/tests/tests/holo/res/drawable-hdpi/holo_dialogwhenlarge_progressbar_horizontal_50.png
new file mode 100644
index 0000000..0891a0b
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_dialogwhenlarge_progressbar_horizontal_50.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_dialogwhenlarge_progressbar_large.png b/tests/tests/holo/res/drawable-hdpi/holo_dialogwhenlarge_progressbar_large.png
new file mode 100644
index 0000000..0fd63d2
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_dialogwhenlarge_progressbar_large.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_dialogwhenlarge_progressbar_small.png b/tests/tests/holo/res/drawable-hdpi/holo_dialogwhenlarge_progressbar_small.png
new file mode 100644
index 0000000..1a270f9
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_dialogwhenlarge_progressbar_small.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_dialogwhenlarge_progressdialog_horizontal.png b/tests/tests/holo/res/drawable-hdpi/holo_dialogwhenlarge_progressdialog_horizontal.png
new file mode 100644
index 0000000..168b54f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_dialogwhenlarge_progressdialog_horizontal.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_dialogwhenlarge_radio_button.png b/tests/tests/holo/res/drawable-hdpi/holo_dialogwhenlarge_radio_button.png
new file mode 100644
index 0000000..50c99a6
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_dialogwhenlarge_radio_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_dialogwhenlarge_radio_button_checked.png b/tests/tests/holo/res/drawable-hdpi/holo_dialogwhenlarge_radio_button_checked.png
new file mode 100644
index 0000000..5959f1b
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_dialogwhenlarge_radio_button_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_dialogwhenlarge_radiogroup_horizontal.png b/tests/tests/holo/res/drawable-hdpi/holo_dialogwhenlarge_radiogroup_horizontal.png
new file mode 100644
index 0000000..bfe6918
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_dialogwhenlarge_radiogroup_horizontal.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_dialogwhenlarge_radiogroup_vertical.png b/tests/tests/holo/res/drawable-hdpi/holo_dialogwhenlarge_radiogroup_vertical.png
new file mode 100644
index 0000000..5a74bfb
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_dialogwhenlarge_radiogroup_vertical.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_land_ratingbar_0.png b/tests/tests/holo/res/drawable-hdpi/holo_dialogwhenlarge_ratingbar_0.png
similarity index 100%
copy from tests/res/drawable-hdpi/holo_land_ratingbar_0.png
copy to tests/tests/holo/res/drawable-hdpi/holo_dialogwhenlarge_ratingbar_0.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_land_ratingbar_0_pressed.png b/tests/tests/holo/res/drawable-hdpi/holo_dialogwhenlarge_ratingbar_0_pressed.png
similarity index 100%
copy from tests/res/drawable-hdpi/holo_land_ratingbar_0_pressed.png
copy to tests/tests/holo/res/drawable-hdpi/holo_dialogwhenlarge_ratingbar_0_pressed.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_land_ratingbar_2point5.png b/tests/tests/holo/res/drawable-hdpi/holo_dialogwhenlarge_ratingbar_2point5.png
similarity index 100%
copy from tests/res/drawable-hdpi/holo_land_ratingbar_2point5.png
copy to tests/tests/holo/res/drawable-hdpi/holo_dialogwhenlarge_ratingbar_2point5.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_land_ratingbar_2point5_pressed.png b/tests/tests/holo/res/drawable-hdpi/holo_dialogwhenlarge_ratingbar_2point5_pressed.png
similarity index 100%
copy from tests/res/drawable-hdpi/holo_land_ratingbar_2point5_pressed.png
copy to tests/tests/holo/res/drawable-hdpi/holo_dialogwhenlarge_ratingbar_2point5_pressed.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_land_ratingbar_5.png b/tests/tests/holo/res/drawable-hdpi/holo_dialogwhenlarge_ratingbar_5.png
similarity index 100%
copy from tests/res/drawable-hdpi/holo_land_ratingbar_5.png
copy to tests/tests/holo/res/drawable-hdpi/holo_dialogwhenlarge_ratingbar_5.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_land_ratingbar_5_pressed.png b/tests/tests/holo/res/drawable-hdpi/holo_dialogwhenlarge_ratingbar_5_pressed.png
similarity index 100%
copy from tests/res/drawable-hdpi/holo_land_ratingbar_5_pressed.png
copy to tests/tests/holo/res/drawable-hdpi/holo_dialogwhenlarge_ratingbar_5_pressed.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_dialogwhenlarge_searchview.png b/tests/tests/holo/res/drawable-hdpi/holo_dialogwhenlarge_searchview.png
new file mode 100644
index 0000000..2316e8a
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_dialogwhenlarge_searchview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_dialogwhenlarge_searchview_query.png b/tests/tests/holo/res/drawable-hdpi/holo_dialogwhenlarge_searchview_query.png
new file mode 100644
index 0000000..1eb04da
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_dialogwhenlarge_searchview_query.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_dialogwhenlarge_searchview_query_hint.png b/tests/tests/holo/res/drawable-hdpi/holo_dialogwhenlarge_searchview_query_hint.png
new file mode 100644
index 0000000..bdf014a
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_dialogwhenlarge_searchview_query_hint.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_dialogwhenlarge_seekbar_0.png b/tests/tests/holo/res/drawable-hdpi/holo_dialogwhenlarge_seekbar_0.png
new file mode 100644
index 0000000..b194d4e
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_dialogwhenlarge_seekbar_0.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_dialogwhenlarge_seekbar_100.png b/tests/tests/holo/res/drawable-hdpi/holo_dialogwhenlarge_seekbar_100.png
new file mode 100644
index 0000000..b89ea7d
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_dialogwhenlarge_seekbar_100.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_dialogwhenlarge_seekbar_50.png b/tests/tests/holo/res/drawable-hdpi/holo_dialogwhenlarge_seekbar_50.png
new file mode 100644
index 0000000..3100469
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_dialogwhenlarge_seekbar_50.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_dialogwhenlarge_spinner.png b/tests/tests/holo/res/drawable-hdpi/holo_dialogwhenlarge_spinner.png
new file mode 100644
index 0000000..9aaac14
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_dialogwhenlarge_spinner.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_dialogwhenlarge_switch.png b/tests/tests/holo/res/drawable-hdpi/holo_dialogwhenlarge_switch.png
new file mode 100644
index 0000000..38fe4e7
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_dialogwhenlarge_switch.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_dialogwhenlarge_switch_checked.png b/tests/tests/holo/res/drawable-hdpi/holo_dialogwhenlarge_switch_checked.png
new file mode 100644
index 0000000..d85ceaa
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_dialogwhenlarge_switch_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_dialogwhenlarge_tabhost.png b/tests/tests/holo/res/drawable-hdpi/holo_dialogwhenlarge_tabhost.png
new file mode 100644
index 0000000..27698b0
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_dialogwhenlarge_tabhost.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_dialogwhenlarge_textview.png b/tests/tests/holo/res/drawable-hdpi/holo_dialogwhenlarge_textview.png
new file mode 100644
index 0000000..85547e3
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_dialogwhenlarge_textview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_dialogwhenlarge_timepicker.png b/tests/tests/holo/res/drawable-hdpi/holo_dialogwhenlarge_timepicker.png
new file mode 100644
index 0000000..427cc55
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_dialogwhenlarge_timepicker.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_dialogwhenlarge_toggle_button.png b/tests/tests/holo/res/drawable-hdpi/holo_dialogwhenlarge_toggle_button.png
new file mode 100644
index 0000000..e101854
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_dialogwhenlarge_toggle_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_dialogwhenlarge_toggle_button_checked.png b/tests/tests/holo/res/drawable-hdpi/holo_dialogwhenlarge_toggle_button_checked.png
new file mode 100644
index 0000000..2daed75
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_dialogwhenlarge_toggle_button_checked.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_land_zoomcontrols.png b/tests/tests/holo/res/drawable-hdpi/holo_dialogwhenlarge_zoomcontrols.png
similarity index 100%
copy from tests/res/drawable-hdpi/holo_land_zoomcontrols.png
copy to tests/tests/holo/res/drawable-hdpi/holo_dialogwhenlarge_zoomcontrols.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_edittext.png b/tests/tests/holo/res/drawable-hdpi/holo_edittext.png
new file mode 100644
index 0000000..369d7b4
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_edittext.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_inputmethod_alertdialog_list.png b/tests/tests/holo/res/drawable-hdpi/holo_inputmethod_alertdialog_list.png
new file mode 100644
index 0000000..19843c2
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_inputmethod_alertdialog_list.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_inputmethod_alertdialog_multichoice.png b/tests/tests/holo/res/drawable-hdpi/holo_inputmethod_alertdialog_multichoice.png
new file mode 100644
index 0000000..45a8da0
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_inputmethod_alertdialog_multichoice.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_inputmethod_alertdialog_onebutton.png b/tests/tests/holo/res/drawable-hdpi/holo_inputmethod_alertdialog_onebutton.png
new file mode 100644
index 0000000..7382c6c
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_inputmethod_alertdialog_onebutton.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_inputmethod_alertdialog_singlechoice.png b/tests/tests/holo/res/drawable-hdpi/holo_inputmethod_alertdialog_singlechoice.png
new file mode 100644
index 0000000..c1e7f2b
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_inputmethod_alertdialog_singlechoice.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_inputmethod_alertdialog_threebuttons.png b/tests/tests/holo/res/drawable-hdpi/holo_inputmethod_alertdialog_threebuttons.png
new file mode 100644
index 0000000..2c65d33
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_inputmethod_alertdialog_threebuttons.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_inputmethod_alertdialog_twobuttons.png b/tests/tests/holo/res/drawable-hdpi/holo_inputmethod_alertdialog_twobuttons.png
new file mode 100644
index 0000000..d8c1bc4
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_inputmethod_alertdialog_twobuttons.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_inputmethod_button.png b/tests/tests/holo/res/drawable-hdpi/holo_inputmethod_button.png
new file mode 100644
index 0000000..8c096ca
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_inputmethod_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_inputmethod_button_pressed.png b/tests/tests/holo/res/drawable-hdpi/holo_inputmethod_button_pressed.png
new file mode 100644
index 0000000..5c4d96c
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_inputmethod_button_pressed.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_inputmethod_calendar_view.png b/tests/tests/holo/res/drawable-hdpi/holo_inputmethod_calendar_view.png
new file mode 100644
index 0000000..99d23a7
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_inputmethod_calendar_view.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_inputmethod_calendar_view_feb.png b/tests/tests/holo/res/drawable-hdpi/holo_inputmethod_calendar_view_feb.png
new file mode 100644
index 0000000..2c0619b
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_inputmethod_calendar_view_feb.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_inputmethod_checkbox.png b/tests/tests/holo/res/drawable-hdpi/holo_inputmethod_checkbox.png
new file mode 100644
index 0000000..6fd2ba2
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_inputmethod_checkbox.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_inputmethod_checkbox_checked.png b/tests/tests/holo/res/drawable-hdpi/holo_inputmethod_checkbox_checked.png
new file mode 100644
index 0000000..f52884c
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_inputmethod_checkbox_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_inputmethod_chronometer.png b/tests/tests/holo/res/drawable-hdpi/holo_inputmethod_chronometer.png
new file mode 100644
index 0000000..5ede793
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_inputmethod_chronometer.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_inputmethod_color_blue_bright.png b/tests/tests/holo/res/drawable-hdpi/holo_inputmethod_color_blue_bright.png
new file mode 100644
index 0000000..2d1e63f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_inputmethod_color_blue_bright.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_inputmethod_color_blue_dark.png b/tests/tests/holo/res/drawable-hdpi/holo_inputmethod_color_blue_dark.png
new file mode 100644
index 0000000..914e522
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_inputmethod_color_blue_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_inputmethod_color_blue_light.png b/tests/tests/holo/res/drawable-hdpi/holo_inputmethod_color_blue_light.png
new file mode 100644
index 0000000..a6f2f65
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_inputmethod_color_blue_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_inputmethod_color_green_dark.png b/tests/tests/holo/res/drawable-hdpi/holo_inputmethod_color_green_dark.png
new file mode 100644
index 0000000..2cf79d0
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_inputmethod_color_green_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_inputmethod_color_green_light.png b/tests/tests/holo/res/drawable-hdpi/holo_inputmethod_color_green_light.png
new file mode 100644
index 0000000..508a96e
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_inputmethod_color_green_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_inputmethod_color_orange_dark.png b/tests/tests/holo/res/drawable-hdpi/holo_inputmethod_color_orange_dark.png
new file mode 100644
index 0000000..4a0157f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_inputmethod_color_orange_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_inputmethod_color_orange_light.png b/tests/tests/holo/res/drawable-hdpi/holo_inputmethod_color_orange_light.png
new file mode 100644
index 0000000..0bdb9be
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_inputmethod_color_orange_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_inputmethod_color_purple.png b/tests/tests/holo/res/drawable-hdpi/holo_inputmethod_color_purple.png
new file mode 100644
index 0000000..97071db
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_inputmethod_color_purple.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_inputmethod_color_red_dark.png b/tests/tests/holo/res/drawable-hdpi/holo_inputmethod_color_red_dark.png
new file mode 100644
index 0000000..dbcef9d
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_inputmethod_color_red_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_inputmethod_color_red_light.png b/tests/tests/holo/res/drawable-hdpi/holo_inputmethod_color_red_light.png
new file mode 100644
index 0000000..c60546f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_inputmethod_color_red_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_inputmethod_edittext.png b/tests/tests/holo/res/drawable-hdpi/holo_inputmethod_edittext.png
new file mode 100644
index 0000000..4356dd0
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_inputmethod_edittext.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_inputmethod_progressbar.png b/tests/tests/holo/res/drawable-hdpi/holo_inputmethod_progressbar.png
new file mode 100644
index 0000000..41e958c
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_inputmethod_progressbar.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_inputmethod_progressbar_horizontal_0.png b/tests/tests/holo/res/drawable-hdpi/holo_inputmethod_progressbar_horizontal_0.png
new file mode 100644
index 0000000..8a2248d
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_inputmethod_progressbar_horizontal_0.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_inputmethod_progressbar_horizontal_100.png b/tests/tests/holo/res/drawable-hdpi/holo_inputmethod_progressbar_horizontal_100.png
new file mode 100644
index 0000000..069a67e
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_inputmethod_progressbar_horizontal_100.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_inputmethod_progressbar_horizontal_50.png b/tests/tests/holo/res/drawable-hdpi/holo_inputmethod_progressbar_horizontal_50.png
new file mode 100644
index 0000000..d7fa13d
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_inputmethod_progressbar_horizontal_50.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_inputmethod_progressbar_large.png b/tests/tests/holo/res/drawable-hdpi/holo_inputmethod_progressbar_large.png
new file mode 100644
index 0000000..0fd63d2
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_inputmethod_progressbar_large.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_inputmethod_progressbar_small.png b/tests/tests/holo/res/drawable-hdpi/holo_inputmethod_progressbar_small.png
new file mode 100644
index 0000000..1a270f9
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_inputmethod_progressbar_small.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_inputmethod_progressdialog_horizontal.png b/tests/tests/holo/res/drawable-hdpi/holo_inputmethod_progressdialog_horizontal.png
new file mode 100644
index 0000000..cd50fe6
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_inputmethod_progressdialog_horizontal.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_inputmethod_radio_button.png b/tests/tests/holo/res/drawable-hdpi/holo_inputmethod_radio_button.png
new file mode 100644
index 0000000..8d0bd4f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_inputmethod_radio_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_inputmethod_radio_button_checked.png b/tests/tests/holo/res/drawable-hdpi/holo_inputmethod_radio_button_checked.png
new file mode 100644
index 0000000..26f65ee
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_inputmethod_radio_button_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_inputmethod_radiogroup_horizontal.png b/tests/tests/holo/res/drawable-hdpi/holo_inputmethod_radiogroup_horizontal.png
new file mode 100644
index 0000000..dad7afc
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_inputmethod_radiogroup_horizontal.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_inputmethod_radiogroup_vertical.png b/tests/tests/holo/res/drawable-hdpi/holo_inputmethod_radiogroup_vertical.png
new file mode 100644
index 0000000..d8e8dfb
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_inputmethod_radiogroup_vertical.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_light_land_ratingbar_0.png b/tests/tests/holo/res/drawable-hdpi/holo_inputmethod_ratingbar_0.png
similarity index 100%
rename from tests/res/drawable-hdpi/holo_light_land_ratingbar_0.png
rename to tests/tests/holo/res/drawable-hdpi/holo_inputmethod_ratingbar_0.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_light_land_ratingbar_0_pressed.png b/tests/tests/holo/res/drawable-hdpi/holo_inputmethod_ratingbar_0_pressed.png
similarity index 100%
rename from tests/res/drawable-hdpi/holo_light_land_ratingbar_0_pressed.png
rename to tests/tests/holo/res/drawable-hdpi/holo_inputmethod_ratingbar_0_pressed.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_light_land_ratingbar_2point5.png b/tests/tests/holo/res/drawable-hdpi/holo_inputmethod_ratingbar_2point5.png
similarity index 100%
rename from tests/res/drawable-hdpi/holo_light_land_ratingbar_2point5.png
rename to tests/tests/holo/res/drawable-hdpi/holo_inputmethod_ratingbar_2point5.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_light_land_ratingbar_2point5_pressed.png b/tests/tests/holo/res/drawable-hdpi/holo_inputmethod_ratingbar_2point5_pressed.png
similarity index 100%
rename from tests/res/drawable-hdpi/holo_light_land_ratingbar_2point5_pressed.png
rename to tests/tests/holo/res/drawable-hdpi/holo_inputmethod_ratingbar_2point5_pressed.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_light_land_ratingbar_5.png b/tests/tests/holo/res/drawable-hdpi/holo_inputmethod_ratingbar_5.png
similarity index 100%
rename from tests/res/drawable-hdpi/holo_light_land_ratingbar_5.png
rename to tests/tests/holo/res/drawable-hdpi/holo_inputmethod_ratingbar_5.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_light_land_ratingbar_5_pressed.png b/tests/tests/holo/res/drawable-hdpi/holo_inputmethod_ratingbar_5_pressed.png
similarity index 100%
rename from tests/res/drawable-hdpi/holo_light_land_ratingbar_5_pressed.png
rename to tests/tests/holo/res/drawable-hdpi/holo_inputmethod_ratingbar_5_pressed.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_inputmethod_searchview.png b/tests/tests/holo/res/drawable-hdpi/holo_inputmethod_searchview.png
new file mode 100644
index 0000000..4fa916a
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_inputmethod_searchview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_inputmethod_searchview_query.png b/tests/tests/holo/res/drawable-hdpi/holo_inputmethod_searchview_query.png
new file mode 100644
index 0000000..bf3c4c0
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_inputmethod_searchview_query.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_inputmethod_searchview_query_hint.png b/tests/tests/holo/res/drawable-hdpi/holo_inputmethod_searchview_query_hint.png
new file mode 100644
index 0000000..da47cb1
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_inputmethod_searchview_query_hint.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_inputmethod_seekbar_0.png b/tests/tests/holo/res/drawable-hdpi/holo_inputmethod_seekbar_0.png
new file mode 100644
index 0000000..bbdaa9c
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_inputmethod_seekbar_0.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_inputmethod_seekbar_100.png b/tests/tests/holo/res/drawable-hdpi/holo_inputmethod_seekbar_100.png
new file mode 100644
index 0000000..b89ea7d
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_inputmethod_seekbar_100.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_inputmethod_seekbar_50.png b/tests/tests/holo/res/drawable-hdpi/holo_inputmethod_seekbar_50.png
new file mode 100644
index 0000000..e8320ca
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_inputmethod_seekbar_50.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_inputmethod_spinner.png b/tests/tests/holo/res/drawable-hdpi/holo_inputmethod_spinner.png
new file mode 100644
index 0000000..d7f357a
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_inputmethod_spinner.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_inputmethod_switch.png b/tests/tests/holo/res/drawable-hdpi/holo_inputmethod_switch.png
new file mode 100644
index 0000000..64a0e59
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_inputmethod_switch.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_inputmethod_switch_checked.png b/tests/tests/holo/res/drawable-hdpi/holo_inputmethod_switch_checked.png
new file mode 100644
index 0000000..cf3beea
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_inputmethod_switch_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_inputmethod_tabhost.png b/tests/tests/holo/res/drawable-hdpi/holo_inputmethod_tabhost.png
new file mode 100644
index 0000000..462e9d3
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_inputmethod_tabhost.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_inputmethod_textview.png b/tests/tests/holo/res/drawable-hdpi/holo_inputmethod_textview.png
new file mode 100644
index 0000000..bbb3acf
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_inputmethod_textview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_inputmethod_timepicker.png b/tests/tests/holo/res/drawable-hdpi/holo_inputmethod_timepicker.png
new file mode 100644
index 0000000..72bb752
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_inputmethod_timepicker.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_inputmethod_toggle_button.png b/tests/tests/holo/res/drawable-hdpi/holo_inputmethod_toggle_button.png
new file mode 100644
index 0000000..49ce08d
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_inputmethod_toggle_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_inputmethod_toggle_button_checked.png b/tests/tests/holo/res/drawable-hdpi/holo_inputmethod_toggle_button_checked.png
new file mode 100644
index 0000000..9d240f3
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_inputmethod_toggle_button_checked.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_land_zoomcontrols.png b/tests/tests/holo/res/drawable-hdpi/holo_inputmethod_zoomcontrols.png
similarity index 100%
copy from tests/res/drawable-hdpi/holo_land_zoomcontrols.png
copy to tests/tests/holo/res/drawable-hdpi/holo_inputmethod_zoomcontrols.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_alertdialog_list.png b/tests/tests/holo/res/drawable-hdpi/holo_light_alertdialog_list.png
new file mode 100644
index 0000000..19843c2
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_alertdialog_list.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_alertdialog_multichoice.png b/tests/tests/holo/res/drawable-hdpi/holo_light_alertdialog_multichoice.png
new file mode 100644
index 0000000..45a8da0
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_alertdialog_multichoice.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_alertdialog_onebutton.png b/tests/tests/holo/res/drawable-hdpi/holo_light_alertdialog_onebutton.png
new file mode 100644
index 0000000..7382c6c
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_alertdialog_onebutton.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_alertdialog_singlechoice.png b/tests/tests/holo/res/drawable-hdpi/holo_light_alertdialog_singlechoice.png
new file mode 100644
index 0000000..c1e7f2b
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_alertdialog_singlechoice.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_alertdialog_threebuttons.png b/tests/tests/holo/res/drawable-hdpi/holo_light_alertdialog_threebuttons.png
new file mode 100644
index 0000000..2c65d33
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_alertdialog_threebuttons.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_alertdialog_twobuttons.png b/tests/tests/holo/res/drawable-hdpi/holo_light_alertdialog_twobuttons.png
new file mode 100644
index 0000000..d8c1bc4
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_alertdialog_twobuttons.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_button.png b/tests/tests/holo/res/drawable-hdpi/holo_light_button.png
new file mode 100644
index 0000000..8c096ca
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_button_pressed.png b/tests/tests/holo/res/drawable-hdpi/holo_light_button_pressed.png
new file mode 100644
index 0000000..5c4d96c
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_button_pressed.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_calendar_view.png b/tests/tests/holo/res/drawable-hdpi/holo_light_calendar_view.png
new file mode 100644
index 0000000..99d23a7
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_calendar_view.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_calendar_view_feb.png b/tests/tests/holo/res/drawable-hdpi/holo_light_calendar_view_feb.png
new file mode 100644
index 0000000..2c0619b
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_calendar_view_feb.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_checkbox.png b/tests/tests/holo/res/drawable-hdpi/holo_light_checkbox.png
new file mode 100644
index 0000000..6fd2ba2
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_checkbox.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_checkbox_checked.png b/tests/tests/holo/res/drawable-hdpi/holo_light_checkbox_checked.png
new file mode 100644
index 0000000..f52884c
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_checkbox_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_chronometer.png b/tests/tests/holo/res/drawable-hdpi/holo_light_chronometer.png
new file mode 100644
index 0000000..5ede793
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_chronometer.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_color_blue_bright.png b/tests/tests/holo/res/drawable-hdpi/holo_light_color_blue_bright.png
new file mode 100644
index 0000000..2d1e63f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_color_blue_bright.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_color_blue_dark.png b/tests/tests/holo/res/drawable-hdpi/holo_light_color_blue_dark.png
new file mode 100644
index 0000000..914e522
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_color_blue_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_color_blue_light.png b/tests/tests/holo/res/drawable-hdpi/holo_light_color_blue_light.png
new file mode 100644
index 0000000..a6f2f65
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_color_blue_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_color_green_dark.png b/tests/tests/holo/res/drawable-hdpi/holo_light_color_green_dark.png
new file mode 100644
index 0000000..2cf79d0
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_color_green_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_color_green_light.png b/tests/tests/holo/res/drawable-hdpi/holo_light_color_green_light.png
new file mode 100644
index 0000000..508a96e
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_color_green_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_color_orange_dark.png b/tests/tests/holo/res/drawable-hdpi/holo_light_color_orange_dark.png
new file mode 100644
index 0000000..4a0157f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_color_orange_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_color_orange_light.png b/tests/tests/holo/res/drawable-hdpi/holo_light_color_orange_light.png
new file mode 100644
index 0000000..0bdb9be
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_color_orange_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_color_purple.png b/tests/tests/holo/res/drawable-hdpi/holo_light_color_purple.png
new file mode 100644
index 0000000..97071db
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_color_purple.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_color_red_dark.png b/tests/tests/holo/res/drawable-hdpi/holo_light_color_red_dark.png
new file mode 100644
index 0000000..dbcef9d
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_color_red_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_color_red_light.png b/tests/tests/holo/res/drawable-hdpi/holo_light_color_red_light.png
new file mode 100644
index 0000000..c60546f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_color_red_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_darkactionbar_alertdialog_list.png b/tests/tests/holo/res/drawable-hdpi/holo_light_darkactionbar_alertdialog_list.png
new file mode 100644
index 0000000..19843c2
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_darkactionbar_alertdialog_list.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_darkactionbar_alertdialog_multichoice.png b/tests/tests/holo/res/drawable-hdpi/holo_light_darkactionbar_alertdialog_multichoice.png
new file mode 100644
index 0000000..45a8da0
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_darkactionbar_alertdialog_multichoice.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_darkactionbar_alertdialog_onebutton.png b/tests/tests/holo/res/drawable-hdpi/holo_light_darkactionbar_alertdialog_onebutton.png
new file mode 100644
index 0000000..7382c6c
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_darkactionbar_alertdialog_onebutton.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_darkactionbar_alertdialog_singlechoice.png b/tests/tests/holo/res/drawable-hdpi/holo_light_darkactionbar_alertdialog_singlechoice.png
new file mode 100644
index 0000000..c1e7f2b
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_darkactionbar_alertdialog_singlechoice.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_darkactionbar_alertdialog_threebuttons.png b/tests/tests/holo/res/drawable-hdpi/holo_light_darkactionbar_alertdialog_threebuttons.png
new file mode 100644
index 0000000..2c65d33
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_darkactionbar_alertdialog_threebuttons.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_darkactionbar_alertdialog_twobuttons.png b/tests/tests/holo/res/drawable-hdpi/holo_light_darkactionbar_alertdialog_twobuttons.png
new file mode 100644
index 0000000..d8c1bc4
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_darkactionbar_alertdialog_twobuttons.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_darkactionbar_button.png b/tests/tests/holo/res/drawable-hdpi/holo_light_darkactionbar_button.png
new file mode 100644
index 0000000..8c096ca
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_darkactionbar_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_darkactionbar_button_pressed.png b/tests/tests/holo/res/drawable-hdpi/holo_light_darkactionbar_button_pressed.png
new file mode 100644
index 0000000..5c4d96c
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_darkactionbar_button_pressed.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_darkactionbar_calendar_view.png b/tests/tests/holo/res/drawable-hdpi/holo_light_darkactionbar_calendar_view.png
new file mode 100644
index 0000000..99d23a7
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_darkactionbar_calendar_view.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_darkactionbar_calendar_view_feb.png b/tests/tests/holo/res/drawable-hdpi/holo_light_darkactionbar_calendar_view_feb.png
new file mode 100644
index 0000000..2c0619b
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_darkactionbar_calendar_view_feb.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_darkactionbar_checkbox.png b/tests/tests/holo/res/drawable-hdpi/holo_light_darkactionbar_checkbox.png
new file mode 100644
index 0000000..6fd2ba2
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_darkactionbar_checkbox.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_darkactionbar_checkbox_checked.png b/tests/tests/holo/res/drawable-hdpi/holo_light_darkactionbar_checkbox_checked.png
new file mode 100644
index 0000000..f52884c
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_darkactionbar_checkbox_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_darkactionbar_chronometer.png b/tests/tests/holo/res/drawable-hdpi/holo_light_darkactionbar_chronometer.png
new file mode 100644
index 0000000..5ede793
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_darkactionbar_chronometer.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_darkactionbar_color_blue_bright.png b/tests/tests/holo/res/drawable-hdpi/holo_light_darkactionbar_color_blue_bright.png
new file mode 100644
index 0000000..2d1e63f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_darkactionbar_color_blue_bright.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_darkactionbar_color_blue_dark.png b/tests/tests/holo/res/drawable-hdpi/holo_light_darkactionbar_color_blue_dark.png
new file mode 100644
index 0000000..914e522
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_darkactionbar_color_blue_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_darkactionbar_color_blue_light.png b/tests/tests/holo/res/drawable-hdpi/holo_light_darkactionbar_color_blue_light.png
new file mode 100644
index 0000000..a6f2f65
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_darkactionbar_color_blue_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_darkactionbar_color_green_dark.png b/tests/tests/holo/res/drawable-hdpi/holo_light_darkactionbar_color_green_dark.png
new file mode 100644
index 0000000..2cf79d0
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_darkactionbar_color_green_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_darkactionbar_color_green_light.png b/tests/tests/holo/res/drawable-hdpi/holo_light_darkactionbar_color_green_light.png
new file mode 100644
index 0000000..508a96e
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_darkactionbar_color_green_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_darkactionbar_color_orange_dark.png b/tests/tests/holo/res/drawable-hdpi/holo_light_darkactionbar_color_orange_dark.png
new file mode 100644
index 0000000..4a0157f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_darkactionbar_color_orange_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_darkactionbar_color_orange_light.png b/tests/tests/holo/res/drawable-hdpi/holo_light_darkactionbar_color_orange_light.png
new file mode 100644
index 0000000..0bdb9be
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_darkactionbar_color_orange_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_darkactionbar_color_purple.png b/tests/tests/holo/res/drawable-hdpi/holo_light_darkactionbar_color_purple.png
new file mode 100644
index 0000000..97071db
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_darkactionbar_color_purple.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_darkactionbar_color_red_dark.png b/tests/tests/holo/res/drawable-hdpi/holo_light_darkactionbar_color_red_dark.png
new file mode 100644
index 0000000..dbcef9d
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_darkactionbar_color_red_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_darkactionbar_color_red_light.png b/tests/tests/holo/res/drawable-hdpi/holo_light_darkactionbar_color_red_light.png
new file mode 100644
index 0000000..c60546f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_darkactionbar_color_red_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_darkactionbar_edittext.png b/tests/tests/holo/res/drawable-hdpi/holo_light_darkactionbar_edittext.png
new file mode 100644
index 0000000..4356dd0
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_darkactionbar_edittext.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_darkactionbar_progressbar.png b/tests/tests/holo/res/drawable-hdpi/holo_light_darkactionbar_progressbar.png
new file mode 100644
index 0000000..41e958c
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_darkactionbar_progressbar.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_darkactionbar_progressbar_horizontal_0.png b/tests/tests/holo/res/drawable-hdpi/holo_light_darkactionbar_progressbar_horizontal_0.png
new file mode 100644
index 0000000..8a2248d
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_darkactionbar_progressbar_horizontal_0.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_darkactionbar_progressbar_horizontal_100.png b/tests/tests/holo/res/drawable-hdpi/holo_light_darkactionbar_progressbar_horizontal_100.png
new file mode 100644
index 0000000..069a67e
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_darkactionbar_progressbar_horizontal_100.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_darkactionbar_progressbar_horizontal_50.png b/tests/tests/holo/res/drawable-hdpi/holo_light_darkactionbar_progressbar_horizontal_50.png
new file mode 100644
index 0000000..d7fa13d
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_darkactionbar_progressbar_horizontal_50.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_darkactionbar_progressbar_large.png b/tests/tests/holo/res/drawable-hdpi/holo_light_darkactionbar_progressbar_large.png
new file mode 100644
index 0000000..0fd63d2
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_darkactionbar_progressbar_large.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_darkactionbar_progressbar_small.png b/tests/tests/holo/res/drawable-hdpi/holo_light_darkactionbar_progressbar_small.png
new file mode 100644
index 0000000..1a270f9
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_darkactionbar_progressbar_small.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_darkactionbar_progressdialog_horizontal.png b/tests/tests/holo/res/drawable-hdpi/holo_light_darkactionbar_progressdialog_horizontal.png
new file mode 100644
index 0000000..cd50fe6
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_darkactionbar_progressdialog_horizontal.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_darkactionbar_radio_button.png b/tests/tests/holo/res/drawable-hdpi/holo_light_darkactionbar_radio_button.png
new file mode 100644
index 0000000..8d0bd4f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_darkactionbar_radio_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_darkactionbar_radio_button_checked.png b/tests/tests/holo/res/drawable-hdpi/holo_light_darkactionbar_radio_button_checked.png
new file mode 100644
index 0000000..26f65ee
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_darkactionbar_radio_button_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_darkactionbar_radiogroup_horizontal.png b/tests/tests/holo/res/drawable-hdpi/holo_light_darkactionbar_radiogroup_horizontal.png
new file mode 100644
index 0000000..dad7afc
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_darkactionbar_radiogroup_horizontal.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_darkactionbar_radiogroup_vertical.png b/tests/tests/holo/res/drawable-hdpi/holo_light_darkactionbar_radiogroup_vertical.png
new file mode 100644
index 0000000..d8e8dfb
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_darkactionbar_radiogroup_vertical.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_light_land_ratingbar_0.png b/tests/tests/holo/res/drawable-hdpi/holo_light_darkactionbar_ratingbar_0.png
similarity index 100%
copy from tests/res/drawable-hdpi/holo_light_land_ratingbar_0.png
copy to tests/tests/holo/res/drawable-hdpi/holo_light_darkactionbar_ratingbar_0.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_light_land_ratingbar_0_pressed.png b/tests/tests/holo/res/drawable-hdpi/holo_light_darkactionbar_ratingbar_0_pressed.png
similarity index 100%
copy from tests/res/drawable-hdpi/holo_light_land_ratingbar_0_pressed.png
copy to tests/tests/holo/res/drawable-hdpi/holo_light_darkactionbar_ratingbar_0_pressed.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_light_land_ratingbar_2point5.png b/tests/tests/holo/res/drawable-hdpi/holo_light_darkactionbar_ratingbar_2point5.png
similarity index 100%
copy from tests/res/drawable-hdpi/holo_light_land_ratingbar_2point5.png
copy to tests/tests/holo/res/drawable-hdpi/holo_light_darkactionbar_ratingbar_2point5.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_light_land_ratingbar_2point5_pressed.png b/tests/tests/holo/res/drawable-hdpi/holo_light_darkactionbar_ratingbar_2point5_pressed.png
similarity index 100%
copy from tests/res/drawable-hdpi/holo_light_land_ratingbar_2point5_pressed.png
copy to tests/tests/holo/res/drawable-hdpi/holo_light_darkactionbar_ratingbar_2point5_pressed.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_light_land_ratingbar_5.png b/tests/tests/holo/res/drawable-hdpi/holo_light_darkactionbar_ratingbar_5.png
similarity index 100%
copy from tests/res/drawable-hdpi/holo_light_land_ratingbar_5.png
copy to tests/tests/holo/res/drawable-hdpi/holo_light_darkactionbar_ratingbar_5.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_light_land_ratingbar_5_pressed.png b/tests/tests/holo/res/drawable-hdpi/holo_light_darkactionbar_ratingbar_5_pressed.png
similarity index 100%
copy from tests/res/drawable-hdpi/holo_light_land_ratingbar_5_pressed.png
copy to tests/tests/holo/res/drawable-hdpi/holo_light_darkactionbar_ratingbar_5_pressed.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_darkactionbar_searchview.png b/tests/tests/holo/res/drawable-hdpi/holo_light_darkactionbar_searchview.png
new file mode 100644
index 0000000..4fa916a
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_darkactionbar_searchview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_darkactionbar_searchview_query.png b/tests/tests/holo/res/drawable-hdpi/holo_light_darkactionbar_searchview_query.png
new file mode 100644
index 0000000..bf3c4c0
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_darkactionbar_searchview_query.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_darkactionbar_searchview_query_hint.png b/tests/tests/holo/res/drawable-hdpi/holo_light_darkactionbar_searchview_query_hint.png
new file mode 100644
index 0000000..da47cb1
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_darkactionbar_searchview_query_hint.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_darkactionbar_seekbar_0.png b/tests/tests/holo/res/drawable-hdpi/holo_light_darkactionbar_seekbar_0.png
new file mode 100644
index 0000000..bbdaa9c
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_darkactionbar_seekbar_0.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_darkactionbar_seekbar_100.png b/tests/tests/holo/res/drawable-hdpi/holo_light_darkactionbar_seekbar_100.png
new file mode 100644
index 0000000..b89ea7d
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_darkactionbar_seekbar_100.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_darkactionbar_seekbar_50.png b/tests/tests/holo/res/drawable-hdpi/holo_light_darkactionbar_seekbar_50.png
new file mode 100644
index 0000000..e8320ca
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_darkactionbar_seekbar_50.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_darkactionbar_spinner.png b/tests/tests/holo/res/drawable-hdpi/holo_light_darkactionbar_spinner.png
new file mode 100644
index 0000000..d7f357a
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_darkactionbar_spinner.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_darkactionbar_switch.png b/tests/tests/holo/res/drawable-hdpi/holo_light_darkactionbar_switch.png
new file mode 100644
index 0000000..64a0e59
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_darkactionbar_switch.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_darkactionbar_switch_checked.png b/tests/tests/holo/res/drawable-hdpi/holo_light_darkactionbar_switch_checked.png
new file mode 100644
index 0000000..cf3beea
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_darkactionbar_switch_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_darkactionbar_tabhost.png b/tests/tests/holo/res/drawable-hdpi/holo_light_darkactionbar_tabhost.png
new file mode 100644
index 0000000..462e9d3
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_darkactionbar_tabhost.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_darkactionbar_textview.png b/tests/tests/holo/res/drawable-hdpi/holo_light_darkactionbar_textview.png
new file mode 100644
index 0000000..bbb3acf
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_darkactionbar_textview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_darkactionbar_timepicker.png b/tests/tests/holo/res/drawable-hdpi/holo_light_darkactionbar_timepicker.png
new file mode 100644
index 0000000..72bb752
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_darkactionbar_timepicker.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_darkactionbar_toggle_button.png b/tests/tests/holo/res/drawable-hdpi/holo_light_darkactionbar_toggle_button.png
new file mode 100644
index 0000000..49ce08d
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_darkactionbar_toggle_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_darkactionbar_toggle_button_checked.png b/tests/tests/holo/res/drawable-hdpi/holo_light_darkactionbar_toggle_button_checked.png
new file mode 100644
index 0000000..9d240f3
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_darkactionbar_toggle_button_checked.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_land_zoomcontrols.png b/tests/tests/holo/res/drawable-hdpi/holo_light_darkactionbar_zoomcontrols.png
similarity index 100%
copy from tests/res/drawable-hdpi/holo_land_zoomcontrols.png
copy to tests/tests/holo/res/drawable-hdpi/holo_light_darkactionbar_zoomcontrols.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_alertdialog_list.png b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_alertdialog_list.png
new file mode 100644
index 0000000..19843c2
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_alertdialog_list.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_alertdialog_multichoice.png b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_alertdialog_multichoice.png
new file mode 100644
index 0000000..45a8da0
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_alertdialog_multichoice.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_alertdialog_onebutton.png b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_alertdialog_onebutton.png
new file mode 100644
index 0000000..7382c6c
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_alertdialog_onebutton.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_alertdialog_singlechoice.png b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_alertdialog_singlechoice.png
new file mode 100644
index 0000000..c1e7f2b
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_alertdialog_singlechoice.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_alertdialog_threebuttons.png b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_alertdialog_threebuttons.png
new file mode 100644
index 0000000..2c65d33
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_alertdialog_threebuttons.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_alertdialog_twobuttons.png b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_alertdialog_twobuttons.png
new file mode 100644
index 0000000..d8c1bc4
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_alertdialog_twobuttons.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_button.png b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_button.png
new file mode 100644
index 0000000..8c096ca
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_button_pressed.png b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_button_pressed.png
new file mode 100644
index 0000000..5c4d96c
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_button_pressed.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_calendar_view.png b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_calendar_view.png
new file mode 100644
index 0000000..99d23a7
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_calendar_view.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_calendar_view_feb.png b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_calendar_view_feb.png
new file mode 100644
index 0000000..2c0619b
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_calendar_view_feb.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_checkbox.png b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_checkbox.png
new file mode 100644
index 0000000..6fd2ba2
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_checkbox.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_checkbox_checked.png b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_checkbox_checked.png
new file mode 100644
index 0000000..f52884c
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_checkbox_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_chronometer.png b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_chronometer.png
new file mode 100644
index 0000000..5ede793
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_chronometer.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_color_blue_bright.png b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_color_blue_bright.png
new file mode 100644
index 0000000..2d1e63f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_color_blue_bright.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_color_blue_dark.png b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_color_blue_dark.png
new file mode 100644
index 0000000..914e522
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_color_blue_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_color_blue_light.png b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_color_blue_light.png
new file mode 100644
index 0000000..a6f2f65
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_color_blue_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_color_green_dark.png b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_color_green_dark.png
new file mode 100644
index 0000000..2cf79d0
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_color_green_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_color_green_light.png b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_color_green_light.png
new file mode 100644
index 0000000..508a96e
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_color_green_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_color_orange_dark.png b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_color_orange_dark.png
new file mode 100644
index 0000000..4a0157f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_color_orange_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_color_orange_light.png b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_color_orange_light.png
new file mode 100644
index 0000000..0bdb9be
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_color_orange_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_color_purple.png b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_color_purple.png
new file mode 100644
index 0000000..97071db
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_color_purple.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_color_red_dark.png b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_color_red_dark.png
new file mode 100644
index 0000000..dbcef9d
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_color_red_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_color_red_light.png b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_color_red_light.png
new file mode 100644
index 0000000..c60546f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_color_red_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_edittext.png b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_edittext.png
new file mode 100644
index 0000000..4356dd0
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_edittext.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_minwidth_alertdialog_list.png b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_minwidth_alertdialog_list.png
new file mode 100644
index 0000000..19843c2
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_minwidth_alertdialog_list.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_minwidth_alertdialog_multichoice.png b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_minwidth_alertdialog_multichoice.png
new file mode 100644
index 0000000..45a8da0
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_minwidth_alertdialog_multichoice.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_minwidth_alertdialog_onebutton.png b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_minwidth_alertdialog_onebutton.png
new file mode 100644
index 0000000..7382c6c
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_minwidth_alertdialog_onebutton.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_minwidth_alertdialog_singlechoice.png b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_minwidth_alertdialog_singlechoice.png
new file mode 100644
index 0000000..c1e7f2b
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_minwidth_alertdialog_singlechoice.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_minwidth_alertdialog_threebuttons.png b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_minwidth_alertdialog_threebuttons.png
new file mode 100644
index 0000000..2c65d33
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_minwidth_alertdialog_threebuttons.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_minwidth_alertdialog_twobuttons.png b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_minwidth_alertdialog_twobuttons.png
new file mode 100644
index 0000000..d8c1bc4
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_minwidth_alertdialog_twobuttons.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_minwidth_button.png b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_minwidth_button.png
new file mode 100644
index 0000000..8c096ca
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_minwidth_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_minwidth_button_pressed.png b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_minwidth_button_pressed.png
new file mode 100644
index 0000000..5c4d96c
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_minwidth_button_pressed.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_minwidth_calendar_view.png b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_minwidth_calendar_view.png
new file mode 100644
index 0000000..99d23a7
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_minwidth_calendar_view.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_minwidth_calendar_view_feb.png b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_minwidth_calendar_view_feb.png
new file mode 100644
index 0000000..2c0619b
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_minwidth_calendar_view_feb.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_minwidth_checkbox.png b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_minwidth_checkbox.png
new file mode 100644
index 0000000..6fd2ba2
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_minwidth_checkbox.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_minwidth_checkbox_checked.png b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_minwidth_checkbox_checked.png
new file mode 100644
index 0000000..f52884c
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_minwidth_checkbox_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_minwidth_chronometer.png b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_minwidth_chronometer.png
new file mode 100644
index 0000000..5ede793
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_minwidth_chronometer.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_minwidth_color_blue_bright.png b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_minwidth_color_blue_bright.png
new file mode 100644
index 0000000..2d1e63f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_minwidth_color_blue_bright.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_minwidth_color_blue_dark.png b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_minwidth_color_blue_dark.png
new file mode 100644
index 0000000..914e522
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_minwidth_color_blue_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_minwidth_color_blue_light.png b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_minwidth_color_blue_light.png
new file mode 100644
index 0000000..a6f2f65
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_minwidth_color_blue_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_minwidth_color_green_dark.png b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_minwidth_color_green_dark.png
new file mode 100644
index 0000000..2cf79d0
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_minwidth_color_green_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_minwidth_color_green_light.png b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_minwidth_color_green_light.png
new file mode 100644
index 0000000..508a96e
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_minwidth_color_green_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_minwidth_color_orange_dark.png b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_minwidth_color_orange_dark.png
new file mode 100644
index 0000000..4a0157f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_minwidth_color_orange_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_minwidth_color_orange_light.png b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_minwidth_color_orange_light.png
new file mode 100644
index 0000000..0bdb9be
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_minwidth_color_orange_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_minwidth_color_purple.png b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_minwidth_color_purple.png
new file mode 100644
index 0000000..97071db
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_minwidth_color_purple.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_minwidth_color_red_dark.png b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_minwidth_color_red_dark.png
new file mode 100644
index 0000000..dbcef9d
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_minwidth_color_red_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_minwidth_color_red_light.png b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_minwidth_color_red_light.png
new file mode 100644
index 0000000..c60546f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_minwidth_color_red_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_minwidth_edittext.png b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_minwidth_edittext.png
new file mode 100644
index 0000000..4356dd0
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_minwidth_edittext.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_minwidth_progressbar.png b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_minwidth_progressbar.png
new file mode 100644
index 0000000..41e958c
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_minwidth_progressbar.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_minwidth_progressbar_horizontal_0.png b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_minwidth_progressbar_horizontal_0.png
new file mode 100644
index 0000000..8a2248d
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_minwidth_progressbar_horizontal_0.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_minwidth_progressbar_horizontal_100.png b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_minwidth_progressbar_horizontal_100.png
new file mode 100644
index 0000000..069a67e
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_minwidth_progressbar_horizontal_100.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_minwidth_progressbar_horizontal_50.png b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_minwidth_progressbar_horizontal_50.png
new file mode 100644
index 0000000..d7fa13d
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_minwidth_progressbar_horizontal_50.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_minwidth_progressbar_large.png b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_minwidth_progressbar_large.png
new file mode 100644
index 0000000..0fd63d2
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_minwidth_progressbar_large.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_minwidth_progressbar_small.png b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_minwidth_progressbar_small.png
new file mode 100644
index 0000000..1a270f9
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_minwidth_progressbar_small.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_minwidth_progressdialog_horizontal.png b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_minwidth_progressdialog_horizontal.png
new file mode 100644
index 0000000..cd50fe6
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_minwidth_progressdialog_horizontal.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_minwidth_radio_button.png b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_minwidth_radio_button.png
new file mode 100644
index 0000000..8d0bd4f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_minwidth_radio_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_minwidth_radio_button_checked.png b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_minwidth_radio_button_checked.png
new file mode 100644
index 0000000..26f65ee
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_minwidth_radio_button_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_minwidth_radiogroup_horizontal.png b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_minwidth_radiogroup_horizontal.png
new file mode 100644
index 0000000..dad7afc
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_minwidth_radiogroup_horizontal.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_minwidth_radiogroup_vertical.png b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_minwidth_radiogroup_vertical.png
new file mode 100644
index 0000000..d8e8dfb
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_minwidth_radiogroup_vertical.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_light_land_ratingbar_0.png b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_minwidth_ratingbar_0.png
similarity index 100%
copy from tests/res/drawable-hdpi/holo_light_land_ratingbar_0.png
copy to tests/tests/holo/res/drawable-hdpi/holo_light_dialog_minwidth_ratingbar_0.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_light_land_ratingbar_0_pressed.png b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_minwidth_ratingbar_0_pressed.png
similarity index 100%
copy from tests/res/drawable-hdpi/holo_light_land_ratingbar_0_pressed.png
copy to tests/tests/holo/res/drawable-hdpi/holo_light_dialog_minwidth_ratingbar_0_pressed.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_light_land_ratingbar_2point5.png b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_minwidth_ratingbar_2point5.png
similarity index 100%
copy from tests/res/drawable-hdpi/holo_light_land_ratingbar_2point5.png
copy to tests/tests/holo/res/drawable-hdpi/holo_light_dialog_minwidth_ratingbar_2point5.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_light_land_ratingbar_2point5_pressed.png b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_minwidth_ratingbar_2point5_pressed.png
similarity index 100%
copy from tests/res/drawable-hdpi/holo_light_land_ratingbar_2point5_pressed.png
copy to tests/tests/holo/res/drawable-hdpi/holo_light_dialog_minwidth_ratingbar_2point5_pressed.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_light_land_ratingbar_5.png b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_minwidth_ratingbar_5.png
similarity index 100%
copy from tests/res/drawable-hdpi/holo_light_land_ratingbar_5.png
copy to tests/tests/holo/res/drawable-hdpi/holo_light_dialog_minwidth_ratingbar_5.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_light_land_ratingbar_5_pressed.png b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_minwidth_ratingbar_5_pressed.png
similarity index 100%
copy from tests/res/drawable-hdpi/holo_light_land_ratingbar_5_pressed.png
copy to tests/tests/holo/res/drawable-hdpi/holo_light_dialog_minwidth_ratingbar_5_pressed.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_minwidth_searchview.png b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_minwidth_searchview.png
new file mode 100644
index 0000000..4fa916a
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_minwidth_searchview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_minwidth_searchview_query.png b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_minwidth_searchview_query.png
new file mode 100644
index 0000000..bf3c4c0
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_minwidth_searchview_query.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_minwidth_searchview_query_hint.png b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_minwidth_searchview_query_hint.png
new file mode 100644
index 0000000..da47cb1
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_minwidth_searchview_query_hint.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_minwidth_seekbar_0.png b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_minwidth_seekbar_0.png
new file mode 100644
index 0000000..bbdaa9c
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_minwidth_seekbar_0.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_minwidth_seekbar_100.png b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_minwidth_seekbar_100.png
new file mode 100644
index 0000000..b89ea7d
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_minwidth_seekbar_100.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_minwidth_seekbar_50.png b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_minwidth_seekbar_50.png
new file mode 100644
index 0000000..e8320ca
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_minwidth_seekbar_50.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_minwidth_spinner.png b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_minwidth_spinner.png
new file mode 100644
index 0000000..d7f357a
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_minwidth_spinner.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_minwidth_switch.png b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_minwidth_switch.png
new file mode 100644
index 0000000..64a0e59
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_minwidth_switch.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_minwidth_switch_checked.png b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_minwidth_switch_checked.png
new file mode 100644
index 0000000..cf3beea
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_minwidth_switch_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_minwidth_tabhost.png b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_minwidth_tabhost.png
new file mode 100644
index 0000000..462e9d3
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_minwidth_tabhost.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_minwidth_textview.png b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_minwidth_textview.png
new file mode 100644
index 0000000..bbb3acf
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_minwidth_textview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_minwidth_timepicker.png b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_minwidth_timepicker.png
new file mode 100644
index 0000000..72bb752
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_minwidth_timepicker.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_minwidth_toggle_button.png b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_minwidth_toggle_button.png
new file mode 100644
index 0000000..49ce08d
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_minwidth_toggle_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_minwidth_toggle_button_checked.png b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_minwidth_toggle_button_checked.png
new file mode 100644
index 0000000..9d240f3
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_minwidth_toggle_button_checked.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_land_zoomcontrols.png b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_minwidth_zoomcontrols.png
similarity index 100%
copy from tests/res/drawable-hdpi/holo_land_zoomcontrols.png
copy to tests/tests/holo/res/drawable-hdpi/holo_light_dialog_minwidth_zoomcontrols.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_noactionbar_alertdialog_list.png b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_noactionbar_alertdialog_list.png
new file mode 100644
index 0000000..19843c2
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_noactionbar_alertdialog_list.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_noactionbar_alertdialog_multichoice.png b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_noactionbar_alertdialog_multichoice.png
new file mode 100644
index 0000000..45a8da0
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_noactionbar_alertdialog_multichoice.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_noactionbar_alertdialog_onebutton.png b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_noactionbar_alertdialog_onebutton.png
new file mode 100644
index 0000000..7382c6c
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_noactionbar_alertdialog_onebutton.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_noactionbar_alertdialog_singlechoice.png b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_noactionbar_alertdialog_singlechoice.png
new file mode 100644
index 0000000..c1e7f2b
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_noactionbar_alertdialog_singlechoice.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_noactionbar_alertdialog_threebuttons.png b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_noactionbar_alertdialog_threebuttons.png
new file mode 100644
index 0000000..2c65d33
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_noactionbar_alertdialog_threebuttons.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_noactionbar_alertdialog_twobuttons.png b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_noactionbar_alertdialog_twobuttons.png
new file mode 100644
index 0000000..d8c1bc4
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_noactionbar_alertdialog_twobuttons.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_noactionbar_button.png b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_noactionbar_button.png
new file mode 100644
index 0000000..8c096ca
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_noactionbar_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_noactionbar_button_pressed.png b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_noactionbar_button_pressed.png
new file mode 100644
index 0000000..5c4d96c
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_noactionbar_button_pressed.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_noactionbar_calendar_view.png b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_noactionbar_calendar_view.png
new file mode 100644
index 0000000..99d23a7
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_noactionbar_calendar_view.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_noactionbar_calendar_view_feb.png b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_noactionbar_calendar_view_feb.png
new file mode 100644
index 0000000..2c0619b
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_noactionbar_calendar_view_feb.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_noactionbar_checkbox.png b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_noactionbar_checkbox.png
new file mode 100644
index 0000000..6fd2ba2
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_noactionbar_checkbox.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_noactionbar_checkbox_checked.png b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_noactionbar_checkbox_checked.png
new file mode 100644
index 0000000..f52884c
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_noactionbar_checkbox_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_noactionbar_chronometer.png b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_noactionbar_chronometer.png
new file mode 100644
index 0000000..5ede793
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_noactionbar_chronometer.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_noactionbar_color_blue_bright.png b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_noactionbar_color_blue_bright.png
new file mode 100644
index 0000000..2d1e63f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_noactionbar_color_blue_bright.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_noactionbar_color_blue_dark.png b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_noactionbar_color_blue_dark.png
new file mode 100644
index 0000000..914e522
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_noactionbar_color_blue_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_noactionbar_color_blue_light.png b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_noactionbar_color_blue_light.png
new file mode 100644
index 0000000..a6f2f65
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_noactionbar_color_blue_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_noactionbar_color_green_dark.png b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_noactionbar_color_green_dark.png
new file mode 100644
index 0000000..2cf79d0
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_noactionbar_color_green_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_noactionbar_color_green_light.png b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_noactionbar_color_green_light.png
new file mode 100644
index 0000000..508a96e
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_noactionbar_color_green_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_noactionbar_color_orange_dark.png b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_noactionbar_color_orange_dark.png
new file mode 100644
index 0000000..4a0157f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_noactionbar_color_orange_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_noactionbar_color_orange_light.png b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_noactionbar_color_orange_light.png
new file mode 100644
index 0000000..0bdb9be
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_noactionbar_color_orange_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_noactionbar_color_purple.png b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_noactionbar_color_purple.png
new file mode 100644
index 0000000..97071db
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_noactionbar_color_purple.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_noactionbar_color_red_dark.png b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_noactionbar_color_red_dark.png
new file mode 100644
index 0000000..dbcef9d
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_noactionbar_color_red_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_noactionbar_color_red_light.png b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_noactionbar_color_red_light.png
new file mode 100644
index 0000000..c60546f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_noactionbar_color_red_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_noactionbar_edittext.png b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_noactionbar_edittext.png
new file mode 100644
index 0000000..4356dd0
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_noactionbar_edittext.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_noactionbar_minwidth_alertdialog_list.png b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_noactionbar_minwidth_alertdialog_list.png
new file mode 100644
index 0000000..19843c2
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_noactionbar_minwidth_alertdialog_list.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_noactionbar_minwidth_alertdialog_multichoice.png b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_noactionbar_minwidth_alertdialog_multichoice.png
new file mode 100644
index 0000000..45a8da0
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_noactionbar_minwidth_alertdialog_multichoice.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_noactionbar_minwidth_alertdialog_onebutton.png b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_noactionbar_minwidth_alertdialog_onebutton.png
new file mode 100644
index 0000000..7382c6c
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_noactionbar_minwidth_alertdialog_onebutton.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_noactionbar_minwidth_alertdialog_singlechoice.png b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_noactionbar_minwidth_alertdialog_singlechoice.png
new file mode 100644
index 0000000..c1e7f2b
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_noactionbar_minwidth_alertdialog_singlechoice.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_noactionbar_minwidth_alertdialog_threebuttons.png b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_noactionbar_minwidth_alertdialog_threebuttons.png
new file mode 100644
index 0000000..2c65d33
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_noactionbar_minwidth_alertdialog_threebuttons.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_noactionbar_minwidth_alertdialog_twobuttons.png b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_noactionbar_minwidth_alertdialog_twobuttons.png
new file mode 100644
index 0000000..d8c1bc4
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_noactionbar_minwidth_alertdialog_twobuttons.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_noactionbar_minwidth_button.png b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_noactionbar_minwidth_button.png
new file mode 100644
index 0000000..8c096ca
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_noactionbar_minwidth_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_noactionbar_minwidth_button_pressed.png b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_noactionbar_minwidth_button_pressed.png
new file mode 100644
index 0000000..5c4d96c
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_noactionbar_minwidth_button_pressed.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_noactionbar_minwidth_calendar_view.png b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_noactionbar_minwidth_calendar_view.png
new file mode 100644
index 0000000..99d23a7
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_noactionbar_minwidth_calendar_view.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_noactionbar_minwidth_calendar_view_feb.png b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_noactionbar_minwidth_calendar_view_feb.png
new file mode 100644
index 0000000..2c0619b
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_noactionbar_minwidth_calendar_view_feb.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_noactionbar_minwidth_checkbox.png b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_noactionbar_minwidth_checkbox.png
new file mode 100644
index 0000000..6fd2ba2
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_noactionbar_minwidth_checkbox.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_noactionbar_minwidth_checkbox_checked.png b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_noactionbar_minwidth_checkbox_checked.png
new file mode 100644
index 0000000..f52884c
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_noactionbar_minwidth_checkbox_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_noactionbar_minwidth_chronometer.png b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_noactionbar_minwidth_chronometer.png
new file mode 100644
index 0000000..5ede793
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_noactionbar_minwidth_chronometer.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_noactionbar_minwidth_color_blue_bright.png b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_noactionbar_minwidth_color_blue_bright.png
new file mode 100644
index 0000000..2d1e63f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_noactionbar_minwidth_color_blue_bright.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_noactionbar_minwidth_color_blue_dark.png b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_noactionbar_minwidth_color_blue_dark.png
new file mode 100644
index 0000000..914e522
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_noactionbar_minwidth_color_blue_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_noactionbar_minwidth_color_blue_light.png b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_noactionbar_minwidth_color_blue_light.png
new file mode 100644
index 0000000..a6f2f65
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_noactionbar_minwidth_color_blue_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_noactionbar_minwidth_color_green_dark.png b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_noactionbar_minwidth_color_green_dark.png
new file mode 100644
index 0000000..2cf79d0
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_noactionbar_minwidth_color_green_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_noactionbar_minwidth_color_green_light.png b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_noactionbar_minwidth_color_green_light.png
new file mode 100644
index 0000000..508a96e
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_noactionbar_minwidth_color_green_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_noactionbar_minwidth_color_orange_dark.png b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_noactionbar_minwidth_color_orange_dark.png
new file mode 100644
index 0000000..4a0157f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_noactionbar_minwidth_color_orange_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_noactionbar_minwidth_color_orange_light.png b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_noactionbar_minwidth_color_orange_light.png
new file mode 100644
index 0000000..0bdb9be
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_noactionbar_minwidth_color_orange_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_noactionbar_minwidth_color_purple.png b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_noactionbar_minwidth_color_purple.png
new file mode 100644
index 0000000..97071db
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_noactionbar_minwidth_color_purple.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_noactionbar_minwidth_color_red_dark.png b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_noactionbar_minwidth_color_red_dark.png
new file mode 100644
index 0000000..dbcef9d
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_noactionbar_minwidth_color_red_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_noactionbar_minwidth_color_red_light.png b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_noactionbar_minwidth_color_red_light.png
new file mode 100644
index 0000000..c60546f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_noactionbar_minwidth_color_red_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_noactionbar_minwidth_edittext.png b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_noactionbar_minwidth_edittext.png
new file mode 100644
index 0000000..4356dd0
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_noactionbar_minwidth_edittext.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_noactionbar_minwidth_progressbar.png b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_noactionbar_minwidth_progressbar.png
new file mode 100644
index 0000000..41e958c
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_noactionbar_minwidth_progressbar.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_noactionbar_minwidth_progressbar_horizontal_0.png b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_noactionbar_minwidth_progressbar_horizontal_0.png
new file mode 100644
index 0000000..8a2248d
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_noactionbar_minwidth_progressbar_horizontal_0.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_noactionbar_minwidth_progressbar_horizontal_100.png b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_noactionbar_minwidth_progressbar_horizontal_100.png
new file mode 100644
index 0000000..069a67e
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_noactionbar_minwidth_progressbar_horizontal_100.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_noactionbar_minwidth_progressbar_horizontal_50.png b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_noactionbar_minwidth_progressbar_horizontal_50.png
new file mode 100644
index 0000000..d7fa13d
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_noactionbar_minwidth_progressbar_horizontal_50.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_noactionbar_minwidth_progressbar_large.png b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_noactionbar_minwidth_progressbar_large.png
new file mode 100644
index 0000000..0fd63d2
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_noactionbar_minwidth_progressbar_large.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_noactionbar_minwidth_progressbar_small.png b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_noactionbar_minwidth_progressbar_small.png
new file mode 100644
index 0000000..1a270f9
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_noactionbar_minwidth_progressbar_small.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_noactionbar_minwidth_progressdialog_horizontal.png b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_noactionbar_minwidth_progressdialog_horizontal.png
new file mode 100644
index 0000000..cd50fe6
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_noactionbar_minwidth_progressdialog_horizontal.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_noactionbar_minwidth_radio_button.png b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_noactionbar_minwidth_radio_button.png
new file mode 100644
index 0000000..8d0bd4f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_noactionbar_minwidth_radio_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_noactionbar_minwidth_radio_button_checked.png b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_noactionbar_minwidth_radio_button_checked.png
new file mode 100644
index 0000000..26f65ee
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_noactionbar_minwidth_radio_button_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_noactionbar_minwidth_radiogroup_horizontal.png b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_noactionbar_minwidth_radiogroup_horizontal.png
new file mode 100644
index 0000000..dad7afc
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_noactionbar_minwidth_radiogroup_horizontal.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_noactionbar_minwidth_radiogroup_vertical.png b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_noactionbar_minwidth_radiogroup_vertical.png
new file mode 100644
index 0000000..d8e8dfb
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_noactionbar_minwidth_radiogroup_vertical.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_light_land_ratingbar_0.png b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_noactionbar_minwidth_ratingbar_0.png
similarity index 100%
copy from tests/res/drawable-hdpi/holo_light_land_ratingbar_0.png
copy to tests/tests/holo/res/drawable-hdpi/holo_light_dialog_noactionbar_minwidth_ratingbar_0.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_light_land_ratingbar_0_pressed.png b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_noactionbar_minwidth_ratingbar_0_pressed.png
similarity index 100%
copy from tests/res/drawable-hdpi/holo_light_land_ratingbar_0_pressed.png
copy to tests/tests/holo/res/drawable-hdpi/holo_light_dialog_noactionbar_minwidth_ratingbar_0_pressed.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_light_land_ratingbar_2point5.png b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_noactionbar_minwidth_ratingbar_2point5.png
similarity index 100%
copy from tests/res/drawable-hdpi/holo_light_land_ratingbar_2point5.png
copy to tests/tests/holo/res/drawable-hdpi/holo_light_dialog_noactionbar_minwidth_ratingbar_2point5.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_light_land_ratingbar_2point5_pressed.png b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_noactionbar_minwidth_ratingbar_2point5_pressed.png
similarity index 100%
copy from tests/res/drawable-hdpi/holo_light_land_ratingbar_2point5_pressed.png
copy to tests/tests/holo/res/drawable-hdpi/holo_light_dialog_noactionbar_minwidth_ratingbar_2point5_pressed.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_light_land_ratingbar_5.png b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_noactionbar_minwidth_ratingbar_5.png
similarity index 100%
copy from tests/res/drawable-hdpi/holo_light_land_ratingbar_5.png
copy to tests/tests/holo/res/drawable-hdpi/holo_light_dialog_noactionbar_minwidth_ratingbar_5.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_light_land_ratingbar_5_pressed.png b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_noactionbar_minwidth_ratingbar_5_pressed.png
similarity index 100%
copy from tests/res/drawable-hdpi/holo_light_land_ratingbar_5_pressed.png
copy to tests/tests/holo/res/drawable-hdpi/holo_light_dialog_noactionbar_minwidth_ratingbar_5_pressed.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_noactionbar_minwidth_searchview.png b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_noactionbar_minwidth_searchview.png
new file mode 100644
index 0000000..4fa916a
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_noactionbar_minwidth_searchview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_noactionbar_minwidth_searchview_query.png b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_noactionbar_minwidth_searchview_query.png
new file mode 100644
index 0000000..bf3c4c0
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_noactionbar_minwidth_searchview_query.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_noactionbar_minwidth_searchview_query_hint.png b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_noactionbar_minwidth_searchview_query_hint.png
new file mode 100644
index 0000000..da47cb1
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_noactionbar_minwidth_searchview_query_hint.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_noactionbar_minwidth_seekbar_0.png b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_noactionbar_minwidth_seekbar_0.png
new file mode 100644
index 0000000..bbdaa9c
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_noactionbar_minwidth_seekbar_0.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_noactionbar_minwidth_seekbar_100.png b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_noactionbar_minwidth_seekbar_100.png
new file mode 100644
index 0000000..b89ea7d
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_noactionbar_minwidth_seekbar_100.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_noactionbar_minwidth_seekbar_50.png b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_noactionbar_minwidth_seekbar_50.png
new file mode 100644
index 0000000..e8320ca
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_noactionbar_minwidth_seekbar_50.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_noactionbar_minwidth_spinner.png b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_noactionbar_minwidth_spinner.png
new file mode 100644
index 0000000..d7f357a
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_noactionbar_minwidth_spinner.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_noactionbar_minwidth_switch.png b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_noactionbar_minwidth_switch.png
new file mode 100644
index 0000000..64a0e59
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_noactionbar_minwidth_switch.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_noactionbar_minwidth_switch_checked.png b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_noactionbar_minwidth_switch_checked.png
new file mode 100644
index 0000000..cf3beea
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_noactionbar_minwidth_switch_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_noactionbar_minwidth_tabhost.png b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_noactionbar_minwidth_tabhost.png
new file mode 100644
index 0000000..462e9d3
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_noactionbar_minwidth_tabhost.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_noactionbar_minwidth_textview.png b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_noactionbar_minwidth_textview.png
new file mode 100644
index 0000000..bbb3acf
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_noactionbar_minwidth_textview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_noactionbar_minwidth_timepicker.png b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_noactionbar_minwidth_timepicker.png
new file mode 100644
index 0000000..72bb752
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_noactionbar_minwidth_timepicker.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_noactionbar_minwidth_toggle_button.png b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_noactionbar_minwidth_toggle_button.png
new file mode 100644
index 0000000..49ce08d
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_noactionbar_minwidth_toggle_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_noactionbar_minwidth_toggle_button_checked.png b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_noactionbar_minwidth_toggle_button_checked.png
new file mode 100644
index 0000000..9d240f3
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_noactionbar_minwidth_toggle_button_checked.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_land_zoomcontrols.png b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_noactionbar_minwidth_zoomcontrols.png
similarity index 100%
copy from tests/res/drawable-hdpi/holo_land_zoomcontrols.png
copy to tests/tests/holo/res/drawable-hdpi/holo_light_dialog_noactionbar_minwidth_zoomcontrols.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_noactionbar_progressbar.png b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_noactionbar_progressbar.png
new file mode 100644
index 0000000..41e958c
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_noactionbar_progressbar.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_noactionbar_progressbar_horizontal_0.png b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_noactionbar_progressbar_horizontal_0.png
new file mode 100644
index 0000000..8a2248d
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_noactionbar_progressbar_horizontal_0.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_noactionbar_progressbar_horizontal_100.png b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_noactionbar_progressbar_horizontal_100.png
new file mode 100644
index 0000000..069a67e
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_noactionbar_progressbar_horizontal_100.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_noactionbar_progressbar_horizontal_50.png b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_noactionbar_progressbar_horizontal_50.png
new file mode 100644
index 0000000..d7fa13d
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_noactionbar_progressbar_horizontal_50.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_noactionbar_progressbar_large.png b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_noactionbar_progressbar_large.png
new file mode 100644
index 0000000..0fd63d2
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_noactionbar_progressbar_large.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_noactionbar_progressbar_small.png b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_noactionbar_progressbar_small.png
new file mode 100644
index 0000000..1a270f9
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_noactionbar_progressbar_small.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_noactionbar_progressdialog_horizontal.png b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_noactionbar_progressdialog_horizontal.png
new file mode 100644
index 0000000..cd50fe6
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_noactionbar_progressdialog_horizontal.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_noactionbar_radio_button.png b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_noactionbar_radio_button.png
new file mode 100644
index 0000000..8d0bd4f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_noactionbar_radio_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_noactionbar_radio_button_checked.png b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_noactionbar_radio_button_checked.png
new file mode 100644
index 0000000..26f65ee
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_noactionbar_radio_button_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_noactionbar_radiogroup_horizontal.png b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_noactionbar_radiogroup_horizontal.png
new file mode 100644
index 0000000..dad7afc
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_noactionbar_radiogroup_horizontal.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_noactionbar_radiogroup_vertical.png b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_noactionbar_radiogroup_vertical.png
new file mode 100644
index 0000000..d8e8dfb
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_noactionbar_radiogroup_vertical.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_light_land_ratingbar_0.png b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_noactionbar_ratingbar_0.png
similarity index 100%
copy from tests/res/drawable-hdpi/holo_light_land_ratingbar_0.png
copy to tests/tests/holo/res/drawable-hdpi/holo_light_dialog_noactionbar_ratingbar_0.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_light_land_ratingbar_0_pressed.png b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_noactionbar_ratingbar_0_pressed.png
similarity index 100%
copy from tests/res/drawable-hdpi/holo_light_land_ratingbar_0_pressed.png
copy to tests/tests/holo/res/drawable-hdpi/holo_light_dialog_noactionbar_ratingbar_0_pressed.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_light_land_ratingbar_2point5.png b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_noactionbar_ratingbar_2point5.png
similarity index 100%
copy from tests/res/drawable-hdpi/holo_light_land_ratingbar_2point5.png
copy to tests/tests/holo/res/drawable-hdpi/holo_light_dialog_noactionbar_ratingbar_2point5.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_light_land_ratingbar_2point5_pressed.png b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_noactionbar_ratingbar_2point5_pressed.png
similarity index 100%
copy from tests/res/drawable-hdpi/holo_light_land_ratingbar_2point5_pressed.png
copy to tests/tests/holo/res/drawable-hdpi/holo_light_dialog_noactionbar_ratingbar_2point5_pressed.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_light_land_ratingbar_5.png b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_noactionbar_ratingbar_5.png
similarity index 100%
copy from tests/res/drawable-hdpi/holo_light_land_ratingbar_5.png
copy to tests/tests/holo/res/drawable-hdpi/holo_light_dialog_noactionbar_ratingbar_5.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_light_land_ratingbar_5_pressed.png b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_noactionbar_ratingbar_5_pressed.png
similarity index 100%
copy from tests/res/drawable-hdpi/holo_light_land_ratingbar_5_pressed.png
copy to tests/tests/holo/res/drawable-hdpi/holo_light_dialog_noactionbar_ratingbar_5_pressed.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_noactionbar_searchview.png b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_noactionbar_searchview.png
new file mode 100644
index 0000000..4fa916a
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_noactionbar_searchview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_noactionbar_searchview_query.png b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_noactionbar_searchview_query.png
new file mode 100644
index 0000000..bf3c4c0
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_noactionbar_searchview_query.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_noactionbar_searchview_query_hint.png b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_noactionbar_searchview_query_hint.png
new file mode 100644
index 0000000..da47cb1
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_noactionbar_searchview_query_hint.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_noactionbar_seekbar_0.png b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_noactionbar_seekbar_0.png
new file mode 100644
index 0000000..bbdaa9c
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_noactionbar_seekbar_0.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_noactionbar_seekbar_100.png b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_noactionbar_seekbar_100.png
new file mode 100644
index 0000000..b89ea7d
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_noactionbar_seekbar_100.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_noactionbar_seekbar_50.png b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_noactionbar_seekbar_50.png
new file mode 100644
index 0000000..e8320ca
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_noactionbar_seekbar_50.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_noactionbar_spinner.png b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_noactionbar_spinner.png
new file mode 100644
index 0000000..d7f357a
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_noactionbar_spinner.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_noactionbar_switch.png b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_noactionbar_switch.png
new file mode 100644
index 0000000..64a0e59
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_noactionbar_switch.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_noactionbar_switch_checked.png b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_noactionbar_switch_checked.png
new file mode 100644
index 0000000..cf3beea
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_noactionbar_switch_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_noactionbar_tabhost.png b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_noactionbar_tabhost.png
new file mode 100644
index 0000000..462e9d3
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_noactionbar_tabhost.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_noactionbar_textview.png b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_noactionbar_textview.png
new file mode 100644
index 0000000..bbb3acf
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_noactionbar_textview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_noactionbar_timepicker.png b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_noactionbar_timepicker.png
new file mode 100644
index 0000000..72bb752
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_noactionbar_timepicker.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_noactionbar_toggle_button.png b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_noactionbar_toggle_button.png
new file mode 100644
index 0000000..49ce08d
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_noactionbar_toggle_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_noactionbar_toggle_button_checked.png b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_noactionbar_toggle_button_checked.png
new file mode 100644
index 0000000..9d240f3
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_noactionbar_toggle_button_checked.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_land_zoomcontrols.png b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_noactionbar_zoomcontrols.png
similarity index 100%
copy from tests/res/drawable-hdpi/holo_land_zoomcontrols.png
copy to tests/tests/holo/res/drawable-hdpi/holo_light_dialog_noactionbar_zoomcontrols.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_progressbar.png b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_progressbar.png
new file mode 100644
index 0000000..41e958c
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_progressbar.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_progressbar_horizontal_0.png b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_progressbar_horizontal_0.png
new file mode 100644
index 0000000..8a2248d
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_progressbar_horizontal_0.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_progressbar_horizontal_100.png b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_progressbar_horizontal_100.png
new file mode 100644
index 0000000..069a67e
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_progressbar_horizontal_100.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_progressbar_horizontal_50.png b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_progressbar_horizontal_50.png
new file mode 100644
index 0000000..d7fa13d
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_progressbar_horizontal_50.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_progressbar_large.png b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_progressbar_large.png
new file mode 100644
index 0000000..0fd63d2
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_progressbar_large.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_progressbar_small.png b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_progressbar_small.png
new file mode 100644
index 0000000..1a270f9
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_progressbar_small.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_progressdialog_horizontal.png b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_progressdialog_horizontal.png
new file mode 100644
index 0000000..cd50fe6
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_progressdialog_horizontal.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_radio_button.png b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_radio_button.png
new file mode 100644
index 0000000..8d0bd4f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_radio_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_radio_button_checked.png b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_radio_button_checked.png
new file mode 100644
index 0000000..26f65ee
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_radio_button_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_radiogroup_horizontal.png b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_radiogroup_horizontal.png
new file mode 100644
index 0000000..dad7afc
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_radiogroup_horizontal.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_radiogroup_vertical.png b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_radiogroup_vertical.png
new file mode 100644
index 0000000..d8e8dfb
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_radiogroup_vertical.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_light_land_ratingbar_0.png b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_ratingbar_0.png
similarity index 100%
copy from tests/res/drawable-hdpi/holo_light_land_ratingbar_0.png
copy to tests/tests/holo/res/drawable-hdpi/holo_light_dialog_ratingbar_0.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_light_land_ratingbar_0_pressed.png b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_ratingbar_0_pressed.png
similarity index 100%
copy from tests/res/drawable-hdpi/holo_light_land_ratingbar_0_pressed.png
copy to tests/tests/holo/res/drawable-hdpi/holo_light_dialog_ratingbar_0_pressed.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_light_land_ratingbar_2point5.png b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_ratingbar_2point5.png
similarity index 100%
copy from tests/res/drawable-hdpi/holo_light_land_ratingbar_2point5.png
copy to tests/tests/holo/res/drawable-hdpi/holo_light_dialog_ratingbar_2point5.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_light_land_ratingbar_2point5_pressed.png b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_ratingbar_2point5_pressed.png
similarity index 100%
copy from tests/res/drawable-hdpi/holo_light_land_ratingbar_2point5_pressed.png
copy to tests/tests/holo/res/drawable-hdpi/holo_light_dialog_ratingbar_2point5_pressed.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_light_land_ratingbar_5.png b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_ratingbar_5.png
similarity index 100%
copy from tests/res/drawable-hdpi/holo_light_land_ratingbar_5.png
copy to tests/tests/holo/res/drawable-hdpi/holo_light_dialog_ratingbar_5.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_light_land_ratingbar_5_pressed.png b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_ratingbar_5_pressed.png
similarity index 100%
copy from tests/res/drawable-hdpi/holo_light_land_ratingbar_5_pressed.png
copy to tests/tests/holo/res/drawable-hdpi/holo_light_dialog_ratingbar_5_pressed.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_searchview.png b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_searchview.png
new file mode 100644
index 0000000..4fa916a
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_searchview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_searchview_query.png b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_searchview_query.png
new file mode 100644
index 0000000..bf3c4c0
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_searchview_query.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_searchview_query_hint.png b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_searchview_query_hint.png
new file mode 100644
index 0000000..da47cb1
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_searchview_query_hint.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_seekbar_0.png b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_seekbar_0.png
new file mode 100644
index 0000000..bbdaa9c
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_seekbar_0.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_seekbar_100.png b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_seekbar_100.png
new file mode 100644
index 0000000..b89ea7d
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_seekbar_100.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_seekbar_50.png b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_seekbar_50.png
new file mode 100644
index 0000000..e8320ca
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_seekbar_50.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_spinner.png b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_spinner.png
new file mode 100644
index 0000000..d7f357a
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_spinner.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_switch.png b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_switch.png
new file mode 100644
index 0000000..64a0e59
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_switch.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_switch_checked.png b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_switch_checked.png
new file mode 100644
index 0000000..cf3beea
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_switch_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_tabhost.png b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_tabhost.png
new file mode 100644
index 0000000..462e9d3
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_tabhost.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_textview.png b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_textview.png
new file mode 100644
index 0000000..bbb3acf
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_textview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_timepicker.png b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_timepicker.png
new file mode 100644
index 0000000..72bb752
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_timepicker.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_toggle_button.png b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_toggle_button.png
new file mode 100644
index 0000000..49ce08d
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_toggle_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_toggle_button_checked.png b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_toggle_button_checked.png
new file mode 100644
index 0000000..9d240f3
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_toggle_button_checked.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_land_zoomcontrols.png b/tests/tests/holo/res/drawable-hdpi/holo_light_dialog_zoomcontrols.png
similarity index 100%
copy from tests/res/drawable-hdpi/holo_land_zoomcontrols.png
copy to tests/tests/holo/res/drawable-hdpi/holo_light_dialog_zoomcontrols.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_dialogwhenlarge_alertdialog_list.png b/tests/tests/holo/res/drawable-hdpi/holo_light_dialogwhenlarge_alertdialog_list.png
new file mode 100644
index 0000000..19843c2
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_dialogwhenlarge_alertdialog_list.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_dialogwhenlarge_alertdialog_multichoice.png b/tests/tests/holo/res/drawable-hdpi/holo_light_dialogwhenlarge_alertdialog_multichoice.png
new file mode 100644
index 0000000..45a8da0
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_dialogwhenlarge_alertdialog_multichoice.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_dialogwhenlarge_alertdialog_onebutton.png b/tests/tests/holo/res/drawable-hdpi/holo_light_dialogwhenlarge_alertdialog_onebutton.png
new file mode 100644
index 0000000..7382c6c
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_dialogwhenlarge_alertdialog_onebutton.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_dialogwhenlarge_alertdialog_singlechoice.png b/tests/tests/holo/res/drawable-hdpi/holo_light_dialogwhenlarge_alertdialog_singlechoice.png
new file mode 100644
index 0000000..c1e7f2b
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_dialogwhenlarge_alertdialog_singlechoice.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_dialogwhenlarge_alertdialog_threebuttons.png b/tests/tests/holo/res/drawable-hdpi/holo_light_dialogwhenlarge_alertdialog_threebuttons.png
new file mode 100644
index 0000000..2c65d33
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_dialogwhenlarge_alertdialog_threebuttons.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_dialogwhenlarge_alertdialog_twobuttons.png b/tests/tests/holo/res/drawable-hdpi/holo_light_dialogwhenlarge_alertdialog_twobuttons.png
new file mode 100644
index 0000000..d8c1bc4
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_dialogwhenlarge_alertdialog_twobuttons.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_dialogwhenlarge_button.png b/tests/tests/holo/res/drawable-hdpi/holo_light_dialogwhenlarge_button.png
new file mode 100644
index 0000000..8c096ca
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_dialogwhenlarge_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_dialogwhenlarge_button_pressed.png b/tests/tests/holo/res/drawable-hdpi/holo_light_dialogwhenlarge_button_pressed.png
new file mode 100644
index 0000000..5c4d96c
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_dialogwhenlarge_button_pressed.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_dialogwhenlarge_calendar_view.png b/tests/tests/holo/res/drawable-hdpi/holo_light_dialogwhenlarge_calendar_view.png
new file mode 100644
index 0000000..99d23a7
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_dialogwhenlarge_calendar_view.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_dialogwhenlarge_calendar_view_feb.png b/tests/tests/holo/res/drawable-hdpi/holo_light_dialogwhenlarge_calendar_view_feb.png
new file mode 100644
index 0000000..2c0619b
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_dialogwhenlarge_calendar_view_feb.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_dialogwhenlarge_checkbox.png b/tests/tests/holo/res/drawable-hdpi/holo_light_dialogwhenlarge_checkbox.png
new file mode 100644
index 0000000..6fd2ba2
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_dialogwhenlarge_checkbox.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_dialogwhenlarge_checkbox_checked.png b/tests/tests/holo/res/drawable-hdpi/holo_light_dialogwhenlarge_checkbox_checked.png
new file mode 100644
index 0000000..f52884c
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_dialogwhenlarge_checkbox_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_dialogwhenlarge_chronometer.png b/tests/tests/holo/res/drawable-hdpi/holo_light_dialogwhenlarge_chronometer.png
new file mode 100644
index 0000000..5ede793
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_dialogwhenlarge_chronometer.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_dialogwhenlarge_color_blue_bright.png b/tests/tests/holo/res/drawable-hdpi/holo_light_dialogwhenlarge_color_blue_bright.png
new file mode 100644
index 0000000..2d1e63f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_dialogwhenlarge_color_blue_bright.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_dialogwhenlarge_color_blue_dark.png b/tests/tests/holo/res/drawable-hdpi/holo_light_dialogwhenlarge_color_blue_dark.png
new file mode 100644
index 0000000..914e522
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_dialogwhenlarge_color_blue_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_dialogwhenlarge_color_blue_light.png b/tests/tests/holo/res/drawable-hdpi/holo_light_dialogwhenlarge_color_blue_light.png
new file mode 100644
index 0000000..a6f2f65
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_dialogwhenlarge_color_blue_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_dialogwhenlarge_color_green_dark.png b/tests/tests/holo/res/drawable-hdpi/holo_light_dialogwhenlarge_color_green_dark.png
new file mode 100644
index 0000000..2cf79d0
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_dialogwhenlarge_color_green_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_dialogwhenlarge_color_green_light.png b/tests/tests/holo/res/drawable-hdpi/holo_light_dialogwhenlarge_color_green_light.png
new file mode 100644
index 0000000..508a96e
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_dialogwhenlarge_color_green_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_dialogwhenlarge_color_orange_dark.png b/tests/tests/holo/res/drawable-hdpi/holo_light_dialogwhenlarge_color_orange_dark.png
new file mode 100644
index 0000000..4a0157f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_dialogwhenlarge_color_orange_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_dialogwhenlarge_color_orange_light.png b/tests/tests/holo/res/drawable-hdpi/holo_light_dialogwhenlarge_color_orange_light.png
new file mode 100644
index 0000000..0bdb9be
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_dialogwhenlarge_color_orange_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_dialogwhenlarge_color_purple.png b/tests/tests/holo/res/drawable-hdpi/holo_light_dialogwhenlarge_color_purple.png
new file mode 100644
index 0000000..97071db
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_dialogwhenlarge_color_purple.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_dialogwhenlarge_color_red_dark.png b/tests/tests/holo/res/drawable-hdpi/holo_light_dialogwhenlarge_color_red_dark.png
new file mode 100644
index 0000000..dbcef9d
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_dialogwhenlarge_color_red_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_dialogwhenlarge_color_red_light.png b/tests/tests/holo/res/drawable-hdpi/holo_light_dialogwhenlarge_color_red_light.png
new file mode 100644
index 0000000..c60546f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_dialogwhenlarge_color_red_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_dialogwhenlarge_edittext.png b/tests/tests/holo/res/drawable-hdpi/holo_light_dialogwhenlarge_edittext.png
new file mode 100644
index 0000000..4356dd0
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_dialogwhenlarge_edittext.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_dialogwhenlarge_noactionbar_alertdialog_list.png b/tests/tests/holo/res/drawable-hdpi/holo_light_dialogwhenlarge_noactionbar_alertdialog_list.png
new file mode 100644
index 0000000..19843c2
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_dialogwhenlarge_noactionbar_alertdialog_list.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_dialogwhenlarge_noactionbar_alertdialog_multichoice.png b/tests/tests/holo/res/drawable-hdpi/holo_light_dialogwhenlarge_noactionbar_alertdialog_multichoice.png
new file mode 100644
index 0000000..45a8da0
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_dialogwhenlarge_noactionbar_alertdialog_multichoice.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_dialogwhenlarge_noactionbar_alertdialog_onebutton.png b/tests/tests/holo/res/drawable-hdpi/holo_light_dialogwhenlarge_noactionbar_alertdialog_onebutton.png
new file mode 100644
index 0000000..7382c6c
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_dialogwhenlarge_noactionbar_alertdialog_onebutton.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_dialogwhenlarge_noactionbar_alertdialog_singlechoice.png b/tests/tests/holo/res/drawable-hdpi/holo_light_dialogwhenlarge_noactionbar_alertdialog_singlechoice.png
new file mode 100644
index 0000000..c1e7f2b
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_dialogwhenlarge_noactionbar_alertdialog_singlechoice.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_dialogwhenlarge_noactionbar_alertdialog_threebuttons.png b/tests/tests/holo/res/drawable-hdpi/holo_light_dialogwhenlarge_noactionbar_alertdialog_threebuttons.png
new file mode 100644
index 0000000..2c65d33
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_dialogwhenlarge_noactionbar_alertdialog_threebuttons.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_dialogwhenlarge_noactionbar_alertdialog_twobuttons.png b/tests/tests/holo/res/drawable-hdpi/holo_light_dialogwhenlarge_noactionbar_alertdialog_twobuttons.png
new file mode 100644
index 0000000..d8c1bc4
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_dialogwhenlarge_noactionbar_alertdialog_twobuttons.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_dialogwhenlarge_noactionbar_button.png b/tests/tests/holo/res/drawable-hdpi/holo_light_dialogwhenlarge_noactionbar_button.png
new file mode 100644
index 0000000..8c096ca
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_dialogwhenlarge_noactionbar_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_dialogwhenlarge_noactionbar_button_pressed.png b/tests/tests/holo/res/drawable-hdpi/holo_light_dialogwhenlarge_noactionbar_button_pressed.png
new file mode 100644
index 0000000..5c4d96c
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_dialogwhenlarge_noactionbar_button_pressed.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_dialogwhenlarge_noactionbar_calendar_view.png b/tests/tests/holo/res/drawable-hdpi/holo_light_dialogwhenlarge_noactionbar_calendar_view.png
new file mode 100644
index 0000000..99d23a7
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_dialogwhenlarge_noactionbar_calendar_view.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_dialogwhenlarge_noactionbar_calendar_view_feb.png b/tests/tests/holo/res/drawable-hdpi/holo_light_dialogwhenlarge_noactionbar_calendar_view_feb.png
new file mode 100644
index 0000000..2c0619b
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_dialogwhenlarge_noactionbar_calendar_view_feb.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_dialogwhenlarge_noactionbar_checkbox.png b/tests/tests/holo/res/drawable-hdpi/holo_light_dialogwhenlarge_noactionbar_checkbox.png
new file mode 100644
index 0000000..6fd2ba2
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_dialogwhenlarge_noactionbar_checkbox.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_dialogwhenlarge_noactionbar_checkbox_checked.png b/tests/tests/holo/res/drawable-hdpi/holo_light_dialogwhenlarge_noactionbar_checkbox_checked.png
new file mode 100644
index 0000000..f52884c
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_dialogwhenlarge_noactionbar_checkbox_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_dialogwhenlarge_noactionbar_chronometer.png b/tests/tests/holo/res/drawable-hdpi/holo_light_dialogwhenlarge_noactionbar_chronometer.png
new file mode 100644
index 0000000..5ede793
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_dialogwhenlarge_noactionbar_chronometer.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_dialogwhenlarge_noactionbar_color_blue_bright.png b/tests/tests/holo/res/drawable-hdpi/holo_light_dialogwhenlarge_noactionbar_color_blue_bright.png
new file mode 100644
index 0000000..2d1e63f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_dialogwhenlarge_noactionbar_color_blue_bright.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_dialogwhenlarge_noactionbar_color_blue_dark.png b/tests/tests/holo/res/drawable-hdpi/holo_light_dialogwhenlarge_noactionbar_color_blue_dark.png
new file mode 100644
index 0000000..914e522
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_dialogwhenlarge_noactionbar_color_blue_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_dialogwhenlarge_noactionbar_color_blue_light.png b/tests/tests/holo/res/drawable-hdpi/holo_light_dialogwhenlarge_noactionbar_color_blue_light.png
new file mode 100644
index 0000000..a6f2f65
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_dialogwhenlarge_noactionbar_color_blue_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_dialogwhenlarge_noactionbar_color_green_dark.png b/tests/tests/holo/res/drawable-hdpi/holo_light_dialogwhenlarge_noactionbar_color_green_dark.png
new file mode 100644
index 0000000..2cf79d0
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_dialogwhenlarge_noactionbar_color_green_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_dialogwhenlarge_noactionbar_color_green_light.png b/tests/tests/holo/res/drawable-hdpi/holo_light_dialogwhenlarge_noactionbar_color_green_light.png
new file mode 100644
index 0000000..508a96e
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_dialogwhenlarge_noactionbar_color_green_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_dialogwhenlarge_noactionbar_color_orange_dark.png b/tests/tests/holo/res/drawable-hdpi/holo_light_dialogwhenlarge_noactionbar_color_orange_dark.png
new file mode 100644
index 0000000..4a0157f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_dialogwhenlarge_noactionbar_color_orange_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_dialogwhenlarge_noactionbar_color_orange_light.png b/tests/tests/holo/res/drawable-hdpi/holo_light_dialogwhenlarge_noactionbar_color_orange_light.png
new file mode 100644
index 0000000..0bdb9be
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_dialogwhenlarge_noactionbar_color_orange_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_dialogwhenlarge_noactionbar_color_purple.png b/tests/tests/holo/res/drawable-hdpi/holo_light_dialogwhenlarge_noactionbar_color_purple.png
new file mode 100644
index 0000000..97071db
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_dialogwhenlarge_noactionbar_color_purple.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_dialogwhenlarge_noactionbar_color_red_dark.png b/tests/tests/holo/res/drawable-hdpi/holo_light_dialogwhenlarge_noactionbar_color_red_dark.png
new file mode 100644
index 0000000..dbcef9d
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_dialogwhenlarge_noactionbar_color_red_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_dialogwhenlarge_noactionbar_color_red_light.png b/tests/tests/holo/res/drawable-hdpi/holo_light_dialogwhenlarge_noactionbar_color_red_light.png
new file mode 100644
index 0000000..c60546f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_dialogwhenlarge_noactionbar_color_red_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_dialogwhenlarge_noactionbar_edittext.png b/tests/tests/holo/res/drawable-hdpi/holo_light_dialogwhenlarge_noactionbar_edittext.png
new file mode 100644
index 0000000..4356dd0
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_dialogwhenlarge_noactionbar_edittext.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_dialogwhenlarge_noactionbar_progressbar.png b/tests/tests/holo/res/drawable-hdpi/holo_light_dialogwhenlarge_noactionbar_progressbar.png
new file mode 100644
index 0000000..41e958c
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_dialogwhenlarge_noactionbar_progressbar.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_dialogwhenlarge_noactionbar_progressbar_horizontal_0.png b/tests/tests/holo/res/drawable-hdpi/holo_light_dialogwhenlarge_noactionbar_progressbar_horizontal_0.png
new file mode 100644
index 0000000..8a2248d
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_dialogwhenlarge_noactionbar_progressbar_horizontal_0.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_dialogwhenlarge_noactionbar_progressbar_horizontal_100.png b/tests/tests/holo/res/drawable-hdpi/holo_light_dialogwhenlarge_noactionbar_progressbar_horizontal_100.png
new file mode 100644
index 0000000..069a67e
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_dialogwhenlarge_noactionbar_progressbar_horizontal_100.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_dialogwhenlarge_noactionbar_progressbar_horizontal_50.png b/tests/tests/holo/res/drawable-hdpi/holo_light_dialogwhenlarge_noactionbar_progressbar_horizontal_50.png
new file mode 100644
index 0000000..d7fa13d
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_dialogwhenlarge_noactionbar_progressbar_horizontal_50.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_dialogwhenlarge_noactionbar_progressbar_large.png b/tests/tests/holo/res/drawable-hdpi/holo_light_dialogwhenlarge_noactionbar_progressbar_large.png
new file mode 100644
index 0000000..0fd63d2
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_dialogwhenlarge_noactionbar_progressbar_large.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_dialogwhenlarge_noactionbar_progressbar_small.png b/tests/tests/holo/res/drawable-hdpi/holo_light_dialogwhenlarge_noactionbar_progressbar_small.png
new file mode 100644
index 0000000..1a270f9
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_dialogwhenlarge_noactionbar_progressbar_small.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_dialogwhenlarge_noactionbar_progressdialog_horizontal.png b/tests/tests/holo/res/drawable-hdpi/holo_light_dialogwhenlarge_noactionbar_progressdialog_horizontal.png
new file mode 100644
index 0000000..cd50fe6
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_dialogwhenlarge_noactionbar_progressdialog_horizontal.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_dialogwhenlarge_noactionbar_radio_button.png b/tests/tests/holo/res/drawable-hdpi/holo_light_dialogwhenlarge_noactionbar_radio_button.png
new file mode 100644
index 0000000..8d0bd4f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_dialogwhenlarge_noactionbar_radio_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_dialogwhenlarge_noactionbar_radio_button_checked.png b/tests/tests/holo/res/drawable-hdpi/holo_light_dialogwhenlarge_noactionbar_radio_button_checked.png
new file mode 100644
index 0000000..26f65ee
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_dialogwhenlarge_noactionbar_radio_button_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_dialogwhenlarge_noactionbar_radiogroup_horizontal.png b/tests/tests/holo/res/drawable-hdpi/holo_light_dialogwhenlarge_noactionbar_radiogroup_horizontal.png
new file mode 100644
index 0000000..dad7afc
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_dialogwhenlarge_noactionbar_radiogroup_horizontal.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_dialogwhenlarge_noactionbar_radiogroup_vertical.png b/tests/tests/holo/res/drawable-hdpi/holo_light_dialogwhenlarge_noactionbar_radiogroup_vertical.png
new file mode 100644
index 0000000..d8e8dfb
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_dialogwhenlarge_noactionbar_radiogroup_vertical.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_light_land_ratingbar_0.png b/tests/tests/holo/res/drawable-hdpi/holo_light_dialogwhenlarge_noactionbar_ratingbar_0.png
similarity index 100%
copy from tests/res/drawable-hdpi/holo_light_land_ratingbar_0.png
copy to tests/tests/holo/res/drawable-hdpi/holo_light_dialogwhenlarge_noactionbar_ratingbar_0.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_light_land_ratingbar_0_pressed.png b/tests/tests/holo/res/drawable-hdpi/holo_light_dialogwhenlarge_noactionbar_ratingbar_0_pressed.png
similarity index 100%
copy from tests/res/drawable-hdpi/holo_light_land_ratingbar_0_pressed.png
copy to tests/tests/holo/res/drawable-hdpi/holo_light_dialogwhenlarge_noactionbar_ratingbar_0_pressed.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_light_land_ratingbar_2point5.png b/tests/tests/holo/res/drawable-hdpi/holo_light_dialogwhenlarge_noactionbar_ratingbar_2point5.png
similarity index 100%
copy from tests/res/drawable-hdpi/holo_light_land_ratingbar_2point5.png
copy to tests/tests/holo/res/drawable-hdpi/holo_light_dialogwhenlarge_noactionbar_ratingbar_2point5.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_light_land_ratingbar_2point5_pressed.png b/tests/tests/holo/res/drawable-hdpi/holo_light_dialogwhenlarge_noactionbar_ratingbar_2point5_pressed.png
similarity index 100%
copy from tests/res/drawable-hdpi/holo_light_land_ratingbar_2point5_pressed.png
copy to tests/tests/holo/res/drawable-hdpi/holo_light_dialogwhenlarge_noactionbar_ratingbar_2point5_pressed.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_light_land_ratingbar_5.png b/tests/tests/holo/res/drawable-hdpi/holo_light_dialogwhenlarge_noactionbar_ratingbar_5.png
similarity index 100%
copy from tests/res/drawable-hdpi/holo_light_land_ratingbar_5.png
copy to tests/tests/holo/res/drawable-hdpi/holo_light_dialogwhenlarge_noactionbar_ratingbar_5.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_light_land_ratingbar_5_pressed.png b/tests/tests/holo/res/drawable-hdpi/holo_light_dialogwhenlarge_noactionbar_ratingbar_5_pressed.png
similarity index 100%
copy from tests/res/drawable-hdpi/holo_light_land_ratingbar_5_pressed.png
copy to tests/tests/holo/res/drawable-hdpi/holo_light_dialogwhenlarge_noactionbar_ratingbar_5_pressed.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_dialogwhenlarge_noactionbar_searchview.png b/tests/tests/holo/res/drawable-hdpi/holo_light_dialogwhenlarge_noactionbar_searchview.png
new file mode 100644
index 0000000..4fa916a
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_dialogwhenlarge_noactionbar_searchview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_dialogwhenlarge_noactionbar_searchview_query.png b/tests/tests/holo/res/drawable-hdpi/holo_light_dialogwhenlarge_noactionbar_searchview_query.png
new file mode 100644
index 0000000..bf3c4c0
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_dialogwhenlarge_noactionbar_searchview_query.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_dialogwhenlarge_noactionbar_searchview_query_hint.png b/tests/tests/holo/res/drawable-hdpi/holo_light_dialogwhenlarge_noactionbar_searchview_query_hint.png
new file mode 100644
index 0000000..da47cb1
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_dialogwhenlarge_noactionbar_searchview_query_hint.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_dialogwhenlarge_noactionbar_seekbar_0.png b/tests/tests/holo/res/drawable-hdpi/holo_light_dialogwhenlarge_noactionbar_seekbar_0.png
new file mode 100644
index 0000000..bbdaa9c
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_dialogwhenlarge_noactionbar_seekbar_0.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_dialogwhenlarge_noactionbar_seekbar_100.png b/tests/tests/holo/res/drawable-hdpi/holo_light_dialogwhenlarge_noactionbar_seekbar_100.png
new file mode 100644
index 0000000..b89ea7d
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_dialogwhenlarge_noactionbar_seekbar_100.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_dialogwhenlarge_noactionbar_seekbar_50.png b/tests/tests/holo/res/drawable-hdpi/holo_light_dialogwhenlarge_noactionbar_seekbar_50.png
new file mode 100644
index 0000000..e8320ca
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_dialogwhenlarge_noactionbar_seekbar_50.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_dialogwhenlarge_noactionbar_spinner.png b/tests/tests/holo/res/drawable-hdpi/holo_light_dialogwhenlarge_noactionbar_spinner.png
new file mode 100644
index 0000000..d7f357a
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_dialogwhenlarge_noactionbar_spinner.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_dialogwhenlarge_noactionbar_switch.png b/tests/tests/holo/res/drawable-hdpi/holo_light_dialogwhenlarge_noactionbar_switch.png
new file mode 100644
index 0000000..64a0e59
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_dialogwhenlarge_noactionbar_switch.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_dialogwhenlarge_noactionbar_switch_checked.png b/tests/tests/holo/res/drawable-hdpi/holo_light_dialogwhenlarge_noactionbar_switch_checked.png
new file mode 100644
index 0000000..cf3beea
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_dialogwhenlarge_noactionbar_switch_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_dialogwhenlarge_noactionbar_tabhost.png b/tests/tests/holo/res/drawable-hdpi/holo_light_dialogwhenlarge_noactionbar_tabhost.png
new file mode 100644
index 0000000..462e9d3
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_dialogwhenlarge_noactionbar_tabhost.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_dialogwhenlarge_noactionbar_textview.png b/tests/tests/holo/res/drawable-hdpi/holo_light_dialogwhenlarge_noactionbar_textview.png
new file mode 100644
index 0000000..bbb3acf
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_dialogwhenlarge_noactionbar_textview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_dialogwhenlarge_noactionbar_timepicker.png b/tests/tests/holo/res/drawable-hdpi/holo_light_dialogwhenlarge_noactionbar_timepicker.png
new file mode 100644
index 0000000..72bb752
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_dialogwhenlarge_noactionbar_timepicker.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_dialogwhenlarge_noactionbar_toggle_button.png b/tests/tests/holo/res/drawable-hdpi/holo_light_dialogwhenlarge_noactionbar_toggle_button.png
new file mode 100644
index 0000000..49ce08d
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_dialogwhenlarge_noactionbar_toggle_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_dialogwhenlarge_noactionbar_toggle_button_checked.png b/tests/tests/holo/res/drawable-hdpi/holo_light_dialogwhenlarge_noactionbar_toggle_button_checked.png
new file mode 100644
index 0000000..9d240f3
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_dialogwhenlarge_noactionbar_toggle_button_checked.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_land_zoomcontrols.png b/tests/tests/holo/res/drawable-hdpi/holo_light_dialogwhenlarge_noactionbar_zoomcontrols.png
similarity index 100%
copy from tests/res/drawable-hdpi/holo_land_zoomcontrols.png
copy to tests/tests/holo/res/drawable-hdpi/holo_light_dialogwhenlarge_noactionbar_zoomcontrols.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_dialogwhenlarge_progressbar.png b/tests/tests/holo/res/drawable-hdpi/holo_light_dialogwhenlarge_progressbar.png
new file mode 100644
index 0000000..41e958c
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_dialogwhenlarge_progressbar.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_dialogwhenlarge_progressbar_horizontal_0.png b/tests/tests/holo/res/drawable-hdpi/holo_light_dialogwhenlarge_progressbar_horizontal_0.png
new file mode 100644
index 0000000..8a2248d
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_dialogwhenlarge_progressbar_horizontal_0.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_dialogwhenlarge_progressbar_horizontal_100.png b/tests/tests/holo/res/drawable-hdpi/holo_light_dialogwhenlarge_progressbar_horizontal_100.png
new file mode 100644
index 0000000..069a67e
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_dialogwhenlarge_progressbar_horizontal_100.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_dialogwhenlarge_progressbar_horizontal_50.png b/tests/tests/holo/res/drawable-hdpi/holo_light_dialogwhenlarge_progressbar_horizontal_50.png
new file mode 100644
index 0000000..d7fa13d
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_dialogwhenlarge_progressbar_horizontal_50.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_dialogwhenlarge_progressbar_large.png b/tests/tests/holo/res/drawable-hdpi/holo_light_dialogwhenlarge_progressbar_large.png
new file mode 100644
index 0000000..0fd63d2
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_dialogwhenlarge_progressbar_large.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_dialogwhenlarge_progressbar_small.png b/tests/tests/holo/res/drawable-hdpi/holo_light_dialogwhenlarge_progressbar_small.png
new file mode 100644
index 0000000..1a270f9
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_dialogwhenlarge_progressbar_small.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_dialogwhenlarge_progressdialog_horizontal.png b/tests/tests/holo/res/drawable-hdpi/holo_light_dialogwhenlarge_progressdialog_horizontal.png
new file mode 100644
index 0000000..cd50fe6
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_dialogwhenlarge_progressdialog_horizontal.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_dialogwhenlarge_radio_button.png b/tests/tests/holo/res/drawable-hdpi/holo_light_dialogwhenlarge_radio_button.png
new file mode 100644
index 0000000..8d0bd4f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_dialogwhenlarge_radio_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_dialogwhenlarge_radio_button_checked.png b/tests/tests/holo/res/drawable-hdpi/holo_light_dialogwhenlarge_radio_button_checked.png
new file mode 100644
index 0000000..26f65ee
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_dialogwhenlarge_radio_button_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_dialogwhenlarge_radiogroup_horizontal.png b/tests/tests/holo/res/drawable-hdpi/holo_light_dialogwhenlarge_radiogroup_horizontal.png
new file mode 100644
index 0000000..dad7afc
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_dialogwhenlarge_radiogroup_horizontal.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_dialogwhenlarge_radiogroup_vertical.png b/tests/tests/holo/res/drawable-hdpi/holo_light_dialogwhenlarge_radiogroup_vertical.png
new file mode 100644
index 0000000..d8e8dfb
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_dialogwhenlarge_radiogroup_vertical.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_light_land_ratingbar_0.png b/tests/tests/holo/res/drawable-hdpi/holo_light_dialogwhenlarge_ratingbar_0.png
similarity index 100%
copy from tests/res/drawable-hdpi/holo_light_land_ratingbar_0.png
copy to tests/tests/holo/res/drawable-hdpi/holo_light_dialogwhenlarge_ratingbar_0.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_light_land_ratingbar_0_pressed.png b/tests/tests/holo/res/drawable-hdpi/holo_light_dialogwhenlarge_ratingbar_0_pressed.png
similarity index 100%
copy from tests/res/drawable-hdpi/holo_light_land_ratingbar_0_pressed.png
copy to tests/tests/holo/res/drawable-hdpi/holo_light_dialogwhenlarge_ratingbar_0_pressed.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_light_land_ratingbar_2point5.png b/tests/tests/holo/res/drawable-hdpi/holo_light_dialogwhenlarge_ratingbar_2point5.png
similarity index 100%
copy from tests/res/drawable-hdpi/holo_light_land_ratingbar_2point5.png
copy to tests/tests/holo/res/drawable-hdpi/holo_light_dialogwhenlarge_ratingbar_2point5.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_light_land_ratingbar_2point5_pressed.png b/tests/tests/holo/res/drawable-hdpi/holo_light_dialogwhenlarge_ratingbar_2point5_pressed.png
similarity index 100%
copy from tests/res/drawable-hdpi/holo_light_land_ratingbar_2point5_pressed.png
copy to tests/tests/holo/res/drawable-hdpi/holo_light_dialogwhenlarge_ratingbar_2point5_pressed.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_light_land_ratingbar_5.png b/tests/tests/holo/res/drawable-hdpi/holo_light_dialogwhenlarge_ratingbar_5.png
similarity index 100%
copy from tests/res/drawable-hdpi/holo_light_land_ratingbar_5.png
copy to tests/tests/holo/res/drawable-hdpi/holo_light_dialogwhenlarge_ratingbar_5.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_light_land_ratingbar_5_pressed.png b/tests/tests/holo/res/drawable-hdpi/holo_light_dialogwhenlarge_ratingbar_5_pressed.png
similarity index 100%
copy from tests/res/drawable-hdpi/holo_light_land_ratingbar_5_pressed.png
copy to tests/tests/holo/res/drawable-hdpi/holo_light_dialogwhenlarge_ratingbar_5_pressed.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_dialogwhenlarge_searchview.png b/tests/tests/holo/res/drawable-hdpi/holo_light_dialogwhenlarge_searchview.png
new file mode 100644
index 0000000..4fa916a
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_dialogwhenlarge_searchview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_dialogwhenlarge_searchview_query.png b/tests/tests/holo/res/drawable-hdpi/holo_light_dialogwhenlarge_searchview_query.png
new file mode 100644
index 0000000..bf3c4c0
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_dialogwhenlarge_searchview_query.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_dialogwhenlarge_searchview_query_hint.png b/tests/tests/holo/res/drawable-hdpi/holo_light_dialogwhenlarge_searchview_query_hint.png
new file mode 100644
index 0000000..da47cb1
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_dialogwhenlarge_searchview_query_hint.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_dialogwhenlarge_seekbar_0.png b/tests/tests/holo/res/drawable-hdpi/holo_light_dialogwhenlarge_seekbar_0.png
new file mode 100644
index 0000000..bbdaa9c
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_dialogwhenlarge_seekbar_0.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_dialogwhenlarge_seekbar_100.png b/tests/tests/holo/res/drawable-hdpi/holo_light_dialogwhenlarge_seekbar_100.png
new file mode 100644
index 0000000..b89ea7d
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_dialogwhenlarge_seekbar_100.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_dialogwhenlarge_seekbar_50.png b/tests/tests/holo/res/drawable-hdpi/holo_light_dialogwhenlarge_seekbar_50.png
new file mode 100644
index 0000000..e8320ca
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_dialogwhenlarge_seekbar_50.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_dialogwhenlarge_spinner.png b/tests/tests/holo/res/drawable-hdpi/holo_light_dialogwhenlarge_spinner.png
new file mode 100644
index 0000000..d7f357a
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_dialogwhenlarge_spinner.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_dialogwhenlarge_switch.png b/tests/tests/holo/res/drawable-hdpi/holo_light_dialogwhenlarge_switch.png
new file mode 100644
index 0000000..64a0e59
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_dialogwhenlarge_switch.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_dialogwhenlarge_switch_checked.png b/tests/tests/holo/res/drawable-hdpi/holo_light_dialogwhenlarge_switch_checked.png
new file mode 100644
index 0000000..cf3beea
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_dialogwhenlarge_switch_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_dialogwhenlarge_tabhost.png b/tests/tests/holo/res/drawable-hdpi/holo_light_dialogwhenlarge_tabhost.png
new file mode 100644
index 0000000..462e9d3
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_dialogwhenlarge_tabhost.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_dialogwhenlarge_textview.png b/tests/tests/holo/res/drawable-hdpi/holo_light_dialogwhenlarge_textview.png
new file mode 100644
index 0000000..bbb3acf
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_dialogwhenlarge_textview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_dialogwhenlarge_timepicker.png b/tests/tests/holo/res/drawable-hdpi/holo_light_dialogwhenlarge_timepicker.png
new file mode 100644
index 0000000..72bb752
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_dialogwhenlarge_timepicker.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_dialogwhenlarge_toggle_button.png b/tests/tests/holo/res/drawable-hdpi/holo_light_dialogwhenlarge_toggle_button.png
new file mode 100644
index 0000000..49ce08d
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_dialogwhenlarge_toggle_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_dialogwhenlarge_toggle_button_checked.png b/tests/tests/holo/res/drawable-hdpi/holo_light_dialogwhenlarge_toggle_button_checked.png
new file mode 100644
index 0000000..9d240f3
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_dialogwhenlarge_toggle_button_checked.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_land_zoomcontrols.png b/tests/tests/holo/res/drawable-hdpi/holo_light_dialogwhenlarge_zoomcontrols.png
similarity index 100%
copy from tests/res/drawable-hdpi/holo_land_zoomcontrols.png
copy to tests/tests/holo/res/drawable-hdpi/holo_light_dialogwhenlarge_zoomcontrols.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_edittext.png b/tests/tests/holo/res/drawable-hdpi/holo_light_edittext.png
new file mode 100644
index 0000000..4356dd0
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_edittext.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_noactionbar_alertdialog_list.png b/tests/tests/holo/res/drawable-hdpi/holo_light_noactionbar_alertdialog_list.png
new file mode 100644
index 0000000..19843c2
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_noactionbar_alertdialog_list.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_noactionbar_alertdialog_multichoice.png b/tests/tests/holo/res/drawable-hdpi/holo_light_noactionbar_alertdialog_multichoice.png
new file mode 100644
index 0000000..45a8da0
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_noactionbar_alertdialog_multichoice.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_noactionbar_alertdialog_onebutton.png b/tests/tests/holo/res/drawable-hdpi/holo_light_noactionbar_alertdialog_onebutton.png
new file mode 100644
index 0000000..7382c6c
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_noactionbar_alertdialog_onebutton.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_noactionbar_alertdialog_singlechoice.png b/tests/tests/holo/res/drawable-hdpi/holo_light_noactionbar_alertdialog_singlechoice.png
new file mode 100644
index 0000000..c1e7f2b
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_noactionbar_alertdialog_singlechoice.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_noactionbar_alertdialog_threebuttons.png b/tests/tests/holo/res/drawable-hdpi/holo_light_noactionbar_alertdialog_threebuttons.png
new file mode 100644
index 0000000..2c65d33
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_noactionbar_alertdialog_threebuttons.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_noactionbar_alertdialog_twobuttons.png b/tests/tests/holo/res/drawable-hdpi/holo_light_noactionbar_alertdialog_twobuttons.png
new file mode 100644
index 0000000..d8c1bc4
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_noactionbar_alertdialog_twobuttons.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_noactionbar_button.png b/tests/tests/holo/res/drawable-hdpi/holo_light_noactionbar_button.png
new file mode 100644
index 0000000..8c096ca
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_noactionbar_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_noactionbar_button_pressed.png b/tests/tests/holo/res/drawable-hdpi/holo_light_noactionbar_button_pressed.png
new file mode 100644
index 0000000..5c4d96c
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_noactionbar_button_pressed.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_noactionbar_calendar_view.png b/tests/tests/holo/res/drawable-hdpi/holo_light_noactionbar_calendar_view.png
new file mode 100644
index 0000000..99d23a7
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_noactionbar_calendar_view.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_noactionbar_calendar_view_feb.png b/tests/tests/holo/res/drawable-hdpi/holo_light_noactionbar_calendar_view_feb.png
new file mode 100644
index 0000000..2c0619b
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_noactionbar_calendar_view_feb.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_noactionbar_checkbox.png b/tests/tests/holo/res/drawable-hdpi/holo_light_noactionbar_checkbox.png
new file mode 100644
index 0000000..6fd2ba2
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_noactionbar_checkbox.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_noactionbar_checkbox_checked.png b/tests/tests/holo/res/drawable-hdpi/holo_light_noactionbar_checkbox_checked.png
new file mode 100644
index 0000000..f52884c
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_noactionbar_checkbox_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_noactionbar_chronometer.png b/tests/tests/holo/res/drawable-hdpi/holo_light_noactionbar_chronometer.png
new file mode 100644
index 0000000..5ede793
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_noactionbar_chronometer.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_noactionbar_color_blue_bright.png b/tests/tests/holo/res/drawable-hdpi/holo_light_noactionbar_color_blue_bright.png
new file mode 100644
index 0000000..2d1e63f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_noactionbar_color_blue_bright.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_noactionbar_color_blue_dark.png b/tests/tests/holo/res/drawable-hdpi/holo_light_noactionbar_color_blue_dark.png
new file mode 100644
index 0000000..914e522
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_noactionbar_color_blue_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_noactionbar_color_blue_light.png b/tests/tests/holo/res/drawable-hdpi/holo_light_noactionbar_color_blue_light.png
new file mode 100644
index 0000000..a6f2f65
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_noactionbar_color_blue_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_noactionbar_color_green_dark.png b/tests/tests/holo/res/drawable-hdpi/holo_light_noactionbar_color_green_dark.png
new file mode 100644
index 0000000..2cf79d0
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_noactionbar_color_green_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_noactionbar_color_green_light.png b/tests/tests/holo/res/drawable-hdpi/holo_light_noactionbar_color_green_light.png
new file mode 100644
index 0000000..508a96e
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_noactionbar_color_green_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_noactionbar_color_orange_dark.png b/tests/tests/holo/res/drawable-hdpi/holo_light_noactionbar_color_orange_dark.png
new file mode 100644
index 0000000..4a0157f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_noactionbar_color_orange_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_noactionbar_color_orange_light.png b/tests/tests/holo/res/drawable-hdpi/holo_light_noactionbar_color_orange_light.png
new file mode 100644
index 0000000..0bdb9be
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_noactionbar_color_orange_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_noactionbar_color_purple.png b/tests/tests/holo/res/drawable-hdpi/holo_light_noactionbar_color_purple.png
new file mode 100644
index 0000000..97071db
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_noactionbar_color_purple.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_noactionbar_color_red_dark.png b/tests/tests/holo/res/drawable-hdpi/holo_light_noactionbar_color_red_dark.png
new file mode 100644
index 0000000..dbcef9d
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_noactionbar_color_red_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_noactionbar_color_red_light.png b/tests/tests/holo/res/drawable-hdpi/holo_light_noactionbar_color_red_light.png
new file mode 100644
index 0000000..c60546f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_noactionbar_color_red_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_noactionbar_edittext.png b/tests/tests/holo/res/drawable-hdpi/holo_light_noactionbar_edittext.png
new file mode 100644
index 0000000..4356dd0
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_noactionbar_edittext.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_noactionbar_fullscreen_alertdialog_list.png b/tests/tests/holo/res/drawable-hdpi/holo_light_noactionbar_fullscreen_alertdialog_list.png
new file mode 100644
index 0000000..19843c2
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_noactionbar_fullscreen_alertdialog_list.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_noactionbar_fullscreen_alertdialog_multichoice.png b/tests/tests/holo/res/drawable-hdpi/holo_light_noactionbar_fullscreen_alertdialog_multichoice.png
new file mode 100644
index 0000000..45a8da0
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_noactionbar_fullscreen_alertdialog_multichoice.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_noactionbar_fullscreen_alertdialog_onebutton.png b/tests/tests/holo/res/drawable-hdpi/holo_light_noactionbar_fullscreen_alertdialog_onebutton.png
new file mode 100644
index 0000000..7382c6c
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_noactionbar_fullscreen_alertdialog_onebutton.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_noactionbar_fullscreen_alertdialog_singlechoice.png b/tests/tests/holo/res/drawable-hdpi/holo_light_noactionbar_fullscreen_alertdialog_singlechoice.png
new file mode 100644
index 0000000..c1e7f2b
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_noactionbar_fullscreen_alertdialog_singlechoice.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_noactionbar_fullscreen_alertdialog_threebuttons.png b/tests/tests/holo/res/drawable-hdpi/holo_light_noactionbar_fullscreen_alertdialog_threebuttons.png
new file mode 100644
index 0000000..2c65d33
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_noactionbar_fullscreen_alertdialog_threebuttons.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_noactionbar_fullscreen_alertdialog_twobuttons.png b/tests/tests/holo/res/drawable-hdpi/holo_light_noactionbar_fullscreen_alertdialog_twobuttons.png
new file mode 100644
index 0000000..d8c1bc4
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_noactionbar_fullscreen_alertdialog_twobuttons.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_noactionbar_fullscreen_button.png b/tests/tests/holo/res/drawable-hdpi/holo_light_noactionbar_fullscreen_button.png
new file mode 100644
index 0000000..8c096ca
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_noactionbar_fullscreen_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_noactionbar_fullscreen_button_pressed.png b/tests/tests/holo/res/drawable-hdpi/holo_light_noactionbar_fullscreen_button_pressed.png
new file mode 100644
index 0000000..5c4d96c
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_noactionbar_fullscreen_button_pressed.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_noactionbar_fullscreen_calendar_view.png b/tests/tests/holo/res/drawable-hdpi/holo_light_noactionbar_fullscreen_calendar_view.png
new file mode 100644
index 0000000..99d23a7
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_noactionbar_fullscreen_calendar_view.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_noactionbar_fullscreen_calendar_view_feb.png b/tests/tests/holo/res/drawable-hdpi/holo_light_noactionbar_fullscreen_calendar_view_feb.png
new file mode 100644
index 0000000..2c0619b
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_noactionbar_fullscreen_calendar_view_feb.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_noactionbar_fullscreen_checkbox.png b/tests/tests/holo/res/drawable-hdpi/holo_light_noactionbar_fullscreen_checkbox.png
new file mode 100644
index 0000000..6fd2ba2
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_noactionbar_fullscreen_checkbox.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_noactionbar_fullscreen_checkbox_checked.png b/tests/tests/holo/res/drawable-hdpi/holo_light_noactionbar_fullscreen_checkbox_checked.png
new file mode 100644
index 0000000..f52884c
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_noactionbar_fullscreen_checkbox_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_noactionbar_fullscreen_chronometer.png b/tests/tests/holo/res/drawable-hdpi/holo_light_noactionbar_fullscreen_chronometer.png
new file mode 100644
index 0000000..5ede793
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_noactionbar_fullscreen_chronometer.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_noactionbar_fullscreen_color_blue_bright.png b/tests/tests/holo/res/drawable-hdpi/holo_light_noactionbar_fullscreen_color_blue_bright.png
new file mode 100644
index 0000000..2d1e63f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_noactionbar_fullscreen_color_blue_bright.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_noactionbar_fullscreen_color_blue_dark.png b/tests/tests/holo/res/drawable-hdpi/holo_light_noactionbar_fullscreen_color_blue_dark.png
new file mode 100644
index 0000000..914e522
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_noactionbar_fullscreen_color_blue_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_noactionbar_fullscreen_color_blue_light.png b/tests/tests/holo/res/drawable-hdpi/holo_light_noactionbar_fullscreen_color_blue_light.png
new file mode 100644
index 0000000..a6f2f65
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_noactionbar_fullscreen_color_blue_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_noactionbar_fullscreen_color_green_dark.png b/tests/tests/holo/res/drawable-hdpi/holo_light_noactionbar_fullscreen_color_green_dark.png
new file mode 100644
index 0000000..2cf79d0
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_noactionbar_fullscreen_color_green_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_noactionbar_fullscreen_color_green_light.png b/tests/tests/holo/res/drawable-hdpi/holo_light_noactionbar_fullscreen_color_green_light.png
new file mode 100644
index 0000000..508a96e
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_noactionbar_fullscreen_color_green_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_noactionbar_fullscreen_color_orange_dark.png b/tests/tests/holo/res/drawable-hdpi/holo_light_noactionbar_fullscreen_color_orange_dark.png
new file mode 100644
index 0000000..4a0157f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_noactionbar_fullscreen_color_orange_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_noactionbar_fullscreen_color_orange_light.png b/tests/tests/holo/res/drawable-hdpi/holo_light_noactionbar_fullscreen_color_orange_light.png
new file mode 100644
index 0000000..0bdb9be
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_noactionbar_fullscreen_color_orange_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_noactionbar_fullscreen_color_purple.png b/tests/tests/holo/res/drawable-hdpi/holo_light_noactionbar_fullscreen_color_purple.png
new file mode 100644
index 0000000..97071db
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_noactionbar_fullscreen_color_purple.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_noactionbar_fullscreen_color_red_dark.png b/tests/tests/holo/res/drawable-hdpi/holo_light_noactionbar_fullscreen_color_red_dark.png
new file mode 100644
index 0000000..dbcef9d
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_noactionbar_fullscreen_color_red_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_noactionbar_fullscreen_color_red_light.png b/tests/tests/holo/res/drawable-hdpi/holo_light_noactionbar_fullscreen_color_red_light.png
new file mode 100644
index 0000000..c60546f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_noactionbar_fullscreen_color_red_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_noactionbar_fullscreen_edittext.png b/tests/tests/holo/res/drawable-hdpi/holo_light_noactionbar_fullscreen_edittext.png
new file mode 100644
index 0000000..4356dd0
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_noactionbar_fullscreen_edittext.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_noactionbar_fullscreen_progressbar.png b/tests/tests/holo/res/drawable-hdpi/holo_light_noactionbar_fullscreen_progressbar.png
new file mode 100644
index 0000000..41e958c
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_noactionbar_fullscreen_progressbar.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_noactionbar_fullscreen_progressbar_horizontal_0.png b/tests/tests/holo/res/drawable-hdpi/holo_light_noactionbar_fullscreen_progressbar_horizontal_0.png
new file mode 100644
index 0000000..8a2248d
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_noactionbar_fullscreen_progressbar_horizontal_0.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_noactionbar_fullscreen_progressbar_horizontal_100.png b/tests/tests/holo/res/drawable-hdpi/holo_light_noactionbar_fullscreen_progressbar_horizontal_100.png
new file mode 100644
index 0000000..069a67e
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_noactionbar_fullscreen_progressbar_horizontal_100.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_noactionbar_fullscreen_progressbar_horizontal_50.png b/tests/tests/holo/res/drawable-hdpi/holo_light_noactionbar_fullscreen_progressbar_horizontal_50.png
new file mode 100644
index 0000000..d7fa13d
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_noactionbar_fullscreen_progressbar_horizontal_50.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_noactionbar_fullscreen_progressbar_large.png b/tests/tests/holo/res/drawable-hdpi/holo_light_noactionbar_fullscreen_progressbar_large.png
new file mode 100644
index 0000000..0fd63d2
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_noactionbar_fullscreen_progressbar_large.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_noactionbar_fullscreen_progressbar_small.png b/tests/tests/holo/res/drawable-hdpi/holo_light_noactionbar_fullscreen_progressbar_small.png
new file mode 100644
index 0000000..1a270f9
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_noactionbar_fullscreen_progressbar_small.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_noactionbar_fullscreen_progressdialog_horizontal.png b/tests/tests/holo/res/drawable-hdpi/holo_light_noactionbar_fullscreen_progressdialog_horizontal.png
new file mode 100644
index 0000000..cd50fe6
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_noactionbar_fullscreen_progressdialog_horizontal.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_noactionbar_fullscreen_radio_button.png b/tests/tests/holo/res/drawable-hdpi/holo_light_noactionbar_fullscreen_radio_button.png
new file mode 100644
index 0000000..8d0bd4f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_noactionbar_fullscreen_radio_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_noactionbar_fullscreen_radio_button_checked.png b/tests/tests/holo/res/drawable-hdpi/holo_light_noactionbar_fullscreen_radio_button_checked.png
new file mode 100644
index 0000000..26f65ee
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_noactionbar_fullscreen_radio_button_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_noactionbar_fullscreen_radiogroup_horizontal.png b/tests/tests/holo/res/drawable-hdpi/holo_light_noactionbar_fullscreen_radiogroup_horizontal.png
new file mode 100644
index 0000000..dad7afc
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_noactionbar_fullscreen_radiogroup_horizontal.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_noactionbar_fullscreen_radiogroup_vertical.png b/tests/tests/holo/res/drawable-hdpi/holo_light_noactionbar_fullscreen_radiogroup_vertical.png
new file mode 100644
index 0000000..d8e8dfb
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_noactionbar_fullscreen_radiogroup_vertical.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_light_land_ratingbar_0.png b/tests/tests/holo/res/drawable-hdpi/holo_light_noactionbar_fullscreen_ratingbar_0.png
similarity index 100%
copy from tests/res/drawable-hdpi/holo_light_land_ratingbar_0.png
copy to tests/tests/holo/res/drawable-hdpi/holo_light_noactionbar_fullscreen_ratingbar_0.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_light_land_ratingbar_0_pressed.png b/tests/tests/holo/res/drawable-hdpi/holo_light_noactionbar_fullscreen_ratingbar_0_pressed.png
similarity index 100%
copy from tests/res/drawable-hdpi/holo_light_land_ratingbar_0_pressed.png
copy to tests/tests/holo/res/drawable-hdpi/holo_light_noactionbar_fullscreen_ratingbar_0_pressed.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_light_land_ratingbar_2point5.png b/tests/tests/holo/res/drawable-hdpi/holo_light_noactionbar_fullscreen_ratingbar_2point5.png
similarity index 100%
copy from tests/res/drawable-hdpi/holo_light_land_ratingbar_2point5.png
copy to tests/tests/holo/res/drawable-hdpi/holo_light_noactionbar_fullscreen_ratingbar_2point5.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_light_land_ratingbar_2point5_pressed.png b/tests/tests/holo/res/drawable-hdpi/holo_light_noactionbar_fullscreen_ratingbar_2point5_pressed.png
similarity index 100%
copy from tests/res/drawable-hdpi/holo_light_land_ratingbar_2point5_pressed.png
copy to tests/tests/holo/res/drawable-hdpi/holo_light_noactionbar_fullscreen_ratingbar_2point5_pressed.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_light_land_ratingbar_5.png b/tests/tests/holo/res/drawable-hdpi/holo_light_noactionbar_fullscreen_ratingbar_5.png
similarity index 100%
copy from tests/res/drawable-hdpi/holo_light_land_ratingbar_5.png
copy to tests/tests/holo/res/drawable-hdpi/holo_light_noactionbar_fullscreen_ratingbar_5.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_light_land_ratingbar_5_pressed.png b/tests/tests/holo/res/drawable-hdpi/holo_light_noactionbar_fullscreen_ratingbar_5_pressed.png
similarity index 100%
copy from tests/res/drawable-hdpi/holo_light_land_ratingbar_5_pressed.png
copy to tests/tests/holo/res/drawable-hdpi/holo_light_noactionbar_fullscreen_ratingbar_5_pressed.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_noactionbar_fullscreen_searchview.png b/tests/tests/holo/res/drawable-hdpi/holo_light_noactionbar_fullscreen_searchview.png
new file mode 100644
index 0000000..4fa916a
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_noactionbar_fullscreen_searchview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_noactionbar_fullscreen_searchview_query.png b/tests/tests/holo/res/drawable-hdpi/holo_light_noactionbar_fullscreen_searchview_query.png
new file mode 100644
index 0000000..bf3c4c0
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_noactionbar_fullscreen_searchview_query.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_noactionbar_fullscreen_searchview_query_hint.png b/tests/tests/holo/res/drawable-hdpi/holo_light_noactionbar_fullscreen_searchview_query_hint.png
new file mode 100644
index 0000000..da47cb1
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_noactionbar_fullscreen_searchview_query_hint.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_noactionbar_fullscreen_seekbar_0.png b/tests/tests/holo/res/drawable-hdpi/holo_light_noactionbar_fullscreen_seekbar_0.png
new file mode 100644
index 0000000..bbdaa9c
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_noactionbar_fullscreen_seekbar_0.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_noactionbar_fullscreen_seekbar_100.png b/tests/tests/holo/res/drawable-hdpi/holo_light_noactionbar_fullscreen_seekbar_100.png
new file mode 100644
index 0000000..b89ea7d
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_noactionbar_fullscreen_seekbar_100.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_noactionbar_fullscreen_seekbar_50.png b/tests/tests/holo/res/drawable-hdpi/holo_light_noactionbar_fullscreen_seekbar_50.png
new file mode 100644
index 0000000..e8320ca
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_noactionbar_fullscreen_seekbar_50.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_noactionbar_fullscreen_spinner.png b/tests/tests/holo/res/drawable-hdpi/holo_light_noactionbar_fullscreen_spinner.png
new file mode 100644
index 0000000..d7f357a
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_noactionbar_fullscreen_spinner.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_noactionbar_fullscreen_switch.png b/tests/tests/holo/res/drawable-hdpi/holo_light_noactionbar_fullscreen_switch.png
new file mode 100644
index 0000000..64a0e59
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_noactionbar_fullscreen_switch.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_noactionbar_fullscreen_switch_checked.png b/tests/tests/holo/res/drawable-hdpi/holo_light_noactionbar_fullscreen_switch_checked.png
new file mode 100644
index 0000000..cf3beea
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_noactionbar_fullscreen_switch_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_noactionbar_fullscreen_tabhost.png b/tests/tests/holo/res/drawable-hdpi/holo_light_noactionbar_fullscreen_tabhost.png
new file mode 100644
index 0000000..462e9d3
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_noactionbar_fullscreen_tabhost.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_noactionbar_fullscreen_textview.png b/tests/tests/holo/res/drawable-hdpi/holo_light_noactionbar_fullscreen_textview.png
new file mode 100644
index 0000000..bbb3acf
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_noactionbar_fullscreen_textview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_noactionbar_fullscreen_timepicker.png b/tests/tests/holo/res/drawable-hdpi/holo_light_noactionbar_fullscreen_timepicker.png
new file mode 100644
index 0000000..72bb752
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_noactionbar_fullscreen_timepicker.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_noactionbar_fullscreen_toggle_button.png b/tests/tests/holo/res/drawable-hdpi/holo_light_noactionbar_fullscreen_toggle_button.png
new file mode 100644
index 0000000..49ce08d
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_noactionbar_fullscreen_toggle_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_noactionbar_fullscreen_toggle_button_checked.png b/tests/tests/holo/res/drawable-hdpi/holo_light_noactionbar_fullscreen_toggle_button_checked.png
new file mode 100644
index 0000000..9d240f3
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_noactionbar_fullscreen_toggle_button_checked.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_land_zoomcontrols.png b/tests/tests/holo/res/drawable-hdpi/holo_light_noactionbar_fullscreen_zoomcontrols.png
similarity index 100%
copy from tests/res/drawable-hdpi/holo_land_zoomcontrols.png
copy to tests/tests/holo/res/drawable-hdpi/holo_light_noactionbar_fullscreen_zoomcontrols.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_noactionbar_progressbar.png b/tests/tests/holo/res/drawable-hdpi/holo_light_noactionbar_progressbar.png
new file mode 100644
index 0000000..41e958c
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_noactionbar_progressbar.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_noactionbar_progressbar_horizontal_0.png b/tests/tests/holo/res/drawable-hdpi/holo_light_noactionbar_progressbar_horizontal_0.png
new file mode 100644
index 0000000..8a2248d
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_noactionbar_progressbar_horizontal_0.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_noactionbar_progressbar_horizontal_100.png b/tests/tests/holo/res/drawable-hdpi/holo_light_noactionbar_progressbar_horizontal_100.png
new file mode 100644
index 0000000..069a67e
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_noactionbar_progressbar_horizontal_100.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_noactionbar_progressbar_horizontal_50.png b/tests/tests/holo/res/drawable-hdpi/holo_light_noactionbar_progressbar_horizontal_50.png
new file mode 100644
index 0000000..d7fa13d
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_noactionbar_progressbar_horizontal_50.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_noactionbar_progressbar_large.png b/tests/tests/holo/res/drawable-hdpi/holo_light_noactionbar_progressbar_large.png
new file mode 100644
index 0000000..0fd63d2
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_noactionbar_progressbar_large.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_noactionbar_progressbar_small.png b/tests/tests/holo/res/drawable-hdpi/holo_light_noactionbar_progressbar_small.png
new file mode 100644
index 0000000..1a270f9
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_noactionbar_progressbar_small.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_noactionbar_progressdialog_horizontal.png b/tests/tests/holo/res/drawable-hdpi/holo_light_noactionbar_progressdialog_horizontal.png
new file mode 100644
index 0000000..cd50fe6
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_noactionbar_progressdialog_horizontal.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_noactionbar_radio_button.png b/tests/tests/holo/res/drawable-hdpi/holo_light_noactionbar_radio_button.png
new file mode 100644
index 0000000..8d0bd4f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_noactionbar_radio_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_noactionbar_radio_button_checked.png b/tests/tests/holo/res/drawable-hdpi/holo_light_noactionbar_radio_button_checked.png
new file mode 100644
index 0000000..26f65ee
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_noactionbar_radio_button_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_noactionbar_radiogroup_horizontal.png b/tests/tests/holo/res/drawable-hdpi/holo_light_noactionbar_radiogroup_horizontal.png
new file mode 100644
index 0000000..dad7afc
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_noactionbar_radiogroup_horizontal.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_noactionbar_radiogroup_vertical.png b/tests/tests/holo/res/drawable-hdpi/holo_light_noactionbar_radiogroup_vertical.png
new file mode 100644
index 0000000..d8e8dfb
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_noactionbar_radiogroup_vertical.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_light_land_ratingbar_0.png b/tests/tests/holo/res/drawable-hdpi/holo_light_noactionbar_ratingbar_0.png
similarity index 100%
copy from tests/res/drawable-hdpi/holo_light_land_ratingbar_0.png
copy to tests/tests/holo/res/drawable-hdpi/holo_light_noactionbar_ratingbar_0.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_light_land_ratingbar_0_pressed.png b/tests/tests/holo/res/drawable-hdpi/holo_light_noactionbar_ratingbar_0_pressed.png
similarity index 100%
copy from tests/res/drawable-hdpi/holo_light_land_ratingbar_0_pressed.png
copy to tests/tests/holo/res/drawable-hdpi/holo_light_noactionbar_ratingbar_0_pressed.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_light_land_ratingbar_2point5.png b/tests/tests/holo/res/drawable-hdpi/holo_light_noactionbar_ratingbar_2point5.png
similarity index 100%
copy from tests/res/drawable-hdpi/holo_light_land_ratingbar_2point5.png
copy to tests/tests/holo/res/drawable-hdpi/holo_light_noactionbar_ratingbar_2point5.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_light_land_ratingbar_2point5_pressed.png b/tests/tests/holo/res/drawable-hdpi/holo_light_noactionbar_ratingbar_2point5_pressed.png
similarity index 100%
copy from tests/res/drawable-hdpi/holo_light_land_ratingbar_2point5_pressed.png
copy to tests/tests/holo/res/drawable-hdpi/holo_light_noactionbar_ratingbar_2point5_pressed.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_light_land_ratingbar_5.png b/tests/tests/holo/res/drawable-hdpi/holo_light_noactionbar_ratingbar_5.png
similarity index 100%
copy from tests/res/drawable-hdpi/holo_light_land_ratingbar_5.png
copy to tests/tests/holo/res/drawable-hdpi/holo_light_noactionbar_ratingbar_5.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_light_land_ratingbar_5_pressed.png b/tests/tests/holo/res/drawable-hdpi/holo_light_noactionbar_ratingbar_5_pressed.png
similarity index 100%
copy from tests/res/drawable-hdpi/holo_light_land_ratingbar_5_pressed.png
copy to tests/tests/holo/res/drawable-hdpi/holo_light_noactionbar_ratingbar_5_pressed.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_noactionbar_searchview.png b/tests/tests/holo/res/drawable-hdpi/holo_light_noactionbar_searchview.png
new file mode 100644
index 0000000..4fa916a
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_noactionbar_searchview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_noactionbar_searchview_query.png b/tests/tests/holo/res/drawable-hdpi/holo_light_noactionbar_searchview_query.png
new file mode 100644
index 0000000..bf3c4c0
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_noactionbar_searchview_query.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_noactionbar_searchview_query_hint.png b/tests/tests/holo/res/drawable-hdpi/holo_light_noactionbar_searchview_query_hint.png
new file mode 100644
index 0000000..da47cb1
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_noactionbar_searchview_query_hint.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_noactionbar_seekbar_0.png b/tests/tests/holo/res/drawable-hdpi/holo_light_noactionbar_seekbar_0.png
new file mode 100644
index 0000000..bbdaa9c
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_noactionbar_seekbar_0.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_noactionbar_seekbar_100.png b/tests/tests/holo/res/drawable-hdpi/holo_light_noactionbar_seekbar_100.png
new file mode 100644
index 0000000..b89ea7d
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_noactionbar_seekbar_100.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_noactionbar_seekbar_50.png b/tests/tests/holo/res/drawable-hdpi/holo_light_noactionbar_seekbar_50.png
new file mode 100644
index 0000000..e8320ca
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_noactionbar_seekbar_50.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_noactionbar_spinner.png b/tests/tests/holo/res/drawable-hdpi/holo_light_noactionbar_spinner.png
new file mode 100644
index 0000000..d7f357a
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_noactionbar_spinner.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_noactionbar_switch.png b/tests/tests/holo/res/drawable-hdpi/holo_light_noactionbar_switch.png
new file mode 100644
index 0000000..64a0e59
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_noactionbar_switch.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_noactionbar_switch_checked.png b/tests/tests/holo/res/drawable-hdpi/holo_light_noactionbar_switch_checked.png
new file mode 100644
index 0000000..cf3beea
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_noactionbar_switch_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_noactionbar_tabhost.png b/tests/tests/holo/res/drawable-hdpi/holo_light_noactionbar_tabhost.png
new file mode 100644
index 0000000..462e9d3
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_noactionbar_tabhost.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_noactionbar_textview.png b/tests/tests/holo/res/drawable-hdpi/holo_light_noactionbar_textview.png
new file mode 100644
index 0000000..bbb3acf
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_noactionbar_textview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_noactionbar_timepicker.png b/tests/tests/holo/res/drawable-hdpi/holo_light_noactionbar_timepicker.png
new file mode 100644
index 0000000..72bb752
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_noactionbar_timepicker.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_noactionbar_toggle_button.png b/tests/tests/holo/res/drawable-hdpi/holo_light_noactionbar_toggle_button.png
new file mode 100644
index 0000000..49ce08d
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_noactionbar_toggle_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_noactionbar_toggle_button_checked.png b/tests/tests/holo/res/drawable-hdpi/holo_light_noactionbar_toggle_button_checked.png
new file mode 100644
index 0000000..9d240f3
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_noactionbar_toggle_button_checked.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_land_zoomcontrols.png b/tests/tests/holo/res/drawable-hdpi/holo_light_noactionbar_zoomcontrols.png
similarity index 100%
copy from tests/res/drawable-hdpi/holo_land_zoomcontrols.png
copy to tests/tests/holo/res/drawable-hdpi/holo_light_noactionbar_zoomcontrols.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_panel_alertdialog_list.png b/tests/tests/holo/res/drawable-hdpi/holo_light_panel_alertdialog_list.png
new file mode 100644
index 0000000..19843c2
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_panel_alertdialog_list.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_panel_alertdialog_multichoice.png b/tests/tests/holo/res/drawable-hdpi/holo_light_panel_alertdialog_multichoice.png
new file mode 100644
index 0000000..45a8da0
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_panel_alertdialog_multichoice.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_panel_alertdialog_onebutton.png b/tests/tests/holo/res/drawable-hdpi/holo_light_panel_alertdialog_onebutton.png
new file mode 100644
index 0000000..7382c6c
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_panel_alertdialog_onebutton.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_panel_alertdialog_singlechoice.png b/tests/tests/holo/res/drawable-hdpi/holo_light_panel_alertdialog_singlechoice.png
new file mode 100644
index 0000000..c1e7f2b
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_panel_alertdialog_singlechoice.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_panel_alertdialog_threebuttons.png b/tests/tests/holo/res/drawable-hdpi/holo_light_panel_alertdialog_threebuttons.png
new file mode 100644
index 0000000..2c65d33
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_panel_alertdialog_threebuttons.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_panel_alertdialog_twobuttons.png b/tests/tests/holo/res/drawable-hdpi/holo_light_panel_alertdialog_twobuttons.png
new file mode 100644
index 0000000..d8c1bc4
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_panel_alertdialog_twobuttons.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_panel_button.png b/tests/tests/holo/res/drawable-hdpi/holo_light_panel_button.png
new file mode 100644
index 0000000..8c096ca
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_panel_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_panel_button_pressed.png b/tests/tests/holo/res/drawable-hdpi/holo_light_panel_button_pressed.png
new file mode 100644
index 0000000..5c4d96c
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_panel_button_pressed.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_panel_calendar_view.png b/tests/tests/holo/res/drawable-hdpi/holo_light_panel_calendar_view.png
new file mode 100644
index 0000000..99d23a7
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_panel_calendar_view.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_panel_calendar_view_feb.png b/tests/tests/holo/res/drawable-hdpi/holo_light_panel_calendar_view_feb.png
new file mode 100644
index 0000000..2c0619b
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_panel_calendar_view_feb.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_panel_checkbox.png b/tests/tests/holo/res/drawable-hdpi/holo_light_panel_checkbox.png
new file mode 100644
index 0000000..6fd2ba2
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_panel_checkbox.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_panel_checkbox_checked.png b/tests/tests/holo/res/drawable-hdpi/holo_light_panel_checkbox_checked.png
new file mode 100644
index 0000000..f52884c
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_panel_checkbox_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_panel_chronometer.png b/tests/tests/holo/res/drawable-hdpi/holo_light_panel_chronometer.png
new file mode 100644
index 0000000..5ede793
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_panel_chronometer.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_panel_color_blue_bright.png b/tests/tests/holo/res/drawable-hdpi/holo_light_panel_color_blue_bright.png
new file mode 100644
index 0000000..2d1e63f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_panel_color_blue_bright.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_panel_color_blue_dark.png b/tests/tests/holo/res/drawable-hdpi/holo_light_panel_color_blue_dark.png
new file mode 100644
index 0000000..914e522
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_panel_color_blue_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_panel_color_blue_light.png b/tests/tests/holo/res/drawable-hdpi/holo_light_panel_color_blue_light.png
new file mode 100644
index 0000000..a6f2f65
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_panel_color_blue_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_panel_color_green_dark.png b/tests/tests/holo/res/drawable-hdpi/holo_light_panel_color_green_dark.png
new file mode 100644
index 0000000..2cf79d0
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_panel_color_green_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_panel_color_green_light.png b/tests/tests/holo/res/drawable-hdpi/holo_light_panel_color_green_light.png
new file mode 100644
index 0000000..508a96e
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_panel_color_green_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_panel_color_orange_dark.png b/tests/tests/holo/res/drawable-hdpi/holo_light_panel_color_orange_dark.png
new file mode 100644
index 0000000..4a0157f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_panel_color_orange_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_panel_color_orange_light.png b/tests/tests/holo/res/drawable-hdpi/holo_light_panel_color_orange_light.png
new file mode 100644
index 0000000..0bdb9be
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_panel_color_orange_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_panel_color_purple.png b/tests/tests/holo/res/drawable-hdpi/holo_light_panel_color_purple.png
new file mode 100644
index 0000000..97071db
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_panel_color_purple.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_panel_color_red_dark.png b/tests/tests/holo/res/drawable-hdpi/holo_light_panel_color_red_dark.png
new file mode 100644
index 0000000..dbcef9d
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_panel_color_red_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_panel_color_red_light.png b/tests/tests/holo/res/drawable-hdpi/holo_light_panel_color_red_light.png
new file mode 100644
index 0000000..c60546f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_panel_color_red_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_panel_edittext.png b/tests/tests/holo/res/drawable-hdpi/holo_light_panel_edittext.png
new file mode 100644
index 0000000..4356dd0
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_panel_edittext.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_panel_progressbar.png b/tests/tests/holo/res/drawable-hdpi/holo_light_panel_progressbar.png
new file mode 100644
index 0000000..41e958c
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_panel_progressbar.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_panel_progressbar_horizontal_0.png b/tests/tests/holo/res/drawable-hdpi/holo_light_panel_progressbar_horizontal_0.png
new file mode 100644
index 0000000..8a2248d
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_panel_progressbar_horizontal_0.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_panel_progressbar_horizontal_100.png b/tests/tests/holo/res/drawable-hdpi/holo_light_panel_progressbar_horizontal_100.png
new file mode 100644
index 0000000..069a67e
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_panel_progressbar_horizontal_100.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_panel_progressbar_horizontal_50.png b/tests/tests/holo/res/drawable-hdpi/holo_light_panel_progressbar_horizontal_50.png
new file mode 100644
index 0000000..d7fa13d
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_panel_progressbar_horizontal_50.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_panel_progressbar_large.png b/tests/tests/holo/res/drawable-hdpi/holo_light_panel_progressbar_large.png
new file mode 100644
index 0000000..0fd63d2
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_panel_progressbar_large.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_panel_progressbar_small.png b/tests/tests/holo/res/drawable-hdpi/holo_light_panel_progressbar_small.png
new file mode 100644
index 0000000..1a270f9
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_panel_progressbar_small.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_panel_progressdialog_horizontal.png b/tests/tests/holo/res/drawable-hdpi/holo_light_panel_progressdialog_horizontal.png
new file mode 100644
index 0000000..cd50fe6
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_panel_progressdialog_horizontal.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_panel_radio_button.png b/tests/tests/holo/res/drawable-hdpi/holo_light_panel_radio_button.png
new file mode 100644
index 0000000..8d0bd4f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_panel_radio_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_panel_radio_button_checked.png b/tests/tests/holo/res/drawable-hdpi/holo_light_panel_radio_button_checked.png
new file mode 100644
index 0000000..26f65ee
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_panel_radio_button_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_panel_radiogroup_horizontal.png b/tests/tests/holo/res/drawable-hdpi/holo_light_panel_radiogroup_horizontal.png
new file mode 100644
index 0000000..dad7afc
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_panel_radiogroup_horizontal.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_panel_radiogroup_vertical.png b/tests/tests/holo/res/drawable-hdpi/holo_light_panel_radiogroup_vertical.png
new file mode 100644
index 0000000..d8e8dfb
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_panel_radiogroup_vertical.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_light_land_ratingbar_0.png b/tests/tests/holo/res/drawable-hdpi/holo_light_panel_ratingbar_0.png
similarity index 100%
copy from tests/res/drawable-hdpi/holo_light_land_ratingbar_0.png
copy to tests/tests/holo/res/drawable-hdpi/holo_light_panel_ratingbar_0.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_light_land_ratingbar_0_pressed.png b/tests/tests/holo/res/drawable-hdpi/holo_light_panel_ratingbar_0_pressed.png
similarity index 100%
copy from tests/res/drawable-hdpi/holo_light_land_ratingbar_0_pressed.png
copy to tests/tests/holo/res/drawable-hdpi/holo_light_panel_ratingbar_0_pressed.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_light_land_ratingbar_2point5.png b/tests/tests/holo/res/drawable-hdpi/holo_light_panel_ratingbar_2point5.png
similarity index 100%
copy from tests/res/drawable-hdpi/holo_light_land_ratingbar_2point5.png
copy to tests/tests/holo/res/drawable-hdpi/holo_light_panel_ratingbar_2point5.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_light_land_ratingbar_2point5_pressed.png b/tests/tests/holo/res/drawable-hdpi/holo_light_panel_ratingbar_2point5_pressed.png
similarity index 100%
copy from tests/res/drawable-hdpi/holo_light_land_ratingbar_2point5_pressed.png
copy to tests/tests/holo/res/drawable-hdpi/holo_light_panel_ratingbar_2point5_pressed.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_light_land_ratingbar_5.png b/tests/tests/holo/res/drawable-hdpi/holo_light_panel_ratingbar_5.png
similarity index 100%
copy from tests/res/drawable-hdpi/holo_light_land_ratingbar_5.png
copy to tests/tests/holo/res/drawable-hdpi/holo_light_panel_ratingbar_5.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_light_land_ratingbar_5_pressed.png b/tests/tests/holo/res/drawable-hdpi/holo_light_panel_ratingbar_5_pressed.png
similarity index 100%
copy from tests/res/drawable-hdpi/holo_light_land_ratingbar_5_pressed.png
copy to tests/tests/holo/res/drawable-hdpi/holo_light_panel_ratingbar_5_pressed.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_panel_searchview.png b/tests/tests/holo/res/drawable-hdpi/holo_light_panel_searchview.png
new file mode 100644
index 0000000..4fa916a
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_panel_searchview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_panel_searchview_query.png b/tests/tests/holo/res/drawable-hdpi/holo_light_panel_searchview_query.png
new file mode 100644
index 0000000..bf3c4c0
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_panel_searchview_query.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_panel_searchview_query_hint.png b/tests/tests/holo/res/drawable-hdpi/holo_light_panel_searchview_query_hint.png
new file mode 100644
index 0000000..da47cb1
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_panel_searchview_query_hint.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_panel_seekbar_0.png b/tests/tests/holo/res/drawable-hdpi/holo_light_panel_seekbar_0.png
new file mode 100644
index 0000000..bbdaa9c
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_panel_seekbar_0.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_panel_seekbar_100.png b/tests/tests/holo/res/drawable-hdpi/holo_light_panel_seekbar_100.png
new file mode 100644
index 0000000..b89ea7d
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_panel_seekbar_100.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_panel_seekbar_50.png b/tests/tests/holo/res/drawable-hdpi/holo_light_panel_seekbar_50.png
new file mode 100644
index 0000000..e8320ca
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_panel_seekbar_50.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_panel_spinner.png b/tests/tests/holo/res/drawable-hdpi/holo_light_panel_spinner.png
new file mode 100644
index 0000000..d7f357a
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_panel_spinner.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_panel_switch.png b/tests/tests/holo/res/drawable-hdpi/holo_light_panel_switch.png
new file mode 100644
index 0000000..64a0e59
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_panel_switch.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_panel_switch_checked.png b/tests/tests/holo/res/drawable-hdpi/holo_light_panel_switch_checked.png
new file mode 100644
index 0000000..cf3beea
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_panel_switch_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_panel_tabhost.png b/tests/tests/holo/res/drawable-hdpi/holo_light_panel_tabhost.png
new file mode 100644
index 0000000..462e9d3
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_panel_tabhost.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_panel_textview.png b/tests/tests/holo/res/drawable-hdpi/holo_light_panel_textview.png
new file mode 100644
index 0000000..bbb3acf
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_panel_textview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_panel_timepicker.png b/tests/tests/holo/res/drawable-hdpi/holo_light_panel_timepicker.png
new file mode 100644
index 0000000..72bb752
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_panel_timepicker.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_panel_toggle_button.png b/tests/tests/holo/res/drawable-hdpi/holo_light_panel_toggle_button.png
new file mode 100644
index 0000000..49ce08d
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_panel_toggle_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_panel_toggle_button_checked.png b/tests/tests/holo/res/drawable-hdpi/holo_light_panel_toggle_button_checked.png
new file mode 100644
index 0000000..9d240f3
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_panel_toggle_button_checked.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_land_zoomcontrols.png b/tests/tests/holo/res/drawable-hdpi/holo_light_panel_zoomcontrols.png
similarity index 100%
copy from tests/res/drawable-hdpi/holo_land_zoomcontrols.png
copy to tests/tests/holo/res/drawable-hdpi/holo_light_panel_zoomcontrols.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_progressbar.png b/tests/tests/holo/res/drawable-hdpi/holo_light_progressbar.png
new file mode 100644
index 0000000..41e958c
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_progressbar.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_progressbar_horizontal_0.png b/tests/tests/holo/res/drawable-hdpi/holo_light_progressbar_horizontal_0.png
new file mode 100644
index 0000000..8a2248d
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_progressbar_horizontal_0.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_progressbar_horizontal_100.png b/tests/tests/holo/res/drawable-hdpi/holo_light_progressbar_horizontal_100.png
new file mode 100644
index 0000000..069a67e
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_progressbar_horizontal_100.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_progressbar_horizontal_50.png b/tests/tests/holo/res/drawable-hdpi/holo_light_progressbar_horizontal_50.png
new file mode 100644
index 0000000..d7fa13d
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_progressbar_horizontal_50.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_progressbar_large.png b/tests/tests/holo/res/drawable-hdpi/holo_light_progressbar_large.png
new file mode 100644
index 0000000..0fd63d2
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_progressbar_large.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_progressbar_small.png b/tests/tests/holo/res/drawable-hdpi/holo_light_progressbar_small.png
new file mode 100644
index 0000000..1a270f9
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_progressbar_small.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_progressdialog_horizontal.png b/tests/tests/holo/res/drawable-hdpi/holo_light_progressdialog_horizontal.png
new file mode 100644
index 0000000..cd50fe6
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_progressdialog_horizontal.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_radio_button.png b/tests/tests/holo/res/drawable-hdpi/holo_light_radio_button.png
new file mode 100644
index 0000000..8d0bd4f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_radio_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_radio_button_checked.png b/tests/tests/holo/res/drawable-hdpi/holo_light_radio_button_checked.png
new file mode 100644
index 0000000..26f65ee
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_radio_button_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_radiogroup_horizontal.png b/tests/tests/holo/res/drawable-hdpi/holo_light_radiogroup_horizontal.png
new file mode 100644
index 0000000..dad7afc
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_radiogroup_horizontal.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_radiogroup_vertical.png b/tests/tests/holo/res/drawable-hdpi/holo_light_radiogroup_vertical.png
new file mode 100644
index 0000000..d8e8dfb
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_radiogroup_vertical.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_light_port_ratingbar_0.png b/tests/tests/holo/res/drawable-hdpi/holo_light_ratingbar_0.png
similarity index 100%
rename from tests/res/drawable-hdpi/holo_light_port_ratingbar_0.png
rename to tests/tests/holo/res/drawable-hdpi/holo_light_ratingbar_0.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_light_port_ratingbar_0_pressed.png b/tests/tests/holo/res/drawable-hdpi/holo_light_ratingbar_0_pressed.png
similarity index 100%
rename from tests/res/drawable-hdpi/holo_light_port_ratingbar_0_pressed.png
rename to tests/tests/holo/res/drawable-hdpi/holo_light_ratingbar_0_pressed.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_light_port_ratingbar_2point5.png b/tests/tests/holo/res/drawable-hdpi/holo_light_ratingbar_2point5.png
similarity index 100%
rename from tests/res/drawable-hdpi/holo_light_port_ratingbar_2point5.png
rename to tests/tests/holo/res/drawable-hdpi/holo_light_ratingbar_2point5.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_light_port_ratingbar_2point5_pressed.png b/tests/tests/holo/res/drawable-hdpi/holo_light_ratingbar_2point5_pressed.png
similarity index 100%
rename from tests/res/drawable-hdpi/holo_light_port_ratingbar_2point5_pressed.png
rename to tests/tests/holo/res/drawable-hdpi/holo_light_ratingbar_2point5_pressed.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_light_port_ratingbar_5.png b/tests/tests/holo/res/drawable-hdpi/holo_light_ratingbar_5.png
similarity index 100%
rename from tests/res/drawable-hdpi/holo_light_port_ratingbar_5.png
rename to tests/tests/holo/res/drawable-hdpi/holo_light_ratingbar_5.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_light_port_ratingbar_5_pressed.png b/tests/tests/holo/res/drawable-hdpi/holo_light_ratingbar_5_pressed.png
similarity index 100%
rename from tests/res/drawable-hdpi/holo_light_port_ratingbar_5_pressed.png
rename to tests/tests/holo/res/drawable-hdpi/holo_light_ratingbar_5_pressed.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_searchview.png b/tests/tests/holo/res/drawable-hdpi/holo_light_searchview.png
new file mode 100644
index 0000000..4fa916a
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_searchview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_searchview_query.png b/tests/tests/holo/res/drawable-hdpi/holo_light_searchview_query.png
new file mode 100644
index 0000000..bf3c4c0
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_searchview_query.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_searchview_query_hint.png b/tests/tests/holo/res/drawable-hdpi/holo_light_searchview_query_hint.png
new file mode 100644
index 0000000..da47cb1
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_searchview_query_hint.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_seekbar_0.png b/tests/tests/holo/res/drawable-hdpi/holo_light_seekbar_0.png
new file mode 100644
index 0000000..bbdaa9c
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_seekbar_0.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_seekbar_100.png b/tests/tests/holo/res/drawable-hdpi/holo_light_seekbar_100.png
new file mode 100644
index 0000000..b89ea7d
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_seekbar_100.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_seekbar_50.png b/tests/tests/holo/res/drawable-hdpi/holo_light_seekbar_50.png
new file mode 100644
index 0000000..e8320ca
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_seekbar_50.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_spinner.png b/tests/tests/holo/res/drawable-hdpi/holo_light_spinner.png
new file mode 100644
index 0000000..d7f357a
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_spinner.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_switch.png b/tests/tests/holo/res/drawable-hdpi/holo_light_switch.png
new file mode 100644
index 0000000..64a0e59
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_switch.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_switch_checked.png b/tests/tests/holo/res/drawable-hdpi/holo_light_switch_checked.png
new file mode 100644
index 0000000..cf3beea
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_switch_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_tabhost.png b/tests/tests/holo/res/drawable-hdpi/holo_light_tabhost.png
new file mode 100644
index 0000000..462e9d3
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_tabhost.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_textview.png b/tests/tests/holo/res/drawable-hdpi/holo_light_textview.png
new file mode 100644
index 0000000..bbb3acf
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_textview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_timepicker.png b/tests/tests/holo/res/drawable-hdpi/holo_light_timepicker.png
new file mode 100644
index 0000000..72bb752
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_timepicker.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_toggle_button.png b/tests/tests/holo/res/drawable-hdpi/holo_light_toggle_button.png
new file mode 100644
index 0000000..49ce08d
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_toggle_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_light_toggle_button_checked.png b/tests/tests/holo/res/drawable-hdpi/holo_light_toggle_button_checked.png
new file mode 100644
index 0000000..9d240f3
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_light_toggle_button_checked.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_port_zoomcontrols.png b/tests/tests/holo/res/drawable-hdpi/holo_light_zoomcontrols.png
similarity index 100%
rename from tests/res/drawable-hdpi/holo_port_zoomcontrols.png
rename to tests/tests/holo/res/drawable-hdpi/holo_light_zoomcontrols.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_noactionbar_alertdialog_list.png b/tests/tests/holo/res/drawable-hdpi/holo_noactionbar_alertdialog_list.png
new file mode 100644
index 0000000..aa074c1
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_noactionbar_alertdialog_list.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_noactionbar_alertdialog_multichoice.png b/tests/tests/holo/res/drawable-hdpi/holo_noactionbar_alertdialog_multichoice.png
new file mode 100644
index 0000000..205b855
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_noactionbar_alertdialog_multichoice.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_noactionbar_alertdialog_onebutton.png b/tests/tests/holo/res/drawable-hdpi/holo_noactionbar_alertdialog_onebutton.png
new file mode 100644
index 0000000..356c230
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_noactionbar_alertdialog_onebutton.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_noactionbar_alertdialog_singlechoice.png b/tests/tests/holo/res/drawable-hdpi/holo_noactionbar_alertdialog_singlechoice.png
new file mode 100644
index 0000000..4d0d20c
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_noactionbar_alertdialog_singlechoice.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_noactionbar_alertdialog_threebuttons.png b/tests/tests/holo/res/drawable-hdpi/holo_noactionbar_alertdialog_threebuttons.png
new file mode 100644
index 0000000..33d0641
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_noactionbar_alertdialog_threebuttons.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_noactionbar_alertdialog_twobuttons.png b/tests/tests/holo/res/drawable-hdpi/holo_noactionbar_alertdialog_twobuttons.png
new file mode 100644
index 0000000..5969402
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_noactionbar_alertdialog_twobuttons.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_noactionbar_button.png b/tests/tests/holo/res/drawable-hdpi/holo_noactionbar_button.png
new file mode 100644
index 0000000..1c65266
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_noactionbar_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_noactionbar_button_pressed.png b/tests/tests/holo/res/drawable-hdpi/holo_noactionbar_button_pressed.png
new file mode 100644
index 0000000..797dccc
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_noactionbar_button_pressed.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_noactionbar_calendar_view.png b/tests/tests/holo/res/drawable-hdpi/holo_noactionbar_calendar_view.png
new file mode 100644
index 0000000..bf1aaa5
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_noactionbar_calendar_view.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_noactionbar_calendar_view_feb.png b/tests/tests/holo/res/drawable-hdpi/holo_noactionbar_calendar_view_feb.png
new file mode 100644
index 0000000..1421fbc
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_noactionbar_calendar_view_feb.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_noactionbar_checkbox.png b/tests/tests/holo/res/drawable-hdpi/holo_noactionbar_checkbox.png
new file mode 100644
index 0000000..97e83b6
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_noactionbar_checkbox.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_noactionbar_checkbox_checked.png b/tests/tests/holo/res/drawable-hdpi/holo_noactionbar_checkbox_checked.png
new file mode 100644
index 0000000..88934c2
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_noactionbar_checkbox_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_noactionbar_chronometer.png b/tests/tests/holo/res/drawable-hdpi/holo_noactionbar_chronometer.png
new file mode 100644
index 0000000..65af9b3
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_noactionbar_chronometer.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_noactionbar_color_blue_bright.png b/tests/tests/holo/res/drawable-hdpi/holo_noactionbar_color_blue_bright.png
new file mode 100644
index 0000000..2d1e63f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_noactionbar_color_blue_bright.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_noactionbar_color_blue_dark.png b/tests/tests/holo/res/drawable-hdpi/holo_noactionbar_color_blue_dark.png
new file mode 100644
index 0000000..914e522
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_noactionbar_color_blue_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_noactionbar_color_blue_light.png b/tests/tests/holo/res/drawable-hdpi/holo_noactionbar_color_blue_light.png
new file mode 100644
index 0000000..a6f2f65
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_noactionbar_color_blue_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_noactionbar_color_green_dark.png b/tests/tests/holo/res/drawable-hdpi/holo_noactionbar_color_green_dark.png
new file mode 100644
index 0000000..2cf79d0
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_noactionbar_color_green_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_noactionbar_color_green_light.png b/tests/tests/holo/res/drawable-hdpi/holo_noactionbar_color_green_light.png
new file mode 100644
index 0000000..508a96e
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_noactionbar_color_green_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_noactionbar_color_orange_dark.png b/tests/tests/holo/res/drawable-hdpi/holo_noactionbar_color_orange_dark.png
new file mode 100644
index 0000000..4a0157f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_noactionbar_color_orange_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_noactionbar_color_orange_light.png b/tests/tests/holo/res/drawable-hdpi/holo_noactionbar_color_orange_light.png
new file mode 100644
index 0000000..0bdb9be
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_noactionbar_color_orange_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_noactionbar_color_purple.png b/tests/tests/holo/res/drawable-hdpi/holo_noactionbar_color_purple.png
new file mode 100644
index 0000000..97071db
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_noactionbar_color_purple.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_noactionbar_color_red_dark.png b/tests/tests/holo/res/drawable-hdpi/holo_noactionbar_color_red_dark.png
new file mode 100644
index 0000000..dbcef9d
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_noactionbar_color_red_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_noactionbar_color_red_light.png b/tests/tests/holo/res/drawable-hdpi/holo_noactionbar_color_red_light.png
new file mode 100644
index 0000000..c60546f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_noactionbar_color_red_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_noactionbar_edittext.png b/tests/tests/holo/res/drawable-hdpi/holo_noactionbar_edittext.png
new file mode 100644
index 0000000..369d7b4
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_noactionbar_edittext.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_noactionbar_fullscreen_alertdialog_list.png b/tests/tests/holo/res/drawable-hdpi/holo_noactionbar_fullscreen_alertdialog_list.png
new file mode 100644
index 0000000..aa074c1
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_noactionbar_fullscreen_alertdialog_list.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_noactionbar_fullscreen_alertdialog_multichoice.png b/tests/tests/holo/res/drawable-hdpi/holo_noactionbar_fullscreen_alertdialog_multichoice.png
new file mode 100644
index 0000000..205b855
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_noactionbar_fullscreen_alertdialog_multichoice.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_noactionbar_fullscreen_alertdialog_onebutton.png b/tests/tests/holo/res/drawable-hdpi/holo_noactionbar_fullscreen_alertdialog_onebutton.png
new file mode 100644
index 0000000..356c230
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_noactionbar_fullscreen_alertdialog_onebutton.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_noactionbar_fullscreen_alertdialog_singlechoice.png b/tests/tests/holo/res/drawable-hdpi/holo_noactionbar_fullscreen_alertdialog_singlechoice.png
new file mode 100644
index 0000000..4d0d20c
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_noactionbar_fullscreen_alertdialog_singlechoice.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_noactionbar_fullscreen_alertdialog_threebuttons.png b/tests/tests/holo/res/drawable-hdpi/holo_noactionbar_fullscreen_alertdialog_threebuttons.png
new file mode 100644
index 0000000..33d0641
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_noactionbar_fullscreen_alertdialog_threebuttons.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_noactionbar_fullscreen_alertdialog_twobuttons.png b/tests/tests/holo/res/drawable-hdpi/holo_noactionbar_fullscreen_alertdialog_twobuttons.png
new file mode 100644
index 0000000..5969402
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_noactionbar_fullscreen_alertdialog_twobuttons.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_noactionbar_fullscreen_button.png b/tests/tests/holo/res/drawable-hdpi/holo_noactionbar_fullscreen_button.png
new file mode 100644
index 0000000..1c65266
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_noactionbar_fullscreen_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_noactionbar_fullscreen_button_pressed.png b/tests/tests/holo/res/drawable-hdpi/holo_noactionbar_fullscreen_button_pressed.png
new file mode 100644
index 0000000..797dccc
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_noactionbar_fullscreen_button_pressed.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_noactionbar_fullscreen_calendar_view.png b/tests/tests/holo/res/drawable-hdpi/holo_noactionbar_fullscreen_calendar_view.png
new file mode 100644
index 0000000..bf1aaa5
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_noactionbar_fullscreen_calendar_view.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_noactionbar_fullscreen_calendar_view_feb.png b/tests/tests/holo/res/drawable-hdpi/holo_noactionbar_fullscreen_calendar_view_feb.png
new file mode 100644
index 0000000..1421fbc
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_noactionbar_fullscreen_calendar_view_feb.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_noactionbar_fullscreen_checkbox.png b/tests/tests/holo/res/drawable-hdpi/holo_noactionbar_fullscreen_checkbox.png
new file mode 100644
index 0000000..97e83b6
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_noactionbar_fullscreen_checkbox.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_noactionbar_fullscreen_checkbox_checked.png b/tests/tests/holo/res/drawable-hdpi/holo_noactionbar_fullscreen_checkbox_checked.png
new file mode 100644
index 0000000..88934c2
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_noactionbar_fullscreen_checkbox_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_noactionbar_fullscreen_chronometer.png b/tests/tests/holo/res/drawable-hdpi/holo_noactionbar_fullscreen_chronometer.png
new file mode 100644
index 0000000..65af9b3
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_noactionbar_fullscreen_chronometer.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_noactionbar_fullscreen_color_blue_bright.png b/tests/tests/holo/res/drawable-hdpi/holo_noactionbar_fullscreen_color_blue_bright.png
new file mode 100644
index 0000000..2d1e63f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_noactionbar_fullscreen_color_blue_bright.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_noactionbar_fullscreen_color_blue_dark.png b/tests/tests/holo/res/drawable-hdpi/holo_noactionbar_fullscreen_color_blue_dark.png
new file mode 100644
index 0000000..914e522
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_noactionbar_fullscreen_color_blue_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_noactionbar_fullscreen_color_blue_light.png b/tests/tests/holo/res/drawable-hdpi/holo_noactionbar_fullscreen_color_blue_light.png
new file mode 100644
index 0000000..a6f2f65
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_noactionbar_fullscreen_color_blue_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_noactionbar_fullscreen_color_green_dark.png b/tests/tests/holo/res/drawable-hdpi/holo_noactionbar_fullscreen_color_green_dark.png
new file mode 100644
index 0000000..2cf79d0
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_noactionbar_fullscreen_color_green_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_noactionbar_fullscreen_color_green_light.png b/tests/tests/holo/res/drawable-hdpi/holo_noactionbar_fullscreen_color_green_light.png
new file mode 100644
index 0000000..508a96e
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_noactionbar_fullscreen_color_green_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_noactionbar_fullscreen_color_orange_dark.png b/tests/tests/holo/res/drawable-hdpi/holo_noactionbar_fullscreen_color_orange_dark.png
new file mode 100644
index 0000000..4a0157f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_noactionbar_fullscreen_color_orange_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_noactionbar_fullscreen_color_orange_light.png b/tests/tests/holo/res/drawable-hdpi/holo_noactionbar_fullscreen_color_orange_light.png
new file mode 100644
index 0000000..0bdb9be
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_noactionbar_fullscreen_color_orange_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_noactionbar_fullscreen_color_purple.png b/tests/tests/holo/res/drawable-hdpi/holo_noactionbar_fullscreen_color_purple.png
new file mode 100644
index 0000000..97071db
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_noactionbar_fullscreen_color_purple.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_noactionbar_fullscreen_color_red_dark.png b/tests/tests/holo/res/drawable-hdpi/holo_noactionbar_fullscreen_color_red_dark.png
new file mode 100644
index 0000000..dbcef9d
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_noactionbar_fullscreen_color_red_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_noactionbar_fullscreen_color_red_light.png b/tests/tests/holo/res/drawable-hdpi/holo_noactionbar_fullscreen_color_red_light.png
new file mode 100644
index 0000000..c60546f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_noactionbar_fullscreen_color_red_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_noactionbar_fullscreen_edittext.png b/tests/tests/holo/res/drawable-hdpi/holo_noactionbar_fullscreen_edittext.png
new file mode 100644
index 0000000..369d7b4
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_noactionbar_fullscreen_edittext.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_noactionbar_fullscreen_progressbar.png b/tests/tests/holo/res/drawable-hdpi/holo_noactionbar_fullscreen_progressbar.png
new file mode 100644
index 0000000..41e958c
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_noactionbar_fullscreen_progressbar.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_noactionbar_fullscreen_progressbar_horizontal_0.png b/tests/tests/holo/res/drawable-hdpi/holo_noactionbar_fullscreen_progressbar_horizontal_0.png
new file mode 100644
index 0000000..7923142
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_noactionbar_fullscreen_progressbar_horizontal_0.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_noactionbar_fullscreen_progressbar_horizontal_100.png b/tests/tests/holo/res/drawable-hdpi/holo_noactionbar_fullscreen_progressbar_horizontal_100.png
new file mode 100644
index 0000000..d94e0ec
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_noactionbar_fullscreen_progressbar_horizontal_100.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_noactionbar_fullscreen_progressbar_horizontal_50.png b/tests/tests/holo/res/drawable-hdpi/holo_noactionbar_fullscreen_progressbar_horizontal_50.png
new file mode 100644
index 0000000..0891a0b
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_noactionbar_fullscreen_progressbar_horizontal_50.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_noactionbar_fullscreen_progressbar_large.png b/tests/tests/holo/res/drawable-hdpi/holo_noactionbar_fullscreen_progressbar_large.png
new file mode 100644
index 0000000..0fd63d2
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_noactionbar_fullscreen_progressbar_large.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_noactionbar_fullscreen_progressbar_small.png b/tests/tests/holo/res/drawable-hdpi/holo_noactionbar_fullscreen_progressbar_small.png
new file mode 100644
index 0000000..1a270f9
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_noactionbar_fullscreen_progressbar_small.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_noactionbar_fullscreen_progressdialog_horizontal.png b/tests/tests/holo/res/drawable-hdpi/holo_noactionbar_fullscreen_progressdialog_horizontal.png
new file mode 100644
index 0000000..168b54f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_noactionbar_fullscreen_progressdialog_horizontal.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_noactionbar_fullscreen_radio_button.png b/tests/tests/holo/res/drawable-hdpi/holo_noactionbar_fullscreen_radio_button.png
new file mode 100644
index 0000000..50c99a6
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_noactionbar_fullscreen_radio_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_noactionbar_fullscreen_radio_button_checked.png b/tests/tests/holo/res/drawable-hdpi/holo_noactionbar_fullscreen_radio_button_checked.png
new file mode 100644
index 0000000..5959f1b
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_noactionbar_fullscreen_radio_button_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_noactionbar_fullscreen_radiogroup_horizontal.png b/tests/tests/holo/res/drawable-hdpi/holo_noactionbar_fullscreen_radiogroup_horizontal.png
new file mode 100644
index 0000000..bfe6918
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_noactionbar_fullscreen_radiogroup_horizontal.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_noactionbar_fullscreen_radiogroup_vertical.png b/tests/tests/holo/res/drawable-hdpi/holo_noactionbar_fullscreen_radiogroup_vertical.png
new file mode 100644
index 0000000..5a74bfb
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_noactionbar_fullscreen_radiogroup_vertical.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_land_ratingbar_0.png b/tests/tests/holo/res/drawable-hdpi/holo_noactionbar_fullscreen_ratingbar_0.png
similarity index 100%
copy from tests/res/drawable-hdpi/holo_land_ratingbar_0.png
copy to tests/tests/holo/res/drawable-hdpi/holo_noactionbar_fullscreen_ratingbar_0.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_land_ratingbar_0_pressed.png b/tests/tests/holo/res/drawable-hdpi/holo_noactionbar_fullscreen_ratingbar_0_pressed.png
similarity index 100%
copy from tests/res/drawable-hdpi/holo_land_ratingbar_0_pressed.png
copy to tests/tests/holo/res/drawable-hdpi/holo_noactionbar_fullscreen_ratingbar_0_pressed.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_land_ratingbar_2point5.png b/tests/tests/holo/res/drawable-hdpi/holo_noactionbar_fullscreen_ratingbar_2point5.png
similarity index 100%
copy from tests/res/drawable-hdpi/holo_land_ratingbar_2point5.png
copy to tests/tests/holo/res/drawable-hdpi/holo_noactionbar_fullscreen_ratingbar_2point5.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_land_ratingbar_2point5_pressed.png b/tests/tests/holo/res/drawable-hdpi/holo_noactionbar_fullscreen_ratingbar_2point5_pressed.png
similarity index 100%
copy from tests/res/drawable-hdpi/holo_land_ratingbar_2point5_pressed.png
copy to tests/tests/holo/res/drawable-hdpi/holo_noactionbar_fullscreen_ratingbar_2point5_pressed.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_land_ratingbar_5.png b/tests/tests/holo/res/drawable-hdpi/holo_noactionbar_fullscreen_ratingbar_5.png
similarity index 100%
copy from tests/res/drawable-hdpi/holo_land_ratingbar_5.png
copy to tests/tests/holo/res/drawable-hdpi/holo_noactionbar_fullscreen_ratingbar_5.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_land_ratingbar_5_pressed.png b/tests/tests/holo/res/drawable-hdpi/holo_noactionbar_fullscreen_ratingbar_5_pressed.png
similarity index 100%
copy from tests/res/drawable-hdpi/holo_land_ratingbar_5_pressed.png
copy to tests/tests/holo/res/drawable-hdpi/holo_noactionbar_fullscreen_ratingbar_5_pressed.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_noactionbar_fullscreen_searchview.png b/tests/tests/holo/res/drawable-hdpi/holo_noactionbar_fullscreen_searchview.png
new file mode 100644
index 0000000..2316e8a
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_noactionbar_fullscreen_searchview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_noactionbar_fullscreen_searchview_query.png b/tests/tests/holo/res/drawable-hdpi/holo_noactionbar_fullscreen_searchview_query.png
new file mode 100644
index 0000000..1eb04da
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_noactionbar_fullscreen_searchview_query.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_noactionbar_fullscreen_searchview_query_hint.png b/tests/tests/holo/res/drawable-hdpi/holo_noactionbar_fullscreen_searchview_query_hint.png
new file mode 100644
index 0000000..bdf014a
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_noactionbar_fullscreen_searchview_query_hint.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_noactionbar_fullscreen_seekbar_0.png b/tests/tests/holo/res/drawable-hdpi/holo_noactionbar_fullscreen_seekbar_0.png
new file mode 100644
index 0000000..b194d4e
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_noactionbar_fullscreen_seekbar_0.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_noactionbar_fullscreen_seekbar_100.png b/tests/tests/holo/res/drawable-hdpi/holo_noactionbar_fullscreen_seekbar_100.png
new file mode 100644
index 0000000..b89ea7d
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_noactionbar_fullscreen_seekbar_100.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_noactionbar_fullscreen_seekbar_50.png b/tests/tests/holo/res/drawable-hdpi/holo_noactionbar_fullscreen_seekbar_50.png
new file mode 100644
index 0000000..3100469
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_noactionbar_fullscreen_seekbar_50.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_noactionbar_fullscreen_spinner.png b/tests/tests/holo/res/drawable-hdpi/holo_noactionbar_fullscreen_spinner.png
new file mode 100644
index 0000000..9aaac14
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_noactionbar_fullscreen_spinner.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_noactionbar_fullscreen_switch.png b/tests/tests/holo/res/drawable-hdpi/holo_noactionbar_fullscreen_switch.png
new file mode 100644
index 0000000..38fe4e7
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_noactionbar_fullscreen_switch.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_noactionbar_fullscreen_switch_checked.png b/tests/tests/holo/res/drawable-hdpi/holo_noactionbar_fullscreen_switch_checked.png
new file mode 100644
index 0000000..d85ceaa
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_noactionbar_fullscreen_switch_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_noactionbar_fullscreen_tabhost.png b/tests/tests/holo/res/drawable-hdpi/holo_noactionbar_fullscreen_tabhost.png
new file mode 100644
index 0000000..27698b0
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_noactionbar_fullscreen_tabhost.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_noactionbar_fullscreen_textview.png b/tests/tests/holo/res/drawable-hdpi/holo_noactionbar_fullscreen_textview.png
new file mode 100644
index 0000000..85547e3
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_noactionbar_fullscreen_textview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_noactionbar_fullscreen_timepicker.png b/tests/tests/holo/res/drawable-hdpi/holo_noactionbar_fullscreen_timepicker.png
new file mode 100644
index 0000000..427cc55
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_noactionbar_fullscreen_timepicker.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_noactionbar_fullscreen_toggle_button.png b/tests/tests/holo/res/drawable-hdpi/holo_noactionbar_fullscreen_toggle_button.png
new file mode 100644
index 0000000..e101854
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_noactionbar_fullscreen_toggle_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_noactionbar_fullscreen_toggle_button_checked.png b/tests/tests/holo/res/drawable-hdpi/holo_noactionbar_fullscreen_toggle_button_checked.png
new file mode 100644
index 0000000..2daed75
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_noactionbar_fullscreen_toggle_button_checked.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_land_zoomcontrols.png b/tests/tests/holo/res/drawable-hdpi/holo_noactionbar_fullscreen_zoomcontrols.png
similarity index 100%
copy from tests/res/drawable-hdpi/holo_land_zoomcontrols.png
copy to tests/tests/holo/res/drawable-hdpi/holo_noactionbar_fullscreen_zoomcontrols.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_noactionbar_progressbar.png b/tests/tests/holo/res/drawable-hdpi/holo_noactionbar_progressbar.png
new file mode 100644
index 0000000..41e958c
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_noactionbar_progressbar.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_noactionbar_progressbar_horizontal_0.png b/tests/tests/holo/res/drawable-hdpi/holo_noactionbar_progressbar_horizontal_0.png
new file mode 100644
index 0000000..7923142
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_noactionbar_progressbar_horizontal_0.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_noactionbar_progressbar_horizontal_100.png b/tests/tests/holo/res/drawable-hdpi/holo_noactionbar_progressbar_horizontal_100.png
new file mode 100644
index 0000000..d94e0ec
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_noactionbar_progressbar_horizontal_100.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_noactionbar_progressbar_horizontal_50.png b/tests/tests/holo/res/drawable-hdpi/holo_noactionbar_progressbar_horizontal_50.png
new file mode 100644
index 0000000..0891a0b
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_noactionbar_progressbar_horizontal_50.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_noactionbar_progressbar_large.png b/tests/tests/holo/res/drawable-hdpi/holo_noactionbar_progressbar_large.png
new file mode 100644
index 0000000..0fd63d2
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_noactionbar_progressbar_large.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_noactionbar_progressbar_small.png b/tests/tests/holo/res/drawable-hdpi/holo_noactionbar_progressbar_small.png
new file mode 100644
index 0000000..1a270f9
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_noactionbar_progressbar_small.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_noactionbar_progressdialog_horizontal.png b/tests/tests/holo/res/drawable-hdpi/holo_noactionbar_progressdialog_horizontal.png
new file mode 100644
index 0000000..168b54f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_noactionbar_progressdialog_horizontal.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_noactionbar_radio_button.png b/tests/tests/holo/res/drawable-hdpi/holo_noactionbar_radio_button.png
new file mode 100644
index 0000000..50c99a6
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_noactionbar_radio_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_noactionbar_radio_button_checked.png b/tests/tests/holo/res/drawable-hdpi/holo_noactionbar_radio_button_checked.png
new file mode 100644
index 0000000..5959f1b
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_noactionbar_radio_button_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_noactionbar_radiogroup_horizontal.png b/tests/tests/holo/res/drawable-hdpi/holo_noactionbar_radiogroup_horizontal.png
new file mode 100644
index 0000000..bfe6918
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_noactionbar_radiogroup_horizontal.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_noactionbar_radiogroup_vertical.png b/tests/tests/holo/res/drawable-hdpi/holo_noactionbar_radiogroup_vertical.png
new file mode 100644
index 0000000..5a74bfb
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_noactionbar_radiogroup_vertical.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_land_ratingbar_0.png b/tests/tests/holo/res/drawable-hdpi/holo_noactionbar_ratingbar_0.png
similarity index 100%
copy from tests/res/drawable-hdpi/holo_land_ratingbar_0.png
copy to tests/tests/holo/res/drawable-hdpi/holo_noactionbar_ratingbar_0.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_land_ratingbar_0_pressed.png b/tests/tests/holo/res/drawable-hdpi/holo_noactionbar_ratingbar_0_pressed.png
similarity index 100%
copy from tests/res/drawable-hdpi/holo_land_ratingbar_0_pressed.png
copy to tests/tests/holo/res/drawable-hdpi/holo_noactionbar_ratingbar_0_pressed.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_land_ratingbar_2point5.png b/tests/tests/holo/res/drawable-hdpi/holo_noactionbar_ratingbar_2point5.png
similarity index 100%
copy from tests/res/drawable-hdpi/holo_land_ratingbar_2point5.png
copy to tests/tests/holo/res/drawable-hdpi/holo_noactionbar_ratingbar_2point5.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_land_ratingbar_2point5_pressed.png b/tests/tests/holo/res/drawable-hdpi/holo_noactionbar_ratingbar_2point5_pressed.png
similarity index 100%
copy from tests/res/drawable-hdpi/holo_land_ratingbar_2point5_pressed.png
copy to tests/tests/holo/res/drawable-hdpi/holo_noactionbar_ratingbar_2point5_pressed.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_land_ratingbar_5.png b/tests/tests/holo/res/drawable-hdpi/holo_noactionbar_ratingbar_5.png
similarity index 100%
copy from tests/res/drawable-hdpi/holo_land_ratingbar_5.png
copy to tests/tests/holo/res/drawable-hdpi/holo_noactionbar_ratingbar_5.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_land_ratingbar_5_pressed.png b/tests/tests/holo/res/drawable-hdpi/holo_noactionbar_ratingbar_5_pressed.png
similarity index 100%
copy from tests/res/drawable-hdpi/holo_land_ratingbar_5_pressed.png
copy to tests/tests/holo/res/drawable-hdpi/holo_noactionbar_ratingbar_5_pressed.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_noactionbar_searchview.png b/tests/tests/holo/res/drawable-hdpi/holo_noactionbar_searchview.png
new file mode 100644
index 0000000..2316e8a
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_noactionbar_searchview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_noactionbar_searchview_query.png b/tests/tests/holo/res/drawable-hdpi/holo_noactionbar_searchview_query.png
new file mode 100644
index 0000000..1eb04da
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_noactionbar_searchview_query.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_noactionbar_searchview_query_hint.png b/tests/tests/holo/res/drawable-hdpi/holo_noactionbar_searchview_query_hint.png
new file mode 100644
index 0000000..bdf014a
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_noactionbar_searchview_query_hint.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_noactionbar_seekbar_0.png b/tests/tests/holo/res/drawable-hdpi/holo_noactionbar_seekbar_0.png
new file mode 100644
index 0000000..b194d4e
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_noactionbar_seekbar_0.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_noactionbar_seekbar_100.png b/tests/tests/holo/res/drawable-hdpi/holo_noactionbar_seekbar_100.png
new file mode 100644
index 0000000..b89ea7d
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_noactionbar_seekbar_100.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_noactionbar_seekbar_50.png b/tests/tests/holo/res/drawable-hdpi/holo_noactionbar_seekbar_50.png
new file mode 100644
index 0000000..3100469
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_noactionbar_seekbar_50.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_noactionbar_spinner.png b/tests/tests/holo/res/drawable-hdpi/holo_noactionbar_spinner.png
new file mode 100644
index 0000000..9aaac14
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_noactionbar_spinner.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_noactionbar_switch.png b/tests/tests/holo/res/drawable-hdpi/holo_noactionbar_switch.png
new file mode 100644
index 0000000..38fe4e7
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_noactionbar_switch.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_noactionbar_switch_checked.png b/tests/tests/holo/res/drawable-hdpi/holo_noactionbar_switch_checked.png
new file mode 100644
index 0000000..d85ceaa
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_noactionbar_switch_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_noactionbar_tabhost.png b/tests/tests/holo/res/drawable-hdpi/holo_noactionbar_tabhost.png
new file mode 100644
index 0000000..27698b0
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_noactionbar_tabhost.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_noactionbar_textview.png b/tests/tests/holo/res/drawable-hdpi/holo_noactionbar_textview.png
new file mode 100644
index 0000000..85547e3
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_noactionbar_textview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_noactionbar_timepicker.png b/tests/tests/holo/res/drawable-hdpi/holo_noactionbar_timepicker.png
new file mode 100644
index 0000000..427cc55
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_noactionbar_timepicker.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_noactionbar_toggle_button.png b/tests/tests/holo/res/drawable-hdpi/holo_noactionbar_toggle_button.png
new file mode 100644
index 0000000..e101854
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_noactionbar_toggle_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_noactionbar_toggle_button_checked.png b/tests/tests/holo/res/drawable-hdpi/holo_noactionbar_toggle_button_checked.png
new file mode 100644
index 0000000..2daed75
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_noactionbar_toggle_button_checked.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_land_zoomcontrols.png b/tests/tests/holo/res/drawable-hdpi/holo_noactionbar_zoomcontrols.png
similarity index 100%
copy from tests/res/drawable-hdpi/holo_land_zoomcontrols.png
copy to tests/tests/holo/res/drawable-hdpi/holo_noactionbar_zoomcontrols.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_panel_alertdialog_list.png b/tests/tests/holo/res/drawable-hdpi/holo_panel_alertdialog_list.png
new file mode 100644
index 0000000..aa074c1
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_panel_alertdialog_list.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_panel_alertdialog_multichoice.png b/tests/tests/holo/res/drawable-hdpi/holo_panel_alertdialog_multichoice.png
new file mode 100644
index 0000000..205b855
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_panel_alertdialog_multichoice.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_panel_alertdialog_onebutton.png b/tests/tests/holo/res/drawable-hdpi/holo_panel_alertdialog_onebutton.png
new file mode 100644
index 0000000..356c230
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_panel_alertdialog_onebutton.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_panel_alertdialog_singlechoice.png b/tests/tests/holo/res/drawable-hdpi/holo_panel_alertdialog_singlechoice.png
new file mode 100644
index 0000000..4d0d20c
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_panel_alertdialog_singlechoice.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_panel_alertdialog_threebuttons.png b/tests/tests/holo/res/drawable-hdpi/holo_panel_alertdialog_threebuttons.png
new file mode 100644
index 0000000..33d0641
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_panel_alertdialog_threebuttons.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_panel_alertdialog_twobuttons.png b/tests/tests/holo/res/drawable-hdpi/holo_panel_alertdialog_twobuttons.png
new file mode 100644
index 0000000..5969402
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_panel_alertdialog_twobuttons.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_panel_button.png b/tests/tests/holo/res/drawable-hdpi/holo_panel_button.png
new file mode 100644
index 0000000..1c65266
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_panel_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_panel_button_pressed.png b/tests/tests/holo/res/drawable-hdpi/holo_panel_button_pressed.png
new file mode 100644
index 0000000..797dccc
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_panel_button_pressed.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_panel_calendar_view.png b/tests/tests/holo/res/drawable-hdpi/holo_panel_calendar_view.png
new file mode 100644
index 0000000..bf1aaa5
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_panel_calendar_view.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_panel_calendar_view_feb.png b/tests/tests/holo/res/drawable-hdpi/holo_panel_calendar_view_feb.png
new file mode 100644
index 0000000..1421fbc
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_panel_calendar_view_feb.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_panel_checkbox.png b/tests/tests/holo/res/drawable-hdpi/holo_panel_checkbox.png
new file mode 100644
index 0000000..97e83b6
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_panel_checkbox.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_panel_checkbox_checked.png b/tests/tests/holo/res/drawable-hdpi/holo_panel_checkbox_checked.png
new file mode 100644
index 0000000..88934c2
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_panel_checkbox_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_panel_chronometer.png b/tests/tests/holo/res/drawable-hdpi/holo_panel_chronometer.png
new file mode 100644
index 0000000..65af9b3
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_panel_chronometer.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_panel_color_blue_bright.png b/tests/tests/holo/res/drawable-hdpi/holo_panel_color_blue_bright.png
new file mode 100644
index 0000000..2d1e63f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_panel_color_blue_bright.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_panel_color_blue_dark.png b/tests/tests/holo/res/drawable-hdpi/holo_panel_color_blue_dark.png
new file mode 100644
index 0000000..914e522
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_panel_color_blue_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_panel_color_blue_light.png b/tests/tests/holo/res/drawable-hdpi/holo_panel_color_blue_light.png
new file mode 100644
index 0000000..a6f2f65
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_panel_color_blue_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_panel_color_green_dark.png b/tests/tests/holo/res/drawable-hdpi/holo_panel_color_green_dark.png
new file mode 100644
index 0000000..2cf79d0
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_panel_color_green_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_panel_color_green_light.png b/tests/tests/holo/res/drawable-hdpi/holo_panel_color_green_light.png
new file mode 100644
index 0000000..508a96e
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_panel_color_green_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_panel_color_orange_dark.png b/tests/tests/holo/res/drawable-hdpi/holo_panel_color_orange_dark.png
new file mode 100644
index 0000000..4a0157f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_panel_color_orange_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_panel_color_orange_light.png b/tests/tests/holo/res/drawable-hdpi/holo_panel_color_orange_light.png
new file mode 100644
index 0000000..0bdb9be
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_panel_color_orange_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_panel_color_purple.png b/tests/tests/holo/res/drawable-hdpi/holo_panel_color_purple.png
new file mode 100644
index 0000000..97071db
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_panel_color_purple.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_panel_color_red_dark.png b/tests/tests/holo/res/drawable-hdpi/holo_panel_color_red_dark.png
new file mode 100644
index 0000000..dbcef9d
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_panel_color_red_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_panel_color_red_light.png b/tests/tests/holo/res/drawable-hdpi/holo_panel_color_red_light.png
new file mode 100644
index 0000000..c60546f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_panel_color_red_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_panel_edittext.png b/tests/tests/holo/res/drawable-hdpi/holo_panel_edittext.png
new file mode 100644
index 0000000..369d7b4
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_panel_edittext.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_panel_progressbar.png b/tests/tests/holo/res/drawable-hdpi/holo_panel_progressbar.png
new file mode 100644
index 0000000..41e958c
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_panel_progressbar.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_panel_progressbar_horizontal_0.png b/tests/tests/holo/res/drawable-hdpi/holo_panel_progressbar_horizontal_0.png
new file mode 100644
index 0000000..7923142
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_panel_progressbar_horizontal_0.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_panel_progressbar_horizontal_100.png b/tests/tests/holo/res/drawable-hdpi/holo_panel_progressbar_horizontal_100.png
new file mode 100644
index 0000000..d94e0ec
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_panel_progressbar_horizontal_100.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_panel_progressbar_horizontal_50.png b/tests/tests/holo/res/drawable-hdpi/holo_panel_progressbar_horizontal_50.png
new file mode 100644
index 0000000..0891a0b
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_panel_progressbar_horizontal_50.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_panel_progressbar_large.png b/tests/tests/holo/res/drawable-hdpi/holo_panel_progressbar_large.png
new file mode 100644
index 0000000..0fd63d2
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_panel_progressbar_large.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_panel_progressbar_small.png b/tests/tests/holo/res/drawable-hdpi/holo_panel_progressbar_small.png
new file mode 100644
index 0000000..1a270f9
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_panel_progressbar_small.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_panel_progressdialog_horizontal.png b/tests/tests/holo/res/drawable-hdpi/holo_panel_progressdialog_horizontal.png
new file mode 100644
index 0000000..168b54f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_panel_progressdialog_horizontal.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_panel_radio_button.png b/tests/tests/holo/res/drawable-hdpi/holo_panel_radio_button.png
new file mode 100644
index 0000000..50c99a6
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_panel_radio_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_panel_radio_button_checked.png b/tests/tests/holo/res/drawable-hdpi/holo_panel_radio_button_checked.png
new file mode 100644
index 0000000..5959f1b
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_panel_radio_button_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_panel_radiogroup_horizontal.png b/tests/tests/holo/res/drawable-hdpi/holo_panel_radiogroup_horizontal.png
new file mode 100644
index 0000000..bfe6918
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_panel_radiogroup_horizontal.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_panel_radiogroup_vertical.png b/tests/tests/holo/res/drawable-hdpi/holo_panel_radiogroup_vertical.png
new file mode 100644
index 0000000..5a74bfb
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_panel_radiogroup_vertical.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_land_ratingbar_0.png b/tests/tests/holo/res/drawable-hdpi/holo_panel_ratingbar_0.png
similarity index 100%
copy from tests/res/drawable-hdpi/holo_land_ratingbar_0.png
copy to tests/tests/holo/res/drawable-hdpi/holo_panel_ratingbar_0.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_land_ratingbar_0_pressed.png b/tests/tests/holo/res/drawable-hdpi/holo_panel_ratingbar_0_pressed.png
similarity index 100%
copy from tests/res/drawable-hdpi/holo_land_ratingbar_0_pressed.png
copy to tests/tests/holo/res/drawable-hdpi/holo_panel_ratingbar_0_pressed.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_land_ratingbar_2point5.png b/tests/tests/holo/res/drawable-hdpi/holo_panel_ratingbar_2point5.png
similarity index 100%
copy from tests/res/drawable-hdpi/holo_land_ratingbar_2point5.png
copy to tests/tests/holo/res/drawable-hdpi/holo_panel_ratingbar_2point5.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_land_ratingbar_2point5_pressed.png b/tests/tests/holo/res/drawable-hdpi/holo_panel_ratingbar_2point5_pressed.png
similarity index 100%
rename from tests/res/drawable-hdpi/holo_land_ratingbar_2point5_pressed.png
rename to tests/tests/holo/res/drawable-hdpi/holo_panel_ratingbar_2point5_pressed.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_land_ratingbar_5.png b/tests/tests/holo/res/drawable-hdpi/holo_panel_ratingbar_5.png
similarity index 100%
copy from tests/res/drawable-hdpi/holo_land_ratingbar_5.png
copy to tests/tests/holo/res/drawable-hdpi/holo_panel_ratingbar_5.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_land_ratingbar_5_pressed.png b/tests/tests/holo/res/drawable-hdpi/holo_panel_ratingbar_5_pressed.png
similarity index 100%
copy from tests/res/drawable-hdpi/holo_land_ratingbar_5_pressed.png
copy to tests/tests/holo/res/drawable-hdpi/holo_panel_ratingbar_5_pressed.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_panel_searchview.png b/tests/tests/holo/res/drawable-hdpi/holo_panel_searchview.png
new file mode 100644
index 0000000..2316e8a
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_panel_searchview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_panel_searchview_query.png b/tests/tests/holo/res/drawable-hdpi/holo_panel_searchview_query.png
new file mode 100644
index 0000000..1eb04da
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_panel_searchview_query.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_panel_searchview_query_hint.png b/tests/tests/holo/res/drawable-hdpi/holo_panel_searchview_query_hint.png
new file mode 100644
index 0000000..bdf014a
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_panel_searchview_query_hint.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_panel_seekbar_0.png b/tests/tests/holo/res/drawable-hdpi/holo_panel_seekbar_0.png
new file mode 100644
index 0000000..b194d4e
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_panel_seekbar_0.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_panel_seekbar_100.png b/tests/tests/holo/res/drawable-hdpi/holo_panel_seekbar_100.png
new file mode 100644
index 0000000..b89ea7d
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_panel_seekbar_100.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_panel_seekbar_50.png b/tests/tests/holo/res/drawable-hdpi/holo_panel_seekbar_50.png
new file mode 100644
index 0000000..3100469
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_panel_seekbar_50.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_panel_spinner.png b/tests/tests/holo/res/drawable-hdpi/holo_panel_spinner.png
new file mode 100644
index 0000000..9aaac14
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_panel_spinner.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_panel_switch.png b/tests/tests/holo/res/drawable-hdpi/holo_panel_switch.png
new file mode 100644
index 0000000..38fe4e7
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_panel_switch.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_panel_switch_checked.png b/tests/tests/holo/res/drawable-hdpi/holo_panel_switch_checked.png
new file mode 100644
index 0000000..d85ceaa
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_panel_switch_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_panel_tabhost.png b/tests/tests/holo/res/drawable-hdpi/holo_panel_tabhost.png
new file mode 100644
index 0000000..27698b0
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_panel_tabhost.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_panel_textview.png b/tests/tests/holo/res/drawable-hdpi/holo_panel_textview.png
new file mode 100644
index 0000000..85547e3
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_panel_textview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_panel_timepicker.png b/tests/tests/holo/res/drawable-hdpi/holo_panel_timepicker.png
new file mode 100644
index 0000000..427cc55
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_panel_timepicker.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_panel_toggle_button.png b/tests/tests/holo/res/drawable-hdpi/holo_panel_toggle_button.png
new file mode 100644
index 0000000..e101854
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_panel_toggle_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_panel_toggle_button_checked.png b/tests/tests/holo/res/drawable-hdpi/holo_panel_toggle_button_checked.png
new file mode 100644
index 0000000..2daed75
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_panel_toggle_button_checked.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_land_zoomcontrols.png b/tests/tests/holo/res/drawable-hdpi/holo_panel_zoomcontrols.png
similarity index 100%
copy from tests/res/drawable-hdpi/holo_land_zoomcontrols.png
copy to tests/tests/holo/res/drawable-hdpi/holo_panel_zoomcontrols.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_progressbar.png b/tests/tests/holo/res/drawable-hdpi/holo_progressbar.png
new file mode 100644
index 0000000..41e958c
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_progressbar.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_progressbar_horizontal_0.png b/tests/tests/holo/res/drawable-hdpi/holo_progressbar_horizontal_0.png
new file mode 100644
index 0000000..7923142
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_progressbar_horizontal_0.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_progressbar_horizontal_100.png b/tests/tests/holo/res/drawable-hdpi/holo_progressbar_horizontal_100.png
new file mode 100644
index 0000000..d94e0ec
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_progressbar_horizontal_100.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_progressbar_horizontal_50.png b/tests/tests/holo/res/drawable-hdpi/holo_progressbar_horizontal_50.png
new file mode 100644
index 0000000..0891a0b
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_progressbar_horizontal_50.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_progressbar_large.png b/tests/tests/holo/res/drawable-hdpi/holo_progressbar_large.png
new file mode 100644
index 0000000..0fd63d2
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_progressbar_large.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_progressbar_small.png b/tests/tests/holo/res/drawable-hdpi/holo_progressbar_small.png
new file mode 100644
index 0000000..1a270f9
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_progressbar_small.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_progressdialog_horizontal.png b/tests/tests/holo/res/drawable-hdpi/holo_progressdialog_horizontal.png
new file mode 100644
index 0000000..168b54f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_progressdialog_horizontal.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_radio_button.png b/tests/tests/holo/res/drawable-hdpi/holo_radio_button.png
new file mode 100644
index 0000000..50c99a6
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_radio_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_radio_button_checked.png b/tests/tests/holo/res/drawable-hdpi/holo_radio_button_checked.png
new file mode 100644
index 0000000..5959f1b
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_radio_button_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_radiogroup_horizontal.png b/tests/tests/holo/res/drawable-hdpi/holo_radiogroup_horizontal.png
new file mode 100644
index 0000000..bfe6918
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_radiogroup_horizontal.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_radiogroup_vertical.png b/tests/tests/holo/res/drawable-hdpi/holo_radiogroup_vertical.png
new file mode 100644
index 0000000..5a74bfb
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_radiogroup_vertical.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_land_ratingbar_0.png b/tests/tests/holo/res/drawable-hdpi/holo_ratingbar_0.png
similarity index 100%
rename from tests/res/drawable-hdpi/holo_land_ratingbar_0.png
rename to tests/tests/holo/res/drawable-hdpi/holo_ratingbar_0.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_land_ratingbar_0_pressed.png b/tests/tests/holo/res/drawable-hdpi/holo_ratingbar_0_pressed.png
similarity index 100%
rename from tests/res/drawable-hdpi/holo_land_ratingbar_0_pressed.png
rename to tests/tests/holo/res/drawable-hdpi/holo_ratingbar_0_pressed.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_land_ratingbar_2point5.png b/tests/tests/holo/res/drawable-hdpi/holo_ratingbar_2point5.png
similarity index 100%
rename from tests/res/drawable-hdpi/holo_land_ratingbar_2point5.png
rename to tests/tests/holo/res/drawable-hdpi/holo_ratingbar_2point5.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_land_ratingbar_2point5_pressed.png b/tests/tests/holo/res/drawable-hdpi/holo_ratingbar_2point5_pressed.png
similarity index 100%
copy from tests/res/drawable-hdpi/holo_land_ratingbar_2point5_pressed.png
copy to tests/tests/holo/res/drawable-hdpi/holo_ratingbar_2point5_pressed.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_land_ratingbar_5.png b/tests/tests/holo/res/drawable-hdpi/holo_ratingbar_5.png
similarity index 100%
rename from tests/res/drawable-hdpi/holo_land_ratingbar_5.png
rename to tests/tests/holo/res/drawable-hdpi/holo_ratingbar_5.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_land_ratingbar_5_pressed.png b/tests/tests/holo/res/drawable-hdpi/holo_ratingbar_5_pressed.png
similarity index 100%
rename from tests/res/drawable-hdpi/holo_land_ratingbar_5_pressed.png
rename to tests/tests/holo/res/drawable-hdpi/holo_ratingbar_5_pressed.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_searchview.png b/tests/tests/holo/res/drawable-hdpi/holo_searchview.png
new file mode 100644
index 0000000..2316e8a
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_searchview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_searchview_query.png b/tests/tests/holo/res/drawable-hdpi/holo_searchview_query.png
new file mode 100644
index 0000000..1eb04da
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_searchview_query.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_searchview_query_hint.png b/tests/tests/holo/res/drawable-hdpi/holo_searchview_query_hint.png
new file mode 100644
index 0000000..bdf014a
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_searchview_query_hint.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_seekbar_0.png b/tests/tests/holo/res/drawable-hdpi/holo_seekbar_0.png
new file mode 100644
index 0000000..b194d4e
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_seekbar_0.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_seekbar_100.png b/tests/tests/holo/res/drawable-hdpi/holo_seekbar_100.png
new file mode 100644
index 0000000..b89ea7d
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_seekbar_100.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_seekbar_50.png b/tests/tests/holo/res/drawable-hdpi/holo_seekbar_50.png
new file mode 100644
index 0000000..3100469
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_seekbar_50.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_spinner.png b/tests/tests/holo/res/drawable-hdpi/holo_spinner.png
new file mode 100644
index 0000000..9aaac14
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_spinner.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_switch.png b/tests/tests/holo/res/drawable-hdpi/holo_switch.png
new file mode 100644
index 0000000..38fe4e7
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_switch.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_switch_checked.png b/tests/tests/holo/res/drawable-hdpi/holo_switch_checked.png
new file mode 100644
index 0000000..d85ceaa
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_switch_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_tabhost.png b/tests/tests/holo/res/drawable-hdpi/holo_tabhost.png
new file mode 100644
index 0000000..27698b0
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_tabhost.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_textview.png b/tests/tests/holo/res/drawable-hdpi/holo_textview.png
new file mode 100644
index 0000000..85547e3
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_textview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_timepicker.png b/tests/tests/holo/res/drawable-hdpi/holo_timepicker.png
new file mode 100644
index 0000000..427cc55
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_timepicker.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_toggle_button.png b/tests/tests/holo/res/drawable-hdpi/holo_toggle_button.png
new file mode 100644
index 0000000..e101854
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_toggle_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_toggle_button_checked.png b/tests/tests/holo/res/drawable-hdpi/holo_toggle_button_checked.png
new file mode 100644
index 0000000..2daed75
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_toggle_button_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_wallpaper_alertdialog_list.png b/tests/tests/holo/res/drawable-hdpi/holo_wallpaper_alertdialog_list.png
new file mode 100644
index 0000000..aa074c1
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_wallpaper_alertdialog_list.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_wallpaper_alertdialog_multichoice.png b/tests/tests/holo/res/drawable-hdpi/holo_wallpaper_alertdialog_multichoice.png
new file mode 100644
index 0000000..205b855
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_wallpaper_alertdialog_multichoice.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_wallpaper_alertdialog_onebutton.png b/tests/tests/holo/res/drawable-hdpi/holo_wallpaper_alertdialog_onebutton.png
new file mode 100644
index 0000000..356c230
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_wallpaper_alertdialog_onebutton.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_wallpaper_alertdialog_singlechoice.png b/tests/tests/holo/res/drawable-hdpi/holo_wallpaper_alertdialog_singlechoice.png
new file mode 100644
index 0000000..4d0d20c
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_wallpaper_alertdialog_singlechoice.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_wallpaper_alertdialog_threebuttons.png b/tests/tests/holo/res/drawable-hdpi/holo_wallpaper_alertdialog_threebuttons.png
new file mode 100644
index 0000000..33d0641
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_wallpaper_alertdialog_threebuttons.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_wallpaper_alertdialog_twobuttons.png b/tests/tests/holo/res/drawable-hdpi/holo_wallpaper_alertdialog_twobuttons.png
new file mode 100644
index 0000000..5969402
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_wallpaper_alertdialog_twobuttons.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_wallpaper_button.png b/tests/tests/holo/res/drawable-hdpi/holo_wallpaper_button.png
new file mode 100644
index 0000000..1c65266
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_wallpaper_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_wallpaper_button_pressed.png b/tests/tests/holo/res/drawable-hdpi/holo_wallpaper_button_pressed.png
new file mode 100644
index 0000000..797dccc
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_wallpaper_button_pressed.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_wallpaper_calendar_view.png b/tests/tests/holo/res/drawable-hdpi/holo_wallpaper_calendar_view.png
new file mode 100644
index 0000000..bf1aaa5
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_wallpaper_calendar_view.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_wallpaper_calendar_view_feb.png b/tests/tests/holo/res/drawable-hdpi/holo_wallpaper_calendar_view_feb.png
new file mode 100644
index 0000000..1421fbc
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_wallpaper_calendar_view_feb.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_wallpaper_checkbox.png b/tests/tests/holo/res/drawable-hdpi/holo_wallpaper_checkbox.png
new file mode 100644
index 0000000..97e83b6
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_wallpaper_checkbox.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_wallpaper_checkbox_checked.png b/tests/tests/holo/res/drawable-hdpi/holo_wallpaper_checkbox_checked.png
new file mode 100644
index 0000000..88934c2
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_wallpaper_checkbox_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_wallpaper_chronometer.png b/tests/tests/holo/res/drawable-hdpi/holo_wallpaper_chronometer.png
new file mode 100644
index 0000000..65af9b3
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_wallpaper_chronometer.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_wallpaper_color_blue_bright.png b/tests/tests/holo/res/drawable-hdpi/holo_wallpaper_color_blue_bright.png
new file mode 100644
index 0000000..2d1e63f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_wallpaper_color_blue_bright.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_wallpaper_color_blue_dark.png b/tests/tests/holo/res/drawable-hdpi/holo_wallpaper_color_blue_dark.png
new file mode 100644
index 0000000..914e522
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_wallpaper_color_blue_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_wallpaper_color_blue_light.png b/tests/tests/holo/res/drawable-hdpi/holo_wallpaper_color_blue_light.png
new file mode 100644
index 0000000..a6f2f65
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_wallpaper_color_blue_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_wallpaper_color_green_dark.png b/tests/tests/holo/res/drawable-hdpi/holo_wallpaper_color_green_dark.png
new file mode 100644
index 0000000..2cf79d0
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_wallpaper_color_green_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_wallpaper_color_green_light.png b/tests/tests/holo/res/drawable-hdpi/holo_wallpaper_color_green_light.png
new file mode 100644
index 0000000..508a96e
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_wallpaper_color_green_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_wallpaper_color_orange_dark.png b/tests/tests/holo/res/drawable-hdpi/holo_wallpaper_color_orange_dark.png
new file mode 100644
index 0000000..4a0157f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_wallpaper_color_orange_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_wallpaper_color_orange_light.png b/tests/tests/holo/res/drawable-hdpi/holo_wallpaper_color_orange_light.png
new file mode 100644
index 0000000..0bdb9be
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_wallpaper_color_orange_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_wallpaper_color_purple.png b/tests/tests/holo/res/drawable-hdpi/holo_wallpaper_color_purple.png
new file mode 100644
index 0000000..97071db
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_wallpaper_color_purple.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_wallpaper_color_red_dark.png b/tests/tests/holo/res/drawable-hdpi/holo_wallpaper_color_red_dark.png
new file mode 100644
index 0000000..dbcef9d
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_wallpaper_color_red_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_wallpaper_color_red_light.png b/tests/tests/holo/res/drawable-hdpi/holo_wallpaper_color_red_light.png
new file mode 100644
index 0000000..c60546f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_wallpaper_color_red_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_wallpaper_edittext.png b/tests/tests/holo/res/drawable-hdpi/holo_wallpaper_edittext.png
new file mode 100644
index 0000000..369d7b4
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_wallpaper_edittext.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_wallpaper_notitlebar_alertdialog_list.png b/tests/tests/holo/res/drawable-hdpi/holo_wallpaper_notitlebar_alertdialog_list.png
new file mode 100644
index 0000000..aa074c1
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_wallpaper_notitlebar_alertdialog_list.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_wallpaper_notitlebar_alertdialog_multichoice.png b/tests/tests/holo/res/drawable-hdpi/holo_wallpaper_notitlebar_alertdialog_multichoice.png
new file mode 100644
index 0000000..205b855
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_wallpaper_notitlebar_alertdialog_multichoice.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_wallpaper_notitlebar_alertdialog_onebutton.png b/tests/tests/holo/res/drawable-hdpi/holo_wallpaper_notitlebar_alertdialog_onebutton.png
new file mode 100644
index 0000000..356c230
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_wallpaper_notitlebar_alertdialog_onebutton.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_wallpaper_notitlebar_alertdialog_singlechoice.png b/tests/tests/holo/res/drawable-hdpi/holo_wallpaper_notitlebar_alertdialog_singlechoice.png
new file mode 100644
index 0000000..4d0d20c
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_wallpaper_notitlebar_alertdialog_singlechoice.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_wallpaper_notitlebar_alertdialog_threebuttons.png b/tests/tests/holo/res/drawable-hdpi/holo_wallpaper_notitlebar_alertdialog_threebuttons.png
new file mode 100644
index 0000000..33d0641
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_wallpaper_notitlebar_alertdialog_threebuttons.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_wallpaper_notitlebar_alertdialog_twobuttons.png b/tests/tests/holo/res/drawable-hdpi/holo_wallpaper_notitlebar_alertdialog_twobuttons.png
new file mode 100644
index 0000000..5969402
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_wallpaper_notitlebar_alertdialog_twobuttons.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_wallpaper_notitlebar_button.png b/tests/tests/holo/res/drawable-hdpi/holo_wallpaper_notitlebar_button.png
new file mode 100644
index 0000000..1c65266
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_wallpaper_notitlebar_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_wallpaper_notitlebar_button_pressed.png b/tests/tests/holo/res/drawable-hdpi/holo_wallpaper_notitlebar_button_pressed.png
new file mode 100644
index 0000000..797dccc
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_wallpaper_notitlebar_button_pressed.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_wallpaper_notitlebar_calendar_view.png b/tests/tests/holo/res/drawable-hdpi/holo_wallpaper_notitlebar_calendar_view.png
new file mode 100644
index 0000000..bf1aaa5
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_wallpaper_notitlebar_calendar_view.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_wallpaper_notitlebar_calendar_view_feb.png b/tests/tests/holo/res/drawable-hdpi/holo_wallpaper_notitlebar_calendar_view_feb.png
new file mode 100644
index 0000000..1421fbc
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_wallpaper_notitlebar_calendar_view_feb.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_wallpaper_notitlebar_checkbox.png b/tests/tests/holo/res/drawable-hdpi/holo_wallpaper_notitlebar_checkbox.png
new file mode 100644
index 0000000..97e83b6
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_wallpaper_notitlebar_checkbox.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_wallpaper_notitlebar_checkbox_checked.png b/tests/tests/holo/res/drawable-hdpi/holo_wallpaper_notitlebar_checkbox_checked.png
new file mode 100644
index 0000000..88934c2
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_wallpaper_notitlebar_checkbox_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_wallpaper_notitlebar_chronometer.png b/tests/tests/holo/res/drawable-hdpi/holo_wallpaper_notitlebar_chronometer.png
new file mode 100644
index 0000000..65af9b3
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_wallpaper_notitlebar_chronometer.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_wallpaper_notitlebar_color_blue_bright.png b/tests/tests/holo/res/drawable-hdpi/holo_wallpaper_notitlebar_color_blue_bright.png
new file mode 100644
index 0000000..2d1e63f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_wallpaper_notitlebar_color_blue_bright.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_wallpaper_notitlebar_color_blue_dark.png b/tests/tests/holo/res/drawable-hdpi/holo_wallpaper_notitlebar_color_blue_dark.png
new file mode 100644
index 0000000..914e522
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_wallpaper_notitlebar_color_blue_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_wallpaper_notitlebar_color_blue_light.png b/tests/tests/holo/res/drawable-hdpi/holo_wallpaper_notitlebar_color_blue_light.png
new file mode 100644
index 0000000..a6f2f65
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_wallpaper_notitlebar_color_blue_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_wallpaper_notitlebar_color_green_dark.png b/tests/tests/holo/res/drawable-hdpi/holo_wallpaper_notitlebar_color_green_dark.png
new file mode 100644
index 0000000..2cf79d0
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_wallpaper_notitlebar_color_green_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_wallpaper_notitlebar_color_green_light.png b/tests/tests/holo/res/drawable-hdpi/holo_wallpaper_notitlebar_color_green_light.png
new file mode 100644
index 0000000..508a96e
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_wallpaper_notitlebar_color_green_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_wallpaper_notitlebar_color_orange_dark.png b/tests/tests/holo/res/drawable-hdpi/holo_wallpaper_notitlebar_color_orange_dark.png
new file mode 100644
index 0000000..4a0157f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_wallpaper_notitlebar_color_orange_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_wallpaper_notitlebar_color_orange_light.png b/tests/tests/holo/res/drawable-hdpi/holo_wallpaper_notitlebar_color_orange_light.png
new file mode 100644
index 0000000..0bdb9be
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_wallpaper_notitlebar_color_orange_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_wallpaper_notitlebar_color_purple.png b/tests/tests/holo/res/drawable-hdpi/holo_wallpaper_notitlebar_color_purple.png
new file mode 100644
index 0000000..97071db
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_wallpaper_notitlebar_color_purple.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_wallpaper_notitlebar_color_red_dark.png b/tests/tests/holo/res/drawable-hdpi/holo_wallpaper_notitlebar_color_red_dark.png
new file mode 100644
index 0000000..dbcef9d
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_wallpaper_notitlebar_color_red_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_wallpaper_notitlebar_color_red_light.png b/tests/tests/holo/res/drawable-hdpi/holo_wallpaper_notitlebar_color_red_light.png
new file mode 100644
index 0000000..c60546f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_wallpaper_notitlebar_color_red_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_wallpaper_notitlebar_edittext.png b/tests/tests/holo/res/drawable-hdpi/holo_wallpaper_notitlebar_edittext.png
new file mode 100644
index 0000000..369d7b4
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_wallpaper_notitlebar_edittext.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_wallpaper_notitlebar_progressbar.png b/tests/tests/holo/res/drawable-hdpi/holo_wallpaper_notitlebar_progressbar.png
new file mode 100644
index 0000000..41e958c
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_wallpaper_notitlebar_progressbar.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_wallpaper_notitlebar_progressbar_horizontal_0.png b/tests/tests/holo/res/drawable-hdpi/holo_wallpaper_notitlebar_progressbar_horizontal_0.png
new file mode 100644
index 0000000..7923142
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_wallpaper_notitlebar_progressbar_horizontal_0.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_wallpaper_notitlebar_progressbar_horizontal_100.png b/tests/tests/holo/res/drawable-hdpi/holo_wallpaper_notitlebar_progressbar_horizontal_100.png
new file mode 100644
index 0000000..d94e0ec
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_wallpaper_notitlebar_progressbar_horizontal_100.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_wallpaper_notitlebar_progressbar_horizontal_50.png b/tests/tests/holo/res/drawable-hdpi/holo_wallpaper_notitlebar_progressbar_horizontal_50.png
new file mode 100644
index 0000000..0891a0b
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_wallpaper_notitlebar_progressbar_horizontal_50.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_wallpaper_notitlebar_progressbar_large.png b/tests/tests/holo/res/drawable-hdpi/holo_wallpaper_notitlebar_progressbar_large.png
new file mode 100644
index 0000000..0fd63d2
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_wallpaper_notitlebar_progressbar_large.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_wallpaper_notitlebar_progressbar_small.png b/tests/tests/holo/res/drawable-hdpi/holo_wallpaper_notitlebar_progressbar_small.png
new file mode 100644
index 0000000..1a270f9
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_wallpaper_notitlebar_progressbar_small.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_wallpaper_notitlebar_progressdialog_horizontal.png b/tests/tests/holo/res/drawable-hdpi/holo_wallpaper_notitlebar_progressdialog_horizontal.png
new file mode 100644
index 0000000..168b54f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_wallpaper_notitlebar_progressdialog_horizontal.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_wallpaper_notitlebar_radio_button.png b/tests/tests/holo/res/drawable-hdpi/holo_wallpaper_notitlebar_radio_button.png
new file mode 100644
index 0000000..50c99a6
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_wallpaper_notitlebar_radio_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_wallpaper_notitlebar_radio_button_checked.png b/tests/tests/holo/res/drawable-hdpi/holo_wallpaper_notitlebar_radio_button_checked.png
new file mode 100644
index 0000000..5959f1b
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_wallpaper_notitlebar_radio_button_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_wallpaper_notitlebar_radiogroup_horizontal.png b/tests/tests/holo/res/drawable-hdpi/holo_wallpaper_notitlebar_radiogroup_horizontal.png
new file mode 100644
index 0000000..bfe6918
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_wallpaper_notitlebar_radiogroup_horizontal.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_wallpaper_notitlebar_radiogroup_vertical.png b/tests/tests/holo/res/drawable-hdpi/holo_wallpaper_notitlebar_radiogroup_vertical.png
new file mode 100644
index 0000000..5a74bfb
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_wallpaper_notitlebar_radiogroup_vertical.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_land_ratingbar_0.png b/tests/tests/holo/res/drawable-hdpi/holo_wallpaper_notitlebar_ratingbar_0.png
similarity index 100%
copy from tests/res/drawable-hdpi/holo_land_ratingbar_0.png
copy to tests/tests/holo/res/drawable-hdpi/holo_wallpaper_notitlebar_ratingbar_0.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_land_ratingbar_0_pressed.png b/tests/tests/holo/res/drawable-hdpi/holo_wallpaper_notitlebar_ratingbar_0_pressed.png
similarity index 100%
copy from tests/res/drawable-hdpi/holo_land_ratingbar_0_pressed.png
copy to tests/tests/holo/res/drawable-hdpi/holo_wallpaper_notitlebar_ratingbar_0_pressed.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_land_ratingbar_2point5.png b/tests/tests/holo/res/drawable-hdpi/holo_wallpaper_notitlebar_ratingbar_2point5.png
similarity index 100%
copy from tests/res/drawable-hdpi/holo_land_ratingbar_2point5.png
copy to tests/tests/holo/res/drawable-hdpi/holo_wallpaper_notitlebar_ratingbar_2point5.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_land_ratingbar_2point5_pressed.png b/tests/tests/holo/res/drawable-hdpi/holo_wallpaper_notitlebar_ratingbar_2point5_pressed.png
similarity index 100%
copy from tests/res/drawable-hdpi/holo_land_ratingbar_2point5_pressed.png
copy to tests/tests/holo/res/drawable-hdpi/holo_wallpaper_notitlebar_ratingbar_2point5_pressed.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_land_ratingbar_5.png b/tests/tests/holo/res/drawable-hdpi/holo_wallpaper_notitlebar_ratingbar_5.png
similarity index 100%
copy from tests/res/drawable-hdpi/holo_land_ratingbar_5.png
copy to tests/tests/holo/res/drawable-hdpi/holo_wallpaper_notitlebar_ratingbar_5.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_land_ratingbar_5_pressed.png b/tests/tests/holo/res/drawable-hdpi/holo_wallpaper_notitlebar_ratingbar_5_pressed.png
similarity index 100%
copy from tests/res/drawable-hdpi/holo_land_ratingbar_5_pressed.png
copy to tests/tests/holo/res/drawable-hdpi/holo_wallpaper_notitlebar_ratingbar_5_pressed.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_wallpaper_notitlebar_searchview.png b/tests/tests/holo/res/drawable-hdpi/holo_wallpaper_notitlebar_searchview.png
new file mode 100644
index 0000000..2316e8a
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_wallpaper_notitlebar_searchview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_wallpaper_notitlebar_searchview_query.png b/tests/tests/holo/res/drawable-hdpi/holo_wallpaper_notitlebar_searchview_query.png
new file mode 100644
index 0000000..1eb04da
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_wallpaper_notitlebar_searchview_query.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_wallpaper_notitlebar_searchview_query_hint.png b/tests/tests/holo/res/drawable-hdpi/holo_wallpaper_notitlebar_searchview_query_hint.png
new file mode 100644
index 0000000..bdf014a
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_wallpaper_notitlebar_searchview_query_hint.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_wallpaper_notitlebar_seekbar_0.png b/tests/tests/holo/res/drawable-hdpi/holo_wallpaper_notitlebar_seekbar_0.png
new file mode 100644
index 0000000..b194d4e
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_wallpaper_notitlebar_seekbar_0.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_wallpaper_notitlebar_seekbar_100.png b/tests/tests/holo/res/drawable-hdpi/holo_wallpaper_notitlebar_seekbar_100.png
new file mode 100644
index 0000000..b89ea7d
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_wallpaper_notitlebar_seekbar_100.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_wallpaper_notitlebar_seekbar_50.png b/tests/tests/holo/res/drawable-hdpi/holo_wallpaper_notitlebar_seekbar_50.png
new file mode 100644
index 0000000..3100469
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_wallpaper_notitlebar_seekbar_50.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_wallpaper_notitlebar_spinner.png b/tests/tests/holo/res/drawable-hdpi/holo_wallpaper_notitlebar_spinner.png
new file mode 100644
index 0000000..9aaac14
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_wallpaper_notitlebar_spinner.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_wallpaper_notitlebar_switch.png b/tests/tests/holo/res/drawable-hdpi/holo_wallpaper_notitlebar_switch.png
new file mode 100644
index 0000000..38fe4e7
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_wallpaper_notitlebar_switch.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_wallpaper_notitlebar_switch_checked.png b/tests/tests/holo/res/drawable-hdpi/holo_wallpaper_notitlebar_switch_checked.png
new file mode 100644
index 0000000..d85ceaa
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_wallpaper_notitlebar_switch_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_wallpaper_notitlebar_tabhost.png b/tests/tests/holo/res/drawable-hdpi/holo_wallpaper_notitlebar_tabhost.png
new file mode 100644
index 0000000..27698b0
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_wallpaper_notitlebar_tabhost.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_wallpaper_notitlebar_textview.png b/tests/tests/holo/res/drawable-hdpi/holo_wallpaper_notitlebar_textview.png
new file mode 100644
index 0000000..85547e3
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_wallpaper_notitlebar_textview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_wallpaper_notitlebar_timepicker.png b/tests/tests/holo/res/drawable-hdpi/holo_wallpaper_notitlebar_timepicker.png
new file mode 100644
index 0000000..427cc55
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_wallpaper_notitlebar_timepicker.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_wallpaper_notitlebar_toggle_button.png b/tests/tests/holo/res/drawable-hdpi/holo_wallpaper_notitlebar_toggle_button.png
new file mode 100644
index 0000000..e101854
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_wallpaper_notitlebar_toggle_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_wallpaper_notitlebar_toggle_button_checked.png b/tests/tests/holo/res/drawable-hdpi/holo_wallpaper_notitlebar_toggle_button_checked.png
new file mode 100644
index 0000000..2daed75
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_wallpaper_notitlebar_toggle_button_checked.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_land_zoomcontrols.png b/tests/tests/holo/res/drawable-hdpi/holo_wallpaper_notitlebar_zoomcontrols.png
similarity index 100%
copy from tests/res/drawable-hdpi/holo_land_zoomcontrols.png
copy to tests/tests/holo/res/drawable-hdpi/holo_wallpaper_notitlebar_zoomcontrols.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_wallpaper_progressbar.png b/tests/tests/holo/res/drawable-hdpi/holo_wallpaper_progressbar.png
new file mode 100644
index 0000000..41e958c
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_wallpaper_progressbar.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_wallpaper_progressbar_horizontal_0.png b/tests/tests/holo/res/drawable-hdpi/holo_wallpaper_progressbar_horizontal_0.png
new file mode 100644
index 0000000..7923142
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_wallpaper_progressbar_horizontal_0.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_wallpaper_progressbar_horizontal_100.png b/tests/tests/holo/res/drawable-hdpi/holo_wallpaper_progressbar_horizontal_100.png
new file mode 100644
index 0000000..d94e0ec
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_wallpaper_progressbar_horizontal_100.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_wallpaper_progressbar_horizontal_50.png b/tests/tests/holo/res/drawable-hdpi/holo_wallpaper_progressbar_horizontal_50.png
new file mode 100644
index 0000000..0891a0b
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_wallpaper_progressbar_horizontal_50.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_wallpaper_progressbar_large.png b/tests/tests/holo/res/drawable-hdpi/holo_wallpaper_progressbar_large.png
new file mode 100644
index 0000000..0fd63d2
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_wallpaper_progressbar_large.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_wallpaper_progressbar_small.png b/tests/tests/holo/res/drawable-hdpi/holo_wallpaper_progressbar_small.png
new file mode 100644
index 0000000..1a270f9
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_wallpaper_progressbar_small.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_wallpaper_progressdialog_horizontal.png b/tests/tests/holo/res/drawable-hdpi/holo_wallpaper_progressdialog_horizontal.png
new file mode 100644
index 0000000..168b54f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_wallpaper_progressdialog_horizontal.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_wallpaper_radio_button.png b/tests/tests/holo/res/drawable-hdpi/holo_wallpaper_radio_button.png
new file mode 100644
index 0000000..50c99a6
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_wallpaper_radio_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_wallpaper_radio_button_checked.png b/tests/tests/holo/res/drawable-hdpi/holo_wallpaper_radio_button_checked.png
new file mode 100644
index 0000000..5959f1b
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_wallpaper_radio_button_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_wallpaper_radiogroup_horizontal.png b/tests/tests/holo/res/drawable-hdpi/holo_wallpaper_radiogroup_horizontal.png
new file mode 100644
index 0000000..bfe6918
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_wallpaper_radiogroup_horizontal.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_wallpaper_radiogroup_vertical.png b/tests/tests/holo/res/drawable-hdpi/holo_wallpaper_radiogroup_vertical.png
new file mode 100644
index 0000000..5a74bfb
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_wallpaper_radiogroup_vertical.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_land_ratingbar_0.png b/tests/tests/holo/res/drawable-hdpi/holo_wallpaper_ratingbar_0.png
similarity index 100%
copy from tests/res/drawable-hdpi/holo_land_ratingbar_0.png
copy to tests/tests/holo/res/drawable-hdpi/holo_wallpaper_ratingbar_0.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_land_ratingbar_0_pressed.png b/tests/tests/holo/res/drawable-hdpi/holo_wallpaper_ratingbar_0_pressed.png
similarity index 100%
copy from tests/res/drawable-hdpi/holo_land_ratingbar_0_pressed.png
copy to tests/tests/holo/res/drawable-hdpi/holo_wallpaper_ratingbar_0_pressed.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_land_ratingbar_2point5.png b/tests/tests/holo/res/drawable-hdpi/holo_wallpaper_ratingbar_2point5.png
similarity index 100%
copy from tests/res/drawable-hdpi/holo_land_ratingbar_2point5.png
copy to tests/tests/holo/res/drawable-hdpi/holo_wallpaper_ratingbar_2point5.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_land_ratingbar_2point5_pressed.png b/tests/tests/holo/res/drawable-hdpi/holo_wallpaper_ratingbar_2point5_pressed.png
similarity index 100%
copy from tests/res/drawable-hdpi/holo_land_ratingbar_2point5_pressed.png
copy to tests/tests/holo/res/drawable-hdpi/holo_wallpaper_ratingbar_2point5_pressed.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_land_ratingbar_5.png b/tests/tests/holo/res/drawable-hdpi/holo_wallpaper_ratingbar_5.png
similarity index 100%
copy from tests/res/drawable-hdpi/holo_land_ratingbar_5.png
copy to tests/tests/holo/res/drawable-hdpi/holo_wallpaper_ratingbar_5.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_land_ratingbar_5_pressed.png b/tests/tests/holo/res/drawable-hdpi/holo_wallpaper_ratingbar_5_pressed.png
similarity index 100%
copy from tests/res/drawable-hdpi/holo_land_ratingbar_5_pressed.png
copy to tests/tests/holo/res/drawable-hdpi/holo_wallpaper_ratingbar_5_pressed.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_wallpaper_searchview.png b/tests/tests/holo/res/drawable-hdpi/holo_wallpaper_searchview.png
new file mode 100644
index 0000000..2316e8a
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_wallpaper_searchview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_wallpaper_searchview_query.png b/tests/tests/holo/res/drawable-hdpi/holo_wallpaper_searchview_query.png
new file mode 100644
index 0000000..1eb04da
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_wallpaper_searchview_query.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_wallpaper_searchview_query_hint.png b/tests/tests/holo/res/drawable-hdpi/holo_wallpaper_searchview_query_hint.png
new file mode 100644
index 0000000..bdf014a
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_wallpaper_searchview_query_hint.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_wallpaper_seekbar_0.png b/tests/tests/holo/res/drawable-hdpi/holo_wallpaper_seekbar_0.png
new file mode 100644
index 0000000..b194d4e
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_wallpaper_seekbar_0.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_wallpaper_seekbar_100.png b/tests/tests/holo/res/drawable-hdpi/holo_wallpaper_seekbar_100.png
new file mode 100644
index 0000000..b89ea7d
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_wallpaper_seekbar_100.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_wallpaper_seekbar_50.png b/tests/tests/holo/res/drawable-hdpi/holo_wallpaper_seekbar_50.png
new file mode 100644
index 0000000..3100469
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_wallpaper_seekbar_50.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_wallpaper_spinner.png b/tests/tests/holo/res/drawable-hdpi/holo_wallpaper_spinner.png
new file mode 100644
index 0000000..9aaac14
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_wallpaper_spinner.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_wallpaper_switch.png b/tests/tests/holo/res/drawable-hdpi/holo_wallpaper_switch.png
new file mode 100644
index 0000000..38fe4e7
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_wallpaper_switch.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_wallpaper_switch_checked.png b/tests/tests/holo/res/drawable-hdpi/holo_wallpaper_switch_checked.png
new file mode 100644
index 0000000..d85ceaa
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_wallpaper_switch_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_wallpaper_tabhost.png b/tests/tests/holo/res/drawable-hdpi/holo_wallpaper_tabhost.png
new file mode 100644
index 0000000..27698b0
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_wallpaper_tabhost.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_wallpaper_textview.png b/tests/tests/holo/res/drawable-hdpi/holo_wallpaper_textview.png
new file mode 100644
index 0000000..85547e3
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_wallpaper_textview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_wallpaper_timepicker.png b/tests/tests/holo/res/drawable-hdpi/holo_wallpaper_timepicker.png
new file mode 100644
index 0000000..427cc55
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_wallpaper_timepicker.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_wallpaper_toggle_button.png b/tests/tests/holo/res/drawable-hdpi/holo_wallpaper_toggle_button.png
new file mode 100644
index 0000000..e101854
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_wallpaper_toggle_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-hdpi/holo_wallpaper_toggle_button_checked.png b/tests/tests/holo/res/drawable-hdpi/holo_wallpaper_toggle_button_checked.png
new file mode 100644
index 0000000..2daed75
--- /dev/null
+++ b/tests/tests/holo/res/drawable-hdpi/holo_wallpaper_toggle_button_checked.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_land_zoomcontrols.png b/tests/tests/holo/res/drawable-hdpi/holo_wallpaper_zoomcontrols.png
similarity index 100%
copy from tests/res/drawable-hdpi/holo_land_zoomcontrols.png
copy to tests/tests/holo/res/drawable-hdpi/holo_wallpaper_zoomcontrols.png
Binary files differ
diff --git a/tests/res/drawable-hdpi/holo_land_zoomcontrols.png b/tests/tests/holo/res/drawable-hdpi/holo_zoomcontrols.png
similarity index 100%
rename from tests/res/drawable-hdpi/holo_land_zoomcontrols.png
rename to tests/tests/holo/res/drawable-hdpi/holo_zoomcontrols.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_alertdialog_list.png b/tests/tests/holo/res/drawable-ldpi/holo_alertdialog_list.png
new file mode 100644
index 0000000..ca60c2f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_alertdialog_list.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_alertdialog_multichoice.png b/tests/tests/holo/res/drawable-ldpi/holo_alertdialog_multichoice.png
new file mode 100644
index 0000000..ef5a620
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_alertdialog_multichoice.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_alertdialog_onebutton.png b/tests/tests/holo/res/drawable-ldpi/holo_alertdialog_onebutton.png
new file mode 100644
index 0000000..6e67ae0
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_alertdialog_onebutton.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_alertdialog_singlechoice.png b/tests/tests/holo/res/drawable-ldpi/holo_alertdialog_singlechoice.png
new file mode 100644
index 0000000..b66441a
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_alertdialog_singlechoice.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_alertdialog_threebuttons.png b/tests/tests/holo/res/drawable-ldpi/holo_alertdialog_threebuttons.png
new file mode 100644
index 0000000..e5c6476
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_alertdialog_threebuttons.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_alertdialog_twobuttons.png b/tests/tests/holo/res/drawable-ldpi/holo_alertdialog_twobuttons.png
new file mode 100644
index 0000000..65b1d05
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_alertdialog_twobuttons.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_button.png b/tests/tests/holo/res/drawable-ldpi/holo_button.png
new file mode 100644
index 0000000..354ebd1
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_button_pressed.png b/tests/tests/holo/res/drawable-ldpi/holo_button_pressed.png
new file mode 100644
index 0000000..2562c8c
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_button_pressed.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_calendar_view.png b/tests/tests/holo/res/drawable-ldpi/holo_calendar_view.png
new file mode 100644
index 0000000..884bfc0
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_calendar_view.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_calendar_view_feb.png b/tests/tests/holo/res/drawable-ldpi/holo_calendar_view_feb.png
new file mode 100644
index 0000000..fc65b4a
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_calendar_view_feb.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_checkbox.png b/tests/tests/holo/res/drawable-ldpi/holo_checkbox.png
new file mode 100644
index 0000000..58b679e
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_checkbox.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_checkbox_checked.png b/tests/tests/holo/res/drawable-ldpi/holo_checkbox_checked.png
new file mode 100644
index 0000000..894922c
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_checkbox_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_chronometer.png b/tests/tests/holo/res/drawable-ldpi/holo_chronometer.png
new file mode 100644
index 0000000..dca49b0
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_chronometer.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_color_blue_bright.png b/tests/tests/holo/res/drawable-ldpi/holo_color_blue_bright.png
new file mode 100644
index 0000000..feaec2c
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_color_blue_bright.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_color_blue_dark.png b/tests/tests/holo/res/drawable-ldpi/holo_color_blue_dark.png
new file mode 100644
index 0000000..a8640c1
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_color_blue_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_color_blue_light.png b/tests/tests/holo/res/drawable-ldpi/holo_color_blue_light.png
new file mode 100644
index 0000000..ae141af
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_color_blue_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_color_green_dark.png b/tests/tests/holo/res/drawable-ldpi/holo_color_green_dark.png
new file mode 100644
index 0000000..0ee2324
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_color_green_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_color_green_light.png b/tests/tests/holo/res/drawable-ldpi/holo_color_green_light.png
new file mode 100644
index 0000000..9ca63c5
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_color_green_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_color_orange_dark.png b/tests/tests/holo/res/drawable-ldpi/holo_color_orange_dark.png
new file mode 100644
index 0000000..bc06b4f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_color_orange_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_color_orange_light.png b/tests/tests/holo/res/drawable-ldpi/holo_color_orange_light.png
new file mode 100644
index 0000000..1495f82
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_color_orange_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_color_purple.png b/tests/tests/holo/res/drawable-ldpi/holo_color_purple.png
new file mode 100644
index 0000000..9652f56
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_color_purple.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_color_red_dark.png b/tests/tests/holo/res/drawable-ldpi/holo_color_red_dark.png
new file mode 100644
index 0000000..4acebf8
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_color_red_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_color_red_light.png b/tests/tests/holo/res/drawable-ldpi/holo_color_red_light.png
new file mode 100644
index 0000000..d5b5742
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_color_red_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_dialog_alertdialog_list.png b/tests/tests/holo/res/drawable-ldpi/holo_dialog_alertdialog_list.png
new file mode 100644
index 0000000..ca60c2f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_dialog_alertdialog_list.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_dialog_alertdialog_multichoice.png b/tests/tests/holo/res/drawable-ldpi/holo_dialog_alertdialog_multichoice.png
new file mode 100644
index 0000000..ef5a620
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_dialog_alertdialog_multichoice.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_dialog_alertdialog_onebutton.png b/tests/tests/holo/res/drawable-ldpi/holo_dialog_alertdialog_onebutton.png
new file mode 100644
index 0000000..6e67ae0
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_dialog_alertdialog_onebutton.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_dialog_alertdialog_singlechoice.png b/tests/tests/holo/res/drawable-ldpi/holo_dialog_alertdialog_singlechoice.png
new file mode 100644
index 0000000..b66441a
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_dialog_alertdialog_singlechoice.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_dialog_alertdialog_threebuttons.png b/tests/tests/holo/res/drawable-ldpi/holo_dialog_alertdialog_threebuttons.png
new file mode 100644
index 0000000..e5c6476
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_dialog_alertdialog_threebuttons.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_dialog_alertdialog_twobuttons.png b/tests/tests/holo/res/drawable-ldpi/holo_dialog_alertdialog_twobuttons.png
new file mode 100644
index 0000000..65b1d05
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_dialog_alertdialog_twobuttons.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_dialog_button.png b/tests/tests/holo/res/drawable-ldpi/holo_dialog_button.png
new file mode 100644
index 0000000..354ebd1
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_dialog_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_dialog_button_pressed.png b/tests/tests/holo/res/drawable-ldpi/holo_dialog_button_pressed.png
new file mode 100644
index 0000000..2562c8c
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_dialog_button_pressed.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_dialog_calendar_view.png b/tests/tests/holo/res/drawable-ldpi/holo_dialog_calendar_view.png
new file mode 100644
index 0000000..884bfc0
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_dialog_calendar_view.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_dialog_calendar_view_feb.png b/tests/tests/holo/res/drawable-ldpi/holo_dialog_calendar_view_feb.png
new file mode 100644
index 0000000..fc65b4a
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_dialog_calendar_view_feb.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_dialog_checkbox.png b/tests/tests/holo/res/drawable-ldpi/holo_dialog_checkbox.png
new file mode 100644
index 0000000..58b679e
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_dialog_checkbox.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_dialog_checkbox_checked.png b/tests/tests/holo/res/drawable-ldpi/holo_dialog_checkbox_checked.png
new file mode 100644
index 0000000..894922c
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_dialog_checkbox_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_dialog_chronometer.png b/tests/tests/holo/res/drawable-ldpi/holo_dialog_chronometer.png
new file mode 100644
index 0000000..dca49b0
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_dialog_chronometer.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_dialog_color_blue_bright.png b/tests/tests/holo/res/drawable-ldpi/holo_dialog_color_blue_bright.png
new file mode 100644
index 0000000..feaec2c
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_dialog_color_blue_bright.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_dialog_color_blue_dark.png b/tests/tests/holo/res/drawable-ldpi/holo_dialog_color_blue_dark.png
new file mode 100644
index 0000000..a8640c1
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_dialog_color_blue_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_dialog_color_blue_light.png b/tests/tests/holo/res/drawable-ldpi/holo_dialog_color_blue_light.png
new file mode 100644
index 0000000..ae141af
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_dialog_color_blue_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_dialog_color_green_dark.png b/tests/tests/holo/res/drawable-ldpi/holo_dialog_color_green_dark.png
new file mode 100644
index 0000000..0ee2324
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_dialog_color_green_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_dialog_color_green_light.png b/tests/tests/holo/res/drawable-ldpi/holo_dialog_color_green_light.png
new file mode 100644
index 0000000..9ca63c5
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_dialog_color_green_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_dialog_color_orange_dark.png b/tests/tests/holo/res/drawable-ldpi/holo_dialog_color_orange_dark.png
new file mode 100644
index 0000000..bc06b4f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_dialog_color_orange_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_dialog_color_orange_light.png b/tests/tests/holo/res/drawable-ldpi/holo_dialog_color_orange_light.png
new file mode 100644
index 0000000..1495f82
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_dialog_color_orange_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_dialog_color_purple.png b/tests/tests/holo/res/drawable-ldpi/holo_dialog_color_purple.png
new file mode 100644
index 0000000..9652f56
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_dialog_color_purple.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_dialog_color_red_dark.png b/tests/tests/holo/res/drawable-ldpi/holo_dialog_color_red_dark.png
new file mode 100644
index 0000000..4acebf8
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_dialog_color_red_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_dialog_color_red_light.png b/tests/tests/holo/res/drawable-ldpi/holo_dialog_color_red_light.png
new file mode 100644
index 0000000..d5b5742
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_dialog_color_red_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_dialog_edittext.png b/tests/tests/holo/res/drawable-ldpi/holo_dialog_edittext.png
new file mode 100644
index 0000000..07a56b3
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_dialog_edittext.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_dialog_minwidth_alertdialog_list.png b/tests/tests/holo/res/drawable-ldpi/holo_dialog_minwidth_alertdialog_list.png
new file mode 100644
index 0000000..ca60c2f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_dialog_minwidth_alertdialog_list.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_dialog_minwidth_alertdialog_multichoice.png b/tests/tests/holo/res/drawable-ldpi/holo_dialog_minwidth_alertdialog_multichoice.png
new file mode 100644
index 0000000..ef5a620
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_dialog_minwidth_alertdialog_multichoice.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_dialog_minwidth_alertdialog_onebutton.png b/tests/tests/holo/res/drawable-ldpi/holo_dialog_minwidth_alertdialog_onebutton.png
new file mode 100644
index 0000000..6e67ae0
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_dialog_minwidth_alertdialog_onebutton.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_dialog_minwidth_alertdialog_singlechoice.png b/tests/tests/holo/res/drawable-ldpi/holo_dialog_minwidth_alertdialog_singlechoice.png
new file mode 100644
index 0000000..b66441a
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_dialog_minwidth_alertdialog_singlechoice.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_dialog_minwidth_alertdialog_threebuttons.png b/tests/tests/holo/res/drawable-ldpi/holo_dialog_minwidth_alertdialog_threebuttons.png
new file mode 100644
index 0000000..e5c6476
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_dialog_minwidth_alertdialog_threebuttons.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_dialog_minwidth_alertdialog_twobuttons.png b/tests/tests/holo/res/drawable-ldpi/holo_dialog_minwidth_alertdialog_twobuttons.png
new file mode 100644
index 0000000..65b1d05
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_dialog_minwidth_alertdialog_twobuttons.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_dialog_minwidth_button.png b/tests/tests/holo/res/drawable-ldpi/holo_dialog_minwidth_button.png
new file mode 100644
index 0000000..354ebd1
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_dialog_minwidth_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_dialog_minwidth_button_pressed.png b/tests/tests/holo/res/drawable-ldpi/holo_dialog_minwidth_button_pressed.png
new file mode 100644
index 0000000..2562c8c
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_dialog_minwidth_button_pressed.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_dialog_minwidth_calendar_view.png b/tests/tests/holo/res/drawable-ldpi/holo_dialog_minwidth_calendar_view.png
new file mode 100644
index 0000000..884bfc0
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_dialog_minwidth_calendar_view.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_dialog_minwidth_calendar_view_feb.png b/tests/tests/holo/res/drawable-ldpi/holo_dialog_minwidth_calendar_view_feb.png
new file mode 100644
index 0000000..fc65b4a
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_dialog_minwidth_calendar_view_feb.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_dialog_minwidth_checkbox.png b/tests/tests/holo/res/drawable-ldpi/holo_dialog_minwidth_checkbox.png
new file mode 100644
index 0000000..58b679e
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_dialog_minwidth_checkbox.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_dialog_minwidth_checkbox_checked.png b/tests/tests/holo/res/drawable-ldpi/holo_dialog_minwidth_checkbox_checked.png
new file mode 100644
index 0000000..894922c
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_dialog_minwidth_checkbox_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_dialog_minwidth_chronometer.png b/tests/tests/holo/res/drawable-ldpi/holo_dialog_minwidth_chronometer.png
new file mode 100644
index 0000000..dca49b0
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_dialog_minwidth_chronometer.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_dialog_minwidth_color_blue_bright.png b/tests/tests/holo/res/drawable-ldpi/holo_dialog_minwidth_color_blue_bright.png
new file mode 100644
index 0000000..feaec2c
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_dialog_minwidth_color_blue_bright.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_dialog_minwidth_color_blue_dark.png b/tests/tests/holo/res/drawable-ldpi/holo_dialog_minwidth_color_blue_dark.png
new file mode 100644
index 0000000..a8640c1
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_dialog_minwidth_color_blue_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_dialog_minwidth_color_blue_light.png b/tests/tests/holo/res/drawable-ldpi/holo_dialog_minwidth_color_blue_light.png
new file mode 100644
index 0000000..ae141af
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_dialog_minwidth_color_blue_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_dialog_minwidth_color_green_dark.png b/tests/tests/holo/res/drawable-ldpi/holo_dialog_minwidth_color_green_dark.png
new file mode 100644
index 0000000..0ee2324
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_dialog_minwidth_color_green_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_dialog_minwidth_color_green_light.png b/tests/tests/holo/res/drawable-ldpi/holo_dialog_minwidth_color_green_light.png
new file mode 100644
index 0000000..9ca63c5
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_dialog_minwidth_color_green_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_dialog_minwidth_color_orange_dark.png b/tests/tests/holo/res/drawable-ldpi/holo_dialog_minwidth_color_orange_dark.png
new file mode 100644
index 0000000..bc06b4f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_dialog_minwidth_color_orange_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_dialog_minwidth_color_orange_light.png b/tests/tests/holo/res/drawable-ldpi/holo_dialog_minwidth_color_orange_light.png
new file mode 100644
index 0000000..1495f82
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_dialog_minwidth_color_orange_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_dialog_minwidth_color_purple.png b/tests/tests/holo/res/drawable-ldpi/holo_dialog_minwidth_color_purple.png
new file mode 100644
index 0000000..9652f56
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_dialog_minwidth_color_purple.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_dialog_minwidth_color_red_dark.png b/tests/tests/holo/res/drawable-ldpi/holo_dialog_minwidth_color_red_dark.png
new file mode 100644
index 0000000..4acebf8
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_dialog_minwidth_color_red_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_dialog_minwidth_color_red_light.png b/tests/tests/holo/res/drawable-ldpi/holo_dialog_minwidth_color_red_light.png
new file mode 100644
index 0000000..d5b5742
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_dialog_minwidth_color_red_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_dialog_minwidth_edittext.png b/tests/tests/holo/res/drawable-ldpi/holo_dialog_minwidth_edittext.png
new file mode 100644
index 0000000..07a56b3
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_dialog_minwidth_edittext.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_dialog_minwidth_progressbar.png b/tests/tests/holo/res/drawable-ldpi/holo_dialog_minwidth_progressbar.png
new file mode 100644
index 0000000..06fec8f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_dialog_minwidth_progressbar.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_dialog_minwidth_progressbar_horizontal_0.png b/tests/tests/holo/res/drawable-ldpi/holo_dialog_minwidth_progressbar_horizontal_0.png
new file mode 100644
index 0000000..3ab1b88
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_dialog_minwidth_progressbar_horizontal_0.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_dialog_minwidth_progressbar_horizontal_100.png b/tests/tests/holo/res/drawable-ldpi/holo_dialog_minwidth_progressbar_horizontal_100.png
new file mode 100644
index 0000000..2ccefc1
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_dialog_minwidth_progressbar_horizontal_100.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_dialog_minwidth_progressbar_horizontal_50.png b/tests/tests/holo/res/drawable-ldpi/holo_dialog_minwidth_progressbar_horizontal_50.png
new file mode 100644
index 0000000..56239e3
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_dialog_minwidth_progressbar_horizontal_50.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_dialog_minwidth_progressbar_large.png b/tests/tests/holo/res/drawable-ldpi/holo_dialog_minwidth_progressbar_large.png
new file mode 100644
index 0000000..fe29e1d
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_dialog_minwidth_progressbar_large.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_dialog_minwidth_progressbar_small.png b/tests/tests/holo/res/drawable-ldpi/holo_dialog_minwidth_progressbar_small.png
new file mode 100644
index 0000000..28c0a40
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_dialog_minwidth_progressbar_small.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_dialog_minwidth_progressdialog_horizontal.png b/tests/tests/holo/res/drawable-ldpi/holo_dialog_minwidth_progressdialog_horizontal.png
new file mode 100644
index 0000000..c602ac2
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_dialog_minwidth_progressdialog_horizontal.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_dialog_minwidth_radio_button.png b/tests/tests/holo/res/drawable-ldpi/holo_dialog_minwidth_radio_button.png
new file mode 100644
index 0000000..96a4af9
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_dialog_minwidth_radio_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_dialog_minwidth_radio_button_checked.png b/tests/tests/holo/res/drawable-ldpi/holo_dialog_minwidth_radio_button_checked.png
new file mode 100644
index 0000000..fa14bcb
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_dialog_minwidth_radio_button_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_dialog_minwidth_radiogroup_horizontal.png b/tests/tests/holo/res/drawable-ldpi/holo_dialog_minwidth_radiogroup_horizontal.png
new file mode 100644
index 0000000..7184016
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_dialog_minwidth_radiogroup_horizontal.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_dialog_minwidth_radiogroup_vertical.png b/tests/tests/holo/res/drawable-ldpi/holo_dialog_minwidth_radiogroup_vertical.png
new file mode 100644
index 0000000..b7927b1
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_dialog_minwidth_radiogroup_vertical.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_dialog_minwidth_ratingbar_0.png b/tests/tests/holo/res/drawable-ldpi/holo_dialog_minwidth_ratingbar_0.png
new file mode 100644
index 0000000..88279b8
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_dialog_minwidth_ratingbar_0.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_dialog_minwidth_ratingbar_0_pressed.png b/tests/tests/holo/res/drawable-ldpi/holo_dialog_minwidth_ratingbar_0_pressed.png
new file mode 100644
index 0000000..d4b841d
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_dialog_minwidth_ratingbar_0_pressed.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_dialog_minwidth_ratingbar_2point5.png b/tests/tests/holo/res/drawable-ldpi/holo_dialog_minwidth_ratingbar_2point5.png
new file mode 100644
index 0000000..3e80e24
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_dialog_minwidth_ratingbar_2point5.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_dialog_minwidth_ratingbar_2point5_pressed.png b/tests/tests/holo/res/drawable-ldpi/holo_dialog_minwidth_ratingbar_2point5_pressed.png
new file mode 100644
index 0000000..b0c4cf2
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_dialog_minwidth_ratingbar_2point5_pressed.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_dialog_minwidth_ratingbar_5.png b/tests/tests/holo/res/drawable-ldpi/holo_dialog_minwidth_ratingbar_5.png
new file mode 100644
index 0000000..13eee57
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_dialog_minwidth_ratingbar_5.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_dialog_minwidth_ratingbar_5_pressed.png b/tests/tests/holo/res/drawable-ldpi/holo_dialog_minwidth_ratingbar_5_pressed.png
new file mode 100644
index 0000000..ccd4d30
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_dialog_minwidth_ratingbar_5_pressed.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_dialog_minwidth_searchview.png b/tests/tests/holo/res/drawable-ldpi/holo_dialog_minwidth_searchview.png
new file mode 100644
index 0000000..ca76a70
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_dialog_minwidth_searchview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_dialog_minwidth_searchview_query.png b/tests/tests/holo/res/drawable-ldpi/holo_dialog_minwidth_searchview_query.png
new file mode 100644
index 0000000..061f026
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_dialog_minwidth_searchview_query.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_dialog_minwidth_searchview_query_hint.png b/tests/tests/holo/res/drawable-ldpi/holo_dialog_minwidth_searchview_query_hint.png
new file mode 100644
index 0000000..34a711e
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_dialog_minwidth_searchview_query_hint.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_dialog_minwidth_seekbar_0.png b/tests/tests/holo/res/drawable-ldpi/holo_dialog_minwidth_seekbar_0.png
new file mode 100644
index 0000000..190a4c1
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_dialog_minwidth_seekbar_0.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_dialog_minwidth_seekbar_100.png b/tests/tests/holo/res/drawable-ldpi/holo_dialog_minwidth_seekbar_100.png
new file mode 100644
index 0000000..8e53289
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_dialog_minwidth_seekbar_100.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_dialog_minwidth_seekbar_50.png b/tests/tests/holo/res/drawable-ldpi/holo_dialog_minwidth_seekbar_50.png
new file mode 100644
index 0000000..421ca13
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_dialog_minwidth_seekbar_50.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_dialog_minwidth_spinner.png b/tests/tests/holo/res/drawable-ldpi/holo_dialog_minwidth_spinner.png
new file mode 100644
index 0000000..0c2edf5
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_dialog_minwidth_spinner.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_dialog_minwidth_switch.png b/tests/tests/holo/res/drawable-ldpi/holo_dialog_minwidth_switch.png
new file mode 100644
index 0000000..24ddf30
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_dialog_minwidth_switch.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_dialog_minwidth_switch_checked.png b/tests/tests/holo/res/drawable-ldpi/holo_dialog_minwidth_switch_checked.png
new file mode 100644
index 0000000..6216a7d
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_dialog_minwidth_switch_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_dialog_minwidth_tabhost.png b/tests/tests/holo/res/drawable-ldpi/holo_dialog_minwidth_tabhost.png
new file mode 100644
index 0000000..79b0338
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_dialog_minwidth_tabhost.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_dialog_minwidth_textview.png b/tests/tests/holo/res/drawable-ldpi/holo_dialog_minwidth_textview.png
new file mode 100644
index 0000000..256a7c2
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_dialog_minwidth_textview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_dialog_minwidth_timepicker.png b/tests/tests/holo/res/drawable-ldpi/holo_dialog_minwidth_timepicker.png
new file mode 100644
index 0000000..43e3494
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_dialog_minwidth_timepicker.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_dialog_minwidth_toggle_button.png b/tests/tests/holo/res/drawable-ldpi/holo_dialog_minwidth_toggle_button.png
new file mode 100644
index 0000000..630353a
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_dialog_minwidth_toggle_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_dialog_minwidth_toggle_button_checked.png b/tests/tests/holo/res/drawable-ldpi/holo_dialog_minwidth_toggle_button_checked.png
new file mode 100644
index 0000000..f1cf667
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_dialog_minwidth_toggle_button_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_dialog_minwidth_zoomcontrols.png b/tests/tests/holo/res/drawable-ldpi/holo_dialog_minwidth_zoomcontrols.png
new file mode 100644
index 0000000..ab090a6
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_dialog_minwidth_zoomcontrols.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_dialog_noactionbar_alertdialog_list.png b/tests/tests/holo/res/drawable-ldpi/holo_dialog_noactionbar_alertdialog_list.png
new file mode 100644
index 0000000..ca60c2f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_dialog_noactionbar_alertdialog_list.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_dialog_noactionbar_alertdialog_multichoice.png b/tests/tests/holo/res/drawable-ldpi/holo_dialog_noactionbar_alertdialog_multichoice.png
new file mode 100644
index 0000000..ef5a620
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_dialog_noactionbar_alertdialog_multichoice.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_dialog_noactionbar_alertdialog_onebutton.png b/tests/tests/holo/res/drawable-ldpi/holo_dialog_noactionbar_alertdialog_onebutton.png
new file mode 100644
index 0000000..6e67ae0
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_dialog_noactionbar_alertdialog_onebutton.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_dialog_noactionbar_alertdialog_singlechoice.png b/tests/tests/holo/res/drawable-ldpi/holo_dialog_noactionbar_alertdialog_singlechoice.png
new file mode 100644
index 0000000..b66441a
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_dialog_noactionbar_alertdialog_singlechoice.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_dialog_noactionbar_alertdialog_threebuttons.png b/tests/tests/holo/res/drawable-ldpi/holo_dialog_noactionbar_alertdialog_threebuttons.png
new file mode 100644
index 0000000..e5c6476
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_dialog_noactionbar_alertdialog_threebuttons.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_dialog_noactionbar_alertdialog_twobuttons.png b/tests/tests/holo/res/drawable-ldpi/holo_dialog_noactionbar_alertdialog_twobuttons.png
new file mode 100644
index 0000000..65b1d05
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_dialog_noactionbar_alertdialog_twobuttons.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_dialog_noactionbar_button.png b/tests/tests/holo/res/drawable-ldpi/holo_dialog_noactionbar_button.png
new file mode 100644
index 0000000..354ebd1
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_dialog_noactionbar_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_dialog_noactionbar_button_pressed.png b/tests/tests/holo/res/drawable-ldpi/holo_dialog_noactionbar_button_pressed.png
new file mode 100644
index 0000000..2562c8c
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_dialog_noactionbar_button_pressed.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_dialog_noactionbar_calendar_view.png b/tests/tests/holo/res/drawable-ldpi/holo_dialog_noactionbar_calendar_view.png
new file mode 100644
index 0000000..884bfc0
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_dialog_noactionbar_calendar_view.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_dialog_noactionbar_calendar_view_feb.png b/tests/tests/holo/res/drawable-ldpi/holo_dialog_noactionbar_calendar_view_feb.png
new file mode 100644
index 0000000..fc65b4a
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_dialog_noactionbar_calendar_view_feb.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_dialog_noactionbar_checkbox.png b/tests/tests/holo/res/drawable-ldpi/holo_dialog_noactionbar_checkbox.png
new file mode 100644
index 0000000..58b679e
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_dialog_noactionbar_checkbox.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_dialog_noactionbar_checkbox_checked.png b/tests/tests/holo/res/drawable-ldpi/holo_dialog_noactionbar_checkbox_checked.png
new file mode 100644
index 0000000..894922c
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_dialog_noactionbar_checkbox_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_dialog_noactionbar_chronometer.png b/tests/tests/holo/res/drawable-ldpi/holo_dialog_noactionbar_chronometer.png
new file mode 100644
index 0000000..dca49b0
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_dialog_noactionbar_chronometer.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_dialog_noactionbar_color_blue_bright.png b/tests/tests/holo/res/drawable-ldpi/holo_dialog_noactionbar_color_blue_bright.png
new file mode 100644
index 0000000..feaec2c
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_dialog_noactionbar_color_blue_bright.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_dialog_noactionbar_color_blue_dark.png b/tests/tests/holo/res/drawable-ldpi/holo_dialog_noactionbar_color_blue_dark.png
new file mode 100644
index 0000000..a8640c1
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_dialog_noactionbar_color_blue_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_dialog_noactionbar_color_blue_light.png b/tests/tests/holo/res/drawable-ldpi/holo_dialog_noactionbar_color_blue_light.png
new file mode 100644
index 0000000..ae141af
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_dialog_noactionbar_color_blue_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_dialog_noactionbar_color_green_dark.png b/tests/tests/holo/res/drawable-ldpi/holo_dialog_noactionbar_color_green_dark.png
new file mode 100644
index 0000000..0ee2324
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_dialog_noactionbar_color_green_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_dialog_noactionbar_color_green_light.png b/tests/tests/holo/res/drawable-ldpi/holo_dialog_noactionbar_color_green_light.png
new file mode 100644
index 0000000..9ca63c5
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_dialog_noactionbar_color_green_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_dialog_noactionbar_color_orange_dark.png b/tests/tests/holo/res/drawable-ldpi/holo_dialog_noactionbar_color_orange_dark.png
new file mode 100644
index 0000000..bc06b4f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_dialog_noactionbar_color_orange_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_dialog_noactionbar_color_orange_light.png b/tests/tests/holo/res/drawable-ldpi/holo_dialog_noactionbar_color_orange_light.png
new file mode 100644
index 0000000..1495f82
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_dialog_noactionbar_color_orange_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_dialog_noactionbar_color_purple.png b/tests/tests/holo/res/drawable-ldpi/holo_dialog_noactionbar_color_purple.png
new file mode 100644
index 0000000..9652f56
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_dialog_noactionbar_color_purple.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_dialog_noactionbar_color_red_dark.png b/tests/tests/holo/res/drawable-ldpi/holo_dialog_noactionbar_color_red_dark.png
new file mode 100644
index 0000000..4acebf8
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_dialog_noactionbar_color_red_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_dialog_noactionbar_color_red_light.png b/tests/tests/holo/res/drawable-ldpi/holo_dialog_noactionbar_color_red_light.png
new file mode 100644
index 0000000..d5b5742
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_dialog_noactionbar_color_red_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_dialog_noactionbar_edittext.png b/tests/tests/holo/res/drawable-ldpi/holo_dialog_noactionbar_edittext.png
new file mode 100644
index 0000000..07a56b3
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_dialog_noactionbar_edittext.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_dialog_noactionbar_minwidth_alertdialog_list.png b/tests/tests/holo/res/drawable-ldpi/holo_dialog_noactionbar_minwidth_alertdialog_list.png
new file mode 100644
index 0000000..ca60c2f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_dialog_noactionbar_minwidth_alertdialog_list.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_dialog_noactionbar_minwidth_alertdialog_multichoice.png b/tests/tests/holo/res/drawable-ldpi/holo_dialog_noactionbar_minwidth_alertdialog_multichoice.png
new file mode 100644
index 0000000..ef5a620
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_dialog_noactionbar_minwidth_alertdialog_multichoice.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_dialog_noactionbar_minwidth_alertdialog_onebutton.png b/tests/tests/holo/res/drawable-ldpi/holo_dialog_noactionbar_minwidth_alertdialog_onebutton.png
new file mode 100644
index 0000000..6e67ae0
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_dialog_noactionbar_minwidth_alertdialog_onebutton.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_dialog_noactionbar_minwidth_alertdialog_singlechoice.png b/tests/tests/holo/res/drawable-ldpi/holo_dialog_noactionbar_minwidth_alertdialog_singlechoice.png
new file mode 100644
index 0000000..b66441a
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_dialog_noactionbar_minwidth_alertdialog_singlechoice.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_dialog_noactionbar_minwidth_alertdialog_threebuttons.png b/tests/tests/holo/res/drawable-ldpi/holo_dialog_noactionbar_minwidth_alertdialog_threebuttons.png
new file mode 100644
index 0000000..e5c6476
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_dialog_noactionbar_minwidth_alertdialog_threebuttons.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_dialog_noactionbar_minwidth_alertdialog_twobuttons.png b/tests/tests/holo/res/drawable-ldpi/holo_dialog_noactionbar_minwidth_alertdialog_twobuttons.png
new file mode 100644
index 0000000..65b1d05
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_dialog_noactionbar_minwidth_alertdialog_twobuttons.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_dialog_noactionbar_minwidth_button.png b/tests/tests/holo/res/drawable-ldpi/holo_dialog_noactionbar_minwidth_button.png
new file mode 100644
index 0000000..354ebd1
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_dialog_noactionbar_minwidth_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_dialog_noactionbar_minwidth_button_pressed.png b/tests/tests/holo/res/drawable-ldpi/holo_dialog_noactionbar_minwidth_button_pressed.png
new file mode 100644
index 0000000..2562c8c
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_dialog_noactionbar_minwidth_button_pressed.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_dialog_noactionbar_minwidth_calendar_view.png b/tests/tests/holo/res/drawable-ldpi/holo_dialog_noactionbar_minwidth_calendar_view.png
new file mode 100644
index 0000000..884bfc0
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_dialog_noactionbar_minwidth_calendar_view.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_dialog_noactionbar_minwidth_calendar_view_feb.png b/tests/tests/holo/res/drawable-ldpi/holo_dialog_noactionbar_minwidth_calendar_view_feb.png
new file mode 100644
index 0000000..fc65b4a
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_dialog_noactionbar_minwidth_calendar_view_feb.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_dialog_noactionbar_minwidth_checkbox.png b/tests/tests/holo/res/drawable-ldpi/holo_dialog_noactionbar_minwidth_checkbox.png
new file mode 100644
index 0000000..58b679e
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_dialog_noactionbar_minwidth_checkbox.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_dialog_noactionbar_minwidth_checkbox_checked.png b/tests/tests/holo/res/drawable-ldpi/holo_dialog_noactionbar_minwidth_checkbox_checked.png
new file mode 100644
index 0000000..894922c
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_dialog_noactionbar_minwidth_checkbox_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_dialog_noactionbar_minwidth_chronometer.png b/tests/tests/holo/res/drawable-ldpi/holo_dialog_noactionbar_minwidth_chronometer.png
new file mode 100644
index 0000000..dca49b0
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_dialog_noactionbar_minwidth_chronometer.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_dialog_noactionbar_minwidth_color_blue_bright.png b/tests/tests/holo/res/drawable-ldpi/holo_dialog_noactionbar_minwidth_color_blue_bright.png
new file mode 100644
index 0000000..feaec2c
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_dialog_noactionbar_minwidth_color_blue_bright.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_dialog_noactionbar_minwidth_color_blue_dark.png b/tests/tests/holo/res/drawable-ldpi/holo_dialog_noactionbar_minwidth_color_blue_dark.png
new file mode 100644
index 0000000..a8640c1
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_dialog_noactionbar_minwidth_color_blue_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_dialog_noactionbar_minwidth_color_blue_light.png b/tests/tests/holo/res/drawable-ldpi/holo_dialog_noactionbar_minwidth_color_blue_light.png
new file mode 100644
index 0000000..ae141af
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_dialog_noactionbar_minwidth_color_blue_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_dialog_noactionbar_minwidth_color_green_dark.png b/tests/tests/holo/res/drawable-ldpi/holo_dialog_noactionbar_minwidth_color_green_dark.png
new file mode 100644
index 0000000..0ee2324
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_dialog_noactionbar_minwidth_color_green_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_dialog_noactionbar_minwidth_color_green_light.png b/tests/tests/holo/res/drawable-ldpi/holo_dialog_noactionbar_minwidth_color_green_light.png
new file mode 100644
index 0000000..9ca63c5
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_dialog_noactionbar_minwidth_color_green_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_dialog_noactionbar_minwidth_color_orange_dark.png b/tests/tests/holo/res/drawable-ldpi/holo_dialog_noactionbar_minwidth_color_orange_dark.png
new file mode 100644
index 0000000..bc06b4f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_dialog_noactionbar_minwidth_color_orange_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_dialog_noactionbar_minwidth_color_orange_light.png b/tests/tests/holo/res/drawable-ldpi/holo_dialog_noactionbar_minwidth_color_orange_light.png
new file mode 100644
index 0000000..1495f82
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_dialog_noactionbar_minwidth_color_orange_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_dialog_noactionbar_minwidth_color_purple.png b/tests/tests/holo/res/drawable-ldpi/holo_dialog_noactionbar_minwidth_color_purple.png
new file mode 100644
index 0000000..9652f56
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_dialog_noactionbar_minwidth_color_purple.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_dialog_noactionbar_minwidth_color_red_dark.png b/tests/tests/holo/res/drawable-ldpi/holo_dialog_noactionbar_minwidth_color_red_dark.png
new file mode 100644
index 0000000..4acebf8
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_dialog_noactionbar_minwidth_color_red_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_dialog_noactionbar_minwidth_color_red_light.png b/tests/tests/holo/res/drawable-ldpi/holo_dialog_noactionbar_minwidth_color_red_light.png
new file mode 100644
index 0000000..d5b5742
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_dialog_noactionbar_minwidth_color_red_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_dialog_noactionbar_minwidth_edittext.png b/tests/tests/holo/res/drawable-ldpi/holo_dialog_noactionbar_minwidth_edittext.png
new file mode 100644
index 0000000..07a56b3
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_dialog_noactionbar_minwidth_edittext.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_dialog_noactionbar_minwidth_progressbar.png b/tests/tests/holo/res/drawable-ldpi/holo_dialog_noactionbar_minwidth_progressbar.png
new file mode 100644
index 0000000..06fec8f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_dialog_noactionbar_minwidth_progressbar.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_dialog_noactionbar_minwidth_progressbar_horizontal_0.png b/tests/tests/holo/res/drawable-ldpi/holo_dialog_noactionbar_minwidth_progressbar_horizontal_0.png
new file mode 100644
index 0000000..3ab1b88
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_dialog_noactionbar_minwidth_progressbar_horizontal_0.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_dialog_noactionbar_minwidth_progressbar_horizontal_100.png b/tests/tests/holo/res/drawable-ldpi/holo_dialog_noactionbar_minwidth_progressbar_horizontal_100.png
new file mode 100644
index 0000000..2ccefc1
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_dialog_noactionbar_minwidth_progressbar_horizontal_100.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_dialog_noactionbar_minwidth_progressbar_horizontal_50.png b/tests/tests/holo/res/drawable-ldpi/holo_dialog_noactionbar_minwidth_progressbar_horizontal_50.png
new file mode 100644
index 0000000..56239e3
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_dialog_noactionbar_minwidth_progressbar_horizontal_50.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_dialog_noactionbar_minwidth_progressbar_large.png b/tests/tests/holo/res/drawable-ldpi/holo_dialog_noactionbar_minwidth_progressbar_large.png
new file mode 100644
index 0000000..fe29e1d
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_dialog_noactionbar_minwidth_progressbar_large.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_dialog_noactionbar_minwidth_progressbar_small.png b/tests/tests/holo/res/drawable-ldpi/holo_dialog_noactionbar_minwidth_progressbar_small.png
new file mode 100644
index 0000000..28c0a40
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_dialog_noactionbar_minwidth_progressbar_small.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_dialog_noactionbar_minwidth_progressdialog_horizontal.png b/tests/tests/holo/res/drawable-ldpi/holo_dialog_noactionbar_minwidth_progressdialog_horizontal.png
new file mode 100644
index 0000000..c602ac2
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_dialog_noactionbar_minwidth_progressdialog_horizontal.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_dialog_noactionbar_minwidth_radio_button.png b/tests/tests/holo/res/drawable-ldpi/holo_dialog_noactionbar_minwidth_radio_button.png
new file mode 100644
index 0000000..96a4af9
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_dialog_noactionbar_minwidth_radio_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_dialog_noactionbar_minwidth_radio_button_checked.png b/tests/tests/holo/res/drawable-ldpi/holo_dialog_noactionbar_minwidth_radio_button_checked.png
new file mode 100644
index 0000000..fa14bcb
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_dialog_noactionbar_minwidth_radio_button_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_dialog_noactionbar_minwidth_radiogroup_horizontal.png b/tests/tests/holo/res/drawable-ldpi/holo_dialog_noactionbar_minwidth_radiogroup_horizontal.png
new file mode 100644
index 0000000..7184016
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_dialog_noactionbar_minwidth_radiogroup_horizontal.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_dialog_noactionbar_minwidth_radiogroup_vertical.png b/tests/tests/holo/res/drawable-ldpi/holo_dialog_noactionbar_minwidth_radiogroup_vertical.png
new file mode 100644
index 0000000..b7927b1
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_dialog_noactionbar_minwidth_radiogroup_vertical.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_dialog_noactionbar_minwidth_ratingbar_0.png b/tests/tests/holo/res/drawable-ldpi/holo_dialog_noactionbar_minwidth_ratingbar_0.png
new file mode 100644
index 0000000..88279b8
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_dialog_noactionbar_minwidth_ratingbar_0.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_dialog_noactionbar_minwidth_ratingbar_0_pressed.png b/tests/tests/holo/res/drawable-ldpi/holo_dialog_noactionbar_minwidth_ratingbar_0_pressed.png
new file mode 100644
index 0000000..d4b841d
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_dialog_noactionbar_minwidth_ratingbar_0_pressed.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_dialog_noactionbar_minwidth_ratingbar_2point5.png b/tests/tests/holo/res/drawable-ldpi/holo_dialog_noactionbar_minwidth_ratingbar_2point5.png
new file mode 100644
index 0000000..3e80e24
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_dialog_noactionbar_minwidth_ratingbar_2point5.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_dialog_noactionbar_minwidth_ratingbar_2point5_pressed.png b/tests/tests/holo/res/drawable-ldpi/holo_dialog_noactionbar_minwidth_ratingbar_2point5_pressed.png
new file mode 100644
index 0000000..b0c4cf2
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_dialog_noactionbar_minwidth_ratingbar_2point5_pressed.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_dialog_noactionbar_minwidth_ratingbar_5.png b/tests/tests/holo/res/drawable-ldpi/holo_dialog_noactionbar_minwidth_ratingbar_5.png
new file mode 100644
index 0000000..13eee57
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_dialog_noactionbar_minwidth_ratingbar_5.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_dialog_noactionbar_minwidth_ratingbar_5_pressed.png b/tests/tests/holo/res/drawable-ldpi/holo_dialog_noactionbar_minwidth_ratingbar_5_pressed.png
new file mode 100644
index 0000000..ccd4d30
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_dialog_noactionbar_minwidth_ratingbar_5_pressed.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_dialog_noactionbar_minwidth_searchview.png b/tests/tests/holo/res/drawable-ldpi/holo_dialog_noactionbar_minwidth_searchview.png
new file mode 100644
index 0000000..ca76a70
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_dialog_noactionbar_minwidth_searchview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_dialog_noactionbar_minwidth_searchview_query.png b/tests/tests/holo/res/drawable-ldpi/holo_dialog_noactionbar_minwidth_searchview_query.png
new file mode 100644
index 0000000..061f026
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_dialog_noactionbar_minwidth_searchview_query.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_dialog_noactionbar_minwidth_searchview_query_hint.png b/tests/tests/holo/res/drawable-ldpi/holo_dialog_noactionbar_minwidth_searchview_query_hint.png
new file mode 100644
index 0000000..34a711e
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_dialog_noactionbar_minwidth_searchview_query_hint.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_dialog_noactionbar_minwidth_seekbar_0.png b/tests/tests/holo/res/drawable-ldpi/holo_dialog_noactionbar_minwidth_seekbar_0.png
new file mode 100644
index 0000000..190a4c1
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_dialog_noactionbar_minwidth_seekbar_0.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_dialog_noactionbar_minwidth_seekbar_100.png b/tests/tests/holo/res/drawable-ldpi/holo_dialog_noactionbar_minwidth_seekbar_100.png
new file mode 100644
index 0000000..8e53289
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_dialog_noactionbar_minwidth_seekbar_100.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_dialog_noactionbar_minwidth_seekbar_50.png b/tests/tests/holo/res/drawable-ldpi/holo_dialog_noactionbar_minwidth_seekbar_50.png
new file mode 100644
index 0000000..421ca13
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_dialog_noactionbar_minwidth_seekbar_50.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_dialog_noactionbar_minwidth_spinner.png b/tests/tests/holo/res/drawable-ldpi/holo_dialog_noactionbar_minwidth_spinner.png
new file mode 100644
index 0000000..0c2edf5
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_dialog_noactionbar_minwidth_spinner.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_dialog_noactionbar_minwidth_switch.png b/tests/tests/holo/res/drawable-ldpi/holo_dialog_noactionbar_minwidth_switch.png
new file mode 100644
index 0000000..24ddf30
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_dialog_noactionbar_minwidth_switch.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_dialog_noactionbar_minwidth_switch_checked.png b/tests/tests/holo/res/drawable-ldpi/holo_dialog_noactionbar_minwidth_switch_checked.png
new file mode 100644
index 0000000..6216a7d
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_dialog_noactionbar_minwidth_switch_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_dialog_noactionbar_minwidth_tabhost.png b/tests/tests/holo/res/drawable-ldpi/holo_dialog_noactionbar_minwidth_tabhost.png
new file mode 100644
index 0000000..79b0338
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_dialog_noactionbar_minwidth_tabhost.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_dialog_noactionbar_minwidth_textview.png b/tests/tests/holo/res/drawable-ldpi/holo_dialog_noactionbar_minwidth_textview.png
new file mode 100644
index 0000000..256a7c2
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_dialog_noactionbar_minwidth_textview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_dialog_noactionbar_minwidth_timepicker.png b/tests/tests/holo/res/drawable-ldpi/holo_dialog_noactionbar_minwidth_timepicker.png
new file mode 100644
index 0000000..43e3494
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_dialog_noactionbar_minwidth_timepicker.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_dialog_noactionbar_minwidth_toggle_button.png b/tests/tests/holo/res/drawable-ldpi/holo_dialog_noactionbar_minwidth_toggle_button.png
new file mode 100644
index 0000000..630353a
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_dialog_noactionbar_minwidth_toggle_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_dialog_noactionbar_minwidth_toggle_button_checked.png b/tests/tests/holo/res/drawable-ldpi/holo_dialog_noactionbar_minwidth_toggle_button_checked.png
new file mode 100644
index 0000000..f1cf667
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_dialog_noactionbar_minwidth_toggle_button_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_dialog_noactionbar_minwidth_zoomcontrols.png b/tests/tests/holo/res/drawable-ldpi/holo_dialog_noactionbar_minwidth_zoomcontrols.png
new file mode 100644
index 0000000..ab090a6
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_dialog_noactionbar_minwidth_zoomcontrols.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_dialog_noactionbar_progressbar.png b/tests/tests/holo/res/drawable-ldpi/holo_dialog_noactionbar_progressbar.png
new file mode 100644
index 0000000..06fec8f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_dialog_noactionbar_progressbar.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_dialog_noactionbar_progressbar_horizontal_0.png b/tests/tests/holo/res/drawable-ldpi/holo_dialog_noactionbar_progressbar_horizontal_0.png
new file mode 100644
index 0000000..3ab1b88
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_dialog_noactionbar_progressbar_horizontal_0.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_dialog_noactionbar_progressbar_horizontal_100.png b/tests/tests/holo/res/drawable-ldpi/holo_dialog_noactionbar_progressbar_horizontal_100.png
new file mode 100644
index 0000000..2ccefc1
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_dialog_noactionbar_progressbar_horizontal_100.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_dialog_noactionbar_progressbar_horizontal_50.png b/tests/tests/holo/res/drawable-ldpi/holo_dialog_noactionbar_progressbar_horizontal_50.png
new file mode 100644
index 0000000..56239e3
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_dialog_noactionbar_progressbar_horizontal_50.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_dialog_noactionbar_progressbar_large.png b/tests/tests/holo/res/drawable-ldpi/holo_dialog_noactionbar_progressbar_large.png
new file mode 100644
index 0000000..fe29e1d
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_dialog_noactionbar_progressbar_large.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_dialog_noactionbar_progressbar_small.png b/tests/tests/holo/res/drawable-ldpi/holo_dialog_noactionbar_progressbar_small.png
new file mode 100644
index 0000000..28c0a40
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_dialog_noactionbar_progressbar_small.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_dialog_noactionbar_progressdialog_horizontal.png b/tests/tests/holo/res/drawable-ldpi/holo_dialog_noactionbar_progressdialog_horizontal.png
new file mode 100644
index 0000000..c602ac2
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_dialog_noactionbar_progressdialog_horizontal.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_dialog_noactionbar_radio_button.png b/tests/tests/holo/res/drawable-ldpi/holo_dialog_noactionbar_radio_button.png
new file mode 100644
index 0000000..96a4af9
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_dialog_noactionbar_radio_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_dialog_noactionbar_radio_button_checked.png b/tests/tests/holo/res/drawable-ldpi/holo_dialog_noactionbar_radio_button_checked.png
new file mode 100644
index 0000000..fa14bcb
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_dialog_noactionbar_radio_button_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_dialog_noactionbar_radiogroup_horizontal.png b/tests/tests/holo/res/drawable-ldpi/holo_dialog_noactionbar_radiogroup_horizontal.png
new file mode 100644
index 0000000..7184016
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_dialog_noactionbar_radiogroup_horizontal.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_dialog_noactionbar_radiogroup_vertical.png b/tests/tests/holo/res/drawable-ldpi/holo_dialog_noactionbar_radiogroup_vertical.png
new file mode 100644
index 0000000..b7927b1
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_dialog_noactionbar_radiogroup_vertical.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_dialog_noactionbar_ratingbar_0.png b/tests/tests/holo/res/drawable-ldpi/holo_dialog_noactionbar_ratingbar_0.png
new file mode 100644
index 0000000..88279b8
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_dialog_noactionbar_ratingbar_0.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_dialog_noactionbar_ratingbar_0_pressed.png b/tests/tests/holo/res/drawable-ldpi/holo_dialog_noactionbar_ratingbar_0_pressed.png
new file mode 100644
index 0000000..d4b841d
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_dialog_noactionbar_ratingbar_0_pressed.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_dialog_noactionbar_ratingbar_2point5.png b/tests/tests/holo/res/drawable-ldpi/holo_dialog_noactionbar_ratingbar_2point5.png
new file mode 100644
index 0000000..3e80e24
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_dialog_noactionbar_ratingbar_2point5.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_dialog_noactionbar_ratingbar_2point5_pressed.png b/tests/tests/holo/res/drawable-ldpi/holo_dialog_noactionbar_ratingbar_2point5_pressed.png
new file mode 100644
index 0000000..b0c4cf2
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_dialog_noactionbar_ratingbar_2point5_pressed.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_dialog_noactionbar_ratingbar_5.png b/tests/tests/holo/res/drawable-ldpi/holo_dialog_noactionbar_ratingbar_5.png
new file mode 100644
index 0000000..13eee57
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_dialog_noactionbar_ratingbar_5.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_dialog_noactionbar_ratingbar_5_pressed.png b/tests/tests/holo/res/drawable-ldpi/holo_dialog_noactionbar_ratingbar_5_pressed.png
new file mode 100644
index 0000000..ccd4d30
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_dialog_noactionbar_ratingbar_5_pressed.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_dialog_noactionbar_searchview.png b/tests/tests/holo/res/drawable-ldpi/holo_dialog_noactionbar_searchview.png
new file mode 100644
index 0000000..ca76a70
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_dialog_noactionbar_searchview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_dialog_noactionbar_searchview_query.png b/tests/tests/holo/res/drawable-ldpi/holo_dialog_noactionbar_searchview_query.png
new file mode 100644
index 0000000..061f026
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_dialog_noactionbar_searchview_query.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_dialog_noactionbar_searchview_query_hint.png b/tests/tests/holo/res/drawable-ldpi/holo_dialog_noactionbar_searchview_query_hint.png
new file mode 100644
index 0000000..34a711e
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_dialog_noactionbar_searchview_query_hint.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_dialog_noactionbar_seekbar_0.png b/tests/tests/holo/res/drawable-ldpi/holo_dialog_noactionbar_seekbar_0.png
new file mode 100644
index 0000000..190a4c1
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_dialog_noactionbar_seekbar_0.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_dialog_noactionbar_seekbar_100.png b/tests/tests/holo/res/drawable-ldpi/holo_dialog_noactionbar_seekbar_100.png
new file mode 100644
index 0000000..8e53289
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_dialog_noactionbar_seekbar_100.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_dialog_noactionbar_seekbar_50.png b/tests/tests/holo/res/drawable-ldpi/holo_dialog_noactionbar_seekbar_50.png
new file mode 100644
index 0000000..421ca13
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_dialog_noactionbar_seekbar_50.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_dialog_noactionbar_spinner.png b/tests/tests/holo/res/drawable-ldpi/holo_dialog_noactionbar_spinner.png
new file mode 100644
index 0000000..0c2edf5
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_dialog_noactionbar_spinner.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_dialog_noactionbar_switch.png b/tests/tests/holo/res/drawable-ldpi/holo_dialog_noactionbar_switch.png
new file mode 100644
index 0000000..24ddf30
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_dialog_noactionbar_switch.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_dialog_noactionbar_switch_checked.png b/tests/tests/holo/res/drawable-ldpi/holo_dialog_noactionbar_switch_checked.png
new file mode 100644
index 0000000..6216a7d
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_dialog_noactionbar_switch_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_dialog_noactionbar_tabhost.png b/tests/tests/holo/res/drawable-ldpi/holo_dialog_noactionbar_tabhost.png
new file mode 100644
index 0000000..79b0338
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_dialog_noactionbar_tabhost.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_dialog_noactionbar_textview.png b/tests/tests/holo/res/drawable-ldpi/holo_dialog_noactionbar_textview.png
new file mode 100644
index 0000000..256a7c2
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_dialog_noactionbar_textview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_dialog_noactionbar_timepicker.png b/tests/tests/holo/res/drawable-ldpi/holo_dialog_noactionbar_timepicker.png
new file mode 100644
index 0000000..43e3494
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_dialog_noactionbar_timepicker.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_dialog_noactionbar_toggle_button.png b/tests/tests/holo/res/drawable-ldpi/holo_dialog_noactionbar_toggle_button.png
new file mode 100644
index 0000000..630353a
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_dialog_noactionbar_toggle_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_dialog_noactionbar_toggle_button_checked.png b/tests/tests/holo/res/drawable-ldpi/holo_dialog_noactionbar_toggle_button_checked.png
new file mode 100644
index 0000000..f1cf667
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_dialog_noactionbar_toggle_button_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_dialog_noactionbar_zoomcontrols.png b/tests/tests/holo/res/drawable-ldpi/holo_dialog_noactionbar_zoomcontrols.png
new file mode 100644
index 0000000..ab090a6
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_dialog_noactionbar_zoomcontrols.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_dialog_progressbar.png b/tests/tests/holo/res/drawable-ldpi/holo_dialog_progressbar.png
new file mode 100644
index 0000000..06fec8f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_dialog_progressbar.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_dialog_progressbar_horizontal_0.png b/tests/tests/holo/res/drawable-ldpi/holo_dialog_progressbar_horizontal_0.png
new file mode 100644
index 0000000..3ab1b88
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_dialog_progressbar_horizontal_0.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_dialog_progressbar_horizontal_100.png b/tests/tests/holo/res/drawable-ldpi/holo_dialog_progressbar_horizontal_100.png
new file mode 100644
index 0000000..2ccefc1
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_dialog_progressbar_horizontal_100.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_dialog_progressbar_horizontal_50.png b/tests/tests/holo/res/drawable-ldpi/holo_dialog_progressbar_horizontal_50.png
new file mode 100644
index 0000000..56239e3
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_dialog_progressbar_horizontal_50.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_dialog_progressbar_large.png b/tests/tests/holo/res/drawable-ldpi/holo_dialog_progressbar_large.png
new file mode 100644
index 0000000..fe29e1d
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_dialog_progressbar_large.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_dialog_progressbar_small.png b/tests/tests/holo/res/drawable-ldpi/holo_dialog_progressbar_small.png
new file mode 100644
index 0000000..28c0a40
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_dialog_progressbar_small.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_dialog_progressdialog_horizontal.png b/tests/tests/holo/res/drawable-ldpi/holo_dialog_progressdialog_horizontal.png
new file mode 100644
index 0000000..c602ac2
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_dialog_progressdialog_horizontal.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_dialog_radio_button.png b/tests/tests/holo/res/drawable-ldpi/holo_dialog_radio_button.png
new file mode 100644
index 0000000..96a4af9
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_dialog_radio_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_dialog_radio_button_checked.png b/tests/tests/holo/res/drawable-ldpi/holo_dialog_radio_button_checked.png
new file mode 100644
index 0000000..fa14bcb
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_dialog_radio_button_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_dialog_radiogroup_horizontal.png b/tests/tests/holo/res/drawable-ldpi/holo_dialog_radiogroup_horizontal.png
new file mode 100644
index 0000000..7184016
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_dialog_radiogroup_horizontal.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_dialog_radiogroup_vertical.png b/tests/tests/holo/res/drawable-ldpi/holo_dialog_radiogroup_vertical.png
new file mode 100644
index 0000000..b7927b1
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_dialog_radiogroup_vertical.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_dialog_ratingbar_0.png b/tests/tests/holo/res/drawable-ldpi/holo_dialog_ratingbar_0.png
new file mode 100644
index 0000000..88279b8
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_dialog_ratingbar_0.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_dialog_ratingbar_0_pressed.png b/tests/tests/holo/res/drawable-ldpi/holo_dialog_ratingbar_0_pressed.png
new file mode 100644
index 0000000..d4b841d
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_dialog_ratingbar_0_pressed.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_dialog_ratingbar_2point5.png b/tests/tests/holo/res/drawable-ldpi/holo_dialog_ratingbar_2point5.png
new file mode 100644
index 0000000..3e80e24
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_dialog_ratingbar_2point5.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_dialog_ratingbar_2point5_pressed.png b/tests/tests/holo/res/drawable-ldpi/holo_dialog_ratingbar_2point5_pressed.png
new file mode 100644
index 0000000..b0c4cf2
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_dialog_ratingbar_2point5_pressed.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_dialog_ratingbar_5.png b/tests/tests/holo/res/drawable-ldpi/holo_dialog_ratingbar_5.png
new file mode 100644
index 0000000..13eee57
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_dialog_ratingbar_5.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_dialog_ratingbar_5_pressed.png b/tests/tests/holo/res/drawable-ldpi/holo_dialog_ratingbar_5_pressed.png
new file mode 100644
index 0000000..ccd4d30
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_dialog_ratingbar_5_pressed.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_dialog_searchview.png b/tests/tests/holo/res/drawable-ldpi/holo_dialog_searchview.png
new file mode 100644
index 0000000..ca76a70
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_dialog_searchview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_dialog_searchview_query.png b/tests/tests/holo/res/drawable-ldpi/holo_dialog_searchview_query.png
new file mode 100644
index 0000000..061f026
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_dialog_searchview_query.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_dialog_searchview_query_hint.png b/tests/tests/holo/res/drawable-ldpi/holo_dialog_searchview_query_hint.png
new file mode 100644
index 0000000..34a711e
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_dialog_searchview_query_hint.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_dialog_seekbar_0.png b/tests/tests/holo/res/drawable-ldpi/holo_dialog_seekbar_0.png
new file mode 100644
index 0000000..190a4c1
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_dialog_seekbar_0.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_dialog_seekbar_100.png b/tests/tests/holo/res/drawable-ldpi/holo_dialog_seekbar_100.png
new file mode 100644
index 0000000..8e53289
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_dialog_seekbar_100.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_dialog_seekbar_50.png b/tests/tests/holo/res/drawable-ldpi/holo_dialog_seekbar_50.png
new file mode 100644
index 0000000..421ca13
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_dialog_seekbar_50.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_dialog_spinner.png b/tests/tests/holo/res/drawable-ldpi/holo_dialog_spinner.png
new file mode 100644
index 0000000..0c2edf5
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_dialog_spinner.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_dialog_switch.png b/tests/tests/holo/res/drawable-ldpi/holo_dialog_switch.png
new file mode 100644
index 0000000..24ddf30
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_dialog_switch.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_dialog_switch_checked.png b/tests/tests/holo/res/drawable-ldpi/holo_dialog_switch_checked.png
new file mode 100644
index 0000000..6216a7d
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_dialog_switch_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_dialog_tabhost.png b/tests/tests/holo/res/drawable-ldpi/holo_dialog_tabhost.png
new file mode 100644
index 0000000..79b0338
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_dialog_tabhost.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_dialog_textview.png b/tests/tests/holo/res/drawable-ldpi/holo_dialog_textview.png
new file mode 100644
index 0000000..256a7c2
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_dialog_textview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_dialog_timepicker.png b/tests/tests/holo/res/drawable-ldpi/holo_dialog_timepicker.png
new file mode 100644
index 0000000..43e3494
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_dialog_timepicker.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_dialog_toggle_button.png b/tests/tests/holo/res/drawable-ldpi/holo_dialog_toggle_button.png
new file mode 100644
index 0000000..630353a
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_dialog_toggle_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_dialog_toggle_button_checked.png b/tests/tests/holo/res/drawable-ldpi/holo_dialog_toggle_button_checked.png
new file mode 100644
index 0000000..f1cf667
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_dialog_toggle_button_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_dialog_zoomcontrols.png b/tests/tests/holo/res/drawable-ldpi/holo_dialog_zoomcontrols.png
new file mode 100644
index 0000000..ab090a6
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_dialog_zoomcontrols.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_dialogwhenlarge_alertdialog_list.png b/tests/tests/holo/res/drawable-ldpi/holo_dialogwhenlarge_alertdialog_list.png
new file mode 100644
index 0000000..ca60c2f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_dialogwhenlarge_alertdialog_list.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_dialogwhenlarge_alertdialog_multichoice.png b/tests/tests/holo/res/drawable-ldpi/holo_dialogwhenlarge_alertdialog_multichoice.png
new file mode 100644
index 0000000..ef5a620
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_dialogwhenlarge_alertdialog_multichoice.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_dialogwhenlarge_alertdialog_onebutton.png b/tests/tests/holo/res/drawable-ldpi/holo_dialogwhenlarge_alertdialog_onebutton.png
new file mode 100644
index 0000000..6e67ae0
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_dialogwhenlarge_alertdialog_onebutton.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_dialogwhenlarge_alertdialog_singlechoice.png b/tests/tests/holo/res/drawable-ldpi/holo_dialogwhenlarge_alertdialog_singlechoice.png
new file mode 100644
index 0000000..b66441a
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_dialogwhenlarge_alertdialog_singlechoice.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_dialogwhenlarge_alertdialog_threebuttons.png b/tests/tests/holo/res/drawable-ldpi/holo_dialogwhenlarge_alertdialog_threebuttons.png
new file mode 100644
index 0000000..e5c6476
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_dialogwhenlarge_alertdialog_threebuttons.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_dialogwhenlarge_alertdialog_twobuttons.png b/tests/tests/holo/res/drawable-ldpi/holo_dialogwhenlarge_alertdialog_twobuttons.png
new file mode 100644
index 0000000..65b1d05
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_dialogwhenlarge_alertdialog_twobuttons.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_dialogwhenlarge_button.png b/tests/tests/holo/res/drawable-ldpi/holo_dialogwhenlarge_button.png
new file mode 100644
index 0000000..354ebd1
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_dialogwhenlarge_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_dialogwhenlarge_button_pressed.png b/tests/tests/holo/res/drawable-ldpi/holo_dialogwhenlarge_button_pressed.png
new file mode 100644
index 0000000..2562c8c
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_dialogwhenlarge_button_pressed.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_dialogwhenlarge_calendar_view.png b/tests/tests/holo/res/drawable-ldpi/holo_dialogwhenlarge_calendar_view.png
new file mode 100644
index 0000000..884bfc0
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_dialogwhenlarge_calendar_view.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_dialogwhenlarge_calendar_view_feb.png b/tests/tests/holo/res/drawable-ldpi/holo_dialogwhenlarge_calendar_view_feb.png
new file mode 100644
index 0000000..fc65b4a
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_dialogwhenlarge_calendar_view_feb.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_dialogwhenlarge_checkbox.png b/tests/tests/holo/res/drawable-ldpi/holo_dialogwhenlarge_checkbox.png
new file mode 100644
index 0000000..58b679e
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_dialogwhenlarge_checkbox.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_dialogwhenlarge_checkbox_checked.png b/tests/tests/holo/res/drawable-ldpi/holo_dialogwhenlarge_checkbox_checked.png
new file mode 100644
index 0000000..894922c
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_dialogwhenlarge_checkbox_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_dialogwhenlarge_chronometer.png b/tests/tests/holo/res/drawable-ldpi/holo_dialogwhenlarge_chronometer.png
new file mode 100644
index 0000000..dca49b0
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_dialogwhenlarge_chronometer.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_dialogwhenlarge_color_blue_bright.png b/tests/tests/holo/res/drawable-ldpi/holo_dialogwhenlarge_color_blue_bright.png
new file mode 100644
index 0000000..feaec2c
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_dialogwhenlarge_color_blue_bright.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_dialogwhenlarge_color_blue_dark.png b/tests/tests/holo/res/drawable-ldpi/holo_dialogwhenlarge_color_blue_dark.png
new file mode 100644
index 0000000..a8640c1
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_dialogwhenlarge_color_blue_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_dialogwhenlarge_color_blue_light.png b/tests/tests/holo/res/drawable-ldpi/holo_dialogwhenlarge_color_blue_light.png
new file mode 100644
index 0000000..ae141af
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_dialogwhenlarge_color_blue_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_dialogwhenlarge_color_green_dark.png b/tests/tests/holo/res/drawable-ldpi/holo_dialogwhenlarge_color_green_dark.png
new file mode 100644
index 0000000..0ee2324
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_dialogwhenlarge_color_green_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_dialogwhenlarge_color_green_light.png b/tests/tests/holo/res/drawable-ldpi/holo_dialogwhenlarge_color_green_light.png
new file mode 100644
index 0000000..9ca63c5
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_dialogwhenlarge_color_green_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_dialogwhenlarge_color_orange_dark.png b/tests/tests/holo/res/drawable-ldpi/holo_dialogwhenlarge_color_orange_dark.png
new file mode 100644
index 0000000..bc06b4f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_dialogwhenlarge_color_orange_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_dialogwhenlarge_color_orange_light.png b/tests/tests/holo/res/drawable-ldpi/holo_dialogwhenlarge_color_orange_light.png
new file mode 100644
index 0000000..1495f82
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_dialogwhenlarge_color_orange_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_dialogwhenlarge_color_purple.png b/tests/tests/holo/res/drawable-ldpi/holo_dialogwhenlarge_color_purple.png
new file mode 100644
index 0000000..9652f56
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_dialogwhenlarge_color_purple.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_dialogwhenlarge_color_red_dark.png b/tests/tests/holo/res/drawable-ldpi/holo_dialogwhenlarge_color_red_dark.png
new file mode 100644
index 0000000..4acebf8
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_dialogwhenlarge_color_red_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_dialogwhenlarge_color_red_light.png b/tests/tests/holo/res/drawable-ldpi/holo_dialogwhenlarge_color_red_light.png
new file mode 100644
index 0000000..d5b5742
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_dialogwhenlarge_color_red_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_dialogwhenlarge_edittext.png b/tests/tests/holo/res/drawable-ldpi/holo_dialogwhenlarge_edittext.png
new file mode 100644
index 0000000..07a56b3
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_dialogwhenlarge_edittext.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_dialogwhenlarge_noactionbar_alertdialog_list.png b/tests/tests/holo/res/drawable-ldpi/holo_dialogwhenlarge_noactionbar_alertdialog_list.png
new file mode 100644
index 0000000..ca60c2f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_dialogwhenlarge_noactionbar_alertdialog_list.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_dialogwhenlarge_noactionbar_alertdialog_multichoice.png b/tests/tests/holo/res/drawable-ldpi/holo_dialogwhenlarge_noactionbar_alertdialog_multichoice.png
new file mode 100644
index 0000000..ef5a620
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_dialogwhenlarge_noactionbar_alertdialog_multichoice.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_dialogwhenlarge_noactionbar_alertdialog_onebutton.png b/tests/tests/holo/res/drawable-ldpi/holo_dialogwhenlarge_noactionbar_alertdialog_onebutton.png
new file mode 100644
index 0000000..6e67ae0
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_dialogwhenlarge_noactionbar_alertdialog_onebutton.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_dialogwhenlarge_noactionbar_alertdialog_singlechoice.png b/tests/tests/holo/res/drawable-ldpi/holo_dialogwhenlarge_noactionbar_alertdialog_singlechoice.png
new file mode 100644
index 0000000..b66441a
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_dialogwhenlarge_noactionbar_alertdialog_singlechoice.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_dialogwhenlarge_noactionbar_alertdialog_threebuttons.png b/tests/tests/holo/res/drawable-ldpi/holo_dialogwhenlarge_noactionbar_alertdialog_threebuttons.png
new file mode 100644
index 0000000..e5c6476
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_dialogwhenlarge_noactionbar_alertdialog_threebuttons.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_dialogwhenlarge_noactionbar_alertdialog_twobuttons.png b/tests/tests/holo/res/drawable-ldpi/holo_dialogwhenlarge_noactionbar_alertdialog_twobuttons.png
new file mode 100644
index 0000000..65b1d05
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_dialogwhenlarge_noactionbar_alertdialog_twobuttons.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_dialogwhenlarge_noactionbar_button.png b/tests/tests/holo/res/drawable-ldpi/holo_dialogwhenlarge_noactionbar_button.png
new file mode 100644
index 0000000..354ebd1
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_dialogwhenlarge_noactionbar_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_dialogwhenlarge_noactionbar_button_pressed.png b/tests/tests/holo/res/drawable-ldpi/holo_dialogwhenlarge_noactionbar_button_pressed.png
new file mode 100644
index 0000000..2562c8c
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_dialogwhenlarge_noactionbar_button_pressed.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_dialogwhenlarge_noactionbar_calendar_view.png b/tests/tests/holo/res/drawable-ldpi/holo_dialogwhenlarge_noactionbar_calendar_view.png
new file mode 100644
index 0000000..884bfc0
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_dialogwhenlarge_noactionbar_calendar_view.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_dialogwhenlarge_noactionbar_calendar_view_feb.png b/tests/tests/holo/res/drawable-ldpi/holo_dialogwhenlarge_noactionbar_calendar_view_feb.png
new file mode 100644
index 0000000..fc65b4a
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_dialogwhenlarge_noactionbar_calendar_view_feb.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_dialogwhenlarge_noactionbar_checkbox.png b/tests/tests/holo/res/drawable-ldpi/holo_dialogwhenlarge_noactionbar_checkbox.png
new file mode 100644
index 0000000..58b679e
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_dialogwhenlarge_noactionbar_checkbox.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_dialogwhenlarge_noactionbar_checkbox_checked.png b/tests/tests/holo/res/drawable-ldpi/holo_dialogwhenlarge_noactionbar_checkbox_checked.png
new file mode 100644
index 0000000..894922c
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_dialogwhenlarge_noactionbar_checkbox_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_dialogwhenlarge_noactionbar_chronometer.png b/tests/tests/holo/res/drawable-ldpi/holo_dialogwhenlarge_noactionbar_chronometer.png
new file mode 100644
index 0000000..dca49b0
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_dialogwhenlarge_noactionbar_chronometer.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_dialogwhenlarge_noactionbar_color_blue_bright.png b/tests/tests/holo/res/drawable-ldpi/holo_dialogwhenlarge_noactionbar_color_blue_bright.png
new file mode 100644
index 0000000..feaec2c
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_dialogwhenlarge_noactionbar_color_blue_bright.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_dialogwhenlarge_noactionbar_color_blue_dark.png b/tests/tests/holo/res/drawable-ldpi/holo_dialogwhenlarge_noactionbar_color_blue_dark.png
new file mode 100644
index 0000000..a8640c1
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_dialogwhenlarge_noactionbar_color_blue_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_dialogwhenlarge_noactionbar_color_blue_light.png b/tests/tests/holo/res/drawable-ldpi/holo_dialogwhenlarge_noactionbar_color_blue_light.png
new file mode 100644
index 0000000..ae141af
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_dialogwhenlarge_noactionbar_color_blue_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_dialogwhenlarge_noactionbar_color_green_dark.png b/tests/tests/holo/res/drawable-ldpi/holo_dialogwhenlarge_noactionbar_color_green_dark.png
new file mode 100644
index 0000000..0ee2324
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_dialogwhenlarge_noactionbar_color_green_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_dialogwhenlarge_noactionbar_color_green_light.png b/tests/tests/holo/res/drawable-ldpi/holo_dialogwhenlarge_noactionbar_color_green_light.png
new file mode 100644
index 0000000..9ca63c5
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_dialogwhenlarge_noactionbar_color_green_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_dialogwhenlarge_noactionbar_color_orange_dark.png b/tests/tests/holo/res/drawable-ldpi/holo_dialogwhenlarge_noactionbar_color_orange_dark.png
new file mode 100644
index 0000000..bc06b4f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_dialogwhenlarge_noactionbar_color_orange_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_dialogwhenlarge_noactionbar_color_orange_light.png b/tests/tests/holo/res/drawable-ldpi/holo_dialogwhenlarge_noactionbar_color_orange_light.png
new file mode 100644
index 0000000..1495f82
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_dialogwhenlarge_noactionbar_color_orange_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_dialogwhenlarge_noactionbar_color_purple.png b/tests/tests/holo/res/drawable-ldpi/holo_dialogwhenlarge_noactionbar_color_purple.png
new file mode 100644
index 0000000..9652f56
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_dialogwhenlarge_noactionbar_color_purple.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_dialogwhenlarge_noactionbar_color_red_dark.png b/tests/tests/holo/res/drawable-ldpi/holo_dialogwhenlarge_noactionbar_color_red_dark.png
new file mode 100644
index 0000000..4acebf8
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_dialogwhenlarge_noactionbar_color_red_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_dialogwhenlarge_noactionbar_color_red_light.png b/tests/tests/holo/res/drawable-ldpi/holo_dialogwhenlarge_noactionbar_color_red_light.png
new file mode 100644
index 0000000..d5b5742
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_dialogwhenlarge_noactionbar_color_red_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_dialogwhenlarge_noactionbar_edittext.png b/tests/tests/holo/res/drawable-ldpi/holo_dialogwhenlarge_noactionbar_edittext.png
new file mode 100644
index 0000000..07a56b3
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_dialogwhenlarge_noactionbar_edittext.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_dialogwhenlarge_noactionbar_progressbar.png b/tests/tests/holo/res/drawable-ldpi/holo_dialogwhenlarge_noactionbar_progressbar.png
new file mode 100644
index 0000000..06fec8f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_dialogwhenlarge_noactionbar_progressbar.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_dialogwhenlarge_noactionbar_progressbar_horizontal_0.png b/tests/tests/holo/res/drawable-ldpi/holo_dialogwhenlarge_noactionbar_progressbar_horizontal_0.png
new file mode 100644
index 0000000..3ab1b88
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_dialogwhenlarge_noactionbar_progressbar_horizontal_0.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_dialogwhenlarge_noactionbar_progressbar_horizontal_100.png b/tests/tests/holo/res/drawable-ldpi/holo_dialogwhenlarge_noactionbar_progressbar_horizontal_100.png
new file mode 100644
index 0000000..2ccefc1
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_dialogwhenlarge_noactionbar_progressbar_horizontal_100.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_dialogwhenlarge_noactionbar_progressbar_horizontal_50.png b/tests/tests/holo/res/drawable-ldpi/holo_dialogwhenlarge_noactionbar_progressbar_horizontal_50.png
new file mode 100644
index 0000000..56239e3
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_dialogwhenlarge_noactionbar_progressbar_horizontal_50.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_dialogwhenlarge_noactionbar_progressbar_large.png b/tests/tests/holo/res/drawable-ldpi/holo_dialogwhenlarge_noactionbar_progressbar_large.png
new file mode 100644
index 0000000..fe29e1d
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_dialogwhenlarge_noactionbar_progressbar_large.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_dialogwhenlarge_noactionbar_progressbar_small.png b/tests/tests/holo/res/drawable-ldpi/holo_dialogwhenlarge_noactionbar_progressbar_small.png
new file mode 100644
index 0000000..28c0a40
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_dialogwhenlarge_noactionbar_progressbar_small.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_dialogwhenlarge_noactionbar_progressdialog_horizontal.png b/tests/tests/holo/res/drawable-ldpi/holo_dialogwhenlarge_noactionbar_progressdialog_horizontal.png
new file mode 100644
index 0000000..c602ac2
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_dialogwhenlarge_noactionbar_progressdialog_horizontal.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_dialogwhenlarge_noactionbar_radio_button.png b/tests/tests/holo/res/drawable-ldpi/holo_dialogwhenlarge_noactionbar_radio_button.png
new file mode 100644
index 0000000..96a4af9
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_dialogwhenlarge_noactionbar_radio_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_dialogwhenlarge_noactionbar_radio_button_checked.png b/tests/tests/holo/res/drawable-ldpi/holo_dialogwhenlarge_noactionbar_radio_button_checked.png
new file mode 100644
index 0000000..fa14bcb
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_dialogwhenlarge_noactionbar_radio_button_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_dialogwhenlarge_noactionbar_radiogroup_horizontal.png b/tests/tests/holo/res/drawable-ldpi/holo_dialogwhenlarge_noactionbar_radiogroup_horizontal.png
new file mode 100644
index 0000000..7184016
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_dialogwhenlarge_noactionbar_radiogroup_horizontal.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_dialogwhenlarge_noactionbar_radiogroup_vertical.png b/tests/tests/holo/res/drawable-ldpi/holo_dialogwhenlarge_noactionbar_radiogroup_vertical.png
new file mode 100644
index 0000000..b7927b1
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_dialogwhenlarge_noactionbar_radiogroup_vertical.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_dialogwhenlarge_noactionbar_ratingbar_0.png b/tests/tests/holo/res/drawable-ldpi/holo_dialogwhenlarge_noactionbar_ratingbar_0.png
new file mode 100644
index 0000000..88279b8
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_dialogwhenlarge_noactionbar_ratingbar_0.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_dialogwhenlarge_noactionbar_ratingbar_0_pressed.png b/tests/tests/holo/res/drawable-ldpi/holo_dialogwhenlarge_noactionbar_ratingbar_0_pressed.png
new file mode 100644
index 0000000..d4b841d
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_dialogwhenlarge_noactionbar_ratingbar_0_pressed.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_dialogwhenlarge_noactionbar_ratingbar_2point5.png b/tests/tests/holo/res/drawable-ldpi/holo_dialogwhenlarge_noactionbar_ratingbar_2point5.png
new file mode 100644
index 0000000..3e80e24
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_dialogwhenlarge_noactionbar_ratingbar_2point5.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_dialogwhenlarge_noactionbar_ratingbar_2point5_pressed.png b/tests/tests/holo/res/drawable-ldpi/holo_dialogwhenlarge_noactionbar_ratingbar_2point5_pressed.png
new file mode 100644
index 0000000..b0c4cf2
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_dialogwhenlarge_noactionbar_ratingbar_2point5_pressed.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_dialogwhenlarge_noactionbar_ratingbar_5.png b/tests/tests/holo/res/drawable-ldpi/holo_dialogwhenlarge_noactionbar_ratingbar_5.png
new file mode 100644
index 0000000..13eee57
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_dialogwhenlarge_noactionbar_ratingbar_5.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_dialogwhenlarge_noactionbar_ratingbar_5_pressed.png b/tests/tests/holo/res/drawable-ldpi/holo_dialogwhenlarge_noactionbar_ratingbar_5_pressed.png
new file mode 100644
index 0000000..ccd4d30
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_dialogwhenlarge_noactionbar_ratingbar_5_pressed.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_dialogwhenlarge_noactionbar_searchview.png b/tests/tests/holo/res/drawable-ldpi/holo_dialogwhenlarge_noactionbar_searchview.png
new file mode 100644
index 0000000..ca76a70
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_dialogwhenlarge_noactionbar_searchview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_dialogwhenlarge_noactionbar_searchview_query.png b/tests/tests/holo/res/drawable-ldpi/holo_dialogwhenlarge_noactionbar_searchview_query.png
new file mode 100644
index 0000000..061f026
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_dialogwhenlarge_noactionbar_searchview_query.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_dialogwhenlarge_noactionbar_searchview_query_hint.png b/tests/tests/holo/res/drawable-ldpi/holo_dialogwhenlarge_noactionbar_searchview_query_hint.png
new file mode 100644
index 0000000..34a711e
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_dialogwhenlarge_noactionbar_searchview_query_hint.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_dialogwhenlarge_noactionbar_seekbar_0.png b/tests/tests/holo/res/drawable-ldpi/holo_dialogwhenlarge_noactionbar_seekbar_0.png
new file mode 100644
index 0000000..190a4c1
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_dialogwhenlarge_noactionbar_seekbar_0.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_dialogwhenlarge_noactionbar_seekbar_100.png b/tests/tests/holo/res/drawable-ldpi/holo_dialogwhenlarge_noactionbar_seekbar_100.png
new file mode 100644
index 0000000..8e53289
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_dialogwhenlarge_noactionbar_seekbar_100.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_dialogwhenlarge_noactionbar_seekbar_50.png b/tests/tests/holo/res/drawable-ldpi/holo_dialogwhenlarge_noactionbar_seekbar_50.png
new file mode 100644
index 0000000..421ca13
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_dialogwhenlarge_noactionbar_seekbar_50.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_dialogwhenlarge_noactionbar_spinner.png b/tests/tests/holo/res/drawable-ldpi/holo_dialogwhenlarge_noactionbar_spinner.png
new file mode 100644
index 0000000..0c2edf5
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_dialogwhenlarge_noactionbar_spinner.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_dialogwhenlarge_noactionbar_switch.png b/tests/tests/holo/res/drawable-ldpi/holo_dialogwhenlarge_noactionbar_switch.png
new file mode 100644
index 0000000..24ddf30
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_dialogwhenlarge_noactionbar_switch.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_dialogwhenlarge_noactionbar_switch_checked.png b/tests/tests/holo/res/drawable-ldpi/holo_dialogwhenlarge_noactionbar_switch_checked.png
new file mode 100644
index 0000000..6216a7d
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_dialogwhenlarge_noactionbar_switch_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_dialogwhenlarge_noactionbar_tabhost.png b/tests/tests/holo/res/drawable-ldpi/holo_dialogwhenlarge_noactionbar_tabhost.png
new file mode 100644
index 0000000..79b0338
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_dialogwhenlarge_noactionbar_tabhost.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_dialogwhenlarge_noactionbar_textview.png b/tests/tests/holo/res/drawable-ldpi/holo_dialogwhenlarge_noactionbar_textview.png
new file mode 100644
index 0000000..256a7c2
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_dialogwhenlarge_noactionbar_textview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_dialogwhenlarge_noactionbar_timepicker.png b/tests/tests/holo/res/drawable-ldpi/holo_dialogwhenlarge_noactionbar_timepicker.png
new file mode 100644
index 0000000..43e3494
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_dialogwhenlarge_noactionbar_timepicker.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_dialogwhenlarge_noactionbar_toggle_button.png b/tests/tests/holo/res/drawable-ldpi/holo_dialogwhenlarge_noactionbar_toggle_button.png
new file mode 100644
index 0000000..630353a
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_dialogwhenlarge_noactionbar_toggle_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_dialogwhenlarge_noactionbar_toggle_button_checked.png b/tests/tests/holo/res/drawable-ldpi/holo_dialogwhenlarge_noactionbar_toggle_button_checked.png
new file mode 100644
index 0000000..f1cf667
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_dialogwhenlarge_noactionbar_toggle_button_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_dialogwhenlarge_noactionbar_zoomcontrols.png b/tests/tests/holo/res/drawable-ldpi/holo_dialogwhenlarge_noactionbar_zoomcontrols.png
new file mode 100644
index 0000000..ab090a6
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_dialogwhenlarge_noactionbar_zoomcontrols.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_dialogwhenlarge_progressbar.png b/tests/tests/holo/res/drawable-ldpi/holo_dialogwhenlarge_progressbar.png
new file mode 100644
index 0000000..06fec8f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_dialogwhenlarge_progressbar.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_dialogwhenlarge_progressbar_horizontal_0.png b/tests/tests/holo/res/drawable-ldpi/holo_dialogwhenlarge_progressbar_horizontal_0.png
new file mode 100644
index 0000000..3ab1b88
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_dialogwhenlarge_progressbar_horizontal_0.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_dialogwhenlarge_progressbar_horizontal_100.png b/tests/tests/holo/res/drawable-ldpi/holo_dialogwhenlarge_progressbar_horizontal_100.png
new file mode 100644
index 0000000..2ccefc1
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_dialogwhenlarge_progressbar_horizontal_100.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_dialogwhenlarge_progressbar_horizontal_50.png b/tests/tests/holo/res/drawable-ldpi/holo_dialogwhenlarge_progressbar_horizontal_50.png
new file mode 100644
index 0000000..56239e3
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_dialogwhenlarge_progressbar_horizontal_50.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_dialogwhenlarge_progressbar_large.png b/tests/tests/holo/res/drawable-ldpi/holo_dialogwhenlarge_progressbar_large.png
new file mode 100644
index 0000000..fe29e1d
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_dialogwhenlarge_progressbar_large.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_dialogwhenlarge_progressbar_small.png b/tests/tests/holo/res/drawable-ldpi/holo_dialogwhenlarge_progressbar_small.png
new file mode 100644
index 0000000..28c0a40
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_dialogwhenlarge_progressbar_small.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_dialogwhenlarge_progressdialog_horizontal.png b/tests/tests/holo/res/drawable-ldpi/holo_dialogwhenlarge_progressdialog_horizontal.png
new file mode 100644
index 0000000..c602ac2
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_dialogwhenlarge_progressdialog_horizontal.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_dialogwhenlarge_radio_button.png b/tests/tests/holo/res/drawable-ldpi/holo_dialogwhenlarge_radio_button.png
new file mode 100644
index 0000000..96a4af9
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_dialogwhenlarge_radio_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_dialogwhenlarge_radio_button_checked.png b/tests/tests/holo/res/drawable-ldpi/holo_dialogwhenlarge_radio_button_checked.png
new file mode 100644
index 0000000..fa14bcb
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_dialogwhenlarge_radio_button_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_dialogwhenlarge_radiogroup_horizontal.png b/tests/tests/holo/res/drawable-ldpi/holo_dialogwhenlarge_radiogroup_horizontal.png
new file mode 100644
index 0000000..7184016
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_dialogwhenlarge_radiogroup_horizontal.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_dialogwhenlarge_radiogroup_vertical.png b/tests/tests/holo/res/drawable-ldpi/holo_dialogwhenlarge_radiogroup_vertical.png
new file mode 100644
index 0000000..b7927b1
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_dialogwhenlarge_radiogroup_vertical.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_dialogwhenlarge_ratingbar_0.png b/tests/tests/holo/res/drawable-ldpi/holo_dialogwhenlarge_ratingbar_0.png
new file mode 100644
index 0000000..88279b8
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_dialogwhenlarge_ratingbar_0.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_dialogwhenlarge_ratingbar_0_pressed.png b/tests/tests/holo/res/drawable-ldpi/holo_dialogwhenlarge_ratingbar_0_pressed.png
new file mode 100644
index 0000000..d4b841d
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_dialogwhenlarge_ratingbar_0_pressed.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_dialogwhenlarge_ratingbar_2point5.png b/tests/tests/holo/res/drawable-ldpi/holo_dialogwhenlarge_ratingbar_2point5.png
new file mode 100644
index 0000000..3e80e24
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_dialogwhenlarge_ratingbar_2point5.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_dialogwhenlarge_ratingbar_2point5_pressed.png b/tests/tests/holo/res/drawable-ldpi/holo_dialogwhenlarge_ratingbar_2point5_pressed.png
new file mode 100644
index 0000000..b0c4cf2
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_dialogwhenlarge_ratingbar_2point5_pressed.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_dialogwhenlarge_ratingbar_5.png b/tests/tests/holo/res/drawable-ldpi/holo_dialogwhenlarge_ratingbar_5.png
new file mode 100644
index 0000000..13eee57
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_dialogwhenlarge_ratingbar_5.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_dialogwhenlarge_ratingbar_5_pressed.png b/tests/tests/holo/res/drawable-ldpi/holo_dialogwhenlarge_ratingbar_5_pressed.png
new file mode 100644
index 0000000..ccd4d30
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_dialogwhenlarge_ratingbar_5_pressed.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_dialogwhenlarge_searchview.png b/tests/tests/holo/res/drawable-ldpi/holo_dialogwhenlarge_searchview.png
new file mode 100644
index 0000000..ca76a70
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_dialogwhenlarge_searchview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_dialogwhenlarge_searchview_query.png b/tests/tests/holo/res/drawable-ldpi/holo_dialogwhenlarge_searchview_query.png
new file mode 100644
index 0000000..061f026
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_dialogwhenlarge_searchview_query.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_dialogwhenlarge_searchview_query_hint.png b/tests/tests/holo/res/drawable-ldpi/holo_dialogwhenlarge_searchview_query_hint.png
new file mode 100644
index 0000000..34a711e
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_dialogwhenlarge_searchview_query_hint.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_dialogwhenlarge_seekbar_0.png b/tests/tests/holo/res/drawable-ldpi/holo_dialogwhenlarge_seekbar_0.png
new file mode 100644
index 0000000..190a4c1
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_dialogwhenlarge_seekbar_0.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_dialogwhenlarge_seekbar_100.png b/tests/tests/holo/res/drawable-ldpi/holo_dialogwhenlarge_seekbar_100.png
new file mode 100644
index 0000000..8e53289
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_dialogwhenlarge_seekbar_100.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_dialogwhenlarge_seekbar_50.png b/tests/tests/holo/res/drawable-ldpi/holo_dialogwhenlarge_seekbar_50.png
new file mode 100644
index 0000000..421ca13
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_dialogwhenlarge_seekbar_50.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_dialogwhenlarge_spinner.png b/tests/tests/holo/res/drawable-ldpi/holo_dialogwhenlarge_spinner.png
new file mode 100644
index 0000000..0c2edf5
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_dialogwhenlarge_spinner.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_dialogwhenlarge_switch.png b/tests/tests/holo/res/drawable-ldpi/holo_dialogwhenlarge_switch.png
new file mode 100644
index 0000000..24ddf30
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_dialogwhenlarge_switch.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_dialogwhenlarge_switch_checked.png b/tests/tests/holo/res/drawable-ldpi/holo_dialogwhenlarge_switch_checked.png
new file mode 100644
index 0000000..6216a7d
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_dialogwhenlarge_switch_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_dialogwhenlarge_tabhost.png b/tests/tests/holo/res/drawable-ldpi/holo_dialogwhenlarge_tabhost.png
new file mode 100644
index 0000000..79b0338
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_dialogwhenlarge_tabhost.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_dialogwhenlarge_textview.png b/tests/tests/holo/res/drawable-ldpi/holo_dialogwhenlarge_textview.png
new file mode 100644
index 0000000..256a7c2
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_dialogwhenlarge_textview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_dialogwhenlarge_timepicker.png b/tests/tests/holo/res/drawable-ldpi/holo_dialogwhenlarge_timepicker.png
new file mode 100644
index 0000000..43e3494
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_dialogwhenlarge_timepicker.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_dialogwhenlarge_toggle_button.png b/tests/tests/holo/res/drawable-ldpi/holo_dialogwhenlarge_toggle_button.png
new file mode 100644
index 0000000..630353a
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_dialogwhenlarge_toggle_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_dialogwhenlarge_toggle_button_checked.png b/tests/tests/holo/res/drawable-ldpi/holo_dialogwhenlarge_toggle_button_checked.png
new file mode 100644
index 0000000..f1cf667
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_dialogwhenlarge_toggle_button_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_dialogwhenlarge_zoomcontrols.png b/tests/tests/holo/res/drawable-ldpi/holo_dialogwhenlarge_zoomcontrols.png
new file mode 100644
index 0000000..ab090a6
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_dialogwhenlarge_zoomcontrols.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_edittext.png b/tests/tests/holo/res/drawable-ldpi/holo_edittext.png
new file mode 100644
index 0000000..07a56b3
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_edittext.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_inputmethod_alertdialog_list.png b/tests/tests/holo/res/drawable-ldpi/holo_inputmethod_alertdialog_list.png
new file mode 100644
index 0000000..a06cdd8
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_inputmethod_alertdialog_list.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_inputmethod_alertdialog_multichoice.png b/tests/tests/holo/res/drawable-ldpi/holo_inputmethod_alertdialog_multichoice.png
new file mode 100644
index 0000000..278e9b8
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_inputmethod_alertdialog_multichoice.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_inputmethod_alertdialog_onebutton.png b/tests/tests/holo/res/drawable-ldpi/holo_inputmethod_alertdialog_onebutton.png
new file mode 100644
index 0000000..caaec27
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_inputmethod_alertdialog_onebutton.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_inputmethod_alertdialog_singlechoice.png b/tests/tests/holo/res/drawable-ldpi/holo_inputmethod_alertdialog_singlechoice.png
new file mode 100644
index 0000000..8be0aa4
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_inputmethod_alertdialog_singlechoice.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_inputmethod_alertdialog_threebuttons.png b/tests/tests/holo/res/drawable-ldpi/holo_inputmethod_alertdialog_threebuttons.png
new file mode 100644
index 0000000..7450944
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_inputmethod_alertdialog_threebuttons.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_inputmethod_alertdialog_twobuttons.png b/tests/tests/holo/res/drawable-ldpi/holo_inputmethod_alertdialog_twobuttons.png
new file mode 100644
index 0000000..b0eccd5
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_inputmethod_alertdialog_twobuttons.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_inputmethod_button.png b/tests/tests/holo/res/drawable-ldpi/holo_inputmethod_button.png
new file mode 100644
index 0000000..054d4e5
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_inputmethod_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_inputmethod_button_pressed.png b/tests/tests/holo/res/drawable-ldpi/holo_inputmethod_button_pressed.png
new file mode 100644
index 0000000..a7a0105
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_inputmethod_button_pressed.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_inputmethod_calendar_view.png b/tests/tests/holo/res/drawable-ldpi/holo_inputmethod_calendar_view.png
new file mode 100644
index 0000000..16deb8f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_inputmethod_calendar_view.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_inputmethod_calendar_view_feb.png b/tests/tests/holo/res/drawable-ldpi/holo_inputmethod_calendar_view_feb.png
new file mode 100644
index 0000000..f27f7d2
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_inputmethod_calendar_view_feb.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_inputmethod_checkbox.png b/tests/tests/holo/res/drawable-ldpi/holo_inputmethod_checkbox.png
new file mode 100644
index 0000000..416fc5e
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_inputmethod_checkbox.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_inputmethod_checkbox_checked.png b/tests/tests/holo/res/drawable-ldpi/holo_inputmethod_checkbox_checked.png
new file mode 100644
index 0000000..dc38372
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_inputmethod_checkbox_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_inputmethod_chronometer.png b/tests/tests/holo/res/drawable-ldpi/holo_inputmethod_chronometer.png
new file mode 100644
index 0000000..dd8eb6d
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_inputmethod_chronometer.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_inputmethod_color_blue_bright.png b/tests/tests/holo/res/drawable-ldpi/holo_inputmethod_color_blue_bright.png
new file mode 100644
index 0000000..feaec2c
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_inputmethod_color_blue_bright.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_inputmethod_color_blue_dark.png b/tests/tests/holo/res/drawable-ldpi/holo_inputmethod_color_blue_dark.png
new file mode 100644
index 0000000..a8640c1
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_inputmethod_color_blue_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_inputmethod_color_blue_light.png b/tests/tests/holo/res/drawable-ldpi/holo_inputmethod_color_blue_light.png
new file mode 100644
index 0000000..ae141af
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_inputmethod_color_blue_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_inputmethod_color_green_dark.png b/tests/tests/holo/res/drawable-ldpi/holo_inputmethod_color_green_dark.png
new file mode 100644
index 0000000..0ee2324
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_inputmethod_color_green_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_inputmethod_color_green_light.png b/tests/tests/holo/res/drawable-ldpi/holo_inputmethod_color_green_light.png
new file mode 100644
index 0000000..9ca63c5
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_inputmethod_color_green_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_inputmethod_color_orange_dark.png b/tests/tests/holo/res/drawable-ldpi/holo_inputmethod_color_orange_dark.png
new file mode 100644
index 0000000..bc06b4f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_inputmethod_color_orange_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_inputmethod_color_orange_light.png b/tests/tests/holo/res/drawable-ldpi/holo_inputmethod_color_orange_light.png
new file mode 100644
index 0000000..1495f82
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_inputmethod_color_orange_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_inputmethod_color_purple.png b/tests/tests/holo/res/drawable-ldpi/holo_inputmethod_color_purple.png
new file mode 100644
index 0000000..9652f56
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_inputmethod_color_purple.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_inputmethod_color_red_dark.png b/tests/tests/holo/res/drawable-ldpi/holo_inputmethod_color_red_dark.png
new file mode 100644
index 0000000..4acebf8
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_inputmethod_color_red_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_inputmethod_color_red_light.png b/tests/tests/holo/res/drawable-ldpi/holo_inputmethod_color_red_light.png
new file mode 100644
index 0000000..d5b5742
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_inputmethod_color_red_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_inputmethod_edittext.png b/tests/tests/holo/res/drawable-ldpi/holo_inputmethod_edittext.png
new file mode 100644
index 0000000..c65471f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_inputmethod_edittext.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_inputmethod_progressbar.png b/tests/tests/holo/res/drawable-ldpi/holo_inputmethod_progressbar.png
new file mode 100644
index 0000000..06fec8f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_inputmethod_progressbar.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_inputmethod_progressbar_horizontal_0.png b/tests/tests/holo/res/drawable-ldpi/holo_inputmethod_progressbar_horizontal_0.png
new file mode 100644
index 0000000..c89e5f2
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_inputmethod_progressbar_horizontal_0.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_inputmethod_progressbar_horizontal_100.png b/tests/tests/holo/res/drawable-ldpi/holo_inputmethod_progressbar_horizontal_100.png
new file mode 100644
index 0000000..0abda21
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_inputmethod_progressbar_horizontal_100.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_inputmethod_progressbar_horizontal_50.png b/tests/tests/holo/res/drawable-ldpi/holo_inputmethod_progressbar_horizontal_50.png
new file mode 100644
index 0000000..b33950b
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_inputmethod_progressbar_horizontal_50.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_inputmethod_progressbar_large.png b/tests/tests/holo/res/drawable-ldpi/holo_inputmethod_progressbar_large.png
new file mode 100644
index 0000000..fe29e1d
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_inputmethod_progressbar_large.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_inputmethod_progressbar_small.png b/tests/tests/holo/res/drawable-ldpi/holo_inputmethod_progressbar_small.png
new file mode 100644
index 0000000..28c0a40
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_inputmethod_progressbar_small.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_inputmethod_progressdialog_horizontal.png b/tests/tests/holo/res/drawable-ldpi/holo_inputmethod_progressdialog_horizontal.png
new file mode 100644
index 0000000..01b7a98
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_inputmethod_progressdialog_horizontal.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_inputmethod_radio_button.png b/tests/tests/holo/res/drawable-ldpi/holo_inputmethod_radio_button.png
new file mode 100644
index 0000000..b9c52f4
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_inputmethod_radio_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_inputmethod_radio_button_checked.png b/tests/tests/holo/res/drawable-ldpi/holo_inputmethod_radio_button_checked.png
new file mode 100644
index 0000000..5acf60f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_inputmethod_radio_button_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_inputmethod_radiogroup_horizontal.png b/tests/tests/holo/res/drawable-ldpi/holo_inputmethod_radiogroup_horizontal.png
new file mode 100644
index 0000000..10af193
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_inputmethod_radiogroup_horizontal.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_inputmethod_radiogroup_vertical.png b/tests/tests/holo/res/drawable-ldpi/holo_inputmethod_radiogroup_vertical.png
new file mode 100644
index 0000000..ec7dd84
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_inputmethod_radiogroup_vertical.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_inputmethod_ratingbar_0.png b/tests/tests/holo/res/drawable-ldpi/holo_inputmethod_ratingbar_0.png
new file mode 100644
index 0000000..2f1a8a0
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_inputmethod_ratingbar_0.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_inputmethod_ratingbar_0_pressed.png b/tests/tests/holo/res/drawable-ldpi/holo_inputmethod_ratingbar_0_pressed.png
new file mode 100644
index 0000000..47c7851
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_inputmethod_ratingbar_0_pressed.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_inputmethod_ratingbar_2point5.png b/tests/tests/holo/res/drawable-ldpi/holo_inputmethod_ratingbar_2point5.png
new file mode 100644
index 0000000..e35abf9
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_inputmethod_ratingbar_2point5.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_inputmethod_ratingbar_2point5_pressed.png b/tests/tests/holo/res/drawable-ldpi/holo_inputmethod_ratingbar_2point5_pressed.png
new file mode 100644
index 0000000..a9d7fd4
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_inputmethod_ratingbar_2point5_pressed.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_inputmethod_ratingbar_5.png b/tests/tests/holo/res/drawable-ldpi/holo_inputmethod_ratingbar_5.png
new file mode 100644
index 0000000..23afb05
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_inputmethod_ratingbar_5.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_inputmethod_ratingbar_5_pressed.png b/tests/tests/holo/res/drawable-ldpi/holo_inputmethod_ratingbar_5_pressed.png
new file mode 100644
index 0000000..1747219
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_inputmethod_ratingbar_5_pressed.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_inputmethod_searchview.png b/tests/tests/holo/res/drawable-ldpi/holo_inputmethod_searchview.png
new file mode 100644
index 0000000..e5feeb8
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_inputmethod_searchview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_inputmethod_searchview_query.png b/tests/tests/holo/res/drawable-ldpi/holo_inputmethod_searchview_query.png
new file mode 100644
index 0000000..89a4ef9
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_inputmethod_searchview_query.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_inputmethod_searchview_query_hint.png b/tests/tests/holo/res/drawable-ldpi/holo_inputmethod_searchview_query_hint.png
new file mode 100644
index 0000000..d6121ce
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_inputmethod_searchview_query_hint.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_inputmethod_seekbar_0.png b/tests/tests/holo/res/drawable-ldpi/holo_inputmethod_seekbar_0.png
new file mode 100644
index 0000000..b79d8de
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_inputmethod_seekbar_0.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_inputmethod_seekbar_100.png b/tests/tests/holo/res/drawable-ldpi/holo_inputmethod_seekbar_100.png
new file mode 100644
index 0000000..8e53289
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_inputmethod_seekbar_100.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_inputmethod_seekbar_50.png b/tests/tests/holo/res/drawable-ldpi/holo_inputmethod_seekbar_50.png
new file mode 100644
index 0000000..3b7343f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_inputmethod_seekbar_50.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_inputmethod_spinner.png b/tests/tests/holo/res/drawable-ldpi/holo_inputmethod_spinner.png
new file mode 100644
index 0000000..9cf08d4
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_inputmethod_spinner.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_inputmethod_switch.png b/tests/tests/holo/res/drawable-ldpi/holo_inputmethod_switch.png
new file mode 100644
index 0000000..0bd5809
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_inputmethod_switch.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_inputmethod_switch_checked.png b/tests/tests/holo/res/drawable-ldpi/holo_inputmethod_switch_checked.png
new file mode 100644
index 0000000..8404698
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_inputmethod_switch_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_inputmethod_tabhost.png b/tests/tests/holo/res/drawable-ldpi/holo_inputmethod_tabhost.png
new file mode 100644
index 0000000..61687f6
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_inputmethod_tabhost.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_inputmethod_textview.png b/tests/tests/holo/res/drawable-ldpi/holo_inputmethod_textview.png
new file mode 100644
index 0000000..5941143
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_inputmethod_textview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_inputmethod_timepicker.png b/tests/tests/holo/res/drawable-ldpi/holo_inputmethod_timepicker.png
new file mode 100644
index 0000000..16bedde
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_inputmethod_timepicker.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_inputmethod_toggle_button.png b/tests/tests/holo/res/drawable-ldpi/holo_inputmethod_toggle_button.png
new file mode 100644
index 0000000..71d5967
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_inputmethod_toggle_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_inputmethod_toggle_button_checked.png b/tests/tests/holo/res/drawable-ldpi/holo_inputmethod_toggle_button_checked.png
new file mode 100644
index 0000000..6448695
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_inputmethod_toggle_button_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_inputmethod_zoomcontrols.png b/tests/tests/holo/res/drawable-ldpi/holo_inputmethod_zoomcontrols.png
new file mode 100644
index 0000000..ab090a6
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_inputmethod_zoomcontrols.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_alertdialog_list.png b/tests/tests/holo/res/drawable-ldpi/holo_light_alertdialog_list.png
new file mode 100644
index 0000000..a06cdd8
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_alertdialog_list.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_alertdialog_multichoice.png b/tests/tests/holo/res/drawable-ldpi/holo_light_alertdialog_multichoice.png
new file mode 100644
index 0000000..278e9b8
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_alertdialog_multichoice.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_alertdialog_onebutton.png b/tests/tests/holo/res/drawable-ldpi/holo_light_alertdialog_onebutton.png
new file mode 100644
index 0000000..caaec27
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_alertdialog_onebutton.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_alertdialog_singlechoice.png b/tests/tests/holo/res/drawable-ldpi/holo_light_alertdialog_singlechoice.png
new file mode 100644
index 0000000..8be0aa4
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_alertdialog_singlechoice.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_alertdialog_threebuttons.png b/tests/tests/holo/res/drawable-ldpi/holo_light_alertdialog_threebuttons.png
new file mode 100644
index 0000000..7450944
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_alertdialog_threebuttons.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_alertdialog_twobuttons.png b/tests/tests/holo/res/drawable-ldpi/holo_light_alertdialog_twobuttons.png
new file mode 100644
index 0000000..b0eccd5
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_alertdialog_twobuttons.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_button.png b/tests/tests/holo/res/drawable-ldpi/holo_light_button.png
new file mode 100644
index 0000000..054d4e5
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_button_pressed.png b/tests/tests/holo/res/drawable-ldpi/holo_light_button_pressed.png
new file mode 100644
index 0000000..a7a0105
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_button_pressed.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_calendar_view.png b/tests/tests/holo/res/drawable-ldpi/holo_light_calendar_view.png
new file mode 100644
index 0000000..16deb8f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_calendar_view.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_calendar_view_feb.png b/tests/tests/holo/res/drawable-ldpi/holo_light_calendar_view_feb.png
new file mode 100644
index 0000000..f27f7d2
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_calendar_view_feb.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_checkbox.png b/tests/tests/holo/res/drawable-ldpi/holo_light_checkbox.png
new file mode 100644
index 0000000..416fc5e
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_checkbox.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_checkbox_checked.png b/tests/tests/holo/res/drawable-ldpi/holo_light_checkbox_checked.png
new file mode 100644
index 0000000..dc38372
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_checkbox_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_chronometer.png b/tests/tests/holo/res/drawable-ldpi/holo_light_chronometer.png
new file mode 100644
index 0000000..dd8eb6d
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_chronometer.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_color_blue_bright.png b/tests/tests/holo/res/drawable-ldpi/holo_light_color_blue_bright.png
new file mode 100644
index 0000000..feaec2c
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_color_blue_bright.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_color_blue_dark.png b/tests/tests/holo/res/drawable-ldpi/holo_light_color_blue_dark.png
new file mode 100644
index 0000000..a8640c1
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_color_blue_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_color_blue_light.png b/tests/tests/holo/res/drawable-ldpi/holo_light_color_blue_light.png
new file mode 100644
index 0000000..ae141af
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_color_blue_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_color_green_dark.png b/tests/tests/holo/res/drawable-ldpi/holo_light_color_green_dark.png
new file mode 100644
index 0000000..0ee2324
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_color_green_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_color_green_light.png b/tests/tests/holo/res/drawable-ldpi/holo_light_color_green_light.png
new file mode 100644
index 0000000..9ca63c5
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_color_green_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_color_orange_dark.png b/tests/tests/holo/res/drawable-ldpi/holo_light_color_orange_dark.png
new file mode 100644
index 0000000..bc06b4f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_color_orange_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_color_orange_light.png b/tests/tests/holo/res/drawable-ldpi/holo_light_color_orange_light.png
new file mode 100644
index 0000000..1495f82
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_color_orange_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_color_purple.png b/tests/tests/holo/res/drawable-ldpi/holo_light_color_purple.png
new file mode 100644
index 0000000..9652f56
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_color_purple.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_color_red_dark.png b/tests/tests/holo/res/drawable-ldpi/holo_light_color_red_dark.png
new file mode 100644
index 0000000..4acebf8
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_color_red_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_color_red_light.png b/tests/tests/holo/res/drawable-ldpi/holo_light_color_red_light.png
new file mode 100644
index 0000000..d5b5742
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_color_red_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_darkactionbar_alertdialog_list.png b/tests/tests/holo/res/drawable-ldpi/holo_light_darkactionbar_alertdialog_list.png
new file mode 100644
index 0000000..a06cdd8
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_darkactionbar_alertdialog_list.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_darkactionbar_alertdialog_multichoice.png b/tests/tests/holo/res/drawable-ldpi/holo_light_darkactionbar_alertdialog_multichoice.png
new file mode 100644
index 0000000..278e9b8
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_darkactionbar_alertdialog_multichoice.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_darkactionbar_alertdialog_onebutton.png b/tests/tests/holo/res/drawable-ldpi/holo_light_darkactionbar_alertdialog_onebutton.png
new file mode 100644
index 0000000..caaec27
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_darkactionbar_alertdialog_onebutton.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_darkactionbar_alertdialog_singlechoice.png b/tests/tests/holo/res/drawable-ldpi/holo_light_darkactionbar_alertdialog_singlechoice.png
new file mode 100644
index 0000000..8be0aa4
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_darkactionbar_alertdialog_singlechoice.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_darkactionbar_alertdialog_threebuttons.png b/tests/tests/holo/res/drawable-ldpi/holo_light_darkactionbar_alertdialog_threebuttons.png
new file mode 100644
index 0000000..7450944
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_darkactionbar_alertdialog_threebuttons.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_darkactionbar_alertdialog_twobuttons.png b/tests/tests/holo/res/drawable-ldpi/holo_light_darkactionbar_alertdialog_twobuttons.png
new file mode 100644
index 0000000..b0eccd5
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_darkactionbar_alertdialog_twobuttons.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_darkactionbar_button.png b/tests/tests/holo/res/drawable-ldpi/holo_light_darkactionbar_button.png
new file mode 100644
index 0000000..054d4e5
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_darkactionbar_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_darkactionbar_button_pressed.png b/tests/tests/holo/res/drawable-ldpi/holo_light_darkactionbar_button_pressed.png
new file mode 100644
index 0000000..a7a0105
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_darkactionbar_button_pressed.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_darkactionbar_calendar_view.png b/tests/tests/holo/res/drawable-ldpi/holo_light_darkactionbar_calendar_view.png
new file mode 100644
index 0000000..16deb8f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_darkactionbar_calendar_view.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_darkactionbar_calendar_view_feb.png b/tests/tests/holo/res/drawable-ldpi/holo_light_darkactionbar_calendar_view_feb.png
new file mode 100644
index 0000000..f27f7d2
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_darkactionbar_calendar_view_feb.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_darkactionbar_checkbox.png b/tests/tests/holo/res/drawable-ldpi/holo_light_darkactionbar_checkbox.png
new file mode 100644
index 0000000..416fc5e
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_darkactionbar_checkbox.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_darkactionbar_checkbox_checked.png b/tests/tests/holo/res/drawable-ldpi/holo_light_darkactionbar_checkbox_checked.png
new file mode 100644
index 0000000..dc38372
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_darkactionbar_checkbox_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_darkactionbar_chronometer.png b/tests/tests/holo/res/drawable-ldpi/holo_light_darkactionbar_chronometer.png
new file mode 100644
index 0000000..dd8eb6d
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_darkactionbar_chronometer.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_darkactionbar_color_blue_bright.png b/tests/tests/holo/res/drawable-ldpi/holo_light_darkactionbar_color_blue_bright.png
new file mode 100644
index 0000000..feaec2c
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_darkactionbar_color_blue_bright.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_darkactionbar_color_blue_dark.png b/tests/tests/holo/res/drawable-ldpi/holo_light_darkactionbar_color_blue_dark.png
new file mode 100644
index 0000000..a8640c1
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_darkactionbar_color_blue_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_darkactionbar_color_blue_light.png b/tests/tests/holo/res/drawable-ldpi/holo_light_darkactionbar_color_blue_light.png
new file mode 100644
index 0000000..ae141af
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_darkactionbar_color_blue_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_darkactionbar_color_green_dark.png b/tests/tests/holo/res/drawable-ldpi/holo_light_darkactionbar_color_green_dark.png
new file mode 100644
index 0000000..0ee2324
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_darkactionbar_color_green_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_darkactionbar_color_green_light.png b/tests/tests/holo/res/drawable-ldpi/holo_light_darkactionbar_color_green_light.png
new file mode 100644
index 0000000..9ca63c5
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_darkactionbar_color_green_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_darkactionbar_color_orange_dark.png b/tests/tests/holo/res/drawable-ldpi/holo_light_darkactionbar_color_orange_dark.png
new file mode 100644
index 0000000..bc06b4f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_darkactionbar_color_orange_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_darkactionbar_color_orange_light.png b/tests/tests/holo/res/drawable-ldpi/holo_light_darkactionbar_color_orange_light.png
new file mode 100644
index 0000000..1495f82
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_darkactionbar_color_orange_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_darkactionbar_color_purple.png b/tests/tests/holo/res/drawable-ldpi/holo_light_darkactionbar_color_purple.png
new file mode 100644
index 0000000..9652f56
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_darkactionbar_color_purple.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_darkactionbar_color_red_dark.png b/tests/tests/holo/res/drawable-ldpi/holo_light_darkactionbar_color_red_dark.png
new file mode 100644
index 0000000..4acebf8
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_darkactionbar_color_red_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_darkactionbar_color_red_light.png b/tests/tests/holo/res/drawable-ldpi/holo_light_darkactionbar_color_red_light.png
new file mode 100644
index 0000000..d5b5742
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_darkactionbar_color_red_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_darkactionbar_edittext.png b/tests/tests/holo/res/drawable-ldpi/holo_light_darkactionbar_edittext.png
new file mode 100644
index 0000000..c65471f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_darkactionbar_edittext.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_darkactionbar_progressbar.png b/tests/tests/holo/res/drawable-ldpi/holo_light_darkactionbar_progressbar.png
new file mode 100644
index 0000000..06fec8f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_darkactionbar_progressbar.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_darkactionbar_progressbar_horizontal_0.png b/tests/tests/holo/res/drawable-ldpi/holo_light_darkactionbar_progressbar_horizontal_0.png
new file mode 100644
index 0000000..c89e5f2
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_darkactionbar_progressbar_horizontal_0.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_darkactionbar_progressbar_horizontal_100.png b/tests/tests/holo/res/drawable-ldpi/holo_light_darkactionbar_progressbar_horizontal_100.png
new file mode 100644
index 0000000..0abda21
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_darkactionbar_progressbar_horizontal_100.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_darkactionbar_progressbar_horizontal_50.png b/tests/tests/holo/res/drawable-ldpi/holo_light_darkactionbar_progressbar_horizontal_50.png
new file mode 100644
index 0000000..b33950b
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_darkactionbar_progressbar_horizontal_50.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_darkactionbar_progressbar_large.png b/tests/tests/holo/res/drawable-ldpi/holo_light_darkactionbar_progressbar_large.png
new file mode 100644
index 0000000..fe29e1d
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_darkactionbar_progressbar_large.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_darkactionbar_progressbar_small.png b/tests/tests/holo/res/drawable-ldpi/holo_light_darkactionbar_progressbar_small.png
new file mode 100644
index 0000000..28c0a40
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_darkactionbar_progressbar_small.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_darkactionbar_progressdialog_horizontal.png b/tests/tests/holo/res/drawable-ldpi/holo_light_darkactionbar_progressdialog_horizontal.png
new file mode 100644
index 0000000..01b7a98
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_darkactionbar_progressdialog_horizontal.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_darkactionbar_radio_button.png b/tests/tests/holo/res/drawable-ldpi/holo_light_darkactionbar_radio_button.png
new file mode 100644
index 0000000..b9c52f4
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_darkactionbar_radio_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_darkactionbar_radio_button_checked.png b/tests/tests/holo/res/drawable-ldpi/holo_light_darkactionbar_radio_button_checked.png
new file mode 100644
index 0000000..5acf60f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_darkactionbar_radio_button_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_darkactionbar_radiogroup_horizontal.png b/tests/tests/holo/res/drawable-ldpi/holo_light_darkactionbar_radiogroup_horizontal.png
new file mode 100644
index 0000000..10af193
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_darkactionbar_radiogroup_horizontal.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_darkactionbar_radiogroup_vertical.png b/tests/tests/holo/res/drawable-ldpi/holo_light_darkactionbar_radiogroup_vertical.png
new file mode 100644
index 0000000..ec7dd84
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_darkactionbar_radiogroup_vertical.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_darkactionbar_ratingbar_0.png b/tests/tests/holo/res/drawable-ldpi/holo_light_darkactionbar_ratingbar_0.png
new file mode 100644
index 0000000..2f1a8a0
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_darkactionbar_ratingbar_0.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_darkactionbar_ratingbar_0_pressed.png b/tests/tests/holo/res/drawable-ldpi/holo_light_darkactionbar_ratingbar_0_pressed.png
new file mode 100644
index 0000000..47c7851
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_darkactionbar_ratingbar_0_pressed.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_darkactionbar_ratingbar_2point5.png b/tests/tests/holo/res/drawable-ldpi/holo_light_darkactionbar_ratingbar_2point5.png
new file mode 100644
index 0000000..e35abf9
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_darkactionbar_ratingbar_2point5.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_darkactionbar_ratingbar_2point5_pressed.png b/tests/tests/holo/res/drawable-ldpi/holo_light_darkactionbar_ratingbar_2point5_pressed.png
new file mode 100644
index 0000000..a9d7fd4
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_darkactionbar_ratingbar_2point5_pressed.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_darkactionbar_ratingbar_5.png b/tests/tests/holo/res/drawable-ldpi/holo_light_darkactionbar_ratingbar_5.png
new file mode 100644
index 0000000..23afb05
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_darkactionbar_ratingbar_5.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_darkactionbar_ratingbar_5_pressed.png b/tests/tests/holo/res/drawable-ldpi/holo_light_darkactionbar_ratingbar_5_pressed.png
new file mode 100644
index 0000000..1747219
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_darkactionbar_ratingbar_5_pressed.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_darkactionbar_searchview.png b/tests/tests/holo/res/drawable-ldpi/holo_light_darkactionbar_searchview.png
new file mode 100644
index 0000000..e5feeb8
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_darkactionbar_searchview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_darkactionbar_searchview_query.png b/tests/tests/holo/res/drawable-ldpi/holo_light_darkactionbar_searchview_query.png
new file mode 100644
index 0000000..89a4ef9
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_darkactionbar_searchview_query.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_darkactionbar_searchview_query_hint.png b/tests/tests/holo/res/drawable-ldpi/holo_light_darkactionbar_searchview_query_hint.png
new file mode 100644
index 0000000..d6121ce
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_darkactionbar_searchview_query_hint.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_darkactionbar_seekbar_0.png b/tests/tests/holo/res/drawable-ldpi/holo_light_darkactionbar_seekbar_0.png
new file mode 100644
index 0000000..b79d8de
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_darkactionbar_seekbar_0.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_darkactionbar_seekbar_100.png b/tests/tests/holo/res/drawable-ldpi/holo_light_darkactionbar_seekbar_100.png
new file mode 100644
index 0000000..8e53289
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_darkactionbar_seekbar_100.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_darkactionbar_seekbar_50.png b/tests/tests/holo/res/drawable-ldpi/holo_light_darkactionbar_seekbar_50.png
new file mode 100644
index 0000000..3b7343f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_darkactionbar_seekbar_50.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_darkactionbar_spinner.png b/tests/tests/holo/res/drawable-ldpi/holo_light_darkactionbar_spinner.png
new file mode 100644
index 0000000..9cf08d4
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_darkactionbar_spinner.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_darkactionbar_switch.png b/tests/tests/holo/res/drawable-ldpi/holo_light_darkactionbar_switch.png
new file mode 100644
index 0000000..0bd5809
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_darkactionbar_switch.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_darkactionbar_switch_checked.png b/tests/tests/holo/res/drawable-ldpi/holo_light_darkactionbar_switch_checked.png
new file mode 100644
index 0000000..8404698
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_darkactionbar_switch_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_darkactionbar_tabhost.png b/tests/tests/holo/res/drawable-ldpi/holo_light_darkactionbar_tabhost.png
new file mode 100644
index 0000000..61687f6
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_darkactionbar_tabhost.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_darkactionbar_textview.png b/tests/tests/holo/res/drawable-ldpi/holo_light_darkactionbar_textview.png
new file mode 100644
index 0000000..5941143
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_darkactionbar_textview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_darkactionbar_timepicker.png b/tests/tests/holo/res/drawable-ldpi/holo_light_darkactionbar_timepicker.png
new file mode 100644
index 0000000..16bedde
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_darkactionbar_timepicker.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_darkactionbar_toggle_button.png b/tests/tests/holo/res/drawable-ldpi/holo_light_darkactionbar_toggle_button.png
new file mode 100644
index 0000000..71d5967
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_darkactionbar_toggle_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_darkactionbar_toggle_button_checked.png b/tests/tests/holo/res/drawable-ldpi/holo_light_darkactionbar_toggle_button_checked.png
new file mode 100644
index 0000000..6448695
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_darkactionbar_toggle_button_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_darkactionbar_zoomcontrols.png b/tests/tests/holo/res/drawable-ldpi/holo_light_darkactionbar_zoomcontrols.png
new file mode 100644
index 0000000..ab090a6
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_darkactionbar_zoomcontrols.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_alertdialog_list.png b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_alertdialog_list.png
new file mode 100644
index 0000000..a06cdd8
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_alertdialog_list.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_alertdialog_multichoice.png b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_alertdialog_multichoice.png
new file mode 100644
index 0000000..278e9b8
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_alertdialog_multichoice.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_alertdialog_onebutton.png b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_alertdialog_onebutton.png
new file mode 100644
index 0000000..caaec27
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_alertdialog_onebutton.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_alertdialog_singlechoice.png b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_alertdialog_singlechoice.png
new file mode 100644
index 0000000..8be0aa4
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_alertdialog_singlechoice.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_alertdialog_threebuttons.png b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_alertdialog_threebuttons.png
new file mode 100644
index 0000000..7450944
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_alertdialog_threebuttons.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_alertdialog_twobuttons.png b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_alertdialog_twobuttons.png
new file mode 100644
index 0000000..b0eccd5
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_alertdialog_twobuttons.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_button.png b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_button.png
new file mode 100644
index 0000000..054d4e5
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_button_pressed.png b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_button_pressed.png
new file mode 100644
index 0000000..a7a0105
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_button_pressed.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_calendar_view.png b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_calendar_view.png
new file mode 100644
index 0000000..16deb8f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_calendar_view.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_calendar_view_feb.png b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_calendar_view_feb.png
new file mode 100644
index 0000000..f27f7d2
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_calendar_view_feb.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_checkbox.png b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_checkbox.png
new file mode 100644
index 0000000..416fc5e
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_checkbox.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_checkbox_checked.png b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_checkbox_checked.png
new file mode 100644
index 0000000..dc38372
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_checkbox_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_chronometer.png b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_chronometer.png
new file mode 100644
index 0000000..dd8eb6d
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_chronometer.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_color_blue_bright.png b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_color_blue_bright.png
new file mode 100644
index 0000000..feaec2c
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_color_blue_bright.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_color_blue_dark.png b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_color_blue_dark.png
new file mode 100644
index 0000000..a8640c1
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_color_blue_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_color_blue_light.png b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_color_blue_light.png
new file mode 100644
index 0000000..ae141af
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_color_blue_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_color_green_dark.png b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_color_green_dark.png
new file mode 100644
index 0000000..0ee2324
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_color_green_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_color_green_light.png b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_color_green_light.png
new file mode 100644
index 0000000..9ca63c5
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_color_green_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_color_orange_dark.png b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_color_orange_dark.png
new file mode 100644
index 0000000..bc06b4f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_color_orange_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_color_orange_light.png b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_color_orange_light.png
new file mode 100644
index 0000000..1495f82
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_color_orange_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_color_purple.png b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_color_purple.png
new file mode 100644
index 0000000..9652f56
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_color_purple.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_color_red_dark.png b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_color_red_dark.png
new file mode 100644
index 0000000..4acebf8
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_color_red_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_color_red_light.png b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_color_red_light.png
new file mode 100644
index 0000000..d5b5742
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_color_red_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_edittext.png b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_edittext.png
new file mode 100644
index 0000000..c65471f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_edittext.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_minwidth_alertdialog_list.png b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_minwidth_alertdialog_list.png
new file mode 100644
index 0000000..a06cdd8
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_minwidth_alertdialog_list.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_minwidth_alertdialog_multichoice.png b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_minwidth_alertdialog_multichoice.png
new file mode 100644
index 0000000..278e9b8
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_minwidth_alertdialog_multichoice.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_minwidth_alertdialog_onebutton.png b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_minwidth_alertdialog_onebutton.png
new file mode 100644
index 0000000..caaec27
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_minwidth_alertdialog_onebutton.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_minwidth_alertdialog_singlechoice.png b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_minwidth_alertdialog_singlechoice.png
new file mode 100644
index 0000000..8be0aa4
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_minwidth_alertdialog_singlechoice.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_minwidth_alertdialog_threebuttons.png b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_minwidth_alertdialog_threebuttons.png
new file mode 100644
index 0000000..7450944
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_minwidth_alertdialog_threebuttons.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_minwidth_alertdialog_twobuttons.png b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_minwidth_alertdialog_twobuttons.png
new file mode 100644
index 0000000..b0eccd5
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_minwidth_alertdialog_twobuttons.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_minwidth_button.png b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_minwidth_button.png
new file mode 100644
index 0000000..054d4e5
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_minwidth_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_minwidth_button_pressed.png b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_minwidth_button_pressed.png
new file mode 100644
index 0000000..a7a0105
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_minwidth_button_pressed.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_minwidth_calendar_view.png b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_minwidth_calendar_view.png
new file mode 100644
index 0000000..16deb8f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_minwidth_calendar_view.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_minwidth_calendar_view_feb.png b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_minwidth_calendar_view_feb.png
new file mode 100644
index 0000000..f27f7d2
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_minwidth_calendar_view_feb.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_minwidth_checkbox.png b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_minwidth_checkbox.png
new file mode 100644
index 0000000..416fc5e
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_minwidth_checkbox.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_minwidth_checkbox_checked.png b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_minwidth_checkbox_checked.png
new file mode 100644
index 0000000..dc38372
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_minwidth_checkbox_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_minwidth_chronometer.png b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_minwidth_chronometer.png
new file mode 100644
index 0000000..dd8eb6d
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_minwidth_chronometer.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_minwidth_color_blue_bright.png b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_minwidth_color_blue_bright.png
new file mode 100644
index 0000000..feaec2c
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_minwidth_color_blue_bright.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_minwidth_color_blue_dark.png b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_minwidth_color_blue_dark.png
new file mode 100644
index 0000000..a8640c1
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_minwidth_color_blue_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_minwidth_color_blue_light.png b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_minwidth_color_blue_light.png
new file mode 100644
index 0000000..ae141af
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_minwidth_color_blue_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_minwidth_color_green_dark.png b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_minwidth_color_green_dark.png
new file mode 100644
index 0000000..0ee2324
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_minwidth_color_green_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_minwidth_color_green_light.png b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_minwidth_color_green_light.png
new file mode 100644
index 0000000..9ca63c5
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_minwidth_color_green_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_minwidth_color_orange_dark.png b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_minwidth_color_orange_dark.png
new file mode 100644
index 0000000..bc06b4f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_minwidth_color_orange_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_minwidth_color_orange_light.png b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_minwidth_color_orange_light.png
new file mode 100644
index 0000000..1495f82
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_minwidth_color_orange_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_minwidth_color_purple.png b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_minwidth_color_purple.png
new file mode 100644
index 0000000..9652f56
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_minwidth_color_purple.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_minwidth_color_red_dark.png b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_minwidth_color_red_dark.png
new file mode 100644
index 0000000..4acebf8
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_minwidth_color_red_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_minwidth_color_red_light.png b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_minwidth_color_red_light.png
new file mode 100644
index 0000000..d5b5742
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_minwidth_color_red_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_minwidth_edittext.png b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_minwidth_edittext.png
new file mode 100644
index 0000000..c65471f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_minwidth_edittext.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_minwidth_progressbar.png b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_minwidth_progressbar.png
new file mode 100644
index 0000000..06fec8f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_minwidth_progressbar.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_minwidth_progressbar_horizontal_0.png b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_minwidth_progressbar_horizontal_0.png
new file mode 100644
index 0000000..c89e5f2
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_minwidth_progressbar_horizontal_0.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_minwidth_progressbar_horizontal_100.png b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_minwidth_progressbar_horizontal_100.png
new file mode 100644
index 0000000..0abda21
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_minwidth_progressbar_horizontal_100.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_minwidth_progressbar_horizontal_50.png b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_minwidth_progressbar_horizontal_50.png
new file mode 100644
index 0000000..b33950b
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_minwidth_progressbar_horizontal_50.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_minwidth_progressbar_large.png b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_minwidth_progressbar_large.png
new file mode 100644
index 0000000..fe29e1d
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_minwidth_progressbar_large.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_minwidth_progressbar_small.png b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_minwidth_progressbar_small.png
new file mode 100644
index 0000000..28c0a40
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_minwidth_progressbar_small.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_minwidth_progressdialog_horizontal.png b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_minwidth_progressdialog_horizontal.png
new file mode 100644
index 0000000..01b7a98
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_minwidth_progressdialog_horizontal.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_minwidth_radio_button.png b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_minwidth_radio_button.png
new file mode 100644
index 0000000..b9c52f4
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_minwidth_radio_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_minwidth_radio_button_checked.png b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_minwidth_radio_button_checked.png
new file mode 100644
index 0000000..5acf60f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_minwidth_radio_button_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_minwidth_radiogroup_horizontal.png b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_minwidth_radiogroup_horizontal.png
new file mode 100644
index 0000000..10af193
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_minwidth_radiogroup_horizontal.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_minwidth_radiogroup_vertical.png b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_minwidth_radiogroup_vertical.png
new file mode 100644
index 0000000..ec7dd84
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_minwidth_radiogroup_vertical.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_minwidth_ratingbar_0.png b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_minwidth_ratingbar_0.png
new file mode 100644
index 0000000..2f1a8a0
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_minwidth_ratingbar_0.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_minwidth_ratingbar_0_pressed.png b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_minwidth_ratingbar_0_pressed.png
new file mode 100644
index 0000000..47c7851
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_minwidth_ratingbar_0_pressed.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_minwidth_ratingbar_2point5.png b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_minwidth_ratingbar_2point5.png
new file mode 100644
index 0000000..e35abf9
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_minwidth_ratingbar_2point5.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_minwidth_ratingbar_2point5_pressed.png b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_minwidth_ratingbar_2point5_pressed.png
new file mode 100644
index 0000000..a9d7fd4
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_minwidth_ratingbar_2point5_pressed.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_minwidth_ratingbar_5.png b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_minwidth_ratingbar_5.png
new file mode 100644
index 0000000..23afb05
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_minwidth_ratingbar_5.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_minwidth_ratingbar_5_pressed.png b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_minwidth_ratingbar_5_pressed.png
new file mode 100644
index 0000000..1747219
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_minwidth_ratingbar_5_pressed.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_minwidth_searchview.png b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_minwidth_searchview.png
new file mode 100644
index 0000000..e5feeb8
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_minwidth_searchview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_minwidth_searchview_query.png b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_minwidth_searchview_query.png
new file mode 100644
index 0000000..89a4ef9
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_minwidth_searchview_query.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_minwidth_searchview_query_hint.png b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_minwidth_searchview_query_hint.png
new file mode 100644
index 0000000..d6121ce
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_minwidth_searchview_query_hint.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_minwidth_seekbar_0.png b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_minwidth_seekbar_0.png
new file mode 100644
index 0000000..b79d8de
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_minwidth_seekbar_0.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_minwidth_seekbar_100.png b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_minwidth_seekbar_100.png
new file mode 100644
index 0000000..8e53289
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_minwidth_seekbar_100.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_minwidth_seekbar_50.png b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_minwidth_seekbar_50.png
new file mode 100644
index 0000000..3b7343f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_minwidth_seekbar_50.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_minwidth_spinner.png b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_minwidth_spinner.png
new file mode 100644
index 0000000..9cf08d4
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_minwidth_spinner.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_minwidth_switch.png b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_minwidth_switch.png
new file mode 100644
index 0000000..0bd5809
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_minwidth_switch.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_minwidth_switch_checked.png b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_minwidth_switch_checked.png
new file mode 100644
index 0000000..8404698
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_minwidth_switch_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_minwidth_tabhost.png b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_minwidth_tabhost.png
new file mode 100644
index 0000000..61687f6
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_minwidth_tabhost.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_minwidth_textview.png b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_minwidth_textview.png
new file mode 100644
index 0000000..5941143
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_minwidth_textview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_minwidth_timepicker.png b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_minwidth_timepicker.png
new file mode 100644
index 0000000..16bedde
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_minwidth_timepicker.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_minwidth_toggle_button.png b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_minwidth_toggle_button.png
new file mode 100644
index 0000000..71d5967
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_minwidth_toggle_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_minwidth_toggle_button_checked.png b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_minwidth_toggle_button_checked.png
new file mode 100644
index 0000000..6448695
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_minwidth_toggle_button_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_minwidth_zoomcontrols.png b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_minwidth_zoomcontrols.png
new file mode 100644
index 0000000..ab090a6
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_minwidth_zoomcontrols.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_noactionbar_alertdialog_list.png b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_noactionbar_alertdialog_list.png
new file mode 100644
index 0000000..a06cdd8
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_noactionbar_alertdialog_list.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_noactionbar_alertdialog_multichoice.png b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_noactionbar_alertdialog_multichoice.png
new file mode 100644
index 0000000..278e9b8
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_noactionbar_alertdialog_multichoice.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_noactionbar_alertdialog_onebutton.png b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_noactionbar_alertdialog_onebutton.png
new file mode 100644
index 0000000..caaec27
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_noactionbar_alertdialog_onebutton.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_noactionbar_alertdialog_singlechoice.png b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_noactionbar_alertdialog_singlechoice.png
new file mode 100644
index 0000000..8be0aa4
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_noactionbar_alertdialog_singlechoice.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_noactionbar_alertdialog_threebuttons.png b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_noactionbar_alertdialog_threebuttons.png
new file mode 100644
index 0000000..7450944
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_noactionbar_alertdialog_threebuttons.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_noactionbar_alertdialog_twobuttons.png b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_noactionbar_alertdialog_twobuttons.png
new file mode 100644
index 0000000..b0eccd5
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_noactionbar_alertdialog_twobuttons.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_noactionbar_button.png b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_noactionbar_button.png
new file mode 100644
index 0000000..054d4e5
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_noactionbar_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_noactionbar_button_pressed.png b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_noactionbar_button_pressed.png
new file mode 100644
index 0000000..a7a0105
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_noactionbar_button_pressed.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_noactionbar_calendar_view.png b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_noactionbar_calendar_view.png
new file mode 100644
index 0000000..16deb8f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_noactionbar_calendar_view.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_noactionbar_calendar_view_feb.png b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_noactionbar_calendar_view_feb.png
new file mode 100644
index 0000000..f27f7d2
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_noactionbar_calendar_view_feb.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_noactionbar_checkbox.png b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_noactionbar_checkbox.png
new file mode 100644
index 0000000..416fc5e
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_noactionbar_checkbox.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_noactionbar_checkbox_checked.png b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_noactionbar_checkbox_checked.png
new file mode 100644
index 0000000..dc38372
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_noactionbar_checkbox_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_noactionbar_chronometer.png b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_noactionbar_chronometer.png
new file mode 100644
index 0000000..dd8eb6d
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_noactionbar_chronometer.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_noactionbar_color_blue_bright.png b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_noactionbar_color_blue_bright.png
new file mode 100644
index 0000000..feaec2c
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_noactionbar_color_blue_bright.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_noactionbar_color_blue_dark.png b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_noactionbar_color_blue_dark.png
new file mode 100644
index 0000000..a8640c1
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_noactionbar_color_blue_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_noactionbar_color_blue_light.png b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_noactionbar_color_blue_light.png
new file mode 100644
index 0000000..ae141af
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_noactionbar_color_blue_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_noactionbar_color_green_dark.png b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_noactionbar_color_green_dark.png
new file mode 100644
index 0000000..0ee2324
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_noactionbar_color_green_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_noactionbar_color_green_light.png b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_noactionbar_color_green_light.png
new file mode 100644
index 0000000..9ca63c5
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_noactionbar_color_green_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_noactionbar_color_orange_dark.png b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_noactionbar_color_orange_dark.png
new file mode 100644
index 0000000..bc06b4f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_noactionbar_color_orange_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_noactionbar_color_orange_light.png b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_noactionbar_color_orange_light.png
new file mode 100644
index 0000000..1495f82
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_noactionbar_color_orange_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_noactionbar_color_purple.png b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_noactionbar_color_purple.png
new file mode 100644
index 0000000..9652f56
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_noactionbar_color_purple.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_noactionbar_color_red_dark.png b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_noactionbar_color_red_dark.png
new file mode 100644
index 0000000..4acebf8
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_noactionbar_color_red_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_noactionbar_color_red_light.png b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_noactionbar_color_red_light.png
new file mode 100644
index 0000000..d5b5742
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_noactionbar_color_red_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_noactionbar_edittext.png b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_noactionbar_edittext.png
new file mode 100644
index 0000000..c65471f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_noactionbar_edittext.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_noactionbar_minwidth_alertdialog_list.png b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_noactionbar_minwidth_alertdialog_list.png
new file mode 100644
index 0000000..a06cdd8
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_noactionbar_minwidth_alertdialog_list.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_noactionbar_minwidth_alertdialog_multichoice.png b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_noactionbar_minwidth_alertdialog_multichoice.png
new file mode 100644
index 0000000..278e9b8
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_noactionbar_minwidth_alertdialog_multichoice.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_noactionbar_minwidth_alertdialog_onebutton.png b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_noactionbar_minwidth_alertdialog_onebutton.png
new file mode 100644
index 0000000..caaec27
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_noactionbar_minwidth_alertdialog_onebutton.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_noactionbar_minwidth_alertdialog_singlechoice.png b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_noactionbar_minwidth_alertdialog_singlechoice.png
new file mode 100644
index 0000000..8be0aa4
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_noactionbar_minwidth_alertdialog_singlechoice.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_noactionbar_minwidth_alertdialog_threebuttons.png b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_noactionbar_minwidth_alertdialog_threebuttons.png
new file mode 100644
index 0000000..7450944
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_noactionbar_minwidth_alertdialog_threebuttons.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_noactionbar_minwidth_alertdialog_twobuttons.png b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_noactionbar_minwidth_alertdialog_twobuttons.png
new file mode 100644
index 0000000..b0eccd5
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_noactionbar_minwidth_alertdialog_twobuttons.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_noactionbar_minwidth_button.png b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_noactionbar_minwidth_button.png
new file mode 100644
index 0000000..054d4e5
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_noactionbar_minwidth_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_noactionbar_minwidth_button_pressed.png b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_noactionbar_minwidth_button_pressed.png
new file mode 100644
index 0000000..a7a0105
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_noactionbar_minwidth_button_pressed.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_noactionbar_minwidth_calendar_view.png b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_noactionbar_minwidth_calendar_view.png
new file mode 100644
index 0000000..16deb8f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_noactionbar_minwidth_calendar_view.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_noactionbar_minwidth_calendar_view_feb.png b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_noactionbar_minwidth_calendar_view_feb.png
new file mode 100644
index 0000000..f27f7d2
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_noactionbar_minwidth_calendar_view_feb.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_noactionbar_minwidth_checkbox.png b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_noactionbar_minwidth_checkbox.png
new file mode 100644
index 0000000..416fc5e
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_noactionbar_minwidth_checkbox.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_noactionbar_minwidth_checkbox_checked.png b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_noactionbar_minwidth_checkbox_checked.png
new file mode 100644
index 0000000..dc38372
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_noactionbar_minwidth_checkbox_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_noactionbar_minwidth_chronometer.png b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_noactionbar_minwidth_chronometer.png
new file mode 100644
index 0000000..dd8eb6d
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_noactionbar_minwidth_chronometer.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_noactionbar_minwidth_color_blue_bright.png b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_noactionbar_minwidth_color_blue_bright.png
new file mode 100644
index 0000000..feaec2c
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_noactionbar_minwidth_color_blue_bright.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_noactionbar_minwidth_color_blue_dark.png b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_noactionbar_minwidth_color_blue_dark.png
new file mode 100644
index 0000000..a8640c1
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_noactionbar_minwidth_color_blue_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_noactionbar_minwidth_color_blue_light.png b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_noactionbar_minwidth_color_blue_light.png
new file mode 100644
index 0000000..ae141af
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_noactionbar_minwidth_color_blue_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_noactionbar_minwidth_color_green_dark.png b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_noactionbar_minwidth_color_green_dark.png
new file mode 100644
index 0000000..0ee2324
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_noactionbar_minwidth_color_green_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_noactionbar_minwidth_color_green_light.png b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_noactionbar_minwidth_color_green_light.png
new file mode 100644
index 0000000..9ca63c5
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_noactionbar_minwidth_color_green_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_noactionbar_minwidth_color_orange_dark.png b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_noactionbar_minwidth_color_orange_dark.png
new file mode 100644
index 0000000..bc06b4f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_noactionbar_minwidth_color_orange_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_noactionbar_minwidth_color_orange_light.png b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_noactionbar_minwidth_color_orange_light.png
new file mode 100644
index 0000000..1495f82
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_noactionbar_minwidth_color_orange_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_noactionbar_minwidth_color_purple.png b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_noactionbar_minwidth_color_purple.png
new file mode 100644
index 0000000..9652f56
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_noactionbar_minwidth_color_purple.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_noactionbar_minwidth_color_red_dark.png b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_noactionbar_minwidth_color_red_dark.png
new file mode 100644
index 0000000..4acebf8
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_noactionbar_minwidth_color_red_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_noactionbar_minwidth_color_red_light.png b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_noactionbar_minwidth_color_red_light.png
new file mode 100644
index 0000000..d5b5742
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_noactionbar_minwidth_color_red_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_noactionbar_minwidth_edittext.png b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_noactionbar_minwidth_edittext.png
new file mode 100644
index 0000000..c65471f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_noactionbar_minwidth_edittext.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_noactionbar_minwidth_progressbar.png b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_noactionbar_minwidth_progressbar.png
new file mode 100644
index 0000000..06fec8f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_noactionbar_minwidth_progressbar.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_noactionbar_minwidth_progressbar_horizontal_0.png b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_noactionbar_minwidth_progressbar_horizontal_0.png
new file mode 100644
index 0000000..c89e5f2
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_noactionbar_minwidth_progressbar_horizontal_0.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_noactionbar_minwidth_progressbar_horizontal_100.png b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_noactionbar_minwidth_progressbar_horizontal_100.png
new file mode 100644
index 0000000..0abda21
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_noactionbar_minwidth_progressbar_horizontal_100.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_noactionbar_minwidth_progressbar_horizontal_50.png b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_noactionbar_minwidth_progressbar_horizontal_50.png
new file mode 100644
index 0000000..b33950b
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_noactionbar_minwidth_progressbar_horizontal_50.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_noactionbar_minwidth_progressbar_large.png b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_noactionbar_minwidth_progressbar_large.png
new file mode 100644
index 0000000..fe29e1d
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_noactionbar_minwidth_progressbar_large.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_noactionbar_minwidth_progressbar_small.png b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_noactionbar_minwidth_progressbar_small.png
new file mode 100644
index 0000000..28c0a40
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_noactionbar_minwidth_progressbar_small.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_noactionbar_minwidth_progressdialog_horizontal.png b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_noactionbar_minwidth_progressdialog_horizontal.png
new file mode 100644
index 0000000..01b7a98
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_noactionbar_minwidth_progressdialog_horizontal.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_noactionbar_minwidth_radio_button.png b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_noactionbar_minwidth_radio_button.png
new file mode 100644
index 0000000..b9c52f4
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_noactionbar_minwidth_radio_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_noactionbar_minwidth_radio_button_checked.png b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_noactionbar_minwidth_radio_button_checked.png
new file mode 100644
index 0000000..5acf60f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_noactionbar_minwidth_radio_button_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_noactionbar_minwidth_radiogroup_horizontal.png b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_noactionbar_minwidth_radiogroup_horizontal.png
new file mode 100644
index 0000000..10af193
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_noactionbar_minwidth_radiogroup_horizontal.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_noactionbar_minwidth_radiogroup_vertical.png b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_noactionbar_minwidth_radiogroup_vertical.png
new file mode 100644
index 0000000..ec7dd84
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_noactionbar_minwidth_radiogroup_vertical.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_noactionbar_minwidth_ratingbar_0.png b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_noactionbar_minwidth_ratingbar_0.png
new file mode 100644
index 0000000..2f1a8a0
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_noactionbar_minwidth_ratingbar_0.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_noactionbar_minwidth_ratingbar_0_pressed.png b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_noactionbar_minwidth_ratingbar_0_pressed.png
new file mode 100644
index 0000000..47c7851
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_noactionbar_minwidth_ratingbar_0_pressed.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_noactionbar_minwidth_ratingbar_2point5.png b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_noactionbar_minwidth_ratingbar_2point5.png
new file mode 100644
index 0000000..e35abf9
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_noactionbar_minwidth_ratingbar_2point5.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_noactionbar_minwidth_ratingbar_2point5_pressed.png b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_noactionbar_minwidth_ratingbar_2point5_pressed.png
new file mode 100644
index 0000000..a9d7fd4
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_noactionbar_minwidth_ratingbar_2point5_pressed.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_noactionbar_minwidth_ratingbar_5.png b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_noactionbar_minwidth_ratingbar_5.png
new file mode 100644
index 0000000..23afb05
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_noactionbar_minwidth_ratingbar_5.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_noactionbar_minwidth_ratingbar_5_pressed.png b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_noactionbar_minwidth_ratingbar_5_pressed.png
new file mode 100644
index 0000000..1747219
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_noactionbar_minwidth_ratingbar_5_pressed.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_noactionbar_minwidth_searchview.png b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_noactionbar_minwidth_searchview.png
new file mode 100644
index 0000000..e5feeb8
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_noactionbar_minwidth_searchview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_noactionbar_minwidth_searchview_query.png b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_noactionbar_minwidth_searchview_query.png
new file mode 100644
index 0000000..89a4ef9
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_noactionbar_minwidth_searchview_query.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_noactionbar_minwidth_searchview_query_hint.png b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_noactionbar_minwidth_searchview_query_hint.png
new file mode 100644
index 0000000..d6121ce
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_noactionbar_minwidth_searchview_query_hint.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_noactionbar_minwidth_seekbar_0.png b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_noactionbar_minwidth_seekbar_0.png
new file mode 100644
index 0000000..b79d8de
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_noactionbar_minwidth_seekbar_0.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_noactionbar_minwidth_seekbar_100.png b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_noactionbar_minwidth_seekbar_100.png
new file mode 100644
index 0000000..8e53289
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_noactionbar_minwidth_seekbar_100.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_noactionbar_minwidth_seekbar_50.png b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_noactionbar_minwidth_seekbar_50.png
new file mode 100644
index 0000000..3b7343f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_noactionbar_minwidth_seekbar_50.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_noactionbar_minwidth_spinner.png b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_noactionbar_minwidth_spinner.png
new file mode 100644
index 0000000..9cf08d4
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_noactionbar_minwidth_spinner.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_noactionbar_minwidth_switch.png b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_noactionbar_minwidth_switch.png
new file mode 100644
index 0000000..0bd5809
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_noactionbar_minwidth_switch.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_noactionbar_minwidth_switch_checked.png b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_noactionbar_minwidth_switch_checked.png
new file mode 100644
index 0000000..8404698
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_noactionbar_minwidth_switch_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_noactionbar_minwidth_tabhost.png b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_noactionbar_minwidth_tabhost.png
new file mode 100644
index 0000000..61687f6
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_noactionbar_minwidth_tabhost.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_noactionbar_minwidth_textview.png b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_noactionbar_minwidth_textview.png
new file mode 100644
index 0000000..5941143
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_noactionbar_minwidth_textview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_noactionbar_minwidth_timepicker.png b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_noactionbar_minwidth_timepicker.png
new file mode 100644
index 0000000..16bedde
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_noactionbar_minwidth_timepicker.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_noactionbar_minwidth_toggle_button.png b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_noactionbar_minwidth_toggle_button.png
new file mode 100644
index 0000000..71d5967
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_noactionbar_minwidth_toggle_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_noactionbar_minwidth_toggle_button_checked.png b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_noactionbar_minwidth_toggle_button_checked.png
new file mode 100644
index 0000000..6448695
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_noactionbar_minwidth_toggle_button_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_noactionbar_minwidth_zoomcontrols.png b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_noactionbar_minwidth_zoomcontrols.png
new file mode 100644
index 0000000..ab090a6
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_noactionbar_minwidth_zoomcontrols.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_noactionbar_progressbar.png b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_noactionbar_progressbar.png
new file mode 100644
index 0000000..06fec8f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_noactionbar_progressbar.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_noactionbar_progressbar_horizontal_0.png b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_noactionbar_progressbar_horizontal_0.png
new file mode 100644
index 0000000..c89e5f2
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_noactionbar_progressbar_horizontal_0.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_noactionbar_progressbar_horizontal_100.png b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_noactionbar_progressbar_horizontal_100.png
new file mode 100644
index 0000000..0abda21
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_noactionbar_progressbar_horizontal_100.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_noactionbar_progressbar_horizontal_50.png b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_noactionbar_progressbar_horizontal_50.png
new file mode 100644
index 0000000..b33950b
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_noactionbar_progressbar_horizontal_50.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_noactionbar_progressbar_large.png b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_noactionbar_progressbar_large.png
new file mode 100644
index 0000000..fe29e1d
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_noactionbar_progressbar_large.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_noactionbar_progressbar_small.png b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_noactionbar_progressbar_small.png
new file mode 100644
index 0000000..28c0a40
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_noactionbar_progressbar_small.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_noactionbar_progressdialog_horizontal.png b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_noactionbar_progressdialog_horizontal.png
new file mode 100644
index 0000000..01b7a98
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_noactionbar_progressdialog_horizontal.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_noactionbar_radio_button.png b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_noactionbar_radio_button.png
new file mode 100644
index 0000000..b9c52f4
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_noactionbar_radio_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_noactionbar_radio_button_checked.png b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_noactionbar_radio_button_checked.png
new file mode 100644
index 0000000..5acf60f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_noactionbar_radio_button_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_noactionbar_radiogroup_horizontal.png b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_noactionbar_radiogroup_horizontal.png
new file mode 100644
index 0000000..10af193
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_noactionbar_radiogroup_horizontal.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_noactionbar_radiogroup_vertical.png b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_noactionbar_radiogroup_vertical.png
new file mode 100644
index 0000000..ec7dd84
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_noactionbar_radiogroup_vertical.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_noactionbar_ratingbar_0.png b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_noactionbar_ratingbar_0.png
new file mode 100644
index 0000000..2f1a8a0
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_noactionbar_ratingbar_0.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_noactionbar_ratingbar_0_pressed.png b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_noactionbar_ratingbar_0_pressed.png
new file mode 100644
index 0000000..47c7851
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_noactionbar_ratingbar_0_pressed.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_noactionbar_ratingbar_2point5.png b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_noactionbar_ratingbar_2point5.png
new file mode 100644
index 0000000..e35abf9
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_noactionbar_ratingbar_2point5.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_noactionbar_ratingbar_2point5_pressed.png b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_noactionbar_ratingbar_2point5_pressed.png
new file mode 100644
index 0000000..a9d7fd4
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_noactionbar_ratingbar_2point5_pressed.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_noactionbar_ratingbar_5.png b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_noactionbar_ratingbar_5.png
new file mode 100644
index 0000000..23afb05
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_noactionbar_ratingbar_5.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_noactionbar_ratingbar_5_pressed.png b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_noactionbar_ratingbar_5_pressed.png
new file mode 100644
index 0000000..1747219
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_noactionbar_ratingbar_5_pressed.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_noactionbar_searchview.png b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_noactionbar_searchview.png
new file mode 100644
index 0000000..e5feeb8
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_noactionbar_searchview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_noactionbar_searchview_query.png b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_noactionbar_searchview_query.png
new file mode 100644
index 0000000..89a4ef9
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_noactionbar_searchview_query.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_noactionbar_searchview_query_hint.png b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_noactionbar_searchview_query_hint.png
new file mode 100644
index 0000000..d6121ce
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_noactionbar_searchview_query_hint.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_noactionbar_seekbar_0.png b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_noactionbar_seekbar_0.png
new file mode 100644
index 0000000..b79d8de
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_noactionbar_seekbar_0.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_noactionbar_seekbar_100.png b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_noactionbar_seekbar_100.png
new file mode 100644
index 0000000..8e53289
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_noactionbar_seekbar_100.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_noactionbar_seekbar_50.png b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_noactionbar_seekbar_50.png
new file mode 100644
index 0000000..3b7343f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_noactionbar_seekbar_50.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_noactionbar_spinner.png b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_noactionbar_spinner.png
new file mode 100644
index 0000000..9cf08d4
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_noactionbar_spinner.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_noactionbar_switch.png b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_noactionbar_switch.png
new file mode 100644
index 0000000..0bd5809
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_noactionbar_switch.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_noactionbar_switch_checked.png b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_noactionbar_switch_checked.png
new file mode 100644
index 0000000..8404698
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_noactionbar_switch_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_noactionbar_tabhost.png b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_noactionbar_tabhost.png
new file mode 100644
index 0000000..61687f6
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_noactionbar_tabhost.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_noactionbar_textview.png b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_noactionbar_textview.png
new file mode 100644
index 0000000..5941143
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_noactionbar_textview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_noactionbar_timepicker.png b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_noactionbar_timepicker.png
new file mode 100644
index 0000000..16bedde
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_noactionbar_timepicker.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_noactionbar_toggle_button.png b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_noactionbar_toggle_button.png
new file mode 100644
index 0000000..71d5967
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_noactionbar_toggle_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_noactionbar_toggle_button_checked.png b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_noactionbar_toggle_button_checked.png
new file mode 100644
index 0000000..6448695
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_noactionbar_toggle_button_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_noactionbar_zoomcontrols.png b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_noactionbar_zoomcontrols.png
new file mode 100644
index 0000000..ab090a6
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_noactionbar_zoomcontrols.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_progressbar.png b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_progressbar.png
new file mode 100644
index 0000000..06fec8f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_progressbar.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_progressbar_horizontal_0.png b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_progressbar_horizontal_0.png
new file mode 100644
index 0000000..c89e5f2
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_progressbar_horizontal_0.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_progressbar_horizontal_100.png b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_progressbar_horizontal_100.png
new file mode 100644
index 0000000..0abda21
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_progressbar_horizontal_100.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_progressbar_horizontal_50.png b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_progressbar_horizontal_50.png
new file mode 100644
index 0000000..b33950b
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_progressbar_horizontal_50.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_progressbar_large.png b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_progressbar_large.png
new file mode 100644
index 0000000..fe29e1d
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_progressbar_large.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_progressbar_small.png b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_progressbar_small.png
new file mode 100644
index 0000000..28c0a40
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_progressbar_small.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_progressdialog_horizontal.png b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_progressdialog_horizontal.png
new file mode 100644
index 0000000..01b7a98
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_progressdialog_horizontal.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_radio_button.png b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_radio_button.png
new file mode 100644
index 0000000..b9c52f4
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_radio_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_radio_button_checked.png b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_radio_button_checked.png
new file mode 100644
index 0000000..5acf60f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_radio_button_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_radiogroup_horizontal.png b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_radiogroup_horizontal.png
new file mode 100644
index 0000000..10af193
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_radiogroup_horizontal.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_radiogroup_vertical.png b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_radiogroup_vertical.png
new file mode 100644
index 0000000..ec7dd84
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_radiogroup_vertical.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_ratingbar_0.png b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_ratingbar_0.png
new file mode 100644
index 0000000..2f1a8a0
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_ratingbar_0.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_ratingbar_0_pressed.png b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_ratingbar_0_pressed.png
new file mode 100644
index 0000000..47c7851
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_ratingbar_0_pressed.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_ratingbar_2point5.png b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_ratingbar_2point5.png
new file mode 100644
index 0000000..e35abf9
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_ratingbar_2point5.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_ratingbar_2point5_pressed.png b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_ratingbar_2point5_pressed.png
new file mode 100644
index 0000000..a9d7fd4
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_ratingbar_2point5_pressed.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_ratingbar_5.png b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_ratingbar_5.png
new file mode 100644
index 0000000..23afb05
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_ratingbar_5.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_ratingbar_5_pressed.png b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_ratingbar_5_pressed.png
new file mode 100644
index 0000000..1747219
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_ratingbar_5_pressed.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_searchview.png b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_searchview.png
new file mode 100644
index 0000000..e5feeb8
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_searchview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_searchview_query.png b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_searchview_query.png
new file mode 100644
index 0000000..89a4ef9
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_searchview_query.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_searchview_query_hint.png b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_searchview_query_hint.png
new file mode 100644
index 0000000..d6121ce
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_searchview_query_hint.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_seekbar_0.png b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_seekbar_0.png
new file mode 100644
index 0000000..b79d8de
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_seekbar_0.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_seekbar_100.png b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_seekbar_100.png
new file mode 100644
index 0000000..8e53289
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_seekbar_100.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_seekbar_50.png b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_seekbar_50.png
new file mode 100644
index 0000000..3b7343f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_seekbar_50.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_spinner.png b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_spinner.png
new file mode 100644
index 0000000..9cf08d4
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_spinner.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_switch.png b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_switch.png
new file mode 100644
index 0000000..0bd5809
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_switch.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_switch_checked.png b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_switch_checked.png
new file mode 100644
index 0000000..8404698
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_switch_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_tabhost.png b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_tabhost.png
new file mode 100644
index 0000000..61687f6
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_tabhost.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_textview.png b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_textview.png
new file mode 100644
index 0000000..5941143
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_textview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_timepicker.png b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_timepicker.png
new file mode 100644
index 0000000..16bedde
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_timepicker.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_toggle_button.png b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_toggle_button.png
new file mode 100644
index 0000000..71d5967
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_toggle_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_toggle_button_checked.png b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_toggle_button_checked.png
new file mode 100644
index 0000000..6448695
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_toggle_button_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_zoomcontrols.png b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_zoomcontrols.png
new file mode 100644
index 0000000..ab090a6
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_dialog_zoomcontrols.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_dialogwhenlarge_alertdialog_list.png b/tests/tests/holo/res/drawable-ldpi/holo_light_dialogwhenlarge_alertdialog_list.png
new file mode 100644
index 0000000..a06cdd8
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_dialogwhenlarge_alertdialog_list.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_dialogwhenlarge_alertdialog_multichoice.png b/tests/tests/holo/res/drawable-ldpi/holo_light_dialogwhenlarge_alertdialog_multichoice.png
new file mode 100644
index 0000000..278e9b8
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_dialogwhenlarge_alertdialog_multichoice.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_dialogwhenlarge_alertdialog_onebutton.png b/tests/tests/holo/res/drawable-ldpi/holo_light_dialogwhenlarge_alertdialog_onebutton.png
new file mode 100644
index 0000000..caaec27
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_dialogwhenlarge_alertdialog_onebutton.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_dialogwhenlarge_alertdialog_singlechoice.png b/tests/tests/holo/res/drawable-ldpi/holo_light_dialogwhenlarge_alertdialog_singlechoice.png
new file mode 100644
index 0000000..8be0aa4
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_dialogwhenlarge_alertdialog_singlechoice.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_dialogwhenlarge_alertdialog_threebuttons.png b/tests/tests/holo/res/drawable-ldpi/holo_light_dialogwhenlarge_alertdialog_threebuttons.png
new file mode 100644
index 0000000..7450944
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_dialogwhenlarge_alertdialog_threebuttons.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_dialogwhenlarge_alertdialog_twobuttons.png b/tests/tests/holo/res/drawable-ldpi/holo_light_dialogwhenlarge_alertdialog_twobuttons.png
new file mode 100644
index 0000000..b0eccd5
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_dialogwhenlarge_alertdialog_twobuttons.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_dialogwhenlarge_button.png b/tests/tests/holo/res/drawable-ldpi/holo_light_dialogwhenlarge_button.png
new file mode 100644
index 0000000..054d4e5
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_dialogwhenlarge_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_dialogwhenlarge_button_pressed.png b/tests/tests/holo/res/drawable-ldpi/holo_light_dialogwhenlarge_button_pressed.png
new file mode 100644
index 0000000..a7a0105
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_dialogwhenlarge_button_pressed.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_dialogwhenlarge_calendar_view.png b/tests/tests/holo/res/drawable-ldpi/holo_light_dialogwhenlarge_calendar_view.png
new file mode 100644
index 0000000..16deb8f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_dialogwhenlarge_calendar_view.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_dialogwhenlarge_calendar_view_feb.png b/tests/tests/holo/res/drawable-ldpi/holo_light_dialogwhenlarge_calendar_view_feb.png
new file mode 100644
index 0000000..f27f7d2
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_dialogwhenlarge_calendar_view_feb.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_dialogwhenlarge_checkbox.png b/tests/tests/holo/res/drawable-ldpi/holo_light_dialogwhenlarge_checkbox.png
new file mode 100644
index 0000000..416fc5e
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_dialogwhenlarge_checkbox.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_dialogwhenlarge_checkbox_checked.png b/tests/tests/holo/res/drawable-ldpi/holo_light_dialogwhenlarge_checkbox_checked.png
new file mode 100644
index 0000000..dc38372
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_dialogwhenlarge_checkbox_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_dialogwhenlarge_chronometer.png b/tests/tests/holo/res/drawable-ldpi/holo_light_dialogwhenlarge_chronometer.png
new file mode 100644
index 0000000..dd8eb6d
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_dialogwhenlarge_chronometer.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_dialogwhenlarge_color_blue_bright.png b/tests/tests/holo/res/drawable-ldpi/holo_light_dialogwhenlarge_color_blue_bright.png
new file mode 100644
index 0000000..feaec2c
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_dialogwhenlarge_color_blue_bright.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_dialogwhenlarge_color_blue_dark.png b/tests/tests/holo/res/drawable-ldpi/holo_light_dialogwhenlarge_color_blue_dark.png
new file mode 100644
index 0000000..a8640c1
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_dialogwhenlarge_color_blue_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_dialogwhenlarge_color_blue_light.png b/tests/tests/holo/res/drawable-ldpi/holo_light_dialogwhenlarge_color_blue_light.png
new file mode 100644
index 0000000..ae141af
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_dialogwhenlarge_color_blue_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_dialogwhenlarge_color_green_dark.png b/tests/tests/holo/res/drawable-ldpi/holo_light_dialogwhenlarge_color_green_dark.png
new file mode 100644
index 0000000..0ee2324
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_dialogwhenlarge_color_green_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_dialogwhenlarge_color_green_light.png b/tests/tests/holo/res/drawable-ldpi/holo_light_dialogwhenlarge_color_green_light.png
new file mode 100644
index 0000000..9ca63c5
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_dialogwhenlarge_color_green_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_dialogwhenlarge_color_orange_dark.png b/tests/tests/holo/res/drawable-ldpi/holo_light_dialogwhenlarge_color_orange_dark.png
new file mode 100644
index 0000000..bc06b4f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_dialogwhenlarge_color_orange_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_dialogwhenlarge_color_orange_light.png b/tests/tests/holo/res/drawable-ldpi/holo_light_dialogwhenlarge_color_orange_light.png
new file mode 100644
index 0000000..1495f82
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_dialogwhenlarge_color_orange_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_dialogwhenlarge_color_purple.png b/tests/tests/holo/res/drawable-ldpi/holo_light_dialogwhenlarge_color_purple.png
new file mode 100644
index 0000000..9652f56
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_dialogwhenlarge_color_purple.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_dialogwhenlarge_color_red_dark.png b/tests/tests/holo/res/drawable-ldpi/holo_light_dialogwhenlarge_color_red_dark.png
new file mode 100644
index 0000000..4acebf8
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_dialogwhenlarge_color_red_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_dialogwhenlarge_color_red_light.png b/tests/tests/holo/res/drawable-ldpi/holo_light_dialogwhenlarge_color_red_light.png
new file mode 100644
index 0000000..d5b5742
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_dialogwhenlarge_color_red_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_dialogwhenlarge_edittext.png b/tests/tests/holo/res/drawable-ldpi/holo_light_dialogwhenlarge_edittext.png
new file mode 100644
index 0000000..c65471f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_dialogwhenlarge_edittext.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_dialogwhenlarge_noactionbar_alertdialog_list.png b/tests/tests/holo/res/drawable-ldpi/holo_light_dialogwhenlarge_noactionbar_alertdialog_list.png
new file mode 100644
index 0000000..a06cdd8
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_dialogwhenlarge_noactionbar_alertdialog_list.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_dialogwhenlarge_noactionbar_alertdialog_multichoice.png b/tests/tests/holo/res/drawable-ldpi/holo_light_dialogwhenlarge_noactionbar_alertdialog_multichoice.png
new file mode 100644
index 0000000..278e9b8
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_dialogwhenlarge_noactionbar_alertdialog_multichoice.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_dialogwhenlarge_noactionbar_alertdialog_onebutton.png b/tests/tests/holo/res/drawable-ldpi/holo_light_dialogwhenlarge_noactionbar_alertdialog_onebutton.png
new file mode 100644
index 0000000..caaec27
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_dialogwhenlarge_noactionbar_alertdialog_onebutton.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_dialogwhenlarge_noactionbar_alertdialog_singlechoice.png b/tests/tests/holo/res/drawable-ldpi/holo_light_dialogwhenlarge_noactionbar_alertdialog_singlechoice.png
new file mode 100644
index 0000000..8be0aa4
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_dialogwhenlarge_noactionbar_alertdialog_singlechoice.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_dialogwhenlarge_noactionbar_alertdialog_threebuttons.png b/tests/tests/holo/res/drawable-ldpi/holo_light_dialogwhenlarge_noactionbar_alertdialog_threebuttons.png
new file mode 100644
index 0000000..7450944
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_dialogwhenlarge_noactionbar_alertdialog_threebuttons.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_dialogwhenlarge_noactionbar_alertdialog_twobuttons.png b/tests/tests/holo/res/drawable-ldpi/holo_light_dialogwhenlarge_noactionbar_alertdialog_twobuttons.png
new file mode 100644
index 0000000..b0eccd5
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_dialogwhenlarge_noactionbar_alertdialog_twobuttons.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_dialogwhenlarge_noactionbar_button.png b/tests/tests/holo/res/drawable-ldpi/holo_light_dialogwhenlarge_noactionbar_button.png
new file mode 100644
index 0000000..054d4e5
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_dialogwhenlarge_noactionbar_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_dialogwhenlarge_noactionbar_button_pressed.png b/tests/tests/holo/res/drawable-ldpi/holo_light_dialogwhenlarge_noactionbar_button_pressed.png
new file mode 100644
index 0000000..a7a0105
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_dialogwhenlarge_noactionbar_button_pressed.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_dialogwhenlarge_noactionbar_calendar_view.png b/tests/tests/holo/res/drawable-ldpi/holo_light_dialogwhenlarge_noactionbar_calendar_view.png
new file mode 100644
index 0000000..16deb8f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_dialogwhenlarge_noactionbar_calendar_view.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_dialogwhenlarge_noactionbar_calendar_view_feb.png b/tests/tests/holo/res/drawable-ldpi/holo_light_dialogwhenlarge_noactionbar_calendar_view_feb.png
new file mode 100644
index 0000000..f27f7d2
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_dialogwhenlarge_noactionbar_calendar_view_feb.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_dialogwhenlarge_noactionbar_checkbox.png b/tests/tests/holo/res/drawable-ldpi/holo_light_dialogwhenlarge_noactionbar_checkbox.png
new file mode 100644
index 0000000..416fc5e
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_dialogwhenlarge_noactionbar_checkbox.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_dialogwhenlarge_noactionbar_checkbox_checked.png b/tests/tests/holo/res/drawable-ldpi/holo_light_dialogwhenlarge_noactionbar_checkbox_checked.png
new file mode 100644
index 0000000..dc38372
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_dialogwhenlarge_noactionbar_checkbox_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_dialogwhenlarge_noactionbar_chronometer.png b/tests/tests/holo/res/drawable-ldpi/holo_light_dialogwhenlarge_noactionbar_chronometer.png
new file mode 100644
index 0000000..dd8eb6d
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_dialogwhenlarge_noactionbar_chronometer.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_dialogwhenlarge_noactionbar_color_blue_bright.png b/tests/tests/holo/res/drawable-ldpi/holo_light_dialogwhenlarge_noactionbar_color_blue_bright.png
new file mode 100644
index 0000000..feaec2c
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_dialogwhenlarge_noactionbar_color_blue_bright.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_dialogwhenlarge_noactionbar_color_blue_dark.png b/tests/tests/holo/res/drawable-ldpi/holo_light_dialogwhenlarge_noactionbar_color_blue_dark.png
new file mode 100644
index 0000000..a8640c1
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_dialogwhenlarge_noactionbar_color_blue_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_dialogwhenlarge_noactionbar_color_blue_light.png b/tests/tests/holo/res/drawable-ldpi/holo_light_dialogwhenlarge_noactionbar_color_blue_light.png
new file mode 100644
index 0000000..ae141af
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_dialogwhenlarge_noactionbar_color_blue_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_dialogwhenlarge_noactionbar_color_green_dark.png b/tests/tests/holo/res/drawable-ldpi/holo_light_dialogwhenlarge_noactionbar_color_green_dark.png
new file mode 100644
index 0000000..0ee2324
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_dialogwhenlarge_noactionbar_color_green_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_dialogwhenlarge_noactionbar_color_green_light.png b/tests/tests/holo/res/drawable-ldpi/holo_light_dialogwhenlarge_noactionbar_color_green_light.png
new file mode 100644
index 0000000..9ca63c5
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_dialogwhenlarge_noactionbar_color_green_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_dialogwhenlarge_noactionbar_color_orange_dark.png b/tests/tests/holo/res/drawable-ldpi/holo_light_dialogwhenlarge_noactionbar_color_orange_dark.png
new file mode 100644
index 0000000..bc06b4f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_dialogwhenlarge_noactionbar_color_orange_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_dialogwhenlarge_noactionbar_color_orange_light.png b/tests/tests/holo/res/drawable-ldpi/holo_light_dialogwhenlarge_noactionbar_color_orange_light.png
new file mode 100644
index 0000000..1495f82
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_dialogwhenlarge_noactionbar_color_orange_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_dialogwhenlarge_noactionbar_color_purple.png b/tests/tests/holo/res/drawable-ldpi/holo_light_dialogwhenlarge_noactionbar_color_purple.png
new file mode 100644
index 0000000..9652f56
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_dialogwhenlarge_noactionbar_color_purple.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_dialogwhenlarge_noactionbar_color_red_dark.png b/tests/tests/holo/res/drawable-ldpi/holo_light_dialogwhenlarge_noactionbar_color_red_dark.png
new file mode 100644
index 0000000..4acebf8
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_dialogwhenlarge_noactionbar_color_red_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_dialogwhenlarge_noactionbar_color_red_light.png b/tests/tests/holo/res/drawable-ldpi/holo_light_dialogwhenlarge_noactionbar_color_red_light.png
new file mode 100644
index 0000000..d5b5742
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_dialogwhenlarge_noactionbar_color_red_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_dialogwhenlarge_noactionbar_edittext.png b/tests/tests/holo/res/drawable-ldpi/holo_light_dialogwhenlarge_noactionbar_edittext.png
new file mode 100644
index 0000000..c65471f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_dialogwhenlarge_noactionbar_edittext.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_dialogwhenlarge_noactionbar_progressbar.png b/tests/tests/holo/res/drawable-ldpi/holo_light_dialogwhenlarge_noactionbar_progressbar.png
new file mode 100644
index 0000000..06fec8f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_dialogwhenlarge_noactionbar_progressbar.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_dialogwhenlarge_noactionbar_progressbar_horizontal_0.png b/tests/tests/holo/res/drawable-ldpi/holo_light_dialogwhenlarge_noactionbar_progressbar_horizontal_0.png
new file mode 100644
index 0000000..c89e5f2
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_dialogwhenlarge_noactionbar_progressbar_horizontal_0.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_dialogwhenlarge_noactionbar_progressbar_horizontal_100.png b/tests/tests/holo/res/drawable-ldpi/holo_light_dialogwhenlarge_noactionbar_progressbar_horizontal_100.png
new file mode 100644
index 0000000..0abda21
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_dialogwhenlarge_noactionbar_progressbar_horizontal_100.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_dialogwhenlarge_noactionbar_progressbar_horizontal_50.png b/tests/tests/holo/res/drawable-ldpi/holo_light_dialogwhenlarge_noactionbar_progressbar_horizontal_50.png
new file mode 100644
index 0000000..b33950b
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_dialogwhenlarge_noactionbar_progressbar_horizontal_50.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_dialogwhenlarge_noactionbar_progressbar_large.png b/tests/tests/holo/res/drawable-ldpi/holo_light_dialogwhenlarge_noactionbar_progressbar_large.png
new file mode 100644
index 0000000..fe29e1d
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_dialogwhenlarge_noactionbar_progressbar_large.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_dialogwhenlarge_noactionbar_progressbar_small.png b/tests/tests/holo/res/drawable-ldpi/holo_light_dialogwhenlarge_noactionbar_progressbar_small.png
new file mode 100644
index 0000000..28c0a40
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_dialogwhenlarge_noactionbar_progressbar_small.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_dialogwhenlarge_noactionbar_progressdialog_horizontal.png b/tests/tests/holo/res/drawable-ldpi/holo_light_dialogwhenlarge_noactionbar_progressdialog_horizontal.png
new file mode 100644
index 0000000..01b7a98
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_dialogwhenlarge_noactionbar_progressdialog_horizontal.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_dialogwhenlarge_noactionbar_radio_button.png b/tests/tests/holo/res/drawable-ldpi/holo_light_dialogwhenlarge_noactionbar_radio_button.png
new file mode 100644
index 0000000..b9c52f4
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_dialogwhenlarge_noactionbar_radio_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_dialogwhenlarge_noactionbar_radio_button_checked.png b/tests/tests/holo/res/drawable-ldpi/holo_light_dialogwhenlarge_noactionbar_radio_button_checked.png
new file mode 100644
index 0000000..5acf60f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_dialogwhenlarge_noactionbar_radio_button_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_dialogwhenlarge_noactionbar_radiogroup_horizontal.png b/tests/tests/holo/res/drawable-ldpi/holo_light_dialogwhenlarge_noactionbar_radiogroup_horizontal.png
new file mode 100644
index 0000000..10af193
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_dialogwhenlarge_noactionbar_radiogroup_horizontal.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_dialogwhenlarge_noactionbar_radiogroup_vertical.png b/tests/tests/holo/res/drawable-ldpi/holo_light_dialogwhenlarge_noactionbar_radiogroup_vertical.png
new file mode 100644
index 0000000..ec7dd84
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_dialogwhenlarge_noactionbar_radiogroup_vertical.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_dialogwhenlarge_noactionbar_ratingbar_0.png b/tests/tests/holo/res/drawable-ldpi/holo_light_dialogwhenlarge_noactionbar_ratingbar_0.png
new file mode 100644
index 0000000..2f1a8a0
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_dialogwhenlarge_noactionbar_ratingbar_0.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_dialogwhenlarge_noactionbar_ratingbar_0_pressed.png b/tests/tests/holo/res/drawable-ldpi/holo_light_dialogwhenlarge_noactionbar_ratingbar_0_pressed.png
new file mode 100644
index 0000000..47c7851
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_dialogwhenlarge_noactionbar_ratingbar_0_pressed.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_dialogwhenlarge_noactionbar_ratingbar_2point5.png b/tests/tests/holo/res/drawable-ldpi/holo_light_dialogwhenlarge_noactionbar_ratingbar_2point5.png
new file mode 100644
index 0000000..e35abf9
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_dialogwhenlarge_noactionbar_ratingbar_2point5.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_dialogwhenlarge_noactionbar_ratingbar_2point5_pressed.png b/tests/tests/holo/res/drawable-ldpi/holo_light_dialogwhenlarge_noactionbar_ratingbar_2point5_pressed.png
new file mode 100644
index 0000000..a9d7fd4
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_dialogwhenlarge_noactionbar_ratingbar_2point5_pressed.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_dialogwhenlarge_noactionbar_ratingbar_5.png b/tests/tests/holo/res/drawable-ldpi/holo_light_dialogwhenlarge_noactionbar_ratingbar_5.png
new file mode 100644
index 0000000..23afb05
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_dialogwhenlarge_noactionbar_ratingbar_5.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_dialogwhenlarge_noactionbar_ratingbar_5_pressed.png b/tests/tests/holo/res/drawable-ldpi/holo_light_dialogwhenlarge_noactionbar_ratingbar_5_pressed.png
new file mode 100644
index 0000000..1747219
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_dialogwhenlarge_noactionbar_ratingbar_5_pressed.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_dialogwhenlarge_noactionbar_searchview.png b/tests/tests/holo/res/drawable-ldpi/holo_light_dialogwhenlarge_noactionbar_searchview.png
new file mode 100644
index 0000000..e5feeb8
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_dialogwhenlarge_noactionbar_searchview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_dialogwhenlarge_noactionbar_searchview_query.png b/tests/tests/holo/res/drawable-ldpi/holo_light_dialogwhenlarge_noactionbar_searchview_query.png
new file mode 100644
index 0000000..89a4ef9
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_dialogwhenlarge_noactionbar_searchview_query.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_dialogwhenlarge_noactionbar_searchview_query_hint.png b/tests/tests/holo/res/drawable-ldpi/holo_light_dialogwhenlarge_noactionbar_searchview_query_hint.png
new file mode 100644
index 0000000..d6121ce
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_dialogwhenlarge_noactionbar_searchview_query_hint.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_dialogwhenlarge_noactionbar_seekbar_0.png b/tests/tests/holo/res/drawable-ldpi/holo_light_dialogwhenlarge_noactionbar_seekbar_0.png
new file mode 100644
index 0000000..b79d8de
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_dialogwhenlarge_noactionbar_seekbar_0.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_dialogwhenlarge_noactionbar_seekbar_100.png b/tests/tests/holo/res/drawable-ldpi/holo_light_dialogwhenlarge_noactionbar_seekbar_100.png
new file mode 100644
index 0000000..8e53289
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_dialogwhenlarge_noactionbar_seekbar_100.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_dialogwhenlarge_noactionbar_seekbar_50.png b/tests/tests/holo/res/drawable-ldpi/holo_light_dialogwhenlarge_noactionbar_seekbar_50.png
new file mode 100644
index 0000000..3b7343f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_dialogwhenlarge_noactionbar_seekbar_50.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_dialogwhenlarge_noactionbar_spinner.png b/tests/tests/holo/res/drawable-ldpi/holo_light_dialogwhenlarge_noactionbar_spinner.png
new file mode 100644
index 0000000..9cf08d4
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_dialogwhenlarge_noactionbar_spinner.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_dialogwhenlarge_noactionbar_switch.png b/tests/tests/holo/res/drawable-ldpi/holo_light_dialogwhenlarge_noactionbar_switch.png
new file mode 100644
index 0000000..0bd5809
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_dialogwhenlarge_noactionbar_switch.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_dialogwhenlarge_noactionbar_switch_checked.png b/tests/tests/holo/res/drawable-ldpi/holo_light_dialogwhenlarge_noactionbar_switch_checked.png
new file mode 100644
index 0000000..8404698
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_dialogwhenlarge_noactionbar_switch_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_dialogwhenlarge_noactionbar_tabhost.png b/tests/tests/holo/res/drawable-ldpi/holo_light_dialogwhenlarge_noactionbar_tabhost.png
new file mode 100644
index 0000000..61687f6
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_dialogwhenlarge_noactionbar_tabhost.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_dialogwhenlarge_noactionbar_textview.png b/tests/tests/holo/res/drawable-ldpi/holo_light_dialogwhenlarge_noactionbar_textview.png
new file mode 100644
index 0000000..5941143
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_dialogwhenlarge_noactionbar_textview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_dialogwhenlarge_noactionbar_timepicker.png b/tests/tests/holo/res/drawable-ldpi/holo_light_dialogwhenlarge_noactionbar_timepicker.png
new file mode 100644
index 0000000..16bedde
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_dialogwhenlarge_noactionbar_timepicker.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_dialogwhenlarge_noactionbar_toggle_button.png b/tests/tests/holo/res/drawable-ldpi/holo_light_dialogwhenlarge_noactionbar_toggle_button.png
new file mode 100644
index 0000000..71d5967
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_dialogwhenlarge_noactionbar_toggle_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_dialogwhenlarge_noactionbar_toggle_button_checked.png b/tests/tests/holo/res/drawable-ldpi/holo_light_dialogwhenlarge_noactionbar_toggle_button_checked.png
new file mode 100644
index 0000000..6448695
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_dialogwhenlarge_noactionbar_toggle_button_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_dialogwhenlarge_noactionbar_zoomcontrols.png b/tests/tests/holo/res/drawable-ldpi/holo_light_dialogwhenlarge_noactionbar_zoomcontrols.png
new file mode 100644
index 0000000..ab090a6
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_dialogwhenlarge_noactionbar_zoomcontrols.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_dialogwhenlarge_progressbar.png b/tests/tests/holo/res/drawable-ldpi/holo_light_dialogwhenlarge_progressbar.png
new file mode 100644
index 0000000..06fec8f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_dialogwhenlarge_progressbar.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_dialogwhenlarge_progressbar_horizontal_0.png b/tests/tests/holo/res/drawable-ldpi/holo_light_dialogwhenlarge_progressbar_horizontal_0.png
new file mode 100644
index 0000000..c89e5f2
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_dialogwhenlarge_progressbar_horizontal_0.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_dialogwhenlarge_progressbar_horizontal_100.png b/tests/tests/holo/res/drawable-ldpi/holo_light_dialogwhenlarge_progressbar_horizontal_100.png
new file mode 100644
index 0000000..0abda21
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_dialogwhenlarge_progressbar_horizontal_100.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_dialogwhenlarge_progressbar_horizontal_50.png b/tests/tests/holo/res/drawable-ldpi/holo_light_dialogwhenlarge_progressbar_horizontal_50.png
new file mode 100644
index 0000000..b33950b
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_dialogwhenlarge_progressbar_horizontal_50.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_dialogwhenlarge_progressbar_large.png b/tests/tests/holo/res/drawable-ldpi/holo_light_dialogwhenlarge_progressbar_large.png
new file mode 100644
index 0000000..fe29e1d
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_dialogwhenlarge_progressbar_large.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_dialogwhenlarge_progressbar_small.png b/tests/tests/holo/res/drawable-ldpi/holo_light_dialogwhenlarge_progressbar_small.png
new file mode 100644
index 0000000..28c0a40
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_dialogwhenlarge_progressbar_small.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_dialogwhenlarge_progressdialog_horizontal.png b/tests/tests/holo/res/drawable-ldpi/holo_light_dialogwhenlarge_progressdialog_horizontal.png
new file mode 100644
index 0000000..01b7a98
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_dialogwhenlarge_progressdialog_horizontal.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_dialogwhenlarge_radio_button.png b/tests/tests/holo/res/drawable-ldpi/holo_light_dialogwhenlarge_radio_button.png
new file mode 100644
index 0000000..b9c52f4
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_dialogwhenlarge_radio_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_dialogwhenlarge_radio_button_checked.png b/tests/tests/holo/res/drawable-ldpi/holo_light_dialogwhenlarge_radio_button_checked.png
new file mode 100644
index 0000000..5acf60f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_dialogwhenlarge_radio_button_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_dialogwhenlarge_radiogroup_horizontal.png b/tests/tests/holo/res/drawable-ldpi/holo_light_dialogwhenlarge_radiogroup_horizontal.png
new file mode 100644
index 0000000..10af193
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_dialogwhenlarge_radiogroup_horizontal.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_dialogwhenlarge_radiogroup_vertical.png b/tests/tests/holo/res/drawable-ldpi/holo_light_dialogwhenlarge_radiogroup_vertical.png
new file mode 100644
index 0000000..ec7dd84
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_dialogwhenlarge_radiogroup_vertical.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_dialogwhenlarge_ratingbar_0.png b/tests/tests/holo/res/drawable-ldpi/holo_light_dialogwhenlarge_ratingbar_0.png
new file mode 100644
index 0000000..2f1a8a0
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_dialogwhenlarge_ratingbar_0.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_dialogwhenlarge_ratingbar_0_pressed.png b/tests/tests/holo/res/drawable-ldpi/holo_light_dialogwhenlarge_ratingbar_0_pressed.png
new file mode 100644
index 0000000..47c7851
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_dialogwhenlarge_ratingbar_0_pressed.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_dialogwhenlarge_ratingbar_2point5.png b/tests/tests/holo/res/drawable-ldpi/holo_light_dialogwhenlarge_ratingbar_2point5.png
new file mode 100644
index 0000000..e35abf9
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_dialogwhenlarge_ratingbar_2point5.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_dialogwhenlarge_ratingbar_2point5_pressed.png b/tests/tests/holo/res/drawable-ldpi/holo_light_dialogwhenlarge_ratingbar_2point5_pressed.png
new file mode 100644
index 0000000..a9d7fd4
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_dialogwhenlarge_ratingbar_2point5_pressed.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_dialogwhenlarge_ratingbar_5.png b/tests/tests/holo/res/drawable-ldpi/holo_light_dialogwhenlarge_ratingbar_5.png
new file mode 100644
index 0000000..23afb05
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_dialogwhenlarge_ratingbar_5.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_dialogwhenlarge_ratingbar_5_pressed.png b/tests/tests/holo/res/drawable-ldpi/holo_light_dialogwhenlarge_ratingbar_5_pressed.png
new file mode 100644
index 0000000..1747219
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_dialogwhenlarge_ratingbar_5_pressed.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_dialogwhenlarge_searchview.png b/tests/tests/holo/res/drawable-ldpi/holo_light_dialogwhenlarge_searchview.png
new file mode 100644
index 0000000..e5feeb8
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_dialogwhenlarge_searchview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_dialogwhenlarge_searchview_query.png b/tests/tests/holo/res/drawable-ldpi/holo_light_dialogwhenlarge_searchview_query.png
new file mode 100644
index 0000000..89a4ef9
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_dialogwhenlarge_searchview_query.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_dialogwhenlarge_searchview_query_hint.png b/tests/tests/holo/res/drawable-ldpi/holo_light_dialogwhenlarge_searchview_query_hint.png
new file mode 100644
index 0000000..d6121ce
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_dialogwhenlarge_searchview_query_hint.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_dialogwhenlarge_seekbar_0.png b/tests/tests/holo/res/drawable-ldpi/holo_light_dialogwhenlarge_seekbar_0.png
new file mode 100644
index 0000000..b79d8de
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_dialogwhenlarge_seekbar_0.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_dialogwhenlarge_seekbar_100.png b/tests/tests/holo/res/drawable-ldpi/holo_light_dialogwhenlarge_seekbar_100.png
new file mode 100644
index 0000000..8e53289
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_dialogwhenlarge_seekbar_100.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_dialogwhenlarge_seekbar_50.png b/tests/tests/holo/res/drawable-ldpi/holo_light_dialogwhenlarge_seekbar_50.png
new file mode 100644
index 0000000..3b7343f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_dialogwhenlarge_seekbar_50.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_dialogwhenlarge_spinner.png b/tests/tests/holo/res/drawable-ldpi/holo_light_dialogwhenlarge_spinner.png
new file mode 100644
index 0000000..9cf08d4
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_dialogwhenlarge_spinner.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_dialogwhenlarge_switch.png b/tests/tests/holo/res/drawable-ldpi/holo_light_dialogwhenlarge_switch.png
new file mode 100644
index 0000000..0bd5809
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_dialogwhenlarge_switch.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_dialogwhenlarge_switch_checked.png b/tests/tests/holo/res/drawable-ldpi/holo_light_dialogwhenlarge_switch_checked.png
new file mode 100644
index 0000000..8404698
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_dialogwhenlarge_switch_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_dialogwhenlarge_tabhost.png b/tests/tests/holo/res/drawable-ldpi/holo_light_dialogwhenlarge_tabhost.png
new file mode 100644
index 0000000..61687f6
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_dialogwhenlarge_tabhost.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_dialogwhenlarge_textview.png b/tests/tests/holo/res/drawable-ldpi/holo_light_dialogwhenlarge_textview.png
new file mode 100644
index 0000000..5941143
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_dialogwhenlarge_textview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_dialogwhenlarge_timepicker.png b/tests/tests/holo/res/drawable-ldpi/holo_light_dialogwhenlarge_timepicker.png
new file mode 100644
index 0000000..16bedde
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_dialogwhenlarge_timepicker.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_dialogwhenlarge_toggle_button.png b/tests/tests/holo/res/drawable-ldpi/holo_light_dialogwhenlarge_toggle_button.png
new file mode 100644
index 0000000..71d5967
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_dialogwhenlarge_toggle_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_dialogwhenlarge_toggle_button_checked.png b/tests/tests/holo/res/drawable-ldpi/holo_light_dialogwhenlarge_toggle_button_checked.png
new file mode 100644
index 0000000..6448695
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_dialogwhenlarge_toggle_button_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_dialogwhenlarge_zoomcontrols.png b/tests/tests/holo/res/drawable-ldpi/holo_light_dialogwhenlarge_zoomcontrols.png
new file mode 100644
index 0000000..ab090a6
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_dialogwhenlarge_zoomcontrols.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_edittext.png b/tests/tests/holo/res/drawable-ldpi/holo_light_edittext.png
new file mode 100644
index 0000000..c65471f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_edittext.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_noactionbar_alertdialog_list.png b/tests/tests/holo/res/drawable-ldpi/holo_light_noactionbar_alertdialog_list.png
new file mode 100644
index 0000000..a06cdd8
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_noactionbar_alertdialog_list.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_noactionbar_alertdialog_multichoice.png b/tests/tests/holo/res/drawable-ldpi/holo_light_noactionbar_alertdialog_multichoice.png
new file mode 100644
index 0000000..278e9b8
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_noactionbar_alertdialog_multichoice.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_noactionbar_alertdialog_onebutton.png b/tests/tests/holo/res/drawable-ldpi/holo_light_noactionbar_alertdialog_onebutton.png
new file mode 100644
index 0000000..caaec27
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_noactionbar_alertdialog_onebutton.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_noactionbar_alertdialog_singlechoice.png b/tests/tests/holo/res/drawable-ldpi/holo_light_noactionbar_alertdialog_singlechoice.png
new file mode 100644
index 0000000..8be0aa4
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_noactionbar_alertdialog_singlechoice.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_noactionbar_alertdialog_threebuttons.png b/tests/tests/holo/res/drawable-ldpi/holo_light_noactionbar_alertdialog_threebuttons.png
new file mode 100644
index 0000000..7450944
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_noactionbar_alertdialog_threebuttons.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_noactionbar_alertdialog_twobuttons.png b/tests/tests/holo/res/drawable-ldpi/holo_light_noactionbar_alertdialog_twobuttons.png
new file mode 100644
index 0000000..b0eccd5
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_noactionbar_alertdialog_twobuttons.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_noactionbar_button.png b/tests/tests/holo/res/drawable-ldpi/holo_light_noactionbar_button.png
new file mode 100644
index 0000000..054d4e5
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_noactionbar_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_noactionbar_button_pressed.png b/tests/tests/holo/res/drawable-ldpi/holo_light_noactionbar_button_pressed.png
new file mode 100644
index 0000000..a7a0105
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_noactionbar_button_pressed.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_noactionbar_calendar_view.png b/tests/tests/holo/res/drawable-ldpi/holo_light_noactionbar_calendar_view.png
new file mode 100644
index 0000000..16deb8f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_noactionbar_calendar_view.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_noactionbar_calendar_view_feb.png b/tests/tests/holo/res/drawable-ldpi/holo_light_noactionbar_calendar_view_feb.png
new file mode 100644
index 0000000..f27f7d2
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_noactionbar_calendar_view_feb.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_noactionbar_checkbox.png b/tests/tests/holo/res/drawable-ldpi/holo_light_noactionbar_checkbox.png
new file mode 100644
index 0000000..416fc5e
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_noactionbar_checkbox.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_noactionbar_checkbox_checked.png b/tests/tests/holo/res/drawable-ldpi/holo_light_noactionbar_checkbox_checked.png
new file mode 100644
index 0000000..dc38372
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_noactionbar_checkbox_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_noactionbar_chronometer.png b/tests/tests/holo/res/drawable-ldpi/holo_light_noactionbar_chronometer.png
new file mode 100644
index 0000000..dd8eb6d
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_noactionbar_chronometer.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_noactionbar_color_blue_bright.png b/tests/tests/holo/res/drawable-ldpi/holo_light_noactionbar_color_blue_bright.png
new file mode 100644
index 0000000..feaec2c
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_noactionbar_color_blue_bright.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_noactionbar_color_blue_dark.png b/tests/tests/holo/res/drawable-ldpi/holo_light_noactionbar_color_blue_dark.png
new file mode 100644
index 0000000..a8640c1
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_noactionbar_color_blue_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_noactionbar_color_blue_light.png b/tests/tests/holo/res/drawable-ldpi/holo_light_noactionbar_color_blue_light.png
new file mode 100644
index 0000000..ae141af
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_noactionbar_color_blue_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_noactionbar_color_green_dark.png b/tests/tests/holo/res/drawable-ldpi/holo_light_noactionbar_color_green_dark.png
new file mode 100644
index 0000000..0ee2324
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_noactionbar_color_green_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_noactionbar_color_green_light.png b/tests/tests/holo/res/drawable-ldpi/holo_light_noactionbar_color_green_light.png
new file mode 100644
index 0000000..9ca63c5
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_noactionbar_color_green_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_noactionbar_color_orange_dark.png b/tests/tests/holo/res/drawable-ldpi/holo_light_noactionbar_color_orange_dark.png
new file mode 100644
index 0000000..bc06b4f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_noactionbar_color_orange_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_noactionbar_color_orange_light.png b/tests/tests/holo/res/drawable-ldpi/holo_light_noactionbar_color_orange_light.png
new file mode 100644
index 0000000..1495f82
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_noactionbar_color_orange_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_noactionbar_color_purple.png b/tests/tests/holo/res/drawable-ldpi/holo_light_noactionbar_color_purple.png
new file mode 100644
index 0000000..9652f56
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_noactionbar_color_purple.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_noactionbar_color_red_dark.png b/tests/tests/holo/res/drawable-ldpi/holo_light_noactionbar_color_red_dark.png
new file mode 100644
index 0000000..4acebf8
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_noactionbar_color_red_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_noactionbar_color_red_light.png b/tests/tests/holo/res/drawable-ldpi/holo_light_noactionbar_color_red_light.png
new file mode 100644
index 0000000..d5b5742
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_noactionbar_color_red_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_noactionbar_edittext.png b/tests/tests/holo/res/drawable-ldpi/holo_light_noactionbar_edittext.png
new file mode 100644
index 0000000..c65471f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_noactionbar_edittext.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_noactionbar_fullscreen_alertdialog_list.png b/tests/tests/holo/res/drawable-ldpi/holo_light_noactionbar_fullscreen_alertdialog_list.png
new file mode 100644
index 0000000..a06cdd8
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_noactionbar_fullscreen_alertdialog_list.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_noactionbar_fullscreen_alertdialog_multichoice.png b/tests/tests/holo/res/drawable-ldpi/holo_light_noactionbar_fullscreen_alertdialog_multichoice.png
new file mode 100644
index 0000000..278e9b8
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_noactionbar_fullscreen_alertdialog_multichoice.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_noactionbar_fullscreen_alertdialog_onebutton.png b/tests/tests/holo/res/drawable-ldpi/holo_light_noactionbar_fullscreen_alertdialog_onebutton.png
new file mode 100644
index 0000000..caaec27
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_noactionbar_fullscreen_alertdialog_onebutton.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_noactionbar_fullscreen_alertdialog_singlechoice.png b/tests/tests/holo/res/drawable-ldpi/holo_light_noactionbar_fullscreen_alertdialog_singlechoice.png
new file mode 100644
index 0000000..8be0aa4
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_noactionbar_fullscreen_alertdialog_singlechoice.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_noactionbar_fullscreen_alertdialog_threebuttons.png b/tests/tests/holo/res/drawable-ldpi/holo_light_noactionbar_fullscreen_alertdialog_threebuttons.png
new file mode 100644
index 0000000..7450944
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_noactionbar_fullscreen_alertdialog_threebuttons.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_noactionbar_fullscreen_alertdialog_twobuttons.png b/tests/tests/holo/res/drawable-ldpi/holo_light_noactionbar_fullscreen_alertdialog_twobuttons.png
new file mode 100644
index 0000000..b0eccd5
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_noactionbar_fullscreen_alertdialog_twobuttons.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_noactionbar_fullscreen_button.png b/tests/tests/holo/res/drawable-ldpi/holo_light_noactionbar_fullscreen_button.png
new file mode 100644
index 0000000..054d4e5
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_noactionbar_fullscreen_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_noactionbar_fullscreen_button_pressed.png b/tests/tests/holo/res/drawable-ldpi/holo_light_noactionbar_fullscreen_button_pressed.png
new file mode 100644
index 0000000..a7a0105
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_noactionbar_fullscreen_button_pressed.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_noactionbar_fullscreen_calendar_view.png b/tests/tests/holo/res/drawable-ldpi/holo_light_noactionbar_fullscreen_calendar_view.png
new file mode 100644
index 0000000..16deb8f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_noactionbar_fullscreen_calendar_view.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_noactionbar_fullscreen_calendar_view_feb.png b/tests/tests/holo/res/drawable-ldpi/holo_light_noactionbar_fullscreen_calendar_view_feb.png
new file mode 100644
index 0000000..f27f7d2
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_noactionbar_fullscreen_calendar_view_feb.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_noactionbar_fullscreen_checkbox.png b/tests/tests/holo/res/drawable-ldpi/holo_light_noactionbar_fullscreen_checkbox.png
new file mode 100644
index 0000000..416fc5e
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_noactionbar_fullscreen_checkbox.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_noactionbar_fullscreen_checkbox_checked.png b/tests/tests/holo/res/drawable-ldpi/holo_light_noactionbar_fullscreen_checkbox_checked.png
new file mode 100644
index 0000000..dc38372
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_noactionbar_fullscreen_checkbox_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_noactionbar_fullscreen_chronometer.png b/tests/tests/holo/res/drawable-ldpi/holo_light_noactionbar_fullscreen_chronometer.png
new file mode 100644
index 0000000..dd8eb6d
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_noactionbar_fullscreen_chronometer.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_noactionbar_fullscreen_color_blue_bright.png b/tests/tests/holo/res/drawable-ldpi/holo_light_noactionbar_fullscreen_color_blue_bright.png
new file mode 100644
index 0000000..feaec2c
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_noactionbar_fullscreen_color_blue_bright.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_noactionbar_fullscreen_color_blue_dark.png b/tests/tests/holo/res/drawable-ldpi/holo_light_noactionbar_fullscreen_color_blue_dark.png
new file mode 100644
index 0000000..a8640c1
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_noactionbar_fullscreen_color_blue_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_noactionbar_fullscreen_color_blue_light.png b/tests/tests/holo/res/drawable-ldpi/holo_light_noactionbar_fullscreen_color_blue_light.png
new file mode 100644
index 0000000..ae141af
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_noactionbar_fullscreen_color_blue_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_noactionbar_fullscreen_color_green_dark.png b/tests/tests/holo/res/drawable-ldpi/holo_light_noactionbar_fullscreen_color_green_dark.png
new file mode 100644
index 0000000..0ee2324
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_noactionbar_fullscreen_color_green_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_noactionbar_fullscreen_color_green_light.png b/tests/tests/holo/res/drawable-ldpi/holo_light_noactionbar_fullscreen_color_green_light.png
new file mode 100644
index 0000000..9ca63c5
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_noactionbar_fullscreen_color_green_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_noactionbar_fullscreen_color_orange_dark.png b/tests/tests/holo/res/drawable-ldpi/holo_light_noactionbar_fullscreen_color_orange_dark.png
new file mode 100644
index 0000000..bc06b4f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_noactionbar_fullscreen_color_orange_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_noactionbar_fullscreen_color_orange_light.png b/tests/tests/holo/res/drawable-ldpi/holo_light_noactionbar_fullscreen_color_orange_light.png
new file mode 100644
index 0000000..1495f82
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_noactionbar_fullscreen_color_orange_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_noactionbar_fullscreen_color_purple.png b/tests/tests/holo/res/drawable-ldpi/holo_light_noactionbar_fullscreen_color_purple.png
new file mode 100644
index 0000000..9652f56
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_noactionbar_fullscreen_color_purple.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_noactionbar_fullscreen_color_red_dark.png b/tests/tests/holo/res/drawable-ldpi/holo_light_noactionbar_fullscreen_color_red_dark.png
new file mode 100644
index 0000000..4acebf8
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_noactionbar_fullscreen_color_red_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_noactionbar_fullscreen_color_red_light.png b/tests/tests/holo/res/drawable-ldpi/holo_light_noactionbar_fullscreen_color_red_light.png
new file mode 100644
index 0000000..d5b5742
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_noactionbar_fullscreen_color_red_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_noactionbar_fullscreen_edittext.png b/tests/tests/holo/res/drawable-ldpi/holo_light_noactionbar_fullscreen_edittext.png
new file mode 100644
index 0000000..c65471f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_noactionbar_fullscreen_edittext.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_noactionbar_fullscreen_progressbar.png b/tests/tests/holo/res/drawable-ldpi/holo_light_noactionbar_fullscreen_progressbar.png
new file mode 100644
index 0000000..06fec8f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_noactionbar_fullscreen_progressbar.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_noactionbar_fullscreen_progressbar_horizontal_0.png b/tests/tests/holo/res/drawable-ldpi/holo_light_noactionbar_fullscreen_progressbar_horizontal_0.png
new file mode 100644
index 0000000..c89e5f2
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_noactionbar_fullscreen_progressbar_horizontal_0.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_noactionbar_fullscreen_progressbar_horizontal_100.png b/tests/tests/holo/res/drawable-ldpi/holo_light_noactionbar_fullscreen_progressbar_horizontal_100.png
new file mode 100644
index 0000000..0abda21
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_noactionbar_fullscreen_progressbar_horizontal_100.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_noactionbar_fullscreen_progressbar_horizontal_50.png b/tests/tests/holo/res/drawable-ldpi/holo_light_noactionbar_fullscreen_progressbar_horizontal_50.png
new file mode 100644
index 0000000..b33950b
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_noactionbar_fullscreen_progressbar_horizontal_50.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_noactionbar_fullscreen_progressbar_large.png b/tests/tests/holo/res/drawable-ldpi/holo_light_noactionbar_fullscreen_progressbar_large.png
new file mode 100644
index 0000000..fe29e1d
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_noactionbar_fullscreen_progressbar_large.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_noactionbar_fullscreen_progressbar_small.png b/tests/tests/holo/res/drawable-ldpi/holo_light_noactionbar_fullscreen_progressbar_small.png
new file mode 100644
index 0000000..28c0a40
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_noactionbar_fullscreen_progressbar_small.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_noactionbar_fullscreen_progressdialog_horizontal.png b/tests/tests/holo/res/drawable-ldpi/holo_light_noactionbar_fullscreen_progressdialog_horizontal.png
new file mode 100644
index 0000000..01b7a98
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_noactionbar_fullscreen_progressdialog_horizontal.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_noactionbar_fullscreen_radio_button.png b/tests/tests/holo/res/drawable-ldpi/holo_light_noactionbar_fullscreen_radio_button.png
new file mode 100644
index 0000000..b9c52f4
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_noactionbar_fullscreen_radio_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_noactionbar_fullscreen_radio_button_checked.png b/tests/tests/holo/res/drawable-ldpi/holo_light_noactionbar_fullscreen_radio_button_checked.png
new file mode 100644
index 0000000..5acf60f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_noactionbar_fullscreen_radio_button_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_noactionbar_fullscreen_radiogroup_horizontal.png b/tests/tests/holo/res/drawable-ldpi/holo_light_noactionbar_fullscreen_radiogroup_horizontal.png
new file mode 100644
index 0000000..10af193
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_noactionbar_fullscreen_radiogroup_horizontal.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_noactionbar_fullscreen_radiogroup_vertical.png b/tests/tests/holo/res/drawable-ldpi/holo_light_noactionbar_fullscreen_radiogroup_vertical.png
new file mode 100644
index 0000000..ec7dd84
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_noactionbar_fullscreen_radiogroup_vertical.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_noactionbar_fullscreen_ratingbar_0.png b/tests/tests/holo/res/drawable-ldpi/holo_light_noactionbar_fullscreen_ratingbar_0.png
new file mode 100644
index 0000000..2f1a8a0
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_noactionbar_fullscreen_ratingbar_0.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_noactionbar_fullscreen_ratingbar_0_pressed.png b/tests/tests/holo/res/drawable-ldpi/holo_light_noactionbar_fullscreen_ratingbar_0_pressed.png
new file mode 100644
index 0000000..47c7851
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_noactionbar_fullscreen_ratingbar_0_pressed.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_noactionbar_fullscreen_ratingbar_2point5.png b/tests/tests/holo/res/drawable-ldpi/holo_light_noactionbar_fullscreen_ratingbar_2point5.png
new file mode 100644
index 0000000..e35abf9
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_noactionbar_fullscreen_ratingbar_2point5.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_noactionbar_fullscreen_ratingbar_2point5_pressed.png b/tests/tests/holo/res/drawable-ldpi/holo_light_noactionbar_fullscreen_ratingbar_2point5_pressed.png
new file mode 100644
index 0000000..a9d7fd4
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_noactionbar_fullscreen_ratingbar_2point5_pressed.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_noactionbar_fullscreen_ratingbar_5.png b/tests/tests/holo/res/drawable-ldpi/holo_light_noactionbar_fullscreen_ratingbar_5.png
new file mode 100644
index 0000000..23afb05
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_noactionbar_fullscreen_ratingbar_5.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_noactionbar_fullscreen_ratingbar_5_pressed.png b/tests/tests/holo/res/drawable-ldpi/holo_light_noactionbar_fullscreen_ratingbar_5_pressed.png
new file mode 100644
index 0000000..1747219
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_noactionbar_fullscreen_ratingbar_5_pressed.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_noactionbar_fullscreen_searchview.png b/tests/tests/holo/res/drawable-ldpi/holo_light_noactionbar_fullscreen_searchview.png
new file mode 100644
index 0000000..e5feeb8
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_noactionbar_fullscreen_searchview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_noactionbar_fullscreen_searchview_query.png b/tests/tests/holo/res/drawable-ldpi/holo_light_noactionbar_fullscreen_searchview_query.png
new file mode 100644
index 0000000..89a4ef9
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_noactionbar_fullscreen_searchview_query.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_noactionbar_fullscreen_searchview_query_hint.png b/tests/tests/holo/res/drawable-ldpi/holo_light_noactionbar_fullscreen_searchview_query_hint.png
new file mode 100644
index 0000000..d6121ce
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_noactionbar_fullscreen_searchview_query_hint.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_noactionbar_fullscreen_seekbar_0.png b/tests/tests/holo/res/drawable-ldpi/holo_light_noactionbar_fullscreen_seekbar_0.png
new file mode 100644
index 0000000..b79d8de
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_noactionbar_fullscreen_seekbar_0.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_noactionbar_fullscreen_seekbar_100.png b/tests/tests/holo/res/drawable-ldpi/holo_light_noactionbar_fullscreen_seekbar_100.png
new file mode 100644
index 0000000..8e53289
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_noactionbar_fullscreen_seekbar_100.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_noactionbar_fullscreen_seekbar_50.png b/tests/tests/holo/res/drawable-ldpi/holo_light_noactionbar_fullscreen_seekbar_50.png
new file mode 100644
index 0000000..3b7343f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_noactionbar_fullscreen_seekbar_50.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_noactionbar_fullscreen_spinner.png b/tests/tests/holo/res/drawable-ldpi/holo_light_noactionbar_fullscreen_spinner.png
new file mode 100644
index 0000000..9cf08d4
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_noactionbar_fullscreen_spinner.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_noactionbar_fullscreen_switch.png b/tests/tests/holo/res/drawable-ldpi/holo_light_noactionbar_fullscreen_switch.png
new file mode 100644
index 0000000..0bd5809
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_noactionbar_fullscreen_switch.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_noactionbar_fullscreen_switch_checked.png b/tests/tests/holo/res/drawable-ldpi/holo_light_noactionbar_fullscreen_switch_checked.png
new file mode 100644
index 0000000..8404698
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_noactionbar_fullscreen_switch_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_noactionbar_fullscreen_tabhost.png b/tests/tests/holo/res/drawable-ldpi/holo_light_noactionbar_fullscreen_tabhost.png
new file mode 100644
index 0000000..61687f6
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_noactionbar_fullscreen_tabhost.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_noactionbar_fullscreen_textview.png b/tests/tests/holo/res/drawable-ldpi/holo_light_noactionbar_fullscreen_textview.png
new file mode 100644
index 0000000..5941143
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_noactionbar_fullscreen_textview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_noactionbar_fullscreen_timepicker.png b/tests/tests/holo/res/drawable-ldpi/holo_light_noactionbar_fullscreen_timepicker.png
new file mode 100644
index 0000000..16bedde
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_noactionbar_fullscreen_timepicker.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_noactionbar_fullscreen_toggle_button.png b/tests/tests/holo/res/drawable-ldpi/holo_light_noactionbar_fullscreen_toggle_button.png
new file mode 100644
index 0000000..71d5967
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_noactionbar_fullscreen_toggle_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_noactionbar_fullscreen_toggle_button_checked.png b/tests/tests/holo/res/drawable-ldpi/holo_light_noactionbar_fullscreen_toggle_button_checked.png
new file mode 100644
index 0000000..6448695
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_noactionbar_fullscreen_toggle_button_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_noactionbar_fullscreen_zoomcontrols.png b/tests/tests/holo/res/drawable-ldpi/holo_light_noactionbar_fullscreen_zoomcontrols.png
new file mode 100644
index 0000000..ab090a6
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_noactionbar_fullscreen_zoomcontrols.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_noactionbar_progressbar.png b/tests/tests/holo/res/drawable-ldpi/holo_light_noactionbar_progressbar.png
new file mode 100644
index 0000000..06fec8f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_noactionbar_progressbar.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_noactionbar_progressbar_horizontal_0.png b/tests/tests/holo/res/drawable-ldpi/holo_light_noactionbar_progressbar_horizontal_0.png
new file mode 100644
index 0000000..c89e5f2
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_noactionbar_progressbar_horizontal_0.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_noactionbar_progressbar_horizontal_100.png b/tests/tests/holo/res/drawable-ldpi/holo_light_noactionbar_progressbar_horizontal_100.png
new file mode 100644
index 0000000..0abda21
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_noactionbar_progressbar_horizontal_100.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_noactionbar_progressbar_horizontal_50.png b/tests/tests/holo/res/drawable-ldpi/holo_light_noactionbar_progressbar_horizontal_50.png
new file mode 100644
index 0000000..b33950b
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_noactionbar_progressbar_horizontal_50.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_noactionbar_progressbar_large.png b/tests/tests/holo/res/drawable-ldpi/holo_light_noactionbar_progressbar_large.png
new file mode 100644
index 0000000..fe29e1d
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_noactionbar_progressbar_large.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_noactionbar_progressbar_small.png b/tests/tests/holo/res/drawable-ldpi/holo_light_noactionbar_progressbar_small.png
new file mode 100644
index 0000000..28c0a40
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_noactionbar_progressbar_small.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_noactionbar_progressdialog_horizontal.png b/tests/tests/holo/res/drawable-ldpi/holo_light_noactionbar_progressdialog_horizontal.png
new file mode 100644
index 0000000..01b7a98
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_noactionbar_progressdialog_horizontal.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_noactionbar_radio_button.png b/tests/tests/holo/res/drawable-ldpi/holo_light_noactionbar_radio_button.png
new file mode 100644
index 0000000..b9c52f4
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_noactionbar_radio_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_noactionbar_radio_button_checked.png b/tests/tests/holo/res/drawable-ldpi/holo_light_noactionbar_radio_button_checked.png
new file mode 100644
index 0000000..5acf60f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_noactionbar_radio_button_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_noactionbar_radiogroup_horizontal.png b/tests/tests/holo/res/drawable-ldpi/holo_light_noactionbar_radiogroup_horizontal.png
new file mode 100644
index 0000000..10af193
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_noactionbar_radiogroup_horizontal.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_noactionbar_radiogroup_vertical.png b/tests/tests/holo/res/drawable-ldpi/holo_light_noactionbar_radiogroup_vertical.png
new file mode 100644
index 0000000..ec7dd84
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_noactionbar_radiogroup_vertical.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_noactionbar_ratingbar_0.png b/tests/tests/holo/res/drawable-ldpi/holo_light_noactionbar_ratingbar_0.png
new file mode 100644
index 0000000..2f1a8a0
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_noactionbar_ratingbar_0.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_noactionbar_ratingbar_0_pressed.png b/tests/tests/holo/res/drawable-ldpi/holo_light_noactionbar_ratingbar_0_pressed.png
new file mode 100644
index 0000000..47c7851
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_noactionbar_ratingbar_0_pressed.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_noactionbar_ratingbar_2point5.png b/tests/tests/holo/res/drawable-ldpi/holo_light_noactionbar_ratingbar_2point5.png
new file mode 100644
index 0000000..e35abf9
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_noactionbar_ratingbar_2point5.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_noactionbar_ratingbar_2point5_pressed.png b/tests/tests/holo/res/drawable-ldpi/holo_light_noactionbar_ratingbar_2point5_pressed.png
new file mode 100644
index 0000000..a9d7fd4
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_noactionbar_ratingbar_2point5_pressed.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_noactionbar_ratingbar_5.png b/tests/tests/holo/res/drawable-ldpi/holo_light_noactionbar_ratingbar_5.png
new file mode 100644
index 0000000..23afb05
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_noactionbar_ratingbar_5.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_noactionbar_ratingbar_5_pressed.png b/tests/tests/holo/res/drawable-ldpi/holo_light_noactionbar_ratingbar_5_pressed.png
new file mode 100644
index 0000000..1747219
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_noactionbar_ratingbar_5_pressed.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_noactionbar_searchview.png b/tests/tests/holo/res/drawable-ldpi/holo_light_noactionbar_searchview.png
new file mode 100644
index 0000000..e5feeb8
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_noactionbar_searchview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_noactionbar_searchview_query.png b/tests/tests/holo/res/drawable-ldpi/holo_light_noactionbar_searchview_query.png
new file mode 100644
index 0000000..89a4ef9
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_noactionbar_searchview_query.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_noactionbar_searchview_query_hint.png b/tests/tests/holo/res/drawable-ldpi/holo_light_noactionbar_searchview_query_hint.png
new file mode 100644
index 0000000..d6121ce
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_noactionbar_searchview_query_hint.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_noactionbar_seekbar_0.png b/tests/tests/holo/res/drawable-ldpi/holo_light_noactionbar_seekbar_0.png
new file mode 100644
index 0000000..b79d8de
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_noactionbar_seekbar_0.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_noactionbar_seekbar_100.png b/tests/tests/holo/res/drawable-ldpi/holo_light_noactionbar_seekbar_100.png
new file mode 100644
index 0000000..8e53289
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_noactionbar_seekbar_100.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_noactionbar_seekbar_50.png b/tests/tests/holo/res/drawable-ldpi/holo_light_noactionbar_seekbar_50.png
new file mode 100644
index 0000000..3b7343f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_noactionbar_seekbar_50.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_noactionbar_spinner.png b/tests/tests/holo/res/drawable-ldpi/holo_light_noactionbar_spinner.png
new file mode 100644
index 0000000..9cf08d4
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_noactionbar_spinner.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_noactionbar_switch.png b/tests/tests/holo/res/drawable-ldpi/holo_light_noactionbar_switch.png
new file mode 100644
index 0000000..0bd5809
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_noactionbar_switch.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_noactionbar_switch_checked.png b/tests/tests/holo/res/drawable-ldpi/holo_light_noactionbar_switch_checked.png
new file mode 100644
index 0000000..8404698
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_noactionbar_switch_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_noactionbar_tabhost.png b/tests/tests/holo/res/drawable-ldpi/holo_light_noactionbar_tabhost.png
new file mode 100644
index 0000000..61687f6
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_noactionbar_tabhost.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_noactionbar_textview.png b/tests/tests/holo/res/drawable-ldpi/holo_light_noactionbar_textview.png
new file mode 100644
index 0000000..5941143
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_noactionbar_textview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_noactionbar_timepicker.png b/tests/tests/holo/res/drawable-ldpi/holo_light_noactionbar_timepicker.png
new file mode 100644
index 0000000..16bedde
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_noactionbar_timepicker.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_noactionbar_toggle_button.png b/tests/tests/holo/res/drawable-ldpi/holo_light_noactionbar_toggle_button.png
new file mode 100644
index 0000000..71d5967
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_noactionbar_toggle_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_noactionbar_toggle_button_checked.png b/tests/tests/holo/res/drawable-ldpi/holo_light_noactionbar_toggle_button_checked.png
new file mode 100644
index 0000000..6448695
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_noactionbar_toggle_button_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_noactionbar_zoomcontrols.png b/tests/tests/holo/res/drawable-ldpi/holo_light_noactionbar_zoomcontrols.png
new file mode 100644
index 0000000..ab090a6
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_noactionbar_zoomcontrols.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_panel_alertdialog_list.png b/tests/tests/holo/res/drawable-ldpi/holo_light_panel_alertdialog_list.png
new file mode 100644
index 0000000..a06cdd8
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_panel_alertdialog_list.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_panel_alertdialog_multichoice.png b/tests/tests/holo/res/drawable-ldpi/holo_light_panel_alertdialog_multichoice.png
new file mode 100644
index 0000000..278e9b8
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_panel_alertdialog_multichoice.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_panel_alertdialog_onebutton.png b/tests/tests/holo/res/drawable-ldpi/holo_light_panel_alertdialog_onebutton.png
new file mode 100644
index 0000000..caaec27
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_panel_alertdialog_onebutton.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_panel_alertdialog_singlechoice.png b/tests/tests/holo/res/drawable-ldpi/holo_light_panel_alertdialog_singlechoice.png
new file mode 100644
index 0000000..8be0aa4
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_panel_alertdialog_singlechoice.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_panel_alertdialog_threebuttons.png b/tests/tests/holo/res/drawable-ldpi/holo_light_panel_alertdialog_threebuttons.png
new file mode 100644
index 0000000..7450944
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_panel_alertdialog_threebuttons.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_panel_alertdialog_twobuttons.png b/tests/tests/holo/res/drawable-ldpi/holo_light_panel_alertdialog_twobuttons.png
new file mode 100644
index 0000000..b0eccd5
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_panel_alertdialog_twobuttons.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_panel_button.png b/tests/tests/holo/res/drawable-ldpi/holo_light_panel_button.png
new file mode 100644
index 0000000..054d4e5
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_panel_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_panel_button_pressed.png b/tests/tests/holo/res/drawable-ldpi/holo_light_panel_button_pressed.png
new file mode 100644
index 0000000..a7a0105
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_panel_button_pressed.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_panel_calendar_view.png b/tests/tests/holo/res/drawable-ldpi/holo_light_panel_calendar_view.png
new file mode 100644
index 0000000..16deb8f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_panel_calendar_view.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_panel_calendar_view_feb.png b/tests/tests/holo/res/drawable-ldpi/holo_light_panel_calendar_view_feb.png
new file mode 100644
index 0000000..f27f7d2
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_panel_calendar_view_feb.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_panel_checkbox.png b/tests/tests/holo/res/drawable-ldpi/holo_light_panel_checkbox.png
new file mode 100644
index 0000000..416fc5e
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_panel_checkbox.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_panel_checkbox_checked.png b/tests/tests/holo/res/drawable-ldpi/holo_light_panel_checkbox_checked.png
new file mode 100644
index 0000000..dc38372
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_panel_checkbox_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_panel_chronometer.png b/tests/tests/holo/res/drawable-ldpi/holo_light_panel_chronometer.png
new file mode 100644
index 0000000..dd8eb6d
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_panel_chronometer.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_panel_color_blue_bright.png b/tests/tests/holo/res/drawable-ldpi/holo_light_panel_color_blue_bright.png
new file mode 100644
index 0000000..feaec2c
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_panel_color_blue_bright.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_panel_color_blue_dark.png b/tests/tests/holo/res/drawable-ldpi/holo_light_panel_color_blue_dark.png
new file mode 100644
index 0000000..a8640c1
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_panel_color_blue_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_panel_color_blue_light.png b/tests/tests/holo/res/drawable-ldpi/holo_light_panel_color_blue_light.png
new file mode 100644
index 0000000..ae141af
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_panel_color_blue_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_panel_color_green_dark.png b/tests/tests/holo/res/drawable-ldpi/holo_light_panel_color_green_dark.png
new file mode 100644
index 0000000..0ee2324
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_panel_color_green_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_panel_color_green_light.png b/tests/tests/holo/res/drawable-ldpi/holo_light_panel_color_green_light.png
new file mode 100644
index 0000000..9ca63c5
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_panel_color_green_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_panel_color_orange_dark.png b/tests/tests/holo/res/drawable-ldpi/holo_light_panel_color_orange_dark.png
new file mode 100644
index 0000000..bc06b4f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_panel_color_orange_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_panel_color_orange_light.png b/tests/tests/holo/res/drawable-ldpi/holo_light_panel_color_orange_light.png
new file mode 100644
index 0000000..1495f82
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_panel_color_orange_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_panel_color_purple.png b/tests/tests/holo/res/drawable-ldpi/holo_light_panel_color_purple.png
new file mode 100644
index 0000000..9652f56
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_panel_color_purple.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_panel_color_red_dark.png b/tests/tests/holo/res/drawable-ldpi/holo_light_panel_color_red_dark.png
new file mode 100644
index 0000000..4acebf8
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_panel_color_red_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_panel_color_red_light.png b/tests/tests/holo/res/drawable-ldpi/holo_light_panel_color_red_light.png
new file mode 100644
index 0000000..d5b5742
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_panel_color_red_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_panel_edittext.png b/tests/tests/holo/res/drawable-ldpi/holo_light_panel_edittext.png
new file mode 100644
index 0000000..c65471f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_panel_edittext.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_panel_progressbar.png b/tests/tests/holo/res/drawable-ldpi/holo_light_panel_progressbar.png
new file mode 100644
index 0000000..06fec8f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_panel_progressbar.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_panel_progressbar_horizontal_0.png b/tests/tests/holo/res/drawable-ldpi/holo_light_panel_progressbar_horizontal_0.png
new file mode 100644
index 0000000..c89e5f2
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_panel_progressbar_horizontal_0.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_panel_progressbar_horizontal_100.png b/tests/tests/holo/res/drawable-ldpi/holo_light_panel_progressbar_horizontal_100.png
new file mode 100644
index 0000000..0abda21
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_panel_progressbar_horizontal_100.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_panel_progressbar_horizontal_50.png b/tests/tests/holo/res/drawable-ldpi/holo_light_panel_progressbar_horizontal_50.png
new file mode 100644
index 0000000..b33950b
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_panel_progressbar_horizontal_50.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_panel_progressbar_large.png b/tests/tests/holo/res/drawable-ldpi/holo_light_panel_progressbar_large.png
new file mode 100644
index 0000000..fe29e1d
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_panel_progressbar_large.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_panel_progressbar_small.png b/tests/tests/holo/res/drawable-ldpi/holo_light_panel_progressbar_small.png
new file mode 100644
index 0000000..28c0a40
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_panel_progressbar_small.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_panel_progressdialog_horizontal.png b/tests/tests/holo/res/drawable-ldpi/holo_light_panel_progressdialog_horizontal.png
new file mode 100644
index 0000000..01b7a98
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_panel_progressdialog_horizontal.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_panel_radio_button.png b/tests/tests/holo/res/drawable-ldpi/holo_light_panel_radio_button.png
new file mode 100644
index 0000000..b9c52f4
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_panel_radio_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_panel_radio_button_checked.png b/tests/tests/holo/res/drawable-ldpi/holo_light_panel_radio_button_checked.png
new file mode 100644
index 0000000..5acf60f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_panel_radio_button_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_panel_radiogroup_horizontal.png b/tests/tests/holo/res/drawable-ldpi/holo_light_panel_radiogroup_horizontal.png
new file mode 100644
index 0000000..10af193
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_panel_radiogroup_horizontal.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_panel_radiogroup_vertical.png b/tests/tests/holo/res/drawable-ldpi/holo_light_panel_radiogroup_vertical.png
new file mode 100644
index 0000000..ec7dd84
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_panel_radiogroup_vertical.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_panel_ratingbar_0.png b/tests/tests/holo/res/drawable-ldpi/holo_light_panel_ratingbar_0.png
new file mode 100644
index 0000000..2f1a8a0
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_panel_ratingbar_0.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_panel_ratingbar_0_pressed.png b/tests/tests/holo/res/drawable-ldpi/holo_light_panel_ratingbar_0_pressed.png
new file mode 100644
index 0000000..47c7851
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_panel_ratingbar_0_pressed.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_panel_ratingbar_2point5.png b/tests/tests/holo/res/drawable-ldpi/holo_light_panel_ratingbar_2point5.png
new file mode 100644
index 0000000..e35abf9
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_panel_ratingbar_2point5.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_panel_ratingbar_2point5_pressed.png b/tests/tests/holo/res/drawable-ldpi/holo_light_panel_ratingbar_2point5_pressed.png
new file mode 100644
index 0000000..a9d7fd4
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_panel_ratingbar_2point5_pressed.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_panel_ratingbar_5.png b/tests/tests/holo/res/drawable-ldpi/holo_light_panel_ratingbar_5.png
new file mode 100644
index 0000000..23afb05
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_panel_ratingbar_5.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_panel_ratingbar_5_pressed.png b/tests/tests/holo/res/drawable-ldpi/holo_light_panel_ratingbar_5_pressed.png
new file mode 100644
index 0000000..1747219
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_panel_ratingbar_5_pressed.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_panel_searchview.png b/tests/tests/holo/res/drawable-ldpi/holo_light_panel_searchview.png
new file mode 100644
index 0000000..e5feeb8
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_panel_searchview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_panel_searchview_query.png b/tests/tests/holo/res/drawable-ldpi/holo_light_panel_searchview_query.png
new file mode 100644
index 0000000..89a4ef9
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_panel_searchview_query.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_panel_searchview_query_hint.png b/tests/tests/holo/res/drawable-ldpi/holo_light_panel_searchview_query_hint.png
new file mode 100644
index 0000000..d6121ce
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_panel_searchview_query_hint.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_panel_seekbar_0.png b/tests/tests/holo/res/drawable-ldpi/holo_light_panel_seekbar_0.png
new file mode 100644
index 0000000..b79d8de
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_panel_seekbar_0.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_panel_seekbar_100.png b/tests/tests/holo/res/drawable-ldpi/holo_light_panel_seekbar_100.png
new file mode 100644
index 0000000..8e53289
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_panel_seekbar_100.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_panel_seekbar_50.png b/tests/tests/holo/res/drawable-ldpi/holo_light_panel_seekbar_50.png
new file mode 100644
index 0000000..3b7343f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_panel_seekbar_50.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_panel_spinner.png b/tests/tests/holo/res/drawable-ldpi/holo_light_panel_spinner.png
new file mode 100644
index 0000000..9cf08d4
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_panel_spinner.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_panel_switch.png b/tests/tests/holo/res/drawable-ldpi/holo_light_panel_switch.png
new file mode 100644
index 0000000..0bd5809
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_panel_switch.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_panel_switch_checked.png b/tests/tests/holo/res/drawable-ldpi/holo_light_panel_switch_checked.png
new file mode 100644
index 0000000..8404698
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_panel_switch_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_panel_tabhost.png b/tests/tests/holo/res/drawable-ldpi/holo_light_panel_tabhost.png
new file mode 100644
index 0000000..61687f6
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_panel_tabhost.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_panel_textview.png b/tests/tests/holo/res/drawable-ldpi/holo_light_panel_textview.png
new file mode 100644
index 0000000..5941143
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_panel_textview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_panel_timepicker.png b/tests/tests/holo/res/drawable-ldpi/holo_light_panel_timepicker.png
new file mode 100644
index 0000000..16bedde
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_panel_timepicker.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_panel_toggle_button.png b/tests/tests/holo/res/drawable-ldpi/holo_light_panel_toggle_button.png
new file mode 100644
index 0000000..71d5967
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_panel_toggle_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_panel_toggle_button_checked.png b/tests/tests/holo/res/drawable-ldpi/holo_light_panel_toggle_button_checked.png
new file mode 100644
index 0000000..6448695
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_panel_toggle_button_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_panel_zoomcontrols.png b/tests/tests/holo/res/drawable-ldpi/holo_light_panel_zoomcontrols.png
new file mode 100644
index 0000000..ab090a6
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_panel_zoomcontrols.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_progressbar.png b/tests/tests/holo/res/drawable-ldpi/holo_light_progressbar.png
new file mode 100644
index 0000000..06fec8f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_progressbar.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_progressbar_horizontal_0.png b/tests/tests/holo/res/drawable-ldpi/holo_light_progressbar_horizontal_0.png
new file mode 100644
index 0000000..c89e5f2
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_progressbar_horizontal_0.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_progressbar_horizontal_100.png b/tests/tests/holo/res/drawable-ldpi/holo_light_progressbar_horizontal_100.png
new file mode 100644
index 0000000..0abda21
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_progressbar_horizontal_100.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_progressbar_horizontal_50.png b/tests/tests/holo/res/drawable-ldpi/holo_light_progressbar_horizontal_50.png
new file mode 100644
index 0000000..b33950b
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_progressbar_horizontal_50.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_progressbar_large.png b/tests/tests/holo/res/drawable-ldpi/holo_light_progressbar_large.png
new file mode 100644
index 0000000..fe29e1d
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_progressbar_large.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_progressbar_small.png b/tests/tests/holo/res/drawable-ldpi/holo_light_progressbar_small.png
new file mode 100644
index 0000000..28c0a40
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_progressbar_small.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_progressdialog_horizontal.png b/tests/tests/holo/res/drawable-ldpi/holo_light_progressdialog_horizontal.png
new file mode 100644
index 0000000..01b7a98
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_progressdialog_horizontal.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_radio_button.png b/tests/tests/holo/res/drawable-ldpi/holo_light_radio_button.png
new file mode 100644
index 0000000..b9c52f4
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_radio_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_radio_button_checked.png b/tests/tests/holo/res/drawable-ldpi/holo_light_radio_button_checked.png
new file mode 100644
index 0000000..5acf60f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_radio_button_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_radiogroup_horizontal.png b/tests/tests/holo/res/drawable-ldpi/holo_light_radiogroup_horizontal.png
new file mode 100644
index 0000000..10af193
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_radiogroup_horizontal.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_radiogroup_vertical.png b/tests/tests/holo/res/drawable-ldpi/holo_light_radiogroup_vertical.png
new file mode 100644
index 0000000..ec7dd84
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_radiogroup_vertical.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_ratingbar_0.png b/tests/tests/holo/res/drawable-ldpi/holo_light_ratingbar_0.png
new file mode 100644
index 0000000..2f1a8a0
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_ratingbar_0.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_ratingbar_0_pressed.png b/tests/tests/holo/res/drawable-ldpi/holo_light_ratingbar_0_pressed.png
new file mode 100644
index 0000000..47c7851
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_ratingbar_0_pressed.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_ratingbar_2point5.png b/tests/tests/holo/res/drawable-ldpi/holo_light_ratingbar_2point5.png
new file mode 100644
index 0000000..e35abf9
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_ratingbar_2point5.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_ratingbar_2point5_pressed.png b/tests/tests/holo/res/drawable-ldpi/holo_light_ratingbar_2point5_pressed.png
new file mode 100644
index 0000000..a9d7fd4
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_ratingbar_2point5_pressed.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_ratingbar_5.png b/tests/tests/holo/res/drawable-ldpi/holo_light_ratingbar_5.png
new file mode 100644
index 0000000..23afb05
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_ratingbar_5.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_ratingbar_5_pressed.png b/tests/tests/holo/res/drawable-ldpi/holo_light_ratingbar_5_pressed.png
new file mode 100644
index 0000000..1747219
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_ratingbar_5_pressed.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_searchview.png b/tests/tests/holo/res/drawable-ldpi/holo_light_searchview.png
new file mode 100644
index 0000000..e5feeb8
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_searchview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_searchview_query.png b/tests/tests/holo/res/drawable-ldpi/holo_light_searchview_query.png
new file mode 100644
index 0000000..89a4ef9
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_searchview_query.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_searchview_query_hint.png b/tests/tests/holo/res/drawable-ldpi/holo_light_searchview_query_hint.png
new file mode 100644
index 0000000..d6121ce
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_searchview_query_hint.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_seekbar_0.png b/tests/tests/holo/res/drawable-ldpi/holo_light_seekbar_0.png
new file mode 100644
index 0000000..b79d8de
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_seekbar_0.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_seekbar_100.png b/tests/tests/holo/res/drawable-ldpi/holo_light_seekbar_100.png
new file mode 100644
index 0000000..8e53289
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_seekbar_100.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_seekbar_50.png b/tests/tests/holo/res/drawable-ldpi/holo_light_seekbar_50.png
new file mode 100644
index 0000000..3b7343f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_seekbar_50.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_spinner.png b/tests/tests/holo/res/drawable-ldpi/holo_light_spinner.png
new file mode 100644
index 0000000..9cf08d4
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_spinner.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_switch.png b/tests/tests/holo/res/drawable-ldpi/holo_light_switch.png
new file mode 100644
index 0000000..0bd5809
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_switch.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_switch_checked.png b/tests/tests/holo/res/drawable-ldpi/holo_light_switch_checked.png
new file mode 100644
index 0000000..8404698
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_switch_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_tabhost.png b/tests/tests/holo/res/drawable-ldpi/holo_light_tabhost.png
new file mode 100644
index 0000000..61687f6
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_tabhost.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_textview.png b/tests/tests/holo/res/drawable-ldpi/holo_light_textview.png
new file mode 100644
index 0000000..5941143
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_textview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_timepicker.png b/tests/tests/holo/res/drawable-ldpi/holo_light_timepicker.png
new file mode 100644
index 0000000..16bedde
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_timepicker.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_toggle_button.png b/tests/tests/holo/res/drawable-ldpi/holo_light_toggle_button.png
new file mode 100644
index 0000000..71d5967
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_toggle_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_toggle_button_checked.png b/tests/tests/holo/res/drawable-ldpi/holo_light_toggle_button_checked.png
new file mode 100644
index 0000000..6448695
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_toggle_button_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_light_zoomcontrols.png b/tests/tests/holo/res/drawable-ldpi/holo_light_zoomcontrols.png
new file mode 100644
index 0000000..ab090a6
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_light_zoomcontrols.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_noactionbar_alertdialog_list.png b/tests/tests/holo/res/drawable-ldpi/holo_noactionbar_alertdialog_list.png
new file mode 100644
index 0000000..ca60c2f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_noactionbar_alertdialog_list.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_noactionbar_alertdialog_multichoice.png b/tests/tests/holo/res/drawable-ldpi/holo_noactionbar_alertdialog_multichoice.png
new file mode 100644
index 0000000..ef5a620
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_noactionbar_alertdialog_multichoice.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_noactionbar_alertdialog_onebutton.png b/tests/tests/holo/res/drawable-ldpi/holo_noactionbar_alertdialog_onebutton.png
new file mode 100644
index 0000000..6e67ae0
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_noactionbar_alertdialog_onebutton.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_noactionbar_alertdialog_singlechoice.png b/tests/tests/holo/res/drawable-ldpi/holo_noactionbar_alertdialog_singlechoice.png
new file mode 100644
index 0000000..b66441a
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_noactionbar_alertdialog_singlechoice.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_noactionbar_alertdialog_threebuttons.png b/tests/tests/holo/res/drawable-ldpi/holo_noactionbar_alertdialog_threebuttons.png
new file mode 100644
index 0000000..e5c6476
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_noactionbar_alertdialog_threebuttons.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_noactionbar_alertdialog_twobuttons.png b/tests/tests/holo/res/drawable-ldpi/holo_noactionbar_alertdialog_twobuttons.png
new file mode 100644
index 0000000..65b1d05
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_noactionbar_alertdialog_twobuttons.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_noactionbar_button.png b/tests/tests/holo/res/drawable-ldpi/holo_noactionbar_button.png
new file mode 100644
index 0000000..354ebd1
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_noactionbar_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_noactionbar_button_pressed.png b/tests/tests/holo/res/drawable-ldpi/holo_noactionbar_button_pressed.png
new file mode 100644
index 0000000..2562c8c
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_noactionbar_button_pressed.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_noactionbar_calendar_view.png b/tests/tests/holo/res/drawable-ldpi/holo_noactionbar_calendar_view.png
new file mode 100644
index 0000000..884bfc0
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_noactionbar_calendar_view.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_noactionbar_calendar_view_feb.png b/tests/tests/holo/res/drawable-ldpi/holo_noactionbar_calendar_view_feb.png
new file mode 100644
index 0000000..fc65b4a
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_noactionbar_calendar_view_feb.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_noactionbar_checkbox.png b/tests/tests/holo/res/drawable-ldpi/holo_noactionbar_checkbox.png
new file mode 100644
index 0000000..58b679e
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_noactionbar_checkbox.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_noactionbar_checkbox_checked.png b/tests/tests/holo/res/drawable-ldpi/holo_noactionbar_checkbox_checked.png
new file mode 100644
index 0000000..894922c
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_noactionbar_checkbox_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_noactionbar_chronometer.png b/tests/tests/holo/res/drawable-ldpi/holo_noactionbar_chronometer.png
new file mode 100644
index 0000000..dca49b0
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_noactionbar_chronometer.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_noactionbar_color_blue_bright.png b/tests/tests/holo/res/drawable-ldpi/holo_noactionbar_color_blue_bright.png
new file mode 100644
index 0000000..feaec2c
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_noactionbar_color_blue_bright.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_noactionbar_color_blue_dark.png b/tests/tests/holo/res/drawable-ldpi/holo_noactionbar_color_blue_dark.png
new file mode 100644
index 0000000..a8640c1
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_noactionbar_color_blue_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_noactionbar_color_blue_light.png b/tests/tests/holo/res/drawable-ldpi/holo_noactionbar_color_blue_light.png
new file mode 100644
index 0000000..ae141af
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_noactionbar_color_blue_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_noactionbar_color_green_dark.png b/tests/tests/holo/res/drawable-ldpi/holo_noactionbar_color_green_dark.png
new file mode 100644
index 0000000..0ee2324
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_noactionbar_color_green_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_noactionbar_color_green_light.png b/tests/tests/holo/res/drawable-ldpi/holo_noactionbar_color_green_light.png
new file mode 100644
index 0000000..9ca63c5
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_noactionbar_color_green_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_noactionbar_color_orange_dark.png b/tests/tests/holo/res/drawable-ldpi/holo_noactionbar_color_orange_dark.png
new file mode 100644
index 0000000..bc06b4f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_noactionbar_color_orange_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_noactionbar_color_orange_light.png b/tests/tests/holo/res/drawable-ldpi/holo_noactionbar_color_orange_light.png
new file mode 100644
index 0000000..1495f82
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_noactionbar_color_orange_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_noactionbar_color_purple.png b/tests/tests/holo/res/drawable-ldpi/holo_noactionbar_color_purple.png
new file mode 100644
index 0000000..9652f56
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_noactionbar_color_purple.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_noactionbar_color_red_dark.png b/tests/tests/holo/res/drawable-ldpi/holo_noactionbar_color_red_dark.png
new file mode 100644
index 0000000..4acebf8
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_noactionbar_color_red_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_noactionbar_color_red_light.png b/tests/tests/holo/res/drawable-ldpi/holo_noactionbar_color_red_light.png
new file mode 100644
index 0000000..d5b5742
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_noactionbar_color_red_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_noactionbar_edittext.png b/tests/tests/holo/res/drawable-ldpi/holo_noactionbar_edittext.png
new file mode 100644
index 0000000..07a56b3
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_noactionbar_edittext.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_noactionbar_fullscreen_alertdialog_list.png b/tests/tests/holo/res/drawable-ldpi/holo_noactionbar_fullscreen_alertdialog_list.png
new file mode 100644
index 0000000..ca60c2f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_noactionbar_fullscreen_alertdialog_list.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_noactionbar_fullscreen_alertdialog_multichoice.png b/tests/tests/holo/res/drawable-ldpi/holo_noactionbar_fullscreen_alertdialog_multichoice.png
new file mode 100644
index 0000000..ef5a620
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_noactionbar_fullscreen_alertdialog_multichoice.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_noactionbar_fullscreen_alertdialog_onebutton.png b/tests/tests/holo/res/drawable-ldpi/holo_noactionbar_fullscreen_alertdialog_onebutton.png
new file mode 100644
index 0000000..6e67ae0
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_noactionbar_fullscreen_alertdialog_onebutton.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_noactionbar_fullscreen_alertdialog_singlechoice.png b/tests/tests/holo/res/drawable-ldpi/holo_noactionbar_fullscreen_alertdialog_singlechoice.png
new file mode 100644
index 0000000..b66441a
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_noactionbar_fullscreen_alertdialog_singlechoice.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_noactionbar_fullscreen_alertdialog_threebuttons.png b/tests/tests/holo/res/drawable-ldpi/holo_noactionbar_fullscreen_alertdialog_threebuttons.png
new file mode 100644
index 0000000..e5c6476
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_noactionbar_fullscreen_alertdialog_threebuttons.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_noactionbar_fullscreen_alertdialog_twobuttons.png b/tests/tests/holo/res/drawable-ldpi/holo_noactionbar_fullscreen_alertdialog_twobuttons.png
new file mode 100644
index 0000000..65b1d05
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_noactionbar_fullscreen_alertdialog_twobuttons.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_noactionbar_fullscreen_button.png b/tests/tests/holo/res/drawable-ldpi/holo_noactionbar_fullscreen_button.png
new file mode 100644
index 0000000..354ebd1
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_noactionbar_fullscreen_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_noactionbar_fullscreen_button_pressed.png b/tests/tests/holo/res/drawable-ldpi/holo_noactionbar_fullscreen_button_pressed.png
new file mode 100644
index 0000000..2562c8c
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_noactionbar_fullscreen_button_pressed.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_noactionbar_fullscreen_calendar_view.png b/tests/tests/holo/res/drawable-ldpi/holo_noactionbar_fullscreen_calendar_view.png
new file mode 100644
index 0000000..884bfc0
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_noactionbar_fullscreen_calendar_view.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_noactionbar_fullscreen_calendar_view_feb.png b/tests/tests/holo/res/drawable-ldpi/holo_noactionbar_fullscreen_calendar_view_feb.png
new file mode 100644
index 0000000..fc65b4a
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_noactionbar_fullscreen_calendar_view_feb.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_noactionbar_fullscreen_checkbox.png b/tests/tests/holo/res/drawable-ldpi/holo_noactionbar_fullscreen_checkbox.png
new file mode 100644
index 0000000..58b679e
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_noactionbar_fullscreen_checkbox.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_noactionbar_fullscreen_checkbox_checked.png b/tests/tests/holo/res/drawable-ldpi/holo_noactionbar_fullscreen_checkbox_checked.png
new file mode 100644
index 0000000..894922c
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_noactionbar_fullscreen_checkbox_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_noactionbar_fullscreen_chronometer.png b/tests/tests/holo/res/drawable-ldpi/holo_noactionbar_fullscreen_chronometer.png
new file mode 100644
index 0000000..dca49b0
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_noactionbar_fullscreen_chronometer.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_noactionbar_fullscreen_color_blue_bright.png b/tests/tests/holo/res/drawable-ldpi/holo_noactionbar_fullscreen_color_blue_bright.png
new file mode 100644
index 0000000..feaec2c
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_noactionbar_fullscreen_color_blue_bright.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_noactionbar_fullscreen_color_blue_dark.png b/tests/tests/holo/res/drawable-ldpi/holo_noactionbar_fullscreen_color_blue_dark.png
new file mode 100644
index 0000000..a8640c1
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_noactionbar_fullscreen_color_blue_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_noactionbar_fullscreen_color_blue_light.png b/tests/tests/holo/res/drawable-ldpi/holo_noactionbar_fullscreen_color_blue_light.png
new file mode 100644
index 0000000..ae141af
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_noactionbar_fullscreen_color_blue_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_noactionbar_fullscreen_color_green_dark.png b/tests/tests/holo/res/drawable-ldpi/holo_noactionbar_fullscreen_color_green_dark.png
new file mode 100644
index 0000000..0ee2324
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_noactionbar_fullscreen_color_green_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_noactionbar_fullscreen_color_green_light.png b/tests/tests/holo/res/drawable-ldpi/holo_noactionbar_fullscreen_color_green_light.png
new file mode 100644
index 0000000..9ca63c5
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_noactionbar_fullscreen_color_green_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_noactionbar_fullscreen_color_orange_dark.png b/tests/tests/holo/res/drawable-ldpi/holo_noactionbar_fullscreen_color_orange_dark.png
new file mode 100644
index 0000000..bc06b4f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_noactionbar_fullscreen_color_orange_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_noactionbar_fullscreen_color_orange_light.png b/tests/tests/holo/res/drawable-ldpi/holo_noactionbar_fullscreen_color_orange_light.png
new file mode 100644
index 0000000..1495f82
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_noactionbar_fullscreen_color_orange_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_noactionbar_fullscreen_color_purple.png b/tests/tests/holo/res/drawable-ldpi/holo_noactionbar_fullscreen_color_purple.png
new file mode 100644
index 0000000..9652f56
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_noactionbar_fullscreen_color_purple.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_noactionbar_fullscreen_color_red_dark.png b/tests/tests/holo/res/drawable-ldpi/holo_noactionbar_fullscreen_color_red_dark.png
new file mode 100644
index 0000000..4acebf8
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_noactionbar_fullscreen_color_red_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_noactionbar_fullscreen_color_red_light.png b/tests/tests/holo/res/drawable-ldpi/holo_noactionbar_fullscreen_color_red_light.png
new file mode 100644
index 0000000..d5b5742
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_noactionbar_fullscreen_color_red_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_noactionbar_fullscreen_edittext.png b/tests/tests/holo/res/drawable-ldpi/holo_noactionbar_fullscreen_edittext.png
new file mode 100644
index 0000000..07a56b3
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_noactionbar_fullscreen_edittext.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_noactionbar_fullscreen_progressbar.png b/tests/tests/holo/res/drawable-ldpi/holo_noactionbar_fullscreen_progressbar.png
new file mode 100644
index 0000000..06fec8f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_noactionbar_fullscreen_progressbar.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_noactionbar_fullscreen_progressbar_horizontal_0.png b/tests/tests/holo/res/drawable-ldpi/holo_noactionbar_fullscreen_progressbar_horizontal_0.png
new file mode 100644
index 0000000..3ab1b88
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_noactionbar_fullscreen_progressbar_horizontal_0.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_noactionbar_fullscreen_progressbar_horizontal_100.png b/tests/tests/holo/res/drawable-ldpi/holo_noactionbar_fullscreen_progressbar_horizontal_100.png
new file mode 100644
index 0000000..2ccefc1
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_noactionbar_fullscreen_progressbar_horizontal_100.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_noactionbar_fullscreen_progressbar_horizontal_50.png b/tests/tests/holo/res/drawable-ldpi/holo_noactionbar_fullscreen_progressbar_horizontal_50.png
new file mode 100644
index 0000000..56239e3
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_noactionbar_fullscreen_progressbar_horizontal_50.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_noactionbar_fullscreen_progressbar_large.png b/tests/tests/holo/res/drawable-ldpi/holo_noactionbar_fullscreen_progressbar_large.png
new file mode 100644
index 0000000..fe29e1d
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_noactionbar_fullscreen_progressbar_large.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_noactionbar_fullscreen_progressbar_small.png b/tests/tests/holo/res/drawable-ldpi/holo_noactionbar_fullscreen_progressbar_small.png
new file mode 100644
index 0000000..28c0a40
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_noactionbar_fullscreen_progressbar_small.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_noactionbar_fullscreen_progressdialog_horizontal.png b/tests/tests/holo/res/drawable-ldpi/holo_noactionbar_fullscreen_progressdialog_horizontal.png
new file mode 100644
index 0000000..c602ac2
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_noactionbar_fullscreen_progressdialog_horizontal.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_noactionbar_fullscreen_radio_button.png b/tests/tests/holo/res/drawable-ldpi/holo_noactionbar_fullscreen_radio_button.png
new file mode 100644
index 0000000..96a4af9
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_noactionbar_fullscreen_radio_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_noactionbar_fullscreen_radio_button_checked.png b/tests/tests/holo/res/drawable-ldpi/holo_noactionbar_fullscreen_radio_button_checked.png
new file mode 100644
index 0000000..fa14bcb
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_noactionbar_fullscreen_radio_button_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_noactionbar_fullscreen_radiogroup_horizontal.png b/tests/tests/holo/res/drawable-ldpi/holo_noactionbar_fullscreen_radiogroup_horizontal.png
new file mode 100644
index 0000000..7184016
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_noactionbar_fullscreen_radiogroup_horizontal.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_noactionbar_fullscreen_radiogroup_vertical.png b/tests/tests/holo/res/drawable-ldpi/holo_noactionbar_fullscreen_radiogroup_vertical.png
new file mode 100644
index 0000000..b7927b1
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_noactionbar_fullscreen_radiogroup_vertical.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_noactionbar_fullscreen_ratingbar_0.png b/tests/tests/holo/res/drawable-ldpi/holo_noactionbar_fullscreen_ratingbar_0.png
new file mode 100644
index 0000000..88279b8
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_noactionbar_fullscreen_ratingbar_0.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_noactionbar_fullscreen_ratingbar_0_pressed.png b/tests/tests/holo/res/drawable-ldpi/holo_noactionbar_fullscreen_ratingbar_0_pressed.png
new file mode 100644
index 0000000..d4b841d
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_noactionbar_fullscreen_ratingbar_0_pressed.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_noactionbar_fullscreen_ratingbar_2point5.png b/tests/tests/holo/res/drawable-ldpi/holo_noactionbar_fullscreen_ratingbar_2point5.png
new file mode 100644
index 0000000..3e80e24
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_noactionbar_fullscreen_ratingbar_2point5.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_noactionbar_fullscreen_ratingbar_2point5_pressed.png b/tests/tests/holo/res/drawable-ldpi/holo_noactionbar_fullscreen_ratingbar_2point5_pressed.png
new file mode 100644
index 0000000..b0c4cf2
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_noactionbar_fullscreen_ratingbar_2point5_pressed.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_noactionbar_fullscreen_ratingbar_5.png b/tests/tests/holo/res/drawable-ldpi/holo_noactionbar_fullscreen_ratingbar_5.png
new file mode 100644
index 0000000..13eee57
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_noactionbar_fullscreen_ratingbar_5.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_noactionbar_fullscreen_ratingbar_5_pressed.png b/tests/tests/holo/res/drawable-ldpi/holo_noactionbar_fullscreen_ratingbar_5_pressed.png
new file mode 100644
index 0000000..ccd4d30
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_noactionbar_fullscreen_ratingbar_5_pressed.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_noactionbar_fullscreen_searchview.png b/tests/tests/holo/res/drawable-ldpi/holo_noactionbar_fullscreen_searchview.png
new file mode 100644
index 0000000..ca76a70
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_noactionbar_fullscreen_searchview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_noactionbar_fullscreen_searchview_query.png b/tests/tests/holo/res/drawable-ldpi/holo_noactionbar_fullscreen_searchview_query.png
new file mode 100644
index 0000000..061f026
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_noactionbar_fullscreen_searchview_query.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_noactionbar_fullscreen_searchview_query_hint.png b/tests/tests/holo/res/drawable-ldpi/holo_noactionbar_fullscreen_searchview_query_hint.png
new file mode 100644
index 0000000..34a711e
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_noactionbar_fullscreen_searchview_query_hint.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_noactionbar_fullscreen_seekbar_0.png b/tests/tests/holo/res/drawable-ldpi/holo_noactionbar_fullscreen_seekbar_0.png
new file mode 100644
index 0000000..190a4c1
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_noactionbar_fullscreen_seekbar_0.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_noactionbar_fullscreen_seekbar_100.png b/tests/tests/holo/res/drawable-ldpi/holo_noactionbar_fullscreen_seekbar_100.png
new file mode 100644
index 0000000..8e53289
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_noactionbar_fullscreen_seekbar_100.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_noactionbar_fullscreen_seekbar_50.png b/tests/tests/holo/res/drawable-ldpi/holo_noactionbar_fullscreen_seekbar_50.png
new file mode 100644
index 0000000..421ca13
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_noactionbar_fullscreen_seekbar_50.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_noactionbar_fullscreen_spinner.png b/tests/tests/holo/res/drawable-ldpi/holo_noactionbar_fullscreen_spinner.png
new file mode 100644
index 0000000..0c2edf5
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_noactionbar_fullscreen_spinner.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_noactionbar_fullscreen_switch.png b/tests/tests/holo/res/drawable-ldpi/holo_noactionbar_fullscreen_switch.png
new file mode 100644
index 0000000..24ddf30
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_noactionbar_fullscreen_switch.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_noactionbar_fullscreen_switch_checked.png b/tests/tests/holo/res/drawable-ldpi/holo_noactionbar_fullscreen_switch_checked.png
new file mode 100644
index 0000000..6216a7d
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_noactionbar_fullscreen_switch_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_noactionbar_fullscreen_tabhost.png b/tests/tests/holo/res/drawable-ldpi/holo_noactionbar_fullscreen_tabhost.png
new file mode 100644
index 0000000..79b0338
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_noactionbar_fullscreen_tabhost.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_noactionbar_fullscreen_textview.png b/tests/tests/holo/res/drawable-ldpi/holo_noactionbar_fullscreen_textview.png
new file mode 100644
index 0000000..256a7c2
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_noactionbar_fullscreen_textview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_noactionbar_fullscreen_timepicker.png b/tests/tests/holo/res/drawable-ldpi/holo_noactionbar_fullscreen_timepicker.png
new file mode 100644
index 0000000..43e3494
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_noactionbar_fullscreen_timepicker.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_noactionbar_fullscreen_toggle_button.png b/tests/tests/holo/res/drawable-ldpi/holo_noactionbar_fullscreen_toggle_button.png
new file mode 100644
index 0000000..630353a
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_noactionbar_fullscreen_toggle_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_noactionbar_fullscreen_toggle_button_checked.png b/tests/tests/holo/res/drawable-ldpi/holo_noactionbar_fullscreen_toggle_button_checked.png
new file mode 100644
index 0000000..f1cf667
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_noactionbar_fullscreen_toggle_button_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_noactionbar_fullscreen_zoomcontrols.png b/tests/tests/holo/res/drawable-ldpi/holo_noactionbar_fullscreen_zoomcontrols.png
new file mode 100644
index 0000000..ab090a6
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_noactionbar_fullscreen_zoomcontrols.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_noactionbar_progressbar.png b/tests/tests/holo/res/drawable-ldpi/holo_noactionbar_progressbar.png
new file mode 100644
index 0000000..06fec8f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_noactionbar_progressbar.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_noactionbar_progressbar_horizontal_0.png b/tests/tests/holo/res/drawable-ldpi/holo_noactionbar_progressbar_horizontal_0.png
new file mode 100644
index 0000000..3ab1b88
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_noactionbar_progressbar_horizontal_0.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_noactionbar_progressbar_horizontal_100.png b/tests/tests/holo/res/drawable-ldpi/holo_noactionbar_progressbar_horizontal_100.png
new file mode 100644
index 0000000..2ccefc1
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_noactionbar_progressbar_horizontal_100.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_noactionbar_progressbar_horizontal_50.png b/tests/tests/holo/res/drawable-ldpi/holo_noactionbar_progressbar_horizontal_50.png
new file mode 100644
index 0000000..56239e3
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_noactionbar_progressbar_horizontal_50.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_noactionbar_progressbar_large.png b/tests/tests/holo/res/drawable-ldpi/holo_noactionbar_progressbar_large.png
new file mode 100644
index 0000000..fe29e1d
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_noactionbar_progressbar_large.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_noactionbar_progressbar_small.png b/tests/tests/holo/res/drawable-ldpi/holo_noactionbar_progressbar_small.png
new file mode 100644
index 0000000..28c0a40
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_noactionbar_progressbar_small.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_noactionbar_progressdialog_horizontal.png b/tests/tests/holo/res/drawable-ldpi/holo_noactionbar_progressdialog_horizontal.png
new file mode 100644
index 0000000..c602ac2
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_noactionbar_progressdialog_horizontal.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_noactionbar_radio_button.png b/tests/tests/holo/res/drawable-ldpi/holo_noactionbar_radio_button.png
new file mode 100644
index 0000000..96a4af9
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_noactionbar_radio_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_noactionbar_radio_button_checked.png b/tests/tests/holo/res/drawable-ldpi/holo_noactionbar_radio_button_checked.png
new file mode 100644
index 0000000..fa14bcb
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_noactionbar_radio_button_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_noactionbar_radiogroup_horizontal.png b/tests/tests/holo/res/drawable-ldpi/holo_noactionbar_radiogroup_horizontal.png
new file mode 100644
index 0000000..7184016
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_noactionbar_radiogroup_horizontal.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_noactionbar_radiogroup_vertical.png b/tests/tests/holo/res/drawable-ldpi/holo_noactionbar_radiogroup_vertical.png
new file mode 100644
index 0000000..b7927b1
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_noactionbar_radiogroup_vertical.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_noactionbar_ratingbar_0.png b/tests/tests/holo/res/drawable-ldpi/holo_noactionbar_ratingbar_0.png
new file mode 100644
index 0000000..88279b8
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_noactionbar_ratingbar_0.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_noactionbar_ratingbar_0_pressed.png b/tests/tests/holo/res/drawable-ldpi/holo_noactionbar_ratingbar_0_pressed.png
new file mode 100644
index 0000000..d4b841d
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_noactionbar_ratingbar_0_pressed.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_noactionbar_ratingbar_2point5.png b/tests/tests/holo/res/drawable-ldpi/holo_noactionbar_ratingbar_2point5.png
new file mode 100644
index 0000000..3e80e24
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_noactionbar_ratingbar_2point5.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_noactionbar_ratingbar_2point5_pressed.png b/tests/tests/holo/res/drawable-ldpi/holo_noactionbar_ratingbar_2point5_pressed.png
new file mode 100644
index 0000000..b0c4cf2
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_noactionbar_ratingbar_2point5_pressed.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_noactionbar_ratingbar_5.png b/tests/tests/holo/res/drawable-ldpi/holo_noactionbar_ratingbar_5.png
new file mode 100644
index 0000000..13eee57
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_noactionbar_ratingbar_5.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_noactionbar_ratingbar_5_pressed.png b/tests/tests/holo/res/drawable-ldpi/holo_noactionbar_ratingbar_5_pressed.png
new file mode 100644
index 0000000..ccd4d30
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_noactionbar_ratingbar_5_pressed.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_noactionbar_searchview.png b/tests/tests/holo/res/drawable-ldpi/holo_noactionbar_searchview.png
new file mode 100644
index 0000000..ca76a70
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_noactionbar_searchview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_noactionbar_searchview_query.png b/tests/tests/holo/res/drawable-ldpi/holo_noactionbar_searchview_query.png
new file mode 100644
index 0000000..061f026
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_noactionbar_searchview_query.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_noactionbar_searchview_query_hint.png b/tests/tests/holo/res/drawable-ldpi/holo_noactionbar_searchview_query_hint.png
new file mode 100644
index 0000000..34a711e
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_noactionbar_searchview_query_hint.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_noactionbar_seekbar_0.png b/tests/tests/holo/res/drawable-ldpi/holo_noactionbar_seekbar_0.png
new file mode 100644
index 0000000..190a4c1
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_noactionbar_seekbar_0.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_noactionbar_seekbar_100.png b/tests/tests/holo/res/drawable-ldpi/holo_noactionbar_seekbar_100.png
new file mode 100644
index 0000000..8e53289
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_noactionbar_seekbar_100.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_noactionbar_seekbar_50.png b/tests/tests/holo/res/drawable-ldpi/holo_noactionbar_seekbar_50.png
new file mode 100644
index 0000000..421ca13
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_noactionbar_seekbar_50.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_noactionbar_spinner.png b/tests/tests/holo/res/drawable-ldpi/holo_noactionbar_spinner.png
new file mode 100644
index 0000000..0c2edf5
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_noactionbar_spinner.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_noactionbar_switch.png b/tests/tests/holo/res/drawable-ldpi/holo_noactionbar_switch.png
new file mode 100644
index 0000000..24ddf30
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_noactionbar_switch.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_noactionbar_switch_checked.png b/tests/tests/holo/res/drawable-ldpi/holo_noactionbar_switch_checked.png
new file mode 100644
index 0000000..6216a7d
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_noactionbar_switch_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_noactionbar_tabhost.png b/tests/tests/holo/res/drawable-ldpi/holo_noactionbar_tabhost.png
new file mode 100644
index 0000000..79b0338
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_noactionbar_tabhost.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_noactionbar_textview.png b/tests/tests/holo/res/drawable-ldpi/holo_noactionbar_textview.png
new file mode 100644
index 0000000..256a7c2
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_noactionbar_textview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_noactionbar_timepicker.png b/tests/tests/holo/res/drawable-ldpi/holo_noactionbar_timepicker.png
new file mode 100644
index 0000000..43e3494
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_noactionbar_timepicker.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_noactionbar_toggle_button.png b/tests/tests/holo/res/drawable-ldpi/holo_noactionbar_toggle_button.png
new file mode 100644
index 0000000..630353a
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_noactionbar_toggle_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_noactionbar_toggle_button_checked.png b/tests/tests/holo/res/drawable-ldpi/holo_noactionbar_toggle_button_checked.png
new file mode 100644
index 0000000..f1cf667
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_noactionbar_toggle_button_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_noactionbar_zoomcontrols.png b/tests/tests/holo/res/drawable-ldpi/holo_noactionbar_zoomcontrols.png
new file mode 100644
index 0000000..ab090a6
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_noactionbar_zoomcontrols.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_panel_alertdialog_list.png b/tests/tests/holo/res/drawable-ldpi/holo_panel_alertdialog_list.png
new file mode 100644
index 0000000..ca60c2f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_panel_alertdialog_list.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_panel_alertdialog_multichoice.png b/tests/tests/holo/res/drawable-ldpi/holo_panel_alertdialog_multichoice.png
new file mode 100644
index 0000000..ef5a620
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_panel_alertdialog_multichoice.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_panel_alertdialog_onebutton.png b/tests/tests/holo/res/drawable-ldpi/holo_panel_alertdialog_onebutton.png
new file mode 100644
index 0000000..6e67ae0
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_panel_alertdialog_onebutton.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_panel_alertdialog_singlechoice.png b/tests/tests/holo/res/drawable-ldpi/holo_panel_alertdialog_singlechoice.png
new file mode 100644
index 0000000..b66441a
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_panel_alertdialog_singlechoice.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_panel_alertdialog_threebuttons.png b/tests/tests/holo/res/drawable-ldpi/holo_panel_alertdialog_threebuttons.png
new file mode 100644
index 0000000..e5c6476
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_panel_alertdialog_threebuttons.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_panel_alertdialog_twobuttons.png b/tests/tests/holo/res/drawable-ldpi/holo_panel_alertdialog_twobuttons.png
new file mode 100644
index 0000000..65b1d05
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_panel_alertdialog_twobuttons.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_panel_button.png b/tests/tests/holo/res/drawable-ldpi/holo_panel_button.png
new file mode 100644
index 0000000..354ebd1
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_panel_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_panel_button_pressed.png b/tests/tests/holo/res/drawable-ldpi/holo_panel_button_pressed.png
new file mode 100644
index 0000000..2562c8c
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_panel_button_pressed.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_panel_calendar_view.png b/tests/tests/holo/res/drawable-ldpi/holo_panel_calendar_view.png
new file mode 100644
index 0000000..884bfc0
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_panel_calendar_view.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_panel_calendar_view_feb.png b/tests/tests/holo/res/drawable-ldpi/holo_panel_calendar_view_feb.png
new file mode 100644
index 0000000..fc65b4a
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_panel_calendar_view_feb.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_panel_checkbox.png b/tests/tests/holo/res/drawable-ldpi/holo_panel_checkbox.png
new file mode 100644
index 0000000..58b679e
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_panel_checkbox.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_panel_checkbox_checked.png b/tests/tests/holo/res/drawable-ldpi/holo_panel_checkbox_checked.png
new file mode 100644
index 0000000..894922c
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_panel_checkbox_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_panel_chronometer.png b/tests/tests/holo/res/drawable-ldpi/holo_panel_chronometer.png
new file mode 100644
index 0000000..dca49b0
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_panel_chronometer.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_panel_color_blue_bright.png b/tests/tests/holo/res/drawable-ldpi/holo_panel_color_blue_bright.png
new file mode 100644
index 0000000..feaec2c
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_panel_color_blue_bright.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_panel_color_blue_dark.png b/tests/tests/holo/res/drawable-ldpi/holo_panel_color_blue_dark.png
new file mode 100644
index 0000000..a8640c1
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_panel_color_blue_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_panel_color_blue_light.png b/tests/tests/holo/res/drawable-ldpi/holo_panel_color_blue_light.png
new file mode 100644
index 0000000..ae141af
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_panel_color_blue_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_panel_color_green_dark.png b/tests/tests/holo/res/drawable-ldpi/holo_panel_color_green_dark.png
new file mode 100644
index 0000000..0ee2324
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_panel_color_green_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_panel_color_green_light.png b/tests/tests/holo/res/drawable-ldpi/holo_panel_color_green_light.png
new file mode 100644
index 0000000..9ca63c5
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_panel_color_green_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_panel_color_orange_dark.png b/tests/tests/holo/res/drawable-ldpi/holo_panel_color_orange_dark.png
new file mode 100644
index 0000000..bc06b4f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_panel_color_orange_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_panel_color_orange_light.png b/tests/tests/holo/res/drawable-ldpi/holo_panel_color_orange_light.png
new file mode 100644
index 0000000..1495f82
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_panel_color_orange_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_panel_color_purple.png b/tests/tests/holo/res/drawable-ldpi/holo_panel_color_purple.png
new file mode 100644
index 0000000..9652f56
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_panel_color_purple.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_panel_color_red_dark.png b/tests/tests/holo/res/drawable-ldpi/holo_panel_color_red_dark.png
new file mode 100644
index 0000000..4acebf8
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_panel_color_red_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_panel_color_red_light.png b/tests/tests/holo/res/drawable-ldpi/holo_panel_color_red_light.png
new file mode 100644
index 0000000..d5b5742
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_panel_color_red_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_panel_edittext.png b/tests/tests/holo/res/drawable-ldpi/holo_panel_edittext.png
new file mode 100644
index 0000000..07a56b3
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_panel_edittext.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_panel_progressbar.png b/tests/tests/holo/res/drawable-ldpi/holo_panel_progressbar.png
new file mode 100644
index 0000000..06fec8f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_panel_progressbar.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_panel_progressbar_horizontal_0.png b/tests/tests/holo/res/drawable-ldpi/holo_panel_progressbar_horizontal_0.png
new file mode 100644
index 0000000..3ab1b88
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_panel_progressbar_horizontal_0.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_panel_progressbar_horizontal_100.png b/tests/tests/holo/res/drawable-ldpi/holo_panel_progressbar_horizontal_100.png
new file mode 100644
index 0000000..2ccefc1
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_panel_progressbar_horizontal_100.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_panel_progressbar_horizontal_50.png b/tests/tests/holo/res/drawable-ldpi/holo_panel_progressbar_horizontal_50.png
new file mode 100644
index 0000000..56239e3
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_panel_progressbar_horizontal_50.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_panel_progressbar_large.png b/tests/tests/holo/res/drawable-ldpi/holo_panel_progressbar_large.png
new file mode 100644
index 0000000..fe29e1d
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_panel_progressbar_large.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_panel_progressbar_small.png b/tests/tests/holo/res/drawable-ldpi/holo_panel_progressbar_small.png
new file mode 100644
index 0000000..28c0a40
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_panel_progressbar_small.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_panel_progressdialog_horizontal.png b/tests/tests/holo/res/drawable-ldpi/holo_panel_progressdialog_horizontal.png
new file mode 100644
index 0000000..c602ac2
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_panel_progressdialog_horizontal.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_panel_radio_button.png b/tests/tests/holo/res/drawable-ldpi/holo_panel_radio_button.png
new file mode 100644
index 0000000..96a4af9
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_panel_radio_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_panel_radio_button_checked.png b/tests/tests/holo/res/drawable-ldpi/holo_panel_radio_button_checked.png
new file mode 100644
index 0000000..fa14bcb
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_panel_radio_button_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_panel_radiogroup_horizontal.png b/tests/tests/holo/res/drawable-ldpi/holo_panel_radiogroup_horizontal.png
new file mode 100644
index 0000000..7184016
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_panel_radiogroup_horizontal.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_panel_radiogroup_vertical.png b/tests/tests/holo/res/drawable-ldpi/holo_panel_radiogroup_vertical.png
new file mode 100644
index 0000000..b7927b1
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_panel_radiogroup_vertical.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_panel_ratingbar_0.png b/tests/tests/holo/res/drawable-ldpi/holo_panel_ratingbar_0.png
new file mode 100644
index 0000000..88279b8
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_panel_ratingbar_0.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_panel_ratingbar_0_pressed.png b/tests/tests/holo/res/drawable-ldpi/holo_panel_ratingbar_0_pressed.png
new file mode 100644
index 0000000..d4b841d
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_panel_ratingbar_0_pressed.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_panel_ratingbar_2point5.png b/tests/tests/holo/res/drawable-ldpi/holo_panel_ratingbar_2point5.png
new file mode 100644
index 0000000..3e80e24
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_panel_ratingbar_2point5.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_panel_ratingbar_2point5_pressed.png b/tests/tests/holo/res/drawable-ldpi/holo_panel_ratingbar_2point5_pressed.png
new file mode 100644
index 0000000..b0c4cf2
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_panel_ratingbar_2point5_pressed.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_panel_ratingbar_5.png b/tests/tests/holo/res/drawable-ldpi/holo_panel_ratingbar_5.png
new file mode 100644
index 0000000..13eee57
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_panel_ratingbar_5.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_panel_ratingbar_5_pressed.png b/tests/tests/holo/res/drawable-ldpi/holo_panel_ratingbar_5_pressed.png
new file mode 100644
index 0000000..ccd4d30
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_panel_ratingbar_5_pressed.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_panel_searchview.png b/tests/tests/holo/res/drawable-ldpi/holo_panel_searchview.png
new file mode 100644
index 0000000..ca76a70
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_panel_searchview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_panel_searchview_query.png b/tests/tests/holo/res/drawable-ldpi/holo_panel_searchview_query.png
new file mode 100644
index 0000000..061f026
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_panel_searchview_query.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_panel_searchview_query_hint.png b/tests/tests/holo/res/drawable-ldpi/holo_panel_searchview_query_hint.png
new file mode 100644
index 0000000..34a711e
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_panel_searchview_query_hint.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_panel_seekbar_0.png b/tests/tests/holo/res/drawable-ldpi/holo_panel_seekbar_0.png
new file mode 100644
index 0000000..190a4c1
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_panel_seekbar_0.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_panel_seekbar_100.png b/tests/tests/holo/res/drawable-ldpi/holo_panel_seekbar_100.png
new file mode 100644
index 0000000..8e53289
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_panel_seekbar_100.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_panel_seekbar_50.png b/tests/tests/holo/res/drawable-ldpi/holo_panel_seekbar_50.png
new file mode 100644
index 0000000..421ca13
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_panel_seekbar_50.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_panel_spinner.png b/tests/tests/holo/res/drawable-ldpi/holo_panel_spinner.png
new file mode 100644
index 0000000..0c2edf5
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_panel_spinner.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_panel_switch.png b/tests/tests/holo/res/drawable-ldpi/holo_panel_switch.png
new file mode 100644
index 0000000..24ddf30
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_panel_switch.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_panel_switch_checked.png b/tests/tests/holo/res/drawable-ldpi/holo_panel_switch_checked.png
new file mode 100644
index 0000000..6216a7d
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_panel_switch_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_panel_tabhost.png b/tests/tests/holo/res/drawable-ldpi/holo_panel_tabhost.png
new file mode 100644
index 0000000..79b0338
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_panel_tabhost.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_panel_textview.png b/tests/tests/holo/res/drawable-ldpi/holo_panel_textview.png
new file mode 100644
index 0000000..256a7c2
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_panel_textview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_panel_timepicker.png b/tests/tests/holo/res/drawable-ldpi/holo_panel_timepicker.png
new file mode 100644
index 0000000..43e3494
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_panel_timepicker.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_panel_toggle_button.png b/tests/tests/holo/res/drawable-ldpi/holo_panel_toggle_button.png
new file mode 100644
index 0000000..630353a
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_panel_toggle_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_panel_toggle_button_checked.png b/tests/tests/holo/res/drawable-ldpi/holo_panel_toggle_button_checked.png
new file mode 100644
index 0000000..f1cf667
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_panel_toggle_button_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_panel_zoomcontrols.png b/tests/tests/holo/res/drawable-ldpi/holo_panel_zoomcontrols.png
new file mode 100644
index 0000000..ab090a6
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_panel_zoomcontrols.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_progressbar.png b/tests/tests/holo/res/drawable-ldpi/holo_progressbar.png
new file mode 100644
index 0000000..06fec8f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_progressbar.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_progressbar_horizontal_0.png b/tests/tests/holo/res/drawable-ldpi/holo_progressbar_horizontal_0.png
new file mode 100644
index 0000000..3ab1b88
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_progressbar_horizontal_0.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_progressbar_horizontal_100.png b/tests/tests/holo/res/drawable-ldpi/holo_progressbar_horizontal_100.png
new file mode 100644
index 0000000..2ccefc1
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_progressbar_horizontal_100.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_progressbar_horizontal_50.png b/tests/tests/holo/res/drawable-ldpi/holo_progressbar_horizontal_50.png
new file mode 100644
index 0000000..56239e3
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_progressbar_horizontal_50.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_progressbar_large.png b/tests/tests/holo/res/drawable-ldpi/holo_progressbar_large.png
new file mode 100644
index 0000000..fe29e1d
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_progressbar_large.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_progressbar_small.png b/tests/tests/holo/res/drawable-ldpi/holo_progressbar_small.png
new file mode 100644
index 0000000..28c0a40
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_progressbar_small.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_progressdialog_horizontal.png b/tests/tests/holo/res/drawable-ldpi/holo_progressdialog_horizontal.png
new file mode 100644
index 0000000..c602ac2
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_progressdialog_horizontal.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_radio_button.png b/tests/tests/holo/res/drawable-ldpi/holo_radio_button.png
new file mode 100644
index 0000000..96a4af9
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_radio_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_radio_button_checked.png b/tests/tests/holo/res/drawable-ldpi/holo_radio_button_checked.png
new file mode 100644
index 0000000..fa14bcb
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_radio_button_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_radiogroup_horizontal.png b/tests/tests/holo/res/drawable-ldpi/holo_radiogroup_horizontal.png
new file mode 100644
index 0000000..7184016
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_radiogroup_horizontal.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_radiogroup_vertical.png b/tests/tests/holo/res/drawable-ldpi/holo_radiogroup_vertical.png
new file mode 100644
index 0000000..b7927b1
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_radiogroup_vertical.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_ratingbar_0.png b/tests/tests/holo/res/drawable-ldpi/holo_ratingbar_0.png
new file mode 100644
index 0000000..88279b8
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_ratingbar_0.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_ratingbar_0_pressed.png b/tests/tests/holo/res/drawable-ldpi/holo_ratingbar_0_pressed.png
new file mode 100644
index 0000000..d4b841d
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_ratingbar_0_pressed.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_ratingbar_2point5.png b/tests/tests/holo/res/drawable-ldpi/holo_ratingbar_2point5.png
new file mode 100644
index 0000000..3e80e24
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_ratingbar_2point5.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_ratingbar_2point5_pressed.png b/tests/tests/holo/res/drawable-ldpi/holo_ratingbar_2point5_pressed.png
new file mode 100644
index 0000000..b0c4cf2
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_ratingbar_2point5_pressed.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_ratingbar_5.png b/tests/tests/holo/res/drawable-ldpi/holo_ratingbar_5.png
new file mode 100644
index 0000000..13eee57
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_ratingbar_5.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_ratingbar_5_pressed.png b/tests/tests/holo/res/drawable-ldpi/holo_ratingbar_5_pressed.png
new file mode 100644
index 0000000..ccd4d30
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_ratingbar_5_pressed.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_searchview.png b/tests/tests/holo/res/drawable-ldpi/holo_searchview.png
new file mode 100644
index 0000000..ca76a70
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_searchview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_searchview_query.png b/tests/tests/holo/res/drawable-ldpi/holo_searchview_query.png
new file mode 100644
index 0000000..061f026
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_searchview_query.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_searchview_query_hint.png b/tests/tests/holo/res/drawable-ldpi/holo_searchview_query_hint.png
new file mode 100644
index 0000000..34a711e
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_searchview_query_hint.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_seekbar_0.png b/tests/tests/holo/res/drawable-ldpi/holo_seekbar_0.png
new file mode 100644
index 0000000..190a4c1
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_seekbar_0.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_seekbar_100.png b/tests/tests/holo/res/drawable-ldpi/holo_seekbar_100.png
new file mode 100644
index 0000000..8e53289
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_seekbar_100.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_seekbar_50.png b/tests/tests/holo/res/drawable-ldpi/holo_seekbar_50.png
new file mode 100644
index 0000000..421ca13
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_seekbar_50.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_spinner.png b/tests/tests/holo/res/drawable-ldpi/holo_spinner.png
new file mode 100644
index 0000000..0c2edf5
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_spinner.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_switch.png b/tests/tests/holo/res/drawable-ldpi/holo_switch.png
new file mode 100644
index 0000000..24ddf30
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_switch.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_switch_checked.png b/tests/tests/holo/res/drawable-ldpi/holo_switch_checked.png
new file mode 100644
index 0000000..6216a7d
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_switch_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_tabhost.png b/tests/tests/holo/res/drawable-ldpi/holo_tabhost.png
new file mode 100644
index 0000000..79b0338
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_tabhost.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_textview.png b/tests/tests/holo/res/drawable-ldpi/holo_textview.png
new file mode 100644
index 0000000..256a7c2
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_textview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_timepicker.png b/tests/tests/holo/res/drawable-ldpi/holo_timepicker.png
new file mode 100644
index 0000000..43e3494
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_timepicker.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_toggle_button.png b/tests/tests/holo/res/drawable-ldpi/holo_toggle_button.png
new file mode 100644
index 0000000..630353a
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_toggle_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_toggle_button_checked.png b/tests/tests/holo/res/drawable-ldpi/holo_toggle_button_checked.png
new file mode 100644
index 0000000..f1cf667
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_toggle_button_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_wallpaper_alertdialog_list.png b/tests/tests/holo/res/drawable-ldpi/holo_wallpaper_alertdialog_list.png
new file mode 100644
index 0000000..ca60c2f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_wallpaper_alertdialog_list.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_wallpaper_alertdialog_multichoice.png b/tests/tests/holo/res/drawable-ldpi/holo_wallpaper_alertdialog_multichoice.png
new file mode 100644
index 0000000..ef5a620
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_wallpaper_alertdialog_multichoice.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_wallpaper_alertdialog_onebutton.png b/tests/tests/holo/res/drawable-ldpi/holo_wallpaper_alertdialog_onebutton.png
new file mode 100644
index 0000000..6e67ae0
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_wallpaper_alertdialog_onebutton.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_wallpaper_alertdialog_singlechoice.png b/tests/tests/holo/res/drawable-ldpi/holo_wallpaper_alertdialog_singlechoice.png
new file mode 100644
index 0000000..b66441a
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_wallpaper_alertdialog_singlechoice.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_wallpaper_alertdialog_threebuttons.png b/tests/tests/holo/res/drawable-ldpi/holo_wallpaper_alertdialog_threebuttons.png
new file mode 100644
index 0000000..e5c6476
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_wallpaper_alertdialog_threebuttons.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_wallpaper_alertdialog_twobuttons.png b/tests/tests/holo/res/drawable-ldpi/holo_wallpaper_alertdialog_twobuttons.png
new file mode 100644
index 0000000..65b1d05
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_wallpaper_alertdialog_twobuttons.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_wallpaper_button.png b/tests/tests/holo/res/drawable-ldpi/holo_wallpaper_button.png
new file mode 100644
index 0000000..354ebd1
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_wallpaper_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_wallpaper_button_pressed.png b/tests/tests/holo/res/drawable-ldpi/holo_wallpaper_button_pressed.png
new file mode 100644
index 0000000..2562c8c
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_wallpaper_button_pressed.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_wallpaper_calendar_view.png b/tests/tests/holo/res/drawable-ldpi/holo_wallpaper_calendar_view.png
new file mode 100644
index 0000000..884bfc0
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_wallpaper_calendar_view.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_wallpaper_calendar_view_feb.png b/tests/tests/holo/res/drawable-ldpi/holo_wallpaper_calendar_view_feb.png
new file mode 100644
index 0000000..fc65b4a
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_wallpaper_calendar_view_feb.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_wallpaper_checkbox.png b/tests/tests/holo/res/drawable-ldpi/holo_wallpaper_checkbox.png
new file mode 100644
index 0000000..58b679e
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_wallpaper_checkbox.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_wallpaper_checkbox_checked.png b/tests/tests/holo/res/drawable-ldpi/holo_wallpaper_checkbox_checked.png
new file mode 100644
index 0000000..894922c
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_wallpaper_checkbox_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_wallpaper_chronometer.png b/tests/tests/holo/res/drawable-ldpi/holo_wallpaper_chronometer.png
new file mode 100644
index 0000000..dca49b0
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_wallpaper_chronometer.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_wallpaper_color_blue_bright.png b/tests/tests/holo/res/drawable-ldpi/holo_wallpaper_color_blue_bright.png
new file mode 100644
index 0000000..feaec2c
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_wallpaper_color_blue_bright.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_wallpaper_color_blue_dark.png b/tests/tests/holo/res/drawable-ldpi/holo_wallpaper_color_blue_dark.png
new file mode 100644
index 0000000..a8640c1
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_wallpaper_color_blue_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_wallpaper_color_blue_light.png b/tests/tests/holo/res/drawable-ldpi/holo_wallpaper_color_blue_light.png
new file mode 100644
index 0000000..ae141af
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_wallpaper_color_blue_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_wallpaper_color_green_dark.png b/tests/tests/holo/res/drawable-ldpi/holo_wallpaper_color_green_dark.png
new file mode 100644
index 0000000..0ee2324
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_wallpaper_color_green_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_wallpaper_color_green_light.png b/tests/tests/holo/res/drawable-ldpi/holo_wallpaper_color_green_light.png
new file mode 100644
index 0000000..9ca63c5
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_wallpaper_color_green_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_wallpaper_color_orange_dark.png b/tests/tests/holo/res/drawable-ldpi/holo_wallpaper_color_orange_dark.png
new file mode 100644
index 0000000..bc06b4f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_wallpaper_color_orange_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_wallpaper_color_orange_light.png b/tests/tests/holo/res/drawable-ldpi/holo_wallpaper_color_orange_light.png
new file mode 100644
index 0000000..1495f82
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_wallpaper_color_orange_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_wallpaper_color_purple.png b/tests/tests/holo/res/drawable-ldpi/holo_wallpaper_color_purple.png
new file mode 100644
index 0000000..9652f56
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_wallpaper_color_purple.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_wallpaper_color_red_dark.png b/tests/tests/holo/res/drawable-ldpi/holo_wallpaper_color_red_dark.png
new file mode 100644
index 0000000..4acebf8
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_wallpaper_color_red_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_wallpaper_color_red_light.png b/tests/tests/holo/res/drawable-ldpi/holo_wallpaper_color_red_light.png
new file mode 100644
index 0000000..d5b5742
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_wallpaper_color_red_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_wallpaper_edittext.png b/tests/tests/holo/res/drawable-ldpi/holo_wallpaper_edittext.png
new file mode 100644
index 0000000..07a56b3
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_wallpaper_edittext.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_wallpaper_notitlebar_alertdialog_list.png b/tests/tests/holo/res/drawable-ldpi/holo_wallpaper_notitlebar_alertdialog_list.png
new file mode 100644
index 0000000..ca60c2f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_wallpaper_notitlebar_alertdialog_list.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_wallpaper_notitlebar_alertdialog_multichoice.png b/tests/tests/holo/res/drawable-ldpi/holo_wallpaper_notitlebar_alertdialog_multichoice.png
new file mode 100644
index 0000000..ef5a620
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_wallpaper_notitlebar_alertdialog_multichoice.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_wallpaper_notitlebar_alertdialog_onebutton.png b/tests/tests/holo/res/drawable-ldpi/holo_wallpaper_notitlebar_alertdialog_onebutton.png
new file mode 100644
index 0000000..6e67ae0
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_wallpaper_notitlebar_alertdialog_onebutton.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_wallpaper_notitlebar_alertdialog_singlechoice.png b/tests/tests/holo/res/drawable-ldpi/holo_wallpaper_notitlebar_alertdialog_singlechoice.png
new file mode 100644
index 0000000..b66441a
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_wallpaper_notitlebar_alertdialog_singlechoice.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_wallpaper_notitlebar_alertdialog_threebuttons.png b/tests/tests/holo/res/drawable-ldpi/holo_wallpaper_notitlebar_alertdialog_threebuttons.png
new file mode 100644
index 0000000..e5c6476
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_wallpaper_notitlebar_alertdialog_threebuttons.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_wallpaper_notitlebar_alertdialog_twobuttons.png b/tests/tests/holo/res/drawable-ldpi/holo_wallpaper_notitlebar_alertdialog_twobuttons.png
new file mode 100644
index 0000000..65b1d05
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_wallpaper_notitlebar_alertdialog_twobuttons.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_wallpaper_notitlebar_button.png b/tests/tests/holo/res/drawable-ldpi/holo_wallpaper_notitlebar_button.png
new file mode 100644
index 0000000..354ebd1
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_wallpaper_notitlebar_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_wallpaper_notitlebar_button_pressed.png b/tests/tests/holo/res/drawable-ldpi/holo_wallpaper_notitlebar_button_pressed.png
new file mode 100644
index 0000000..2562c8c
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_wallpaper_notitlebar_button_pressed.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_wallpaper_notitlebar_calendar_view.png b/tests/tests/holo/res/drawable-ldpi/holo_wallpaper_notitlebar_calendar_view.png
new file mode 100644
index 0000000..884bfc0
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_wallpaper_notitlebar_calendar_view.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_wallpaper_notitlebar_calendar_view_feb.png b/tests/tests/holo/res/drawable-ldpi/holo_wallpaper_notitlebar_calendar_view_feb.png
new file mode 100644
index 0000000..fc65b4a
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_wallpaper_notitlebar_calendar_view_feb.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_wallpaper_notitlebar_checkbox.png b/tests/tests/holo/res/drawable-ldpi/holo_wallpaper_notitlebar_checkbox.png
new file mode 100644
index 0000000..58b679e
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_wallpaper_notitlebar_checkbox.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_wallpaper_notitlebar_checkbox_checked.png b/tests/tests/holo/res/drawable-ldpi/holo_wallpaper_notitlebar_checkbox_checked.png
new file mode 100644
index 0000000..894922c
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_wallpaper_notitlebar_checkbox_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_wallpaper_notitlebar_chronometer.png b/tests/tests/holo/res/drawable-ldpi/holo_wallpaper_notitlebar_chronometer.png
new file mode 100644
index 0000000..dca49b0
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_wallpaper_notitlebar_chronometer.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_wallpaper_notitlebar_color_blue_bright.png b/tests/tests/holo/res/drawable-ldpi/holo_wallpaper_notitlebar_color_blue_bright.png
new file mode 100644
index 0000000..feaec2c
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_wallpaper_notitlebar_color_blue_bright.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_wallpaper_notitlebar_color_blue_dark.png b/tests/tests/holo/res/drawable-ldpi/holo_wallpaper_notitlebar_color_blue_dark.png
new file mode 100644
index 0000000..a8640c1
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_wallpaper_notitlebar_color_blue_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_wallpaper_notitlebar_color_blue_light.png b/tests/tests/holo/res/drawable-ldpi/holo_wallpaper_notitlebar_color_blue_light.png
new file mode 100644
index 0000000..ae141af
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_wallpaper_notitlebar_color_blue_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_wallpaper_notitlebar_color_green_dark.png b/tests/tests/holo/res/drawable-ldpi/holo_wallpaper_notitlebar_color_green_dark.png
new file mode 100644
index 0000000..0ee2324
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_wallpaper_notitlebar_color_green_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_wallpaper_notitlebar_color_green_light.png b/tests/tests/holo/res/drawable-ldpi/holo_wallpaper_notitlebar_color_green_light.png
new file mode 100644
index 0000000..9ca63c5
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_wallpaper_notitlebar_color_green_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_wallpaper_notitlebar_color_orange_dark.png b/tests/tests/holo/res/drawable-ldpi/holo_wallpaper_notitlebar_color_orange_dark.png
new file mode 100644
index 0000000..bc06b4f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_wallpaper_notitlebar_color_orange_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_wallpaper_notitlebar_color_orange_light.png b/tests/tests/holo/res/drawable-ldpi/holo_wallpaper_notitlebar_color_orange_light.png
new file mode 100644
index 0000000..1495f82
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_wallpaper_notitlebar_color_orange_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_wallpaper_notitlebar_color_purple.png b/tests/tests/holo/res/drawable-ldpi/holo_wallpaper_notitlebar_color_purple.png
new file mode 100644
index 0000000..9652f56
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_wallpaper_notitlebar_color_purple.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_wallpaper_notitlebar_color_red_dark.png b/tests/tests/holo/res/drawable-ldpi/holo_wallpaper_notitlebar_color_red_dark.png
new file mode 100644
index 0000000..4acebf8
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_wallpaper_notitlebar_color_red_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_wallpaper_notitlebar_color_red_light.png b/tests/tests/holo/res/drawable-ldpi/holo_wallpaper_notitlebar_color_red_light.png
new file mode 100644
index 0000000..d5b5742
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_wallpaper_notitlebar_color_red_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_wallpaper_notitlebar_edittext.png b/tests/tests/holo/res/drawable-ldpi/holo_wallpaper_notitlebar_edittext.png
new file mode 100644
index 0000000..07a56b3
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_wallpaper_notitlebar_edittext.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_wallpaper_notitlebar_progressbar.png b/tests/tests/holo/res/drawable-ldpi/holo_wallpaper_notitlebar_progressbar.png
new file mode 100644
index 0000000..06fec8f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_wallpaper_notitlebar_progressbar.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_wallpaper_notitlebar_progressbar_horizontal_0.png b/tests/tests/holo/res/drawable-ldpi/holo_wallpaper_notitlebar_progressbar_horizontal_0.png
new file mode 100644
index 0000000..3ab1b88
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_wallpaper_notitlebar_progressbar_horizontal_0.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_wallpaper_notitlebar_progressbar_horizontal_100.png b/tests/tests/holo/res/drawable-ldpi/holo_wallpaper_notitlebar_progressbar_horizontal_100.png
new file mode 100644
index 0000000..2ccefc1
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_wallpaper_notitlebar_progressbar_horizontal_100.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_wallpaper_notitlebar_progressbar_horizontal_50.png b/tests/tests/holo/res/drawable-ldpi/holo_wallpaper_notitlebar_progressbar_horizontal_50.png
new file mode 100644
index 0000000..56239e3
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_wallpaper_notitlebar_progressbar_horizontal_50.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_wallpaper_notitlebar_progressbar_large.png b/tests/tests/holo/res/drawable-ldpi/holo_wallpaper_notitlebar_progressbar_large.png
new file mode 100644
index 0000000..fe29e1d
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_wallpaper_notitlebar_progressbar_large.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_wallpaper_notitlebar_progressbar_small.png b/tests/tests/holo/res/drawable-ldpi/holo_wallpaper_notitlebar_progressbar_small.png
new file mode 100644
index 0000000..28c0a40
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_wallpaper_notitlebar_progressbar_small.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_wallpaper_notitlebar_progressdialog_horizontal.png b/tests/tests/holo/res/drawable-ldpi/holo_wallpaper_notitlebar_progressdialog_horizontal.png
new file mode 100644
index 0000000..c602ac2
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_wallpaper_notitlebar_progressdialog_horizontal.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_wallpaper_notitlebar_radio_button.png b/tests/tests/holo/res/drawable-ldpi/holo_wallpaper_notitlebar_radio_button.png
new file mode 100644
index 0000000..96a4af9
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_wallpaper_notitlebar_radio_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_wallpaper_notitlebar_radio_button_checked.png b/tests/tests/holo/res/drawable-ldpi/holo_wallpaper_notitlebar_radio_button_checked.png
new file mode 100644
index 0000000..fa14bcb
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_wallpaper_notitlebar_radio_button_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_wallpaper_notitlebar_radiogroup_horizontal.png b/tests/tests/holo/res/drawable-ldpi/holo_wallpaper_notitlebar_radiogroup_horizontal.png
new file mode 100644
index 0000000..7184016
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_wallpaper_notitlebar_radiogroup_horizontal.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_wallpaper_notitlebar_radiogroup_vertical.png b/tests/tests/holo/res/drawable-ldpi/holo_wallpaper_notitlebar_radiogroup_vertical.png
new file mode 100644
index 0000000..b7927b1
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_wallpaper_notitlebar_radiogroup_vertical.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_wallpaper_notitlebar_ratingbar_0.png b/tests/tests/holo/res/drawable-ldpi/holo_wallpaper_notitlebar_ratingbar_0.png
new file mode 100644
index 0000000..88279b8
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_wallpaper_notitlebar_ratingbar_0.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_wallpaper_notitlebar_ratingbar_0_pressed.png b/tests/tests/holo/res/drawable-ldpi/holo_wallpaper_notitlebar_ratingbar_0_pressed.png
new file mode 100644
index 0000000..d4b841d
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_wallpaper_notitlebar_ratingbar_0_pressed.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_wallpaper_notitlebar_ratingbar_2point5.png b/tests/tests/holo/res/drawable-ldpi/holo_wallpaper_notitlebar_ratingbar_2point5.png
new file mode 100644
index 0000000..3e80e24
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_wallpaper_notitlebar_ratingbar_2point5.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_wallpaper_notitlebar_ratingbar_2point5_pressed.png b/tests/tests/holo/res/drawable-ldpi/holo_wallpaper_notitlebar_ratingbar_2point5_pressed.png
new file mode 100644
index 0000000..b0c4cf2
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_wallpaper_notitlebar_ratingbar_2point5_pressed.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_wallpaper_notitlebar_ratingbar_5.png b/tests/tests/holo/res/drawable-ldpi/holo_wallpaper_notitlebar_ratingbar_5.png
new file mode 100644
index 0000000..13eee57
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_wallpaper_notitlebar_ratingbar_5.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_wallpaper_notitlebar_ratingbar_5_pressed.png b/tests/tests/holo/res/drawable-ldpi/holo_wallpaper_notitlebar_ratingbar_5_pressed.png
new file mode 100644
index 0000000..ccd4d30
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_wallpaper_notitlebar_ratingbar_5_pressed.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_wallpaper_notitlebar_searchview.png b/tests/tests/holo/res/drawable-ldpi/holo_wallpaper_notitlebar_searchview.png
new file mode 100644
index 0000000..ca76a70
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_wallpaper_notitlebar_searchview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_wallpaper_notitlebar_searchview_query.png b/tests/tests/holo/res/drawable-ldpi/holo_wallpaper_notitlebar_searchview_query.png
new file mode 100644
index 0000000..061f026
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_wallpaper_notitlebar_searchview_query.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_wallpaper_notitlebar_searchview_query_hint.png b/tests/tests/holo/res/drawable-ldpi/holo_wallpaper_notitlebar_searchview_query_hint.png
new file mode 100644
index 0000000..34a711e
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_wallpaper_notitlebar_searchview_query_hint.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_wallpaper_notitlebar_seekbar_0.png b/tests/tests/holo/res/drawable-ldpi/holo_wallpaper_notitlebar_seekbar_0.png
new file mode 100644
index 0000000..190a4c1
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_wallpaper_notitlebar_seekbar_0.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_wallpaper_notitlebar_seekbar_100.png b/tests/tests/holo/res/drawable-ldpi/holo_wallpaper_notitlebar_seekbar_100.png
new file mode 100644
index 0000000..8e53289
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_wallpaper_notitlebar_seekbar_100.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_wallpaper_notitlebar_seekbar_50.png b/tests/tests/holo/res/drawable-ldpi/holo_wallpaper_notitlebar_seekbar_50.png
new file mode 100644
index 0000000..421ca13
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_wallpaper_notitlebar_seekbar_50.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_wallpaper_notitlebar_spinner.png b/tests/tests/holo/res/drawable-ldpi/holo_wallpaper_notitlebar_spinner.png
new file mode 100644
index 0000000..0c2edf5
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_wallpaper_notitlebar_spinner.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_wallpaper_notitlebar_switch.png b/tests/tests/holo/res/drawable-ldpi/holo_wallpaper_notitlebar_switch.png
new file mode 100644
index 0000000..24ddf30
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_wallpaper_notitlebar_switch.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_wallpaper_notitlebar_switch_checked.png b/tests/tests/holo/res/drawable-ldpi/holo_wallpaper_notitlebar_switch_checked.png
new file mode 100644
index 0000000..6216a7d
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_wallpaper_notitlebar_switch_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_wallpaper_notitlebar_tabhost.png b/tests/tests/holo/res/drawable-ldpi/holo_wallpaper_notitlebar_tabhost.png
new file mode 100644
index 0000000..79b0338
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_wallpaper_notitlebar_tabhost.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_wallpaper_notitlebar_textview.png b/tests/tests/holo/res/drawable-ldpi/holo_wallpaper_notitlebar_textview.png
new file mode 100644
index 0000000..256a7c2
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_wallpaper_notitlebar_textview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_wallpaper_notitlebar_timepicker.png b/tests/tests/holo/res/drawable-ldpi/holo_wallpaper_notitlebar_timepicker.png
new file mode 100644
index 0000000..43e3494
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_wallpaper_notitlebar_timepicker.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_wallpaper_notitlebar_toggle_button.png b/tests/tests/holo/res/drawable-ldpi/holo_wallpaper_notitlebar_toggle_button.png
new file mode 100644
index 0000000..630353a
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_wallpaper_notitlebar_toggle_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_wallpaper_notitlebar_toggle_button_checked.png b/tests/tests/holo/res/drawable-ldpi/holo_wallpaper_notitlebar_toggle_button_checked.png
new file mode 100644
index 0000000..f1cf667
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_wallpaper_notitlebar_toggle_button_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_wallpaper_notitlebar_zoomcontrols.png b/tests/tests/holo/res/drawable-ldpi/holo_wallpaper_notitlebar_zoomcontrols.png
new file mode 100644
index 0000000..ab090a6
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_wallpaper_notitlebar_zoomcontrols.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_wallpaper_progressbar.png b/tests/tests/holo/res/drawable-ldpi/holo_wallpaper_progressbar.png
new file mode 100644
index 0000000..06fec8f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_wallpaper_progressbar.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_wallpaper_progressbar_horizontal_0.png b/tests/tests/holo/res/drawable-ldpi/holo_wallpaper_progressbar_horizontal_0.png
new file mode 100644
index 0000000..3ab1b88
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_wallpaper_progressbar_horizontal_0.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_wallpaper_progressbar_horizontal_100.png b/tests/tests/holo/res/drawable-ldpi/holo_wallpaper_progressbar_horizontal_100.png
new file mode 100644
index 0000000..2ccefc1
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_wallpaper_progressbar_horizontal_100.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_wallpaper_progressbar_horizontal_50.png b/tests/tests/holo/res/drawable-ldpi/holo_wallpaper_progressbar_horizontal_50.png
new file mode 100644
index 0000000..56239e3
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_wallpaper_progressbar_horizontal_50.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_wallpaper_progressbar_large.png b/tests/tests/holo/res/drawable-ldpi/holo_wallpaper_progressbar_large.png
new file mode 100644
index 0000000..fe29e1d
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_wallpaper_progressbar_large.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_wallpaper_progressbar_small.png b/tests/tests/holo/res/drawable-ldpi/holo_wallpaper_progressbar_small.png
new file mode 100644
index 0000000..28c0a40
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_wallpaper_progressbar_small.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_wallpaper_progressdialog_horizontal.png b/tests/tests/holo/res/drawable-ldpi/holo_wallpaper_progressdialog_horizontal.png
new file mode 100644
index 0000000..c602ac2
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_wallpaper_progressdialog_horizontal.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_wallpaper_radio_button.png b/tests/tests/holo/res/drawable-ldpi/holo_wallpaper_radio_button.png
new file mode 100644
index 0000000..96a4af9
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_wallpaper_radio_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_wallpaper_radio_button_checked.png b/tests/tests/holo/res/drawable-ldpi/holo_wallpaper_radio_button_checked.png
new file mode 100644
index 0000000..fa14bcb
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_wallpaper_radio_button_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_wallpaper_radiogroup_horizontal.png b/tests/tests/holo/res/drawable-ldpi/holo_wallpaper_radiogroup_horizontal.png
new file mode 100644
index 0000000..7184016
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_wallpaper_radiogroup_horizontal.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_wallpaper_radiogroup_vertical.png b/tests/tests/holo/res/drawable-ldpi/holo_wallpaper_radiogroup_vertical.png
new file mode 100644
index 0000000..b7927b1
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_wallpaper_radiogroup_vertical.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_wallpaper_ratingbar_0.png b/tests/tests/holo/res/drawable-ldpi/holo_wallpaper_ratingbar_0.png
new file mode 100644
index 0000000..88279b8
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_wallpaper_ratingbar_0.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_wallpaper_ratingbar_0_pressed.png b/tests/tests/holo/res/drawable-ldpi/holo_wallpaper_ratingbar_0_pressed.png
new file mode 100644
index 0000000..d4b841d
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_wallpaper_ratingbar_0_pressed.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_wallpaper_ratingbar_2point5.png b/tests/tests/holo/res/drawable-ldpi/holo_wallpaper_ratingbar_2point5.png
new file mode 100644
index 0000000..3e80e24
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_wallpaper_ratingbar_2point5.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_wallpaper_ratingbar_2point5_pressed.png b/tests/tests/holo/res/drawable-ldpi/holo_wallpaper_ratingbar_2point5_pressed.png
new file mode 100644
index 0000000..b0c4cf2
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_wallpaper_ratingbar_2point5_pressed.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_wallpaper_ratingbar_5.png b/tests/tests/holo/res/drawable-ldpi/holo_wallpaper_ratingbar_5.png
new file mode 100644
index 0000000..13eee57
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_wallpaper_ratingbar_5.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_wallpaper_ratingbar_5_pressed.png b/tests/tests/holo/res/drawable-ldpi/holo_wallpaper_ratingbar_5_pressed.png
new file mode 100644
index 0000000..ccd4d30
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_wallpaper_ratingbar_5_pressed.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_wallpaper_searchview.png b/tests/tests/holo/res/drawable-ldpi/holo_wallpaper_searchview.png
new file mode 100644
index 0000000..ca76a70
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_wallpaper_searchview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_wallpaper_searchview_query.png b/tests/tests/holo/res/drawable-ldpi/holo_wallpaper_searchview_query.png
new file mode 100644
index 0000000..061f026
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_wallpaper_searchview_query.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_wallpaper_searchview_query_hint.png b/tests/tests/holo/res/drawable-ldpi/holo_wallpaper_searchview_query_hint.png
new file mode 100644
index 0000000..34a711e
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_wallpaper_searchview_query_hint.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_wallpaper_seekbar_0.png b/tests/tests/holo/res/drawable-ldpi/holo_wallpaper_seekbar_0.png
new file mode 100644
index 0000000..190a4c1
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_wallpaper_seekbar_0.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_wallpaper_seekbar_100.png b/tests/tests/holo/res/drawable-ldpi/holo_wallpaper_seekbar_100.png
new file mode 100644
index 0000000..8e53289
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_wallpaper_seekbar_100.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_wallpaper_seekbar_50.png b/tests/tests/holo/res/drawable-ldpi/holo_wallpaper_seekbar_50.png
new file mode 100644
index 0000000..421ca13
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_wallpaper_seekbar_50.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_wallpaper_spinner.png b/tests/tests/holo/res/drawable-ldpi/holo_wallpaper_spinner.png
new file mode 100644
index 0000000..0c2edf5
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_wallpaper_spinner.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_wallpaper_switch.png b/tests/tests/holo/res/drawable-ldpi/holo_wallpaper_switch.png
new file mode 100644
index 0000000..24ddf30
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_wallpaper_switch.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_wallpaper_switch_checked.png b/tests/tests/holo/res/drawable-ldpi/holo_wallpaper_switch_checked.png
new file mode 100644
index 0000000..6216a7d
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_wallpaper_switch_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_wallpaper_tabhost.png b/tests/tests/holo/res/drawable-ldpi/holo_wallpaper_tabhost.png
new file mode 100644
index 0000000..79b0338
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_wallpaper_tabhost.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_wallpaper_textview.png b/tests/tests/holo/res/drawable-ldpi/holo_wallpaper_textview.png
new file mode 100644
index 0000000..256a7c2
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_wallpaper_textview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_wallpaper_timepicker.png b/tests/tests/holo/res/drawable-ldpi/holo_wallpaper_timepicker.png
new file mode 100644
index 0000000..43e3494
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_wallpaper_timepicker.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_wallpaper_toggle_button.png b/tests/tests/holo/res/drawable-ldpi/holo_wallpaper_toggle_button.png
new file mode 100644
index 0000000..630353a
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_wallpaper_toggle_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_wallpaper_toggle_button_checked.png b/tests/tests/holo/res/drawable-ldpi/holo_wallpaper_toggle_button_checked.png
new file mode 100644
index 0000000..f1cf667
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_wallpaper_toggle_button_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_wallpaper_zoomcontrols.png b/tests/tests/holo/res/drawable-ldpi/holo_wallpaper_zoomcontrols.png
new file mode 100644
index 0000000..ab090a6
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_wallpaper_zoomcontrols.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-ldpi/holo_zoomcontrols.png b/tests/tests/holo/res/drawable-ldpi/holo_zoomcontrols.png
new file mode 100644
index 0000000..ab090a6
--- /dev/null
+++ b/tests/tests/holo/res/drawable-ldpi/holo_zoomcontrols.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_button.png b/tests/tests/holo/res/drawable-mdpi/holo_button.png
new file mode 100644
index 0000000..6d81450
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_calendar_view.png b/tests/tests/holo/res/drawable-mdpi/holo_calendar_view.png
new file mode 100644
index 0000000..50d00ab
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_calendar_view.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_calendar_view_feb.png b/tests/tests/holo/res/drawable-mdpi/holo_calendar_view_feb.png
new file mode 100644
index 0000000..aed3bc0
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_calendar_view_feb.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_checkbox.png b/tests/tests/holo/res/drawable-mdpi/holo_checkbox.png
new file mode 100644
index 0000000..63dc6ed
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_checkbox.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_checkbox_checked.png b/tests/tests/holo/res/drawable-mdpi/holo_checkbox_checked.png
new file mode 100644
index 0000000..a0f737c
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_checkbox_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_chronometer.png b/tests/tests/holo/res/drawable-mdpi/holo_chronometer.png
new file mode 100644
index 0000000..a4e7093
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_chronometer.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_color_blue_bright.png b/tests/tests/holo/res/drawable-mdpi/holo_color_blue_bright.png
new file mode 100644
index 0000000..fe1bdd7
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_color_blue_bright.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_color_blue_dark.png b/tests/tests/holo/res/drawable-mdpi/holo_color_blue_dark.png
new file mode 100644
index 0000000..f3f0640
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_color_blue_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_color_blue_light.png b/tests/tests/holo/res/drawable-mdpi/holo_color_blue_light.png
new file mode 100644
index 0000000..285d925
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_color_blue_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_color_green_dark.png b/tests/tests/holo/res/drawable-mdpi/holo_color_green_dark.png
new file mode 100644
index 0000000..cfbbdd4
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_color_green_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_color_green_light.png b/tests/tests/holo/res/drawable-mdpi/holo_color_green_light.png
new file mode 100644
index 0000000..a691827
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_color_green_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_color_orange_dark.png b/tests/tests/holo/res/drawable-mdpi/holo_color_orange_dark.png
new file mode 100644
index 0000000..3f0e99a
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_color_orange_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_color_orange_light.png b/tests/tests/holo/res/drawable-mdpi/holo_color_orange_light.png
new file mode 100644
index 0000000..f54fd64
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_color_orange_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_color_purple.png b/tests/tests/holo/res/drawable-mdpi/holo_color_purple.png
new file mode 100644
index 0000000..15c9494
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_color_purple.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_color_red_dark.png b/tests/tests/holo/res/drawable-mdpi/holo_color_red_dark.png
new file mode 100644
index 0000000..de3385d
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_color_red_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_color_red_light.png b/tests/tests/holo/res/drawable-mdpi/holo_color_red_light.png
new file mode 100644
index 0000000..dde4043
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_color_red_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_dialog_button.png b/tests/tests/holo/res/drawable-mdpi/holo_dialog_button.png
new file mode 100644
index 0000000..6d81450
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_dialog_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_dialog_calendar_view.png b/tests/tests/holo/res/drawable-mdpi/holo_dialog_calendar_view.png
new file mode 100644
index 0000000..50d00ab
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_dialog_calendar_view.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_dialog_calendar_view_feb.png b/tests/tests/holo/res/drawable-mdpi/holo_dialog_calendar_view_feb.png
new file mode 100644
index 0000000..aed3bc0
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_dialog_calendar_view_feb.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_dialog_checkbox.png b/tests/tests/holo/res/drawable-mdpi/holo_dialog_checkbox.png
new file mode 100644
index 0000000..63dc6ed
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_dialog_checkbox.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_dialog_checkbox_checked.png b/tests/tests/holo/res/drawable-mdpi/holo_dialog_checkbox_checked.png
new file mode 100644
index 0000000..a0f737c
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_dialog_checkbox_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_dialog_chronometer.png b/tests/tests/holo/res/drawable-mdpi/holo_dialog_chronometer.png
new file mode 100644
index 0000000..a4e7093
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_dialog_chronometer.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_dialog_color_blue_bright.png b/tests/tests/holo/res/drawable-mdpi/holo_dialog_color_blue_bright.png
new file mode 100644
index 0000000..fe1bdd7
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_dialog_color_blue_bright.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_dialog_color_blue_dark.png b/tests/tests/holo/res/drawable-mdpi/holo_dialog_color_blue_dark.png
new file mode 100644
index 0000000..f3f0640
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_dialog_color_blue_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_dialog_color_blue_light.png b/tests/tests/holo/res/drawable-mdpi/holo_dialog_color_blue_light.png
new file mode 100644
index 0000000..285d925
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_dialog_color_blue_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_dialog_color_green_dark.png b/tests/tests/holo/res/drawable-mdpi/holo_dialog_color_green_dark.png
new file mode 100644
index 0000000..cfbbdd4
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_dialog_color_green_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_dialog_color_green_light.png b/tests/tests/holo/res/drawable-mdpi/holo_dialog_color_green_light.png
new file mode 100644
index 0000000..a691827
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_dialog_color_green_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_dialog_color_orange_dark.png b/tests/tests/holo/res/drawable-mdpi/holo_dialog_color_orange_dark.png
new file mode 100644
index 0000000..3f0e99a
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_dialog_color_orange_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_dialog_color_orange_light.png b/tests/tests/holo/res/drawable-mdpi/holo_dialog_color_orange_light.png
new file mode 100644
index 0000000..f54fd64
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_dialog_color_orange_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_dialog_color_purple.png b/tests/tests/holo/res/drawable-mdpi/holo_dialog_color_purple.png
new file mode 100644
index 0000000..15c9494
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_dialog_color_purple.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_dialog_color_red_dark.png b/tests/tests/holo/res/drawable-mdpi/holo_dialog_color_red_dark.png
new file mode 100644
index 0000000..de3385d
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_dialog_color_red_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_dialog_color_red_light.png b/tests/tests/holo/res/drawable-mdpi/holo_dialog_color_red_light.png
new file mode 100644
index 0000000..dde4043
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_dialog_color_red_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_dialog_edittext.png b/tests/tests/holo/res/drawable-mdpi/holo_dialog_edittext.png
new file mode 100644
index 0000000..6fabb7e
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_dialog_edittext.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_dialog_minwidth_button.png b/tests/tests/holo/res/drawable-mdpi/holo_dialog_minwidth_button.png
new file mode 100644
index 0000000..6d81450
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_dialog_minwidth_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_dialog_minwidth_calendar_view.png b/tests/tests/holo/res/drawable-mdpi/holo_dialog_minwidth_calendar_view.png
new file mode 100644
index 0000000..50d00ab
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_dialog_minwidth_calendar_view.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_dialog_minwidth_calendar_view_feb.png b/tests/tests/holo/res/drawable-mdpi/holo_dialog_minwidth_calendar_view_feb.png
new file mode 100644
index 0000000..aed3bc0
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_dialog_minwidth_calendar_view_feb.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_dialog_minwidth_checkbox.png b/tests/tests/holo/res/drawable-mdpi/holo_dialog_minwidth_checkbox.png
new file mode 100644
index 0000000..63dc6ed
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_dialog_minwidth_checkbox.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_dialog_minwidth_checkbox_checked.png b/tests/tests/holo/res/drawable-mdpi/holo_dialog_minwidth_checkbox_checked.png
new file mode 100644
index 0000000..a0f737c
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_dialog_minwidth_checkbox_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_dialog_minwidth_chronometer.png b/tests/tests/holo/res/drawable-mdpi/holo_dialog_minwidth_chronometer.png
new file mode 100644
index 0000000..a4e7093
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_dialog_minwidth_chronometer.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_dialog_minwidth_color_blue_bright.png b/tests/tests/holo/res/drawable-mdpi/holo_dialog_minwidth_color_blue_bright.png
new file mode 100644
index 0000000..fe1bdd7
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_dialog_minwidth_color_blue_bright.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_dialog_minwidth_color_blue_dark.png b/tests/tests/holo/res/drawable-mdpi/holo_dialog_minwidth_color_blue_dark.png
new file mode 100644
index 0000000..f3f0640
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_dialog_minwidth_color_blue_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_dialog_minwidth_color_blue_light.png b/tests/tests/holo/res/drawable-mdpi/holo_dialog_minwidth_color_blue_light.png
new file mode 100644
index 0000000..285d925
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_dialog_minwidth_color_blue_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_dialog_minwidth_color_green_dark.png b/tests/tests/holo/res/drawable-mdpi/holo_dialog_minwidth_color_green_dark.png
new file mode 100644
index 0000000..cfbbdd4
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_dialog_minwidth_color_green_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_dialog_minwidth_color_green_light.png b/tests/tests/holo/res/drawable-mdpi/holo_dialog_minwidth_color_green_light.png
new file mode 100644
index 0000000..a691827
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_dialog_minwidth_color_green_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_dialog_minwidth_color_orange_dark.png b/tests/tests/holo/res/drawable-mdpi/holo_dialog_minwidth_color_orange_dark.png
new file mode 100644
index 0000000..3f0e99a
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_dialog_minwidth_color_orange_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_dialog_minwidth_color_orange_light.png b/tests/tests/holo/res/drawable-mdpi/holo_dialog_minwidth_color_orange_light.png
new file mode 100644
index 0000000..f54fd64
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_dialog_minwidth_color_orange_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_dialog_minwidth_color_purple.png b/tests/tests/holo/res/drawable-mdpi/holo_dialog_minwidth_color_purple.png
new file mode 100644
index 0000000..15c9494
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_dialog_minwidth_color_purple.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_dialog_minwidth_color_red_dark.png b/tests/tests/holo/res/drawable-mdpi/holo_dialog_minwidth_color_red_dark.png
new file mode 100644
index 0000000..de3385d
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_dialog_minwidth_color_red_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_dialog_minwidth_color_red_light.png b/tests/tests/holo/res/drawable-mdpi/holo_dialog_minwidth_color_red_light.png
new file mode 100644
index 0000000..dde4043
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_dialog_minwidth_color_red_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_dialog_minwidth_edittext.png b/tests/tests/holo/res/drawable-mdpi/holo_dialog_minwidth_edittext.png
new file mode 100644
index 0000000..6fabb7e
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_dialog_minwidth_edittext.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_dialog_minwidth_progressbar.png b/tests/tests/holo/res/drawable-mdpi/holo_dialog_minwidth_progressbar.png
new file mode 100644
index 0000000..d027b03
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_dialog_minwidth_progressbar.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_dialog_minwidth_progressbar_horizontal_0.png b/tests/tests/holo/res/drawable-mdpi/holo_dialog_minwidth_progressbar_horizontal_0.png
new file mode 100644
index 0000000..a73db14
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_dialog_minwidth_progressbar_horizontal_0.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_dialog_minwidth_progressbar_horizontal_100.png b/tests/tests/holo/res/drawable-mdpi/holo_dialog_minwidth_progressbar_horizontal_100.png
new file mode 100644
index 0000000..2813c84
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_dialog_minwidth_progressbar_horizontal_100.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_dialog_minwidth_progressbar_horizontal_50.png b/tests/tests/holo/res/drawable-mdpi/holo_dialog_minwidth_progressbar_horizontal_50.png
new file mode 100644
index 0000000..d5c65a9
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_dialog_minwidth_progressbar_horizontal_50.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_dialog_minwidth_progressbar_large.png b/tests/tests/holo/res/drawable-mdpi/holo_dialog_minwidth_progressbar_large.png
new file mode 100644
index 0000000..50301a4
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_dialog_minwidth_progressbar_large.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_dialog_minwidth_progressbar_small.png b/tests/tests/holo/res/drawable-mdpi/holo_dialog_minwidth_progressbar_small.png
new file mode 100644
index 0000000..1240e6a
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_dialog_minwidth_progressbar_small.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_dialog_minwidth_radio_button.png b/tests/tests/holo/res/drawable-mdpi/holo_dialog_minwidth_radio_button.png
new file mode 100644
index 0000000..813b9ee
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_dialog_minwidth_radio_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_dialog_minwidth_radio_button_checked.png b/tests/tests/holo/res/drawable-mdpi/holo_dialog_minwidth_radio_button_checked.png
new file mode 100644
index 0000000..ca4a1b7
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_dialog_minwidth_radio_button_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_dialog_minwidth_radiogroup_horizontal.png b/tests/tests/holo/res/drawable-mdpi/holo_dialog_minwidth_radiogroup_horizontal.png
new file mode 100644
index 0000000..944e7a4
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_dialog_minwidth_radiogroup_horizontal.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_dialog_minwidth_radiogroup_vertical.png b/tests/tests/holo/res/drawable-mdpi/holo_dialog_minwidth_radiogroup_vertical.png
new file mode 100644
index 0000000..e9aecf8
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_dialog_minwidth_radiogroup_vertical.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_dialog_minwidth_ratingbar_0.png b/tests/tests/holo/res/drawable-mdpi/holo_dialog_minwidth_ratingbar_0.png
new file mode 100644
index 0000000..00a9aab
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_dialog_minwidth_ratingbar_0.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_dialog_minwidth_ratingbar_2point5.png b/tests/tests/holo/res/drawable-mdpi/holo_dialog_minwidth_ratingbar_2point5.png
new file mode 100644
index 0000000..88725b1
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_dialog_minwidth_ratingbar_2point5.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_dialog_minwidth_ratingbar_5.png b/tests/tests/holo/res/drawable-mdpi/holo_dialog_minwidth_ratingbar_5.png
new file mode 100644
index 0000000..f62fa44
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_dialog_minwidth_ratingbar_5.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_dialog_minwidth_searchview.png b/tests/tests/holo/res/drawable-mdpi/holo_dialog_minwidth_searchview.png
new file mode 100644
index 0000000..06ec15b
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_dialog_minwidth_searchview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_dialog_minwidth_searchview_query.png b/tests/tests/holo/res/drawable-mdpi/holo_dialog_minwidth_searchview_query.png
new file mode 100644
index 0000000..e6e3646
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_dialog_minwidth_searchview_query.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_dialog_minwidth_searchview_query_hint.png b/tests/tests/holo/res/drawable-mdpi/holo_dialog_minwidth_searchview_query_hint.png
new file mode 100644
index 0000000..df6d421
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_dialog_minwidth_searchview_query_hint.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_dialog_minwidth_seekbar_0.png b/tests/tests/holo/res/drawable-mdpi/holo_dialog_minwidth_seekbar_0.png
new file mode 100644
index 0000000..6ef0c71
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_dialog_minwidth_seekbar_0.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_dialog_minwidth_seekbar_100.png b/tests/tests/holo/res/drawable-mdpi/holo_dialog_minwidth_seekbar_100.png
new file mode 100644
index 0000000..5be0453
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_dialog_minwidth_seekbar_100.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_dialog_minwidth_seekbar_50.png b/tests/tests/holo/res/drawable-mdpi/holo_dialog_minwidth_seekbar_50.png
new file mode 100644
index 0000000..3ba6228
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_dialog_minwidth_seekbar_50.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_dialog_minwidth_spinner.png b/tests/tests/holo/res/drawable-mdpi/holo_dialog_minwidth_spinner.png
new file mode 100644
index 0000000..7b14cc0
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_dialog_minwidth_spinner.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_dialog_minwidth_switch.png b/tests/tests/holo/res/drawable-mdpi/holo_dialog_minwidth_switch.png
new file mode 100644
index 0000000..a1beda8
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_dialog_minwidth_switch.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_dialog_minwidth_switch_checked.png b/tests/tests/holo/res/drawable-mdpi/holo_dialog_minwidth_switch_checked.png
new file mode 100644
index 0000000..a5e17d3
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_dialog_minwidth_switch_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_dialog_minwidth_tabhost.png b/tests/tests/holo/res/drawable-mdpi/holo_dialog_minwidth_tabhost.png
new file mode 100644
index 0000000..6c1595c
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_dialog_minwidth_tabhost.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_dialog_minwidth_textview.png b/tests/tests/holo/res/drawable-mdpi/holo_dialog_minwidth_textview.png
new file mode 100644
index 0000000..1ccf89f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_dialog_minwidth_textview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_dialog_minwidth_timepicker.png b/tests/tests/holo/res/drawable-mdpi/holo_dialog_minwidth_timepicker.png
new file mode 100644
index 0000000..86802e3
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_dialog_minwidth_timepicker.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_dialog_minwidth_toggle_button.png b/tests/tests/holo/res/drawable-mdpi/holo_dialog_minwidth_toggle_button.png
new file mode 100644
index 0000000..948e1b8
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_dialog_minwidth_toggle_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_dialog_minwidth_toggle_button_checked.png b/tests/tests/holo/res/drawable-mdpi/holo_dialog_minwidth_toggle_button_checked.png
new file mode 100644
index 0000000..c89fae2
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_dialog_minwidth_toggle_button_checked.png
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_land_zoomcontrols.png b/tests/tests/holo/res/drawable-mdpi/holo_dialog_minwidth_zoomcontrols.png
similarity index 100%
copy from tests/res/drawable-mdpi/holo_land_zoomcontrols.png
copy to tests/tests/holo/res/drawable-mdpi/holo_dialog_minwidth_zoomcontrols.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_dialog_noactionbar_button.png b/tests/tests/holo/res/drawable-mdpi/holo_dialog_noactionbar_button.png
new file mode 100644
index 0000000..6d81450
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_dialog_noactionbar_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_dialog_noactionbar_calendar_view.png b/tests/tests/holo/res/drawable-mdpi/holo_dialog_noactionbar_calendar_view.png
new file mode 100644
index 0000000..50d00ab
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_dialog_noactionbar_calendar_view.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_dialog_noactionbar_calendar_view_feb.png b/tests/tests/holo/res/drawable-mdpi/holo_dialog_noactionbar_calendar_view_feb.png
new file mode 100644
index 0000000..aed3bc0
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_dialog_noactionbar_calendar_view_feb.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_dialog_noactionbar_checkbox.png b/tests/tests/holo/res/drawable-mdpi/holo_dialog_noactionbar_checkbox.png
new file mode 100644
index 0000000..63dc6ed
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_dialog_noactionbar_checkbox.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_dialog_noactionbar_checkbox_checked.png b/tests/tests/holo/res/drawable-mdpi/holo_dialog_noactionbar_checkbox_checked.png
new file mode 100644
index 0000000..a0f737c
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_dialog_noactionbar_checkbox_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_dialog_noactionbar_chronometer.png b/tests/tests/holo/res/drawable-mdpi/holo_dialog_noactionbar_chronometer.png
new file mode 100644
index 0000000..a4e7093
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_dialog_noactionbar_chronometer.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_dialog_noactionbar_color_blue_bright.png b/tests/tests/holo/res/drawable-mdpi/holo_dialog_noactionbar_color_blue_bright.png
new file mode 100644
index 0000000..fe1bdd7
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_dialog_noactionbar_color_blue_bright.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_dialog_noactionbar_color_blue_dark.png b/tests/tests/holo/res/drawable-mdpi/holo_dialog_noactionbar_color_blue_dark.png
new file mode 100644
index 0000000..f3f0640
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_dialog_noactionbar_color_blue_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_dialog_noactionbar_color_blue_light.png b/tests/tests/holo/res/drawable-mdpi/holo_dialog_noactionbar_color_blue_light.png
new file mode 100644
index 0000000..285d925
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_dialog_noactionbar_color_blue_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_dialog_noactionbar_color_green_dark.png b/tests/tests/holo/res/drawable-mdpi/holo_dialog_noactionbar_color_green_dark.png
new file mode 100644
index 0000000..cfbbdd4
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_dialog_noactionbar_color_green_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_dialog_noactionbar_color_green_light.png b/tests/tests/holo/res/drawable-mdpi/holo_dialog_noactionbar_color_green_light.png
new file mode 100644
index 0000000..a691827
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_dialog_noactionbar_color_green_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_dialog_noactionbar_color_orange_dark.png b/tests/tests/holo/res/drawable-mdpi/holo_dialog_noactionbar_color_orange_dark.png
new file mode 100644
index 0000000..3f0e99a
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_dialog_noactionbar_color_orange_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_dialog_noactionbar_color_orange_light.png b/tests/tests/holo/res/drawable-mdpi/holo_dialog_noactionbar_color_orange_light.png
new file mode 100644
index 0000000..f54fd64
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_dialog_noactionbar_color_orange_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_dialog_noactionbar_color_purple.png b/tests/tests/holo/res/drawable-mdpi/holo_dialog_noactionbar_color_purple.png
new file mode 100644
index 0000000..15c9494
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_dialog_noactionbar_color_purple.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_dialog_noactionbar_color_red_dark.png b/tests/tests/holo/res/drawable-mdpi/holo_dialog_noactionbar_color_red_dark.png
new file mode 100644
index 0000000..de3385d
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_dialog_noactionbar_color_red_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_dialog_noactionbar_color_red_light.png b/tests/tests/holo/res/drawable-mdpi/holo_dialog_noactionbar_color_red_light.png
new file mode 100644
index 0000000..dde4043
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_dialog_noactionbar_color_red_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_dialog_noactionbar_edittext.png b/tests/tests/holo/res/drawable-mdpi/holo_dialog_noactionbar_edittext.png
new file mode 100644
index 0000000..6fabb7e
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_dialog_noactionbar_edittext.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_dialog_noactionbar_minwidth_button.png b/tests/tests/holo/res/drawable-mdpi/holo_dialog_noactionbar_minwidth_button.png
new file mode 100644
index 0000000..6d81450
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_dialog_noactionbar_minwidth_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_dialog_noactionbar_minwidth_calendar_view.png b/tests/tests/holo/res/drawable-mdpi/holo_dialog_noactionbar_minwidth_calendar_view.png
new file mode 100644
index 0000000..50d00ab
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_dialog_noactionbar_minwidth_calendar_view.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_dialog_noactionbar_minwidth_calendar_view_feb.png b/tests/tests/holo/res/drawable-mdpi/holo_dialog_noactionbar_minwidth_calendar_view_feb.png
new file mode 100644
index 0000000..aed3bc0
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_dialog_noactionbar_minwidth_calendar_view_feb.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_dialog_noactionbar_minwidth_checkbox.png b/tests/tests/holo/res/drawable-mdpi/holo_dialog_noactionbar_minwidth_checkbox.png
new file mode 100644
index 0000000..63dc6ed
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_dialog_noactionbar_minwidth_checkbox.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_dialog_noactionbar_minwidth_checkbox_checked.png b/tests/tests/holo/res/drawable-mdpi/holo_dialog_noactionbar_minwidth_checkbox_checked.png
new file mode 100644
index 0000000..a0f737c
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_dialog_noactionbar_minwidth_checkbox_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_dialog_noactionbar_minwidth_chronometer.png b/tests/tests/holo/res/drawable-mdpi/holo_dialog_noactionbar_minwidth_chronometer.png
new file mode 100644
index 0000000..a4e7093
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_dialog_noactionbar_minwidth_chronometer.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_dialog_noactionbar_minwidth_color_blue_bright.png b/tests/tests/holo/res/drawable-mdpi/holo_dialog_noactionbar_minwidth_color_blue_bright.png
new file mode 100644
index 0000000..fe1bdd7
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_dialog_noactionbar_minwidth_color_blue_bright.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_dialog_noactionbar_minwidth_color_blue_dark.png b/tests/tests/holo/res/drawable-mdpi/holo_dialog_noactionbar_minwidth_color_blue_dark.png
new file mode 100644
index 0000000..f3f0640
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_dialog_noactionbar_minwidth_color_blue_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_dialog_noactionbar_minwidth_color_blue_light.png b/tests/tests/holo/res/drawable-mdpi/holo_dialog_noactionbar_minwidth_color_blue_light.png
new file mode 100644
index 0000000..285d925
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_dialog_noactionbar_minwidth_color_blue_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_dialog_noactionbar_minwidth_color_green_dark.png b/tests/tests/holo/res/drawable-mdpi/holo_dialog_noactionbar_minwidth_color_green_dark.png
new file mode 100644
index 0000000..cfbbdd4
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_dialog_noactionbar_minwidth_color_green_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_dialog_noactionbar_minwidth_color_green_light.png b/tests/tests/holo/res/drawable-mdpi/holo_dialog_noactionbar_minwidth_color_green_light.png
new file mode 100644
index 0000000..a691827
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_dialog_noactionbar_minwidth_color_green_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_dialog_noactionbar_minwidth_color_orange_dark.png b/tests/tests/holo/res/drawable-mdpi/holo_dialog_noactionbar_minwidth_color_orange_dark.png
new file mode 100644
index 0000000..3f0e99a
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_dialog_noactionbar_minwidth_color_orange_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_dialog_noactionbar_minwidth_color_orange_light.png b/tests/tests/holo/res/drawable-mdpi/holo_dialog_noactionbar_minwidth_color_orange_light.png
new file mode 100644
index 0000000..f54fd64
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_dialog_noactionbar_minwidth_color_orange_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_dialog_noactionbar_minwidth_color_purple.png b/tests/tests/holo/res/drawable-mdpi/holo_dialog_noactionbar_minwidth_color_purple.png
new file mode 100644
index 0000000..15c9494
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_dialog_noactionbar_minwidth_color_purple.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_dialog_noactionbar_minwidth_color_red_dark.png b/tests/tests/holo/res/drawable-mdpi/holo_dialog_noactionbar_minwidth_color_red_dark.png
new file mode 100644
index 0000000..de3385d
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_dialog_noactionbar_minwidth_color_red_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_dialog_noactionbar_minwidth_color_red_light.png b/tests/tests/holo/res/drawable-mdpi/holo_dialog_noactionbar_minwidth_color_red_light.png
new file mode 100644
index 0000000..dde4043
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_dialog_noactionbar_minwidth_color_red_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_dialog_noactionbar_minwidth_edittext.png b/tests/tests/holo/res/drawable-mdpi/holo_dialog_noactionbar_minwidth_edittext.png
new file mode 100644
index 0000000..6fabb7e
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_dialog_noactionbar_minwidth_edittext.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_dialog_noactionbar_minwidth_progressbar.png b/tests/tests/holo/res/drawable-mdpi/holo_dialog_noactionbar_minwidth_progressbar.png
new file mode 100644
index 0000000..d027b03
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_dialog_noactionbar_minwidth_progressbar.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_dialog_noactionbar_minwidth_progressbar_horizontal_0.png b/tests/tests/holo/res/drawable-mdpi/holo_dialog_noactionbar_minwidth_progressbar_horizontal_0.png
new file mode 100644
index 0000000..a73db14
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_dialog_noactionbar_minwidth_progressbar_horizontal_0.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_dialog_noactionbar_minwidth_progressbar_horizontal_100.png b/tests/tests/holo/res/drawable-mdpi/holo_dialog_noactionbar_minwidth_progressbar_horizontal_100.png
new file mode 100644
index 0000000..2813c84
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_dialog_noactionbar_minwidth_progressbar_horizontal_100.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_dialog_noactionbar_minwidth_progressbar_horizontal_50.png b/tests/tests/holo/res/drawable-mdpi/holo_dialog_noactionbar_minwidth_progressbar_horizontal_50.png
new file mode 100644
index 0000000..d5c65a9
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_dialog_noactionbar_minwidth_progressbar_horizontal_50.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_dialog_noactionbar_minwidth_progressbar_large.png b/tests/tests/holo/res/drawable-mdpi/holo_dialog_noactionbar_minwidth_progressbar_large.png
new file mode 100644
index 0000000..50301a4
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_dialog_noactionbar_minwidth_progressbar_large.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_dialog_noactionbar_minwidth_progressbar_small.png b/tests/tests/holo/res/drawable-mdpi/holo_dialog_noactionbar_minwidth_progressbar_small.png
new file mode 100644
index 0000000..1240e6a
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_dialog_noactionbar_minwidth_progressbar_small.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_dialog_noactionbar_minwidth_radio_button.png b/tests/tests/holo/res/drawable-mdpi/holo_dialog_noactionbar_minwidth_radio_button.png
new file mode 100644
index 0000000..813b9ee
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_dialog_noactionbar_minwidth_radio_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_dialog_noactionbar_minwidth_radio_button_checked.png b/tests/tests/holo/res/drawable-mdpi/holo_dialog_noactionbar_minwidth_radio_button_checked.png
new file mode 100644
index 0000000..ca4a1b7
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_dialog_noactionbar_minwidth_radio_button_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_dialog_noactionbar_minwidth_radiogroup_horizontal.png b/tests/tests/holo/res/drawable-mdpi/holo_dialog_noactionbar_minwidth_radiogroup_horizontal.png
new file mode 100644
index 0000000..944e7a4
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_dialog_noactionbar_minwidth_radiogroup_horizontal.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_dialog_noactionbar_minwidth_radiogroup_vertical.png b/tests/tests/holo/res/drawable-mdpi/holo_dialog_noactionbar_minwidth_radiogroup_vertical.png
new file mode 100644
index 0000000..e9aecf8
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_dialog_noactionbar_minwidth_radiogroup_vertical.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_dialog_noactionbar_minwidth_ratingbar_0.png b/tests/tests/holo/res/drawable-mdpi/holo_dialog_noactionbar_minwidth_ratingbar_0.png
new file mode 100644
index 0000000..00a9aab
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_dialog_noactionbar_minwidth_ratingbar_0.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_dialog_noactionbar_minwidth_ratingbar_2point5.png b/tests/tests/holo/res/drawable-mdpi/holo_dialog_noactionbar_minwidth_ratingbar_2point5.png
new file mode 100644
index 0000000..88725b1
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_dialog_noactionbar_minwidth_ratingbar_2point5.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_dialog_noactionbar_minwidth_ratingbar_5.png b/tests/tests/holo/res/drawable-mdpi/holo_dialog_noactionbar_minwidth_ratingbar_5.png
new file mode 100644
index 0000000..f62fa44
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_dialog_noactionbar_minwidth_ratingbar_5.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_dialog_noactionbar_minwidth_searchview.png b/tests/tests/holo/res/drawable-mdpi/holo_dialog_noactionbar_minwidth_searchview.png
new file mode 100644
index 0000000..06ec15b
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_dialog_noactionbar_minwidth_searchview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_dialog_noactionbar_minwidth_searchview_query.png b/tests/tests/holo/res/drawable-mdpi/holo_dialog_noactionbar_minwidth_searchview_query.png
new file mode 100644
index 0000000..e6e3646
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_dialog_noactionbar_minwidth_searchview_query.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_dialog_noactionbar_minwidth_searchview_query_hint.png b/tests/tests/holo/res/drawable-mdpi/holo_dialog_noactionbar_minwidth_searchview_query_hint.png
new file mode 100644
index 0000000..df6d421
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_dialog_noactionbar_minwidth_searchview_query_hint.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_dialog_noactionbar_minwidth_seekbar_0.png b/tests/tests/holo/res/drawable-mdpi/holo_dialog_noactionbar_minwidth_seekbar_0.png
new file mode 100644
index 0000000..6ef0c71
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_dialog_noactionbar_minwidth_seekbar_0.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_dialog_noactionbar_minwidth_seekbar_100.png b/tests/tests/holo/res/drawable-mdpi/holo_dialog_noactionbar_minwidth_seekbar_100.png
new file mode 100644
index 0000000..5be0453
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_dialog_noactionbar_minwidth_seekbar_100.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_dialog_noactionbar_minwidth_seekbar_50.png b/tests/tests/holo/res/drawable-mdpi/holo_dialog_noactionbar_minwidth_seekbar_50.png
new file mode 100644
index 0000000..3ba6228
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_dialog_noactionbar_minwidth_seekbar_50.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_dialog_noactionbar_minwidth_spinner.png b/tests/tests/holo/res/drawable-mdpi/holo_dialog_noactionbar_minwidth_spinner.png
new file mode 100644
index 0000000..7b14cc0
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_dialog_noactionbar_minwidth_spinner.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_dialog_noactionbar_minwidth_switch.png b/tests/tests/holo/res/drawable-mdpi/holo_dialog_noactionbar_minwidth_switch.png
new file mode 100644
index 0000000..a1beda8
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_dialog_noactionbar_minwidth_switch.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_dialog_noactionbar_minwidth_switch_checked.png b/tests/tests/holo/res/drawable-mdpi/holo_dialog_noactionbar_minwidth_switch_checked.png
new file mode 100644
index 0000000..a5e17d3
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_dialog_noactionbar_minwidth_switch_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_dialog_noactionbar_minwidth_tabhost.png b/tests/tests/holo/res/drawable-mdpi/holo_dialog_noactionbar_minwidth_tabhost.png
new file mode 100644
index 0000000..6c1595c
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_dialog_noactionbar_minwidth_tabhost.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_dialog_noactionbar_minwidth_textview.png b/tests/tests/holo/res/drawable-mdpi/holo_dialog_noactionbar_minwidth_textview.png
new file mode 100644
index 0000000..1ccf89f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_dialog_noactionbar_minwidth_textview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_dialog_noactionbar_minwidth_timepicker.png b/tests/tests/holo/res/drawable-mdpi/holo_dialog_noactionbar_minwidth_timepicker.png
new file mode 100644
index 0000000..86802e3
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_dialog_noactionbar_minwidth_timepicker.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_dialog_noactionbar_minwidth_toggle_button.png b/tests/tests/holo/res/drawable-mdpi/holo_dialog_noactionbar_minwidth_toggle_button.png
new file mode 100644
index 0000000..948e1b8
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_dialog_noactionbar_minwidth_toggle_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_dialog_noactionbar_minwidth_toggle_button_checked.png b/tests/tests/holo/res/drawable-mdpi/holo_dialog_noactionbar_minwidth_toggle_button_checked.png
new file mode 100644
index 0000000..c89fae2
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_dialog_noactionbar_minwidth_toggle_button_checked.png
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_land_zoomcontrols.png b/tests/tests/holo/res/drawable-mdpi/holo_dialog_noactionbar_minwidth_zoomcontrols.png
similarity index 100%
copy from tests/res/drawable-mdpi/holo_land_zoomcontrols.png
copy to tests/tests/holo/res/drawable-mdpi/holo_dialog_noactionbar_minwidth_zoomcontrols.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_dialog_noactionbar_progressbar.png b/tests/tests/holo/res/drawable-mdpi/holo_dialog_noactionbar_progressbar.png
new file mode 100644
index 0000000..d027b03
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_dialog_noactionbar_progressbar.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_dialog_noactionbar_progressbar_horizontal_0.png b/tests/tests/holo/res/drawable-mdpi/holo_dialog_noactionbar_progressbar_horizontal_0.png
new file mode 100644
index 0000000..a73db14
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_dialog_noactionbar_progressbar_horizontal_0.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_dialog_noactionbar_progressbar_horizontal_100.png b/tests/tests/holo/res/drawable-mdpi/holo_dialog_noactionbar_progressbar_horizontal_100.png
new file mode 100644
index 0000000..2813c84
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_dialog_noactionbar_progressbar_horizontal_100.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_dialog_noactionbar_progressbar_horizontal_50.png b/tests/tests/holo/res/drawable-mdpi/holo_dialog_noactionbar_progressbar_horizontal_50.png
new file mode 100644
index 0000000..d5c65a9
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_dialog_noactionbar_progressbar_horizontal_50.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_dialog_noactionbar_progressbar_large.png b/tests/tests/holo/res/drawable-mdpi/holo_dialog_noactionbar_progressbar_large.png
new file mode 100644
index 0000000..50301a4
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_dialog_noactionbar_progressbar_large.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_dialog_noactionbar_progressbar_small.png b/tests/tests/holo/res/drawable-mdpi/holo_dialog_noactionbar_progressbar_small.png
new file mode 100644
index 0000000..1240e6a
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_dialog_noactionbar_progressbar_small.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_dialog_noactionbar_radio_button.png b/tests/tests/holo/res/drawable-mdpi/holo_dialog_noactionbar_radio_button.png
new file mode 100644
index 0000000..813b9ee
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_dialog_noactionbar_radio_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_dialog_noactionbar_radio_button_checked.png b/tests/tests/holo/res/drawable-mdpi/holo_dialog_noactionbar_radio_button_checked.png
new file mode 100644
index 0000000..ca4a1b7
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_dialog_noactionbar_radio_button_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_dialog_noactionbar_radiogroup_horizontal.png b/tests/tests/holo/res/drawable-mdpi/holo_dialog_noactionbar_radiogroup_horizontal.png
new file mode 100644
index 0000000..944e7a4
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_dialog_noactionbar_radiogroup_horizontal.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_dialog_noactionbar_radiogroup_vertical.png b/tests/tests/holo/res/drawable-mdpi/holo_dialog_noactionbar_radiogroup_vertical.png
new file mode 100644
index 0000000..e9aecf8
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_dialog_noactionbar_radiogroup_vertical.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_dialog_noactionbar_ratingbar_0.png b/tests/tests/holo/res/drawable-mdpi/holo_dialog_noactionbar_ratingbar_0.png
new file mode 100644
index 0000000..00a9aab
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_dialog_noactionbar_ratingbar_0.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_dialog_noactionbar_ratingbar_2point5.png b/tests/tests/holo/res/drawable-mdpi/holo_dialog_noactionbar_ratingbar_2point5.png
new file mode 100644
index 0000000..88725b1
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_dialog_noactionbar_ratingbar_2point5.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_dialog_noactionbar_ratingbar_5.png b/tests/tests/holo/res/drawable-mdpi/holo_dialog_noactionbar_ratingbar_5.png
new file mode 100644
index 0000000..f62fa44
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_dialog_noactionbar_ratingbar_5.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_dialog_noactionbar_searchview.png b/tests/tests/holo/res/drawable-mdpi/holo_dialog_noactionbar_searchview.png
new file mode 100644
index 0000000..06ec15b
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_dialog_noactionbar_searchview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_dialog_noactionbar_searchview_query.png b/tests/tests/holo/res/drawable-mdpi/holo_dialog_noactionbar_searchview_query.png
new file mode 100644
index 0000000..e6e3646
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_dialog_noactionbar_searchview_query.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_dialog_noactionbar_searchview_query_hint.png b/tests/tests/holo/res/drawable-mdpi/holo_dialog_noactionbar_searchview_query_hint.png
new file mode 100644
index 0000000..df6d421
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_dialog_noactionbar_searchview_query_hint.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_dialog_noactionbar_seekbar_0.png b/tests/tests/holo/res/drawable-mdpi/holo_dialog_noactionbar_seekbar_0.png
new file mode 100644
index 0000000..6ef0c71
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_dialog_noactionbar_seekbar_0.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_dialog_noactionbar_seekbar_100.png b/tests/tests/holo/res/drawable-mdpi/holo_dialog_noactionbar_seekbar_100.png
new file mode 100644
index 0000000..5be0453
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_dialog_noactionbar_seekbar_100.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_dialog_noactionbar_seekbar_50.png b/tests/tests/holo/res/drawable-mdpi/holo_dialog_noactionbar_seekbar_50.png
new file mode 100644
index 0000000..3ba6228
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_dialog_noactionbar_seekbar_50.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_dialog_noactionbar_spinner.png b/tests/tests/holo/res/drawable-mdpi/holo_dialog_noactionbar_spinner.png
new file mode 100644
index 0000000..7b14cc0
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_dialog_noactionbar_spinner.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_dialog_noactionbar_switch.png b/tests/tests/holo/res/drawable-mdpi/holo_dialog_noactionbar_switch.png
new file mode 100644
index 0000000..a1beda8
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_dialog_noactionbar_switch.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_dialog_noactionbar_switch_checked.png b/tests/tests/holo/res/drawable-mdpi/holo_dialog_noactionbar_switch_checked.png
new file mode 100644
index 0000000..a5e17d3
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_dialog_noactionbar_switch_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_dialog_noactionbar_tabhost.png b/tests/tests/holo/res/drawable-mdpi/holo_dialog_noactionbar_tabhost.png
new file mode 100644
index 0000000..6c1595c
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_dialog_noactionbar_tabhost.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_dialog_noactionbar_textview.png b/tests/tests/holo/res/drawable-mdpi/holo_dialog_noactionbar_textview.png
new file mode 100644
index 0000000..1ccf89f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_dialog_noactionbar_textview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_dialog_noactionbar_timepicker.png b/tests/tests/holo/res/drawable-mdpi/holo_dialog_noactionbar_timepicker.png
new file mode 100644
index 0000000..86802e3
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_dialog_noactionbar_timepicker.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_dialog_noactionbar_toggle_button.png b/tests/tests/holo/res/drawable-mdpi/holo_dialog_noactionbar_toggle_button.png
new file mode 100644
index 0000000..948e1b8
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_dialog_noactionbar_toggle_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_dialog_noactionbar_toggle_button_checked.png b/tests/tests/holo/res/drawable-mdpi/holo_dialog_noactionbar_toggle_button_checked.png
new file mode 100644
index 0000000..c89fae2
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_dialog_noactionbar_toggle_button_checked.png
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_land_zoomcontrols.png b/tests/tests/holo/res/drawable-mdpi/holo_dialog_noactionbar_zoomcontrols.png
similarity index 100%
copy from tests/res/drawable-mdpi/holo_land_zoomcontrols.png
copy to tests/tests/holo/res/drawable-mdpi/holo_dialog_noactionbar_zoomcontrols.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_dialog_progressbar.png b/tests/tests/holo/res/drawable-mdpi/holo_dialog_progressbar.png
new file mode 100644
index 0000000..d027b03
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_dialog_progressbar.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_dialog_progressbar_horizontal_0.png b/tests/tests/holo/res/drawable-mdpi/holo_dialog_progressbar_horizontal_0.png
new file mode 100644
index 0000000..a73db14
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_dialog_progressbar_horizontal_0.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_dialog_progressbar_horizontal_100.png b/tests/tests/holo/res/drawable-mdpi/holo_dialog_progressbar_horizontal_100.png
new file mode 100644
index 0000000..2813c84
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_dialog_progressbar_horizontal_100.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_dialog_progressbar_horizontal_50.png b/tests/tests/holo/res/drawable-mdpi/holo_dialog_progressbar_horizontal_50.png
new file mode 100644
index 0000000..d5c65a9
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_dialog_progressbar_horizontal_50.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_dialog_progressbar_large.png b/tests/tests/holo/res/drawable-mdpi/holo_dialog_progressbar_large.png
new file mode 100644
index 0000000..50301a4
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_dialog_progressbar_large.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_dialog_progressbar_small.png b/tests/tests/holo/res/drawable-mdpi/holo_dialog_progressbar_small.png
new file mode 100644
index 0000000..1240e6a
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_dialog_progressbar_small.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_dialog_radio_button.png b/tests/tests/holo/res/drawable-mdpi/holo_dialog_radio_button.png
new file mode 100644
index 0000000..813b9ee
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_dialog_radio_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_dialog_radio_button_checked.png b/tests/tests/holo/res/drawable-mdpi/holo_dialog_radio_button_checked.png
new file mode 100644
index 0000000..ca4a1b7
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_dialog_radio_button_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_dialog_radiogroup_horizontal.png b/tests/tests/holo/res/drawable-mdpi/holo_dialog_radiogroup_horizontal.png
new file mode 100644
index 0000000..944e7a4
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_dialog_radiogroup_horizontal.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_dialog_radiogroup_vertical.png b/tests/tests/holo/res/drawable-mdpi/holo_dialog_radiogroup_vertical.png
new file mode 100644
index 0000000..e9aecf8
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_dialog_radiogroup_vertical.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_dialog_ratingbar_0.png b/tests/tests/holo/res/drawable-mdpi/holo_dialog_ratingbar_0.png
new file mode 100644
index 0000000..00a9aab
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_dialog_ratingbar_0.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_dialog_ratingbar_2point5.png b/tests/tests/holo/res/drawable-mdpi/holo_dialog_ratingbar_2point5.png
new file mode 100644
index 0000000..88725b1
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_dialog_ratingbar_2point5.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_dialog_ratingbar_5.png b/tests/tests/holo/res/drawable-mdpi/holo_dialog_ratingbar_5.png
new file mode 100644
index 0000000..f62fa44
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_dialog_ratingbar_5.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_dialog_searchview.png b/tests/tests/holo/res/drawable-mdpi/holo_dialog_searchview.png
new file mode 100644
index 0000000..06ec15b
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_dialog_searchview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_dialog_searchview_query.png b/tests/tests/holo/res/drawable-mdpi/holo_dialog_searchview_query.png
new file mode 100644
index 0000000..e6e3646
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_dialog_searchview_query.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_dialog_searchview_query_hint.png b/tests/tests/holo/res/drawable-mdpi/holo_dialog_searchview_query_hint.png
new file mode 100644
index 0000000..df6d421
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_dialog_searchview_query_hint.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_dialog_seekbar_0.png b/tests/tests/holo/res/drawable-mdpi/holo_dialog_seekbar_0.png
new file mode 100644
index 0000000..6ef0c71
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_dialog_seekbar_0.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_dialog_seekbar_100.png b/tests/tests/holo/res/drawable-mdpi/holo_dialog_seekbar_100.png
new file mode 100644
index 0000000..5be0453
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_dialog_seekbar_100.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_dialog_seekbar_50.png b/tests/tests/holo/res/drawable-mdpi/holo_dialog_seekbar_50.png
new file mode 100644
index 0000000..3ba6228
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_dialog_seekbar_50.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_dialog_spinner.png b/tests/tests/holo/res/drawable-mdpi/holo_dialog_spinner.png
new file mode 100644
index 0000000..7b14cc0
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_dialog_spinner.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_dialog_switch.png b/tests/tests/holo/res/drawable-mdpi/holo_dialog_switch.png
new file mode 100644
index 0000000..a1beda8
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_dialog_switch.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_dialog_switch_checked.png b/tests/tests/holo/res/drawable-mdpi/holo_dialog_switch_checked.png
new file mode 100644
index 0000000..a5e17d3
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_dialog_switch_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_dialog_tabhost.png b/tests/tests/holo/res/drawable-mdpi/holo_dialog_tabhost.png
new file mode 100644
index 0000000..6c1595c
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_dialog_tabhost.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_dialog_textview.png b/tests/tests/holo/res/drawable-mdpi/holo_dialog_textview.png
new file mode 100644
index 0000000..1ccf89f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_dialog_textview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_dialog_timepicker.png b/tests/tests/holo/res/drawable-mdpi/holo_dialog_timepicker.png
new file mode 100644
index 0000000..86802e3
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_dialog_timepicker.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_dialog_toggle_button.png b/tests/tests/holo/res/drawable-mdpi/holo_dialog_toggle_button.png
new file mode 100644
index 0000000..948e1b8
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_dialog_toggle_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_dialog_toggle_button_checked.png b/tests/tests/holo/res/drawable-mdpi/holo_dialog_toggle_button_checked.png
new file mode 100644
index 0000000..c89fae2
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_dialog_toggle_button_checked.png
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_land_zoomcontrols.png b/tests/tests/holo/res/drawable-mdpi/holo_dialog_zoomcontrols.png
similarity index 100%
copy from tests/res/drawable-mdpi/holo_land_zoomcontrols.png
copy to tests/tests/holo/res/drawable-mdpi/holo_dialog_zoomcontrols.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_dialogwhenlarge_button.png b/tests/tests/holo/res/drawable-mdpi/holo_dialogwhenlarge_button.png
new file mode 100644
index 0000000..6d81450
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_dialogwhenlarge_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_dialogwhenlarge_calendar_view.png b/tests/tests/holo/res/drawable-mdpi/holo_dialogwhenlarge_calendar_view.png
new file mode 100644
index 0000000..50d00ab
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_dialogwhenlarge_calendar_view.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_dialogwhenlarge_calendar_view_feb.png b/tests/tests/holo/res/drawable-mdpi/holo_dialogwhenlarge_calendar_view_feb.png
new file mode 100644
index 0000000..aed3bc0
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_dialogwhenlarge_calendar_view_feb.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_dialogwhenlarge_checkbox.png b/tests/tests/holo/res/drawable-mdpi/holo_dialogwhenlarge_checkbox.png
new file mode 100644
index 0000000..63dc6ed
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_dialogwhenlarge_checkbox.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_dialogwhenlarge_checkbox_checked.png b/tests/tests/holo/res/drawable-mdpi/holo_dialogwhenlarge_checkbox_checked.png
new file mode 100644
index 0000000..a0f737c
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_dialogwhenlarge_checkbox_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_dialogwhenlarge_chronometer.png b/tests/tests/holo/res/drawable-mdpi/holo_dialogwhenlarge_chronometer.png
new file mode 100644
index 0000000..a4e7093
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_dialogwhenlarge_chronometer.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_dialogwhenlarge_color_blue_bright.png b/tests/tests/holo/res/drawable-mdpi/holo_dialogwhenlarge_color_blue_bright.png
new file mode 100644
index 0000000..fe1bdd7
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_dialogwhenlarge_color_blue_bright.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_dialogwhenlarge_color_blue_dark.png b/tests/tests/holo/res/drawable-mdpi/holo_dialogwhenlarge_color_blue_dark.png
new file mode 100644
index 0000000..f3f0640
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_dialogwhenlarge_color_blue_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_dialogwhenlarge_color_blue_light.png b/tests/tests/holo/res/drawable-mdpi/holo_dialogwhenlarge_color_blue_light.png
new file mode 100644
index 0000000..285d925
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_dialogwhenlarge_color_blue_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_dialogwhenlarge_color_green_dark.png b/tests/tests/holo/res/drawable-mdpi/holo_dialogwhenlarge_color_green_dark.png
new file mode 100644
index 0000000..cfbbdd4
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_dialogwhenlarge_color_green_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_dialogwhenlarge_color_green_light.png b/tests/tests/holo/res/drawable-mdpi/holo_dialogwhenlarge_color_green_light.png
new file mode 100644
index 0000000..a691827
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_dialogwhenlarge_color_green_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_dialogwhenlarge_color_orange_dark.png b/tests/tests/holo/res/drawable-mdpi/holo_dialogwhenlarge_color_orange_dark.png
new file mode 100644
index 0000000..3f0e99a
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_dialogwhenlarge_color_orange_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_dialogwhenlarge_color_orange_light.png b/tests/tests/holo/res/drawable-mdpi/holo_dialogwhenlarge_color_orange_light.png
new file mode 100644
index 0000000..f54fd64
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_dialogwhenlarge_color_orange_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_dialogwhenlarge_color_purple.png b/tests/tests/holo/res/drawable-mdpi/holo_dialogwhenlarge_color_purple.png
new file mode 100644
index 0000000..15c9494
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_dialogwhenlarge_color_purple.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_dialogwhenlarge_color_red_dark.png b/tests/tests/holo/res/drawable-mdpi/holo_dialogwhenlarge_color_red_dark.png
new file mode 100644
index 0000000..de3385d
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_dialogwhenlarge_color_red_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_dialogwhenlarge_color_red_light.png b/tests/tests/holo/res/drawable-mdpi/holo_dialogwhenlarge_color_red_light.png
new file mode 100644
index 0000000..dde4043
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_dialogwhenlarge_color_red_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_dialogwhenlarge_edittext.png b/tests/tests/holo/res/drawable-mdpi/holo_dialogwhenlarge_edittext.png
new file mode 100644
index 0000000..6fabb7e
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_dialogwhenlarge_edittext.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_dialogwhenlarge_noactionbar_button.png b/tests/tests/holo/res/drawable-mdpi/holo_dialogwhenlarge_noactionbar_button.png
new file mode 100644
index 0000000..6d81450
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_dialogwhenlarge_noactionbar_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_dialogwhenlarge_noactionbar_calendar_view.png b/tests/tests/holo/res/drawable-mdpi/holo_dialogwhenlarge_noactionbar_calendar_view.png
new file mode 100644
index 0000000..50d00ab
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_dialogwhenlarge_noactionbar_calendar_view.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_dialogwhenlarge_noactionbar_calendar_view_feb.png b/tests/tests/holo/res/drawable-mdpi/holo_dialogwhenlarge_noactionbar_calendar_view_feb.png
new file mode 100644
index 0000000..aed3bc0
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_dialogwhenlarge_noactionbar_calendar_view_feb.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_dialogwhenlarge_noactionbar_checkbox.png b/tests/tests/holo/res/drawable-mdpi/holo_dialogwhenlarge_noactionbar_checkbox.png
new file mode 100644
index 0000000..63dc6ed
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_dialogwhenlarge_noactionbar_checkbox.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_dialogwhenlarge_noactionbar_checkbox_checked.png b/tests/tests/holo/res/drawable-mdpi/holo_dialogwhenlarge_noactionbar_checkbox_checked.png
new file mode 100644
index 0000000..a0f737c
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_dialogwhenlarge_noactionbar_checkbox_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_dialogwhenlarge_noactionbar_chronometer.png b/tests/tests/holo/res/drawable-mdpi/holo_dialogwhenlarge_noactionbar_chronometer.png
new file mode 100644
index 0000000..a4e7093
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_dialogwhenlarge_noactionbar_chronometer.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_dialogwhenlarge_noactionbar_color_blue_bright.png b/tests/tests/holo/res/drawable-mdpi/holo_dialogwhenlarge_noactionbar_color_blue_bright.png
new file mode 100644
index 0000000..fe1bdd7
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_dialogwhenlarge_noactionbar_color_blue_bright.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_dialogwhenlarge_noactionbar_color_blue_dark.png b/tests/tests/holo/res/drawable-mdpi/holo_dialogwhenlarge_noactionbar_color_blue_dark.png
new file mode 100644
index 0000000..f3f0640
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_dialogwhenlarge_noactionbar_color_blue_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_dialogwhenlarge_noactionbar_color_blue_light.png b/tests/tests/holo/res/drawable-mdpi/holo_dialogwhenlarge_noactionbar_color_blue_light.png
new file mode 100644
index 0000000..285d925
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_dialogwhenlarge_noactionbar_color_blue_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_dialogwhenlarge_noactionbar_color_green_dark.png b/tests/tests/holo/res/drawable-mdpi/holo_dialogwhenlarge_noactionbar_color_green_dark.png
new file mode 100644
index 0000000..cfbbdd4
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_dialogwhenlarge_noactionbar_color_green_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_dialogwhenlarge_noactionbar_color_green_light.png b/tests/tests/holo/res/drawable-mdpi/holo_dialogwhenlarge_noactionbar_color_green_light.png
new file mode 100644
index 0000000..a691827
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_dialogwhenlarge_noactionbar_color_green_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_dialogwhenlarge_noactionbar_color_orange_dark.png b/tests/tests/holo/res/drawable-mdpi/holo_dialogwhenlarge_noactionbar_color_orange_dark.png
new file mode 100644
index 0000000..3f0e99a
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_dialogwhenlarge_noactionbar_color_orange_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_dialogwhenlarge_noactionbar_color_orange_light.png b/tests/tests/holo/res/drawable-mdpi/holo_dialogwhenlarge_noactionbar_color_orange_light.png
new file mode 100644
index 0000000..f54fd64
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_dialogwhenlarge_noactionbar_color_orange_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_dialogwhenlarge_noactionbar_color_purple.png b/tests/tests/holo/res/drawable-mdpi/holo_dialogwhenlarge_noactionbar_color_purple.png
new file mode 100644
index 0000000..15c9494
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_dialogwhenlarge_noactionbar_color_purple.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_dialogwhenlarge_noactionbar_color_red_dark.png b/tests/tests/holo/res/drawable-mdpi/holo_dialogwhenlarge_noactionbar_color_red_dark.png
new file mode 100644
index 0000000..de3385d
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_dialogwhenlarge_noactionbar_color_red_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_dialogwhenlarge_noactionbar_color_red_light.png b/tests/tests/holo/res/drawable-mdpi/holo_dialogwhenlarge_noactionbar_color_red_light.png
new file mode 100644
index 0000000..dde4043
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_dialogwhenlarge_noactionbar_color_red_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_dialogwhenlarge_noactionbar_edittext.png b/tests/tests/holo/res/drawable-mdpi/holo_dialogwhenlarge_noactionbar_edittext.png
new file mode 100644
index 0000000..6fabb7e
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_dialogwhenlarge_noactionbar_edittext.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_dialogwhenlarge_noactionbar_progressbar.png b/tests/tests/holo/res/drawable-mdpi/holo_dialogwhenlarge_noactionbar_progressbar.png
new file mode 100644
index 0000000..d027b03
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_dialogwhenlarge_noactionbar_progressbar.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_dialogwhenlarge_noactionbar_progressbar_horizontal_0.png b/tests/tests/holo/res/drawable-mdpi/holo_dialogwhenlarge_noactionbar_progressbar_horizontal_0.png
new file mode 100644
index 0000000..a73db14
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_dialogwhenlarge_noactionbar_progressbar_horizontal_0.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_dialogwhenlarge_noactionbar_progressbar_horizontal_100.png b/tests/tests/holo/res/drawable-mdpi/holo_dialogwhenlarge_noactionbar_progressbar_horizontal_100.png
new file mode 100644
index 0000000..2813c84
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_dialogwhenlarge_noactionbar_progressbar_horizontal_100.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_dialogwhenlarge_noactionbar_progressbar_horizontal_50.png b/tests/tests/holo/res/drawable-mdpi/holo_dialogwhenlarge_noactionbar_progressbar_horizontal_50.png
new file mode 100644
index 0000000..d5c65a9
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_dialogwhenlarge_noactionbar_progressbar_horizontal_50.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_dialogwhenlarge_noactionbar_progressbar_large.png b/tests/tests/holo/res/drawable-mdpi/holo_dialogwhenlarge_noactionbar_progressbar_large.png
new file mode 100644
index 0000000..50301a4
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_dialogwhenlarge_noactionbar_progressbar_large.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_dialogwhenlarge_noactionbar_progressbar_small.png b/tests/tests/holo/res/drawable-mdpi/holo_dialogwhenlarge_noactionbar_progressbar_small.png
new file mode 100644
index 0000000..1240e6a
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_dialogwhenlarge_noactionbar_progressbar_small.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_dialogwhenlarge_noactionbar_radio_button.png b/tests/tests/holo/res/drawable-mdpi/holo_dialogwhenlarge_noactionbar_radio_button.png
new file mode 100644
index 0000000..813b9ee
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_dialogwhenlarge_noactionbar_radio_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_dialogwhenlarge_noactionbar_radio_button_checked.png b/tests/tests/holo/res/drawable-mdpi/holo_dialogwhenlarge_noactionbar_radio_button_checked.png
new file mode 100644
index 0000000..ca4a1b7
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_dialogwhenlarge_noactionbar_radio_button_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_dialogwhenlarge_noactionbar_radiogroup_horizontal.png b/tests/tests/holo/res/drawable-mdpi/holo_dialogwhenlarge_noactionbar_radiogroup_horizontal.png
new file mode 100644
index 0000000..944e7a4
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_dialogwhenlarge_noactionbar_radiogroup_horizontal.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_dialogwhenlarge_noactionbar_radiogroup_vertical.png b/tests/tests/holo/res/drawable-mdpi/holo_dialogwhenlarge_noactionbar_radiogroup_vertical.png
new file mode 100644
index 0000000..e9aecf8
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_dialogwhenlarge_noactionbar_radiogroup_vertical.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_dialogwhenlarge_noactionbar_ratingbar_0.png b/tests/tests/holo/res/drawable-mdpi/holo_dialogwhenlarge_noactionbar_ratingbar_0.png
new file mode 100644
index 0000000..00a9aab
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_dialogwhenlarge_noactionbar_ratingbar_0.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_dialogwhenlarge_noactionbar_ratingbar_2point5.png b/tests/tests/holo/res/drawable-mdpi/holo_dialogwhenlarge_noactionbar_ratingbar_2point5.png
new file mode 100644
index 0000000..88725b1
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_dialogwhenlarge_noactionbar_ratingbar_2point5.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_dialogwhenlarge_noactionbar_ratingbar_5.png b/tests/tests/holo/res/drawable-mdpi/holo_dialogwhenlarge_noactionbar_ratingbar_5.png
new file mode 100644
index 0000000..f62fa44
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_dialogwhenlarge_noactionbar_ratingbar_5.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_dialogwhenlarge_noactionbar_searchview.png b/tests/tests/holo/res/drawable-mdpi/holo_dialogwhenlarge_noactionbar_searchview.png
new file mode 100644
index 0000000..06ec15b
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_dialogwhenlarge_noactionbar_searchview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_dialogwhenlarge_noactionbar_searchview_query.png b/tests/tests/holo/res/drawable-mdpi/holo_dialogwhenlarge_noactionbar_searchview_query.png
new file mode 100644
index 0000000..e6e3646
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_dialogwhenlarge_noactionbar_searchview_query.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_dialogwhenlarge_noactionbar_searchview_query_hint.png b/tests/tests/holo/res/drawable-mdpi/holo_dialogwhenlarge_noactionbar_searchview_query_hint.png
new file mode 100644
index 0000000..df6d421
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_dialogwhenlarge_noactionbar_searchview_query_hint.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_dialogwhenlarge_noactionbar_seekbar_0.png b/tests/tests/holo/res/drawable-mdpi/holo_dialogwhenlarge_noactionbar_seekbar_0.png
new file mode 100644
index 0000000..6ef0c71
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_dialogwhenlarge_noactionbar_seekbar_0.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_dialogwhenlarge_noactionbar_seekbar_100.png b/tests/tests/holo/res/drawable-mdpi/holo_dialogwhenlarge_noactionbar_seekbar_100.png
new file mode 100644
index 0000000..5be0453
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_dialogwhenlarge_noactionbar_seekbar_100.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_dialogwhenlarge_noactionbar_seekbar_50.png b/tests/tests/holo/res/drawable-mdpi/holo_dialogwhenlarge_noactionbar_seekbar_50.png
new file mode 100644
index 0000000..3ba6228
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_dialogwhenlarge_noactionbar_seekbar_50.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_dialogwhenlarge_noactionbar_spinner.png b/tests/tests/holo/res/drawable-mdpi/holo_dialogwhenlarge_noactionbar_spinner.png
new file mode 100644
index 0000000..7b14cc0
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_dialogwhenlarge_noactionbar_spinner.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_dialogwhenlarge_noactionbar_switch.png b/tests/tests/holo/res/drawable-mdpi/holo_dialogwhenlarge_noactionbar_switch.png
new file mode 100644
index 0000000..a1beda8
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_dialogwhenlarge_noactionbar_switch.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_dialogwhenlarge_noactionbar_switch_checked.png b/tests/tests/holo/res/drawable-mdpi/holo_dialogwhenlarge_noactionbar_switch_checked.png
new file mode 100644
index 0000000..a5e17d3
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_dialogwhenlarge_noactionbar_switch_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_dialogwhenlarge_noactionbar_tabhost.png b/tests/tests/holo/res/drawable-mdpi/holo_dialogwhenlarge_noactionbar_tabhost.png
new file mode 100644
index 0000000..6c1595c
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_dialogwhenlarge_noactionbar_tabhost.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_dialogwhenlarge_noactionbar_textview.png b/tests/tests/holo/res/drawable-mdpi/holo_dialogwhenlarge_noactionbar_textview.png
new file mode 100644
index 0000000..1ccf89f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_dialogwhenlarge_noactionbar_textview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_dialogwhenlarge_noactionbar_timepicker.png b/tests/tests/holo/res/drawable-mdpi/holo_dialogwhenlarge_noactionbar_timepicker.png
new file mode 100644
index 0000000..86802e3
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_dialogwhenlarge_noactionbar_timepicker.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_dialogwhenlarge_noactionbar_toggle_button.png b/tests/tests/holo/res/drawable-mdpi/holo_dialogwhenlarge_noactionbar_toggle_button.png
new file mode 100644
index 0000000..948e1b8
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_dialogwhenlarge_noactionbar_toggle_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_dialogwhenlarge_noactionbar_toggle_button_checked.png b/tests/tests/holo/res/drawable-mdpi/holo_dialogwhenlarge_noactionbar_toggle_button_checked.png
new file mode 100644
index 0000000..c89fae2
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_dialogwhenlarge_noactionbar_toggle_button_checked.png
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_land_zoomcontrols.png b/tests/tests/holo/res/drawable-mdpi/holo_dialogwhenlarge_noactionbar_zoomcontrols.png
similarity index 100%
copy from tests/res/drawable-mdpi/holo_land_zoomcontrols.png
copy to tests/tests/holo/res/drawable-mdpi/holo_dialogwhenlarge_noactionbar_zoomcontrols.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_dialogwhenlarge_progressbar.png b/tests/tests/holo/res/drawable-mdpi/holo_dialogwhenlarge_progressbar.png
new file mode 100644
index 0000000..d027b03
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_dialogwhenlarge_progressbar.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_dialogwhenlarge_progressbar_horizontal_0.png b/tests/tests/holo/res/drawable-mdpi/holo_dialogwhenlarge_progressbar_horizontal_0.png
new file mode 100644
index 0000000..a73db14
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_dialogwhenlarge_progressbar_horizontal_0.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_dialogwhenlarge_progressbar_horizontal_100.png b/tests/tests/holo/res/drawable-mdpi/holo_dialogwhenlarge_progressbar_horizontal_100.png
new file mode 100644
index 0000000..2813c84
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_dialogwhenlarge_progressbar_horizontal_100.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_dialogwhenlarge_progressbar_horizontal_50.png b/tests/tests/holo/res/drawable-mdpi/holo_dialogwhenlarge_progressbar_horizontal_50.png
new file mode 100644
index 0000000..d5c65a9
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_dialogwhenlarge_progressbar_horizontal_50.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_dialogwhenlarge_progressbar_large.png b/tests/tests/holo/res/drawable-mdpi/holo_dialogwhenlarge_progressbar_large.png
new file mode 100644
index 0000000..50301a4
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_dialogwhenlarge_progressbar_large.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_dialogwhenlarge_progressbar_small.png b/tests/tests/holo/res/drawable-mdpi/holo_dialogwhenlarge_progressbar_small.png
new file mode 100644
index 0000000..1240e6a
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_dialogwhenlarge_progressbar_small.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_dialogwhenlarge_radio_button.png b/tests/tests/holo/res/drawable-mdpi/holo_dialogwhenlarge_radio_button.png
new file mode 100644
index 0000000..813b9ee
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_dialogwhenlarge_radio_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_dialogwhenlarge_radio_button_checked.png b/tests/tests/holo/res/drawable-mdpi/holo_dialogwhenlarge_radio_button_checked.png
new file mode 100644
index 0000000..ca4a1b7
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_dialogwhenlarge_radio_button_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_dialogwhenlarge_radiogroup_horizontal.png b/tests/tests/holo/res/drawable-mdpi/holo_dialogwhenlarge_radiogroup_horizontal.png
new file mode 100644
index 0000000..944e7a4
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_dialogwhenlarge_radiogroup_horizontal.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_dialogwhenlarge_radiogroup_vertical.png b/tests/tests/holo/res/drawable-mdpi/holo_dialogwhenlarge_radiogroup_vertical.png
new file mode 100644
index 0000000..e9aecf8
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_dialogwhenlarge_radiogroup_vertical.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_dialogwhenlarge_ratingbar_0.png b/tests/tests/holo/res/drawable-mdpi/holo_dialogwhenlarge_ratingbar_0.png
new file mode 100644
index 0000000..00a9aab
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_dialogwhenlarge_ratingbar_0.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_dialogwhenlarge_ratingbar_2point5.png b/tests/tests/holo/res/drawable-mdpi/holo_dialogwhenlarge_ratingbar_2point5.png
new file mode 100644
index 0000000..88725b1
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_dialogwhenlarge_ratingbar_2point5.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_dialogwhenlarge_ratingbar_5.png b/tests/tests/holo/res/drawable-mdpi/holo_dialogwhenlarge_ratingbar_5.png
new file mode 100644
index 0000000..f62fa44
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_dialogwhenlarge_ratingbar_5.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_dialogwhenlarge_searchview.png b/tests/tests/holo/res/drawable-mdpi/holo_dialogwhenlarge_searchview.png
new file mode 100644
index 0000000..06ec15b
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_dialogwhenlarge_searchview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_dialogwhenlarge_searchview_query.png b/tests/tests/holo/res/drawable-mdpi/holo_dialogwhenlarge_searchview_query.png
new file mode 100644
index 0000000..e6e3646
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_dialogwhenlarge_searchview_query.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_dialogwhenlarge_searchview_query_hint.png b/tests/tests/holo/res/drawable-mdpi/holo_dialogwhenlarge_searchview_query_hint.png
new file mode 100644
index 0000000..df6d421
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_dialogwhenlarge_searchview_query_hint.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_dialogwhenlarge_seekbar_0.png b/tests/tests/holo/res/drawable-mdpi/holo_dialogwhenlarge_seekbar_0.png
new file mode 100644
index 0000000..6ef0c71
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_dialogwhenlarge_seekbar_0.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_dialogwhenlarge_seekbar_100.png b/tests/tests/holo/res/drawable-mdpi/holo_dialogwhenlarge_seekbar_100.png
new file mode 100644
index 0000000..5be0453
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_dialogwhenlarge_seekbar_100.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_dialogwhenlarge_seekbar_50.png b/tests/tests/holo/res/drawable-mdpi/holo_dialogwhenlarge_seekbar_50.png
new file mode 100644
index 0000000..3ba6228
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_dialogwhenlarge_seekbar_50.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_dialogwhenlarge_spinner.png b/tests/tests/holo/res/drawable-mdpi/holo_dialogwhenlarge_spinner.png
new file mode 100644
index 0000000..7b14cc0
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_dialogwhenlarge_spinner.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_dialogwhenlarge_switch.png b/tests/tests/holo/res/drawable-mdpi/holo_dialogwhenlarge_switch.png
new file mode 100644
index 0000000..a1beda8
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_dialogwhenlarge_switch.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_dialogwhenlarge_switch_checked.png b/tests/tests/holo/res/drawable-mdpi/holo_dialogwhenlarge_switch_checked.png
new file mode 100644
index 0000000..a5e17d3
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_dialogwhenlarge_switch_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_dialogwhenlarge_tabhost.png b/tests/tests/holo/res/drawable-mdpi/holo_dialogwhenlarge_tabhost.png
new file mode 100644
index 0000000..6c1595c
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_dialogwhenlarge_tabhost.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_dialogwhenlarge_textview.png b/tests/tests/holo/res/drawable-mdpi/holo_dialogwhenlarge_textview.png
new file mode 100644
index 0000000..1ccf89f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_dialogwhenlarge_textview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_dialogwhenlarge_timepicker.png b/tests/tests/holo/res/drawable-mdpi/holo_dialogwhenlarge_timepicker.png
new file mode 100644
index 0000000..86802e3
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_dialogwhenlarge_timepicker.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_dialogwhenlarge_toggle_button.png b/tests/tests/holo/res/drawable-mdpi/holo_dialogwhenlarge_toggle_button.png
new file mode 100644
index 0000000..948e1b8
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_dialogwhenlarge_toggle_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_dialogwhenlarge_toggle_button_checked.png b/tests/tests/holo/res/drawable-mdpi/holo_dialogwhenlarge_toggle_button_checked.png
new file mode 100644
index 0000000..c89fae2
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_dialogwhenlarge_toggle_button_checked.png
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_land_zoomcontrols.png b/tests/tests/holo/res/drawable-mdpi/holo_dialogwhenlarge_zoomcontrols.png
similarity index 100%
copy from tests/res/drawable-mdpi/holo_land_zoomcontrols.png
copy to tests/tests/holo/res/drawable-mdpi/holo_dialogwhenlarge_zoomcontrols.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_edittext.png b/tests/tests/holo/res/drawable-mdpi/holo_edittext.png
new file mode 100644
index 0000000..6fabb7e
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_edittext.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_inputmethod_button.png b/tests/tests/holo/res/drawable-mdpi/holo_inputmethod_button.png
new file mode 100644
index 0000000..19124b2
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_inputmethod_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_inputmethod_calendar_view.png b/tests/tests/holo/res/drawable-mdpi/holo_inputmethod_calendar_view.png
new file mode 100644
index 0000000..3b86863
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_inputmethod_calendar_view.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_inputmethod_calendar_view_feb.png b/tests/tests/holo/res/drawable-mdpi/holo_inputmethod_calendar_view_feb.png
new file mode 100644
index 0000000..a457bc3
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_inputmethod_calendar_view_feb.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_inputmethod_checkbox.png b/tests/tests/holo/res/drawable-mdpi/holo_inputmethod_checkbox.png
new file mode 100644
index 0000000..54949e8
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_inputmethod_checkbox.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_inputmethod_checkbox_checked.png b/tests/tests/holo/res/drawable-mdpi/holo_inputmethod_checkbox_checked.png
new file mode 100644
index 0000000..42e2783
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_inputmethod_checkbox_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_inputmethod_chronometer.png b/tests/tests/holo/res/drawable-mdpi/holo_inputmethod_chronometer.png
new file mode 100644
index 0000000..200e909
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_inputmethod_chronometer.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_inputmethod_color_blue_bright.png b/tests/tests/holo/res/drawable-mdpi/holo_inputmethod_color_blue_bright.png
new file mode 100644
index 0000000..fe1bdd7
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_inputmethod_color_blue_bright.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_inputmethod_color_blue_dark.png b/tests/tests/holo/res/drawable-mdpi/holo_inputmethod_color_blue_dark.png
new file mode 100644
index 0000000..f3f0640
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_inputmethod_color_blue_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_inputmethod_color_blue_light.png b/tests/tests/holo/res/drawable-mdpi/holo_inputmethod_color_blue_light.png
new file mode 100644
index 0000000..285d925
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_inputmethod_color_blue_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_inputmethod_color_green_dark.png b/tests/tests/holo/res/drawable-mdpi/holo_inputmethod_color_green_dark.png
new file mode 100644
index 0000000..cfbbdd4
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_inputmethod_color_green_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_inputmethod_color_green_light.png b/tests/tests/holo/res/drawable-mdpi/holo_inputmethod_color_green_light.png
new file mode 100644
index 0000000..a691827
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_inputmethod_color_green_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_inputmethod_color_orange_dark.png b/tests/tests/holo/res/drawable-mdpi/holo_inputmethod_color_orange_dark.png
new file mode 100644
index 0000000..3f0e99a
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_inputmethod_color_orange_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_inputmethod_color_orange_light.png b/tests/tests/holo/res/drawable-mdpi/holo_inputmethod_color_orange_light.png
new file mode 100644
index 0000000..f54fd64
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_inputmethod_color_orange_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_inputmethod_color_purple.png b/tests/tests/holo/res/drawable-mdpi/holo_inputmethod_color_purple.png
new file mode 100644
index 0000000..15c9494
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_inputmethod_color_purple.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_inputmethod_color_red_dark.png b/tests/tests/holo/res/drawable-mdpi/holo_inputmethod_color_red_dark.png
new file mode 100644
index 0000000..de3385d
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_inputmethod_color_red_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_inputmethod_color_red_light.png b/tests/tests/holo/res/drawable-mdpi/holo_inputmethod_color_red_light.png
new file mode 100644
index 0000000..dde4043
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_inputmethod_color_red_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_inputmethod_edittext.png b/tests/tests/holo/res/drawable-mdpi/holo_inputmethod_edittext.png
new file mode 100644
index 0000000..3e9e9ca
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_inputmethod_edittext.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_inputmethod_progressbar.png b/tests/tests/holo/res/drawable-mdpi/holo_inputmethod_progressbar.png
new file mode 100644
index 0000000..d027b03
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_inputmethod_progressbar.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_inputmethod_progressbar_horizontal_0.png b/tests/tests/holo/res/drawable-mdpi/holo_inputmethod_progressbar_horizontal_0.png
new file mode 100644
index 0000000..aa86092
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_inputmethod_progressbar_horizontal_0.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_inputmethod_progressbar_horizontal_100.png b/tests/tests/holo/res/drawable-mdpi/holo_inputmethod_progressbar_horizontal_100.png
new file mode 100644
index 0000000..750a89c
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_inputmethod_progressbar_horizontal_100.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_inputmethod_progressbar_horizontal_50.png b/tests/tests/holo/res/drawable-mdpi/holo_inputmethod_progressbar_horizontal_50.png
new file mode 100644
index 0000000..fc91586
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_inputmethod_progressbar_horizontal_50.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_inputmethod_progressbar_large.png b/tests/tests/holo/res/drawable-mdpi/holo_inputmethod_progressbar_large.png
new file mode 100644
index 0000000..50301a4
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_inputmethod_progressbar_large.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_inputmethod_progressbar_small.png b/tests/tests/holo/res/drawable-mdpi/holo_inputmethod_progressbar_small.png
new file mode 100644
index 0000000..1240e6a
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_inputmethod_progressbar_small.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_inputmethod_radio_button.png b/tests/tests/holo/res/drawable-mdpi/holo_inputmethod_radio_button.png
new file mode 100644
index 0000000..c2398a1
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_inputmethod_radio_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_inputmethod_radio_button_checked.png b/tests/tests/holo/res/drawable-mdpi/holo_inputmethod_radio_button_checked.png
new file mode 100644
index 0000000..898442f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_inputmethod_radio_button_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_inputmethod_radiogroup_horizontal.png b/tests/tests/holo/res/drawable-mdpi/holo_inputmethod_radiogroup_horizontal.png
new file mode 100644
index 0000000..6191420
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_inputmethod_radiogroup_horizontal.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_inputmethod_radiogroup_vertical.png b/tests/tests/holo/res/drawable-mdpi/holo_inputmethod_radiogroup_vertical.png
new file mode 100644
index 0000000..fa88e6f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_inputmethod_radiogroup_vertical.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_inputmethod_ratingbar_0.png b/tests/tests/holo/res/drawable-mdpi/holo_inputmethod_ratingbar_0.png
new file mode 100644
index 0000000..2fabd8a
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_inputmethod_ratingbar_0.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_inputmethod_ratingbar_2point5.png b/tests/tests/holo/res/drawable-mdpi/holo_inputmethod_ratingbar_2point5.png
new file mode 100644
index 0000000..2bebaba
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_inputmethod_ratingbar_2point5.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_inputmethod_ratingbar_5.png b/tests/tests/holo/res/drawable-mdpi/holo_inputmethod_ratingbar_5.png
new file mode 100644
index 0000000..51ee230
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_inputmethod_ratingbar_5.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_inputmethod_searchview.png b/tests/tests/holo/res/drawable-mdpi/holo_inputmethod_searchview.png
new file mode 100644
index 0000000..4194f13
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_inputmethod_searchview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_inputmethod_searchview_query.png b/tests/tests/holo/res/drawable-mdpi/holo_inputmethod_searchview_query.png
new file mode 100644
index 0000000..7f11808
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_inputmethod_searchview_query.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_inputmethod_searchview_query_hint.png b/tests/tests/holo/res/drawable-mdpi/holo_inputmethod_searchview_query_hint.png
new file mode 100644
index 0000000..f1e0f2f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_inputmethod_searchview_query_hint.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_inputmethod_seekbar_0.png b/tests/tests/holo/res/drawable-mdpi/holo_inputmethod_seekbar_0.png
new file mode 100644
index 0000000..6a73d98
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_inputmethod_seekbar_0.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_inputmethod_seekbar_100.png b/tests/tests/holo/res/drawable-mdpi/holo_inputmethod_seekbar_100.png
new file mode 100644
index 0000000..5be0453
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_inputmethod_seekbar_100.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_inputmethod_seekbar_50.png b/tests/tests/holo/res/drawable-mdpi/holo_inputmethod_seekbar_50.png
new file mode 100644
index 0000000..881276c
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_inputmethod_seekbar_50.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_inputmethod_spinner.png b/tests/tests/holo/res/drawable-mdpi/holo_inputmethod_spinner.png
new file mode 100644
index 0000000..144cd8f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_inputmethod_spinner.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_inputmethod_switch.png b/tests/tests/holo/res/drawable-mdpi/holo_inputmethod_switch.png
new file mode 100644
index 0000000..f3029f2
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_inputmethod_switch.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_inputmethod_switch_checked.png b/tests/tests/holo/res/drawable-mdpi/holo_inputmethod_switch_checked.png
new file mode 100644
index 0000000..2dad98a
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_inputmethod_switch_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_inputmethod_tabhost.png b/tests/tests/holo/res/drawable-mdpi/holo_inputmethod_tabhost.png
new file mode 100644
index 0000000..c27b8d8
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_inputmethod_tabhost.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_inputmethod_textview.png b/tests/tests/holo/res/drawable-mdpi/holo_inputmethod_textview.png
new file mode 100644
index 0000000..f5319bf
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_inputmethod_textview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_inputmethod_timepicker.png b/tests/tests/holo/res/drawable-mdpi/holo_inputmethod_timepicker.png
new file mode 100644
index 0000000..5e428b0
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_inputmethod_timepicker.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_inputmethod_toggle_button.png b/tests/tests/holo/res/drawable-mdpi/holo_inputmethod_toggle_button.png
new file mode 100644
index 0000000..6e95a85
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_inputmethod_toggle_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_inputmethod_toggle_button_checked.png b/tests/tests/holo/res/drawable-mdpi/holo_inputmethod_toggle_button_checked.png
new file mode 100644
index 0000000..bbbe3c6
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_inputmethod_toggle_button_checked.png
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_land_zoomcontrols.png b/tests/tests/holo/res/drawable-mdpi/holo_inputmethod_zoomcontrols.png
similarity index 100%
copy from tests/res/drawable-mdpi/holo_land_zoomcontrols.png
copy to tests/tests/holo/res/drawable-mdpi/holo_inputmethod_zoomcontrols.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_button.png b/tests/tests/holo/res/drawable-mdpi/holo_light_button.png
new file mode 100644
index 0000000..19124b2
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_calendar_view.png b/tests/tests/holo/res/drawable-mdpi/holo_light_calendar_view.png
new file mode 100644
index 0000000..3b86863
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_calendar_view.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_calendar_view_feb.png b/tests/tests/holo/res/drawable-mdpi/holo_light_calendar_view_feb.png
new file mode 100644
index 0000000..a457bc3
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_calendar_view_feb.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_checkbox.png b/tests/tests/holo/res/drawable-mdpi/holo_light_checkbox.png
new file mode 100644
index 0000000..54949e8
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_checkbox.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_checkbox_checked.png b/tests/tests/holo/res/drawable-mdpi/holo_light_checkbox_checked.png
new file mode 100644
index 0000000..42e2783
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_checkbox_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_chronometer.png b/tests/tests/holo/res/drawable-mdpi/holo_light_chronometer.png
new file mode 100644
index 0000000..200e909
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_chronometer.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_color_blue_bright.png b/tests/tests/holo/res/drawable-mdpi/holo_light_color_blue_bright.png
new file mode 100644
index 0000000..fe1bdd7
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_color_blue_bright.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_color_blue_dark.png b/tests/tests/holo/res/drawable-mdpi/holo_light_color_blue_dark.png
new file mode 100644
index 0000000..f3f0640
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_color_blue_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_color_blue_light.png b/tests/tests/holo/res/drawable-mdpi/holo_light_color_blue_light.png
new file mode 100644
index 0000000..285d925
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_color_blue_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_color_green_dark.png b/tests/tests/holo/res/drawable-mdpi/holo_light_color_green_dark.png
new file mode 100644
index 0000000..cfbbdd4
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_color_green_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_color_green_light.png b/tests/tests/holo/res/drawable-mdpi/holo_light_color_green_light.png
new file mode 100644
index 0000000..a691827
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_color_green_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_color_orange_dark.png b/tests/tests/holo/res/drawable-mdpi/holo_light_color_orange_dark.png
new file mode 100644
index 0000000..3f0e99a
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_color_orange_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_color_orange_light.png b/tests/tests/holo/res/drawable-mdpi/holo_light_color_orange_light.png
new file mode 100644
index 0000000..f54fd64
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_color_orange_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_color_purple.png b/tests/tests/holo/res/drawable-mdpi/holo_light_color_purple.png
new file mode 100644
index 0000000..15c9494
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_color_purple.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_color_red_dark.png b/tests/tests/holo/res/drawable-mdpi/holo_light_color_red_dark.png
new file mode 100644
index 0000000..de3385d
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_color_red_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_color_red_light.png b/tests/tests/holo/res/drawable-mdpi/holo_light_color_red_light.png
new file mode 100644
index 0000000..dde4043
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_color_red_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_darkactionbar_button.png b/tests/tests/holo/res/drawable-mdpi/holo_light_darkactionbar_button.png
new file mode 100644
index 0000000..19124b2
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_darkactionbar_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_darkactionbar_calendar_view.png b/tests/tests/holo/res/drawable-mdpi/holo_light_darkactionbar_calendar_view.png
new file mode 100644
index 0000000..3b86863
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_darkactionbar_calendar_view.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_darkactionbar_calendar_view_feb.png b/tests/tests/holo/res/drawable-mdpi/holo_light_darkactionbar_calendar_view_feb.png
new file mode 100644
index 0000000..a457bc3
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_darkactionbar_calendar_view_feb.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_darkactionbar_checkbox.png b/tests/tests/holo/res/drawable-mdpi/holo_light_darkactionbar_checkbox.png
new file mode 100644
index 0000000..54949e8
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_darkactionbar_checkbox.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_darkactionbar_checkbox_checked.png b/tests/tests/holo/res/drawable-mdpi/holo_light_darkactionbar_checkbox_checked.png
new file mode 100644
index 0000000..42e2783
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_darkactionbar_checkbox_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_darkactionbar_chronometer.png b/tests/tests/holo/res/drawable-mdpi/holo_light_darkactionbar_chronometer.png
new file mode 100644
index 0000000..200e909
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_darkactionbar_chronometer.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_darkactionbar_color_blue_bright.png b/tests/tests/holo/res/drawable-mdpi/holo_light_darkactionbar_color_blue_bright.png
new file mode 100644
index 0000000..fe1bdd7
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_darkactionbar_color_blue_bright.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_darkactionbar_color_blue_dark.png b/tests/tests/holo/res/drawable-mdpi/holo_light_darkactionbar_color_blue_dark.png
new file mode 100644
index 0000000..f3f0640
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_darkactionbar_color_blue_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_darkactionbar_color_blue_light.png b/tests/tests/holo/res/drawable-mdpi/holo_light_darkactionbar_color_blue_light.png
new file mode 100644
index 0000000..285d925
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_darkactionbar_color_blue_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_darkactionbar_color_green_dark.png b/tests/tests/holo/res/drawable-mdpi/holo_light_darkactionbar_color_green_dark.png
new file mode 100644
index 0000000..cfbbdd4
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_darkactionbar_color_green_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_darkactionbar_color_green_light.png b/tests/tests/holo/res/drawable-mdpi/holo_light_darkactionbar_color_green_light.png
new file mode 100644
index 0000000..a691827
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_darkactionbar_color_green_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_darkactionbar_color_orange_dark.png b/tests/tests/holo/res/drawable-mdpi/holo_light_darkactionbar_color_orange_dark.png
new file mode 100644
index 0000000..3f0e99a
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_darkactionbar_color_orange_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_darkactionbar_color_orange_light.png b/tests/tests/holo/res/drawable-mdpi/holo_light_darkactionbar_color_orange_light.png
new file mode 100644
index 0000000..f54fd64
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_darkactionbar_color_orange_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_darkactionbar_color_purple.png b/tests/tests/holo/res/drawable-mdpi/holo_light_darkactionbar_color_purple.png
new file mode 100644
index 0000000..15c9494
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_darkactionbar_color_purple.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_darkactionbar_color_red_dark.png b/tests/tests/holo/res/drawable-mdpi/holo_light_darkactionbar_color_red_dark.png
new file mode 100644
index 0000000..de3385d
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_darkactionbar_color_red_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_darkactionbar_color_red_light.png b/tests/tests/holo/res/drawable-mdpi/holo_light_darkactionbar_color_red_light.png
new file mode 100644
index 0000000..dde4043
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_darkactionbar_color_red_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_darkactionbar_edittext.png b/tests/tests/holo/res/drawable-mdpi/holo_light_darkactionbar_edittext.png
new file mode 100644
index 0000000..3e9e9ca
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_darkactionbar_edittext.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_darkactionbar_progressbar.png b/tests/tests/holo/res/drawable-mdpi/holo_light_darkactionbar_progressbar.png
new file mode 100644
index 0000000..d027b03
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_darkactionbar_progressbar.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_darkactionbar_progressbar_horizontal_0.png b/tests/tests/holo/res/drawable-mdpi/holo_light_darkactionbar_progressbar_horizontal_0.png
new file mode 100644
index 0000000..aa86092
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_darkactionbar_progressbar_horizontal_0.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_darkactionbar_progressbar_horizontal_100.png b/tests/tests/holo/res/drawable-mdpi/holo_light_darkactionbar_progressbar_horizontal_100.png
new file mode 100644
index 0000000..750a89c
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_darkactionbar_progressbar_horizontal_100.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_darkactionbar_progressbar_horizontal_50.png b/tests/tests/holo/res/drawable-mdpi/holo_light_darkactionbar_progressbar_horizontal_50.png
new file mode 100644
index 0000000..fc91586
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_darkactionbar_progressbar_horizontal_50.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_darkactionbar_progressbar_large.png b/tests/tests/holo/res/drawable-mdpi/holo_light_darkactionbar_progressbar_large.png
new file mode 100644
index 0000000..50301a4
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_darkactionbar_progressbar_large.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_darkactionbar_progressbar_small.png b/tests/tests/holo/res/drawable-mdpi/holo_light_darkactionbar_progressbar_small.png
new file mode 100644
index 0000000..1240e6a
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_darkactionbar_progressbar_small.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_darkactionbar_radio_button.png b/tests/tests/holo/res/drawable-mdpi/holo_light_darkactionbar_radio_button.png
new file mode 100644
index 0000000..c2398a1
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_darkactionbar_radio_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_darkactionbar_radio_button_checked.png b/tests/tests/holo/res/drawable-mdpi/holo_light_darkactionbar_radio_button_checked.png
new file mode 100644
index 0000000..898442f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_darkactionbar_radio_button_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_darkactionbar_radiogroup_horizontal.png b/tests/tests/holo/res/drawable-mdpi/holo_light_darkactionbar_radiogroup_horizontal.png
new file mode 100644
index 0000000..6191420
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_darkactionbar_radiogroup_horizontal.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_darkactionbar_radiogroup_vertical.png b/tests/tests/holo/res/drawable-mdpi/holo_light_darkactionbar_radiogroup_vertical.png
new file mode 100644
index 0000000..fa88e6f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_darkactionbar_radiogroup_vertical.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_darkactionbar_ratingbar_0.png b/tests/tests/holo/res/drawable-mdpi/holo_light_darkactionbar_ratingbar_0.png
new file mode 100644
index 0000000..2fabd8a
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_darkactionbar_ratingbar_0.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_darkactionbar_ratingbar_2point5.png b/tests/tests/holo/res/drawable-mdpi/holo_light_darkactionbar_ratingbar_2point5.png
new file mode 100644
index 0000000..2bebaba
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_darkactionbar_ratingbar_2point5.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_darkactionbar_ratingbar_5.png b/tests/tests/holo/res/drawable-mdpi/holo_light_darkactionbar_ratingbar_5.png
new file mode 100644
index 0000000..51ee230
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_darkactionbar_ratingbar_5.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_darkactionbar_searchview.png b/tests/tests/holo/res/drawable-mdpi/holo_light_darkactionbar_searchview.png
new file mode 100644
index 0000000..4194f13
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_darkactionbar_searchview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_darkactionbar_searchview_query.png b/tests/tests/holo/res/drawable-mdpi/holo_light_darkactionbar_searchview_query.png
new file mode 100644
index 0000000..7f11808
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_darkactionbar_searchview_query.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_darkactionbar_searchview_query_hint.png b/tests/tests/holo/res/drawable-mdpi/holo_light_darkactionbar_searchview_query_hint.png
new file mode 100644
index 0000000..f1e0f2f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_darkactionbar_searchview_query_hint.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_darkactionbar_seekbar_0.png b/tests/tests/holo/res/drawable-mdpi/holo_light_darkactionbar_seekbar_0.png
new file mode 100644
index 0000000..6a73d98
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_darkactionbar_seekbar_0.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_darkactionbar_seekbar_100.png b/tests/tests/holo/res/drawable-mdpi/holo_light_darkactionbar_seekbar_100.png
new file mode 100644
index 0000000..5be0453
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_darkactionbar_seekbar_100.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_darkactionbar_seekbar_50.png b/tests/tests/holo/res/drawable-mdpi/holo_light_darkactionbar_seekbar_50.png
new file mode 100644
index 0000000..881276c
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_darkactionbar_seekbar_50.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_darkactionbar_spinner.png b/tests/tests/holo/res/drawable-mdpi/holo_light_darkactionbar_spinner.png
new file mode 100644
index 0000000..144cd8f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_darkactionbar_spinner.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_darkactionbar_switch.png b/tests/tests/holo/res/drawable-mdpi/holo_light_darkactionbar_switch.png
new file mode 100644
index 0000000..f3029f2
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_darkactionbar_switch.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_darkactionbar_switch_checked.png b/tests/tests/holo/res/drawable-mdpi/holo_light_darkactionbar_switch_checked.png
new file mode 100644
index 0000000..2dad98a
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_darkactionbar_switch_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_darkactionbar_tabhost.png b/tests/tests/holo/res/drawable-mdpi/holo_light_darkactionbar_tabhost.png
new file mode 100644
index 0000000..c27b8d8
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_darkactionbar_tabhost.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_darkactionbar_textview.png b/tests/tests/holo/res/drawable-mdpi/holo_light_darkactionbar_textview.png
new file mode 100644
index 0000000..f5319bf
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_darkactionbar_textview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_darkactionbar_timepicker.png b/tests/tests/holo/res/drawable-mdpi/holo_light_darkactionbar_timepicker.png
new file mode 100644
index 0000000..5e428b0
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_darkactionbar_timepicker.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_darkactionbar_toggle_button.png b/tests/tests/holo/res/drawable-mdpi/holo_light_darkactionbar_toggle_button.png
new file mode 100644
index 0000000..6e95a85
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_darkactionbar_toggle_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_darkactionbar_toggle_button_checked.png b/tests/tests/holo/res/drawable-mdpi/holo_light_darkactionbar_toggle_button_checked.png
new file mode 100644
index 0000000..bbbe3c6
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_darkactionbar_toggle_button_checked.png
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_land_zoomcontrols.png b/tests/tests/holo/res/drawable-mdpi/holo_light_darkactionbar_zoomcontrols.png
similarity index 100%
copy from tests/res/drawable-mdpi/holo_land_zoomcontrols.png
copy to tests/tests/holo/res/drawable-mdpi/holo_light_darkactionbar_zoomcontrols.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_button.png b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_button.png
new file mode 100644
index 0000000..19124b2
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_calendar_view.png b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_calendar_view.png
new file mode 100644
index 0000000..3b86863
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_calendar_view.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_calendar_view_feb.png b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_calendar_view_feb.png
new file mode 100644
index 0000000..a457bc3
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_calendar_view_feb.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_checkbox.png b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_checkbox.png
new file mode 100644
index 0000000..54949e8
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_checkbox.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_checkbox_checked.png b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_checkbox_checked.png
new file mode 100644
index 0000000..42e2783
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_checkbox_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_chronometer.png b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_chronometer.png
new file mode 100644
index 0000000..200e909
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_chronometer.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_color_blue_bright.png b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_color_blue_bright.png
new file mode 100644
index 0000000..fe1bdd7
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_color_blue_bright.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_color_blue_dark.png b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_color_blue_dark.png
new file mode 100644
index 0000000..f3f0640
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_color_blue_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_color_blue_light.png b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_color_blue_light.png
new file mode 100644
index 0000000..285d925
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_color_blue_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_color_green_dark.png b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_color_green_dark.png
new file mode 100644
index 0000000..cfbbdd4
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_color_green_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_color_green_light.png b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_color_green_light.png
new file mode 100644
index 0000000..a691827
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_color_green_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_color_orange_dark.png b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_color_orange_dark.png
new file mode 100644
index 0000000..3f0e99a
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_color_orange_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_color_orange_light.png b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_color_orange_light.png
new file mode 100644
index 0000000..f54fd64
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_color_orange_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_color_purple.png b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_color_purple.png
new file mode 100644
index 0000000..15c9494
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_color_purple.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_color_red_dark.png b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_color_red_dark.png
new file mode 100644
index 0000000..de3385d
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_color_red_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_color_red_light.png b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_color_red_light.png
new file mode 100644
index 0000000..dde4043
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_color_red_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_edittext.png b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_edittext.png
new file mode 100644
index 0000000..3e9e9ca
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_edittext.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_minwidth_button.png b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_minwidth_button.png
new file mode 100644
index 0000000..19124b2
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_minwidth_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_minwidth_calendar_view.png b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_minwidth_calendar_view.png
new file mode 100644
index 0000000..3b86863
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_minwidth_calendar_view.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_minwidth_calendar_view_feb.png b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_minwidth_calendar_view_feb.png
new file mode 100644
index 0000000..a457bc3
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_minwidth_calendar_view_feb.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_minwidth_checkbox.png b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_minwidth_checkbox.png
new file mode 100644
index 0000000..54949e8
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_minwidth_checkbox.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_minwidth_checkbox_checked.png b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_minwidth_checkbox_checked.png
new file mode 100644
index 0000000..42e2783
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_minwidth_checkbox_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_minwidth_chronometer.png b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_minwidth_chronometer.png
new file mode 100644
index 0000000..200e909
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_minwidth_chronometer.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_minwidth_color_blue_bright.png b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_minwidth_color_blue_bright.png
new file mode 100644
index 0000000..fe1bdd7
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_minwidth_color_blue_bright.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_minwidth_color_blue_dark.png b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_minwidth_color_blue_dark.png
new file mode 100644
index 0000000..f3f0640
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_minwidth_color_blue_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_minwidth_color_blue_light.png b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_minwidth_color_blue_light.png
new file mode 100644
index 0000000..285d925
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_minwidth_color_blue_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_minwidth_color_green_dark.png b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_minwidth_color_green_dark.png
new file mode 100644
index 0000000..cfbbdd4
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_minwidth_color_green_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_minwidth_color_green_light.png b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_minwidth_color_green_light.png
new file mode 100644
index 0000000..a691827
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_minwidth_color_green_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_minwidth_color_orange_dark.png b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_minwidth_color_orange_dark.png
new file mode 100644
index 0000000..3f0e99a
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_minwidth_color_orange_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_minwidth_color_orange_light.png b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_minwidth_color_orange_light.png
new file mode 100644
index 0000000..f54fd64
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_minwidth_color_orange_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_minwidth_color_purple.png b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_minwidth_color_purple.png
new file mode 100644
index 0000000..15c9494
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_minwidth_color_purple.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_minwidth_color_red_dark.png b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_minwidth_color_red_dark.png
new file mode 100644
index 0000000..de3385d
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_minwidth_color_red_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_minwidth_color_red_light.png b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_minwidth_color_red_light.png
new file mode 100644
index 0000000..dde4043
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_minwidth_color_red_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_minwidth_edittext.png b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_minwidth_edittext.png
new file mode 100644
index 0000000..3e9e9ca
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_minwidth_edittext.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_minwidth_progressbar.png b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_minwidth_progressbar.png
new file mode 100644
index 0000000..d027b03
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_minwidth_progressbar.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_minwidth_progressbar_horizontal_0.png b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_minwidth_progressbar_horizontal_0.png
new file mode 100644
index 0000000..aa86092
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_minwidth_progressbar_horizontal_0.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_minwidth_progressbar_horizontal_100.png b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_minwidth_progressbar_horizontal_100.png
new file mode 100644
index 0000000..750a89c
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_minwidth_progressbar_horizontal_100.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_minwidth_progressbar_horizontal_50.png b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_minwidth_progressbar_horizontal_50.png
new file mode 100644
index 0000000..fc91586
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_minwidth_progressbar_horizontal_50.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_minwidth_progressbar_large.png b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_minwidth_progressbar_large.png
new file mode 100644
index 0000000..50301a4
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_minwidth_progressbar_large.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_minwidth_progressbar_small.png b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_minwidth_progressbar_small.png
new file mode 100644
index 0000000..1240e6a
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_minwidth_progressbar_small.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_minwidth_radio_button.png b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_minwidth_radio_button.png
new file mode 100644
index 0000000..c2398a1
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_minwidth_radio_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_minwidth_radio_button_checked.png b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_minwidth_radio_button_checked.png
new file mode 100644
index 0000000..898442f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_minwidth_radio_button_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_minwidth_radiogroup_horizontal.png b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_minwidth_radiogroup_horizontal.png
new file mode 100644
index 0000000..6191420
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_minwidth_radiogroup_horizontal.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_minwidth_radiogroup_vertical.png b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_minwidth_radiogroup_vertical.png
new file mode 100644
index 0000000..fa88e6f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_minwidth_radiogroup_vertical.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_minwidth_ratingbar_0.png b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_minwidth_ratingbar_0.png
new file mode 100644
index 0000000..2fabd8a
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_minwidth_ratingbar_0.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_minwidth_ratingbar_2point5.png b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_minwidth_ratingbar_2point5.png
new file mode 100644
index 0000000..2bebaba
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_minwidth_ratingbar_2point5.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_minwidth_ratingbar_5.png b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_minwidth_ratingbar_5.png
new file mode 100644
index 0000000..51ee230
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_minwidth_ratingbar_5.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_minwidth_searchview.png b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_minwidth_searchview.png
new file mode 100644
index 0000000..4194f13
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_minwidth_searchview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_minwidth_searchview_query.png b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_minwidth_searchview_query.png
new file mode 100644
index 0000000..7f11808
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_minwidth_searchview_query.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_minwidth_searchview_query_hint.png b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_minwidth_searchview_query_hint.png
new file mode 100644
index 0000000..f1e0f2f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_minwidth_searchview_query_hint.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_minwidth_seekbar_0.png b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_minwidth_seekbar_0.png
new file mode 100644
index 0000000..6a73d98
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_minwidth_seekbar_0.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_minwidth_seekbar_100.png b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_minwidth_seekbar_100.png
new file mode 100644
index 0000000..5be0453
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_minwidth_seekbar_100.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_minwidth_seekbar_50.png b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_minwidth_seekbar_50.png
new file mode 100644
index 0000000..881276c
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_minwidth_seekbar_50.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_minwidth_spinner.png b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_minwidth_spinner.png
new file mode 100644
index 0000000..144cd8f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_minwidth_spinner.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_minwidth_switch.png b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_minwidth_switch.png
new file mode 100644
index 0000000..f3029f2
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_minwidth_switch.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_minwidth_switch_checked.png b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_minwidth_switch_checked.png
new file mode 100644
index 0000000..2dad98a
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_minwidth_switch_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_minwidth_tabhost.png b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_minwidth_tabhost.png
new file mode 100644
index 0000000..c27b8d8
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_minwidth_tabhost.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_minwidth_textview.png b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_minwidth_textview.png
new file mode 100644
index 0000000..f5319bf
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_minwidth_textview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_minwidth_timepicker.png b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_minwidth_timepicker.png
new file mode 100644
index 0000000..5e428b0
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_minwidth_timepicker.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_minwidth_toggle_button.png b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_minwidth_toggle_button.png
new file mode 100644
index 0000000..6e95a85
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_minwidth_toggle_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_minwidth_toggle_button_checked.png b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_minwidth_toggle_button_checked.png
new file mode 100644
index 0000000..bbbe3c6
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_minwidth_toggle_button_checked.png
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_land_zoomcontrols.png b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_minwidth_zoomcontrols.png
similarity index 100%
copy from tests/res/drawable-mdpi/holo_land_zoomcontrols.png
copy to tests/tests/holo/res/drawable-mdpi/holo_light_dialog_minwidth_zoomcontrols.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_noactionbar_button.png b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_noactionbar_button.png
new file mode 100644
index 0000000..19124b2
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_noactionbar_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_noactionbar_calendar_view.png b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_noactionbar_calendar_view.png
new file mode 100644
index 0000000..3b86863
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_noactionbar_calendar_view.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_noactionbar_calendar_view_feb.png b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_noactionbar_calendar_view_feb.png
new file mode 100644
index 0000000..a457bc3
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_noactionbar_calendar_view_feb.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_noactionbar_checkbox.png b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_noactionbar_checkbox.png
new file mode 100644
index 0000000..54949e8
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_noactionbar_checkbox.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_noactionbar_checkbox_checked.png b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_noactionbar_checkbox_checked.png
new file mode 100644
index 0000000..42e2783
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_noactionbar_checkbox_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_noactionbar_chronometer.png b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_noactionbar_chronometer.png
new file mode 100644
index 0000000..200e909
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_noactionbar_chronometer.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_noactionbar_color_blue_bright.png b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_noactionbar_color_blue_bright.png
new file mode 100644
index 0000000..fe1bdd7
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_noactionbar_color_blue_bright.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_noactionbar_color_blue_dark.png b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_noactionbar_color_blue_dark.png
new file mode 100644
index 0000000..f3f0640
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_noactionbar_color_blue_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_noactionbar_color_blue_light.png b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_noactionbar_color_blue_light.png
new file mode 100644
index 0000000..285d925
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_noactionbar_color_blue_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_noactionbar_color_green_dark.png b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_noactionbar_color_green_dark.png
new file mode 100644
index 0000000..cfbbdd4
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_noactionbar_color_green_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_noactionbar_color_green_light.png b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_noactionbar_color_green_light.png
new file mode 100644
index 0000000..a691827
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_noactionbar_color_green_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_noactionbar_color_orange_dark.png b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_noactionbar_color_orange_dark.png
new file mode 100644
index 0000000..3f0e99a
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_noactionbar_color_orange_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_noactionbar_color_orange_light.png b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_noactionbar_color_orange_light.png
new file mode 100644
index 0000000..f54fd64
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_noactionbar_color_orange_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_noactionbar_color_purple.png b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_noactionbar_color_purple.png
new file mode 100644
index 0000000..15c9494
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_noactionbar_color_purple.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_noactionbar_color_red_dark.png b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_noactionbar_color_red_dark.png
new file mode 100644
index 0000000..de3385d
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_noactionbar_color_red_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_noactionbar_color_red_light.png b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_noactionbar_color_red_light.png
new file mode 100644
index 0000000..dde4043
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_noactionbar_color_red_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_noactionbar_edittext.png b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_noactionbar_edittext.png
new file mode 100644
index 0000000..3e9e9ca
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_noactionbar_edittext.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_noactionbar_minwidth_button.png b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_noactionbar_minwidth_button.png
new file mode 100644
index 0000000..19124b2
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_noactionbar_minwidth_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_noactionbar_minwidth_calendar_view.png b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_noactionbar_minwidth_calendar_view.png
new file mode 100644
index 0000000..3b86863
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_noactionbar_minwidth_calendar_view.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_noactionbar_minwidth_calendar_view_feb.png b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_noactionbar_minwidth_calendar_view_feb.png
new file mode 100644
index 0000000..a457bc3
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_noactionbar_minwidth_calendar_view_feb.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_noactionbar_minwidth_checkbox.png b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_noactionbar_minwidth_checkbox.png
new file mode 100644
index 0000000..54949e8
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_noactionbar_minwidth_checkbox.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_noactionbar_minwidth_checkbox_checked.png b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_noactionbar_minwidth_checkbox_checked.png
new file mode 100644
index 0000000..42e2783
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_noactionbar_minwidth_checkbox_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_noactionbar_minwidth_chronometer.png b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_noactionbar_minwidth_chronometer.png
new file mode 100644
index 0000000..200e909
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_noactionbar_minwidth_chronometer.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_noactionbar_minwidth_color_blue_bright.png b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_noactionbar_minwidth_color_blue_bright.png
new file mode 100644
index 0000000..fe1bdd7
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_noactionbar_minwidth_color_blue_bright.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_noactionbar_minwidth_color_blue_dark.png b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_noactionbar_minwidth_color_blue_dark.png
new file mode 100644
index 0000000..f3f0640
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_noactionbar_minwidth_color_blue_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_noactionbar_minwidth_color_blue_light.png b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_noactionbar_minwidth_color_blue_light.png
new file mode 100644
index 0000000..285d925
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_noactionbar_minwidth_color_blue_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_noactionbar_minwidth_color_green_dark.png b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_noactionbar_minwidth_color_green_dark.png
new file mode 100644
index 0000000..cfbbdd4
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_noactionbar_minwidth_color_green_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_noactionbar_minwidth_color_green_light.png b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_noactionbar_minwidth_color_green_light.png
new file mode 100644
index 0000000..a691827
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_noactionbar_minwidth_color_green_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_noactionbar_minwidth_color_orange_dark.png b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_noactionbar_minwidth_color_orange_dark.png
new file mode 100644
index 0000000..3f0e99a
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_noactionbar_minwidth_color_orange_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_noactionbar_minwidth_color_orange_light.png b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_noactionbar_minwidth_color_orange_light.png
new file mode 100644
index 0000000..f54fd64
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_noactionbar_minwidth_color_orange_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_noactionbar_minwidth_color_purple.png b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_noactionbar_minwidth_color_purple.png
new file mode 100644
index 0000000..15c9494
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_noactionbar_minwidth_color_purple.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_noactionbar_minwidth_color_red_dark.png b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_noactionbar_minwidth_color_red_dark.png
new file mode 100644
index 0000000..de3385d
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_noactionbar_minwidth_color_red_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_noactionbar_minwidth_color_red_light.png b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_noactionbar_minwidth_color_red_light.png
new file mode 100644
index 0000000..dde4043
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_noactionbar_minwidth_color_red_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_noactionbar_minwidth_edittext.png b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_noactionbar_minwidth_edittext.png
new file mode 100644
index 0000000..3e9e9ca
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_noactionbar_minwidth_edittext.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_noactionbar_minwidth_progressbar.png b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_noactionbar_minwidth_progressbar.png
new file mode 100644
index 0000000..d027b03
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_noactionbar_minwidth_progressbar.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_noactionbar_minwidth_progressbar_horizontal_0.png b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_noactionbar_minwidth_progressbar_horizontal_0.png
new file mode 100644
index 0000000..aa86092
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_noactionbar_minwidth_progressbar_horizontal_0.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_noactionbar_minwidth_progressbar_horizontal_100.png b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_noactionbar_minwidth_progressbar_horizontal_100.png
new file mode 100644
index 0000000..750a89c
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_noactionbar_minwidth_progressbar_horizontal_100.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_noactionbar_minwidth_progressbar_horizontal_50.png b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_noactionbar_minwidth_progressbar_horizontal_50.png
new file mode 100644
index 0000000..fc91586
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_noactionbar_minwidth_progressbar_horizontal_50.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_noactionbar_minwidth_progressbar_large.png b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_noactionbar_minwidth_progressbar_large.png
new file mode 100644
index 0000000..50301a4
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_noactionbar_minwidth_progressbar_large.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_noactionbar_minwidth_progressbar_small.png b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_noactionbar_minwidth_progressbar_small.png
new file mode 100644
index 0000000..1240e6a
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_noactionbar_minwidth_progressbar_small.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_noactionbar_minwidth_radio_button.png b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_noactionbar_minwidth_radio_button.png
new file mode 100644
index 0000000..c2398a1
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_noactionbar_minwidth_radio_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_noactionbar_minwidth_radio_button_checked.png b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_noactionbar_minwidth_radio_button_checked.png
new file mode 100644
index 0000000..898442f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_noactionbar_minwidth_radio_button_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_noactionbar_minwidth_radiogroup_horizontal.png b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_noactionbar_minwidth_radiogroup_horizontal.png
new file mode 100644
index 0000000..6191420
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_noactionbar_minwidth_radiogroup_horizontal.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_noactionbar_minwidth_radiogroup_vertical.png b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_noactionbar_minwidth_radiogroup_vertical.png
new file mode 100644
index 0000000..fa88e6f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_noactionbar_minwidth_radiogroup_vertical.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_noactionbar_minwidth_ratingbar_0.png b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_noactionbar_minwidth_ratingbar_0.png
new file mode 100644
index 0000000..2fabd8a
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_noactionbar_minwidth_ratingbar_0.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_noactionbar_minwidth_ratingbar_2point5.png b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_noactionbar_minwidth_ratingbar_2point5.png
new file mode 100644
index 0000000..2bebaba
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_noactionbar_minwidth_ratingbar_2point5.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_noactionbar_minwidth_ratingbar_5.png b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_noactionbar_minwidth_ratingbar_5.png
new file mode 100644
index 0000000..51ee230
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_noactionbar_minwidth_ratingbar_5.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_noactionbar_minwidth_searchview.png b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_noactionbar_minwidth_searchview.png
new file mode 100644
index 0000000..4194f13
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_noactionbar_minwidth_searchview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_noactionbar_minwidth_searchview_query.png b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_noactionbar_minwidth_searchview_query.png
new file mode 100644
index 0000000..7f11808
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_noactionbar_minwidth_searchview_query.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_noactionbar_minwidth_searchview_query_hint.png b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_noactionbar_minwidth_searchview_query_hint.png
new file mode 100644
index 0000000..f1e0f2f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_noactionbar_minwidth_searchview_query_hint.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_noactionbar_minwidth_seekbar_0.png b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_noactionbar_minwidth_seekbar_0.png
new file mode 100644
index 0000000..6a73d98
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_noactionbar_minwidth_seekbar_0.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_noactionbar_minwidth_seekbar_100.png b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_noactionbar_minwidth_seekbar_100.png
new file mode 100644
index 0000000..5be0453
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_noactionbar_minwidth_seekbar_100.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_noactionbar_minwidth_seekbar_50.png b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_noactionbar_minwidth_seekbar_50.png
new file mode 100644
index 0000000..881276c
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_noactionbar_minwidth_seekbar_50.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_noactionbar_minwidth_spinner.png b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_noactionbar_minwidth_spinner.png
new file mode 100644
index 0000000..144cd8f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_noactionbar_minwidth_spinner.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_noactionbar_minwidth_switch.png b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_noactionbar_minwidth_switch.png
new file mode 100644
index 0000000..f3029f2
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_noactionbar_minwidth_switch.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_noactionbar_minwidth_switch_checked.png b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_noactionbar_minwidth_switch_checked.png
new file mode 100644
index 0000000..2dad98a
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_noactionbar_minwidth_switch_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_noactionbar_minwidth_tabhost.png b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_noactionbar_minwidth_tabhost.png
new file mode 100644
index 0000000..c27b8d8
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_noactionbar_minwidth_tabhost.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_noactionbar_minwidth_textview.png b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_noactionbar_minwidth_textview.png
new file mode 100644
index 0000000..f5319bf
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_noactionbar_minwidth_textview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_noactionbar_minwidth_timepicker.png b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_noactionbar_minwidth_timepicker.png
new file mode 100644
index 0000000..5e428b0
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_noactionbar_minwidth_timepicker.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_noactionbar_minwidth_toggle_button.png b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_noactionbar_minwidth_toggle_button.png
new file mode 100644
index 0000000..6e95a85
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_noactionbar_minwidth_toggle_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_noactionbar_minwidth_toggle_button_checked.png b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_noactionbar_minwidth_toggle_button_checked.png
new file mode 100644
index 0000000..bbbe3c6
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_noactionbar_minwidth_toggle_button_checked.png
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_land_zoomcontrols.png b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_noactionbar_minwidth_zoomcontrols.png
similarity index 100%
copy from tests/res/drawable-mdpi/holo_land_zoomcontrols.png
copy to tests/tests/holo/res/drawable-mdpi/holo_light_dialog_noactionbar_minwidth_zoomcontrols.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_noactionbar_progressbar.png b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_noactionbar_progressbar.png
new file mode 100644
index 0000000..d027b03
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_noactionbar_progressbar.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_noactionbar_progressbar_horizontal_0.png b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_noactionbar_progressbar_horizontal_0.png
new file mode 100644
index 0000000..aa86092
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_noactionbar_progressbar_horizontal_0.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_noactionbar_progressbar_horizontal_100.png b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_noactionbar_progressbar_horizontal_100.png
new file mode 100644
index 0000000..750a89c
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_noactionbar_progressbar_horizontal_100.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_noactionbar_progressbar_horizontal_50.png b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_noactionbar_progressbar_horizontal_50.png
new file mode 100644
index 0000000..fc91586
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_noactionbar_progressbar_horizontal_50.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_noactionbar_progressbar_large.png b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_noactionbar_progressbar_large.png
new file mode 100644
index 0000000..50301a4
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_noactionbar_progressbar_large.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_noactionbar_progressbar_small.png b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_noactionbar_progressbar_small.png
new file mode 100644
index 0000000..1240e6a
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_noactionbar_progressbar_small.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_noactionbar_radio_button.png b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_noactionbar_radio_button.png
new file mode 100644
index 0000000..c2398a1
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_noactionbar_radio_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_noactionbar_radio_button_checked.png b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_noactionbar_radio_button_checked.png
new file mode 100644
index 0000000..898442f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_noactionbar_radio_button_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_noactionbar_radiogroup_horizontal.png b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_noactionbar_radiogroup_horizontal.png
new file mode 100644
index 0000000..6191420
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_noactionbar_radiogroup_horizontal.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_noactionbar_radiogroup_vertical.png b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_noactionbar_radiogroup_vertical.png
new file mode 100644
index 0000000..fa88e6f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_noactionbar_radiogroup_vertical.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_noactionbar_ratingbar_0.png b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_noactionbar_ratingbar_0.png
new file mode 100644
index 0000000..2fabd8a
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_noactionbar_ratingbar_0.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_noactionbar_ratingbar_2point5.png b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_noactionbar_ratingbar_2point5.png
new file mode 100644
index 0000000..2bebaba
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_noactionbar_ratingbar_2point5.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_noactionbar_ratingbar_5.png b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_noactionbar_ratingbar_5.png
new file mode 100644
index 0000000..51ee230
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_noactionbar_ratingbar_5.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_noactionbar_searchview.png b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_noactionbar_searchview.png
new file mode 100644
index 0000000..4194f13
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_noactionbar_searchview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_noactionbar_searchview_query.png b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_noactionbar_searchview_query.png
new file mode 100644
index 0000000..7f11808
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_noactionbar_searchview_query.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_noactionbar_searchview_query_hint.png b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_noactionbar_searchview_query_hint.png
new file mode 100644
index 0000000..f1e0f2f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_noactionbar_searchview_query_hint.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_noactionbar_seekbar_0.png b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_noactionbar_seekbar_0.png
new file mode 100644
index 0000000..6a73d98
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_noactionbar_seekbar_0.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_noactionbar_seekbar_100.png b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_noactionbar_seekbar_100.png
new file mode 100644
index 0000000..5be0453
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_noactionbar_seekbar_100.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_noactionbar_seekbar_50.png b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_noactionbar_seekbar_50.png
new file mode 100644
index 0000000..881276c
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_noactionbar_seekbar_50.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_noactionbar_spinner.png b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_noactionbar_spinner.png
new file mode 100644
index 0000000..144cd8f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_noactionbar_spinner.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_noactionbar_switch.png b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_noactionbar_switch.png
new file mode 100644
index 0000000..f3029f2
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_noactionbar_switch.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_noactionbar_switch_checked.png b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_noactionbar_switch_checked.png
new file mode 100644
index 0000000..2dad98a
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_noactionbar_switch_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_noactionbar_tabhost.png b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_noactionbar_tabhost.png
new file mode 100644
index 0000000..c27b8d8
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_noactionbar_tabhost.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_noactionbar_textview.png b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_noactionbar_textview.png
new file mode 100644
index 0000000..f5319bf
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_noactionbar_textview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_noactionbar_timepicker.png b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_noactionbar_timepicker.png
new file mode 100644
index 0000000..5e428b0
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_noactionbar_timepicker.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_noactionbar_toggle_button.png b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_noactionbar_toggle_button.png
new file mode 100644
index 0000000..6e95a85
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_noactionbar_toggle_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_noactionbar_toggle_button_checked.png b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_noactionbar_toggle_button_checked.png
new file mode 100644
index 0000000..bbbe3c6
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_noactionbar_toggle_button_checked.png
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_land_zoomcontrols.png b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_noactionbar_zoomcontrols.png
similarity index 100%
copy from tests/res/drawable-mdpi/holo_land_zoomcontrols.png
copy to tests/tests/holo/res/drawable-mdpi/holo_light_dialog_noactionbar_zoomcontrols.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_progressbar.png b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_progressbar.png
new file mode 100644
index 0000000..d027b03
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_progressbar.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_progressbar_horizontal_0.png b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_progressbar_horizontal_0.png
new file mode 100644
index 0000000..aa86092
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_progressbar_horizontal_0.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_progressbar_horizontal_100.png b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_progressbar_horizontal_100.png
new file mode 100644
index 0000000..750a89c
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_progressbar_horizontal_100.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_progressbar_horizontal_50.png b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_progressbar_horizontal_50.png
new file mode 100644
index 0000000..fc91586
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_progressbar_horizontal_50.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_progressbar_large.png b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_progressbar_large.png
new file mode 100644
index 0000000..50301a4
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_progressbar_large.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_progressbar_small.png b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_progressbar_small.png
new file mode 100644
index 0000000..1240e6a
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_progressbar_small.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_radio_button.png b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_radio_button.png
new file mode 100644
index 0000000..c2398a1
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_radio_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_radio_button_checked.png b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_radio_button_checked.png
new file mode 100644
index 0000000..898442f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_radio_button_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_radiogroup_horizontal.png b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_radiogroup_horizontal.png
new file mode 100644
index 0000000..6191420
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_radiogroup_horizontal.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_radiogroup_vertical.png b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_radiogroup_vertical.png
new file mode 100644
index 0000000..fa88e6f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_radiogroup_vertical.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_ratingbar_0.png b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_ratingbar_0.png
new file mode 100644
index 0000000..2fabd8a
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_ratingbar_0.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_ratingbar_2point5.png b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_ratingbar_2point5.png
new file mode 100644
index 0000000..2bebaba
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_ratingbar_2point5.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_ratingbar_5.png b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_ratingbar_5.png
new file mode 100644
index 0000000..51ee230
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_ratingbar_5.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_searchview.png b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_searchview.png
new file mode 100644
index 0000000..4194f13
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_searchview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_searchview_query.png b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_searchview_query.png
new file mode 100644
index 0000000..7f11808
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_searchview_query.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_searchview_query_hint.png b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_searchview_query_hint.png
new file mode 100644
index 0000000..f1e0f2f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_searchview_query_hint.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_seekbar_0.png b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_seekbar_0.png
new file mode 100644
index 0000000..6a73d98
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_seekbar_0.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_seekbar_100.png b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_seekbar_100.png
new file mode 100644
index 0000000..5be0453
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_seekbar_100.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_seekbar_50.png b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_seekbar_50.png
new file mode 100644
index 0000000..881276c
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_seekbar_50.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_spinner.png b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_spinner.png
new file mode 100644
index 0000000..144cd8f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_spinner.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_switch.png b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_switch.png
new file mode 100644
index 0000000..f3029f2
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_switch.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_switch_checked.png b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_switch_checked.png
new file mode 100644
index 0000000..2dad98a
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_switch_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_tabhost.png b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_tabhost.png
new file mode 100644
index 0000000..c27b8d8
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_tabhost.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_textview.png b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_textview.png
new file mode 100644
index 0000000..f5319bf
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_textview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_timepicker.png b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_timepicker.png
new file mode 100644
index 0000000..5e428b0
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_timepicker.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_toggle_button.png b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_toggle_button.png
new file mode 100644
index 0000000..6e95a85
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_toggle_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_toggle_button_checked.png b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_toggle_button_checked.png
new file mode 100644
index 0000000..bbbe3c6
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_toggle_button_checked.png
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_land_zoomcontrols.png b/tests/tests/holo/res/drawable-mdpi/holo_light_dialog_zoomcontrols.png
similarity index 100%
copy from tests/res/drawable-mdpi/holo_land_zoomcontrols.png
copy to tests/tests/holo/res/drawable-mdpi/holo_light_dialog_zoomcontrols.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_dialogwhenlarge_button.png b/tests/tests/holo/res/drawable-mdpi/holo_light_dialogwhenlarge_button.png
new file mode 100644
index 0000000..19124b2
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_dialogwhenlarge_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_dialogwhenlarge_calendar_view.png b/tests/tests/holo/res/drawable-mdpi/holo_light_dialogwhenlarge_calendar_view.png
new file mode 100644
index 0000000..3b86863
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_dialogwhenlarge_calendar_view.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_dialogwhenlarge_calendar_view_feb.png b/tests/tests/holo/res/drawable-mdpi/holo_light_dialogwhenlarge_calendar_view_feb.png
new file mode 100644
index 0000000..a457bc3
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_dialogwhenlarge_calendar_view_feb.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_dialogwhenlarge_checkbox.png b/tests/tests/holo/res/drawable-mdpi/holo_light_dialogwhenlarge_checkbox.png
new file mode 100644
index 0000000..54949e8
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_dialogwhenlarge_checkbox.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_dialogwhenlarge_checkbox_checked.png b/tests/tests/holo/res/drawable-mdpi/holo_light_dialogwhenlarge_checkbox_checked.png
new file mode 100644
index 0000000..42e2783
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_dialogwhenlarge_checkbox_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_dialogwhenlarge_chronometer.png b/tests/tests/holo/res/drawable-mdpi/holo_light_dialogwhenlarge_chronometer.png
new file mode 100644
index 0000000..200e909
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_dialogwhenlarge_chronometer.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_dialogwhenlarge_color_blue_bright.png b/tests/tests/holo/res/drawable-mdpi/holo_light_dialogwhenlarge_color_blue_bright.png
new file mode 100644
index 0000000..fe1bdd7
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_dialogwhenlarge_color_blue_bright.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_dialogwhenlarge_color_blue_dark.png b/tests/tests/holo/res/drawable-mdpi/holo_light_dialogwhenlarge_color_blue_dark.png
new file mode 100644
index 0000000..f3f0640
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_dialogwhenlarge_color_blue_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_dialogwhenlarge_color_blue_light.png b/tests/tests/holo/res/drawable-mdpi/holo_light_dialogwhenlarge_color_blue_light.png
new file mode 100644
index 0000000..285d925
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_dialogwhenlarge_color_blue_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_dialogwhenlarge_color_green_dark.png b/tests/tests/holo/res/drawable-mdpi/holo_light_dialogwhenlarge_color_green_dark.png
new file mode 100644
index 0000000..cfbbdd4
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_dialogwhenlarge_color_green_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_dialogwhenlarge_color_green_light.png b/tests/tests/holo/res/drawable-mdpi/holo_light_dialogwhenlarge_color_green_light.png
new file mode 100644
index 0000000..a691827
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_dialogwhenlarge_color_green_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_dialogwhenlarge_color_orange_dark.png b/tests/tests/holo/res/drawable-mdpi/holo_light_dialogwhenlarge_color_orange_dark.png
new file mode 100644
index 0000000..3f0e99a
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_dialogwhenlarge_color_orange_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_dialogwhenlarge_color_orange_light.png b/tests/tests/holo/res/drawable-mdpi/holo_light_dialogwhenlarge_color_orange_light.png
new file mode 100644
index 0000000..f54fd64
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_dialogwhenlarge_color_orange_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_dialogwhenlarge_color_purple.png b/tests/tests/holo/res/drawable-mdpi/holo_light_dialogwhenlarge_color_purple.png
new file mode 100644
index 0000000..15c9494
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_dialogwhenlarge_color_purple.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_dialogwhenlarge_color_red_dark.png b/tests/tests/holo/res/drawable-mdpi/holo_light_dialogwhenlarge_color_red_dark.png
new file mode 100644
index 0000000..de3385d
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_dialogwhenlarge_color_red_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_dialogwhenlarge_color_red_light.png b/tests/tests/holo/res/drawable-mdpi/holo_light_dialogwhenlarge_color_red_light.png
new file mode 100644
index 0000000..dde4043
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_dialogwhenlarge_color_red_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_dialogwhenlarge_edittext.png b/tests/tests/holo/res/drawable-mdpi/holo_light_dialogwhenlarge_edittext.png
new file mode 100644
index 0000000..3e9e9ca
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_dialogwhenlarge_edittext.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_dialogwhenlarge_noactionbar_button.png b/tests/tests/holo/res/drawable-mdpi/holo_light_dialogwhenlarge_noactionbar_button.png
new file mode 100644
index 0000000..19124b2
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_dialogwhenlarge_noactionbar_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_dialogwhenlarge_noactionbar_calendar_view.png b/tests/tests/holo/res/drawable-mdpi/holo_light_dialogwhenlarge_noactionbar_calendar_view.png
new file mode 100644
index 0000000..3b86863
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_dialogwhenlarge_noactionbar_calendar_view.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_dialogwhenlarge_noactionbar_calendar_view_feb.png b/tests/tests/holo/res/drawable-mdpi/holo_light_dialogwhenlarge_noactionbar_calendar_view_feb.png
new file mode 100644
index 0000000..a457bc3
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_dialogwhenlarge_noactionbar_calendar_view_feb.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_dialogwhenlarge_noactionbar_checkbox.png b/tests/tests/holo/res/drawable-mdpi/holo_light_dialogwhenlarge_noactionbar_checkbox.png
new file mode 100644
index 0000000..54949e8
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_dialogwhenlarge_noactionbar_checkbox.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_dialogwhenlarge_noactionbar_checkbox_checked.png b/tests/tests/holo/res/drawable-mdpi/holo_light_dialogwhenlarge_noactionbar_checkbox_checked.png
new file mode 100644
index 0000000..42e2783
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_dialogwhenlarge_noactionbar_checkbox_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_dialogwhenlarge_noactionbar_chronometer.png b/tests/tests/holo/res/drawable-mdpi/holo_light_dialogwhenlarge_noactionbar_chronometer.png
new file mode 100644
index 0000000..200e909
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_dialogwhenlarge_noactionbar_chronometer.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_dialogwhenlarge_noactionbar_color_blue_bright.png b/tests/tests/holo/res/drawable-mdpi/holo_light_dialogwhenlarge_noactionbar_color_blue_bright.png
new file mode 100644
index 0000000..fe1bdd7
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_dialogwhenlarge_noactionbar_color_blue_bright.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_dialogwhenlarge_noactionbar_color_blue_dark.png b/tests/tests/holo/res/drawable-mdpi/holo_light_dialogwhenlarge_noactionbar_color_blue_dark.png
new file mode 100644
index 0000000..f3f0640
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_dialogwhenlarge_noactionbar_color_blue_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_dialogwhenlarge_noactionbar_color_blue_light.png b/tests/tests/holo/res/drawable-mdpi/holo_light_dialogwhenlarge_noactionbar_color_blue_light.png
new file mode 100644
index 0000000..285d925
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_dialogwhenlarge_noactionbar_color_blue_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_dialogwhenlarge_noactionbar_color_green_dark.png b/tests/tests/holo/res/drawable-mdpi/holo_light_dialogwhenlarge_noactionbar_color_green_dark.png
new file mode 100644
index 0000000..cfbbdd4
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_dialogwhenlarge_noactionbar_color_green_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_dialogwhenlarge_noactionbar_color_green_light.png b/tests/tests/holo/res/drawable-mdpi/holo_light_dialogwhenlarge_noactionbar_color_green_light.png
new file mode 100644
index 0000000..a691827
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_dialogwhenlarge_noactionbar_color_green_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_dialogwhenlarge_noactionbar_color_orange_dark.png b/tests/tests/holo/res/drawable-mdpi/holo_light_dialogwhenlarge_noactionbar_color_orange_dark.png
new file mode 100644
index 0000000..3f0e99a
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_dialogwhenlarge_noactionbar_color_orange_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_dialogwhenlarge_noactionbar_color_orange_light.png b/tests/tests/holo/res/drawable-mdpi/holo_light_dialogwhenlarge_noactionbar_color_orange_light.png
new file mode 100644
index 0000000..f54fd64
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_dialogwhenlarge_noactionbar_color_orange_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_dialogwhenlarge_noactionbar_color_purple.png b/tests/tests/holo/res/drawable-mdpi/holo_light_dialogwhenlarge_noactionbar_color_purple.png
new file mode 100644
index 0000000..15c9494
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_dialogwhenlarge_noactionbar_color_purple.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_dialogwhenlarge_noactionbar_color_red_dark.png b/tests/tests/holo/res/drawable-mdpi/holo_light_dialogwhenlarge_noactionbar_color_red_dark.png
new file mode 100644
index 0000000..de3385d
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_dialogwhenlarge_noactionbar_color_red_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_dialogwhenlarge_noactionbar_color_red_light.png b/tests/tests/holo/res/drawable-mdpi/holo_light_dialogwhenlarge_noactionbar_color_red_light.png
new file mode 100644
index 0000000..dde4043
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_dialogwhenlarge_noactionbar_color_red_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_dialogwhenlarge_noactionbar_edittext.png b/tests/tests/holo/res/drawable-mdpi/holo_light_dialogwhenlarge_noactionbar_edittext.png
new file mode 100644
index 0000000..3e9e9ca
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_dialogwhenlarge_noactionbar_edittext.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_dialogwhenlarge_noactionbar_progressbar.png b/tests/tests/holo/res/drawable-mdpi/holo_light_dialogwhenlarge_noactionbar_progressbar.png
new file mode 100644
index 0000000..d027b03
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_dialogwhenlarge_noactionbar_progressbar.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_dialogwhenlarge_noactionbar_progressbar_horizontal_0.png b/tests/tests/holo/res/drawable-mdpi/holo_light_dialogwhenlarge_noactionbar_progressbar_horizontal_0.png
new file mode 100644
index 0000000..aa86092
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_dialogwhenlarge_noactionbar_progressbar_horizontal_0.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_dialogwhenlarge_noactionbar_progressbar_horizontal_100.png b/tests/tests/holo/res/drawable-mdpi/holo_light_dialogwhenlarge_noactionbar_progressbar_horizontal_100.png
new file mode 100644
index 0000000..750a89c
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_dialogwhenlarge_noactionbar_progressbar_horizontal_100.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_dialogwhenlarge_noactionbar_progressbar_horizontal_50.png b/tests/tests/holo/res/drawable-mdpi/holo_light_dialogwhenlarge_noactionbar_progressbar_horizontal_50.png
new file mode 100644
index 0000000..fc91586
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_dialogwhenlarge_noactionbar_progressbar_horizontal_50.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_dialogwhenlarge_noactionbar_progressbar_large.png b/tests/tests/holo/res/drawable-mdpi/holo_light_dialogwhenlarge_noactionbar_progressbar_large.png
new file mode 100644
index 0000000..50301a4
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_dialogwhenlarge_noactionbar_progressbar_large.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_dialogwhenlarge_noactionbar_progressbar_small.png b/tests/tests/holo/res/drawable-mdpi/holo_light_dialogwhenlarge_noactionbar_progressbar_small.png
new file mode 100644
index 0000000..1240e6a
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_dialogwhenlarge_noactionbar_progressbar_small.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_dialogwhenlarge_noactionbar_radio_button.png b/tests/tests/holo/res/drawable-mdpi/holo_light_dialogwhenlarge_noactionbar_radio_button.png
new file mode 100644
index 0000000..c2398a1
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_dialogwhenlarge_noactionbar_radio_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_dialogwhenlarge_noactionbar_radio_button_checked.png b/tests/tests/holo/res/drawable-mdpi/holo_light_dialogwhenlarge_noactionbar_radio_button_checked.png
new file mode 100644
index 0000000..898442f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_dialogwhenlarge_noactionbar_radio_button_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_dialogwhenlarge_noactionbar_radiogroup_horizontal.png b/tests/tests/holo/res/drawable-mdpi/holo_light_dialogwhenlarge_noactionbar_radiogroup_horizontal.png
new file mode 100644
index 0000000..6191420
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_dialogwhenlarge_noactionbar_radiogroup_horizontal.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_dialogwhenlarge_noactionbar_radiogroup_vertical.png b/tests/tests/holo/res/drawable-mdpi/holo_light_dialogwhenlarge_noactionbar_radiogroup_vertical.png
new file mode 100644
index 0000000..fa88e6f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_dialogwhenlarge_noactionbar_radiogroup_vertical.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_dialogwhenlarge_noactionbar_ratingbar_0.png b/tests/tests/holo/res/drawable-mdpi/holo_light_dialogwhenlarge_noactionbar_ratingbar_0.png
new file mode 100644
index 0000000..2fabd8a
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_dialogwhenlarge_noactionbar_ratingbar_0.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_dialogwhenlarge_noactionbar_ratingbar_2point5.png b/tests/tests/holo/res/drawable-mdpi/holo_light_dialogwhenlarge_noactionbar_ratingbar_2point5.png
new file mode 100644
index 0000000..2bebaba
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_dialogwhenlarge_noactionbar_ratingbar_2point5.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_dialogwhenlarge_noactionbar_ratingbar_5.png b/tests/tests/holo/res/drawable-mdpi/holo_light_dialogwhenlarge_noactionbar_ratingbar_5.png
new file mode 100644
index 0000000..51ee230
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_dialogwhenlarge_noactionbar_ratingbar_5.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_dialogwhenlarge_noactionbar_searchview.png b/tests/tests/holo/res/drawable-mdpi/holo_light_dialogwhenlarge_noactionbar_searchview.png
new file mode 100644
index 0000000..4194f13
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_dialogwhenlarge_noactionbar_searchview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_dialogwhenlarge_noactionbar_searchview_query.png b/tests/tests/holo/res/drawable-mdpi/holo_light_dialogwhenlarge_noactionbar_searchview_query.png
new file mode 100644
index 0000000..7f11808
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_dialogwhenlarge_noactionbar_searchview_query.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_dialogwhenlarge_noactionbar_searchview_query_hint.png b/tests/tests/holo/res/drawable-mdpi/holo_light_dialogwhenlarge_noactionbar_searchview_query_hint.png
new file mode 100644
index 0000000..f1e0f2f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_dialogwhenlarge_noactionbar_searchview_query_hint.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_dialogwhenlarge_noactionbar_seekbar_0.png b/tests/tests/holo/res/drawable-mdpi/holo_light_dialogwhenlarge_noactionbar_seekbar_0.png
new file mode 100644
index 0000000..6a73d98
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_dialogwhenlarge_noactionbar_seekbar_0.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_dialogwhenlarge_noactionbar_seekbar_100.png b/tests/tests/holo/res/drawable-mdpi/holo_light_dialogwhenlarge_noactionbar_seekbar_100.png
new file mode 100644
index 0000000..5be0453
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_dialogwhenlarge_noactionbar_seekbar_100.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_dialogwhenlarge_noactionbar_seekbar_50.png b/tests/tests/holo/res/drawable-mdpi/holo_light_dialogwhenlarge_noactionbar_seekbar_50.png
new file mode 100644
index 0000000..881276c
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_dialogwhenlarge_noactionbar_seekbar_50.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_dialogwhenlarge_noactionbar_spinner.png b/tests/tests/holo/res/drawable-mdpi/holo_light_dialogwhenlarge_noactionbar_spinner.png
new file mode 100644
index 0000000..144cd8f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_dialogwhenlarge_noactionbar_spinner.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_dialogwhenlarge_noactionbar_switch.png b/tests/tests/holo/res/drawable-mdpi/holo_light_dialogwhenlarge_noactionbar_switch.png
new file mode 100644
index 0000000..f3029f2
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_dialogwhenlarge_noactionbar_switch.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_dialogwhenlarge_noactionbar_switch_checked.png b/tests/tests/holo/res/drawable-mdpi/holo_light_dialogwhenlarge_noactionbar_switch_checked.png
new file mode 100644
index 0000000..2dad98a
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_dialogwhenlarge_noactionbar_switch_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_dialogwhenlarge_noactionbar_tabhost.png b/tests/tests/holo/res/drawable-mdpi/holo_light_dialogwhenlarge_noactionbar_tabhost.png
new file mode 100644
index 0000000..c27b8d8
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_dialogwhenlarge_noactionbar_tabhost.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_dialogwhenlarge_noactionbar_textview.png b/tests/tests/holo/res/drawable-mdpi/holo_light_dialogwhenlarge_noactionbar_textview.png
new file mode 100644
index 0000000..f5319bf
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_dialogwhenlarge_noactionbar_textview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_dialogwhenlarge_noactionbar_timepicker.png b/tests/tests/holo/res/drawable-mdpi/holo_light_dialogwhenlarge_noactionbar_timepicker.png
new file mode 100644
index 0000000..5e428b0
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_dialogwhenlarge_noactionbar_timepicker.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_dialogwhenlarge_noactionbar_toggle_button.png b/tests/tests/holo/res/drawable-mdpi/holo_light_dialogwhenlarge_noactionbar_toggle_button.png
new file mode 100644
index 0000000..6e95a85
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_dialogwhenlarge_noactionbar_toggle_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_dialogwhenlarge_noactionbar_toggle_button_checked.png b/tests/tests/holo/res/drawable-mdpi/holo_light_dialogwhenlarge_noactionbar_toggle_button_checked.png
new file mode 100644
index 0000000..bbbe3c6
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_dialogwhenlarge_noactionbar_toggle_button_checked.png
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_land_zoomcontrols.png b/tests/tests/holo/res/drawable-mdpi/holo_light_dialogwhenlarge_noactionbar_zoomcontrols.png
similarity index 100%
copy from tests/res/drawable-mdpi/holo_land_zoomcontrols.png
copy to tests/tests/holo/res/drawable-mdpi/holo_light_dialogwhenlarge_noactionbar_zoomcontrols.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_dialogwhenlarge_progressbar.png b/tests/tests/holo/res/drawable-mdpi/holo_light_dialogwhenlarge_progressbar.png
new file mode 100644
index 0000000..d027b03
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_dialogwhenlarge_progressbar.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_dialogwhenlarge_progressbar_horizontal_0.png b/tests/tests/holo/res/drawable-mdpi/holo_light_dialogwhenlarge_progressbar_horizontal_0.png
new file mode 100644
index 0000000..aa86092
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_dialogwhenlarge_progressbar_horizontal_0.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_dialogwhenlarge_progressbar_horizontal_100.png b/tests/tests/holo/res/drawable-mdpi/holo_light_dialogwhenlarge_progressbar_horizontal_100.png
new file mode 100644
index 0000000..750a89c
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_dialogwhenlarge_progressbar_horizontal_100.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_dialogwhenlarge_progressbar_horizontal_50.png b/tests/tests/holo/res/drawable-mdpi/holo_light_dialogwhenlarge_progressbar_horizontal_50.png
new file mode 100644
index 0000000..fc91586
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_dialogwhenlarge_progressbar_horizontal_50.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_dialogwhenlarge_progressbar_large.png b/tests/tests/holo/res/drawable-mdpi/holo_light_dialogwhenlarge_progressbar_large.png
new file mode 100644
index 0000000..50301a4
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_dialogwhenlarge_progressbar_large.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_dialogwhenlarge_progressbar_small.png b/tests/tests/holo/res/drawable-mdpi/holo_light_dialogwhenlarge_progressbar_small.png
new file mode 100644
index 0000000..1240e6a
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_dialogwhenlarge_progressbar_small.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_dialogwhenlarge_radio_button.png b/tests/tests/holo/res/drawable-mdpi/holo_light_dialogwhenlarge_radio_button.png
new file mode 100644
index 0000000..c2398a1
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_dialogwhenlarge_radio_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_dialogwhenlarge_radio_button_checked.png b/tests/tests/holo/res/drawable-mdpi/holo_light_dialogwhenlarge_radio_button_checked.png
new file mode 100644
index 0000000..898442f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_dialogwhenlarge_radio_button_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_dialogwhenlarge_radiogroup_horizontal.png b/tests/tests/holo/res/drawable-mdpi/holo_light_dialogwhenlarge_radiogroup_horizontal.png
new file mode 100644
index 0000000..6191420
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_dialogwhenlarge_radiogroup_horizontal.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_dialogwhenlarge_radiogroup_vertical.png b/tests/tests/holo/res/drawable-mdpi/holo_light_dialogwhenlarge_radiogroup_vertical.png
new file mode 100644
index 0000000..fa88e6f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_dialogwhenlarge_radiogroup_vertical.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_dialogwhenlarge_ratingbar_0.png b/tests/tests/holo/res/drawable-mdpi/holo_light_dialogwhenlarge_ratingbar_0.png
new file mode 100644
index 0000000..2fabd8a
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_dialogwhenlarge_ratingbar_0.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_dialogwhenlarge_ratingbar_2point5.png b/tests/tests/holo/res/drawable-mdpi/holo_light_dialogwhenlarge_ratingbar_2point5.png
new file mode 100644
index 0000000..2bebaba
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_dialogwhenlarge_ratingbar_2point5.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_dialogwhenlarge_ratingbar_5.png b/tests/tests/holo/res/drawable-mdpi/holo_light_dialogwhenlarge_ratingbar_5.png
new file mode 100644
index 0000000..51ee230
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_dialogwhenlarge_ratingbar_5.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_dialogwhenlarge_searchview.png b/tests/tests/holo/res/drawable-mdpi/holo_light_dialogwhenlarge_searchview.png
new file mode 100644
index 0000000..4194f13
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_dialogwhenlarge_searchview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_dialogwhenlarge_searchview_query.png b/tests/tests/holo/res/drawable-mdpi/holo_light_dialogwhenlarge_searchview_query.png
new file mode 100644
index 0000000..7f11808
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_dialogwhenlarge_searchview_query.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_dialogwhenlarge_searchview_query_hint.png b/tests/tests/holo/res/drawable-mdpi/holo_light_dialogwhenlarge_searchview_query_hint.png
new file mode 100644
index 0000000..f1e0f2f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_dialogwhenlarge_searchview_query_hint.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_dialogwhenlarge_seekbar_0.png b/tests/tests/holo/res/drawable-mdpi/holo_light_dialogwhenlarge_seekbar_0.png
new file mode 100644
index 0000000..6a73d98
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_dialogwhenlarge_seekbar_0.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_dialogwhenlarge_seekbar_100.png b/tests/tests/holo/res/drawable-mdpi/holo_light_dialogwhenlarge_seekbar_100.png
new file mode 100644
index 0000000..5be0453
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_dialogwhenlarge_seekbar_100.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_dialogwhenlarge_seekbar_50.png b/tests/tests/holo/res/drawable-mdpi/holo_light_dialogwhenlarge_seekbar_50.png
new file mode 100644
index 0000000..881276c
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_dialogwhenlarge_seekbar_50.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_dialogwhenlarge_spinner.png b/tests/tests/holo/res/drawable-mdpi/holo_light_dialogwhenlarge_spinner.png
new file mode 100644
index 0000000..144cd8f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_dialogwhenlarge_spinner.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_dialogwhenlarge_switch.png b/tests/tests/holo/res/drawable-mdpi/holo_light_dialogwhenlarge_switch.png
new file mode 100644
index 0000000..f3029f2
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_dialogwhenlarge_switch.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_dialogwhenlarge_switch_checked.png b/tests/tests/holo/res/drawable-mdpi/holo_light_dialogwhenlarge_switch_checked.png
new file mode 100644
index 0000000..2dad98a
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_dialogwhenlarge_switch_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_dialogwhenlarge_tabhost.png b/tests/tests/holo/res/drawable-mdpi/holo_light_dialogwhenlarge_tabhost.png
new file mode 100644
index 0000000..c27b8d8
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_dialogwhenlarge_tabhost.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_dialogwhenlarge_textview.png b/tests/tests/holo/res/drawable-mdpi/holo_light_dialogwhenlarge_textview.png
new file mode 100644
index 0000000..f5319bf
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_dialogwhenlarge_textview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_dialogwhenlarge_timepicker.png b/tests/tests/holo/res/drawable-mdpi/holo_light_dialogwhenlarge_timepicker.png
new file mode 100644
index 0000000..5e428b0
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_dialogwhenlarge_timepicker.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_dialogwhenlarge_toggle_button.png b/tests/tests/holo/res/drawable-mdpi/holo_light_dialogwhenlarge_toggle_button.png
new file mode 100644
index 0000000..6e95a85
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_dialogwhenlarge_toggle_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_dialogwhenlarge_toggle_button_checked.png b/tests/tests/holo/res/drawable-mdpi/holo_light_dialogwhenlarge_toggle_button_checked.png
new file mode 100644
index 0000000..bbbe3c6
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_dialogwhenlarge_toggle_button_checked.png
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_land_zoomcontrols.png b/tests/tests/holo/res/drawable-mdpi/holo_light_dialogwhenlarge_zoomcontrols.png
similarity index 100%
copy from tests/res/drawable-mdpi/holo_land_zoomcontrols.png
copy to tests/tests/holo/res/drawable-mdpi/holo_light_dialogwhenlarge_zoomcontrols.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_edittext.png b/tests/tests/holo/res/drawable-mdpi/holo_light_edittext.png
new file mode 100644
index 0000000..3e9e9ca
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_edittext.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_noactionbar_button.png b/tests/tests/holo/res/drawable-mdpi/holo_light_noactionbar_button.png
new file mode 100644
index 0000000..19124b2
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_noactionbar_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_noactionbar_calendar_view.png b/tests/tests/holo/res/drawable-mdpi/holo_light_noactionbar_calendar_view.png
new file mode 100644
index 0000000..3b86863
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_noactionbar_calendar_view.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_noactionbar_calendar_view_feb.png b/tests/tests/holo/res/drawable-mdpi/holo_light_noactionbar_calendar_view_feb.png
new file mode 100644
index 0000000..a457bc3
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_noactionbar_calendar_view_feb.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_noactionbar_checkbox.png b/tests/tests/holo/res/drawable-mdpi/holo_light_noactionbar_checkbox.png
new file mode 100644
index 0000000..54949e8
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_noactionbar_checkbox.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_noactionbar_checkbox_checked.png b/tests/tests/holo/res/drawable-mdpi/holo_light_noactionbar_checkbox_checked.png
new file mode 100644
index 0000000..42e2783
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_noactionbar_checkbox_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_noactionbar_chronometer.png b/tests/tests/holo/res/drawable-mdpi/holo_light_noactionbar_chronometer.png
new file mode 100644
index 0000000..200e909
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_noactionbar_chronometer.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_noactionbar_color_blue_bright.png b/tests/tests/holo/res/drawable-mdpi/holo_light_noactionbar_color_blue_bright.png
new file mode 100644
index 0000000..fe1bdd7
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_noactionbar_color_blue_bright.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_noactionbar_color_blue_dark.png b/tests/tests/holo/res/drawable-mdpi/holo_light_noactionbar_color_blue_dark.png
new file mode 100644
index 0000000..f3f0640
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_noactionbar_color_blue_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_noactionbar_color_blue_light.png b/tests/tests/holo/res/drawable-mdpi/holo_light_noactionbar_color_blue_light.png
new file mode 100644
index 0000000..285d925
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_noactionbar_color_blue_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_noactionbar_color_green_dark.png b/tests/tests/holo/res/drawable-mdpi/holo_light_noactionbar_color_green_dark.png
new file mode 100644
index 0000000..cfbbdd4
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_noactionbar_color_green_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_noactionbar_color_green_light.png b/tests/tests/holo/res/drawable-mdpi/holo_light_noactionbar_color_green_light.png
new file mode 100644
index 0000000..a691827
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_noactionbar_color_green_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_noactionbar_color_orange_dark.png b/tests/tests/holo/res/drawable-mdpi/holo_light_noactionbar_color_orange_dark.png
new file mode 100644
index 0000000..3f0e99a
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_noactionbar_color_orange_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_noactionbar_color_orange_light.png b/tests/tests/holo/res/drawable-mdpi/holo_light_noactionbar_color_orange_light.png
new file mode 100644
index 0000000..f54fd64
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_noactionbar_color_orange_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_noactionbar_color_purple.png b/tests/tests/holo/res/drawable-mdpi/holo_light_noactionbar_color_purple.png
new file mode 100644
index 0000000..15c9494
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_noactionbar_color_purple.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_noactionbar_color_red_dark.png b/tests/tests/holo/res/drawable-mdpi/holo_light_noactionbar_color_red_dark.png
new file mode 100644
index 0000000..de3385d
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_noactionbar_color_red_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_noactionbar_color_red_light.png b/tests/tests/holo/res/drawable-mdpi/holo_light_noactionbar_color_red_light.png
new file mode 100644
index 0000000..dde4043
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_noactionbar_color_red_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_noactionbar_edittext.png b/tests/tests/holo/res/drawable-mdpi/holo_light_noactionbar_edittext.png
new file mode 100644
index 0000000..3e9e9ca
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_noactionbar_edittext.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_noactionbar_fullscreen_button.png b/tests/tests/holo/res/drawable-mdpi/holo_light_noactionbar_fullscreen_button.png
new file mode 100644
index 0000000..19124b2
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_noactionbar_fullscreen_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_noactionbar_fullscreen_calendar_view.png b/tests/tests/holo/res/drawable-mdpi/holo_light_noactionbar_fullscreen_calendar_view.png
new file mode 100644
index 0000000..3b86863
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_noactionbar_fullscreen_calendar_view.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_noactionbar_fullscreen_calendar_view_feb.png b/tests/tests/holo/res/drawable-mdpi/holo_light_noactionbar_fullscreen_calendar_view_feb.png
new file mode 100644
index 0000000..a457bc3
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_noactionbar_fullscreen_calendar_view_feb.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_noactionbar_fullscreen_checkbox.png b/tests/tests/holo/res/drawable-mdpi/holo_light_noactionbar_fullscreen_checkbox.png
new file mode 100644
index 0000000..54949e8
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_noactionbar_fullscreen_checkbox.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_noactionbar_fullscreen_checkbox_checked.png b/tests/tests/holo/res/drawable-mdpi/holo_light_noactionbar_fullscreen_checkbox_checked.png
new file mode 100644
index 0000000..42e2783
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_noactionbar_fullscreen_checkbox_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_noactionbar_fullscreen_chronometer.png b/tests/tests/holo/res/drawable-mdpi/holo_light_noactionbar_fullscreen_chronometer.png
new file mode 100644
index 0000000..200e909
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_noactionbar_fullscreen_chronometer.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_noactionbar_fullscreen_color_blue_bright.png b/tests/tests/holo/res/drawable-mdpi/holo_light_noactionbar_fullscreen_color_blue_bright.png
new file mode 100644
index 0000000..fe1bdd7
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_noactionbar_fullscreen_color_blue_bright.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_noactionbar_fullscreen_color_blue_dark.png b/tests/tests/holo/res/drawable-mdpi/holo_light_noactionbar_fullscreen_color_blue_dark.png
new file mode 100644
index 0000000..f3f0640
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_noactionbar_fullscreen_color_blue_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_noactionbar_fullscreen_color_blue_light.png b/tests/tests/holo/res/drawable-mdpi/holo_light_noactionbar_fullscreen_color_blue_light.png
new file mode 100644
index 0000000..285d925
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_noactionbar_fullscreen_color_blue_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_noactionbar_fullscreen_color_green_dark.png b/tests/tests/holo/res/drawable-mdpi/holo_light_noactionbar_fullscreen_color_green_dark.png
new file mode 100644
index 0000000..cfbbdd4
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_noactionbar_fullscreen_color_green_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_noactionbar_fullscreen_color_green_light.png b/tests/tests/holo/res/drawable-mdpi/holo_light_noactionbar_fullscreen_color_green_light.png
new file mode 100644
index 0000000..a691827
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_noactionbar_fullscreen_color_green_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_noactionbar_fullscreen_color_orange_dark.png b/tests/tests/holo/res/drawable-mdpi/holo_light_noactionbar_fullscreen_color_orange_dark.png
new file mode 100644
index 0000000..3f0e99a
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_noactionbar_fullscreen_color_orange_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_noactionbar_fullscreen_color_orange_light.png b/tests/tests/holo/res/drawable-mdpi/holo_light_noactionbar_fullscreen_color_orange_light.png
new file mode 100644
index 0000000..f54fd64
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_noactionbar_fullscreen_color_orange_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_noactionbar_fullscreen_color_purple.png b/tests/tests/holo/res/drawable-mdpi/holo_light_noactionbar_fullscreen_color_purple.png
new file mode 100644
index 0000000..15c9494
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_noactionbar_fullscreen_color_purple.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_noactionbar_fullscreen_color_red_dark.png b/tests/tests/holo/res/drawable-mdpi/holo_light_noactionbar_fullscreen_color_red_dark.png
new file mode 100644
index 0000000..de3385d
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_noactionbar_fullscreen_color_red_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_noactionbar_fullscreen_color_red_light.png b/tests/tests/holo/res/drawable-mdpi/holo_light_noactionbar_fullscreen_color_red_light.png
new file mode 100644
index 0000000..dde4043
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_noactionbar_fullscreen_color_red_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_noactionbar_fullscreen_edittext.png b/tests/tests/holo/res/drawable-mdpi/holo_light_noactionbar_fullscreen_edittext.png
new file mode 100644
index 0000000..3e9e9ca
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_noactionbar_fullscreen_edittext.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_noactionbar_fullscreen_progressbar.png b/tests/tests/holo/res/drawable-mdpi/holo_light_noactionbar_fullscreen_progressbar.png
new file mode 100644
index 0000000..d027b03
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_noactionbar_fullscreen_progressbar.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_noactionbar_fullscreen_progressbar_horizontal_0.png b/tests/tests/holo/res/drawable-mdpi/holo_light_noactionbar_fullscreen_progressbar_horizontal_0.png
new file mode 100644
index 0000000..aa86092
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_noactionbar_fullscreen_progressbar_horizontal_0.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_noactionbar_fullscreen_progressbar_horizontal_100.png b/tests/tests/holo/res/drawable-mdpi/holo_light_noactionbar_fullscreen_progressbar_horizontal_100.png
new file mode 100644
index 0000000..750a89c
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_noactionbar_fullscreen_progressbar_horizontal_100.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_noactionbar_fullscreen_progressbar_horizontal_50.png b/tests/tests/holo/res/drawable-mdpi/holo_light_noactionbar_fullscreen_progressbar_horizontal_50.png
new file mode 100644
index 0000000..fc91586
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_noactionbar_fullscreen_progressbar_horizontal_50.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_noactionbar_fullscreen_progressbar_large.png b/tests/tests/holo/res/drawable-mdpi/holo_light_noactionbar_fullscreen_progressbar_large.png
new file mode 100644
index 0000000..50301a4
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_noactionbar_fullscreen_progressbar_large.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_noactionbar_fullscreen_progressbar_small.png b/tests/tests/holo/res/drawable-mdpi/holo_light_noactionbar_fullscreen_progressbar_small.png
new file mode 100644
index 0000000..1240e6a
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_noactionbar_fullscreen_progressbar_small.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_noactionbar_fullscreen_radio_button.png b/tests/tests/holo/res/drawable-mdpi/holo_light_noactionbar_fullscreen_radio_button.png
new file mode 100644
index 0000000..c2398a1
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_noactionbar_fullscreen_radio_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_noactionbar_fullscreen_radio_button_checked.png b/tests/tests/holo/res/drawable-mdpi/holo_light_noactionbar_fullscreen_radio_button_checked.png
new file mode 100644
index 0000000..898442f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_noactionbar_fullscreen_radio_button_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_noactionbar_fullscreen_radiogroup_horizontal.png b/tests/tests/holo/res/drawable-mdpi/holo_light_noactionbar_fullscreen_radiogroup_horizontal.png
new file mode 100644
index 0000000..6191420
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_noactionbar_fullscreen_radiogroup_horizontal.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_noactionbar_fullscreen_radiogroup_vertical.png b/tests/tests/holo/res/drawable-mdpi/holo_light_noactionbar_fullscreen_radiogroup_vertical.png
new file mode 100644
index 0000000..fa88e6f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_noactionbar_fullscreen_radiogroup_vertical.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_noactionbar_fullscreen_ratingbar_0.png b/tests/tests/holo/res/drawable-mdpi/holo_light_noactionbar_fullscreen_ratingbar_0.png
new file mode 100644
index 0000000..2fabd8a
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_noactionbar_fullscreen_ratingbar_0.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_noactionbar_fullscreen_ratingbar_2point5.png b/tests/tests/holo/res/drawable-mdpi/holo_light_noactionbar_fullscreen_ratingbar_2point5.png
new file mode 100644
index 0000000..2bebaba
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_noactionbar_fullscreen_ratingbar_2point5.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_noactionbar_fullscreen_ratingbar_5.png b/tests/tests/holo/res/drawable-mdpi/holo_light_noactionbar_fullscreen_ratingbar_5.png
new file mode 100644
index 0000000..51ee230
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_noactionbar_fullscreen_ratingbar_5.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_noactionbar_fullscreen_searchview.png b/tests/tests/holo/res/drawable-mdpi/holo_light_noactionbar_fullscreen_searchview.png
new file mode 100644
index 0000000..4194f13
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_noactionbar_fullscreen_searchview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_noactionbar_fullscreen_searchview_query.png b/tests/tests/holo/res/drawable-mdpi/holo_light_noactionbar_fullscreen_searchview_query.png
new file mode 100644
index 0000000..7f11808
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_noactionbar_fullscreen_searchview_query.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_noactionbar_fullscreen_searchview_query_hint.png b/tests/tests/holo/res/drawable-mdpi/holo_light_noactionbar_fullscreen_searchview_query_hint.png
new file mode 100644
index 0000000..f1e0f2f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_noactionbar_fullscreen_searchview_query_hint.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_noactionbar_fullscreen_seekbar_0.png b/tests/tests/holo/res/drawable-mdpi/holo_light_noactionbar_fullscreen_seekbar_0.png
new file mode 100644
index 0000000..6a73d98
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_noactionbar_fullscreen_seekbar_0.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_noactionbar_fullscreen_seekbar_100.png b/tests/tests/holo/res/drawable-mdpi/holo_light_noactionbar_fullscreen_seekbar_100.png
new file mode 100644
index 0000000..5be0453
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_noactionbar_fullscreen_seekbar_100.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_noactionbar_fullscreen_seekbar_50.png b/tests/tests/holo/res/drawable-mdpi/holo_light_noactionbar_fullscreen_seekbar_50.png
new file mode 100644
index 0000000..881276c
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_noactionbar_fullscreen_seekbar_50.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_noactionbar_fullscreen_spinner.png b/tests/tests/holo/res/drawable-mdpi/holo_light_noactionbar_fullscreen_spinner.png
new file mode 100644
index 0000000..144cd8f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_noactionbar_fullscreen_spinner.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_noactionbar_fullscreen_switch.png b/tests/tests/holo/res/drawable-mdpi/holo_light_noactionbar_fullscreen_switch.png
new file mode 100644
index 0000000..f3029f2
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_noactionbar_fullscreen_switch.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_noactionbar_fullscreen_switch_checked.png b/tests/tests/holo/res/drawable-mdpi/holo_light_noactionbar_fullscreen_switch_checked.png
new file mode 100644
index 0000000..2dad98a
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_noactionbar_fullscreen_switch_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_noactionbar_fullscreen_tabhost.png b/tests/tests/holo/res/drawable-mdpi/holo_light_noactionbar_fullscreen_tabhost.png
new file mode 100644
index 0000000..c27b8d8
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_noactionbar_fullscreen_tabhost.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_noactionbar_fullscreen_textview.png b/tests/tests/holo/res/drawable-mdpi/holo_light_noactionbar_fullscreen_textview.png
new file mode 100644
index 0000000..f5319bf
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_noactionbar_fullscreen_textview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_noactionbar_fullscreen_timepicker.png b/tests/tests/holo/res/drawable-mdpi/holo_light_noactionbar_fullscreen_timepicker.png
new file mode 100644
index 0000000..5e428b0
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_noactionbar_fullscreen_timepicker.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_noactionbar_fullscreen_toggle_button.png b/tests/tests/holo/res/drawable-mdpi/holo_light_noactionbar_fullscreen_toggle_button.png
new file mode 100644
index 0000000..6e95a85
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_noactionbar_fullscreen_toggle_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_noactionbar_fullscreen_toggle_button_checked.png b/tests/tests/holo/res/drawable-mdpi/holo_light_noactionbar_fullscreen_toggle_button_checked.png
new file mode 100644
index 0000000..bbbe3c6
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_noactionbar_fullscreen_toggle_button_checked.png
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_land_zoomcontrols.png b/tests/tests/holo/res/drawable-mdpi/holo_light_noactionbar_fullscreen_zoomcontrols.png
similarity index 100%
copy from tests/res/drawable-mdpi/holo_land_zoomcontrols.png
copy to tests/tests/holo/res/drawable-mdpi/holo_light_noactionbar_fullscreen_zoomcontrols.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_noactionbar_progressbar.png b/tests/tests/holo/res/drawable-mdpi/holo_light_noactionbar_progressbar.png
new file mode 100644
index 0000000..d027b03
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_noactionbar_progressbar.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_noactionbar_progressbar_horizontal_0.png b/tests/tests/holo/res/drawable-mdpi/holo_light_noactionbar_progressbar_horizontal_0.png
new file mode 100644
index 0000000..aa86092
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_noactionbar_progressbar_horizontal_0.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_noactionbar_progressbar_horizontal_100.png b/tests/tests/holo/res/drawable-mdpi/holo_light_noactionbar_progressbar_horizontal_100.png
new file mode 100644
index 0000000..750a89c
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_noactionbar_progressbar_horizontal_100.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_noactionbar_progressbar_horizontal_50.png b/tests/tests/holo/res/drawable-mdpi/holo_light_noactionbar_progressbar_horizontal_50.png
new file mode 100644
index 0000000..fc91586
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_noactionbar_progressbar_horizontal_50.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_noactionbar_progressbar_large.png b/tests/tests/holo/res/drawable-mdpi/holo_light_noactionbar_progressbar_large.png
new file mode 100644
index 0000000..50301a4
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_noactionbar_progressbar_large.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_noactionbar_progressbar_small.png b/tests/tests/holo/res/drawable-mdpi/holo_light_noactionbar_progressbar_small.png
new file mode 100644
index 0000000..1240e6a
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_noactionbar_progressbar_small.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_noactionbar_radio_button.png b/tests/tests/holo/res/drawable-mdpi/holo_light_noactionbar_radio_button.png
new file mode 100644
index 0000000..c2398a1
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_noactionbar_radio_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_noactionbar_radio_button_checked.png b/tests/tests/holo/res/drawable-mdpi/holo_light_noactionbar_radio_button_checked.png
new file mode 100644
index 0000000..898442f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_noactionbar_radio_button_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_noactionbar_radiogroup_horizontal.png b/tests/tests/holo/res/drawable-mdpi/holo_light_noactionbar_radiogroup_horizontal.png
new file mode 100644
index 0000000..6191420
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_noactionbar_radiogroup_horizontal.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_noactionbar_radiogroup_vertical.png b/tests/tests/holo/res/drawable-mdpi/holo_light_noactionbar_radiogroup_vertical.png
new file mode 100644
index 0000000..fa88e6f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_noactionbar_radiogroup_vertical.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_noactionbar_ratingbar_0.png b/tests/tests/holo/res/drawable-mdpi/holo_light_noactionbar_ratingbar_0.png
new file mode 100644
index 0000000..2fabd8a
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_noactionbar_ratingbar_0.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_noactionbar_ratingbar_2point5.png b/tests/tests/holo/res/drawable-mdpi/holo_light_noactionbar_ratingbar_2point5.png
new file mode 100644
index 0000000..2bebaba
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_noactionbar_ratingbar_2point5.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_noactionbar_ratingbar_5.png b/tests/tests/holo/res/drawable-mdpi/holo_light_noactionbar_ratingbar_5.png
new file mode 100644
index 0000000..51ee230
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_noactionbar_ratingbar_5.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_noactionbar_searchview.png b/tests/tests/holo/res/drawable-mdpi/holo_light_noactionbar_searchview.png
new file mode 100644
index 0000000..4194f13
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_noactionbar_searchview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_noactionbar_searchview_query.png b/tests/tests/holo/res/drawable-mdpi/holo_light_noactionbar_searchview_query.png
new file mode 100644
index 0000000..7f11808
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_noactionbar_searchview_query.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_noactionbar_searchview_query_hint.png b/tests/tests/holo/res/drawable-mdpi/holo_light_noactionbar_searchview_query_hint.png
new file mode 100644
index 0000000..f1e0f2f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_noactionbar_searchview_query_hint.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_noactionbar_seekbar_0.png b/tests/tests/holo/res/drawable-mdpi/holo_light_noactionbar_seekbar_0.png
new file mode 100644
index 0000000..6a73d98
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_noactionbar_seekbar_0.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_noactionbar_seekbar_100.png b/tests/tests/holo/res/drawable-mdpi/holo_light_noactionbar_seekbar_100.png
new file mode 100644
index 0000000..5be0453
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_noactionbar_seekbar_100.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_noactionbar_seekbar_50.png b/tests/tests/holo/res/drawable-mdpi/holo_light_noactionbar_seekbar_50.png
new file mode 100644
index 0000000..881276c
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_noactionbar_seekbar_50.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_noactionbar_spinner.png b/tests/tests/holo/res/drawable-mdpi/holo_light_noactionbar_spinner.png
new file mode 100644
index 0000000..144cd8f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_noactionbar_spinner.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_noactionbar_switch.png b/tests/tests/holo/res/drawable-mdpi/holo_light_noactionbar_switch.png
new file mode 100644
index 0000000..f3029f2
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_noactionbar_switch.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_noactionbar_switch_checked.png b/tests/tests/holo/res/drawable-mdpi/holo_light_noactionbar_switch_checked.png
new file mode 100644
index 0000000..2dad98a
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_noactionbar_switch_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_noactionbar_tabhost.png b/tests/tests/holo/res/drawable-mdpi/holo_light_noactionbar_tabhost.png
new file mode 100644
index 0000000..c27b8d8
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_noactionbar_tabhost.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_noactionbar_textview.png b/tests/tests/holo/res/drawable-mdpi/holo_light_noactionbar_textview.png
new file mode 100644
index 0000000..f5319bf
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_noactionbar_textview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_noactionbar_timepicker.png b/tests/tests/holo/res/drawable-mdpi/holo_light_noactionbar_timepicker.png
new file mode 100644
index 0000000..5e428b0
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_noactionbar_timepicker.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_noactionbar_toggle_button.png b/tests/tests/holo/res/drawable-mdpi/holo_light_noactionbar_toggle_button.png
new file mode 100644
index 0000000..6e95a85
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_noactionbar_toggle_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_noactionbar_toggle_button_checked.png b/tests/tests/holo/res/drawable-mdpi/holo_light_noactionbar_toggle_button_checked.png
new file mode 100644
index 0000000..bbbe3c6
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_noactionbar_toggle_button_checked.png
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_land_zoomcontrols.png b/tests/tests/holo/res/drawable-mdpi/holo_light_noactionbar_zoomcontrols.png
similarity index 100%
copy from tests/res/drawable-mdpi/holo_land_zoomcontrols.png
copy to tests/tests/holo/res/drawable-mdpi/holo_light_noactionbar_zoomcontrols.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_panel_button.png b/tests/tests/holo/res/drawable-mdpi/holo_light_panel_button.png
new file mode 100644
index 0000000..19124b2
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_panel_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_panel_calendar_view.png b/tests/tests/holo/res/drawable-mdpi/holo_light_panel_calendar_view.png
new file mode 100644
index 0000000..3b86863
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_panel_calendar_view.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_panel_calendar_view_feb.png b/tests/tests/holo/res/drawable-mdpi/holo_light_panel_calendar_view_feb.png
new file mode 100644
index 0000000..a457bc3
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_panel_calendar_view_feb.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_panel_checkbox.png b/tests/tests/holo/res/drawable-mdpi/holo_light_panel_checkbox.png
new file mode 100644
index 0000000..54949e8
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_panel_checkbox.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_panel_checkbox_checked.png b/tests/tests/holo/res/drawable-mdpi/holo_light_panel_checkbox_checked.png
new file mode 100644
index 0000000..42e2783
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_panel_checkbox_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_panel_chronometer.png b/tests/tests/holo/res/drawable-mdpi/holo_light_panel_chronometer.png
new file mode 100644
index 0000000..200e909
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_panel_chronometer.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_panel_color_blue_bright.png b/tests/tests/holo/res/drawable-mdpi/holo_light_panel_color_blue_bright.png
new file mode 100644
index 0000000..fe1bdd7
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_panel_color_blue_bright.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_panel_color_blue_dark.png b/tests/tests/holo/res/drawable-mdpi/holo_light_panel_color_blue_dark.png
new file mode 100644
index 0000000..f3f0640
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_panel_color_blue_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_panel_color_blue_light.png b/tests/tests/holo/res/drawable-mdpi/holo_light_panel_color_blue_light.png
new file mode 100644
index 0000000..285d925
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_panel_color_blue_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_panel_color_green_dark.png b/tests/tests/holo/res/drawable-mdpi/holo_light_panel_color_green_dark.png
new file mode 100644
index 0000000..cfbbdd4
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_panel_color_green_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_panel_color_green_light.png b/tests/tests/holo/res/drawable-mdpi/holo_light_panel_color_green_light.png
new file mode 100644
index 0000000..a691827
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_panel_color_green_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_panel_color_orange_dark.png b/tests/tests/holo/res/drawable-mdpi/holo_light_panel_color_orange_dark.png
new file mode 100644
index 0000000..3f0e99a
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_panel_color_orange_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_panel_color_orange_light.png b/tests/tests/holo/res/drawable-mdpi/holo_light_panel_color_orange_light.png
new file mode 100644
index 0000000..f54fd64
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_panel_color_orange_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_panel_color_purple.png b/tests/tests/holo/res/drawable-mdpi/holo_light_panel_color_purple.png
new file mode 100644
index 0000000..15c9494
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_panel_color_purple.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_panel_color_red_dark.png b/tests/tests/holo/res/drawable-mdpi/holo_light_panel_color_red_dark.png
new file mode 100644
index 0000000..de3385d
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_panel_color_red_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_panel_color_red_light.png b/tests/tests/holo/res/drawable-mdpi/holo_light_panel_color_red_light.png
new file mode 100644
index 0000000..dde4043
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_panel_color_red_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_panel_edittext.png b/tests/tests/holo/res/drawable-mdpi/holo_light_panel_edittext.png
new file mode 100644
index 0000000..3e9e9ca
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_panel_edittext.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_panel_progressbar.png b/tests/tests/holo/res/drawable-mdpi/holo_light_panel_progressbar.png
new file mode 100644
index 0000000..d027b03
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_panel_progressbar.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_panel_progressbar_horizontal_0.png b/tests/tests/holo/res/drawable-mdpi/holo_light_panel_progressbar_horizontal_0.png
new file mode 100644
index 0000000..aa86092
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_panel_progressbar_horizontal_0.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_panel_progressbar_horizontal_100.png b/tests/tests/holo/res/drawable-mdpi/holo_light_panel_progressbar_horizontal_100.png
new file mode 100644
index 0000000..750a89c
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_panel_progressbar_horizontal_100.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_panel_progressbar_horizontal_50.png b/tests/tests/holo/res/drawable-mdpi/holo_light_panel_progressbar_horizontal_50.png
new file mode 100644
index 0000000..fc91586
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_panel_progressbar_horizontal_50.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_panel_progressbar_large.png b/tests/tests/holo/res/drawable-mdpi/holo_light_panel_progressbar_large.png
new file mode 100644
index 0000000..50301a4
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_panel_progressbar_large.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_panel_progressbar_small.png b/tests/tests/holo/res/drawable-mdpi/holo_light_panel_progressbar_small.png
new file mode 100644
index 0000000..1240e6a
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_panel_progressbar_small.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_panel_radio_button.png b/tests/tests/holo/res/drawable-mdpi/holo_light_panel_radio_button.png
new file mode 100644
index 0000000..c2398a1
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_panel_radio_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_panel_radio_button_checked.png b/tests/tests/holo/res/drawable-mdpi/holo_light_panel_radio_button_checked.png
new file mode 100644
index 0000000..898442f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_panel_radio_button_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_panel_radiogroup_horizontal.png b/tests/tests/holo/res/drawable-mdpi/holo_light_panel_radiogroup_horizontal.png
new file mode 100644
index 0000000..6191420
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_panel_radiogroup_horizontal.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_panel_radiogroup_vertical.png b/tests/tests/holo/res/drawable-mdpi/holo_light_panel_radiogroup_vertical.png
new file mode 100644
index 0000000..fa88e6f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_panel_radiogroup_vertical.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_panel_ratingbar_0.png b/tests/tests/holo/res/drawable-mdpi/holo_light_panel_ratingbar_0.png
new file mode 100644
index 0000000..2fabd8a
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_panel_ratingbar_0.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_panel_ratingbar_2point5.png b/tests/tests/holo/res/drawable-mdpi/holo_light_panel_ratingbar_2point5.png
new file mode 100644
index 0000000..2bebaba
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_panel_ratingbar_2point5.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_panel_ratingbar_5.png b/tests/tests/holo/res/drawable-mdpi/holo_light_panel_ratingbar_5.png
new file mode 100644
index 0000000..51ee230
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_panel_ratingbar_5.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_panel_searchview.png b/tests/tests/holo/res/drawable-mdpi/holo_light_panel_searchview.png
new file mode 100644
index 0000000..4194f13
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_panel_searchview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_panel_searchview_query.png b/tests/tests/holo/res/drawable-mdpi/holo_light_panel_searchview_query.png
new file mode 100644
index 0000000..7f11808
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_panel_searchview_query.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_panel_searchview_query_hint.png b/tests/tests/holo/res/drawable-mdpi/holo_light_panel_searchview_query_hint.png
new file mode 100644
index 0000000..f1e0f2f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_panel_searchview_query_hint.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_panel_seekbar_0.png b/tests/tests/holo/res/drawable-mdpi/holo_light_panel_seekbar_0.png
new file mode 100644
index 0000000..6a73d98
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_panel_seekbar_0.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_panel_seekbar_100.png b/tests/tests/holo/res/drawable-mdpi/holo_light_panel_seekbar_100.png
new file mode 100644
index 0000000..5be0453
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_panel_seekbar_100.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_panel_seekbar_50.png b/tests/tests/holo/res/drawable-mdpi/holo_light_panel_seekbar_50.png
new file mode 100644
index 0000000..881276c
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_panel_seekbar_50.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_panel_spinner.png b/tests/tests/holo/res/drawable-mdpi/holo_light_panel_spinner.png
new file mode 100644
index 0000000..144cd8f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_panel_spinner.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_panel_switch.png b/tests/tests/holo/res/drawable-mdpi/holo_light_panel_switch.png
new file mode 100644
index 0000000..f3029f2
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_panel_switch.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_panel_switch_checked.png b/tests/tests/holo/res/drawable-mdpi/holo_light_panel_switch_checked.png
new file mode 100644
index 0000000..2dad98a
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_panel_switch_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_panel_tabhost.png b/tests/tests/holo/res/drawable-mdpi/holo_light_panel_tabhost.png
new file mode 100644
index 0000000..c27b8d8
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_panel_tabhost.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_panel_textview.png b/tests/tests/holo/res/drawable-mdpi/holo_light_panel_textview.png
new file mode 100644
index 0000000..f5319bf
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_panel_textview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_panel_timepicker.png b/tests/tests/holo/res/drawable-mdpi/holo_light_panel_timepicker.png
new file mode 100644
index 0000000..5e428b0
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_panel_timepicker.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_panel_toggle_button.png b/tests/tests/holo/res/drawable-mdpi/holo_light_panel_toggle_button.png
new file mode 100644
index 0000000..6e95a85
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_panel_toggle_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_panel_toggle_button_checked.png b/tests/tests/holo/res/drawable-mdpi/holo_light_panel_toggle_button_checked.png
new file mode 100644
index 0000000..bbbe3c6
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_panel_toggle_button_checked.png
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_land_zoomcontrols.png b/tests/tests/holo/res/drawable-mdpi/holo_light_panel_zoomcontrols.png
similarity index 100%
copy from tests/res/drawable-mdpi/holo_land_zoomcontrols.png
copy to tests/tests/holo/res/drawable-mdpi/holo_light_panel_zoomcontrols.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_progressbar.png b/tests/tests/holo/res/drawable-mdpi/holo_light_progressbar.png
new file mode 100644
index 0000000..d027b03
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_progressbar.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_progressbar_horizontal_0.png b/tests/tests/holo/res/drawable-mdpi/holo_light_progressbar_horizontal_0.png
new file mode 100644
index 0000000..aa86092
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_progressbar_horizontal_0.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_progressbar_horizontal_100.png b/tests/tests/holo/res/drawable-mdpi/holo_light_progressbar_horizontal_100.png
new file mode 100644
index 0000000..750a89c
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_progressbar_horizontal_100.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_progressbar_horizontal_50.png b/tests/tests/holo/res/drawable-mdpi/holo_light_progressbar_horizontal_50.png
new file mode 100644
index 0000000..fc91586
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_progressbar_horizontal_50.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_progressbar_large.png b/tests/tests/holo/res/drawable-mdpi/holo_light_progressbar_large.png
new file mode 100644
index 0000000..50301a4
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_progressbar_large.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_progressbar_small.png b/tests/tests/holo/res/drawable-mdpi/holo_light_progressbar_small.png
new file mode 100644
index 0000000..1240e6a
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_progressbar_small.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_radio_button.png b/tests/tests/holo/res/drawable-mdpi/holo_light_radio_button.png
new file mode 100644
index 0000000..c2398a1
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_radio_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_radio_button_checked.png b/tests/tests/holo/res/drawable-mdpi/holo_light_radio_button_checked.png
new file mode 100644
index 0000000..898442f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_radio_button_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_radiogroup_horizontal.png b/tests/tests/holo/res/drawable-mdpi/holo_light_radiogroup_horizontal.png
new file mode 100644
index 0000000..6191420
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_radiogroup_horizontal.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_radiogroup_vertical.png b/tests/tests/holo/res/drawable-mdpi/holo_light_radiogroup_vertical.png
new file mode 100644
index 0000000..fa88e6f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_radiogroup_vertical.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_ratingbar_0.png b/tests/tests/holo/res/drawable-mdpi/holo_light_ratingbar_0.png
new file mode 100644
index 0000000..2fabd8a
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_ratingbar_0.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_ratingbar_2point5.png b/tests/tests/holo/res/drawable-mdpi/holo_light_ratingbar_2point5.png
new file mode 100644
index 0000000..2bebaba
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_ratingbar_2point5.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_ratingbar_5.png b/tests/tests/holo/res/drawable-mdpi/holo_light_ratingbar_5.png
new file mode 100644
index 0000000..51ee230
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_ratingbar_5.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_searchview.png b/tests/tests/holo/res/drawable-mdpi/holo_light_searchview.png
new file mode 100644
index 0000000..4194f13
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_searchview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_searchview_query.png b/tests/tests/holo/res/drawable-mdpi/holo_light_searchview_query.png
new file mode 100644
index 0000000..7f11808
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_searchview_query.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_searchview_query_hint.png b/tests/tests/holo/res/drawable-mdpi/holo_light_searchview_query_hint.png
new file mode 100644
index 0000000..f1e0f2f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_searchview_query_hint.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_seekbar_0.png b/tests/tests/holo/res/drawable-mdpi/holo_light_seekbar_0.png
new file mode 100644
index 0000000..6a73d98
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_seekbar_0.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_seekbar_100.png b/tests/tests/holo/res/drawable-mdpi/holo_light_seekbar_100.png
new file mode 100644
index 0000000..5be0453
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_seekbar_100.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_seekbar_50.png b/tests/tests/holo/res/drawable-mdpi/holo_light_seekbar_50.png
new file mode 100644
index 0000000..881276c
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_seekbar_50.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_spinner.png b/tests/tests/holo/res/drawable-mdpi/holo_light_spinner.png
new file mode 100644
index 0000000..144cd8f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_spinner.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_switch.png b/tests/tests/holo/res/drawable-mdpi/holo_light_switch.png
new file mode 100644
index 0000000..f3029f2
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_switch.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_switch_checked.png b/tests/tests/holo/res/drawable-mdpi/holo_light_switch_checked.png
new file mode 100644
index 0000000..2dad98a
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_switch_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_tabhost.png b/tests/tests/holo/res/drawable-mdpi/holo_light_tabhost.png
new file mode 100644
index 0000000..c27b8d8
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_tabhost.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_textview.png b/tests/tests/holo/res/drawable-mdpi/holo_light_textview.png
new file mode 100644
index 0000000..f5319bf
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_textview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_timepicker.png b/tests/tests/holo/res/drawable-mdpi/holo_light_timepicker.png
new file mode 100644
index 0000000..5e428b0
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_timepicker.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_toggle_button.png b/tests/tests/holo/res/drawable-mdpi/holo_light_toggle_button.png
new file mode 100644
index 0000000..6e95a85
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_toggle_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_light_toggle_button_checked.png b/tests/tests/holo/res/drawable-mdpi/holo_light_toggle_button_checked.png
new file mode 100644
index 0000000..bbbe3c6
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_light_toggle_button_checked.png
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_port_zoomcontrols.png b/tests/tests/holo/res/drawable-mdpi/holo_light_zoomcontrols.png
similarity index 100%
rename from tests/res/drawable-mdpi/holo_port_zoomcontrols.png
rename to tests/tests/holo/res/drawable-mdpi/holo_light_zoomcontrols.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_noactionbar_button.png b/tests/tests/holo/res/drawable-mdpi/holo_noactionbar_button.png
new file mode 100644
index 0000000..6d81450
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_noactionbar_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_noactionbar_calendar_view.png b/tests/tests/holo/res/drawable-mdpi/holo_noactionbar_calendar_view.png
new file mode 100644
index 0000000..50d00ab
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_noactionbar_calendar_view.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_noactionbar_calendar_view_feb.png b/tests/tests/holo/res/drawable-mdpi/holo_noactionbar_calendar_view_feb.png
new file mode 100644
index 0000000..aed3bc0
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_noactionbar_calendar_view_feb.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_noactionbar_checkbox.png b/tests/tests/holo/res/drawable-mdpi/holo_noactionbar_checkbox.png
new file mode 100644
index 0000000..63dc6ed
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_noactionbar_checkbox.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_noactionbar_checkbox_checked.png b/tests/tests/holo/res/drawable-mdpi/holo_noactionbar_checkbox_checked.png
new file mode 100644
index 0000000..a0f737c
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_noactionbar_checkbox_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_noactionbar_chronometer.png b/tests/tests/holo/res/drawable-mdpi/holo_noactionbar_chronometer.png
new file mode 100644
index 0000000..a4e7093
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_noactionbar_chronometer.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_noactionbar_color_blue_bright.png b/tests/tests/holo/res/drawable-mdpi/holo_noactionbar_color_blue_bright.png
new file mode 100644
index 0000000..fe1bdd7
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_noactionbar_color_blue_bright.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_noactionbar_color_blue_dark.png b/tests/tests/holo/res/drawable-mdpi/holo_noactionbar_color_blue_dark.png
new file mode 100644
index 0000000..f3f0640
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_noactionbar_color_blue_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_noactionbar_color_blue_light.png b/tests/tests/holo/res/drawable-mdpi/holo_noactionbar_color_blue_light.png
new file mode 100644
index 0000000..285d925
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_noactionbar_color_blue_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_noactionbar_color_green_dark.png b/tests/tests/holo/res/drawable-mdpi/holo_noactionbar_color_green_dark.png
new file mode 100644
index 0000000..cfbbdd4
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_noactionbar_color_green_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_noactionbar_color_green_light.png b/tests/tests/holo/res/drawable-mdpi/holo_noactionbar_color_green_light.png
new file mode 100644
index 0000000..a691827
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_noactionbar_color_green_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_noactionbar_color_orange_dark.png b/tests/tests/holo/res/drawable-mdpi/holo_noactionbar_color_orange_dark.png
new file mode 100644
index 0000000..3f0e99a
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_noactionbar_color_orange_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_noactionbar_color_orange_light.png b/tests/tests/holo/res/drawable-mdpi/holo_noactionbar_color_orange_light.png
new file mode 100644
index 0000000..f54fd64
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_noactionbar_color_orange_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_noactionbar_color_purple.png b/tests/tests/holo/res/drawable-mdpi/holo_noactionbar_color_purple.png
new file mode 100644
index 0000000..15c9494
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_noactionbar_color_purple.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_noactionbar_color_red_dark.png b/tests/tests/holo/res/drawable-mdpi/holo_noactionbar_color_red_dark.png
new file mode 100644
index 0000000..de3385d
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_noactionbar_color_red_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_noactionbar_color_red_light.png b/tests/tests/holo/res/drawable-mdpi/holo_noactionbar_color_red_light.png
new file mode 100644
index 0000000..dde4043
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_noactionbar_color_red_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_noactionbar_edittext.png b/tests/tests/holo/res/drawable-mdpi/holo_noactionbar_edittext.png
new file mode 100644
index 0000000..6fabb7e
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_noactionbar_edittext.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_noactionbar_fullscreen_button.png b/tests/tests/holo/res/drawable-mdpi/holo_noactionbar_fullscreen_button.png
new file mode 100644
index 0000000..6d81450
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_noactionbar_fullscreen_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_noactionbar_fullscreen_calendar_view.png b/tests/tests/holo/res/drawable-mdpi/holo_noactionbar_fullscreen_calendar_view.png
new file mode 100644
index 0000000..50d00ab
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_noactionbar_fullscreen_calendar_view.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_noactionbar_fullscreen_calendar_view_feb.png b/tests/tests/holo/res/drawable-mdpi/holo_noactionbar_fullscreen_calendar_view_feb.png
new file mode 100644
index 0000000..aed3bc0
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_noactionbar_fullscreen_calendar_view_feb.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_noactionbar_fullscreen_checkbox.png b/tests/tests/holo/res/drawable-mdpi/holo_noactionbar_fullscreen_checkbox.png
new file mode 100644
index 0000000..63dc6ed
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_noactionbar_fullscreen_checkbox.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_noactionbar_fullscreen_checkbox_checked.png b/tests/tests/holo/res/drawable-mdpi/holo_noactionbar_fullscreen_checkbox_checked.png
new file mode 100644
index 0000000..a0f737c
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_noactionbar_fullscreen_checkbox_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_noactionbar_fullscreen_chronometer.png b/tests/tests/holo/res/drawable-mdpi/holo_noactionbar_fullscreen_chronometer.png
new file mode 100644
index 0000000..a4e7093
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_noactionbar_fullscreen_chronometer.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_noactionbar_fullscreen_color_blue_bright.png b/tests/tests/holo/res/drawable-mdpi/holo_noactionbar_fullscreen_color_blue_bright.png
new file mode 100644
index 0000000..fe1bdd7
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_noactionbar_fullscreen_color_blue_bright.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_noactionbar_fullscreen_color_blue_dark.png b/tests/tests/holo/res/drawable-mdpi/holo_noactionbar_fullscreen_color_blue_dark.png
new file mode 100644
index 0000000..f3f0640
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_noactionbar_fullscreen_color_blue_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_noactionbar_fullscreen_color_blue_light.png b/tests/tests/holo/res/drawable-mdpi/holo_noactionbar_fullscreen_color_blue_light.png
new file mode 100644
index 0000000..285d925
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_noactionbar_fullscreen_color_blue_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_noactionbar_fullscreen_color_green_dark.png b/tests/tests/holo/res/drawable-mdpi/holo_noactionbar_fullscreen_color_green_dark.png
new file mode 100644
index 0000000..cfbbdd4
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_noactionbar_fullscreen_color_green_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_noactionbar_fullscreen_color_green_light.png b/tests/tests/holo/res/drawable-mdpi/holo_noactionbar_fullscreen_color_green_light.png
new file mode 100644
index 0000000..a691827
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_noactionbar_fullscreen_color_green_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_noactionbar_fullscreen_color_orange_dark.png b/tests/tests/holo/res/drawable-mdpi/holo_noactionbar_fullscreen_color_orange_dark.png
new file mode 100644
index 0000000..3f0e99a
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_noactionbar_fullscreen_color_orange_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_noactionbar_fullscreen_color_orange_light.png b/tests/tests/holo/res/drawable-mdpi/holo_noactionbar_fullscreen_color_orange_light.png
new file mode 100644
index 0000000..f54fd64
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_noactionbar_fullscreen_color_orange_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_noactionbar_fullscreen_color_purple.png b/tests/tests/holo/res/drawable-mdpi/holo_noactionbar_fullscreen_color_purple.png
new file mode 100644
index 0000000..15c9494
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_noactionbar_fullscreen_color_purple.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_noactionbar_fullscreen_color_red_dark.png b/tests/tests/holo/res/drawable-mdpi/holo_noactionbar_fullscreen_color_red_dark.png
new file mode 100644
index 0000000..de3385d
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_noactionbar_fullscreen_color_red_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_noactionbar_fullscreen_color_red_light.png b/tests/tests/holo/res/drawable-mdpi/holo_noactionbar_fullscreen_color_red_light.png
new file mode 100644
index 0000000..dde4043
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_noactionbar_fullscreen_color_red_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_noactionbar_fullscreen_edittext.png b/tests/tests/holo/res/drawable-mdpi/holo_noactionbar_fullscreen_edittext.png
new file mode 100644
index 0000000..6fabb7e
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_noactionbar_fullscreen_edittext.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_noactionbar_fullscreen_progressbar.png b/tests/tests/holo/res/drawable-mdpi/holo_noactionbar_fullscreen_progressbar.png
new file mode 100644
index 0000000..d027b03
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_noactionbar_fullscreen_progressbar.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_noactionbar_fullscreen_progressbar_horizontal_0.png b/tests/tests/holo/res/drawable-mdpi/holo_noactionbar_fullscreen_progressbar_horizontal_0.png
new file mode 100644
index 0000000..a73db14
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_noactionbar_fullscreen_progressbar_horizontal_0.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_noactionbar_fullscreen_progressbar_horizontal_100.png b/tests/tests/holo/res/drawable-mdpi/holo_noactionbar_fullscreen_progressbar_horizontal_100.png
new file mode 100644
index 0000000..2813c84
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_noactionbar_fullscreen_progressbar_horizontal_100.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_noactionbar_fullscreen_progressbar_horizontal_50.png b/tests/tests/holo/res/drawable-mdpi/holo_noactionbar_fullscreen_progressbar_horizontal_50.png
new file mode 100644
index 0000000..d5c65a9
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_noactionbar_fullscreen_progressbar_horizontal_50.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_noactionbar_fullscreen_progressbar_large.png b/tests/tests/holo/res/drawable-mdpi/holo_noactionbar_fullscreen_progressbar_large.png
new file mode 100644
index 0000000..50301a4
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_noactionbar_fullscreen_progressbar_large.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_noactionbar_fullscreen_progressbar_small.png b/tests/tests/holo/res/drawable-mdpi/holo_noactionbar_fullscreen_progressbar_small.png
new file mode 100644
index 0000000..1240e6a
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_noactionbar_fullscreen_progressbar_small.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_noactionbar_fullscreen_radio_button.png b/tests/tests/holo/res/drawable-mdpi/holo_noactionbar_fullscreen_radio_button.png
new file mode 100644
index 0000000..813b9ee
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_noactionbar_fullscreen_radio_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_noactionbar_fullscreen_radio_button_checked.png b/tests/tests/holo/res/drawable-mdpi/holo_noactionbar_fullscreen_radio_button_checked.png
new file mode 100644
index 0000000..ca4a1b7
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_noactionbar_fullscreen_radio_button_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_noactionbar_fullscreen_radiogroup_horizontal.png b/tests/tests/holo/res/drawable-mdpi/holo_noactionbar_fullscreen_radiogroup_horizontal.png
new file mode 100644
index 0000000..944e7a4
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_noactionbar_fullscreen_radiogroup_horizontal.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_noactionbar_fullscreen_radiogroup_vertical.png b/tests/tests/holo/res/drawable-mdpi/holo_noactionbar_fullscreen_radiogroup_vertical.png
new file mode 100644
index 0000000..e9aecf8
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_noactionbar_fullscreen_radiogroup_vertical.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_noactionbar_fullscreen_ratingbar_0.png b/tests/tests/holo/res/drawable-mdpi/holo_noactionbar_fullscreen_ratingbar_0.png
new file mode 100644
index 0000000..00a9aab
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_noactionbar_fullscreen_ratingbar_0.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_noactionbar_fullscreen_ratingbar_2point5.png b/tests/tests/holo/res/drawable-mdpi/holo_noactionbar_fullscreen_ratingbar_2point5.png
new file mode 100644
index 0000000..88725b1
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_noactionbar_fullscreen_ratingbar_2point5.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_noactionbar_fullscreen_ratingbar_5.png b/tests/tests/holo/res/drawable-mdpi/holo_noactionbar_fullscreen_ratingbar_5.png
new file mode 100644
index 0000000..f62fa44
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_noactionbar_fullscreen_ratingbar_5.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_noactionbar_fullscreen_searchview.png b/tests/tests/holo/res/drawable-mdpi/holo_noactionbar_fullscreen_searchview.png
new file mode 100644
index 0000000..06ec15b
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_noactionbar_fullscreen_searchview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_noactionbar_fullscreen_searchview_query.png b/tests/tests/holo/res/drawable-mdpi/holo_noactionbar_fullscreen_searchview_query.png
new file mode 100644
index 0000000..e6e3646
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_noactionbar_fullscreen_searchview_query.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_noactionbar_fullscreen_searchview_query_hint.png b/tests/tests/holo/res/drawable-mdpi/holo_noactionbar_fullscreen_searchview_query_hint.png
new file mode 100644
index 0000000..df6d421
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_noactionbar_fullscreen_searchview_query_hint.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_noactionbar_fullscreen_seekbar_0.png b/tests/tests/holo/res/drawable-mdpi/holo_noactionbar_fullscreen_seekbar_0.png
new file mode 100644
index 0000000..6ef0c71
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_noactionbar_fullscreen_seekbar_0.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_noactionbar_fullscreen_seekbar_100.png b/tests/tests/holo/res/drawable-mdpi/holo_noactionbar_fullscreen_seekbar_100.png
new file mode 100644
index 0000000..5be0453
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_noactionbar_fullscreen_seekbar_100.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_noactionbar_fullscreen_seekbar_50.png b/tests/tests/holo/res/drawable-mdpi/holo_noactionbar_fullscreen_seekbar_50.png
new file mode 100644
index 0000000..3ba6228
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_noactionbar_fullscreen_seekbar_50.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_noactionbar_fullscreen_spinner.png b/tests/tests/holo/res/drawable-mdpi/holo_noactionbar_fullscreen_spinner.png
new file mode 100644
index 0000000..7b14cc0
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_noactionbar_fullscreen_spinner.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_noactionbar_fullscreen_switch.png b/tests/tests/holo/res/drawable-mdpi/holo_noactionbar_fullscreen_switch.png
new file mode 100644
index 0000000..a1beda8
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_noactionbar_fullscreen_switch.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_noactionbar_fullscreen_switch_checked.png b/tests/tests/holo/res/drawable-mdpi/holo_noactionbar_fullscreen_switch_checked.png
new file mode 100644
index 0000000..a5e17d3
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_noactionbar_fullscreen_switch_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_noactionbar_fullscreen_tabhost.png b/tests/tests/holo/res/drawable-mdpi/holo_noactionbar_fullscreen_tabhost.png
new file mode 100644
index 0000000..6c1595c
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_noactionbar_fullscreen_tabhost.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_noactionbar_fullscreen_textview.png b/tests/tests/holo/res/drawable-mdpi/holo_noactionbar_fullscreen_textview.png
new file mode 100644
index 0000000..1ccf89f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_noactionbar_fullscreen_textview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_noactionbar_fullscreen_timepicker.png b/tests/tests/holo/res/drawable-mdpi/holo_noactionbar_fullscreen_timepicker.png
new file mode 100644
index 0000000..86802e3
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_noactionbar_fullscreen_timepicker.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_noactionbar_fullscreen_toggle_button.png b/tests/tests/holo/res/drawable-mdpi/holo_noactionbar_fullscreen_toggle_button.png
new file mode 100644
index 0000000..948e1b8
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_noactionbar_fullscreen_toggle_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_noactionbar_fullscreen_toggle_button_checked.png b/tests/tests/holo/res/drawable-mdpi/holo_noactionbar_fullscreen_toggle_button_checked.png
new file mode 100644
index 0000000..c89fae2
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_noactionbar_fullscreen_toggle_button_checked.png
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_land_zoomcontrols.png b/tests/tests/holo/res/drawable-mdpi/holo_noactionbar_fullscreen_zoomcontrols.png
similarity index 100%
copy from tests/res/drawable-mdpi/holo_land_zoomcontrols.png
copy to tests/tests/holo/res/drawable-mdpi/holo_noactionbar_fullscreen_zoomcontrols.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_noactionbar_progressbar.png b/tests/tests/holo/res/drawable-mdpi/holo_noactionbar_progressbar.png
new file mode 100644
index 0000000..d027b03
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_noactionbar_progressbar.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_noactionbar_progressbar_horizontal_0.png b/tests/tests/holo/res/drawable-mdpi/holo_noactionbar_progressbar_horizontal_0.png
new file mode 100644
index 0000000..a73db14
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_noactionbar_progressbar_horizontal_0.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_noactionbar_progressbar_horizontal_100.png b/tests/tests/holo/res/drawable-mdpi/holo_noactionbar_progressbar_horizontal_100.png
new file mode 100644
index 0000000..2813c84
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_noactionbar_progressbar_horizontal_100.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_noactionbar_progressbar_horizontal_50.png b/tests/tests/holo/res/drawable-mdpi/holo_noactionbar_progressbar_horizontal_50.png
new file mode 100644
index 0000000..d5c65a9
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_noactionbar_progressbar_horizontal_50.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_noactionbar_progressbar_large.png b/tests/tests/holo/res/drawable-mdpi/holo_noactionbar_progressbar_large.png
new file mode 100644
index 0000000..50301a4
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_noactionbar_progressbar_large.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_noactionbar_progressbar_small.png b/tests/tests/holo/res/drawable-mdpi/holo_noactionbar_progressbar_small.png
new file mode 100644
index 0000000..1240e6a
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_noactionbar_progressbar_small.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_noactionbar_radio_button.png b/tests/tests/holo/res/drawable-mdpi/holo_noactionbar_radio_button.png
new file mode 100644
index 0000000..813b9ee
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_noactionbar_radio_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_noactionbar_radio_button_checked.png b/tests/tests/holo/res/drawable-mdpi/holo_noactionbar_radio_button_checked.png
new file mode 100644
index 0000000..ca4a1b7
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_noactionbar_radio_button_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_noactionbar_radiogroup_horizontal.png b/tests/tests/holo/res/drawable-mdpi/holo_noactionbar_radiogroup_horizontal.png
new file mode 100644
index 0000000..944e7a4
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_noactionbar_radiogroup_horizontal.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_noactionbar_radiogroup_vertical.png b/tests/tests/holo/res/drawable-mdpi/holo_noactionbar_radiogroup_vertical.png
new file mode 100644
index 0000000..e9aecf8
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_noactionbar_radiogroup_vertical.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_noactionbar_ratingbar_0.png b/tests/tests/holo/res/drawable-mdpi/holo_noactionbar_ratingbar_0.png
new file mode 100644
index 0000000..00a9aab
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_noactionbar_ratingbar_0.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_noactionbar_ratingbar_2point5.png b/tests/tests/holo/res/drawable-mdpi/holo_noactionbar_ratingbar_2point5.png
new file mode 100644
index 0000000..88725b1
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_noactionbar_ratingbar_2point5.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_noactionbar_ratingbar_5.png b/tests/tests/holo/res/drawable-mdpi/holo_noactionbar_ratingbar_5.png
new file mode 100644
index 0000000..f62fa44
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_noactionbar_ratingbar_5.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_noactionbar_searchview.png b/tests/tests/holo/res/drawable-mdpi/holo_noactionbar_searchview.png
new file mode 100644
index 0000000..06ec15b
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_noactionbar_searchview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_noactionbar_searchview_query.png b/tests/tests/holo/res/drawable-mdpi/holo_noactionbar_searchview_query.png
new file mode 100644
index 0000000..e6e3646
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_noactionbar_searchview_query.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_noactionbar_searchview_query_hint.png b/tests/tests/holo/res/drawable-mdpi/holo_noactionbar_searchview_query_hint.png
new file mode 100644
index 0000000..df6d421
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_noactionbar_searchview_query_hint.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_noactionbar_seekbar_0.png b/tests/tests/holo/res/drawable-mdpi/holo_noactionbar_seekbar_0.png
new file mode 100644
index 0000000..6ef0c71
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_noactionbar_seekbar_0.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_noactionbar_seekbar_100.png b/tests/tests/holo/res/drawable-mdpi/holo_noactionbar_seekbar_100.png
new file mode 100644
index 0000000..5be0453
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_noactionbar_seekbar_100.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_noactionbar_seekbar_50.png b/tests/tests/holo/res/drawable-mdpi/holo_noactionbar_seekbar_50.png
new file mode 100644
index 0000000..3ba6228
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_noactionbar_seekbar_50.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_noactionbar_spinner.png b/tests/tests/holo/res/drawable-mdpi/holo_noactionbar_spinner.png
new file mode 100644
index 0000000..7b14cc0
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_noactionbar_spinner.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_noactionbar_switch.png b/tests/tests/holo/res/drawable-mdpi/holo_noactionbar_switch.png
new file mode 100644
index 0000000..a1beda8
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_noactionbar_switch.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_noactionbar_switch_checked.png b/tests/tests/holo/res/drawable-mdpi/holo_noactionbar_switch_checked.png
new file mode 100644
index 0000000..a5e17d3
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_noactionbar_switch_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_noactionbar_tabhost.png b/tests/tests/holo/res/drawable-mdpi/holo_noactionbar_tabhost.png
new file mode 100644
index 0000000..6c1595c
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_noactionbar_tabhost.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_noactionbar_textview.png b/tests/tests/holo/res/drawable-mdpi/holo_noactionbar_textview.png
new file mode 100644
index 0000000..1ccf89f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_noactionbar_textview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_noactionbar_timepicker.png b/tests/tests/holo/res/drawable-mdpi/holo_noactionbar_timepicker.png
new file mode 100644
index 0000000..86802e3
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_noactionbar_timepicker.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_noactionbar_toggle_button.png b/tests/tests/holo/res/drawable-mdpi/holo_noactionbar_toggle_button.png
new file mode 100644
index 0000000..948e1b8
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_noactionbar_toggle_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_noactionbar_toggle_button_checked.png b/tests/tests/holo/res/drawable-mdpi/holo_noactionbar_toggle_button_checked.png
new file mode 100644
index 0000000..c89fae2
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_noactionbar_toggle_button_checked.png
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_land_zoomcontrols.png b/tests/tests/holo/res/drawable-mdpi/holo_noactionbar_zoomcontrols.png
similarity index 100%
copy from tests/res/drawable-mdpi/holo_land_zoomcontrols.png
copy to tests/tests/holo/res/drawable-mdpi/holo_noactionbar_zoomcontrols.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_panel_button.png b/tests/tests/holo/res/drawable-mdpi/holo_panel_button.png
new file mode 100644
index 0000000..6d81450
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_panel_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_panel_calendar_view.png b/tests/tests/holo/res/drawable-mdpi/holo_panel_calendar_view.png
new file mode 100644
index 0000000..50d00ab
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_panel_calendar_view.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_panel_calendar_view_feb.png b/tests/tests/holo/res/drawable-mdpi/holo_panel_calendar_view_feb.png
new file mode 100644
index 0000000..aed3bc0
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_panel_calendar_view_feb.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_panel_checkbox.png b/tests/tests/holo/res/drawable-mdpi/holo_panel_checkbox.png
new file mode 100644
index 0000000..63dc6ed
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_panel_checkbox.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_panel_checkbox_checked.png b/tests/tests/holo/res/drawable-mdpi/holo_panel_checkbox_checked.png
new file mode 100644
index 0000000..a0f737c
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_panel_checkbox_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_panel_chronometer.png b/tests/tests/holo/res/drawable-mdpi/holo_panel_chronometer.png
new file mode 100644
index 0000000..a4e7093
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_panel_chronometer.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_panel_color_blue_bright.png b/tests/tests/holo/res/drawable-mdpi/holo_panel_color_blue_bright.png
new file mode 100644
index 0000000..fe1bdd7
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_panel_color_blue_bright.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_panel_color_blue_dark.png b/tests/tests/holo/res/drawable-mdpi/holo_panel_color_blue_dark.png
new file mode 100644
index 0000000..f3f0640
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_panel_color_blue_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_panel_color_blue_light.png b/tests/tests/holo/res/drawable-mdpi/holo_panel_color_blue_light.png
new file mode 100644
index 0000000..285d925
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_panel_color_blue_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_panel_color_green_dark.png b/tests/tests/holo/res/drawable-mdpi/holo_panel_color_green_dark.png
new file mode 100644
index 0000000..cfbbdd4
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_panel_color_green_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_panel_color_green_light.png b/tests/tests/holo/res/drawable-mdpi/holo_panel_color_green_light.png
new file mode 100644
index 0000000..a691827
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_panel_color_green_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_panel_color_orange_dark.png b/tests/tests/holo/res/drawable-mdpi/holo_panel_color_orange_dark.png
new file mode 100644
index 0000000..3f0e99a
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_panel_color_orange_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_panel_color_orange_light.png b/tests/tests/holo/res/drawable-mdpi/holo_panel_color_orange_light.png
new file mode 100644
index 0000000..f54fd64
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_panel_color_orange_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_panel_color_purple.png b/tests/tests/holo/res/drawable-mdpi/holo_panel_color_purple.png
new file mode 100644
index 0000000..15c9494
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_panel_color_purple.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_panel_color_red_dark.png b/tests/tests/holo/res/drawable-mdpi/holo_panel_color_red_dark.png
new file mode 100644
index 0000000..de3385d
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_panel_color_red_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_panel_color_red_light.png b/tests/tests/holo/res/drawable-mdpi/holo_panel_color_red_light.png
new file mode 100644
index 0000000..dde4043
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_panel_color_red_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_panel_edittext.png b/tests/tests/holo/res/drawable-mdpi/holo_panel_edittext.png
new file mode 100644
index 0000000..6fabb7e
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_panel_edittext.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_panel_progressbar.png b/tests/tests/holo/res/drawable-mdpi/holo_panel_progressbar.png
new file mode 100644
index 0000000..d027b03
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_panel_progressbar.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_panel_progressbar_horizontal_0.png b/tests/tests/holo/res/drawable-mdpi/holo_panel_progressbar_horizontal_0.png
new file mode 100644
index 0000000..a73db14
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_panel_progressbar_horizontal_0.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_panel_progressbar_horizontal_100.png b/tests/tests/holo/res/drawable-mdpi/holo_panel_progressbar_horizontal_100.png
new file mode 100644
index 0000000..2813c84
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_panel_progressbar_horizontal_100.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_panel_progressbar_horizontal_50.png b/tests/tests/holo/res/drawable-mdpi/holo_panel_progressbar_horizontal_50.png
new file mode 100644
index 0000000..d5c65a9
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_panel_progressbar_horizontal_50.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_panel_progressbar_large.png b/tests/tests/holo/res/drawable-mdpi/holo_panel_progressbar_large.png
new file mode 100644
index 0000000..50301a4
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_panel_progressbar_large.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_panel_progressbar_small.png b/tests/tests/holo/res/drawable-mdpi/holo_panel_progressbar_small.png
new file mode 100644
index 0000000..1240e6a
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_panel_progressbar_small.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_panel_radio_button.png b/tests/tests/holo/res/drawable-mdpi/holo_panel_radio_button.png
new file mode 100644
index 0000000..813b9ee
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_panel_radio_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_panel_radio_button_checked.png b/tests/tests/holo/res/drawable-mdpi/holo_panel_radio_button_checked.png
new file mode 100644
index 0000000..ca4a1b7
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_panel_radio_button_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_panel_radiogroup_horizontal.png b/tests/tests/holo/res/drawable-mdpi/holo_panel_radiogroup_horizontal.png
new file mode 100644
index 0000000..944e7a4
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_panel_radiogroup_horizontal.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_panel_radiogroup_vertical.png b/tests/tests/holo/res/drawable-mdpi/holo_panel_radiogroup_vertical.png
new file mode 100644
index 0000000..e9aecf8
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_panel_radiogroup_vertical.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_panel_ratingbar_0.png b/tests/tests/holo/res/drawable-mdpi/holo_panel_ratingbar_0.png
new file mode 100644
index 0000000..00a9aab
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_panel_ratingbar_0.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_panel_ratingbar_2point5.png b/tests/tests/holo/res/drawable-mdpi/holo_panel_ratingbar_2point5.png
new file mode 100644
index 0000000..88725b1
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_panel_ratingbar_2point5.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_panel_ratingbar_5.png b/tests/tests/holo/res/drawable-mdpi/holo_panel_ratingbar_5.png
new file mode 100644
index 0000000..f62fa44
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_panel_ratingbar_5.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_panel_searchview.png b/tests/tests/holo/res/drawable-mdpi/holo_panel_searchview.png
new file mode 100644
index 0000000..06ec15b
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_panel_searchview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_panel_searchview_query.png b/tests/tests/holo/res/drawable-mdpi/holo_panel_searchview_query.png
new file mode 100644
index 0000000..e6e3646
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_panel_searchview_query.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_panel_searchview_query_hint.png b/tests/tests/holo/res/drawable-mdpi/holo_panel_searchview_query_hint.png
new file mode 100644
index 0000000..df6d421
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_panel_searchview_query_hint.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_panel_seekbar_0.png b/tests/tests/holo/res/drawable-mdpi/holo_panel_seekbar_0.png
new file mode 100644
index 0000000..6ef0c71
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_panel_seekbar_0.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_panel_seekbar_100.png b/tests/tests/holo/res/drawable-mdpi/holo_panel_seekbar_100.png
new file mode 100644
index 0000000..5be0453
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_panel_seekbar_100.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_panel_seekbar_50.png b/tests/tests/holo/res/drawable-mdpi/holo_panel_seekbar_50.png
new file mode 100644
index 0000000..3ba6228
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_panel_seekbar_50.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_panel_spinner.png b/tests/tests/holo/res/drawable-mdpi/holo_panel_spinner.png
new file mode 100644
index 0000000..7b14cc0
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_panel_spinner.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_panel_switch.png b/tests/tests/holo/res/drawable-mdpi/holo_panel_switch.png
new file mode 100644
index 0000000..a1beda8
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_panel_switch.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_panel_switch_checked.png b/tests/tests/holo/res/drawable-mdpi/holo_panel_switch_checked.png
new file mode 100644
index 0000000..a5e17d3
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_panel_switch_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_panel_tabhost.png b/tests/tests/holo/res/drawable-mdpi/holo_panel_tabhost.png
new file mode 100644
index 0000000..6c1595c
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_panel_tabhost.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_panel_textview.png b/tests/tests/holo/res/drawable-mdpi/holo_panel_textview.png
new file mode 100644
index 0000000..1ccf89f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_panel_textview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_panel_timepicker.png b/tests/tests/holo/res/drawable-mdpi/holo_panel_timepicker.png
new file mode 100644
index 0000000..86802e3
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_panel_timepicker.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_panel_toggle_button.png b/tests/tests/holo/res/drawable-mdpi/holo_panel_toggle_button.png
new file mode 100644
index 0000000..948e1b8
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_panel_toggle_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_panel_toggle_button_checked.png b/tests/tests/holo/res/drawable-mdpi/holo_panel_toggle_button_checked.png
new file mode 100644
index 0000000..c89fae2
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_panel_toggle_button_checked.png
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_land_zoomcontrols.png b/tests/tests/holo/res/drawable-mdpi/holo_panel_zoomcontrols.png
similarity index 100%
copy from tests/res/drawable-mdpi/holo_land_zoomcontrols.png
copy to tests/tests/holo/res/drawable-mdpi/holo_panel_zoomcontrols.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_progressbar.png b/tests/tests/holo/res/drawable-mdpi/holo_progressbar.png
new file mode 100644
index 0000000..d027b03
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_progressbar.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_progressbar_horizontal_0.png b/tests/tests/holo/res/drawable-mdpi/holo_progressbar_horizontal_0.png
new file mode 100644
index 0000000..a73db14
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_progressbar_horizontal_0.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_progressbar_horizontal_100.png b/tests/tests/holo/res/drawable-mdpi/holo_progressbar_horizontal_100.png
new file mode 100644
index 0000000..2813c84
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_progressbar_horizontal_100.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_progressbar_horizontal_50.png b/tests/tests/holo/res/drawable-mdpi/holo_progressbar_horizontal_50.png
new file mode 100644
index 0000000..d5c65a9
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_progressbar_horizontal_50.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_progressbar_large.png b/tests/tests/holo/res/drawable-mdpi/holo_progressbar_large.png
new file mode 100644
index 0000000..50301a4
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_progressbar_large.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_progressbar_small.png b/tests/tests/holo/res/drawable-mdpi/holo_progressbar_small.png
new file mode 100644
index 0000000..1240e6a
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_progressbar_small.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_radio_button.png b/tests/tests/holo/res/drawable-mdpi/holo_radio_button.png
new file mode 100644
index 0000000..813b9ee
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_radio_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_radio_button_checked.png b/tests/tests/holo/res/drawable-mdpi/holo_radio_button_checked.png
new file mode 100644
index 0000000..ca4a1b7
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_radio_button_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_radiogroup_horizontal.png b/tests/tests/holo/res/drawable-mdpi/holo_radiogroup_horizontal.png
new file mode 100644
index 0000000..944e7a4
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_radiogroup_horizontal.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_radiogroup_vertical.png b/tests/tests/holo/res/drawable-mdpi/holo_radiogroup_vertical.png
new file mode 100644
index 0000000..e9aecf8
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_radiogroup_vertical.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_ratingbar_0.png b/tests/tests/holo/res/drawable-mdpi/holo_ratingbar_0.png
new file mode 100644
index 0000000..00a9aab
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_ratingbar_0.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_ratingbar_2point5.png b/tests/tests/holo/res/drawable-mdpi/holo_ratingbar_2point5.png
new file mode 100644
index 0000000..88725b1
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_ratingbar_2point5.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_ratingbar_5.png b/tests/tests/holo/res/drawable-mdpi/holo_ratingbar_5.png
new file mode 100644
index 0000000..f62fa44
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_ratingbar_5.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_searchview.png b/tests/tests/holo/res/drawable-mdpi/holo_searchview.png
new file mode 100644
index 0000000..06ec15b
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_searchview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_searchview_query.png b/tests/tests/holo/res/drawable-mdpi/holo_searchview_query.png
new file mode 100644
index 0000000..e6e3646
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_searchview_query.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_searchview_query_hint.png b/tests/tests/holo/res/drawable-mdpi/holo_searchview_query_hint.png
new file mode 100644
index 0000000..df6d421
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_searchview_query_hint.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_seekbar_0.png b/tests/tests/holo/res/drawable-mdpi/holo_seekbar_0.png
new file mode 100644
index 0000000..6ef0c71
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_seekbar_0.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_seekbar_100.png b/tests/tests/holo/res/drawable-mdpi/holo_seekbar_100.png
new file mode 100644
index 0000000..5be0453
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_seekbar_100.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_seekbar_50.png b/tests/tests/holo/res/drawable-mdpi/holo_seekbar_50.png
new file mode 100644
index 0000000..3ba6228
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_seekbar_50.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_spinner.png b/tests/tests/holo/res/drawable-mdpi/holo_spinner.png
new file mode 100644
index 0000000..7b14cc0
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_spinner.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_switch.png b/tests/tests/holo/res/drawable-mdpi/holo_switch.png
new file mode 100644
index 0000000..a1beda8
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_switch.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_switch_checked.png b/tests/tests/holo/res/drawable-mdpi/holo_switch_checked.png
new file mode 100644
index 0000000..a5e17d3
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_switch_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_tabhost.png b/tests/tests/holo/res/drawable-mdpi/holo_tabhost.png
new file mode 100644
index 0000000..6c1595c
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_tabhost.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_textview.png b/tests/tests/holo/res/drawable-mdpi/holo_textview.png
new file mode 100644
index 0000000..1ccf89f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_textview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_timepicker.png b/tests/tests/holo/res/drawable-mdpi/holo_timepicker.png
new file mode 100644
index 0000000..86802e3
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_timepicker.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_toggle_button.png b/tests/tests/holo/res/drawable-mdpi/holo_toggle_button.png
new file mode 100644
index 0000000..948e1b8
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_toggle_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_toggle_button_checked.png b/tests/tests/holo/res/drawable-mdpi/holo_toggle_button_checked.png
new file mode 100644
index 0000000..c89fae2
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_toggle_button_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_wallpaper_button.png b/tests/tests/holo/res/drawable-mdpi/holo_wallpaper_button.png
new file mode 100644
index 0000000..6d81450
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_wallpaper_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_wallpaper_calendar_view.png b/tests/tests/holo/res/drawable-mdpi/holo_wallpaper_calendar_view.png
new file mode 100644
index 0000000..50d00ab
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_wallpaper_calendar_view.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_wallpaper_calendar_view_feb.png b/tests/tests/holo/res/drawable-mdpi/holo_wallpaper_calendar_view_feb.png
new file mode 100644
index 0000000..aed3bc0
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_wallpaper_calendar_view_feb.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_wallpaper_checkbox.png b/tests/tests/holo/res/drawable-mdpi/holo_wallpaper_checkbox.png
new file mode 100644
index 0000000..63dc6ed
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_wallpaper_checkbox.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_wallpaper_checkbox_checked.png b/tests/tests/holo/res/drawable-mdpi/holo_wallpaper_checkbox_checked.png
new file mode 100644
index 0000000..a0f737c
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_wallpaper_checkbox_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_wallpaper_chronometer.png b/tests/tests/holo/res/drawable-mdpi/holo_wallpaper_chronometer.png
new file mode 100644
index 0000000..a4e7093
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_wallpaper_chronometer.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_wallpaper_color_blue_bright.png b/tests/tests/holo/res/drawable-mdpi/holo_wallpaper_color_blue_bright.png
new file mode 100644
index 0000000..fe1bdd7
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_wallpaper_color_blue_bright.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_wallpaper_color_blue_dark.png b/tests/tests/holo/res/drawable-mdpi/holo_wallpaper_color_blue_dark.png
new file mode 100644
index 0000000..f3f0640
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_wallpaper_color_blue_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_wallpaper_color_blue_light.png b/tests/tests/holo/res/drawable-mdpi/holo_wallpaper_color_blue_light.png
new file mode 100644
index 0000000..285d925
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_wallpaper_color_blue_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_wallpaper_color_green_dark.png b/tests/tests/holo/res/drawable-mdpi/holo_wallpaper_color_green_dark.png
new file mode 100644
index 0000000..cfbbdd4
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_wallpaper_color_green_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_wallpaper_color_green_light.png b/tests/tests/holo/res/drawable-mdpi/holo_wallpaper_color_green_light.png
new file mode 100644
index 0000000..a691827
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_wallpaper_color_green_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_wallpaper_color_orange_dark.png b/tests/tests/holo/res/drawable-mdpi/holo_wallpaper_color_orange_dark.png
new file mode 100644
index 0000000..3f0e99a
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_wallpaper_color_orange_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_wallpaper_color_orange_light.png b/tests/tests/holo/res/drawable-mdpi/holo_wallpaper_color_orange_light.png
new file mode 100644
index 0000000..f54fd64
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_wallpaper_color_orange_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_wallpaper_color_purple.png b/tests/tests/holo/res/drawable-mdpi/holo_wallpaper_color_purple.png
new file mode 100644
index 0000000..15c9494
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_wallpaper_color_purple.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_wallpaper_color_red_dark.png b/tests/tests/holo/res/drawable-mdpi/holo_wallpaper_color_red_dark.png
new file mode 100644
index 0000000..de3385d
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_wallpaper_color_red_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_wallpaper_color_red_light.png b/tests/tests/holo/res/drawable-mdpi/holo_wallpaper_color_red_light.png
new file mode 100644
index 0000000..dde4043
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_wallpaper_color_red_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_wallpaper_edittext.png b/tests/tests/holo/res/drawable-mdpi/holo_wallpaper_edittext.png
new file mode 100644
index 0000000..6fabb7e
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_wallpaper_edittext.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_wallpaper_notitlebar_button.png b/tests/tests/holo/res/drawable-mdpi/holo_wallpaper_notitlebar_button.png
new file mode 100644
index 0000000..6d81450
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_wallpaper_notitlebar_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_wallpaper_notitlebar_calendar_view.png b/tests/tests/holo/res/drawable-mdpi/holo_wallpaper_notitlebar_calendar_view.png
new file mode 100644
index 0000000..50d00ab
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_wallpaper_notitlebar_calendar_view.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_wallpaper_notitlebar_calendar_view_feb.png b/tests/tests/holo/res/drawable-mdpi/holo_wallpaper_notitlebar_calendar_view_feb.png
new file mode 100644
index 0000000..aed3bc0
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_wallpaper_notitlebar_calendar_view_feb.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_wallpaper_notitlebar_checkbox.png b/tests/tests/holo/res/drawable-mdpi/holo_wallpaper_notitlebar_checkbox.png
new file mode 100644
index 0000000..63dc6ed
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_wallpaper_notitlebar_checkbox.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_wallpaper_notitlebar_checkbox_checked.png b/tests/tests/holo/res/drawable-mdpi/holo_wallpaper_notitlebar_checkbox_checked.png
new file mode 100644
index 0000000..a0f737c
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_wallpaper_notitlebar_checkbox_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_wallpaper_notitlebar_chronometer.png b/tests/tests/holo/res/drawable-mdpi/holo_wallpaper_notitlebar_chronometer.png
new file mode 100644
index 0000000..a4e7093
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_wallpaper_notitlebar_chronometer.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_wallpaper_notitlebar_color_blue_bright.png b/tests/tests/holo/res/drawable-mdpi/holo_wallpaper_notitlebar_color_blue_bright.png
new file mode 100644
index 0000000..fe1bdd7
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_wallpaper_notitlebar_color_blue_bright.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_wallpaper_notitlebar_color_blue_dark.png b/tests/tests/holo/res/drawable-mdpi/holo_wallpaper_notitlebar_color_blue_dark.png
new file mode 100644
index 0000000..f3f0640
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_wallpaper_notitlebar_color_blue_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_wallpaper_notitlebar_color_blue_light.png b/tests/tests/holo/res/drawable-mdpi/holo_wallpaper_notitlebar_color_blue_light.png
new file mode 100644
index 0000000..285d925
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_wallpaper_notitlebar_color_blue_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_wallpaper_notitlebar_color_green_dark.png b/tests/tests/holo/res/drawable-mdpi/holo_wallpaper_notitlebar_color_green_dark.png
new file mode 100644
index 0000000..cfbbdd4
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_wallpaper_notitlebar_color_green_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_wallpaper_notitlebar_color_green_light.png b/tests/tests/holo/res/drawable-mdpi/holo_wallpaper_notitlebar_color_green_light.png
new file mode 100644
index 0000000..a691827
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_wallpaper_notitlebar_color_green_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_wallpaper_notitlebar_color_orange_dark.png b/tests/tests/holo/res/drawable-mdpi/holo_wallpaper_notitlebar_color_orange_dark.png
new file mode 100644
index 0000000..3f0e99a
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_wallpaper_notitlebar_color_orange_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_wallpaper_notitlebar_color_orange_light.png b/tests/tests/holo/res/drawable-mdpi/holo_wallpaper_notitlebar_color_orange_light.png
new file mode 100644
index 0000000..f54fd64
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_wallpaper_notitlebar_color_orange_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_wallpaper_notitlebar_color_purple.png b/tests/tests/holo/res/drawable-mdpi/holo_wallpaper_notitlebar_color_purple.png
new file mode 100644
index 0000000..15c9494
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_wallpaper_notitlebar_color_purple.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_wallpaper_notitlebar_color_red_dark.png b/tests/tests/holo/res/drawable-mdpi/holo_wallpaper_notitlebar_color_red_dark.png
new file mode 100644
index 0000000..de3385d
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_wallpaper_notitlebar_color_red_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_wallpaper_notitlebar_color_red_light.png b/tests/tests/holo/res/drawable-mdpi/holo_wallpaper_notitlebar_color_red_light.png
new file mode 100644
index 0000000..dde4043
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_wallpaper_notitlebar_color_red_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_wallpaper_notitlebar_edittext.png b/tests/tests/holo/res/drawable-mdpi/holo_wallpaper_notitlebar_edittext.png
new file mode 100644
index 0000000..6fabb7e
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_wallpaper_notitlebar_edittext.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_wallpaper_notitlebar_progressbar.png b/tests/tests/holo/res/drawable-mdpi/holo_wallpaper_notitlebar_progressbar.png
new file mode 100644
index 0000000..d027b03
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_wallpaper_notitlebar_progressbar.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_wallpaper_notitlebar_progressbar_horizontal_0.png b/tests/tests/holo/res/drawable-mdpi/holo_wallpaper_notitlebar_progressbar_horizontal_0.png
new file mode 100644
index 0000000..a73db14
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_wallpaper_notitlebar_progressbar_horizontal_0.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_wallpaper_notitlebar_progressbar_horizontal_100.png b/tests/tests/holo/res/drawable-mdpi/holo_wallpaper_notitlebar_progressbar_horizontal_100.png
new file mode 100644
index 0000000..2813c84
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_wallpaper_notitlebar_progressbar_horizontal_100.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_wallpaper_notitlebar_progressbar_horizontal_50.png b/tests/tests/holo/res/drawable-mdpi/holo_wallpaper_notitlebar_progressbar_horizontal_50.png
new file mode 100644
index 0000000..d5c65a9
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_wallpaper_notitlebar_progressbar_horizontal_50.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_wallpaper_notitlebar_progressbar_large.png b/tests/tests/holo/res/drawable-mdpi/holo_wallpaper_notitlebar_progressbar_large.png
new file mode 100644
index 0000000..50301a4
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_wallpaper_notitlebar_progressbar_large.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_wallpaper_notitlebar_progressbar_small.png b/tests/tests/holo/res/drawable-mdpi/holo_wallpaper_notitlebar_progressbar_small.png
new file mode 100644
index 0000000..1240e6a
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_wallpaper_notitlebar_progressbar_small.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_wallpaper_notitlebar_radio_button.png b/tests/tests/holo/res/drawable-mdpi/holo_wallpaper_notitlebar_radio_button.png
new file mode 100644
index 0000000..813b9ee
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_wallpaper_notitlebar_radio_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_wallpaper_notitlebar_radio_button_checked.png b/tests/tests/holo/res/drawable-mdpi/holo_wallpaper_notitlebar_radio_button_checked.png
new file mode 100644
index 0000000..ca4a1b7
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_wallpaper_notitlebar_radio_button_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_wallpaper_notitlebar_radiogroup_horizontal.png b/tests/tests/holo/res/drawable-mdpi/holo_wallpaper_notitlebar_radiogroup_horizontal.png
new file mode 100644
index 0000000..944e7a4
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_wallpaper_notitlebar_radiogroup_horizontal.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_wallpaper_notitlebar_radiogroup_vertical.png b/tests/tests/holo/res/drawable-mdpi/holo_wallpaper_notitlebar_radiogroup_vertical.png
new file mode 100644
index 0000000..e9aecf8
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_wallpaper_notitlebar_radiogroup_vertical.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_wallpaper_notitlebar_ratingbar_0.png b/tests/tests/holo/res/drawable-mdpi/holo_wallpaper_notitlebar_ratingbar_0.png
new file mode 100644
index 0000000..00a9aab
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_wallpaper_notitlebar_ratingbar_0.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_wallpaper_notitlebar_ratingbar_2point5.png b/tests/tests/holo/res/drawable-mdpi/holo_wallpaper_notitlebar_ratingbar_2point5.png
new file mode 100644
index 0000000..88725b1
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_wallpaper_notitlebar_ratingbar_2point5.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_wallpaper_notitlebar_ratingbar_5.png b/tests/tests/holo/res/drawable-mdpi/holo_wallpaper_notitlebar_ratingbar_5.png
new file mode 100644
index 0000000..f62fa44
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_wallpaper_notitlebar_ratingbar_5.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_wallpaper_notitlebar_searchview.png b/tests/tests/holo/res/drawable-mdpi/holo_wallpaper_notitlebar_searchview.png
new file mode 100644
index 0000000..06ec15b
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_wallpaper_notitlebar_searchview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_wallpaper_notitlebar_searchview_query.png b/tests/tests/holo/res/drawable-mdpi/holo_wallpaper_notitlebar_searchview_query.png
new file mode 100644
index 0000000..e6e3646
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_wallpaper_notitlebar_searchview_query.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_wallpaper_notitlebar_searchview_query_hint.png b/tests/tests/holo/res/drawable-mdpi/holo_wallpaper_notitlebar_searchview_query_hint.png
new file mode 100644
index 0000000..df6d421
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_wallpaper_notitlebar_searchview_query_hint.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_wallpaper_notitlebar_seekbar_0.png b/tests/tests/holo/res/drawable-mdpi/holo_wallpaper_notitlebar_seekbar_0.png
new file mode 100644
index 0000000..6ef0c71
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_wallpaper_notitlebar_seekbar_0.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_wallpaper_notitlebar_seekbar_100.png b/tests/tests/holo/res/drawable-mdpi/holo_wallpaper_notitlebar_seekbar_100.png
new file mode 100644
index 0000000..5be0453
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_wallpaper_notitlebar_seekbar_100.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_wallpaper_notitlebar_seekbar_50.png b/tests/tests/holo/res/drawable-mdpi/holo_wallpaper_notitlebar_seekbar_50.png
new file mode 100644
index 0000000..3ba6228
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_wallpaper_notitlebar_seekbar_50.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_wallpaper_notitlebar_spinner.png b/tests/tests/holo/res/drawable-mdpi/holo_wallpaper_notitlebar_spinner.png
new file mode 100644
index 0000000..7b14cc0
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_wallpaper_notitlebar_spinner.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_wallpaper_notitlebar_switch.png b/tests/tests/holo/res/drawable-mdpi/holo_wallpaper_notitlebar_switch.png
new file mode 100644
index 0000000..a1beda8
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_wallpaper_notitlebar_switch.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_wallpaper_notitlebar_switch_checked.png b/tests/tests/holo/res/drawable-mdpi/holo_wallpaper_notitlebar_switch_checked.png
new file mode 100644
index 0000000..a5e17d3
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_wallpaper_notitlebar_switch_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_wallpaper_notitlebar_tabhost.png b/tests/tests/holo/res/drawable-mdpi/holo_wallpaper_notitlebar_tabhost.png
new file mode 100644
index 0000000..6c1595c
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_wallpaper_notitlebar_tabhost.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_wallpaper_notitlebar_textview.png b/tests/tests/holo/res/drawable-mdpi/holo_wallpaper_notitlebar_textview.png
new file mode 100644
index 0000000..1ccf89f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_wallpaper_notitlebar_textview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_wallpaper_notitlebar_timepicker.png b/tests/tests/holo/res/drawable-mdpi/holo_wallpaper_notitlebar_timepicker.png
new file mode 100644
index 0000000..86802e3
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_wallpaper_notitlebar_timepicker.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_wallpaper_notitlebar_toggle_button.png b/tests/tests/holo/res/drawable-mdpi/holo_wallpaper_notitlebar_toggle_button.png
new file mode 100644
index 0000000..948e1b8
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_wallpaper_notitlebar_toggle_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_wallpaper_notitlebar_toggle_button_checked.png b/tests/tests/holo/res/drawable-mdpi/holo_wallpaper_notitlebar_toggle_button_checked.png
new file mode 100644
index 0000000..c89fae2
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_wallpaper_notitlebar_toggle_button_checked.png
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_land_zoomcontrols.png b/tests/tests/holo/res/drawable-mdpi/holo_wallpaper_notitlebar_zoomcontrols.png
similarity index 100%
copy from tests/res/drawable-mdpi/holo_land_zoomcontrols.png
copy to tests/tests/holo/res/drawable-mdpi/holo_wallpaper_notitlebar_zoomcontrols.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_wallpaper_progressbar.png b/tests/tests/holo/res/drawable-mdpi/holo_wallpaper_progressbar.png
new file mode 100644
index 0000000..d027b03
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_wallpaper_progressbar.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_wallpaper_progressbar_horizontal_0.png b/tests/tests/holo/res/drawable-mdpi/holo_wallpaper_progressbar_horizontal_0.png
new file mode 100644
index 0000000..a73db14
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_wallpaper_progressbar_horizontal_0.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_wallpaper_progressbar_horizontal_100.png b/tests/tests/holo/res/drawable-mdpi/holo_wallpaper_progressbar_horizontal_100.png
new file mode 100644
index 0000000..2813c84
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_wallpaper_progressbar_horizontal_100.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_wallpaper_progressbar_horizontal_50.png b/tests/tests/holo/res/drawable-mdpi/holo_wallpaper_progressbar_horizontal_50.png
new file mode 100644
index 0000000..d5c65a9
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_wallpaper_progressbar_horizontal_50.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_wallpaper_progressbar_large.png b/tests/tests/holo/res/drawable-mdpi/holo_wallpaper_progressbar_large.png
new file mode 100644
index 0000000..50301a4
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_wallpaper_progressbar_large.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_wallpaper_progressbar_small.png b/tests/tests/holo/res/drawable-mdpi/holo_wallpaper_progressbar_small.png
new file mode 100644
index 0000000..1240e6a
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_wallpaper_progressbar_small.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_wallpaper_radio_button.png b/tests/tests/holo/res/drawable-mdpi/holo_wallpaper_radio_button.png
new file mode 100644
index 0000000..813b9ee
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_wallpaper_radio_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_wallpaper_radio_button_checked.png b/tests/tests/holo/res/drawable-mdpi/holo_wallpaper_radio_button_checked.png
new file mode 100644
index 0000000..ca4a1b7
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_wallpaper_radio_button_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_wallpaper_radiogroup_horizontal.png b/tests/tests/holo/res/drawable-mdpi/holo_wallpaper_radiogroup_horizontal.png
new file mode 100644
index 0000000..944e7a4
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_wallpaper_radiogroup_horizontal.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_wallpaper_radiogroup_vertical.png b/tests/tests/holo/res/drawable-mdpi/holo_wallpaper_radiogroup_vertical.png
new file mode 100644
index 0000000..e9aecf8
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_wallpaper_radiogroup_vertical.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_wallpaper_ratingbar_0.png b/tests/tests/holo/res/drawable-mdpi/holo_wallpaper_ratingbar_0.png
new file mode 100644
index 0000000..00a9aab
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_wallpaper_ratingbar_0.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_wallpaper_ratingbar_2point5.png b/tests/tests/holo/res/drawable-mdpi/holo_wallpaper_ratingbar_2point5.png
new file mode 100644
index 0000000..88725b1
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_wallpaper_ratingbar_2point5.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_wallpaper_ratingbar_5.png b/tests/tests/holo/res/drawable-mdpi/holo_wallpaper_ratingbar_5.png
new file mode 100644
index 0000000..f62fa44
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_wallpaper_ratingbar_5.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_wallpaper_searchview.png b/tests/tests/holo/res/drawable-mdpi/holo_wallpaper_searchview.png
new file mode 100644
index 0000000..06ec15b
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_wallpaper_searchview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_wallpaper_searchview_query.png b/tests/tests/holo/res/drawable-mdpi/holo_wallpaper_searchview_query.png
new file mode 100644
index 0000000..e6e3646
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_wallpaper_searchview_query.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_wallpaper_searchview_query_hint.png b/tests/tests/holo/res/drawable-mdpi/holo_wallpaper_searchview_query_hint.png
new file mode 100644
index 0000000..df6d421
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_wallpaper_searchview_query_hint.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_wallpaper_seekbar_0.png b/tests/tests/holo/res/drawable-mdpi/holo_wallpaper_seekbar_0.png
new file mode 100644
index 0000000..6ef0c71
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_wallpaper_seekbar_0.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_wallpaper_seekbar_100.png b/tests/tests/holo/res/drawable-mdpi/holo_wallpaper_seekbar_100.png
new file mode 100644
index 0000000..5be0453
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_wallpaper_seekbar_100.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_wallpaper_seekbar_50.png b/tests/tests/holo/res/drawable-mdpi/holo_wallpaper_seekbar_50.png
new file mode 100644
index 0000000..3ba6228
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_wallpaper_seekbar_50.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_wallpaper_spinner.png b/tests/tests/holo/res/drawable-mdpi/holo_wallpaper_spinner.png
new file mode 100644
index 0000000..7b14cc0
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_wallpaper_spinner.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_wallpaper_switch.png b/tests/tests/holo/res/drawable-mdpi/holo_wallpaper_switch.png
new file mode 100644
index 0000000..a1beda8
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_wallpaper_switch.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_wallpaper_switch_checked.png b/tests/tests/holo/res/drawable-mdpi/holo_wallpaper_switch_checked.png
new file mode 100644
index 0000000..a5e17d3
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_wallpaper_switch_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_wallpaper_tabhost.png b/tests/tests/holo/res/drawable-mdpi/holo_wallpaper_tabhost.png
new file mode 100644
index 0000000..6c1595c
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_wallpaper_tabhost.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_wallpaper_textview.png b/tests/tests/holo/res/drawable-mdpi/holo_wallpaper_textview.png
new file mode 100644
index 0000000..1ccf89f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_wallpaper_textview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_wallpaper_timepicker.png b/tests/tests/holo/res/drawable-mdpi/holo_wallpaper_timepicker.png
new file mode 100644
index 0000000..86802e3
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_wallpaper_timepicker.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_wallpaper_toggle_button.png b/tests/tests/holo/res/drawable-mdpi/holo_wallpaper_toggle_button.png
new file mode 100644
index 0000000..948e1b8
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_wallpaper_toggle_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-mdpi/holo_wallpaper_toggle_button_checked.png b/tests/tests/holo/res/drawable-mdpi/holo_wallpaper_toggle_button_checked.png
new file mode 100644
index 0000000..c89fae2
--- /dev/null
+++ b/tests/tests/holo/res/drawable-mdpi/holo_wallpaper_toggle_button_checked.png
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_land_zoomcontrols.png b/tests/tests/holo/res/drawable-mdpi/holo_wallpaper_zoomcontrols.png
similarity index 100%
copy from tests/res/drawable-mdpi/holo_land_zoomcontrols.png
copy to tests/tests/holo/res/drawable-mdpi/holo_wallpaper_zoomcontrols.png
Binary files differ
diff --git a/tests/res/drawable-mdpi/holo_land_zoomcontrols.png b/tests/tests/holo/res/drawable-mdpi/holo_zoomcontrols.png
similarity index 100%
rename from tests/res/drawable-mdpi/holo_land_zoomcontrols.png
rename to tests/tests/holo/res/drawable-mdpi/holo_zoomcontrols.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-sw600dp-mdpi/holo_dialog_minwidth_searchview.png b/tests/tests/holo/res/drawable-sw600dp-mdpi/holo_dialog_minwidth_searchview.png
new file mode 100644
index 0000000..d4ccda7
--- /dev/null
+++ b/tests/tests/holo/res/drawable-sw600dp-mdpi/holo_dialog_minwidth_searchview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-sw600dp-mdpi/holo_dialog_minwidth_tabhost.png b/tests/tests/holo/res/drawable-sw600dp-mdpi/holo_dialog_minwidth_tabhost.png
new file mode 100644
index 0000000..b5476b6
--- /dev/null
+++ b/tests/tests/holo/res/drawable-sw600dp-mdpi/holo_dialog_minwidth_tabhost.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-sw600dp-mdpi/holo_dialog_noactionbar_minwidth_searchview.png b/tests/tests/holo/res/drawable-sw600dp-mdpi/holo_dialog_noactionbar_minwidth_searchview.png
new file mode 100644
index 0000000..d4ccda7
--- /dev/null
+++ b/tests/tests/holo/res/drawable-sw600dp-mdpi/holo_dialog_noactionbar_minwidth_searchview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-sw600dp-mdpi/holo_dialog_noactionbar_minwidth_tabhost.png b/tests/tests/holo/res/drawable-sw600dp-mdpi/holo_dialog_noactionbar_minwidth_tabhost.png
new file mode 100644
index 0000000..b5476b6
--- /dev/null
+++ b/tests/tests/holo/res/drawable-sw600dp-mdpi/holo_dialog_noactionbar_minwidth_tabhost.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-sw600dp-mdpi/holo_dialog_noactionbar_searchview.png b/tests/tests/holo/res/drawable-sw600dp-mdpi/holo_dialog_noactionbar_searchview.png
new file mode 100644
index 0000000..d4ccda7
--- /dev/null
+++ b/tests/tests/holo/res/drawable-sw600dp-mdpi/holo_dialog_noactionbar_searchview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-sw600dp-mdpi/holo_dialog_noactionbar_tabhost.png b/tests/tests/holo/res/drawable-sw600dp-mdpi/holo_dialog_noactionbar_tabhost.png
new file mode 100644
index 0000000..b5476b6
--- /dev/null
+++ b/tests/tests/holo/res/drawable-sw600dp-mdpi/holo_dialog_noactionbar_tabhost.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-sw600dp-mdpi/holo_dialog_searchview.png b/tests/tests/holo/res/drawable-sw600dp-mdpi/holo_dialog_searchview.png
new file mode 100644
index 0000000..d4ccda7
--- /dev/null
+++ b/tests/tests/holo/res/drawable-sw600dp-mdpi/holo_dialog_searchview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-sw600dp-mdpi/holo_dialog_tabhost.png b/tests/tests/holo/res/drawable-sw600dp-mdpi/holo_dialog_tabhost.png
new file mode 100644
index 0000000..b5476b6
--- /dev/null
+++ b/tests/tests/holo/res/drawable-sw600dp-mdpi/holo_dialog_tabhost.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-sw600dp-mdpi/holo_dialogwhenlarge_noactionbar_searchview.png b/tests/tests/holo/res/drawable-sw600dp-mdpi/holo_dialogwhenlarge_noactionbar_searchview.png
new file mode 100644
index 0000000..d4ccda7
--- /dev/null
+++ b/tests/tests/holo/res/drawable-sw600dp-mdpi/holo_dialogwhenlarge_noactionbar_searchview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-sw600dp-mdpi/holo_dialogwhenlarge_noactionbar_tabhost.png b/tests/tests/holo/res/drawable-sw600dp-mdpi/holo_dialogwhenlarge_noactionbar_tabhost.png
new file mode 100644
index 0000000..b5476b6
--- /dev/null
+++ b/tests/tests/holo/res/drawable-sw600dp-mdpi/holo_dialogwhenlarge_noactionbar_tabhost.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-sw600dp-mdpi/holo_dialogwhenlarge_searchview.png b/tests/tests/holo/res/drawable-sw600dp-mdpi/holo_dialogwhenlarge_searchview.png
new file mode 100644
index 0000000..d4ccda7
--- /dev/null
+++ b/tests/tests/holo/res/drawable-sw600dp-mdpi/holo_dialogwhenlarge_searchview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-sw600dp-mdpi/holo_dialogwhenlarge_tabhost.png b/tests/tests/holo/res/drawable-sw600dp-mdpi/holo_dialogwhenlarge_tabhost.png
new file mode 100644
index 0000000..b5476b6
--- /dev/null
+++ b/tests/tests/holo/res/drawable-sw600dp-mdpi/holo_dialogwhenlarge_tabhost.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-sw600dp-mdpi/holo_inputmethod_searchview.png b/tests/tests/holo/res/drawable-sw600dp-mdpi/holo_inputmethod_searchview.png
new file mode 100644
index 0000000..5a30758
--- /dev/null
+++ b/tests/tests/holo/res/drawable-sw600dp-mdpi/holo_inputmethod_searchview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-sw600dp-mdpi/holo_inputmethod_tabhost.png b/tests/tests/holo/res/drawable-sw600dp-mdpi/holo_inputmethod_tabhost.png
new file mode 100644
index 0000000..df587bc
--- /dev/null
+++ b/tests/tests/holo/res/drawable-sw600dp-mdpi/holo_inputmethod_tabhost.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-sw600dp-mdpi/holo_light_darkactionbar_searchview.png b/tests/tests/holo/res/drawable-sw600dp-mdpi/holo_light_darkactionbar_searchview.png
new file mode 100644
index 0000000..5a30758
--- /dev/null
+++ b/tests/tests/holo/res/drawable-sw600dp-mdpi/holo_light_darkactionbar_searchview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-sw600dp-mdpi/holo_light_darkactionbar_tabhost.png b/tests/tests/holo/res/drawable-sw600dp-mdpi/holo_light_darkactionbar_tabhost.png
new file mode 100644
index 0000000..df587bc
--- /dev/null
+++ b/tests/tests/holo/res/drawable-sw600dp-mdpi/holo_light_darkactionbar_tabhost.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-sw600dp-mdpi/holo_light_dialog_minwidth_searchview.png b/tests/tests/holo/res/drawable-sw600dp-mdpi/holo_light_dialog_minwidth_searchview.png
new file mode 100644
index 0000000..5a30758
--- /dev/null
+++ b/tests/tests/holo/res/drawable-sw600dp-mdpi/holo_light_dialog_minwidth_searchview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-sw600dp-mdpi/holo_light_dialog_minwidth_tabhost.png b/tests/tests/holo/res/drawable-sw600dp-mdpi/holo_light_dialog_minwidth_tabhost.png
new file mode 100644
index 0000000..df587bc
--- /dev/null
+++ b/tests/tests/holo/res/drawable-sw600dp-mdpi/holo_light_dialog_minwidth_tabhost.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-sw600dp-mdpi/holo_light_dialog_noactionbar_minwidth_searchview.png b/tests/tests/holo/res/drawable-sw600dp-mdpi/holo_light_dialog_noactionbar_minwidth_searchview.png
new file mode 100644
index 0000000..5a30758
--- /dev/null
+++ b/tests/tests/holo/res/drawable-sw600dp-mdpi/holo_light_dialog_noactionbar_minwidth_searchview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-sw600dp-mdpi/holo_light_dialog_noactionbar_minwidth_tabhost.png b/tests/tests/holo/res/drawable-sw600dp-mdpi/holo_light_dialog_noactionbar_minwidth_tabhost.png
new file mode 100644
index 0000000..df587bc
--- /dev/null
+++ b/tests/tests/holo/res/drawable-sw600dp-mdpi/holo_light_dialog_noactionbar_minwidth_tabhost.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-sw600dp-mdpi/holo_light_dialog_noactionbar_searchview.png b/tests/tests/holo/res/drawable-sw600dp-mdpi/holo_light_dialog_noactionbar_searchview.png
new file mode 100644
index 0000000..5a30758
--- /dev/null
+++ b/tests/tests/holo/res/drawable-sw600dp-mdpi/holo_light_dialog_noactionbar_searchview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-sw600dp-mdpi/holo_light_dialog_noactionbar_tabhost.png b/tests/tests/holo/res/drawable-sw600dp-mdpi/holo_light_dialog_noactionbar_tabhost.png
new file mode 100644
index 0000000..df587bc
--- /dev/null
+++ b/tests/tests/holo/res/drawable-sw600dp-mdpi/holo_light_dialog_noactionbar_tabhost.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-sw600dp-mdpi/holo_light_dialog_searchview.png b/tests/tests/holo/res/drawable-sw600dp-mdpi/holo_light_dialog_searchview.png
new file mode 100644
index 0000000..5a30758
--- /dev/null
+++ b/tests/tests/holo/res/drawable-sw600dp-mdpi/holo_light_dialog_searchview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-sw600dp-mdpi/holo_light_dialog_tabhost.png b/tests/tests/holo/res/drawable-sw600dp-mdpi/holo_light_dialog_tabhost.png
new file mode 100644
index 0000000..df587bc
--- /dev/null
+++ b/tests/tests/holo/res/drawable-sw600dp-mdpi/holo_light_dialog_tabhost.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-sw600dp-mdpi/holo_light_dialogwhenlarge_noactionbar_searchview.png b/tests/tests/holo/res/drawable-sw600dp-mdpi/holo_light_dialogwhenlarge_noactionbar_searchview.png
new file mode 100644
index 0000000..5a30758
--- /dev/null
+++ b/tests/tests/holo/res/drawable-sw600dp-mdpi/holo_light_dialogwhenlarge_noactionbar_searchview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-sw600dp-mdpi/holo_light_dialogwhenlarge_noactionbar_tabhost.png b/tests/tests/holo/res/drawable-sw600dp-mdpi/holo_light_dialogwhenlarge_noactionbar_tabhost.png
new file mode 100644
index 0000000..df587bc
--- /dev/null
+++ b/tests/tests/holo/res/drawable-sw600dp-mdpi/holo_light_dialogwhenlarge_noactionbar_tabhost.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-sw600dp-mdpi/holo_light_dialogwhenlarge_searchview.png b/tests/tests/holo/res/drawable-sw600dp-mdpi/holo_light_dialogwhenlarge_searchview.png
new file mode 100644
index 0000000..5a30758
--- /dev/null
+++ b/tests/tests/holo/res/drawable-sw600dp-mdpi/holo_light_dialogwhenlarge_searchview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-sw600dp-mdpi/holo_light_dialogwhenlarge_tabhost.png b/tests/tests/holo/res/drawable-sw600dp-mdpi/holo_light_dialogwhenlarge_tabhost.png
new file mode 100644
index 0000000..df587bc
--- /dev/null
+++ b/tests/tests/holo/res/drawable-sw600dp-mdpi/holo_light_dialogwhenlarge_tabhost.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-sw600dp-mdpi/holo_light_noactionbar_fullscreen_searchview.png b/tests/tests/holo/res/drawable-sw600dp-mdpi/holo_light_noactionbar_fullscreen_searchview.png
new file mode 100644
index 0000000..5a30758
--- /dev/null
+++ b/tests/tests/holo/res/drawable-sw600dp-mdpi/holo_light_noactionbar_fullscreen_searchview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-sw600dp-mdpi/holo_light_noactionbar_fullscreen_tabhost.png b/tests/tests/holo/res/drawable-sw600dp-mdpi/holo_light_noactionbar_fullscreen_tabhost.png
new file mode 100644
index 0000000..df587bc
--- /dev/null
+++ b/tests/tests/holo/res/drawable-sw600dp-mdpi/holo_light_noactionbar_fullscreen_tabhost.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-sw600dp-mdpi/holo_light_noactionbar_searchview.png b/tests/tests/holo/res/drawable-sw600dp-mdpi/holo_light_noactionbar_searchview.png
new file mode 100644
index 0000000..5a30758
--- /dev/null
+++ b/tests/tests/holo/res/drawable-sw600dp-mdpi/holo_light_noactionbar_searchview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-sw600dp-mdpi/holo_light_noactionbar_tabhost.png b/tests/tests/holo/res/drawable-sw600dp-mdpi/holo_light_noactionbar_tabhost.png
new file mode 100644
index 0000000..df587bc
--- /dev/null
+++ b/tests/tests/holo/res/drawable-sw600dp-mdpi/holo_light_noactionbar_tabhost.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-sw600dp-mdpi/holo_light_panel_searchview.png b/tests/tests/holo/res/drawable-sw600dp-mdpi/holo_light_panel_searchview.png
new file mode 100644
index 0000000..5a30758
--- /dev/null
+++ b/tests/tests/holo/res/drawable-sw600dp-mdpi/holo_light_panel_searchview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-sw600dp-mdpi/holo_light_panel_tabhost.png b/tests/tests/holo/res/drawable-sw600dp-mdpi/holo_light_panel_tabhost.png
new file mode 100644
index 0000000..df587bc
--- /dev/null
+++ b/tests/tests/holo/res/drawable-sw600dp-mdpi/holo_light_panel_tabhost.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-sw600dp-mdpi/holo_light_searchview.png b/tests/tests/holo/res/drawable-sw600dp-mdpi/holo_light_searchview.png
new file mode 100644
index 0000000..5a30758
--- /dev/null
+++ b/tests/tests/holo/res/drawable-sw600dp-mdpi/holo_light_searchview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-sw600dp-mdpi/holo_light_tabhost.png b/tests/tests/holo/res/drawable-sw600dp-mdpi/holo_light_tabhost.png
new file mode 100644
index 0000000..df587bc
--- /dev/null
+++ b/tests/tests/holo/res/drawable-sw600dp-mdpi/holo_light_tabhost.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-sw600dp-mdpi/holo_noactionbar_fullscreen_searchview.png b/tests/tests/holo/res/drawable-sw600dp-mdpi/holo_noactionbar_fullscreen_searchview.png
new file mode 100644
index 0000000..d4ccda7
--- /dev/null
+++ b/tests/tests/holo/res/drawable-sw600dp-mdpi/holo_noactionbar_fullscreen_searchview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-sw600dp-mdpi/holo_noactionbar_fullscreen_tabhost.png b/tests/tests/holo/res/drawable-sw600dp-mdpi/holo_noactionbar_fullscreen_tabhost.png
new file mode 100644
index 0000000..b5476b6
--- /dev/null
+++ b/tests/tests/holo/res/drawable-sw600dp-mdpi/holo_noactionbar_fullscreen_tabhost.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-sw600dp-mdpi/holo_noactionbar_searchview.png b/tests/tests/holo/res/drawable-sw600dp-mdpi/holo_noactionbar_searchview.png
new file mode 100644
index 0000000..d4ccda7
--- /dev/null
+++ b/tests/tests/holo/res/drawable-sw600dp-mdpi/holo_noactionbar_searchview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-sw600dp-mdpi/holo_noactionbar_tabhost.png b/tests/tests/holo/res/drawable-sw600dp-mdpi/holo_noactionbar_tabhost.png
new file mode 100644
index 0000000..b5476b6
--- /dev/null
+++ b/tests/tests/holo/res/drawable-sw600dp-mdpi/holo_noactionbar_tabhost.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-sw600dp-mdpi/holo_panel_searchview.png b/tests/tests/holo/res/drawable-sw600dp-mdpi/holo_panel_searchview.png
new file mode 100644
index 0000000..d4ccda7
--- /dev/null
+++ b/tests/tests/holo/res/drawable-sw600dp-mdpi/holo_panel_searchview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-sw600dp-mdpi/holo_panel_tabhost.png b/tests/tests/holo/res/drawable-sw600dp-mdpi/holo_panel_tabhost.png
new file mode 100644
index 0000000..b5476b6
--- /dev/null
+++ b/tests/tests/holo/res/drawable-sw600dp-mdpi/holo_panel_tabhost.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-sw600dp-mdpi/holo_searchview.png b/tests/tests/holo/res/drawable-sw600dp-mdpi/holo_searchview.png
new file mode 100644
index 0000000..d4ccda7
--- /dev/null
+++ b/tests/tests/holo/res/drawable-sw600dp-mdpi/holo_searchview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-sw600dp-mdpi/holo_tabhost.png b/tests/tests/holo/res/drawable-sw600dp-mdpi/holo_tabhost.png
new file mode 100644
index 0000000..b5476b6
--- /dev/null
+++ b/tests/tests/holo/res/drawable-sw600dp-mdpi/holo_tabhost.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-sw600dp-mdpi/holo_wallpaper_notitlebar_searchview.png b/tests/tests/holo/res/drawable-sw600dp-mdpi/holo_wallpaper_notitlebar_searchview.png
new file mode 100644
index 0000000..d4ccda7
--- /dev/null
+++ b/tests/tests/holo/res/drawable-sw600dp-mdpi/holo_wallpaper_notitlebar_searchview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-sw600dp-mdpi/holo_wallpaper_notitlebar_tabhost.png b/tests/tests/holo/res/drawable-sw600dp-mdpi/holo_wallpaper_notitlebar_tabhost.png
new file mode 100644
index 0000000..b5476b6
--- /dev/null
+++ b/tests/tests/holo/res/drawable-sw600dp-mdpi/holo_wallpaper_notitlebar_tabhost.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-sw600dp-mdpi/holo_wallpaper_searchview.png b/tests/tests/holo/res/drawable-sw600dp-mdpi/holo_wallpaper_searchview.png
new file mode 100644
index 0000000..d4ccda7
--- /dev/null
+++ b/tests/tests/holo/res/drawable-sw600dp-mdpi/holo_wallpaper_searchview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-sw600dp-mdpi/holo_wallpaper_tabhost.png b/tests/tests/holo/res/drawable-sw600dp-mdpi/holo_wallpaper_tabhost.png
new file mode 100644
index 0000000..b5476b6
--- /dev/null
+++ b/tests/tests/holo/res/drawable-sw600dp-mdpi/holo_wallpaper_tabhost.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_button.png b/tests/tests/holo/res/drawable-tvdpi/holo_button.png
new file mode 100644
index 0000000..415b686
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_button_pressed.png b/tests/tests/holo/res/drawable-tvdpi/holo_button_pressed.png
new file mode 100644
index 0000000..8ec08df
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_button_pressed.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_calendar_view.png b/tests/tests/holo/res/drawable-tvdpi/holo_calendar_view.png
new file mode 100644
index 0000000..9029d16
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_calendar_view.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_calendar_view_feb.png b/tests/tests/holo/res/drawable-tvdpi/holo_calendar_view_feb.png
new file mode 100644
index 0000000..f6682f0
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_calendar_view_feb.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_checkbox.png b/tests/tests/holo/res/drawable-tvdpi/holo_checkbox.png
new file mode 100644
index 0000000..d1d23c7
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_checkbox.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_checkbox_checked.png b/tests/tests/holo/res/drawable-tvdpi/holo_checkbox_checked.png
new file mode 100644
index 0000000..765dc1f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_checkbox_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_chronometer.png b/tests/tests/holo/res/drawable-tvdpi/holo_chronometer.png
new file mode 100644
index 0000000..6e2b2ca
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_chronometer.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_color_blue_bright.png b/tests/tests/holo/res/drawable-tvdpi/holo_color_blue_bright.png
new file mode 100644
index 0000000..ac9c0fb
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_color_blue_bright.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_color_blue_dark.png b/tests/tests/holo/res/drawable-tvdpi/holo_color_blue_dark.png
new file mode 100644
index 0000000..2a7cbb1
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_color_blue_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_color_blue_light.png b/tests/tests/holo/res/drawable-tvdpi/holo_color_blue_light.png
new file mode 100644
index 0000000..dd9df4e
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_color_blue_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_color_green_dark.png b/tests/tests/holo/res/drawable-tvdpi/holo_color_green_dark.png
new file mode 100644
index 0000000..3c8ed40
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_color_green_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_color_green_light.png b/tests/tests/holo/res/drawable-tvdpi/holo_color_green_light.png
new file mode 100644
index 0000000..f5bf1da
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_color_green_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_color_orange_dark.png b/tests/tests/holo/res/drawable-tvdpi/holo_color_orange_dark.png
new file mode 100644
index 0000000..f6a8a84
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_color_orange_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_color_orange_light.png b/tests/tests/holo/res/drawable-tvdpi/holo_color_orange_light.png
new file mode 100644
index 0000000..707642b
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_color_orange_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_color_purple.png b/tests/tests/holo/res/drawable-tvdpi/holo_color_purple.png
new file mode 100644
index 0000000..7eefbff
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_color_purple.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_color_red_dark.png b/tests/tests/holo/res/drawable-tvdpi/holo_color_red_dark.png
new file mode 100644
index 0000000..799dfbc
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_color_red_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_color_red_light.png b/tests/tests/holo/res/drawable-tvdpi/holo_color_red_light.png
new file mode 100644
index 0000000..5ec82eb
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_color_red_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_dialog_button.png b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_button.png
new file mode 100644
index 0000000..415b686
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_dialog_button_pressed.png b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_button_pressed.png
new file mode 100644
index 0000000..8ec08df
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_button_pressed.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_dialog_calendar_view.png b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_calendar_view.png
new file mode 100644
index 0000000..9029d16
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_calendar_view.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_dialog_calendar_view_feb.png b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_calendar_view_feb.png
new file mode 100644
index 0000000..f6682f0
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_calendar_view_feb.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_dialog_checkbox.png b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_checkbox.png
new file mode 100644
index 0000000..d1d23c7
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_checkbox.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_dialog_checkbox_checked.png b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_checkbox_checked.png
new file mode 100644
index 0000000..765dc1f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_checkbox_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_dialog_chronometer.png b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_chronometer.png
new file mode 100644
index 0000000..6e2b2ca
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_chronometer.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_dialog_color_blue_bright.png b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_color_blue_bright.png
new file mode 100644
index 0000000..ac9c0fb
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_color_blue_bright.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_dialog_color_blue_dark.png b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_color_blue_dark.png
new file mode 100644
index 0000000..2a7cbb1
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_color_blue_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_dialog_color_blue_light.png b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_color_blue_light.png
new file mode 100644
index 0000000..dd9df4e
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_color_blue_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_dialog_color_green_dark.png b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_color_green_dark.png
new file mode 100644
index 0000000..3c8ed40
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_color_green_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_dialog_color_green_light.png b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_color_green_light.png
new file mode 100644
index 0000000..f5bf1da
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_color_green_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_dialog_color_orange_dark.png b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_color_orange_dark.png
new file mode 100644
index 0000000..f6a8a84
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_color_orange_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_dialog_color_orange_light.png b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_color_orange_light.png
new file mode 100644
index 0000000..707642b
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_color_orange_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_dialog_color_purple.png b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_color_purple.png
new file mode 100644
index 0000000..7eefbff
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_color_purple.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_dialog_color_red_dark.png b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_color_red_dark.png
new file mode 100644
index 0000000..799dfbc
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_color_red_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_dialog_color_red_light.png b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_color_red_light.png
new file mode 100644
index 0000000..5ec82eb
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_color_red_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_dialog_edittext.png b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_edittext.png
new file mode 100644
index 0000000..b9c74da
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_edittext.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_dialog_minwidth_button.png b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_minwidth_button.png
new file mode 100644
index 0000000..415b686
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_minwidth_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_dialog_minwidth_button_pressed.png b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_minwidth_button_pressed.png
new file mode 100644
index 0000000..8ec08df
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_minwidth_button_pressed.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_dialog_minwidth_calendar_view.png b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_minwidth_calendar_view.png
new file mode 100644
index 0000000..9029d16
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_minwidth_calendar_view.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_dialog_minwidth_calendar_view_feb.png b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_minwidth_calendar_view_feb.png
new file mode 100644
index 0000000..f6682f0
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_minwidth_calendar_view_feb.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_dialog_minwidth_checkbox.png b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_minwidth_checkbox.png
new file mode 100644
index 0000000..d1d23c7
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_minwidth_checkbox.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_dialog_minwidth_checkbox_checked.png b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_minwidth_checkbox_checked.png
new file mode 100644
index 0000000..765dc1f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_minwidth_checkbox_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_dialog_minwidth_chronometer.png b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_minwidth_chronometer.png
new file mode 100644
index 0000000..6e2b2ca
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_minwidth_chronometer.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_dialog_minwidth_color_blue_bright.png b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_minwidth_color_blue_bright.png
new file mode 100644
index 0000000..ac9c0fb
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_minwidth_color_blue_bright.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_dialog_minwidth_color_blue_dark.png b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_minwidth_color_blue_dark.png
new file mode 100644
index 0000000..2a7cbb1
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_minwidth_color_blue_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_dialog_minwidth_color_blue_light.png b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_minwidth_color_blue_light.png
new file mode 100644
index 0000000..dd9df4e
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_minwidth_color_blue_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_dialog_minwidth_color_green_dark.png b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_minwidth_color_green_dark.png
new file mode 100644
index 0000000..3c8ed40
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_minwidth_color_green_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_dialog_minwidth_color_green_light.png b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_minwidth_color_green_light.png
new file mode 100644
index 0000000..f5bf1da
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_minwidth_color_green_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_dialog_minwidth_color_orange_dark.png b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_minwidth_color_orange_dark.png
new file mode 100644
index 0000000..f6a8a84
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_minwidth_color_orange_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_dialog_minwidth_color_orange_light.png b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_minwidth_color_orange_light.png
new file mode 100644
index 0000000..707642b
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_minwidth_color_orange_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_dialog_minwidth_color_purple.png b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_minwidth_color_purple.png
new file mode 100644
index 0000000..7eefbff
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_minwidth_color_purple.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_dialog_minwidth_color_red_dark.png b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_minwidth_color_red_dark.png
new file mode 100644
index 0000000..799dfbc
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_minwidth_color_red_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_dialog_minwidth_color_red_light.png b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_minwidth_color_red_light.png
new file mode 100644
index 0000000..5ec82eb
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_minwidth_color_red_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_dialog_minwidth_edittext.png b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_minwidth_edittext.png
new file mode 100644
index 0000000..b9c74da
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_minwidth_edittext.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_dialog_minwidth_progressbar.png b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_minwidth_progressbar.png
new file mode 100644
index 0000000..a5ca94f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_minwidth_progressbar.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_dialog_minwidth_progressbar_horizontal_0.png b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_minwidth_progressbar_horizontal_0.png
new file mode 100644
index 0000000..592bf27
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_minwidth_progressbar_horizontal_0.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_dialog_minwidth_progressbar_horizontal_100.png b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_minwidth_progressbar_horizontal_100.png
new file mode 100644
index 0000000..a68c5a0
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_minwidth_progressbar_horizontal_100.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_dialog_minwidth_progressbar_horizontal_50.png b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_minwidth_progressbar_horizontal_50.png
new file mode 100644
index 0000000..20965f7
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_minwidth_progressbar_horizontal_50.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_dialog_minwidth_progressbar_large.png b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_minwidth_progressbar_large.png
new file mode 100644
index 0000000..7482a47
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_minwidth_progressbar_large.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_dialog_minwidth_progressbar_small.png b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_minwidth_progressbar_small.png
new file mode 100644
index 0000000..e454f60
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_minwidth_progressbar_small.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_dialog_minwidth_radio_button.png b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_minwidth_radio_button.png
new file mode 100644
index 0000000..4c06326
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_minwidth_radio_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_dialog_minwidth_radio_button_checked.png b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_minwidth_radio_button_checked.png
new file mode 100644
index 0000000..ec14fb0
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_minwidth_radio_button_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_dialog_minwidth_radiogroup_horizontal.png b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_minwidth_radiogroup_horizontal.png
new file mode 100644
index 0000000..52122d8
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_minwidth_radiogroup_horizontal.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_dialog_minwidth_radiogroup_vertical.png b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_minwidth_radiogroup_vertical.png
new file mode 100644
index 0000000..f1b20be
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_minwidth_radiogroup_vertical.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_dialog_minwidth_ratingbar_0.png b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_minwidth_ratingbar_0.png
new file mode 100644
index 0000000..2816574
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_minwidth_ratingbar_0.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_dialog_minwidth_ratingbar_0_pressed.png b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_minwidth_ratingbar_0_pressed.png
new file mode 100644
index 0000000..c6943d2
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_minwidth_ratingbar_0_pressed.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_dialog_minwidth_ratingbar_2point5.png b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_minwidth_ratingbar_2point5.png
new file mode 100644
index 0000000..bdba081
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_minwidth_ratingbar_2point5.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_dialog_minwidth_ratingbar_2point5_pressed.png b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_minwidth_ratingbar_2point5_pressed.png
new file mode 100644
index 0000000..7f95415
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_minwidth_ratingbar_2point5_pressed.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_dialog_minwidth_ratingbar_5.png b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_minwidth_ratingbar_5.png
new file mode 100644
index 0000000..196404a
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_minwidth_ratingbar_5.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_dialog_minwidth_ratingbar_5_pressed.png b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_minwidth_ratingbar_5_pressed.png
new file mode 100644
index 0000000..6a21e3e
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_minwidth_ratingbar_5_pressed.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_dialog_minwidth_searchview.png b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_minwidth_searchview.png
new file mode 100644
index 0000000..fbf4ca0
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_minwidth_searchview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_dialog_minwidth_searchview_query.png b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_minwidth_searchview_query.png
new file mode 100644
index 0000000..6f437d9
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_minwidth_searchview_query.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_dialog_minwidth_searchview_query_hint.png b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_minwidth_searchview_query_hint.png
new file mode 100644
index 0000000..bbc8e92
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_minwidth_searchview_query_hint.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_dialog_minwidth_seekbar_0.png b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_minwidth_seekbar_0.png
new file mode 100644
index 0000000..b753e64
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_minwidth_seekbar_0.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_dialog_minwidth_seekbar_100.png b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_minwidth_seekbar_100.png
new file mode 100644
index 0000000..cbc2ffe
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_minwidth_seekbar_100.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_dialog_minwidth_seekbar_50.png b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_minwidth_seekbar_50.png
new file mode 100644
index 0000000..5e0370d
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_minwidth_seekbar_50.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_dialog_minwidth_spinner.png b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_minwidth_spinner.png
new file mode 100644
index 0000000..7824c9f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_minwidth_spinner.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_dialog_minwidth_switch.png b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_minwidth_switch.png
new file mode 100644
index 0000000..aa38e43
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_minwidth_switch.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_dialog_minwidth_switch_checked.png b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_minwidth_switch_checked.png
new file mode 100644
index 0000000..6c9fba9
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_minwidth_switch_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_dialog_minwidth_tabhost.png b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_minwidth_tabhost.png
new file mode 100644
index 0000000..17593a9
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_minwidth_tabhost.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_dialog_minwidth_textview.png b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_minwidth_textview.png
new file mode 100644
index 0000000..72df2cf
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_minwidth_textview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_dialog_minwidth_timepicker.png b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_minwidth_timepicker.png
new file mode 100644
index 0000000..72856ac
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_minwidth_timepicker.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_dialog_minwidth_toggle_button.png b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_minwidth_toggle_button.png
new file mode 100644
index 0000000..6129f1d
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_minwidth_toggle_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_dialog_minwidth_toggle_button_checked.png b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_minwidth_toggle_button_checked.png
new file mode 100644
index 0000000..779b70b
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_minwidth_toggle_button_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_dialog_minwidth_zoomcontrols.png b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_minwidth_zoomcontrols.png
new file mode 100644
index 0000000..6c2f5c5
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_minwidth_zoomcontrols.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_dialog_noactionbar_button.png b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_noactionbar_button.png
new file mode 100644
index 0000000..415b686
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_noactionbar_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_dialog_noactionbar_button_pressed.png b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_noactionbar_button_pressed.png
new file mode 100644
index 0000000..8ec08df
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_noactionbar_button_pressed.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_dialog_noactionbar_calendar_view.png b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_noactionbar_calendar_view.png
new file mode 100644
index 0000000..9029d16
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_noactionbar_calendar_view.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_dialog_noactionbar_calendar_view_feb.png b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_noactionbar_calendar_view_feb.png
new file mode 100644
index 0000000..f6682f0
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_noactionbar_calendar_view_feb.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_dialog_noactionbar_checkbox.png b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_noactionbar_checkbox.png
new file mode 100644
index 0000000..d1d23c7
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_noactionbar_checkbox.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_dialog_noactionbar_checkbox_checked.png b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_noactionbar_checkbox_checked.png
new file mode 100644
index 0000000..765dc1f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_noactionbar_checkbox_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_dialog_noactionbar_chronometer.png b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_noactionbar_chronometer.png
new file mode 100644
index 0000000..6e2b2ca
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_noactionbar_chronometer.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_dialog_noactionbar_color_blue_bright.png b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_noactionbar_color_blue_bright.png
new file mode 100644
index 0000000..ac9c0fb
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_noactionbar_color_blue_bright.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_dialog_noactionbar_color_blue_dark.png b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_noactionbar_color_blue_dark.png
new file mode 100644
index 0000000..2a7cbb1
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_noactionbar_color_blue_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_dialog_noactionbar_color_blue_light.png b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_noactionbar_color_blue_light.png
new file mode 100644
index 0000000..dd9df4e
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_noactionbar_color_blue_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_dialog_noactionbar_color_green_dark.png b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_noactionbar_color_green_dark.png
new file mode 100644
index 0000000..3c8ed40
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_noactionbar_color_green_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_dialog_noactionbar_color_green_light.png b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_noactionbar_color_green_light.png
new file mode 100644
index 0000000..f5bf1da
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_noactionbar_color_green_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_dialog_noactionbar_color_orange_dark.png b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_noactionbar_color_orange_dark.png
new file mode 100644
index 0000000..f6a8a84
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_noactionbar_color_orange_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_dialog_noactionbar_color_orange_light.png b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_noactionbar_color_orange_light.png
new file mode 100644
index 0000000..707642b
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_noactionbar_color_orange_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_dialog_noactionbar_color_purple.png b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_noactionbar_color_purple.png
new file mode 100644
index 0000000..7eefbff
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_noactionbar_color_purple.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_dialog_noactionbar_color_red_dark.png b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_noactionbar_color_red_dark.png
new file mode 100644
index 0000000..799dfbc
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_noactionbar_color_red_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_dialog_noactionbar_color_red_light.png b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_noactionbar_color_red_light.png
new file mode 100644
index 0000000..5ec82eb
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_noactionbar_color_red_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_dialog_noactionbar_edittext.png b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_noactionbar_edittext.png
new file mode 100644
index 0000000..b9c74da
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_noactionbar_edittext.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_dialog_noactionbar_minwidth_button.png b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_noactionbar_minwidth_button.png
new file mode 100644
index 0000000..415b686
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_noactionbar_minwidth_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_dialog_noactionbar_minwidth_button_pressed.png b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_noactionbar_minwidth_button_pressed.png
new file mode 100644
index 0000000..8ec08df
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_noactionbar_minwidth_button_pressed.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_dialog_noactionbar_minwidth_calendar_view.png b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_noactionbar_minwidth_calendar_view.png
new file mode 100644
index 0000000..9029d16
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_noactionbar_minwidth_calendar_view.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_dialog_noactionbar_minwidth_calendar_view_feb.png b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_noactionbar_minwidth_calendar_view_feb.png
new file mode 100644
index 0000000..f6682f0
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_noactionbar_minwidth_calendar_view_feb.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_dialog_noactionbar_minwidth_checkbox.png b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_noactionbar_minwidth_checkbox.png
new file mode 100644
index 0000000..d1d23c7
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_noactionbar_minwidth_checkbox.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_dialog_noactionbar_minwidth_checkbox_checked.png b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_noactionbar_minwidth_checkbox_checked.png
new file mode 100644
index 0000000..765dc1f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_noactionbar_minwidth_checkbox_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_dialog_noactionbar_minwidth_chronometer.png b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_noactionbar_minwidth_chronometer.png
new file mode 100644
index 0000000..6e2b2ca
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_noactionbar_minwidth_chronometer.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_dialog_noactionbar_minwidth_color_blue_bright.png b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_noactionbar_minwidth_color_blue_bright.png
new file mode 100644
index 0000000..ac9c0fb
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_noactionbar_minwidth_color_blue_bright.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_dialog_noactionbar_minwidth_color_blue_dark.png b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_noactionbar_minwidth_color_blue_dark.png
new file mode 100644
index 0000000..2a7cbb1
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_noactionbar_minwidth_color_blue_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_dialog_noactionbar_minwidth_color_blue_light.png b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_noactionbar_minwidth_color_blue_light.png
new file mode 100644
index 0000000..dd9df4e
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_noactionbar_minwidth_color_blue_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_dialog_noactionbar_minwidth_color_green_dark.png b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_noactionbar_minwidth_color_green_dark.png
new file mode 100644
index 0000000..3c8ed40
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_noactionbar_minwidth_color_green_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_dialog_noactionbar_minwidth_color_green_light.png b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_noactionbar_minwidth_color_green_light.png
new file mode 100644
index 0000000..f5bf1da
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_noactionbar_minwidth_color_green_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_dialog_noactionbar_minwidth_color_orange_dark.png b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_noactionbar_minwidth_color_orange_dark.png
new file mode 100644
index 0000000..f6a8a84
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_noactionbar_minwidth_color_orange_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_dialog_noactionbar_minwidth_color_orange_light.png b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_noactionbar_minwidth_color_orange_light.png
new file mode 100644
index 0000000..707642b
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_noactionbar_minwidth_color_orange_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_dialog_noactionbar_minwidth_color_purple.png b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_noactionbar_minwidth_color_purple.png
new file mode 100644
index 0000000..7eefbff
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_noactionbar_minwidth_color_purple.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_dialog_noactionbar_minwidth_color_red_dark.png b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_noactionbar_minwidth_color_red_dark.png
new file mode 100644
index 0000000..799dfbc
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_noactionbar_minwidth_color_red_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_dialog_noactionbar_minwidth_color_red_light.png b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_noactionbar_minwidth_color_red_light.png
new file mode 100644
index 0000000..5ec82eb
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_noactionbar_minwidth_color_red_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_dialog_noactionbar_minwidth_edittext.png b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_noactionbar_minwidth_edittext.png
new file mode 100644
index 0000000..b9c74da
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_noactionbar_minwidth_edittext.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_dialog_noactionbar_minwidth_progressbar.png b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_noactionbar_minwidth_progressbar.png
new file mode 100644
index 0000000..a5ca94f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_noactionbar_minwidth_progressbar.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_dialog_noactionbar_minwidth_progressbar_horizontal_0.png b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_noactionbar_minwidth_progressbar_horizontal_0.png
new file mode 100644
index 0000000..592bf27
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_noactionbar_minwidth_progressbar_horizontal_0.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_dialog_noactionbar_minwidth_progressbar_horizontal_100.png b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_noactionbar_minwidth_progressbar_horizontal_100.png
new file mode 100644
index 0000000..a68c5a0
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_noactionbar_minwidth_progressbar_horizontal_100.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_dialog_noactionbar_minwidth_progressbar_horizontal_50.png b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_noactionbar_minwidth_progressbar_horizontal_50.png
new file mode 100644
index 0000000..20965f7
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_noactionbar_minwidth_progressbar_horizontal_50.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_dialog_noactionbar_minwidth_progressbar_large.png b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_noactionbar_minwidth_progressbar_large.png
new file mode 100644
index 0000000..7482a47
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_noactionbar_minwidth_progressbar_large.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_dialog_noactionbar_minwidth_progressbar_small.png b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_noactionbar_minwidth_progressbar_small.png
new file mode 100644
index 0000000..e454f60
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_noactionbar_minwidth_progressbar_small.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_dialog_noactionbar_minwidth_radio_button.png b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_noactionbar_minwidth_radio_button.png
new file mode 100644
index 0000000..4c06326
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_noactionbar_minwidth_radio_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_dialog_noactionbar_minwidth_radio_button_checked.png b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_noactionbar_minwidth_radio_button_checked.png
new file mode 100644
index 0000000..ec14fb0
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_noactionbar_minwidth_radio_button_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_dialog_noactionbar_minwidth_radiogroup_horizontal.png b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_noactionbar_minwidth_radiogroup_horizontal.png
new file mode 100644
index 0000000..52122d8
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_noactionbar_minwidth_radiogroup_horizontal.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_dialog_noactionbar_minwidth_radiogroup_vertical.png b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_noactionbar_minwidth_radiogroup_vertical.png
new file mode 100644
index 0000000..f1b20be
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_noactionbar_minwidth_radiogroup_vertical.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_dialog_noactionbar_minwidth_ratingbar_0.png b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_noactionbar_minwidth_ratingbar_0.png
new file mode 100644
index 0000000..2816574
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_noactionbar_minwidth_ratingbar_0.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_dialog_noactionbar_minwidth_ratingbar_0_pressed.png b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_noactionbar_minwidth_ratingbar_0_pressed.png
new file mode 100644
index 0000000..c6943d2
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_noactionbar_minwidth_ratingbar_0_pressed.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_dialog_noactionbar_minwidth_ratingbar_2point5.png b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_noactionbar_minwidth_ratingbar_2point5.png
new file mode 100644
index 0000000..bdba081
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_noactionbar_minwidth_ratingbar_2point5.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_dialog_noactionbar_minwidth_ratingbar_2point5_pressed.png b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_noactionbar_minwidth_ratingbar_2point5_pressed.png
new file mode 100644
index 0000000..7f95415
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_noactionbar_minwidth_ratingbar_2point5_pressed.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_dialog_noactionbar_minwidth_ratingbar_5.png b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_noactionbar_minwidth_ratingbar_5.png
new file mode 100644
index 0000000..196404a
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_noactionbar_minwidth_ratingbar_5.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_dialog_noactionbar_minwidth_ratingbar_5_pressed.png b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_noactionbar_minwidth_ratingbar_5_pressed.png
new file mode 100644
index 0000000..6a21e3e
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_noactionbar_minwidth_ratingbar_5_pressed.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_dialog_noactionbar_minwidth_searchview.png b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_noactionbar_minwidth_searchview.png
new file mode 100644
index 0000000..fbf4ca0
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_noactionbar_minwidth_searchview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_dialog_noactionbar_minwidth_searchview_query.png b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_noactionbar_minwidth_searchview_query.png
new file mode 100644
index 0000000..6f437d9
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_noactionbar_minwidth_searchview_query.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_dialog_noactionbar_minwidth_searchview_query_hint.png b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_noactionbar_minwidth_searchview_query_hint.png
new file mode 100644
index 0000000..bbc8e92
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_noactionbar_minwidth_searchview_query_hint.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_dialog_noactionbar_minwidth_seekbar_0.png b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_noactionbar_minwidth_seekbar_0.png
new file mode 100644
index 0000000..b753e64
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_noactionbar_minwidth_seekbar_0.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_dialog_noactionbar_minwidth_seekbar_100.png b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_noactionbar_minwidth_seekbar_100.png
new file mode 100644
index 0000000..cbc2ffe
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_noactionbar_minwidth_seekbar_100.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_dialog_noactionbar_minwidth_seekbar_50.png b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_noactionbar_minwidth_seekbar_50.png
new file mode 100644
index 0000000..5e0370d
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_noactionbar_minwidth_seekbar_50.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_dialog_noactionbar_minwidth_spinner.png b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_noactionbar_minwidth_spinner.png
new file mode 100644
index 0000000..7824c9f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_noactionbar_minwidth_spinner.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_dialog_noactionbar_minwidth_switch.png b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_noactionbar_minwidth_switch.png
new file mode 100644
index 0000000..aa38e43
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_noactionbar_minwidth_switch.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_dialog_noactionbar_minwidth_switch_checked.png b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_noactionbar_minwidth_switch_checked.png
new file mode 100644
index 0000000..6c9fba9
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_noactionbar_minwidth_switch_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_dialog_noactionbar_minwidth_tabhost.png b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_noactionbar_minwidth_tabhost.png
new file mode 100644
index 0000000..17593a9
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_noactionbar_minwidth_tabhost.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_dialog_noactionbar_minwidth_textview.png b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_noactionbar_minwidth_textview.png
new file mode 100644
index 0000000..72df2cf
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_noactionbar_minwidth_textview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_dialog_noactionbar_minwidth_timepicker.png b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_noactionbar_minwidth_timepicker.png
new file mode 100644
index 0000000..72856ac
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_noactionbar_minwidth_timepicker.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_dialog_noactionbar_minwidth_toggle_button.png b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_noactionbar_minwidth_toggle_button.png
new file mode 100644
index 0000000..6129f1d
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_noactionbar_minwidth_toggle_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_dialog_noactionbar_minwidth_toggle_button_checked.png b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_noactionbar_minwidth_toggle_button_checked.png
new file mode 100644
index 0000000..779b70b
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_noactionbar_minwidth_toggle_button_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_dialog_noactionbar_minwidth_zoomcontrols.png b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_noactionbar_minwidth_zoomcontrols.png
new file mode 100644
index 0000000..6c2f5c5
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_noactionbar_minwidth_zoomcontrols.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_dialog_noactionbar_progressbar.png b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_noactionbar_progressbar.png
new file mode 100644
index 0000000..a5ca94f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_noactionbar_progressbar.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_dialog_noactionbar_progressbar_horizontal_0.png b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_noactionbar_progressbar_horizontal_0.png
new file mode 100644
index 0000000..592bf27
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_noactionbar_progressbar_horizontal_0.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_dialog_noactionbar_progressbar_horizontal_100.png b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_noactionbar_progressbar_horizontal_100.png
new file mode 100644
index 0000000..a68c5a0
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_noactionbar_progressbar_horizontal_100.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_dialog_noactionbar_progressbar_horizontal_50.png b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_noactionbar_progressbar_horizontal_50.png
new file mode 100644
index 0000000..20965f7
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_noactionbar_progressbar_horizontal_50.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_dialog_noactionbar_progressbar_large.png b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_noactionbar_progressbar_large.png
new file mode 100644
index 0000000..7482a47
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_noactionbar_progressbar_large.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_dialog_noactionbar_progressbar_small.png b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_noactionbar_progressbar_small.png
new file mode 100644
index 0000000..e454f60
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_noactionbar_progressbar_small.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_dialog_noactionbar_radio_button.png b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_noactionbar_radio_button.png
new file mode 100644
index 0000000..4c06326
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_noactionbar_radio_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_dialog_noactionbar_radio_button_checked.png b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_noactionbar_radio_button_checked.png
new file mode 100644
index 0000000..ec14fb0
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_noactionbar_radio_button_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_dialog_noactionbar_radiogroup_horizontal.png b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_noactionbar_radiogroup_horizontal.png
new file mode 100644
index 0000000..52122d8
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_noactionbar_radiogroup_horizontal.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_dialog_noactionbar_radiogroup_vertical.png b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_noactionbar_radiogroup_vertical.png
new file mode 100644
index 0000000..f1b20be
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_noactionbar_radiogroup_vertical.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_dialog_noactionbar_ratingbar_0.png b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_noactionbar_ratingbar_0.png
new file mode 100644
index 0000000..2816574
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_noactionbar_ratingbar_0.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_dialog_noactionbar_ratingbar_0_pressed.png b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_noactionbar_ratingbar_0_pressed.png
new file mode 100644
index 0000000..c6943d2
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_noactionbar_ratingbar_0_pressed.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_dialog_noactionbar_ratingbar_2point5.png b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_noactionbar_ratingbar_2point5.png
new file mode 100644
index 0000000..bdba081
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_noactionbar_ratingbar_2point5.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_dialog_noactionbar_ratingbar_2point5_pressed.png b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_noactionbar_ratingbar_2point5_pressed.png
new file mode 100644
index 0000000..7f95415
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_noactionbar_ratingbar_2point5_pressed.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_dialog_noactionbar_ratingbar_5.png b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_noactionbar_ratingbar_5.png
new file mode 100644
index 0000000..196404a
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_noactionbar_ratingbar_5.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_dialog_noactionbar_ratingbar_5_pressed.png b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_noactionbar_ratingbar_5_pressed.png
new file mode 100644
index 0000000..6a21e3e
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_noactionbar_ratingbar_5_pressed.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_dialog_noactionbar_searchview.png b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_noactionbar_searchview.png
new file mode 100644
index 0000000..fbf4ca0
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_noactionbar_searchview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_dialog_noactionbar_searchview_query.png b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_noactionbar_searchview_query.png
new file mode 100644
index 0000000..6f437d9
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_noactionbar_searchview_query.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_dialog_noactionbar_searchview_query_hint.png b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_noactionbar_searchview_query_hint.png
new file mode 100644
index 0000000..bbc8e92
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_noactionbar_searchview_query_hint.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_dialog_noactionbar_seekbar_0.png b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_noactionbar_seekbar_0.png
new file mode 100644
index 0000000..b753e64
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_noactionbar_seekbar_0.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_dialog_noactionbar_seekbar_100.png b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_noactionbar_seekbar_100.png
new file mode 100644
index 0000000..cbc2ffe
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_noactionbar_seekbar_100.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_dialog_noactionbar_seekbar_50.png b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_noactionbar_seekbar_50.png
new file mode 100644
index 0000000..5e0370d
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_noactionbar_seekbar_50.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_dialog_noactionbar_spinner.png b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_noactionbar_spinner.png
new file mode 100644
index 0000000..7824c9f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_noactionbar_spinner.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_dialog_noactionbar_switch.png b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_noactionbar_switch.png
new file mode 100644
index 0000000..aa38e43
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_noactionbar_switch.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_dialog_noactionbar_switch_checked.png b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_noactionbar_switch_checked.png
new file mode 100644
index 0000000..6c9fba9
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_noactionbar_switch_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_dialog_noactionbar_tabhost.png b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_noactionbar_tabhost.png
new file mode 100644
index 0000000..17593a9
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_noactionbar_tabhost.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_dialog_noactionbar_textview.png b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_noactionbar_textview.png
new file mode 100644
index 0000000..72df2cf
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_noactionbar_textview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_dialog_noactionbar_timepicker.png b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_noactionbar_timepicker.png
new file mode 100644
index 0000000..72856ac
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_noactionbar_timepicker.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_dialog_noactionbar_toggle_button.png b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_noactionbar_toggle_button.png
new file mode 100644
index 0000000..6129f1d
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_noactionbar_toggle_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_dialog_noactionbar_toggle_button_checked.png b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_noactionbar_toggle_button_checked.png
new file mode 100644
index 0000000..779b70b
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_noactionbar_toggle_button_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_dialog_noactionbar_zoomcontrols.png b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_noactionbar_zoomcontrols.png
new file mode 100644
index 0000000..6c2f5c5
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_noactionbar_zoomcontrols.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_dialog_progressbar.png b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_progressbar.png
new file mode 100644
index 0000000..a5ca94f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_progressbar.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_dialog_progressbar_horizontal_0.png b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_progressbar_horizontal_0.png
new file mode 100644
index 0000000..592bf27
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_progressbar_horizontal_0.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_dialog_progressbar_horizontal_100.png b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_progressbar_horizontal_100.png
new file mode 100644
index 0000000..a68c5a0
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_progressbar_horizontal_100.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_dialog_progressbar_horizontal_50.png b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_progressbar_horizontal_50.png
new file mode 100644
index 0000000..20965f7
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_progressbar_horizontal_50.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_dialog_progressbar_large.png b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_progressbar_large.png
new file mode 100644
index 0000000..7482a47
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_progressbar_large.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_dialog_progressbar_small.png b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_progressbar_small.png
new file mode 100644
index 0000000..e454f60
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_progressbar_small.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_dialog_radio_button.png b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_radio_button.png
new file mode 100644
index 0000000..4c06326
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_radio_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_dialog_radio_button_checked.png b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_radio_button_checked.png
new file mode 100644
index 0000000..ec14fb0
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_radio_button_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_dialog_radiogroup_horizontal.png b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_radiogroup_horizontal.png
new file mode 100644
index 0000000..52122d8
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_radiogroup_horizontal.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_dialog_radiogroup_vertical.png b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_radiogroup_vertical.png
new file mode 100644
index 0000000..f1b20be
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_radiogroup_vertical.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_dialog_ratingbar_0.png b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_ratingbar_0.png
new file mode 100644
index 0000000..2816574
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_ratingbar_0.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_dialog_ratingbar_0_pressed.png b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_ratingbar_0_pressed.png
new file mode 100644
index 0000000..c6943d2
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_ratingbar_0_pressed.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_dialog_ratingbar_2point5.png b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_ratingbar_2point5.png
new file mode 100644
index 0000000..bdba081
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_ratingbar_2point5.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_dialog_ratingbar_2point5_pressed.png b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_ratingbar_2point5_pressed.png
new file mode 100644
index 0000000..7f95415
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_ratingbar_2point5_pressed.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_dialog_ratingbar_5.png b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_ratingbar_5.png
new file mode 100644
index 0000000..196404a
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_ratingbar_5.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_dialog_ratingbar_5_pressed.png b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_ratingbar_5_pressed.png
new file mode 100644
index 0000000..6a21e3e
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_ratingbar_5_pressed.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_dialog_searchview.png b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_searchview.png
new file mode 100644
index 0000000..fbf4ca0
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_searchview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_dialog_searchview_query.png b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_searchview_query.png
new file mode 100644
index 0000000..6f437d9
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_searchview_query.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_dialog_searchview_query_hint.png b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_searchview_query_hint.png
new file mode 100644
index 0000000..bbc8e92
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_searchview_query_hint.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_dialog_seekbar_0.png b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_seekbar_0.png
new file mode 100644
index 0000000..b753e64
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_seekbar_0.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_dialog_seekbar_100.png b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_seekbar_100.png
new file mode 100644
index 0000000..cbc2ffe
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_seekbar_100.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_dialog_seekbar_50.png b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_seekbar_50.png
new file mode 100644
index 0000000..5e0370d
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_seekbar_50.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_dialog_spinner.png b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_spinner.png
new file mode 100644
index 0000000..7824c9f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_spinner.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_dialog_switch.png b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_switch.png
new file mode 100644
index 0000000..aa38e43
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_switch.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_dialog_switch_checked.png b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_switch_checked.png
new file mode 100644
index 0000000..6c9fba9
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_switch_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_dialog_tabhost.png b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_tabhost.png
new file mode 100644
index 0000000..17593a9
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_tabhost.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_dialog_textview.png b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_textview.png
new file mode 100644
index 0000000..72df2cf
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_textview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_dialog_timepicker.png b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_timepicker.png
new file mode 100644
index 0000000..72856ac
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_timepicker.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_dialog_toggle_button.png b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_toggle_button.png
new file mode 100644
index 0000000..6129f1d
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_toggle_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_dialog_toggle_button_checked.png b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_toggle_button_checked.png
new file mode 100644
index 0000000..779b70b
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_toggle_button_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_dialog_zoomcontrols.png b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_zoomcontrols.png
new file mode 100644
index 0000000..6c2f5c5
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_dialog_zoomcontrols.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_dialogwhenlarge_button.png b/tests/tests/holo/res/drawable-tvdpi/holo_dialogwhenlarge_button.png
new file mode 100644
index 0000000..415b686
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_dialogwhenlarge_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_dialogwhenlarge_button_pressed.png b/tests/tests/holo/res/drawable-tvdpi/holo_dialogwhenlarge_button_pressed.png
new file mode 100644
index 0000000..8ec08df
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_dialogwhenlarge_button_pressed.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_dialogwhenlarge_calendar_view.png b/tests/tests/holo/res/drawable-tvdpi/holo_dialogwhenlarge_calendar_view.png
new file mode 100644
index 0000000..9029d16
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_dialogwhenlarge_calendar_view.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_dialogwhenlarge_calendar_view_feb.png b/tests/tests/holo/res/drawable-tvdpi/holo_dialogwhenlarge_calendar_view_feb.png
new file mode 100644
index 0000000..f6682f0
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_dialogwhenlarge_calendar_view_feb.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_dialogwhenlarge_checkbox.png b/tests/tests/holo/res/drawable-tvdpi/holo_dialogwhenlarge_checkbox.png
new file mode 100644
index 0000000..d1d23c7
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_dialogwhenlarge_checkbox.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_dialogwhenlarge_checkbox_checked.png b/tests/tests/holo/res/drawable-tvdpi/holo_dialogwhenlarge_checkbox_checked.png
new file mode 100644
index 0000000..765dc1f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_dialogwhenlarge_checkbox_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_dialogwhenlarge_chronometer.png b/tests/tests/holo/res/drawable-tvdpi/holo_dialogwhenlarge_chronometer.png
new file mode 100644
index 0000000..6e2b2ca
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_dialogwhenlarge_chronometer.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_dialogwhenlarge_color_blue_bright.png b/tests/tests/holo/res/drawable-tvdpi/holo_dialogwhenlarge_color_blue_bright.png
new file mode 100644
index 0000000..ac9c0fb
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_dialogwhenlarge_color_blue_bright.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_dialogwhenlarge_color_blue_dark.png b/tests/tests/holo/res/drawable-tvdpi/holo_dialogwhenlarge_color_blue_dark.png
new file mode 100644
index 0000000..2a7cbb1
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_dialogwhenlarge_color_blue_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_dialogwhenlarge_color_blue_light.png b/tests/tests/holo/res/drawable-tvdpi/holo_dialogwhenlarge_color_blue_light.png
new file mode 100644
index 0000000..dd9df4e
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_dialogwhenlarge_color_blue_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_dialogwhenlarge_color_green_dark.png b/tests/tests/holo/res/drawable-tvdpi/holo_dialogwhenlarge_color_green_dark.png
new file mode 100644
index 0000000..3c8ed40
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_dialogwhenlarge_color_green_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_dialogwhenlarge_color_green_light.png b/tests/tests/holo/res/drawable-tvdpi/holo_dialogwhenlarge_color_green_light.png
new file mode 100644
index 0000000..f5bf1da
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_dialogwhenlarge_color_green_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_dialogwhenlarge_color_orange_dark.png b/tests/tests/holo/res/drawable-tvdpi/holo_dialogwhenlarge_color_orange_dark.png
new file mode 100644
index 0000000..f6a8a84
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_dialogwhenlarge_color_orange_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_dialogwhenlarge_color_orange_light.png b/tests/tests/holo/res/drawable-tvdpi/holo_dialogwhenlarge_color_orange_light.png
new file mode 100644
index 0000000..707642b
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_dialogwhenlarge_color_orange_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_dialogwhenlarge_color_purple.png b/tests/tests/holo/res/drawable-tvdpi/holo_dialogwhenlarge_color_purple.png
new file mode 100644
index 0000000..7eefbff
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_dialogwhenlarge_color_purple.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_dialogwhenlarge_color_red_dark.png b/tests/tests/holo/res/drawable-tvdpi/holo_dialogwhenlarge_color_red_dark.png
new file mode 100644
index 0000000..799dfbc
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_dialogwhenlarge_color_red_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_dialogwhenlarge_color_red_light.png b/tests/tests/holo/res/drawable-tvdpi/holo_dialogwhenlarge_color_red_light.png
new file mode 100644
index 0000000..5ec82eb
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_dialogwhenlarge_color_red_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_dialogwhenlarge_edittext.png b/tests/tests/holo/res/drawable-tvdpi/holo_dialogwhenlarge_edittext.png
new file mode 100644
index 0000000..b9c74da
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_dialogwhenlarge_edittext.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_dialogwhenlarge_noactionbar_button.png b/tests/tests/holo/res/drawable-tvdpi/holo_dialogwhenlarge_noactionbar_button.png
new file mode 100644
index 0000000..415b686
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_dialogwhenlarge_noactionbar_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_dialogwhenlarge_noactionbar_button_pressed.png b/tests/tests/holo/res/drawable-tvdpi/holo_dialogwhenlarge_noactionbar_button_pressed.png
new file mode 100644
index 0000000..8ec08df
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_dialogwhenlarge_noactionbar_button_pressed.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_dialogwhenlarge_noactionbar_calendar_view.png b/tests/tests/holo/res/drawable-tvdpi/holo_dialogwhenlarge_noactionbar_calendar_view.png
new file mode 100644
index 0000000..9029d16
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_dialogwhenlarge_noactionbar_calendar_view.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_dialogwhenlarge_noactionbar_calendar_view_feb.png b/tests/tests/holo/res/drawable-tvdpi/holo_dialogwhenlarge_noactionbar_calendar_view_feb.png
new file mode 100644
index 0000000..f6682f0
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_dialogwhenlarge_noactionbar_calendar_view_feb.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_dialogwhenlarge_noactionbar_checkbox.png b/tests/tests/holo/res/drawable-tvdpi/holo_dialogwhenlarge_noactionbar_checkbox.png
new file mode 100644
index 0000000..d1d23c7
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_dialogwhenlarge_noactionbar_checkbox.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_dialogwhenlarge_noactionbar_checkbox_checked.png b/tests/tests/holo/res/drawable-tvdpi/holo_dialogwhenlarge_noactionbar_checkbox_checked.png
new file mode 100644
index 0000000..765dc1f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_dialogwhenlarge_noactionbar_checkbox_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_dialogwhenlarge_noactionbar_chronometer.png b/tests/tests/holo/res/drawable-tvdpi/holo_dialogwhenlarge_noactionbar_chronometer.png
new file mode 100644
index 0000000..6e2b2ca
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_dialogwhenlarge_noactionbar_chronometer.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_dialogwhenlarge_noactionbar_color_blue_bright.png b/tests/tests/holo/res/drawable-tvdpi/holo_dialogwhenlarge_noactionbar_color_blue_bright.png
new file mode 100644
index 0000000..ac9c0fb
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_dialogwhenlarge_noactionbar_color_blue_bright.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_dialogwhenlarge_noactionbar_color_blue_dark.png b/tests/tests/holo/res/drawable-tvdpi/holo_dialogwhenlarge_noactionbar_color_blue_dark.png
new file mode 100644
index 0000000..2a7cbb1
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_dialogwhenlarge_noactionbar_color_blue_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_dialogwhenlarge_noactionbar_color_blue_light.png b/tests/tests/holo/res/drawable-tvdpi/holo_dialogwhenlarge_noactionbar_color_blue_light.png
new file mode 100644
index 0000000..dd9df4e
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_dialogwhenlarge_noactionbar_color_blue_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_dialogwhenlarge_noactionbar_color_green_dark.png b/tests/tests/holo/res/drawable-tvdpi/holo_dialogwhenlarge_noactionbar_color_green_dark.png
new file mode 100644
index 0000000..3c8ed40
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_dialogwhenlarge_noactionbar_color_green_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_dialogwhenlarge_noactionbar_color_green_light.png b/tests/tests/holo/res/drawable-tvdpi/holo_dialogwhenlarge_noactionbar_color_green_light.png
new file mode 100644
index 0000000..f5bf1da
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_dialogwhenlarge_noactionbar_color_green_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_dialogwhenlarge_noactionbar_color_orange_dark.png b/tests/tests/holo/res/drawable-tvdpi/holo_dialogwhenlarge_noactionbar_color_orange_dark.png
new file mode 100644
index 0000000..f6a8a84
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_dialogwhenlarge_noactionbar_color_orange_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_dialogwhenlarge_noactionbar_color_orange_light.png b/tests/tests/holo/res/drawable-tvdpi/holo_dialogwhenlarge_noactionbar_color_orange_light.png
new file mode 100644
index 0000000..707642b
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_dialogwhenlarge_noactionbar_color_orange_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_dialogwhenlarge_noactionbar_color_purple.png b/tests/tests/holo/res/drawable-tvdpi/holo_dialogwhenlarge_noactionbar_color_purple.png
new file mode 100644
index 0000000..7eefbff
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_dialogwhenlarge_noactionbar_color_purple.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_dialogwhenlarge_noactionbar_color_red_dark.png b/tests/tests/holo/res/drawable-tvdpi/holo_dialogwhenlarge_noactionbar_color_red_dark.png
new file mode 100644
index 0000000..799dfbc
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_dialogwhenlarge_noactionbar_color_red_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_dialogwhenlarge_noactionbar_color_red_light.png b/tests/tests/holo/res/drawable-tvdpi/holo_dialogwhenlarge_noactionbar_color_red_light.png
new file mode 100644
index 0000000..5ec82eb
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_dialogwhenlarge_noactionbar_color_red_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_dialogwhenlarge_noactionbar_edittext.png b/tests/tests/holo/res/drawable-tvdpi/holo_dialogwhenlarge_noactionbar_edittext.png
new file mode 100644
index 0000000..b9c74da
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_dialogwhenlarge_noactionbar_edittext.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_dialogwhenlarge_noactionbar_progressbar.png b/tests/tests/holo/res/drawable-tvdpi/holo_dialogwhenlarge_noactionbar_progressbar.png
new file mode 100644
index 0000000..a5ca94f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_dialogwhenlarge_noactionbar_progressbar.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_dialogwhenlarge_noactionbar_progressbar_horizontal_0.png b/tests/tests/holo/res/drawable-tvdpi/holo_dialogwhenlarge_noactionbar_progressbar_horizontal_0.png
new file mode 100644
index 0000000..592bf27
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_dialogwhenlarge_noactionbar_progressbar_horizontal_0.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_dialogwhenlarge_noactionbar_progressbar_horizontal_100.png b/tests/tests/holo/res/drawable-tvdpi/holo_dialogwhenlarge_noactionbar_progressbar_horizontal_100.png
new file mode 100644
index 0000000..a68c5a0
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_dialogwhenlarge_noactionbar_progressbar_horizontal_100.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_dialogwhenlarge_noactionbar_progressbar_horizontal_50.png b/tests/tests/holo/res/drawable-tvdpi/holo_dialogwhenlarge_noactionbar_progressbar_horizontal_50.png
new file mode 100644
index 0000000..20965f7
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_dialogwhenlarge_noactionbar_progressbar_horizontal_50.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_dialogwhenlarge_noactionbar_progressbar_large.png b/tests/tests/holo/res/drawable-tvdpi/holo_dialogwhenlarge_noactionbar_progressbar_large.png
new file mode 100644
index 0000000..7482a47
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_dialogwhenlarge_noactionbar_progressbar_large.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_dialogwhenlarge_noactionbar_progressbar_small.png b/tests/tests/holo/res/drawable-tvdpi/holo_dialogwhenlarge_noactionbar_progressbar_small.png
new file mode 100644
index 0000000..e454f60
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_dialogwhenlarge_noactionbar_progressbar_small.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_dialogwhenlarge_noactionbar_radio_button.png b/tests/tests/holo/res/drawable-tvdpi/holo_dialogwhenlarge_noactionbar_radio_button.png
new file mode 100644
index 0000000..4c06326
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_dialogwhenlarge_noactionbar_radio_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_dialogwhenlarge_noactionbar_radio_button_checked.png b/tests/tests/holo/res/drawable-tvdpi/holo_dialogwhenlarge_noactionbar_radio_button_checked.png
new file mode 100644
index 0000000..ec14fb0
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_dialogwhenlarge_noactionbar_radio_button_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_dialogwhenlarge_noactionbar_radiogroup_horizontal.png b/tests/tests/holo/res/drawable-tvdpi/holo_dialogwhenlarge_noactionbar_radiogroup_horizontal.png
new file mode 100644
index 0000000..52122d8
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_dialogwhenlarge_noactionbar_radiogroup_horizontal.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_dialogwhenlarge_noactionbar_radiogroup_vertical.png b/tests/tests/holo/res/drawable-tvdpi/holo_dialogwhenlarge_noactionbar_radiogroup_vertical.png
new file mode 100644
index 0000000..f1b20be
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_dialogwhenlarge_noactionbar_radiogroup_vertical.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_dialogwhenlarge_noactionbar_ratingbar_0.png b/tests/tests/holo/res/drawable-tvdpi/holo_dialogwhenlarge_noactionbar_ratingbar_0.png
new file mode 100644
index 0000000..2816574
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_dialogwhenlarge_noactionbar_ratingbar_0.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_dialogwhenlarge_noactionbar_ratingbar_0_pressed.png b/tests/tests/holo/res/drawable-tvdpi/holo_dialogwhenlarge_noactionbar_ratingbar_0_pressed.png
new file mode 100644
index 0000000..c6943d2
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_dialogwhenlarge_noactionbar_ratingbar_0_pressed.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_dialogwhenlarge_noactionbar_ratingbar_2point5.png b/tests/tests/holo/res/drawable-tvdpi/holo_dialogwhenlarge_noactionbar_ratingbar_2point5.png
new file mode 100644
index 0000000..bdba081
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_dialogwhenlarge_noactionbar_ratingbar_2point5.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_dialogwhenlarge_noactionbar_ratingbar_2point5_pressed.png b/tests/tests/holo/res/drawable-tvdpi/holo_dialogwhenlarge_noactionbar_ratingbar_2point5_pressed.png
new file mode 100644
index 0000000..7f95415
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_dialogwhenlarge_noactionbar_ratingbar_2point5_pressed.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_dialogwhenlarge_noactionbar_ratingbar_5.png b/tests/tests/holo/res/drawable-tvdpi/holo_dialogwhenlarge_noactionbar_ratingbar_5.png
new file mode 100644
index 0000000..196404a
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_dialogwhenlarge_noactionbar_ratingbar_5.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_dialogwhenlarge_noactionbar_ratingbar_5_pressed.png b/tests/tests/holo/res/drawable-tvdpi/holo_dialogwhenlarge_noactionbar_ratingbar_5_pressed.png
new file mode 100644
index 0000000..6a21e3e
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_dialogwhenlarge_noactionbar_ratingbar_5_pressed.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_dialogwhenlarge_noactionbar_searchview.png b/tests/tests/holo/res/drawable-tvdpi/holo_dialogwhenlarge_noactionbar_searchview.png
new file mode 100644
index 0000000..fbf4ca0
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_dialogwhenlarge_noactionbar_searchview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_dialogwhenlarge_noactionbar_searchview_query.png b/tests/tests/holo/res/drawable-tvdpi/holo_dialogwhenlarge_noactionbar_searchview_query.png
new file mode 100644
index 0000000..6f437d9
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_dialogwhenlarge_noactionbar_searchview_query.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_dialogwhenlarge_noactionbar_searchview_query_hint.png b/tests/tests/holo/res/drawable-tvdpi/holo_dialogwhenlarge_noactionbar_searchview_query_hint.png
new file mode 100644
index 0000000..bbc8e92
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_dialogwhenlarge_noactionbar_searchview_query_hint.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_dialogwhenlarge_noactionbar_seekbar_0.png b/tests/tests/holo/res/drawable-tvdpi/holo_dialogwhenlarge_noactionbar_seekbar_0.png
new file mode 100644
index 0000000..b753e64
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_dialogwhenlarge_noactionbar_seekbar_0.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_dialogwhenlarge_noactionbar_seekbar_100.png b/tests/tests/holo/res/drawable-tvdpi/holo_dialogwhenlarge_noactionbar_seekbar_100.png
new file mode 100644
index 0000000..cbc2ffe
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_dialogwhenlarge_noactionbar_seekbar_100.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_dialogwhenlarge_noactionbar_seekbar_50.png b/tests/tests/holo/res/drawable-tvdpi/holo_dialogwhenlarge_noactionbar_seekbar_50.png
new file mode 100644
index 0000000..5e0370d
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_dialogwhenlarge_noactionbar_seekbar_50.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_dialogwhenlarge_noactionbar_spinner.png b/tests/tests/holo/res/drawable-tvdpi/holo_dialogwhenlarge_noactionbar_spinner.png
new file mode 100644
index 0000000..7824c9f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_dialogwhenlarge_noactionbar_spinner.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_dialogwhenlarge_noactionbar_switch.png b/tests/tests/holo/res/drawable-tvdpi/holo_dialogwhenlarge_noactionbar_switch.png
new file mode 100644
index 0000000..aa38e43
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_dialogwhenlarge_noactionbar_switch.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_dialogwhenlarge_noactionbar_switch_checked.png b/tests/tests/holo/res/drawable-tvdpi/holo_dialogwhenlarge_noactionbar_switch_checked.png
new file mode 100644
index 0000000..6c9fba9
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_dialogwhenlarge_noactionbar_switch_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_dialogwhenlarge_noactionbar_tabhost.png b/tests/tests/holo/res/drawable-tvdpi/holo_dialogwhenlarge_noactionbar_tabhost.png
new file mode 100644
index 0000000..17593a9
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_dialogwhenlarge_noactionbar_tabhost.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_dialogwhenlarge_noactionbar_textview.png b/tests/tests/holo/res/drawable-tvdpi/holo_dialogwhenlarge_noactionbar_textview.png
new file mode 100644
index 0000000..72df2cf
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_dialogwhenlarge_noactionbar_textview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_dialogwhenlarge_noactionbar_timepicker.png b/tests/tests/holo/res/drawable-tvdpi/holo_dialogwhenlarge_noactionbar_timepicker.png
new file mode 100644
index 0000000..72856ac
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_dialogwhenlarge_noactionbar_timepicker.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_dialogwhenlarge_noactionbar_toggle_button.png b/tests/tests/holo/res/drawable-tvdpi/holo_dialogwhenlarge_noactionbar_toggle_button.png
new file mode 100644
index 0000000..6129f1d
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_dialogwhenlarge_noactionbar_toggle_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_dialogwhenlarge_noactionbar_toggle_button_checked.png b/tests/tests/holo/res/drawable-tvdpi/holo_dialogwhenlarge_noactionbar_toggle_button_checked.png
new file mode 100644
index 0000000..779b70b
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_dialogwhenlarge_noactionbar_toggle_button_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_dialogwhenlarge_noactionbar_zoomcontrols.png b/tests/tests/holo/res/drawable-tvdpi/holo_dialogwhenlarge_noactionbar_zoomcontrols.png
new file mode 100644
index 0000000..6c2f5c5
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_dialogwhenlarge_noactionbar_zoomcontrols.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_dialogwhenlarge_progressbar.png b/tests/tests/holo/res/drawable-tvdpi/holo_dialogwhenlarge_progressbar.png
new file mode 100644
index 0000000..a5ca94f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_dialogwhenlarge_progressbar.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_dialogwhenlarge_progressbar_horizontal_0.png b/tests/tests/holo/res/drawable-tvdpi/holo_dialogwhenlarge_progressbar_horizontal_0.png
new file mode 100644
index 0000000..592bf27
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_dialogwhenlarge_progressbar_horizontal_0.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_dialogwhenlarge_progressbar_horizontal_100.png b/tests/tests/holo/res/drawable-tvdpi/holo_dialogwhenlarge_progressbar_horizontal_100.png
new file mode 100644
index 0000000..a68c5a0
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_dialogwhenlarge_progressbar_horizontal_100.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_dialogwhenlarge_progressbar_horizontal_50.png b/tests/tests/holo/res/drawable-tvdpi/holo_dialogwhenlarge_progressbar_horizontal_50.png
new file mode 100644
index 0000000..20965f7
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_dialogwhenlarge_progressbar_horizontal_50.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_dialogwhenlarge_progressbar_large.png b/tests/tests/holo/res/drawable-tvdpi/holo_dialogwhenlarge_progressbar_large.png
new file mode 100644
index 0000000..7482a47
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_dialogwhenlarge_progressbar_large.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_dialogwhenlarge_progressbar_small.png b/tests/tests/holo/res/drawable-tvdpi/holo_dialogwhenlarge_progressbar_small.png
new file mode 100644
index 0000000..e454f60
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_dialogwhenlarge_progressbar_small.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_dialogwhenlarge_radio_button.png b/tests/tests/holo/res/drawable-tvdpi/holo_dialogwhenlarge_radio_button.png
new file mode 100644
index 0000000..4c06326
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_dialogwhenlarge_radio_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_dialogwhenlarge_radio_button_checked.png b/tests/tests/holo/res/drawable-tvdpi/holo_dialogwhenlarge_radio_button_checked.png
new file mode 100644
index 0000000..ec14fb0
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_dialogwhenlarge_radio_button_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_dialogwhenlarge_radiogroup_horizontal.png b/tests/tests/holo/res/drawable-tvdpi/holo_dialogwhenlarge_radiogroup_horizontal.png
new file mode 100644
index 0000000..52122d8
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_dialogwhenlarge_radiogroup_horizontal.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_dialogwhenlarge_radiogroup_vertical.png b/tests/tests/holo/res/drawable-tvdpi/holo_dialogwhenlarge_radiogroup_vertical.png
new file mode 100644
index 0000000..f1b20be
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_dialogwhenlarge_radiogroup_vertical.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_dialogwhenlarge_ratingbar_0.png b/tests/tests/holo/res/drawable-tvdpi/holo_dialogwhenlarge_ratingbar_0.png
new file mode 100644
index 0000000..2816574
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_dialogwhenlarge_ratingbar_0.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_dialogwhenlarge_ratingbar_0_pressed.png b/tests/tests/holo/res/drawable-tvdpi/holo_dialogwhenlarge_ratingbar_0_pressed.png
new file mode 100644
index 0000000..c6943d2
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_dialogwhenlarge_ratingbar_0_pressed.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_dialogwhenlarge_ratingbar_2point5.png b/tests/tests/holo/res/drawable-tvdpi/holo_dialogwhenlarge_ratingbar_2point5.png
new file mode 100644
index 0000000..bdba081
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_dialogwhenlarge_ratingbar_2point5.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_dialogwhenlarge_ratingbar_2point5_pressed.png b/tests/tests/holo/res/drawable-tvdpi/holo_dialogwhenlarge_ratingbar_2point5_pressed.png
new file mode 100644
index 0000000..7f95415
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_dialogwhenlarge_ratingbar_2point5_pressed.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_dialogwhenlarge_ratingbar_5.png b/tests/tests/holo/res/drawable-tvdpi/holo_dialogwhenlarge_ratingbar_5.png
new file mode 100644
index 0000000..196404a
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_dialogwhenlarge_ratingbar_5.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_dialogwhenlarge_ratingbar_5_pressed.png b/tests/tests/holo/res/drawable-tvdpi/holo_dialogwhenlarge_ratingbar_5_pressed.png
new file mode 100644
index 0000000..6a21e3e
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_dialogwhenlarge_ratingbar_5_pressed.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_dialogwhenlarge_searchview.png b/tests/tests/holo/res/drawable-tvdpi/holo_dialogwhenlarge_searchview.png
new file mode 100644
index 0000000..fbf4ca0
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_dialogwhenlarge_searchview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_dialogwhenlarge_searchview_query.png b/tests/tests/holo/res/drawable-tvdpi/holo_dialogwhenlarge_searchview_query.png
new file mode 100644
index 0000000..6f437d9
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_dialogwhenlarge_searchview_query.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_dialogwhenlarge_searchview_query_hint.png b/tests/tests/holo/res/drawable-tvdpi/holo_dialogwhenlarge_searchview_query_hint.png
new file mode 100644
index 0000000..bbc8e92
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_dialogwhenlarge_searchview_query_hint.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_dialogwhenlarge_seekbar_0.png b/tests/tests/holo/res/drawable-tvdpi/holo_dialogwhenlarge_seekbar_0.png
new file mode 100644
index 0000000..b753e64
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_dialogwhenlarge_seekbar_0.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_dialogwhenlarge_seekbar_100.png b/tests/tests/holo/res/drawable-tvdpi/holo_dialogwhenlarge_seekbar_100.png
new file mode 100644
index 0000000..cbc2ffe
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_dialogwhenlarge_seekbar_100.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_dialogwhenlarge_seekbar_50.png b/tests/tests/holo/res/drawable-tvdpi/holo_dialogwhenlarge_seekbar_50.png
new file mode 100644
index 0000000..5e0370d
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_dialogwhenlarge_seekbar_50.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_dialogwhenlarge_spinner.png b/tests/tests/holo/res/drawable-tvdpi/holo_dialogwhenlarge_spinner.png
new file mode 100644
index 0000000..7824c9f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_dialogwhenlarge_spinner.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_dialogwhenlarge_switch.png b/tests/tests/holo/res/drawable-tvdpi/holo_dialogwhenlarge_switch.png
new file mode 100644
index 0000000..aa38e43
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_dialogwhenlarge_switch.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_dialogwhenlarge_switch_checked.png b/tests/tests/holo/res/drawable-tvdpi/holo_dialogwhenlarge_switch_checked.png
new file mode 100644
index 0000000..6c9fba9
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_dialogwhenlarge_switch_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_dialogwhenlarge_tabhost.png b/tests/tests/holo/res/drawable-tvdpi/holo_dialogwhenlarge_tabhost.png
new file mode 100644
index 0000000..17593a9
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_dialogwhenlarge_tabhost.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_dialogwhenlarge_textview.png b/tests/tests/holo/res/drawable-tvdpi/holo_dialogwhenlarge_textview.png
new file mode 100644
index 0000000..72df2cf
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_dialogwhenlarge_textview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_dialogwhenlarge_timepicker.png b/tests/tests/holo/res/drawable-tvdpi/holo_dialogwhenlarge_timepicker.png
new file mode 100644
index 0000000..72856ac
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_dialogwhenlarge_timepicker.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_dialogwhenlarge_toggle_button.png b/tests/tests/holo/res/drawable-tvdpi/holo_dialogwhenlarge_toggle_button.png
new file mode 100644
index 0000000..6129f1d
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_dialogwhenlarge_toggle_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_dialogwhenlarge_toggle_button_checked.png b/tests/tests/holo/res/drawable-tvdpi/holo_dialogwhenlarge_toggle_button_checked.png
new file mode 100644
index 0000000..779b70b
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_dialogwhenlarge_toggle_button_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_dialogwhenlarge_zoomcontrols.png b/tests/tests/holo/res/drawable-tvdpi/holo_dialogwhenlarge_zoomcontrols.png
new file mode 100644
index 0000000..6c2f5c5
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_dialogwhenlarge_zoomcontrols.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_edittext.png b/tests/tests/holo/res/drawable-tvdpi/holo_edittext.png
new file mode 100644
index 0000000..b9c74da
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_edittext.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_inputmethod_button.png b/tests/tests/holo/res/drawable-tvdpi/holo_inputmethod_button.png
new file mode 100644
index 0000000..f81277b
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_inputmethod_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_inputmethod_button_pressed.png b/tests/tests/holo/res/drawable-tvdpi/holo_inputmethod_button_pressed.png
new file mode 100644
index 0000000..df04a11
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_inputmethod_button_pressed.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_inputmethod_calendar_view.png b/tests/tests/holo/res/drawable-tvdpi/holo_inputmethod_calendar_view.png
new file mode 100644
index 0000000..4d4616b
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_inputmethod_calendar_view.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_inputmethod_calendar_view_feb.png b/tests/tests/holo/res/drawable-tvdpi/holo_inputmethod_calendar_view_feb.png
new file mode 100644
index 0000000..afefcfb
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_inputmethod_calendar_view_feb.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_inputmethod_checkbox.png b/tests/tests/holo/res/drawable-tvdpi/holo_inputmethod_checkbox.png
new file mode 100644
index 0000000..f73c30c
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_inputmethod_checkbox.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_inputmethod_checkbox_checked.png b/tests/tests/holo/res/drawable-tvdpi/holo_inputmethod_checkbox_checked.png
new file mode 100644
index 0000000..290d08e
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_inputmethod_checkbox_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_inputmethod_chronometer.png b/tests/tests/holo/res/drawable-tvdpi/holo_inputmethod_chronometer.png
new file mode 100644
index 0000000..ee7f5aa
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_inputmethod_chronometer.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_inputmethod_color_blue_bright.png b/tests/tests/holo/res/drawable-tvdpi/holo_inputmethod_color_blue_bright.png
new file mode 100644
index 0000000..ac9c0fb
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_inputmethod_color_blue_bright.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_inputmethod_color_blue_dark.png b/tests/tests/holo/res/drawable-tvdpi/holo_inputmethod_color_blue_dark.png
new file mode 100644
index 0000000..2a7cbb1
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_inputmethod_color_blue_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_inputmethod_color_blue_light.png b/tests/tests/holo/res/drawable-tvdpi/holo_inputmethod_color_blue_light.png
new file mode 100644
index 0000000..dd9df4e
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_inputmethod_color_blue_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_inputmethod_color_green_dark.png b/tests/tests/holo/res/drawable-tvdpi/holo_inputmethod_color_green_dark.png
new file mode 100644
index 0000000..3c8ed40
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_inputmethod_color_green_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_inputmethod_color_green_light.png b/tests/tests/holo/res/drawable-tvdpi/holo_inputmethod_color_green_light.png
new file mode 100644
index 0000000..f5bf1da
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_inputmethod_color_green_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_inputmethod_color_orange_dark.png b/tests/tests/holo/res/drawable-tvdpi/holo_inputmethod_color_orange_dark.png
new file mode 100644
index 0000000..f6a8a84
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_inputmethod_color_orange_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_inputmethod_color_orange_light.png b/tests/tests/holo/res/drawable-tvdpi/holo_inputmethod_color_orange_light.png
new file mode 100644
index 0000000..707642b
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_inputmethod_color_orange_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_inputmethod_color_purple.png b/tests/tests/holo/res/drawable-tvdpi/holo_inputmethod_color_purple.png
new file mode 100644
index 0000000..7eefbff
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_inputmethod_color_purple.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_inputmethod_color_red_dark.png b/tests/tests/holo/res/drawable-tvdpi/holo_inputmethod_color_red_dark.png
new file mode 100644
index 0000000..799dfbc
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_inputmethod_color_red_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_inputmethod_color_red_light.png b/tests/tests/holo/res/drawable-tvdpi/holo_inputmethod_color_red_light.png
new file mode 100644
index 0000000..5ec82eb
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_inputmethod_color_red_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_inputmethod_edittext.png b/tests/tests/holo/res/drawable-tvdpi/holo_inputmethod_edittext.png
new file mode 100644
index 0000000..da28bef
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_inputmethod_edittext.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_inputmethod_progressbar.png b/tests/tests/holo/res/drawable-tvdpi/holo_inputmethod_progressbar.png
new file mode 100644
index 0000000..a5ca94f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_inputmethod_progressbar.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_inputmethod_progressbar_horizontal_0.png b/tests/tests/holo/res/drawable-tvdpi/holo_inputmethod_progressbar_horizontal_0.png
new file mode 100644
index 0000000..679469e
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_inputmethod_progressbar_horizontal_0.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_inputmethod_progressbar_horizontal_100.png b/tests/tests/holo/res/drawable-tvdpi/holo_inputmethod_progressbar_horizontal_100.png
new file mode 100644
index 0000000..da25af6
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_inputmethod_progressbar_horizontal_100.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_inputmethod_progressbar_horizontal_50.png b/tests/tests/holo/res/drawable-tvdpi/holo_inputmethod_progressbar_horizontal_50.png
new file mode 100644
index 0000000..4814d04
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_inputmethod_progressbar_horizontal_50.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_inputmethod_progressbar_large.png b/tests/tests/holo/res/drawable-tvdpi/holo_inputmethod_progressbar_large.png
new file mode 100644
index 0000000..7482a47
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_inputmethod_progressbar_large.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_inputmethod_progressbar_small.png b/tests/tests/holo/res/drawable-tvdpi/holo_inputmethod_progressbar_small.png
new file mode 100644
index 0000000..e454f60
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_inputmethod_progressbar_small.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_inputmethod_radio_button.png b/tests/tests/holo/res/drawable-tvdpi/holo_inputmethod_radio_button.png
new file mode 100644
index 0000000..9d161a0
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_inputmethod_radio_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_inputmethod_radio_button_checked.png b/tests/tests/holo/res/drawable-tvdpi/holo_inputmethod_radio_button_checked.png
new file mode 100644
index 0000000..4090f1a
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_inputmethod_radio_button_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_inputmethod_radiogroup_horizontal.png b/tests/tests/holo/res/drawable-tvdpi/holo_inputmethod_radiogroup_horizontal.png
new file mode 100644
index 0000000..c133aad
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_inputmethod_radiogroup_horizontal.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_inputmethod_radiogroup_vertical.png b/tests/tests/holo/res/drawable-tvdpi/holo_inputmethod_radiogroup_vertical.png
new file mode 100644
index 0000000..fa2338c
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_inputmethod_radiogroup_vertical.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_inputmethod_ratingbar_0.png b/tests/tests/holo/res/drawable-tvdpi/holo_inputmethod_ratingbar_0.png
new file mode 100644
index 0000000..9a65108
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_inputmethod_ratingbar_0.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_inputmethod_ratingbar_0_pressed.png b/tests/tests/holo/res/drawable-tvdpi/holo_inputmethod_ratingbar_0_pressed.png
new file mode 100644
index 0000000..88d5f5e
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_inputmethod_ratingbar_0_pressed.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_inputmethod_ratingbar_2point5.png b/tests/tests/holo/res/drawable-tvdpi/holo_inputmethod_ratingbar_2point5.png
new file mode 100644
index 0000000..61084d5
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_inputmethod_ratingbar_2point5.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_inputmethod_ratingbar_2point5_pressed.png b/tests/tests/holo/res/drawable-tvdpi/holo_inputmethod_ratingbar_2point5_pressed.png
new file mode 100644
index 0000000..0d1287d
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_inputmethod_ratingbar_2point5_pressed.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_inputmethod_ratingbar_5.png b/tests/tests/holo/res/drawable-tvdpi/holo_inputmethod_ratingbar_5.png
new file mode 100644
index 0000000..97595a3
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_inputmethod_ratingbar_5.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_inputmethod_ratingbar_5_pressed.png b/tests/tests/holo/res/drawable-tvdpi/holo_inputmethod_ratingbar_5_pressed.png
new file mode 100644
index 0000000..3d2b390
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_inputmethod_ratingbar_5_pressed.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_inputmethod_searchview.png b/tests/tests/holo/res/drawable-tvdpi/holo_inputmethod_searchview.png
new file mode 100644
index 0000000..29d37de
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_inputmethod_searchview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_inputmethod_searchview_query.png b/tests/tests/holo/res/drawable-tvdpi/holo_inputmethod_searchview_query.png
new file mode 100644
index 0000000..b57a67c
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_inputmethod_searchview_query.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_inputmethod_searchview_query_hint.png b/tests/tests/holo/res/drawable-tvdpi/holo_inputmethod_searchview_query_hint.png
new file mode 100644
index 0000000..bbaedc3
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_inputmethod_searchview_query_hint.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_inputmethod_seekbar_0.png b/tests/tests/holo/res/drawable-tvdpi/holo_inputmethod_seekbar_0.png
new file mode 100644
index 0000000..fd72408
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_inputmethod_seekbar_0.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_inputmethod_seekbar_100.png b/tests/tests/holo/res/drawable-tvdpi/holo_inputmethod_seekbar_100.png
new file mode 100644
index 0000000..cbc2ffe
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_inputmethod_seekbar_100.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_inputmethod_seekbar_50.png b/tests/tests/holo/res/drawable-tvdpi/holo_inputmethod_seekbar_50.png
new file mode 100644
index 0000000..5b3994a
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_inputmethod_seekbar_50.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_inputmethod_spinner.png b/tests/tests/holo/res/drawable-tvdpi/holo_inputmethod_spinner.png
new file mode 100644
index 0000000..2ac5a69
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_inputmethod_spinner.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_inputmethod_switch.png b/tests/tests/holo/res/drawable-tvdpi/holo_inputmethod_switch.png
new file mode 100644
index 0000000..53101ff
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_inputmethod_switch.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_inputmethod_switch_checked.png b/tests/tests/holo/res/drawable-tvdpi/holo_inputmethod_switch_checked.png
new file mode 100644
index 0000000..214f168
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_inputmethod_switch_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_inputmethod_tabhost.png b/tests/tests/holo/res/drawable-tvdpi/holo_inputmethod_tabhost.png
new file mode 100644
index 0000000..8a39bfe
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_inputmethod_tabhost.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_inputmethod_textview.png b/tests/tests/holo/res/drawable-tvdpi/holo_inputmethod_textview.png
new file mode 100644
index 0000000..bae2482
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_inputmethod_textview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_inputmethod_timepicker.png b/tests/tests/holo/res/drawable-tvdpi/holo_inputmethod_timepicker.png
new file mode 100644
index 0000000..01bebe5
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_inputmethod_timepicker.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_inputmethod_toggle_button.png b/tests/tests/holo/res/drawable-tvdpi/holo_inputmethod_toggle_button.png
new file mode 100644
index 0000000..d5fb293
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_inputmethod_toggle_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_inputmethod_toggle_button_checked.png b/tests/tests/holo/res/drawable-tvdpi/holo_inputmethod_toggle_button_checked.png
new file mode 100644
index 0000000..66d9351
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_inputmethod_toggle_button_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_inputmethod_zoomcontrols.png b/tests/tests/holo/res/drawable-tvdpi/holo_inputmethod_zoomcontrols.png
new file mode 100644
index 0000000..6c2f5c5
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_inputmethod_zoomcontrols.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_button.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_button.png
new file mode 100644
index 0000000..f81277b
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_button_pressed.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_button_pressed.png
new file mode 100644
index 0000000..df04a11
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_button_pressed.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_calendar_view.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_calendar_view.png
new file mode 100644
index 0000000..4d4616b
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_calendar_view.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_calendar_view_feb.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_calendar_view_feb.png
new file mode 100644
index 0000000..afefcfb
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_calendar_view_feb.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_checkbox.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_checkbox.png
new file mode 100644
index 0000000..f73c30c
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_checkbox.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_checkbox_checked.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_checkbox_checked.png
new file mode 100644
index 0000000..290d08e
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_checkbox_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_chronometer.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_chronometer.png
new file mode 100644
index 0000000..ee7f5aa
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_chronometer.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_color_blue_bright.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_color_blue_bright.png
new file mode 100644
index 0000000..ac9c0fb
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_color_blue_bright.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_color_blue_dark.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_color_blue_dark.png
new file mode 100644
index 0000000..2a7cbb1
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_color_blue_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_color_blue_light.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_color_blue_light.png
new file mode 100644
index 0000000..dd9df4e
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_color_blue_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_color_green_dark.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_color_green_dark.png
new file mode 100644
index 0000000..3c8ed40
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_color_green_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_color_green_light.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_color_green_light.png
new file mode 100644
index 0000000..f5bf1da
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_color_green_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_color_orange_dark.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_color_orange_dark.png
new file mode 100644
index 0000000..f6a8a84
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_color_orange_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_color_orange_light.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_color_orange_light.png
new file mode 100644
index 0000000..707642b
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_color_orange_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_color_purple.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_color_purple.png
new file mode 100644
index 0000000..7eefbff
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_color_purple.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_color_red_dark.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_color_red_dark.png
new file mode 100644
index 0000000..799dfbc
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_color_red_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_color_red_light.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_color_red_light.png
new file mode 100644
index 0000000..5ec82eb
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_color_red_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_darkactionbar_button.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_darkactionbar_button.png
new file mode 100644
index 0000000..f81277b
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_darkactionbar_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_darkactionbar_button_pressed.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_darkactionbar_button_pressed.png
new file mode 100644
index 0000000..df04a11
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_darkactionbar_button_pressed.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_darkactionbar_calendar_view.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_darkactionbar_calendar_view.png
new file mode 100644
index 0000000..4d4616b
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_darkactionbar_calendar_view.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_darkactionbar_calendar_view_feb.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_darkactionbar_calendar_view_feb.png
new file mode 100644
index 0000000..afefcfb
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_darkactionbar_calendar_view_feb.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_darkactionbar_checkbox.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_darkactionbar_checkbox.png
new file mode 100644
index 0000000..f73c30c
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_darkactionbar_checkbox.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_darkactionbar_checkbox_checked.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_darkactionbar_checkbox_checked.png
new file mode 100644
index 0000000..290d08e
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_darkactionbar_checkbox_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_darkactionbar_chronometer.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_darkactionbar_chronometer.png
new file mode 100644
index 0000000..ee7f5aa
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_darkactionbar_chronometer.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_darkactionbar_color_blue_bright.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_darkactionbar_color_blue_bright.png
new file mode 100644
index 0000000..ac9c0fb
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_darkactionbar_color_blue_bright.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_darkactionbar_color_blue_dark.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_darkactionbar_color_blue_dark.png
new file mode 100644
index 0000000..2a7cbb1
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_darkactionbar_color_blue_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_darkactionbar_color_blue_light.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_darkactionbar_color_blue_light.png
new file mode 100644
index 0000000..dd9df4e
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_darkactionbar_color_blue_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_darkactionbar_color_green_dark.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_darkactionbar_color_green_dark.png
new file mode 100644
index 0000000..3c8ed40
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_darkactionbar_color_green_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_darkactionbar_color_green_light.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_darkactionbar_color_green_light.png
new file mode 100644
index 0000000..f5bf1da
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_darkactionbar_color_green_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_darkactionbar_color_orange_dark.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_darkactionbar_color_orange_dark.png
new file mode 100644
index 0000000..f6a8a84
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_darkactionbar_color_orange_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_darkactionbar_color_orange_light.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_darkactionbar_color_orange_light.png
new file mode 100644
index 0000000..707642b
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_darkactionbar_color_orange_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_darkactionbar_color_purple.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_darkactionbar_color_purple.png
new file mode 100644
index 0000000..7eefbff
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_darkactionbar_color_purple.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_darkactionbar_color_red_dark.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_darkactionbar_color_red_dark.png
new file mode 100644
index 0000000..799dfbc
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_darkactionbar_color_red_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_darkactionbar_color_red_light.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_darkactionbar_color_red_light.png
new file mode 100644
index 0000000..5ec82eb
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_darkactionbar_color_red_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_darkactionbar_edittext.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_darkactionbar_edittext.png
new file mode 100644
index 0000000..da28bef
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_darkactionbar_edittext.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_darkactionbar_progressbar.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_darkactionbar_progressbar.png
new file mode 100644
index 0000000..a5ca94f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_darkactionbar_progressbar.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_darkactionbar_progressbar_horizontal_0.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_darkactionbar_progressbar_horizontal_0.png
new file mode 100644
index 0000000..679469e
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_darkactionbar_progressbar_horizontal_0.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_darkactionbar_progressbar_horizontal_100.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_darkactionbar_progressbar_horizontal_100.png
new file mode 100644
index 0000000..da25af6
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_darkactionbar_progressbar_horizontal_100.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_darkactionbar_progressbar_horizontal_50.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_darkactionbar_progressbar_horizontal_50.png
new file mode 100644
index 0000000..4814d04
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_darkactionbar_progressbar_horizontal_50.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_darkactionbar_progressbar_large.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_darkactionbar_progressbar_large.png
new file mode 100644
index 0000000..7482a47
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_darkactionbar_progressbar_large.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_darkactionbar_progressbar_small.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_darkactionbar_progressbar_small.png
new file mode 100644
index 0000000..e454f60
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_darkactionbar_progressbar_small.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_darkactionbar_radio_button.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_darkactionbar_radio_button.png
new file mode 100644
index 0000000..9d161a0
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_darkactionbar_radio_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_darkactionbar_radio_button_checked.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_darkactionbar_radio_button_checked.png
new file mode 100644
index 0000000..4090f1a
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_darkactionbar_radio_button_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_darkactionbar_radiogroup_horizontal.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_darkactionbar_radiogroup_horizontal.png
new file mode 100644
index 0000000..c133aad
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_darkactionbar_radiogroup_horizontal.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_darkactionbar_radiogroup_vertical.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_darkactionbar_radiogroup_vertical.png
new file mode 100644
index 0000000..fa2338c
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_darkactionbar_radiogroup_vertical.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_darkactionbar_ratingbar_0.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_darkactionbar_ratingbar_0.png
new file mode 100644
index 0000000..9a65108
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_darkactionbar_ratingbar_0.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_darkactionbar_ratingbar_0_pressed.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_darkactionbar_ratingbar_0_pressed.png
new file mode 100644
index 0000000..88d5f5e
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_darkactionbar_ratingbar_0_pressed.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_darkactionbar_ratingbar_2point5.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_darkactionbar_ratingbar_2point5.png
new file mode 100644
index 0000000..61084d5
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_darkactionbar_ratingbar_2point5.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_darkactionbar_ratingbar_2point5_pressed.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_darkactionbar_ratingbar_2point5_pressed.png
new file mode 100644
index 0000000..0d1287d
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_darkactionbar_ratingbar_2point5_pressed.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_darkactionbar_ratingbar_5.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_darkactionbar_ratingbar_5.png
new file mode 100644
index 0000000..97595a3
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_darkactionbar_ratingbar_5.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_darkactionbar_ratingbar_5_pressed.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_darkactionbar_ratingbar_5_pressed.png
new file mode 100644
index 0000000..3d2b390
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_darkactionbar_ratingbar_5_pressed.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_darkactionbar_searchview.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_darkactionbar_searchview.png
new file mode 100644
index 0000000..29d37de
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_darkactionbar_searchview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_darkactionbar_searchview_query.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_darkactionbar_searchview_query.png
new file mode 100644
index 0000000..b57a67c
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_darkactionbar_searchview_query.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_darkactionbar_searchview_query_hint.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_darkactionbar_searchview_query_hint.png
new file mode 100644
index 0000000..bbaedc3
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_darkactionbar_searchview_query_hint.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_darkactionbar_seekbar_0.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_darkactionbar_seekbar_0.png
new file mode 100644
index 0000000..fd72408
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_darkactionbar_seekbar_0.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_darkactionbar_seekbar_100.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_darkactionbar_seekbar_100.png
new file mode 100644
index 0000000..cbc2ffe
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_darkactionbar_seekbar_100.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_darkactionbar_seekbar_50.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_darkactionbar_seekbar_50.png
new file mode 100644
index 0000000..5b3994a
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_darkactionbar_seekbar_50.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_darkactionbar_spinner.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_darkactionbar_spinner.png
new file mode 100644
index 0000000..2ac5a69
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_darkactionbar_spinner.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_darkactionbar_switch.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_darkactionbar_switch.png
new file mode 100644
index 0000000..53101ff
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_darkactionbar_switch.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_darkactionbar_switch_checked.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_darkactionbar_switch_checked.png
new file mode 100644
index 0000000..214f168
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_darkactionbar_switch_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_darkactionbar_tabhost.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_darkactionbar_tabhost.png
new file mode 100644
index 0000000..8a39bfe
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_darkactionbar_tabhost.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_darkactionbar_textview.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_darkactionbar_textview.png
new file mode 100644
index 0000000..bae2482
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_darkactionbar_textview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_darkactionbar_timepicker.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_darkactionbar_timepicker.png
new file mode 100644
index 0000000..01bebe5
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_darkactionbar_timepicker.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_darkactionbar_toggle_button.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_darkactionbar_toggle_button.png
new file mode 100644
index 0000000..d5fb293
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_darkactionbar_toggle_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_darkactionbar_toggle_button_checked.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_darkactionbar_toggle_button_checked.png
new file mode 100644
index 0000000..66d9351
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_darkactionbar_toggle_button_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_darkactionbar_zoomcontrols.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_darkactionbar_zoomcontrols.png
new file mode 100644
index 0000000..6c2f5c5
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_darkactionbar_zoomcontrols.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_button.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_button.png
new file mode 100644
index 0000000..f81277b
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_button_pressed.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_button_pressed.png
new file mode 100644
index 0000000..df04a11
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_button_pressed.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_calendar_view.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_calendar_view.png
new file mode 100644
index 0000000..4d4616b
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_calendar_view.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_calendar_view_feb.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_calendar_view_feb.png
new file mode 100644
index 0000000..afefcfb
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_calendar_view_feb.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_checkbox.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_checkbox.png
new file mode 100644
index 0000000..f73c30c
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_checkbox.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_checkbox_checked.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_checkbox_checked.png
new file mode 100644
index 0000000..290d08e
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_checkbox_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_chronometer.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_chronometer.png
new file mode 100644
index 0000000..ee7f5aa
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_chronometer.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_color_blue_bright.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_color_blue_bright.png
new file mode 100644
index 0000000..ac9c0fb
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_color_blue_bright.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_color_blue_dark.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_color_blue_dark.png
new file mode 100644
index 0000000..2a7cbb1
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_color_blue_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_color_blue_light.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_color_blue_light.png
new file mode 100644
index 0000000..dd9df4e
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_color_blue_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_color_green_dark.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_color_green_dark.png
new file mode 100644
index 0000000..3c8ed40
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_color_green_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_color_green_light.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_color_green_light.png
new file mode 100644
index 0000000..f5bf1da
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_color_green_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_color_orange_dark.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_color_orange_dark.png
new file mode 100644
index 0000000..f6a8a84
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_color_orange_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_color_orange_light.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_color_orange_light.png
new file mode 100644
index 0000000..707642b
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_color_orange_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_color_purple.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_color_purple.png
new file mode 100644
index 0000000..7eefbff
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_color_purple.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_color_red_dark.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_color_red_dark.png
new file mode 100644
index 0000000..799dfbc
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_color_red_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_color_red_light.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_color_red_light.png
new file mode 100644
index 0000000..5ec82eb
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_color_red_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_edittext.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_edittext.png
new file mode 100644
index 0000000..da28bef
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_edittext.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_minwidth_button.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_minwidth_button.png
new file mode 100644
index 0000000..f81277b
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_minwidth_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_minwidth_button_pressed.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_minwidth_button_pressed.png
new file mode 100644
index 0000000..df04a11
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_minwidth_button_pressed.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_minwidth_calendar_view.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_minwidth_calendar_view.png
new file mode 100644
index 0000000..4d4616b
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_minwidth_calendar_view.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_minwidth_calendar_view_feb.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_minwidth_calendar_view_feb.png
new file mode 100644
index 0000000..afefcfb
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_minwidth_calendar_view_feb.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_minwidth_checkbox.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_minwidth_checkbox.png
new file mode 100644
index 0000000..f73c30c
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_minwidth_checkbox.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_minwidth_checkbox_checked.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_minwidth_checkbox_checked.png
new file mode 100644
index 0000000..290d08e
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_minwidth_checkbox_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_minwidth_chronometer.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_minwidth_chronometer.png
new file mode 100644
index 0000000..ee7f5aa
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_minwidth_chronometer.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_minwidth_color_blue_bright.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_minwidth_color_blue_bright.png
new file mode 100644
index 0000000..ac9c0fb
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_minwidth_color_blue_bright.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_minwidth_color_blue_dark.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_minwidth_color_blue_dark.png
new file mode 100644
index 0000000..2a7cbb1
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_minwidth_color_blue_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_minwidth_color_blue_light.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_minwidth_color_blue_light.png
new file mode 100644
index 0000000..dd9df4e
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_minwidth_color_blue_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_minwidth_color_green_dark.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_minwidth_color_green_dark.png
new file mode 100644
index 0000000..3c8ed40
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_minwidth_color_green_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_minwidth_color_green_light.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_minwidth_color_green_light.png
new file mode 100644
index 0000000..f5bf1da
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_minwidth_color_green_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_minwidth_color_orange_dark.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_minwidth_color_orange_dark.png
new file mode 100644
index 0000000..f6a8a84
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_minwidth_color_orange_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_minwidth_color_orange_light.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_minwidth_color_orange_light.png
new file mode 100644
index 0000000..707642b
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_minwidth_color_orange_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_minwidth_color_purple.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_minwidth_color_purple.png
new file mode 100644
index 0000000..7eefbff
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_minwidth_color_purple.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_minwidth_color_red_dark.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_minwidth_color_red_dark.png
new file mode 100644
index 0000000..799dfbc
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_minwidth_color_red_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_minwidth_color_red_light.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_minwidth_color_red_light.png
new file mode 100644
index 0000000..5ec82eb
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_minwidth_color_red_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_minwidth_edittext.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_minwidth_edittext.png
new file mode 100644
index 0000000..da28bef
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_minwidth_edittext.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_minwidth_progressbar.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_minwidth_progressbar.png
new file mode 100644
index 0000000..a5ca94f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_minwidth_progressbar.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_minwidth_progressbar_horizontal_0.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_minwidth_progressbar_horizontal_0.png
new file mode 100644
index 0000000..679469e
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_minwidth_progressbar_horizontal_0.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_minwidth_progressbar_horizontal_100.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_minwidth_progressbar_horizontal_100.png
new file mode 100644
index 0000000..da25af6
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_minwidth_progressbar_horizontal_100.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_minwidth_progressbar_horizontal_50.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_minwidth_progressbar_horizontal_50.png
new file mode 100644
index 0000000..4814d04
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_minwidth_progressbar_horizontal_50.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_minwidth_progressbar_large.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_minwidth_progressbar_large.png
new file mode 100644
index 0000000..7482a47
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_minwidth_progressbar_large.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_minwidth_progressbar_small.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_minwidth_progressbar_small.png
new file mode 100644
index 0000000..e454f60
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_minwidth_progressbar_small.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_minwidth_radio_button.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_minwidth_radio_button.png
new file mode 100644
index 0000000..9d161a0
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_minwidth_radio_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_minwidth_radio_button_checked.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_minwidth_radio_button_checked.png
new file mode 100644
index 0000000..4090f1a
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_minwidth_radio_button_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_minwidth_radiogroup_horizontal.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_minwidth_radiogroup_horizontal.png
new file mode 100644
index 0000000..c133aad
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_minwidth_radiogroup_horizontal.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_minwidth_radiogroup_vertical.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_minwidth_radiogroup_vertical.png
new file mode 100644
index 0000000..fa2338c
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_minwidth_radiogroup_vertical.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_minwidth_ratingbar_0.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_minwidth_ratingbar_0.png
new file mode 100644
index 0000000..9a65108
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_minwidth_ratingbar_0.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_minwidth_ratingbar_0_pressed.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_minwidth_ratingbar_0_pressed.png
new file mode 100644
index 0000000..88d5f5e
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_minwidth_ratingbar_0_pressed.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_minwidth_ratingbar_2point5.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_minwidth_ratingbar_2point5.png
new file mode 100644
index 0000000..61084d5
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_minwidth_ratingbar_2point5.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_minwidth_ratingbar_2point5_pressed.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_minwidth_ratingbar_2point5_pressed.png
new file mode 100644
index 0000000..0d1287d
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_minwidth_ratingbar_2point5_pressed.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_minwidth_ratingbar_5.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_minwidth_ratingbar_5.png
new file mode 100644
index 0000000..97595a3
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_minwidth_ratingbar_5.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_minwidth_ratingbar_5_pressed.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_minwidth_ratingbar_5_pressed.png
new file mode 100644
index 0000000..3d2b390
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_minwidth_ratingbar_5_pressed.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_minwidth_searchview.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_minwidth_searchview.png
new file mode 100644
index 0000000..29d37de
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_minwidth_searchview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_minwidth_searchview_query.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_minwidth_searchview_query.png
new file mode 100644
index 0000000..b57a67c
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_minwidth_searchview_query.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_minwidth_searchview_query_hint.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_minwidth_searchview_query_hint.png
new file mode 100644
index 0000000..bbaedc3
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_minwidth_searchview_query_hint.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_minwidth_seekbar_0.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_minwidth_seekbar_0.png
new file mode 100644
index 0000000..fd72408
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_minwidth_seekbar_0.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_minwidth_seekbar_100.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_minwidth_seekbar_100.png
new file mode 100644
index 0000000..cbc2ffe
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_minwidth_seekbar_100.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_minwidth_seekbar_50.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_minwidth_seekbar_50.png
new file mode 100644
index 0000000..5b3994a
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_minwidth_seekbar_50.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_minwidth_spinner.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_minwidth_spinner.png
new file mode 100644
index 0000000..2ac5a69
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_minwidth_spinner.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_minwidth_switch.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_minwidth_switch.png
new file mode 100644
index 0000000..53101ff
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_minwidth_switch.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_minwidth_switch_checked.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_minwidth_switch_checked.png
new file mode 100644
index 0000000..214f168
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_minwidth_switch_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_minwidth_tabhost.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_minwidth_tabhost.png
new file mode 100644
index 0000000..8a39bfe
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_minwidth_tabhost.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_minwidth_textview.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_minwidth_textview.png
new file mode 100644
index 0000000..bae2482
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_minwidth_textview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_minwidth_timepicker.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_minwidth_timepicker.png
new file mode 100644
index 0000000..01bebe5
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_minwidth_timepicker.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_minwidth_toggle_button.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_minwidth_toggle_button.png
new file mode 100644
index 0000000..d5fb293
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_minwidth_toggle_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_minwidth_toggle_button_checked.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_minwidth_toggle_button_checked.png
new file mode 100644
index 0000000..66d9351
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_minwidth_toggle_button_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_minwidth_zoomcontrols.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_minwidth_zoomcontrols.png
new file mode 100644
index 0000000..6c2f5c5
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_minwidth_zoomcontrols.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_noactionbar_button.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_noactionbar_button.png
new file mode 100644
index 0000000..f81277b
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_noactionbar_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_noactionbar_button_pressed.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_noactionbar_button_pressed.png
new file mode 100644
index 0000000..df04a11
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_noactionbar_button_pressed.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_noactionbar_calendar_view.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_noactionbar_calendar_view.png
new file mode 100644
index 0000000..4d4616b
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_noactionbar_calendar_view.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_noactionbar_calendar_view_feb.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_noactionbar_calendar_view_feb.png
new file mode 100644
index 0000000..afefcfb
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_noactionbar_calendar_view_feb.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_noactionbar_checkbox.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_noactionbar_checkbox.png
new file mode 100644
index 0000000..f73c30c
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_noactionbar_checkbox.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_noactionbar_checkbox_checked.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_noactionbar_checkbox_checked.png
new file mode 100644
index 0000000..290d08e
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_noactionbar_checkbox_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_noactionbar_chronometer.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_noactionbar_chronometer.png
new file mode 100644
index 0000000..ee7f5aa
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_noactionbar_chronometer.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_noactionbar_color_blue_bright.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_noactionbar_color_blue_bright.png
new file mode 100644
index 0000000..ac9c0fb
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_noactionbar_color_blue_bright.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_noactionbar_color_blue_dark.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_noactionbar_color_blue_dark.png
new file mode 100644
index 0000000..2a7cbb1
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_noactionbar_color_blue_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_noactionbar_color_blue_light.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_noactionbar_color_blue_light.png
new file mode 100644
index 0000000..dd9df4e
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_noactionbar_color_blue_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_noactionbar_color_green_dark.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_noactionbar_color_green_dark.png
new file mode 100644
index 0000000..3c8ed40
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_noactionbar_color_green_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_noactionbar_color_green_light.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_noactionbar_color_green_light.png
new file mode 100644
index 0000000..f5bf1da
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_noactionbar_color_green_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_noactionbar_color_orange_dark.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_noactionbar_color_orange_dark.png
new file mode 100644
index 0000000..f6a8a84
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_noactionbar_color_orange_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_noactionbar_color_orange_light.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_noactionbar_color_orange_light.png
new file mode 100644
index 0000000..707642b
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_noactionbar_color_orange_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_noactionbar_color_purple.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_noactionbar_color_purple.png
new file mode 100644
index 0000000..7eefbff
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_noactionbar_color_purple.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_noactionbar_color_red_dark.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_noactionbar_color_red_dark.png
new file mode 100644
index 0000000..799dfbc
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_noactionbar_color_red_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_noactionbar_color_red_light.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_noactionbar_color_red_light.png
new file mode 100644
index 0000000..5ec82eb
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_noactionbar_color_red_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_noactionbar_edittext.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_noactionbar_edittext.png
new file mode 100644
index 0000000..da28bef
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_noactionbar_edittext.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_noactionbar_minwidth_button.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_noactionbar_minwidth_button.png
new file mode 100644
index 0000000..f81277b
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_noactionbar_minwidth_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_noactionbar_minwidth_button_pressed.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_noactionbar_minwidth_button_pressed.png
new file mode 100644
index 0000000..df04a11
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_noactionbar_minwidth_button_pressed.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_noactionbar_minwidth_calendar_view.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_noactionbar_minwidth_calendar_view.png
new file mode 100644
index 0000000..4d4616b
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_noactionbar_minwidth_calendar_view.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_noactionbar_minwidth_calendar_view_feb.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_noactionbar_minwidth_calendar_view_feb.png
new file mode 100644
index 0000000..afefcfb
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_noactionbar_minwidth_calendar_view_feb.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_noactionbar_minwidth_checkbox.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_noactionbar_minwidth_checkbox.png
new file mode 100644
index 0000000..f73c30c
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_noactionbar_minwidth_checkbox.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_noactionbar_minwidth_checkbox_checked.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_noactionbar_minwidth_checkbox_checked.png
new file mode 100644
index 0000000..290d08e
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_noactionbar_minwidth_checkbox_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_noactionbar_minwidth_chronometer.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_noactionbar_minwidth_chronometer.png
new file mode 100644
index 0000000..ee7f5aa
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_noactionbar_minwidth_chronometer.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_noactionbar_minwidth_color_blue_bright.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_noactionbar_minwidth_color_blue_bright.png
new file mode 100644
index 0000000..ac9c0fb
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_noactionbar_minwidth_color_blue_bright.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_noactionbar_minwidth_color_blue_dark.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_noactionbar_minwidth_color_blue_dark.png
new file mode 100644
index 0000000..2a7cbb1
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_noactionbar_minwidth_color_blue_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_noactionbar_minwidth_color_blue_light.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_noactionbar_minwidth_color_blue_light.png
new file mode 100644
index 0000000..dd9df4e
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_noactionbar_minwidth_color_blue_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_noactionbar_minwidth_color_green_dark.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_noactionbar_minwidth_color_green_dark.png
new file mode 100644
index 0000000..3c8ed40
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_noactionbar_minwidth_color_green_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_noactionbar_minwidth_color_green_light.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_noactionbar_minwidth_color_green_light.png
new file mode 100644
index 0000000..f5bf1da
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_noactionbar_minwidth_color_green_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_noactionbar_minwidth_color_orange_dark.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_noactionbar_minwidth_color_orange_dark.png
new file mode 100644
index 0000000..f6a8a84
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_noactionbar_minwidth_color_orange_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_noactionbar_minwidth_color_orange_light.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_noactionbar_minwidth_color_orange_light.png
new file mode 100644
index 0000000..707642b
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_noactionbar_minwidth_color_orange_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_noactionbar_minwidth_color_purple.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_noactionbar_minwidth_color_purple.png
new file mode 100644
index 0000000..7eefbff
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_noactionbar_minwidth_color_purple.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_noactionbar_minwidth_color_red_dark.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_noactionbar_minwidth_color_red_dark.png
new file mode 100644
index 0000000..799dfbc
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_noactionbar_minwidth_color_red_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_noactionbar_minwidth_color_red_light.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_noactionbar_minwidth_color_red_light.png
new file mode 100644
index 0000000..5ec82eb
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_noactionbar_minwidth_color_red_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_noactionbar_minwidth_edittext.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_noactionbar_minwidth_edittext.png
new file mode 100644
index 0000000..da28bef
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_noactionbar_minwidth_edittext.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_noactionbar_minwidth_progressbar.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_noactionbar_minwidth_progressbar.png
new file mode 100644
index 0000000..a5ca94f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_noactionbar_minwidth_progressbar.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_noactionbar_minwidth_progressbar_horizontal_0.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_noactionbar_minwidth_progressbar_horizontal_0.png
new file mode 100644
index 0000000..679469e
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_noactionbar_minwidth_progressbar_horizontal_0.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_noactionbar_minwidth_progressbar_horizontal_100.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_noactionbar_minwidth_progressbar_horizontal_100.png
new file mode 100644
index 0000000..da25af6
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_noactionbar_minwidth_progressbar_horizontal_100.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_noactionbar_minwidth_progressbar_horizontal_50.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_noactionbar_minwidth_progressbar_horizontal_50.png
new file mode 100644
index 0000000..4814d04
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_noactionbar_minwidth_progressbar_horizontal_50.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_noactionbar_minwidth_progressbar_large.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_noactionbar_minwidth_progressbar_large.png
new file mode 100644
index 0000000..7482a47
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_noactionbar_minwidth_progressbar_large.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_noactionbar_minwidth_progressbar_small.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_noactionbar_minwidth_progressbar_small.png
new file mode 100644
index 0000000..e454f60
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_noactionbar_minwidth_progressbar_small.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_noactionbar_minwidth_radio_button.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_noactionbar_minwidth_radio_button.png
new file mode 100644
index 0000000..9d161a0
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_noactionbar_minwidth_radio_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_noactionbar_minwidth_radio_button_checked.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_noactionbar_minwidth_radio_button_checked.png
new file mode 100644
index 0000000..4090f1a
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_noactionbar_minwidth_radio_button_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_noactionbar_minwidth_radiogroup_horizontal.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_noactionbar_minwidth_radiogroup_horizontal.png
new file mode 100644
index 0000000..c133aad
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_noactionbar_minwidth_radiogroup_horizontal.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_noactionbar_minwidth_radiogroup_vertical.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_noactionbar_minwidth_radiogroup_vertical.png
new file mode 100644
index 0000000..fa2338c
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_noactionbar_minwidth_radiogroup_vertical.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_noactionbar_minwidth_ratingbar_0.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_noactionbar_minwidth_ratingbar_0.png
new file mode 100644
index 0000000..9a65108
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_noactionbar_minwidth_ratingbar_0.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_noactionbar_minwidth_ratingbar_0_pressed.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_noactionbar_minwidth_ratingbar_0_pressed.png
new file mode 100644
index 0000000..88d5f5e
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_noactionbar_minwidth_ratingbar_0_pressed.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_noactionbar_minwidth_ratingbar_2point5.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_noactionbar_minwidth_ratingbar_2point5.png
new file mode 100644
index 0000000..61084d5
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_noactionbar_minwidth_ratingbar_2point5.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_noactionbar_minwidth_ratingbar_2point5_pressed.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_noactionbar_minwidth_ratingbar_2point5_pressed.png
new file mode 100644
index 0000000..0d1287d
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_noactionbar_minwidth_ratingbar_2point5_pressed.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_noactionbar_minwidth_ratingbar_5.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_noactionbar_minwidth_ratingbar_5.png
new file mode 100644
index 0000000..97595a3
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_noactionbar_minwidth_ratingbar_5.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_noactionbar_minwidth_ratingbar_5_pressed.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_noactionbar_minwidth_ratingbar_5_pressed.png
new file mode 100644
index 0000000..3d2b390
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_noactionbar_minwidth_ratingbar_5_pressed.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_noactionbar_minwidth_searchview.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_noactionbar_minwidth_searchview.png
new file mode 100644
index 0000000..29d37de
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_noactionbar_minwidth_searchview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_noactionbar_minwidth_searchview_query.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_noactionbar_minwidth_searchview_query.png
new file mode 100644
index 0000000..b57a67c
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_noactionbar_minwidth_searchview_query.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_noactionbar_minwidth_searchview_query_hint.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_noactionbar_minwidth_searchview_query_hint.png
new file mode 100644
index 0000000..bbaedc3
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_noactionbar_minwidth_searchview_query_hint.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_noactionbar_minwidth_seekbar_0.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_noactionbar_minwidth_seekbar_0.png
new file mode 100644
index 0000000..fd72408
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_noactionbar_minwidth_seekbar_0.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_noactionbar_minwidth_seekbar_100.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_noactionbar_minwidth_seekbar_100.png
new file mode 100644
index 0000000..cbc2ffe
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_noactionbar_minwidth_seekbar_100.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_noactionbar_minwidth_seekbar_50.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_noactionbar_minwidth_seekbar_50.png
new file mode 100644
index 0000000..5b3994a
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_noactionbar_minwidth_seekbar_50.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_noactionbar_minwidth_spinner.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_noactionbar_minwidth_spinner.png
new file mode 100644
index 0000000..2ac5a69
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_noactionbar_minwidth_spinner.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_noactionbar_minwidth_switch.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_noactionbar_minwidth_switch.png
new file mode 100644
index 0000000..53101ff
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_noactionbar_minwidth_switch.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_noactionbar_minwidth_switch_checked.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_noactionbar_minwidth_switch_checked.png
new file mode 100644
index 0000000..214f168
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_noactionbar_minwidth_switch_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_noactionbar_minwidth_tabhost.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_noactionbar_minwidth_tabhost.png
new file mode 100644
index 0000000..8a39bfe
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_noactionbar_minwidth_tabhost.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_noactionbar_minwidth_textview.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_noactionbar_minwidth_textview.png
new file mode 100644
index 0000000..bae2482
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_noactionbar_minwidth_textview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_noactionbar_minwidth_timepicker.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_noactionbar_minwidth_timepicker.png
new file mode 100644
index 0000000..01bebe5
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_noactionbar_minwidth_timepicker.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_noactionbar_minwidth_toggle_button.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_noactionbar_minwidth_toggle_button.png
new file mode 100644
index 0000000..d5fb293
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_noactionbar_minwidth_toggle_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_noactionbar_minwidth_toggle_button_checked.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_noactionbar_minwidth_toggle_button_checked.png
new file mode 100644
index 0000000..66d9351
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_noactionbar_minwidth_toggle_button_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_noactionbar_minwidth_zoomcontrols.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_noactionbar_minwidth_zoomcontrols.png
new file mode 100644
index 0000000..6c2f5c5
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_noactionbar_minwidth_zoomcontrols.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_noactionbar_progressbar.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_noactionbar_progressbar.png
new file mode 100644
index 0000000..a5ca94f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_noactionbar_progressbar.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_noactionbar_progressbar_horizontal_0.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_noactionbar_progressbar_horizontal_0.png
new file mode 100644
index 0000000..679469e
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_noactionbar_progressbar_horizontal_0.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_noactionbar_progressbar_horizontal_100.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_noactionbar_progressbar_horizontal_100.png
new file mode 100644
index 0000000..da25af6
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_noactionbar_progressbar_horizontal_100.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_noactionbar_progressbar_horizontal_50.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_noactionbar_progressbar_horizontal_50.png
new file mode 100644
index 0000000..4814d04
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_noactionbar_progressbar_horizontal_50.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_noactionbar_progressbar_large.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_noactionbar_progressbar_large.png
new file mode 100644
index 0000000..7482a47
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_noactionbar_progressbar_large.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_noactionbar_progressbar_small.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_noactionbar_progressbar_small.png
new file mode 100644
index 0000000..e454f60
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_noactionbar_progressbar_small.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_noactionbar_radio_button.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_noactionbar_radio_button.png
new file mode 100644
index 0000000..9d161a0
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_noactionbar_radio_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_noactionbar_radio_button_checked.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_noactionbar_radio_button_checked.png
new file mode 100644
index 0000000..4090f1a
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_noactionbar_radio_button_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_noactionbar_radiogroup_horizontal.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_noactionbar_radiogroup_horizontal.png
new file mode 100644
index 0000000..c133aad
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_noactionbar_radiogroup_horizontal.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_noactionbar_radiogroup_vertical.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_noactionbar_radiogroup_vertical.png
new file mode 100644
index 0000000..fa2338c
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_noactionbar_radiogroup_vertical.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_noactionbar_ratingbar_0.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_noactionbar_ratingbar_0.png
new file mode 100644
index 0000000..9a65108
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_noactionbar_ratingbar_0.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_noactionbar_ratingbar_0_pressed.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_noactionbar_ratingbar_0_pressed.png
new file mode 100644
index 0000000..88d5f5e
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_noactionbar_ratingbar_0_pressed.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_noactionbar_ratingbar_2point5.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_noactionbar_ratingbar_2point5.png
new file mode 100644
index 0000000..61084d5
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_noactionbar_ratingbar_2point5.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_noactionbar_ratingbar_2point5_pressed.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_noactionbar_ratingbar_2point5_pressed.png
new file mode 100644
index 0000000..0d1287d
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_noactionbar_ratingbar_2point5_pressed.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_noactionbar_ratingbar_5.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_noactionbar_ratingbar_5.png
new file mode 100644
index 0000000..97595a3
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_noactionbar_ratingbar_5.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_noactionbar_ratingbar_5_pressed.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_noactionbar_ratingbar_5_pressed.png
new file mode 100644
index 0000000..3d2b390
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_noactionbar_ratingbar_5_pressed.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_noactionbar_searchview.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_noactionbar_searchview.png
new file mode 100644
index 0000000..29d37de
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_noactionbar_searchview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_noactionbar_searchview_query.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_noactionbar_searchview_query.png
new file mode 100644
index 0000000..b57a67c
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_noactionbar_searchview_query.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_noactionbar_searchview_query_hint.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_noactionbar_searchview_query_hint.png
new file mode 100644
index 0000000..bbaedc3
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_noactionbar_searchview_query_hint.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_noactionbar_seekbar_0.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_noactionbar_seekbar_0.png
new file mode 100644
index 0000000..fd72408
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_noactionbar_seekbar_0.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_noactionbar_seekbar_100.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_noactionbar_seekbar_100.png
new file mode 100644
index 0000000..cbc2ffe
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_noactionbar_seekbar_100.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_noactionbar_seekbar_50.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_noactionbar_seekbar_50.png
new file mode 100644
index 0000000..5b3994a
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_noactionbar_seekbar_50.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_noactionbar_spinner.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_noactionbar_spinner.png
new file mode 100644
index 0000000..2ac5a69
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_noactionbar_spinner.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_noactionbar_switch.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_noactionbar_switch.png
new file mode 100644
index 0000000..53101ff
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_noactionbar_switch.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_noactionbar_switch_checked.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_noactionbar_switch_checked.png
new file mode 100644
index 0000000..214f168
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_noactionbar_switch_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_noactionbar_tabhost.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_noactionbar_tabhost.png
new file mode 100644
index 0000000..8a39bfe
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_noactionbar_tabhost.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_noactionbar_textview.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_noactionbar_textview.png
new file mode 100644
index 0000000..bae2482
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_noactionbar_textview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_noactionbar_timepicker.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_noactionbar_timepicker.png
new file mode 100644
index 0000000..01bebe5
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_noactionbar_timepicker.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_noactionbar_toggle_button.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_noactionbar_toggle_button.png
new file mode 100644
index 0000000..d5fb293
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_noactionbar_toggle_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_noactionbar_toggle_button_checked.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_noactionbar_toggle_button_checked.png
new file mode 100644
index 0000000..66d9351
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_noactionbar_toggle_button_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_noactionbar_zoomcontrols.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_noactionbar_zoomcontrols.png
new file mode 100644
index 0000000..6c2f5c5
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_noactionbar_zoomcontrols.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_progressbar.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_progressbar.png
new file mode 100644
index 0000000..a5ca94f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_progressbar.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_progressbar_horizontal_0.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_progressbar_horizontal_0.png
new file mode 100644
index 0000000..679469e
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_progressbar_horizontal_0.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_progressbar_horizontal_100.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_progressbar_horizontal_100.png
new file mode 100644
index 0000000..da25af6
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_progressbar_horizontal_100.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_progressbar_horizontal_50.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_progressbar_horizontal_50.png
new file mode 100644
index 0000000..4814d04
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_progressbar_horizontal_50.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_progressbar_large.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_progressbar_large.png
new file mode 100644
index 0000000..7482a47
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_progressbar_large.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_progressbar_small.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_progressbar_small.png
new file mode 100644
index 0000000..e454f60
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_progressbar_small.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_radio_button.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_radio_button.png
new file mode 100644
index 0000000..9d161a0
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_radio_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_radio_button_checked.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_radio_button_checked.png
new file mode 100644
index 0000000..4090f1a
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_radio_button_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_radiogroup_horizontal.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_radiogroup_horizontal.png
new file mode 100644
index 0000000..c133aad
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_radiogroup_horizontal.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_radiogroup_vertical.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_radiogroup_vertical.png
new file mode 100644
index 0000000..fa2338c
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_radiogroup_vertical.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_ratingbar_0.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_ratingbar_0.png
new file mode 100644
index 0000000..9a65108
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_ratingbar_0.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_ratingbar_0_pressed.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_ratingbar_0_pressed.png
new file mode 100644
index 0000000..88d5f5e
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_ratingbar_0_pressed.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_ratingbar_2point5.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_ratingbar_2point5.png
new file mode 100644
index 0000000..61084d5
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_ratingbar_2point5.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_ratingbar_2point5_pressed.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_ratingbar_2point5_pressed.png
new file mode 100644
index 0000000..0d1287d
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_ratingbar_2point5_pressed.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_ratingbar_5.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_ratingbar_5.png
new file mode 100644
index 0000000..97595a3
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_ratingbar_5.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_ratingbar_5_pressed.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_ratingbar_5_pressed.png
new file mode 100644
index 0000000..3d2b390
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_ratingbar_5_pressed.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_searchview.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_searchview.png
new file mode 100644
index 0000000..29d37de
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_searchview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_searchview_query.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_searchview_query.png
new file mode 100644
index 0000000..b57a67c
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_searchview_query.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_searchview_query_hint.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_searchview_query_hint.png
new file mode 100644
index 0000000..bbaedc3
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_searchview_query_hint.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_seekbar_0.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_seekbar_0.png
new file mode 100644
index 0000000..fd72408
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_seekbar_0.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_seekbar_100.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_seekbar_100.png
new file mode 100644
index 0000000..cbc2ffe
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_seekbar_100.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_seekbar_50.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_seekbar_50.png
new file mode 100644
index 0000000..5b3994a
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_seekbar_50.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_spinner.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_spinner.png
new file mode 100644
index 0000000..2ac5a69
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_spinner.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_switch.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_switch.png
new file mode 100644
index 0000000..53101ff
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_switch.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_switch_checked.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_switch_checked.png
new file mode 100644
index 0000000..214f168
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_switch_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_tabhost.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_tabhost.png
new file mode 100644
index 0000000..8a39bfe
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_tabhost.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_textview.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_textview.png
new file mode 100644
index 0000000..bae2482
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_textview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_timepicker.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_timepicker.png
new file mode 100644
index 0000000..01bebe5
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_timepicker.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_toggle_button.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_toggle_button.png
new file mode 100644
index 0000000..d5fb293
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_toggle_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_toggle_button_checked.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_toggle_button_checked.png
new file mode 100644
index 0000000..66d9351
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_toggle_button_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_zoomcontrols.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_zoomcontrols.png
new file mode 100644
index 0000000..6c2f5c5
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialog_zoomcontrols.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_dialogwhenlarge_button.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialogwhenlarge_button.png
new file mode 100644
index 0000000..f81277b
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialogwhenlarge_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_dialogwhenlarge_button_pressed.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialogwhenlarge_button_pressed.png
new file mode 100644
index 0000000..df04a11
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialogwhenlarge_button_pressed.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_dialogwhenlarge_calendar_view.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialogwhenlarge_calendar_view.png
new file mode 100644
index 0000000..4d4616b
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialogwhenlarge_calendar_view.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_dialogwhenlarge_calendar_view_feb.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialogwhenlarge_calendar_view_feb.png
new file mode 100644
index 0000000..afefcfb
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialogwhenlarge_calendar_view_feb.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_dialogwhenlarge_checkbox.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialogwhenlarge_checkbox.png
new file mode 100644
index 0000000..f73c30c
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialogwhenlarge_checkbox.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_dialogwhenlarge_checkbox_checked.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialogwhenlarge_checkbox_checked.png
new file mode 100644
index 0000000..290d08e
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialogwhenlarge_checkbox_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_dialogwhenlarge_chronometer.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialogwhenlarge_chronometer.png
new file mode 100644
index 0000000..ee7f5aa
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialogwhenlarge_chronometer.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_dialogwhenlarge_color_blue_bright.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialogwhenlarge_color_blue_bright.png
new file mode 100644
index 0000000..ac9c0fb
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialogwhenlarge_color_blue_bright.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_dialogwhenlarge_color_blue_dark.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialogwhenlarge_color_blue_dark.png
new file mode 100644
index 0000000..2a7cbb1
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialogwhenlarge_color_blue_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_dialogwhenlarge_color_blue_light.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialogwhenlarge_color_blue_light.png
new file mode 100644
index 0000000..dd9df4e
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialogwhenlarge_color_blue_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_dialogwhenlarge_color_green_dark.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialogwhenlarge_color_green_dark.png
new file mode 100644
index 0000000..3c8ed40
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialogwhenlarge_color_green_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_dialogwhenlarge_color_green_light.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialogwhenlarge_color_green_light.png
new file mode 100644
index 0000000..f5bf1da
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialogwhenlarge_color_green_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_dialogwhenlarge_color_orange_dark.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialogwhenlarge_color_orange_dark.png
new file mode 100644
index 0000000..f6a8a84
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialogwhenlarge_color_orange_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_dialogwhenlarge_color_orange_light.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialogwhenlarge_color_orange_light.png
new file mode 100644
index 0000000..707642b
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialogwhenlarge_color_orange_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_dialogwhenlarge_color_purple.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialogwhenlarge_color_purple.png
new file mode 100644
index 0000000..7eefbff
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialogwhenlarge_color_purple.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_dialogwhenlarge_color_red_dark.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialogwhenlarge_color_red_dark.png
new file mode 100644
index 0000000..799dfbc
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialogwhenlarge_color_red_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_dialogwhenlarge_color_red_light.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialogwhenlarge_color_red_light.png
new file mode 100644
index 0000000..5ec82eb
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialogwhenlarge_color_red_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_dialogwhenlarge_edittext.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialogwhenlarge_edittext.png
new file mode 100644
index 0000000..da28bef
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialogwhenlarge_edittext.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_dialogwhenlarge_noactionbar_button.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialogwhenlarge_noactionbar_button.png
new file mode 100644
index 0000000..f81277b
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialogwhenlarge_noactionbar_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_dialogwhenlarge_noactionbar_button_pressed.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialogwhenlarge_noactionbar_button_pressed.png
new file mode 100644
index 0000000..df04a11
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialogwhenlarge_noactionbar_button_pressed.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_dialogwhenlarge_noactionbar_calendar_view.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialogwhenlarge_noactionbar_calendar_view.png
new file mode 100644
index 0000000..4d4616b
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialogwhenlarge_noactionbar_calendar_view.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_dialogwhenlarge_noactionbar_calendar_view_feb.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialogwhenlarge_noactionbar_calendar_view_feb.png
new file mode 100644
index 0000000..afefcfb
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialogwhenlarge_noactionbar_calendar_view_feb.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_dialogwhenlarge_noactionbar_checkbox.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialogwhenlarge_noactionbar_checkbox.png
new file mode 100644
index 0000000..f73c30c
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialogwhenlarge_noactionbar_checkbox.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_dialogwhenlarge_noactionbar_checkbox_checked.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialogwhenlarge_noactionbar_checkbox_checked.png
new file mode 100644
index 0000000..290d08e
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialogwhenlarge_noactionbar_checkbox_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_dialogwhenlarge_noactionbar_chronometer.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialogwhenlarge_noactionbar_chronometer.png
new file mode 100644
index 0000000..ee7f5aa
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialogwhenlarge_noactionbar_chronometer.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_dialogwhenlarge_noactionbar_color_blue_bright.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialogwhenlarge_noactionbar_color_blue_bright.png
new file mode 100644
index 0000000..ac9c0fb
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialogwhenlarge_noactionbar_color_blue_bright.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_dialogwhenlarge_noactionbar_color_blue_dark.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialogwhenlarge_noactionbar_color_blue_dark.png
new file mode 100644
index 0000000..2a7cbb1
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialogwhenlarge_noactionbar_color_blue_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_dialogwhenlarge_noactionbar_color_blue_light.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialogwhenlarge_noactionbar_color_blue_light.png
new file mode 100644
index 0000000..dd9df4e
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialogwhenlarge_noactionbar_color_blue_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_dialogwhenlarge_noactionbar_color_green_dark.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialogwhenlarge_noactionbar_color_green_dark.png
new file mode 100644
index 0000000..3c8ed40
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialogwhenlarge_noactionbar_color_green_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_dialogwhenlarge_noactionbar_color_green_light.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialogwhenlarge_noactionbar_color_green_light.png
new file mode 100644
index 0000000..f5bf1da
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialogwhenlarge_noactionbar_color_green_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_dialogwhenlarge_noactionbar_color_orange_dark.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialogwhenlarge_noactionbar_color_orange_dark.png
new file mode 100644
index 0000000..f6a8a84
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialogwhenlarge_noactionbar_color_orange_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_dialogwhenlarge_noactionbar_color_orange_light.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialogwhenlarge_noactionbar_color_orange_light.png
new file mode 100644
index 0000000..707642b
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialogwhenlarge_noactionbar_color_orange_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_dialogwhenlarge_noactionbar_color_purple.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialogwhenlarge_noactionbar_color_purple.png
new file mode 100644
index 0000000..7eefbff
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialogwhenlarge_noactionbar_color_purple.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_dialogwhenlarge_noactionbar_color_red_dark.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialogwhenlarge_noactionbar_color_red_dark.png
new file mode 100644
index 0000000..799dfbc
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialogwhenlarge_noactionbar_color_red_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_dialogwhenlarge_noactionbar_color_red_light.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialogwhenlarge_noactionbar_color_red_light.png
new file mode 100644
index 0000000..5ec82eb
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialogwhenlarge_noactionbar_color_red_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_dialogwhenlarge_noactionbar_edittext.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialogwhenlarge_noactionbar_edittext.png
new file mode 100644
index 0000000..da28bef
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialogwhenlarge_noactionbar_edittext.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_dialogwhenlarge_noactionbar_progressbar.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialogwhenlarge_noactionbar_progressbar.png
new file mode 100644
index 0000000..a5ca94f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialogwhenlarge_noactionbar_progressbar.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_dialogwhenlarge_noactionbar_progressbar_horizontal_0.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialogwhenlarge_noactionbar_progressbar_horizontal_0.png
new file mode 100644
index 0000000..679469e
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialogwhenlarge_noactionbar_progressbar_horizontal_0.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_dialogwhenlarge_noactionbar_progressbar_horizontal_100.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialogwhenlarge_noactionbar_progressbar_horizontal_100.png
new file mode 100644
index 0000000..da25af6
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialogwhenlarge_noactionbar_progressbar_horizontal_100.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_dialogwhenlarge_noactionbar_progressbar_horizontal_50.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialogwhenlarge_noactionbar_progressbar_horizontal_50.png
new file mode 100644
index 0000000..4814d04
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialogwhenlarge_noactionbar_progressbar_horizontal_50.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_dialogwhenlarge_noactionbar_progressbar_large.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialogwhenlarge_noactionbar_progressbar_large.png
new file mode 100644
index 0000000..7482a47
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialogwhenlarge_noactionbar_progressbar_large.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_dialogwhenlarge_noactionbar_progressbar_small.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialogwhenlarge_noactionbar_progressbar_small.png
new file mode 100644
index 0000000..e454f60
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialogwhenlarge_noactionbar_progressbar_small.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_dialogwhenlarge_noactionbar_radio_button.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialogwhenlarge_noactionbar_radio_button.png
new file mode 100644
index 0000000..9d161a0
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialogwhenlarge_noactionbar_radio_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_dialogwhenlarge_noactionbar_radio_button_checked.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialogwhenlarge_noactionbar_radio_button_checked.png
new file mode 100644
index 0000000..4090f1a
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialogwhenlarge_noactionbar_radio_button_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_dialogwhenlarge_noactionbar_radiogroup_horizontal.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialogwhenlarge_noactionbar_radiogroup_horizontal.png
new file mode 100644
index 0000000..c133aad
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialogwhenlarge_noactionbar_radiogroup_horizontal.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_dialogwhenlarge_noactionbar_radiogroup_vertical.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialogwhenlarge_noactionbar_radiogroup_vertical.png
new file mode 100644
index 0000000..fa2338c
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialogwhenlarge_noactionbar_radiogroup_vertical.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_dialogwhenlarge_noactionbar_ratingbar_0.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialogwhenlarge_noactionbar_ratingbar_0.png
new file mode 100644
index 0000000..9a65108
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialogwhenlarge_noactionbar_ratingbar_0.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_dialogwhenlarge_noactionbar_ratingbar_0_pressed.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialogwhenlarge_noactionbar_ratingbar_0_pressed.png
new file mode 100644
index 0000000..88d5f5e
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialogwhenlarge_noactionbar_ratingbar_0_pressed.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_dialogwhenlarge_noactionbar_ratingbar_2point5.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialogwhenlarge_noactionbar_ratingbar_2point5.png
new file mode 100644
index 0000000..61084d5
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialogwhenlarge_noactionbar_ratingbar_2point5.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_dialogwhenlarge_noactionbar_ratingbar_2point5_pressed.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialogwhenlarge_noactionbar_ratingbar_2point5_pressed.png
new file mode 100644
index 0000000..0d1287d
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialogwhenlarge_noactionbar_ratingbar_2point5_pressed.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_dialogwhenlarge_noactionbar_ratingbar_5.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialogwhenlarge_noactionbar_ratingbar_5.png
new file mode 100644
index 0000000..97595a3
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialogwhenlarge_noactionbar_ratingbar_5.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_dialogwhenlarge_noactionbar_ratingbar_5_pressed.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialogwhenlarge_noactionbar_ratingbar_5_pressed.png
new file mode 100644
index 0000000..3d2b390
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialogwhenlarge_noactionbar_ratingbar_5_pressed.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_dialogwhenlarge_noactionbar_searchview.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialogwhenlarge_noactionbar_searchview.png
new file mode 100644
index 0000000..29d37de
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialogwhenlarge_noactionbar_searchview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_dialogwhenlarge_noactionbar_searchview_query.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialogwhenlarge_noactionbar_searchview_query.png
new file mode 100644
index 0000000..b57a67c
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialogwhenlarge_noactionbar_searchview_query.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_dialogwhenlarge_noactionbar_searchview_query_hint.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialogwhenlarge_noactionbar_searchview_query_hint.png
new file mode 100644
index 0000000..bbaedc3
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialogwhenlarge_noactionbar_searchview_query_hint.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_dialogwhenlarge_noactionbar_seekbar_0.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialogwhenlarge_noactionbar_seekbar_0.png
new file mode 100644
index 0000000..fd72408
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialogwhenlarge_noactionbar_seekbar_0.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_dialogwhenlarge_noactionbar_seekbar_100.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialogwhenlarge_noactionbar_seekbar_100.png
new file mode 100644
index 0000000..cbc2ffe
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialogwhenlarge_noactionbar_seekbar_100.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_dialogwhenlarge_noactionbar_seekbar_50.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialogwhenlarge_noactionbar_seekbar_50.png
new file mode 100644
index 0000000..5b3994a
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialogwhenlarge_noactionbar_seekbar_50.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_dialogwhenlarge_noactionbar_spinner.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialogwhenlarge_noactionbar_spinner.png
new file mode 100644
index 0000000..2ac5a69
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialogwhenlarge_noactionbar_spinner.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_dialogwhenlarge_noactionbar_switch.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialogwhenlarge_noactionbar_switch.png
new file mode 100644
index 0000000..53101ff
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialogwhenlarge_noactionbar_switch.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_dialogwhenlarge_noactionbar_switch_checked.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialogwhenlarge_noactionbar_switch_checked.png
new file mode 100644
index 0000000..214f168
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialogwhenlarge_noactionbar_switch_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_dialogwhenlarge_noactionbar_tabhost.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialogwhenlarge_noactionbar_tabhost.png
new file mode 100644
index 0000000..8a39bfe
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialogwhenlarge_noactionbar_tabhost.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_dialogwhenlarge_noactionbar_textview.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialogwhenlarge_noactionbar_textview.png
new file mode 100644
index 0000000..bae2482
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialogwhenlarge_noactionbar_textview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_dialogwhenlarge_noactionbar_timepicker.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialogwhenlarge_noactionbar_timepicker.png
new file mode 100644
index 0000000..01bebe5
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialogwhenlarge_noactionbar_timepicker.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_dialogwhenlarge_noactionbar_toggle_button.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialogwhenlarge_noactionbar_toggle_button.png
new file mode 100644
index 0000000..d5fb293
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialogwhenlarge_noactionbar_toggle_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_dialogwhenlarge_noactionbar_toggle_button_checked.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialogwhenlarge_noactionbar_toggle_button_checked.png
new file mode 100644
index 0000000..66d9351
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialogwhenlarge_noactionbar_toggle_button_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_dialogwhenlarge_noactionbar_zoomcontrols.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialogwhenlarge_noactionbar_zoomcontrols.png
new file mode 100644
index 0000000..6c2f5c5
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialogwhenlarge_noactionbar_zoomcontrols.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_dialogwhenlarge_progressbar.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialogwhenlarge_progressbar.png
new file mode 100644
index 0000000..a5ca94f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialogwhenlarge_progressbar.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_dialogwhenlarge_progressbar_horizontal_0.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialogwhenlarge_progressbar_horizontal_0.png
new file mode 100644
index 0000000..679469e
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialogwhenlarge_progressbar_horizontal_0.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_dialogwhenlarge_progressbar_horizontal_100.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialogwhenlarge_progressbar_horizontal_100.png
new file mode 100644
index 0000000..da25af6
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialogwhenlarge_progressbar_horizontal_100.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_dialogwhenlarge_progressbar_horizontal_50.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialogwhenlarge_progressbar_horizontal_50.png
new file mode 100644
index 0000000..4814d04
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialogwhenlarge_progressbar_horizontal_50.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_dialogwhenlarge_progressbar_large.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialogwhenlarge_progressbar_large.png
new file mode 100644
index 0000000..7482a47
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialogwhenlarge_progressbar_large.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_dialogwhenlarge_progressbar_small.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialogwhenlarge_progressbar_small.png
new file mode 100644
index 0000000..e454f60
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialogwhenlarge_progressbar_small.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_dialogwhenlarge_radio_button.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialogwhenlarge_radio_button.png
new file mode 100644
index 0000000..9d161a0
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialogwhenlarge_radio_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_dialogwhenlarge_radio_button_checked.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialogwhenlarge_radio_button_checked.png
new file mode 100644
index 0000000..4090f1a
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialogwhenlarge_radio_button_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_dialogwhenlarge_radiogroup_horizontal.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialogwhenlarge_radiogroup_horizontal.png
new file mode 100644
index 0000000..c133aad
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialogwhenlarge_radiogroup_horizontal.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_dialogwhenlarge_radiogroup_vertical.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialogwhenlarge_radiogroup_vertical.png
new file mode 100644
index 0000000..fa2338c
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialogwhenlarge_radiogroup_vertical.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_dialogwhenlarge_ratingbar_0.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialogwhenlarge_ratingbar_0.png
new file mode 100644
index 0000000..9a65108
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialogwhenlarge_ratingbar_0.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_dialogwhenlarge_ratingbar_0_pressed.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialogwhenlarge_ratingbar_0_pressed.png
new file mode 100644
index 0000000..88d5f5e
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialogwhenlarge_ratingbar_0_pressed.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_dialogwhenlarge_ratingbar_2point5.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialogwhenlarge_ratingbar_2point5.png
new file mode 100644
index 0000000..61084d5
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialogwhenlarge_ratingbar_2point5.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_dialogwhenlarge_ratingbar_2point5_pressed.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialogwhenlarge_ratingbar_2point5_pressed.png
new file mode 100644
index 0000000..0d1287d
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialogwhenlarge_ratingbar_2point5_pressed.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_dialogwhenlarge_ratingbar_5.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialogwhenlarge_ratingbar_5.png
new file mode 100644
index 0000000..97595a3
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialogwhenlarge_ratingbar_5.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_dialogwhenlarge_ratingbar_5_pressed.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialogwhenlarge_ratingbar_5_pressed.png
new file mode 100644
index 0000000..3d2b390
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialogwhenlarge_ratingbar_5_pressed.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_dialogwhenlarge_searchview.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialogwhenlarge_searchview.png
new file mode 100644
index 0000000..29d37de
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialogwhenlarge_searchview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_dialogwhenlarge_searchview_query.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialogwhenlarge_searchview_query.png
new file mode 100644
index 0000000..b57a67c
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialogwhenlarge_searchview_query.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_dialogwhenlarge_searchview_query_hint.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialogwhenlarge_searchview_query_hint.png
new file mode 100644
index 0000000..bbaedc3
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialogwhenlarge_searchview_query_hint.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_dialogwhenlarge_seekbar_0.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialogwhenlarge_seekbar_0.png
new file mode 100644
index 0000000..fd72408
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialogwhenlarge_seekbar_0.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_dialogwhenlarge_seekbar_100.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialogwhenlarge_seekbar_100.png
new file mode 100644
index 0000000..cbc2ffe
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialogwhenlarge_seekbar_100.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_dialogwhenlarge_seekbar_50.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialogwhenlarge_seekbar_50.png
new file mode 100644
index 0000000..5b3994a
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialogwhenlarge_seekbar_50.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_dialogwhenlarge_spinner.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialogwhenlarge_spinner.png
new file mode 100644
index 0000000..2ac5a69
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialogwhenlarge_spinner.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_dialogwhenlarge_switch.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialogwhenlarge_switch.png
new file mode 100644
index 0000000..53101ff
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialogwhenlarge_switch.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_dialogwhenlarge_switch_checked.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialogwhenlarge_switch_checked.png
new file mode 100644
index 0000000..214f168
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialogwhenlarge_switch_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_dialogwhenlarge_tabhost.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialogwhenlarge_tabhost.png
new file mode 100644
index 0000000..8a39bfe
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialogwhenlarge_tabhost.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_dialogwhenlarge_textview.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialogwhenlarge_textview.png
new file mode 100644
index 0000000..bae2482
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialogwhenlarge_textview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_dialogwhenlarge_timepicker.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialogwhenlarge_timepicker.png
new file mode 100644
index 0000000..01bebe5
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialogwhenlarge_timepicker.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_dialogwhenlarge_toggle_button.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialogwhenlarge_toggle_button.png
new file mode 100644
index 0000000..d5fb293
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialogwhenlarge_toggle_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_dialogwhenlarge_toggle_button_checked.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialogwhenlarge_toggle_button_checked.png
new file mode 100644
index 0000000..66d9351
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialogwhenlarge_toggle_button_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_dialogwhenlarge_zoomcontrols.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialogwhenlarge_zoomcontrols.png
new file mode 100644
index 0000000..6c2f5c5
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_dialogwhenlarge_zoomcontrols.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_edittext.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_edittext.png
new file mode 100644
index 0000000..da28bef
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_edittext.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_noactionbar_button.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_noactionbar_button.png
new file mode 100644
index 0000000..f81277b
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_noactionbar_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_noactionbar_button_pressed.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_noactionbar_button_pressed.png
new file mode 100644
index 0000000..df04a11
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_noactionbar_button_pressed.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_noactionbar_calendar_view.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_noactionbar_calendar_view.png
new file mode 100644
index 0000000..4d4616b
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_noactionbar_calendar_view.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_noactionbar_calendar_view_feb.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_noactionbar_calendar_view_feb.png
new file mode 100644
index 0000000..afefcfb
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_noactionbar_calendar_view_feb.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_noactionbar_checkbox.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_noactionbar_checkbox.png
new file mode 100644
index 0000000..f73c30c
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_noactionbar_checkbox.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_noactionbar_checkbox_checked.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_noactionbar_checkbox_checked.png
new file mode 100644
index 0000000..290d08e
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_noactionbar_checkbox_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_noactionbar_chronometer.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_noactionbar_chronometer.png
new file mode 100644
index 0000000..ee7f5aa
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_noactionbar_chronometer.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_noactionbar_color_blue_bright.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_noactionbar_color_blue_bright.png
new file mode 100644
index 0000000..ac9c0fb
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_noactionbar_color_blue_bright.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_noactionbar_color_blue_dark.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_noactionbar_color_blue_dark.png
new file mode 100644
index 0000000..2a7cbb1
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_noactionbar_color_blue_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_noactionbar_color_blue_light.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_noactionbar_color_blue_light.png
new file mode 100644
index 0000000..dd9df4e
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_noactionbar_color_blue_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_noactionbar_color_green_dark.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_noactionbar_color_green_dark.png
new file mode 100644
index 0000000..3c8ed40
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_noactionbar_color_green_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_noactionbar_color_green_light.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_noactionbar_color_green_light.png
new file mode 100644
index 0000000..f5bf1da
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_noactionbar_color_green_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_noactionbar_color_orange_dark.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_noactionbar_color_orange_dark.png
new file mode 100644
index 0000000..f6a8a84
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_noactionbar_color_orange_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_noactionbar_color_orange_light.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_noactionbar_color_orange_light.png
new file mode 100644
index 0000000..707642b
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_noactionbar_color_orange_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_noactionbar_color_purple.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_noactionbar_color_purple.png
new file mode 100644
index 0000000..7eefbff
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_noactionbar_color_purple.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_noactionbar_color_red_dark.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_noactionbar_color_red_dark.png
new file mode 100644
index 0000000..799dfbc
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_noactionbar_color_red_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_noactionbar_color_red_light.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_noactionbar_color_red_light.png
new file mode 100644
index 0000000..5ec82eb
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_noactionbar_color_red_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_noactionbar_edittext.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_noactionbar_edittext.png
new file mode 100644
index 0000000..da28bef
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_noactionbar_edittext.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_noactionbar_fullscreen_button.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_noactionbar_fullscreen_button.png
new file mode 100644
index 0000000..f81277b
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_noactionbar_fullscreen_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_noactionbar_fullscreen_button_pressed.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_noactionbar_fullscreen_button_pressed.png
new file mode 100644
index 0000000..df04a11
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_noactionbar_fullscreen_button_pressed.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_noactionbar_fullscreen_calendar_view.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_noactionbar_fullscreen_calendar_view.png
new file mode 100644
index 0000000..4d4616b
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_noactionbar_fullscreen_calendar_view.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_noactionbar_fullscreen_calendar_view_feb.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_noactionbar_fullscreen_calendar_view_feb.png
new file mode 100644
index 0000000..afefcfb
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_noactionbar_fullscreen_calendar_view_feb.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_noactionbar_fullscreen_checkbox.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_noactionbar_fullscreen_checkbox.png
new file mode 100644
index 0000000..f73c30c
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_noactionbar_fullscreen_checkbox.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_noactionbar_fullscreen_checkbox_checked.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_noactionbar_fullscreen_checkbox_checked.png
new file mode 100644
index 0000000..290d08e
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_noactionbar_fullscreen_checkbox_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_noactionbar_fullscreen_chronometer.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_noactionbar_fullscreen_chronometer.png
new file mode 100644
index 0000000..ee7f5aa
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_noactionbar_fullscreen_chronometer.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_noactionbar_fullscreen_color_blue_bright.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_noactionbar_fullscreen_color_blue_bright.png
new file mode 100644
index 0000000..ac9c0fb
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_noactionbar_fullscreen_color_blue_bright.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_noactionbar_fullscreen_color_blue_dark.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_noactionbar_fullscreen_color_blue_dark.png
new file mode 100644
index 0000000..2a7cbb1
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_noactionbar_fullscreen_color_blue_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_noactionbar_fullscreen_color_blue_light.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_noactionbar_fullscreen_color_blue_light.png
new file mode 100644
index 0000000..dd9df4e
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_noactionbar_fullscreen_color_blue_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_noactionbar_fullscreen_color_green_dark.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_noactionbar_fullscreen_color_green_dark.png
new file mode 100644
index 0000000..3c8ed40
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_noactionbar_fullscreen_color_green_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_noactionbar_fullscreen_color_green_light.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_noactionbar_fullscreen_color_green_light.png
new file mode 100644
index 0000000..f5bf1da
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_noactionbar_fullscreen_color_green_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_noactionbar_fullscreen_color_orange_dark.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_noactionbar_fullscreen_color_orange_dark.png
new file mode 100644
index 0000000..f6a8a84
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_noactionbar_fullscreen_color_orange_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_noactionbar_fullscreen_color_orange_light.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_noactionbar_fullscreen_color_orange_light.png
new file mode 100644
index 0000000..707642b
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_noactionbar_fullscreen_color_orange_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_noactionbar_fullscreen_color_purple.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_noactionbar_fullscreen_color_purple.png
new file mode 100644
index 0000000..7eefbff
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_noactionbar_fullscreen_color_purple.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_noactionbar_fullscreen_color_red_dark.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_noactionbar_fullscreen_color_red_dark.png
new file mode 100644
index 0000000..799dfbc
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_noactionbar_fullscreen_color_red_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_noactionbar_fullscreen_color_red_light.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_noactionbar_fullscreen_color_red_light.png
new file mode 100644
index 0000000..5ec82eb
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_noactionbar_fullscreen_color_red_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_noactionbar_fullscreen_edittext.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_noactionbar_fullscreen_edittext.png
new file mode 100644
index 0000000..da28bef
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_noactionbar_fullscreen_edittext.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_noactionbar_fullscreen_progressbar.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_noactionbar_fullscreen_progressbar.png
new file mode 100644
index 0000000..a5ca94f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_noactionbar_fullscreen_progressbar.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_noactionbar_fullscreen_progressbar_horizontal_0.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_noactionbar_fullscreen_progressbar_horizontal_0.png
new file mode 100644
index 0000000..679469e
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_noactionbar_fullscreen_progressbar_horizontal_0.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_noactionbar_fullscreen_progressbar_horizontal_100.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_noactionbar_fullscreen_progressbar_horizontal_100.png
new file mode 100644
index 0000000..da25af6
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_noactionbar_fullscreen_progressbar_horizontal_100.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_noactionbar_fullscreen_progressbar_horizontal_50.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_noactionbar_fullscreen_progressbar_horizontal_50.png
new file mode 100644
index 0000000..4814d04
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_noactionbar_fullscreen_progressbar_horizontal_50.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_noactionbar_fullscreen_progressbar_large.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_noactionbar_fullscreen_progressbar_large.png
new file mode 100644
index 0000000..7482a47
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_noactionbar_fullscreen_progressbar_large.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_noactionbar_fullscreen_progressbar_small.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_noactionbar_fullscreen_progressbar_small.png
new file mode 100644
index 0000000..e454f60
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_noactionbar_fullscreen_progressbar_small.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_noactionbar_fullscreen_radio_button.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_noactionbar_fullscreen_radio_button.png
new file mode 100644
index 0000000..9d161a0
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_noactionbar_fullscreen_radio_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_noactionbar_fullscreen_radio_button_checked.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_noactionbar_fullscreen_radio_button_checked.png
new file mode 100644
index 0000000..4090f1a
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_noactionbar_fullscreen_radio_button_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_noactionbar_fullscreen_radiogroup_horizontal.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_noactionbar_fullscreen_radiogroup_horizontal.png
new file mode 100644
index 0000000..c133aad
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_noactionbar_fullscreen_radiogroup_horizontal.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_noactionbar_fullscreen_radiogroup_vertical.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_noactionbar_fullscreen_radiogroup_vertical.png
new file mode 100644
index 0000000..fa2338c
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_noactionbar_fullscreen_radiogroup_vertical.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_noactionbar_fullscreen_ratingbar_0.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_noactionbar_fullscreen_ratingbar_0.png
new file mode 100644
index 0000000..9a65108
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_noactionbar_fullscreen_ratingbar_0.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_noactionbar_fullscreen_ratingbar_0_pressed.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_noactionbar_fullscreen_ratingbar_0_pressed.png
new file mode 100644
index 0000000..88d5f5e
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_noactionbar_fullscreen_ratingbar_0_pressed.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_noactionbar_fullscreen_ratingbar_2point5.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_noactionbar_fullscreen_ratingbar_2point5.png
new file mode 100644
index 0000000..61084d5
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_noactionbar_fullscreen_ratingbar_2point5.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_noactionbar_fullscreen_ratingbar_2point5_pressed.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_noactionbar_fullscreen_ratingbar_2point5_pressed.png
new file mode 100644
index 0000000..0d1287d
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_noactionbar_fullscreen_ratingbar_2point5_pressed.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_noactionbar_fullscreen_ratingbar_5.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_noactionbar_fullscreen_ratingbar_5.png
new file mode 100644
index 0000000..97595a3
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_noactionbar_fullscreen_ratingbar_5.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_noactionbar_fullscreen_ratingbar_5_pressed.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_noactionbar_fullscreen_ratingbar_5_pressed.png
new file mode 100644
index 0000000..3d2b390
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_noactionbar_fullscreen_ratingbar_5_pressed.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_noactionbar_fullscreen_searchview.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_noactionbar_fullscreen_searchview.png
new file mode 100644
index 0000000..29d37de
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_noactionbar_fullscreen_searchview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_noactionbar_fullscreen_searchview_query.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_noactionbar_fullscreen_searchview_query.png
new file mode 100644
index 0000000..b57a67c
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_noactionbar_fullscreen_searchview_query.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_noactionbar_fullscreen_searchview_query_hint.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_noactionbar_fullscreen_searchview_query_hint.png
new file mode 100644
index 0000000..bbaedc3
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_noactionbar_fullscreen_searchview_query_hint.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_noactionbar_fullscreen_seekbar_0.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_noactionbar_fullscreen_seekbar_0.png
new file mode 100644
index 0000000..fd72408
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_noactionbar_fullscreen_seekbar_0.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_noactionbar_fullscreen_seekbar_100.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_noactionbar_fullscreen_seekbar_100.png
new file mode 100644
index 0000000..cbc2ffe
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_noactionbar_fullscreen_seekbar_100.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_noactionbar_fullscreen_seekbar_50.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_noactionbar_fullscreen_seekbar_50.png
new file mode 100644
index 0000000..5b3994a
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_noactionbar_fullscreen_seekbar_50.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_noactionbar_fullscreen_spinner.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_noactionbar_fullscreen_spinner.png
new file mode 100644
index 0000000..2ac5a69
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_noactionbar_fullscreen_spinner.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_noactionbar_fullscreen_switch.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_noactionbar_fullscreen_switch.png
new file mode 100644
index 0000000..53101ff
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_noactionbar_fullscreen_switch.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_noactionbar_fullscreen_switch_checked.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_noactionbar_fullscreen_switch_checked.png
new file mode 100644
index 0000000..214f168
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_noactionbar_fullscreen_switch_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_noactionbar_fullscreen_tabhost.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_noactionbar_fullscreen_tabhost.png
new file mode 100644
index 0000000..8a39bfe
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_noactionbar_fullscreen_tabhost.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_noactionbar_fullscreen_textview.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_noactionbar_fullscreen_textview.png
new file mode 100644
index 0000000..bae2482
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_noactionbar_fullscreen_textview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_noactionbar_fullscreen_timepicker.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_noactionbar_fullscreen_timepicker.png
new file mode 100644
index 0000000..01bebe5
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_noactionbar_fullscreen_timepicker.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_noactionbar_fullscreen_toggle_button.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_noactionbar_fullscreen_toggle_button.png
new file mode 100644
index 0000000..d5fb293
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_noactionbar_fullscreen_toggle_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_noactionbar_fullscreen_toggle_button_checked.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_noactionbar_fullscreen_toggle_button_checked.png
new file mode 100644
index 0000000..66d9351
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_noactionbar_fullscreen_toggle_button_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_noactionbar_fullscreen_zoomcontrols.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_noactionbar_fullscreen_zoomcontrols.png
new file mode 100644
index 0000000..6c2f5c5
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_noactionbar_fullscreen_zoomcontrols.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_noactionbar_progressbar.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_noactionbar_progressbar.png
new file mode 100644
index 0000000..a5ca94f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_noactionbar_progressbar.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_noactionbar_progressbar_horizontal_0.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_noactionbar_progressbar_horizontal_0.png
new file mode 100644
index 0000000..679469e
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_noactionbar_progressbar_horizontal_0.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_noactionbar_progressbar_horizontal_100.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_noactionbar_progressbar_horizontal_100.png
new file mode 100644
index 0000000..da25af6
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_noactionbar_progressbar_horizontal_100.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_noactionbar_progressbar_horizontal_50.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_noactionbar_progressbar_horizontal_50.png
new file mode 100644
index 0000000..4814d04
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_noactionbar_progressbar_horizontal_50.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_noactionbar_progressbar_large.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_noactionbar_progressbar_large.png
new file mode 100644
index 0000000..7482a47
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_noactionbar_progressbar_large.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_noactionbar_progressbar_small.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_noactionbar_progressbar_small.png
new file mode 100644
index 0000000..e454f60
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_noactionbar_progressbar_small.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_noactionbar_radio_button.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_noactionbar_radio_button.png
new file mode 100644
index 0000000..9d161a0
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_noactionbar_radio_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_noactionbar_radio_button_checked.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_noactionbar_radio_button_checked.png
new file mode 100644
index 0000000..4090f1a
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_noactionbar_radio_button_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_noactionbar_radiogroup_horizontal.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_noactionbar_radiogroup_horizontal.png
new file mode 100644
index 0000000..c133aad
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_noactionbar_radiogroup_horizontal.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_noactionbar_radiogroup_vertical.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_noactionbar_radiogroup_vertical.png
new file mode 100644
index 0000000..fa2338c
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_noactionbar_radiogroup_vertical.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_noactionbar_ratingbar_0.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_noactionbar_ratingbar_0.png
new file mode 100644
index 0000000..9a65108
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_noactionbar_ratingbar_0.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_noactionbar_ratingbar_0_pressed.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_noactionbar_ratingbar_0_pressed.png
new file mode 100644
index 0000000..88d5f5e
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_noactionbar_ratingbar_0_pressed.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_noactionbar_ratingbar_2point5.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_noactionbar_ratingbar_2point5.png
new file mode 100644
index 0000000..61084d5
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_noactionbar_ratingbar_2point5.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_noactionbar_ratingbar_2point5_pressed.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_noactionbar_ratingbar_2point5_pressed.png
new file mode 100644
index 0000000..0d1287d
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_noactionbar_ratingbar_2point5_pressed.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_noactionbar_ratingbar_5.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_noactionbar_ratingbar_5.png
new file mode 100644
index 0000000..97595a3
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_noactionbar_ratingbar_5.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_noactionbar_ratingbar_5_pressed.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_noactionbar_ratingbar_5_pressed.png
new file mode 100644
index 0000000..3d2b390
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_noactionbar_ratingbar_5_pressed.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_noactionbar_searchview.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_noactionbar_searchview.png
new file mode 100644
index 0000000..29d37de
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_noactionbar_searchview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_noactionbar_searchview_query.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_noactionbar_searchview_query.png
new file mode 100644
index 0000000..b57a67c
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_noactionbar_searchview_query.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_noactionbar_searchview_query_hint.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_noactionbar_searchview_query_hint.png
new file mode 100644
index 0000000..bbaedc3
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_noactionbar_searchview_query_hint.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_noactionbar_seekbar_0.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_noactionbar_seekbar_0.png
new file mode 100644
index 0000000..fd72408
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_noactionbar_seekbar_0.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_noactionbar_seekbar_100.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_noactionbar_seekbar_100.png
new file mode 100644
index 0000000..cbc2ffe
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_noactionbar_seekbar_100.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_noactionbar_seekbar_50.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_noactionbar_seekbar_50.png
new file mode 100644
index 0000000..5b3994a
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_noactionbar_seekbar_50.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_noactionbar_spinner.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_noactionbar_spinner.png
new file mode 100644
index 0000000..2ac5a69
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_noactionbar_spinner.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_noactionbar_switch.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_noactionbar_switch.png
new file mode 100644
index 0000000..53101ff
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_noactionbar_switch.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_noactionbar_switch_checked.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_noactionbar_switch_checked.png
new file mode 100644
index 0000000..214f168
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_noactionbar_switch_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_noactionbar_tabhost.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_noactionbar_tabhost.png
new file mode 100644
index 0000000..8a39bfe
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_noactionbar_tabhost.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_noactionbar_textview.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_noactionbar_textview.png
new file mode 100644
index 0000000..bae2482
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_noactionbar_textview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_noactionbar_timepicker.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_noactionbar_timepicker.png
new file mode 100644
index 0000000..01bebe5
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_noactionbar_timepicker.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_noactionbar_toggle_button.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_noactionbar_toggle_button.png
new file mode 100644
index 0000000..d5fb293
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_noactionbar_toggle_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_noactionbar_toggle_button_checked.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_noactionbar_toggle_button_checked.png
new file mode 100644
index 0000000..66d9351
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_noactionbar_toggle_button_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_noactionbar_zoomcontrols.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_noactionbar_zoomcontrols.png
new file mode 100644
index 0000000..6c2f5c5
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_noactionbar_zoomcontrols.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_panel_button.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_panel_button.png
new file mode 100644
index 0000000..f81277b
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_panel_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_panel_button_pressed.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_panel_button_pressed.png
new file mode 100644
index 0000000..df04a11
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_panel_button_pressed.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_panel_calendar_view.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_panel_calendar_view.png
new file mode 100644
index 0000000..4d4616b
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_panel_calendar_view.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_panel_calendar_view_feb.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_panel_calendar_view_feb.png
new file mode 100644
index 0000000..afefcfb
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_panel_calendar_view_feb.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_panel_checkbox.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_panel_checkbox.png
new file mode 100644
index 0000000..f73c30c
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_panel_checkbox.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_panel_checkbox_checked.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_panel_checkbox_checked.png
new file mode 100644
index 0000000..290d08e
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_panel_checkbox_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_panel_chronometer.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_panel_chronometer.png
new file mode 100644
index 0000000..ee7f5aa
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_panel_chronometer.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_panel_color_blue_bright.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_panel_color_blue_bright.png
new file mode 100644
index 0000000..ac9c0fb
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_panel_color_blue_bright.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_panel_color_blue_dark.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_panel_color_blue_dark.png
new file mode 100644
index 0000000..2a7cbb1
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_panel_color_blue_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_panel_color_blue_light.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_panel_color_blue_light.png
new file mode 100644
index 0000000..dd9df4e
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_panel_color_blue_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_panel_color_green_dark.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_panel_color_green_dark.png
new file mode 100644
index 0000000..3c8ed40
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_panel_color_green_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_panel_color_green_light.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_panel_color_green_light.png
new file mode 100644
index 0000000..f5bf1da
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_panel_color_green_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_panel_color_orange_dark.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_panel_color_orange_dark.png
new file mode 100644
index 0000000..f6a8a84
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_panel_color_orange_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_panel_color_orange_light.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_panel_color_orange_light.png
new file mode 100644
index 0000000..707642b
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_panel_color_orange_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_panel_color_purple.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_panel_color_purple.png
new file mode 100644
index 0000000..7eefbff
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_panel_color_purple.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_panel_color_red_dark.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_panel_color_red_dark.png
new file mode 100644
index 0000000..799dfbc
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_panel_color_red_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_panel_color_red_light.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_panel_color_red_light.png
new file mode 100644
index 0000000..5ec82eb
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_panel_color_red_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_panel_edittext.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_panel_edittext.png
new file mode 100644
index 0000000..da28bef
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_panel_edittext.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_panel_progressbar.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_panel_progressbar.png
new file mode 100644
index 0000000..a5ca94f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_panel_progressbar.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_panel_progressbar_horizontal_0.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_panel_progressbar_horizontal_0.png
new file mode 100644
index 0000000..679469e
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_panel_progressbar_horizontal_0.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_panel_progressbar_horizontal_100.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_panel_progressbar_horizontal_100.png
new file mode 100644
index 0000000..da25af6
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_panel_progressbar_horizontal_100.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_panel_progressbar_horizontal_50.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_panel_progressbar_horizontal_50.png
new file mode 100644
index 0000000..4814d04
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_panel_progressbar_horizontal_50.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_panel_progressbar_large.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_panel_progressbar_large.png
new file mode 100644
index 0000000..7482a47
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_panel_progressbar_large.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_panel_progressbar_small.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_panel_progressbar_small.png
new file mode 100644
index 0000000..e454f60
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_panel_progressbar_small.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_panel_radio_button.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_panel_radio_button.png
new file mode 100644
index 0000000..9d161a0
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_panel_radio_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_panel_radio_button_checked.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_panel_radio_button_checked.png
new file mode 100644
index 0000000..4090f1a
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_panel_radio_button_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_panel_radiogroup_horizontal.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_panel_radiogroup_horizontal.png
new file mode 100644
index 0000000..c133aad
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_panel_radiogroup_horizontal.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_panel_radiogroup_vertical.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_panel_radiogroup_vertical.png
new file mode 100644
index 0000000..fa2338c
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_panel_radiogroup_vertical.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_panel_ratingbar_0.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_panel_ratingbar_0.png
new file mode 100644
index 0000000..9a65108
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_panel_ratingbar_0.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_panel_ratingbar_0_pressed.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_panel_ratingbar_0_pressed.png
new file mode 100644
index 0000000..88d5f5e
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_panel_ratingbar_0_pressed.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_panel_ratingbar_2point5.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_panel_ratingbar_2point5.png
new file mode 100644
index 0000000..61084d5
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_panel_ratingbar_2point5.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_panel_ratingbar_2point5_pressed.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_panel_ratingbar_2point5_pressed.png
new file mode 100644
index 0000000..0d1287d
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_panel_ratingbar_2point5_pressed.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_panel_ratingbar_5.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_panel_ratingbar_5.png
new file mode 100644
index 0000000..97595a3
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_panel_ratingbar_5.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_panel_ratingbar_5_pressed.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_panel_ratingbar_5_pressed.png
new file mode 100644
index 0000000..3d2b390
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_panel_ratingbar_5_pressed.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_panel_searchview.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_panel_searchview.png
new file mode 100644
index 0000000..29d37de
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_panel_searchview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_panel_searchview_query.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_panel_searchview_query.png
new file mode 100644
index 0000000..b57a67c
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_panel_searchview_query.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_panel_searchview_query_hint.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_panel_searchview_query_hint.png
new file mode 100644
index 0000000..bbaedc3
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_panel_searchview_query_hint.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_panel_seekbar_0.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_panel_seekbar_0.png
new file mode 100644
index 0000000..fd72408
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_panel_seekbar_0.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_panel_seekbar_100.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_panel_seekbar_100.png
new file mode 100644
index 0000000..cbc2ffe
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_panel_seekbar_100.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_panel_seekbar_50.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_panel_seekbar_50.png
new file mode 100644
index 0000000..5b3994a
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_panel_seekbar_50.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_panel_spinner.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_panel_spinner.png
new file mode 100644
index 0000000..2ac5a69
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_panel_spinner.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_panel_switch.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_panel_switch.png
new file mode 100644
index 0000000..53101ff
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_panel_switch.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_panel_switch_checked.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_panel_switch_checked.png
new file mode 100644
index 0000000..214f168
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_panel_switch_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_panel_tabhost.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_panel_tabhost.png
new file mode 100644
index 0000000..8a39bfe
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_panel_tabhost.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_panel_textview.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_panel_textview.png
new file mode 100644
index 0000000..bae2482
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_panel_textview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_panel_timepicker.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_panel_timepicker.png
new file mode 100644
index 0000000..01bebe5
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_panel_timepicker.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_panel_toggle_button.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_panel_toggle_button.png
new file mode 100644
index 0000000..d5fb293
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_panel_toggle_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_panel_toggle_button_checked.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_panel_toggle_button_checked.png
new file mode 100644
index 0000000..66d9351
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_panel_toggle_button_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_panel_zoomcontrols.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_panel_zoomcontrols.png
new file mode 100644
index 0000000..6c2f5c5
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_panel_zoomcontrols.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_progressbar.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_progressbar.png
new file mode 100644
index 0000000..a5ca94f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_progressbar.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_progressbar_horizontal_0.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_progressbar_horizontal_0.png
new file mode 100644
index 0000000..679469e
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_progressbar_horizontal_0.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_progressbar_horizontal_100.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_progressbar_horizontal_100.png
new file mode 100644
index 0000000..da25af6
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_progressbar_horizontal_100.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_progressbar_horizontal_50.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_progressbar_horizontal_50.png
new file mode 100644
index 0000000..4814d04
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_progressbar_horizontal_50.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_progressbar_large.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_progressbar_large.png
new file mode 100644
index 0000000..7482a47
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_progressbar_large.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_progressbar_small.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_progressbar_small.png
new file mode 100644
index 0000000..e454f60
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_progressbar_small.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_radio_button.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_radio_button.png
new file mode 100644
index 0000000..9d161a0
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_radio_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_radio_button_checked.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_radio_button_checked.png
new file mode 100644
index 0000000..4090f1a
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_radio_button_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_radiogroup_horizontal.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_radiogroup_horizontal.png
new file mode 100644
index 0000000..c133aad
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_radiogroup_horizontal.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_radiogroup_vertical.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_radiogroup_vertical.png
new file mode 100644
index 0000000..fa2338c
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_radiogroup_vertical.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_ratingbar_0.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_ratingbar_0.png
new file mode 100644
index 0000000..9a65108
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_ratingbar_0.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_ratingbar_0_pressed.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_ratingbar_0_pressed.png
new file mode 100644
index 0000000..88d5f5e
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_ratingbar_0_pressed.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_ratingbar_2point5.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_ratingbar_2point5.png
new file mode 100644
index 0000000..61084d5
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_ratingbar_2point5.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_ratingbar_2point5_pressed.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_ratingbar_2point5_pressed.png
new file mode 100644
index 0000000..0d1287d
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_ratingbar_2point5_pressed.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_ratingbar_5.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_ratingbar_5.png
new file mode 100644
index 0000000..97595a3
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_ratingbar_5.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_ratingbar_5_pressed.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_ratingbar_5_pressed.png
new file mode 100644
index 0000000..3d2b390
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_ratingbar_5_pressed.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_searchview.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_searchview.png
new file mode 100644
index 0000000..29d37de
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_searchview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_searchview_query.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_searchview_query.png
new file mode 100644
index 0000000..b57a67c
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_searchview_query.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_searchview_query_hint.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_searchview_query_hint.png
new file mode 100644
index 0000000..bbaedc3
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_searchview_query_hint.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_seekbar_0.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_seekbar_0.png
new file mode 100644
index 0000000..fd72408
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_seekbar_0.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_seekbar_100.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_seekbar_100.png
new file mode 100644
index 0000000..cbc2ffe
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_seekbar_100.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_seekbar_50.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_seekbar_50.png
new file mode 100644
index 0000000..5b3994a
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_seekbar_50.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_spinner.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_spinner.png
new file mode 100644
index 0000000..2ac5a69
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_spinner.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_switch.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_switch.png
new file mode 100644
index 0000000..53101ff
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_switch.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_switch_checked.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_switch_checked.png
new file mode 100644
index 0000000..214f168
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_switch_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_tabhost.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_tabhost.png
new file mode 100644
index 0000000..8a39bfe
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_tabhost.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_textview.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_textview.png
new file mode 100644
index 0000000..bae2482
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_textview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_timepicker.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_timepicker.png
new file mode 100644
index 0000000..01bebe5
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_timepicker.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_toggle_button.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_toggle_button.png
new file mode 100644
index 0000000..d5fb293
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_toggle_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_toggle_button_checked.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_toggle_button_checked.png
new file mode 100644
index 0000000..66d9351
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_toggle_button_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_light_zoomcontrols.png b/tests/tests/holo/res/drawable-tvdpi/holo_light_zoomcontrols.png
new file mode 100644
index 0000000..6c2f5c5
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_light_zoomcontrols.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_noactionbar_button.png b/tests/tests/holo/res/drawable-tvdpi/holo_noactionbar_button.png
new file mode 100644
index 0000000..415b686
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_noactionbar_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_noactionbar_button_pressed.png b/tests/tests/holo/res/drawable-tvdpi/holo_noactionbar_button_pressed.png
new file mode 100644
index 0000000..8ec08df
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_noactionbar_button_pressed.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_noactionbar_calendar_view.png b/tests/tests/holo/res/drawable-tvdpi/holo_noactionbar_calendar_view.png
new file mode 100644
index 0000000..9029d16
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_noactionbar_calendar_view.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_noactionbar_calendar_view_feb.png b/tests/tests/holo/res/drawable-tvdpi/holo_noactionbar_calendar_view_feb.png
new file mode 100644
index 0000000..f6682f0
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_noactionbar_calendar_view_feb.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_noactionbar_checkbox.png b/tests/tests/holo/res/drawable-tvdpi/holo_noactionbar_checkbox.png
new file mode 100644
index 0000000..d1d23c7
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_noactionbar_checkbox.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_noactionbar_checkbox_checked.png b/tests/tests/holo/res/drawable-tvdpi/holo_noactionbar_checkbox_checked.png
new file mode 100644
index 0000000..765dc1f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_noactionbar_checkbox_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_noactionbar_chronometer.png b/tests/tests/holo/res/drawable-tvdpi/holo_noactionbar_chronometer.png
new file mode 100644
index 0000000..6e2b2ca
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_noactionbar_chronometer.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_noactionbar_color_blue_bright.png b/tests/tests/holo/res/drawable-tvdpi/holo_noactionbar_color_blue_bright.png
new file mode 100644
index 0000000..ac9c0fb
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_noactionbar_color_blue_bright.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_noactionbar_color_blue_dark.png b/tests/tests/holo/res/drawable-tvdpi/holo_noactionbar_color_blue_dark.png
new file mode 100644
index 0000000..2a7cbb1
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_noactionbar_color_blue_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_noactionbar_color_blue_light.png b/tests/tests/holo/res/drawable-tvdpi/holo_noactionbar_color_blue_light.png
new file mode 100644
index 0000000..dd9df4e
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_noactionbar_color_blue_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_noactionbar_color_green_dark.png b/tests/tests/holo/res/drawable-tvdpi/holo_noactionbar_color_green_dark.png
new file mode 100644
index 0000000..3c8ed40
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_noactionbar_color_green_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_noactionbar_color_green_light.png b/tests/tests/holo/res/drawable-tvdpi/holo_noactionbar_color_green_light.png
new file mode 100644
index 0000000..f5bf1da
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_noactionbar_color_green_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_noactionbar_color_orange_dark.png b/tests/tests/holo/res/drawable-tvdpi/holo_noactionbar_color_orange_dark.png
new file mode 100644
index 0000000..f6a8a84
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_noactionbar_color_orange_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_noactionbar_color_orange_light.png b/tests/tests/holo/res/drawable-tvdpi/holo_noactionbar_color_orange_light.png
new file mode 100644
index 0000000..707642b
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_noactionbar_color_orange_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_noactionbar_color_purple.png b/tests/tests/holo/res/drawable-tvdpi/holo_noactionbar_color_purple.png
new file mode 100644
index 0000000..7eefbff
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_noactionbar_color_purple.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_noactionbar_color_red_dark.png b/tests/tests/holo/res/drawable-tvdpi/holo_noactionbar_color_red_dark.png
new file mode 100644
index 0000000..799dfbc
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_noactionbar_color_red_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_noactionbar_color_red_light.png b/tests/tests/holo/res/drawable-tvdpi/holo_noactionbar_color_red_light.png
new file mode 100644
index 0000000..5ec82eb
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_noactionbar_color_red_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_noactionbar_edittext.png b/tests/tests/holo/res/drawable-tvdpi/holo_noactionbar_edittext.png
new file mode 100644
index 0000000..b9c74da
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_noactionbar_edittext.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_noactionbar_fullscreen_button.png b/tests/tests/holo/res/drawable-tvdpi/holo_noactionbar_fullscreen_button.png
new file mode 100644
index 0000000..415b686
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_noactionbar_fullscreen_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_noactionbar_fullscreen_button_pressed.png b/tests/tests/holo/res/drawable-tvdpi/holo_noactionbar_fullscreen_button_pressed.png
new file mode 100644
index 0000000..8ec08df
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_noactionbar_fullscreen_button_pressed.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_noactionbar_fullscreen_calendar_view.png b/tests/tests/holo/res/drawable-tvdpi/holo_noactionbar_fullscreen_calendar_view.png
new file mode 100644
index 0000000..9029d16
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_noactionbar_fullscreen_calendar_view.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_noactionbar_fullscreen_calendar_view_feb.png b/tests/tests/holo/res/drawable-tvdpi/holo_noactionbar_fullscreen_calendar_view_feb.png
new file mode 100644
index 0000000..f6682f0
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_noactionbar_fullscreen_calendar_view_feb.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_noactionbar_fullscreen_checkbox.png b/tests/tests/holo/res/drawable-tvdpi/holo_noactionbar_fullscreen_checkbox.png
new file mode 100644
index 0000000..d1d23c7
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_noactionbar_fullscreen_checkbox.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_noactionbar_fullscreen_checkbox_checked.png b/tests/tests/holo/res/drawable-tvdpi/holo_noactionbar_fullscreen_checkbox_checked.png
new file mode 100644
index 0000000..765dc1f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_noactionbar_fullscreen_checkbox_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_noactionbar_fullscreen_chronometer.png b/tests/tests/holo/res/drawable-tvdpi/holo_noactionbar_fullscreen_chronometer.png
new file mode 100644
index 0000000..6e2b2ca
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_noactionbar_fullscreen_chronometer.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_noactionbar_fullscreen_color_blue_bright.png b/tests/tests/holo/res/drawable-tvdpi/holo_noactionbar_fullscreen_color_blue_bright.png
new file mode 100644
index 0000000..ac9c0fb
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_noactionbar_fullscreen_color_blue_bright.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_noactionbar_fullscreen_color_blue_dark.png b/tests/tests/holo/res/drawable-tvdpi/holo_noactionbar_fullscreen_color_blue_dark.png
new file mode 100644
index 0000000..2a7cbb1
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_noactionbar_fullscreen_color_blue_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_noactionbar_fullscreen_color_blue_light.png b/tests/tests/holo/res/drawable-tvdpi/holo_noactionbar_fullscreen_color_blue_light.png
new file mode 100644
index 0000000..dd9df4e
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_noactionbar_fullscreen_color_blue_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_noactionbar_fullscreen_color_green_dark.png b/tests/tests/holo/res/drawable-tvdpi/holo_noactionbar_fullscreen_color_green_dark.png
new file mode 100644
index 0000000..3c8ed40
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_noactionbar_fullscreen_color_green_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_noactionbar_fullscreen_color_green_light.png b/tests/tests/holo/res/drawable-tvdpi/holo_noactionbar_fullscreen_color_green_light.png
new file mode 100644
index 0000000..f5bf1da
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_noactionbar_fullscreen_color_green_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_noactionbar_fullscreen_color_orange_dark.png b/tests/tests/holo/res/drawable-tvdpi/holo_noactionbar_fullscreen_color_orange_dark.png
new file mode 100644
index 0000000..f6a8a84
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_noactionbar_fullscreen_color_orange_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_noactionbar_fullscreen_color_orange_light.png b/tests/tests/holo/res/drawable-tvdpi/holo_noactionbar_fullscreen_color_orange_light.png
new file mode 100644
index 0000000..707642b
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_noactionbar_fullscreen_color_orange_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_noactionbar_fullscreen_color_purple.png b/tests/tests/holo/res/drawable-tvdpi/holo_noactionbar_fullscreen_color_purple.png
new file mode 100644
index 0000000..7eefbff
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_noactionbar_fullscreen_color_purple.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_noactionbar_fullscreen_color_red_dark.png b/tests/tests/holo/res/drawable-tvdpi/holo_noactionbar_fullscreen_color_red_dark.png
new file mode 100644
index 0000000..799dfbc
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_noactionbar_fullscreen_color_red_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_noactionbar_fullscreen_color_red_light.png b/tests/tests/holo/res/drawable-tvdpi/holo_noactionbar_fullscreen_color_red_light.png
new file mode 100644
index 0000000..5ec82eb
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_noactionbar_fullscreen_color_red_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_noactionbar_fullscreen_edittext.png b/tests/tests/holo/res/drawable-tvdpi/holo_noactionbar_fullscreen_edittext.png
new file mode 100644
index 0000000..b9c74da
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_noactionbar_fullscreen_edittext.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_noactionbar_fullscreen_progressbar.png b/tests/tests/holo/res/drawable-tvdpi/holo_noactionbar_fullscreen_progressbar.png
new file mode 100644
index 0000000..a5ca94f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_noactionbar_fullscreen_progressbar.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_noactionbar_fullscreen_progressbar_horizontal_0.png b/tests/tests/holo/res/drawable-tvdpi/holo_noactionbar_fullscreen_progressbar_horizontal_0.png
new file mode 100644
index 0000000..592bf27
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_noactionbar_fullscreen_progressbar_horizontal_0.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_noactionbar_fullscreen_progressbar_horizontal_100.png b/tests/tests/holo/res/drawable-tvdpi/holo_noactionbar_fullscreen_progressbar_horizontal_100.png
new file mode 100644
index 0000000..a68c5a0
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_noactionbar_fullscreen_progressbar_horizontal_100.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_noactionbar_fullscreen_progressbar_horizontal_50.png b/tests/tests/holo/res/drawable-tvdpi/holo_noactionbar_fullscreen_progressbar_horizontal_50.png
new file mode 100644
index 0000000..20965f7
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_noactionbar_fullscreen_progressbar_horizontal_50.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_noactionbar_fullscreen_progressbar_large.png b/tests/tests/holo/res/drawable-tvdpi/holo_noactionbar_fullscreen_progressbar_large.png
new file mode 100644
index 0000000..7482a47
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_noactionbar_fullscreen_progressbar_large.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_noactionbar_fullscreen_progressbar_small.png b/tests/tests/holo/res/drawable-tvdpi/holo_noactionbar_fullscreen_progressbar_small.png
new file mode 100644
index 0000000..e454f60
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_noactionbar_fullscreen_progressbar_small.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_noactionbar_fullscreen_radio_button.png b/tests/tests/holo/res/drawable-tvdpi/holo_noactionbar_fullscreen_radio_button.png
new file mode 100644
index 0000000..4c06326
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_noactionbar_fullscreen_radio_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_noactionbar_fullscreen_radio_button_checked.png b/tests/tests/holo/res/drawable-tvdpi/holo_noactionbar_fullscreen_radio_button_checked.png
new file mode 100644
index 0000000..ec14fb0
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_noactionbar_fullscreen_radio_button_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_noactionbar_fullscreen_radiogroup_horizontal.png b/tests/tests/holo/res/drawable-tvdpi/holo_noactionbar_fullscreen_radiogroup_horizontal.png
new file mode 100644
index 0000000..52122d8
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_noactionbar_fullscreen_radiogroup_horizontal.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_noactionbar_fullscreen_radiogroup_vertical.png b/tests/tests/holo/res/drawable-tvdpi/holo_noactionbar_fullscreen_radiogroup_vertical.png
new file mode 100644
index 0000000..f1b20be
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_noactionbar_fullscreen_radiogroup_vertical.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_noactionbar_fullscreen_ratingbar_0.png b/tests/tests/holo/res/drawable-tvdpi/holo_noactionbar_fullscreen_ratingbar_0.png
new file mode 100644
index 0000000..2816574
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_noactionbar_fullscreen_ratingbar_0.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_noactionbar_fullscreen_ratingbar_0_pressed.png b/tests/tests/holo/res/drawable-tvdpi/holo_noactionbar_fullscreen_ratingbar_0_pressed.png
new file mode 100644
index 0000000..c6943d2
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_noactionbar_fullscreen_ratingbar_0_pressed.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_noactionbar_fullscreen_ratingbar_2point5.png b/tests/tests/holo/res/drawable-tvdpi/holo_noactionbar_fullscreen_ratingbar_2point5.png
new file mode 100644
index 0000000..bdba081
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_noactionbar_fullscreen_ratingbar_2point5.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_noactionbar_fullscreen_ratingbar_2point5_pressed.png b/tests/tests/holo/res/drawable-tvdpi/holo_noactionbar_fullscreen_ratingbar_2point5_pressed.png
new file mode 100644
index 0000000..7f95415
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_noactionbar_fullscreen_ratingbar_2point5_pressed.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_noactionbar_fullscreen_ratingbar_5.png b/tests/tests/holo/res/drawable-tvdpi/holo_noactionbar_fullscreen_ratingbar_5.png
new file mode 100644
index 0000000..196404a
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_noactionbar_fullscreen_ratingbar_5.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_noactionbar_fullscreen_ratingbar_5_pressed.png b/tests/tests/holo/res/drawable-tvdpi/holo_noactionbar_fullscreen_ratingbar_5_pressed.png
new file mode 100644
index 0000000..6a21e3e
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_noactionbar_fullscreen_ratingbar_5_pressed.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_noactionbar_fullscreen_searchview.png b/tests/tests/holo/res/drawable-tvdpi/holo_noactionbar_fullscreen_searchview.png
new file mode 100644
index 0000000..fbf4ca0
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_noactionbar_fullscreen_searchview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_noactionbar_fullscreen_searchview_query.png b/tests/tests/holo/res/drawable-tvdpi/holo_noactionbar_fullscreen_searchview_query.png
new file mode 100644
index 0000000..6f437d9
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_noactionbar_fullscreen_searchview_query.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_noactionbar_fullscreen_searchview_query_hint.png b/tests/tests/holo/res/drawable-tvdpi/holo_noactionbar_fullscreen_searchview_query_hint.png
new file mode 100644
index 0000000..bbc8e92
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_noactionbar_fullscreen_searchview_query_hint.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_noactionbar_fullscreen_seekbar_0.png b/tests/tests/holo/res/drawable-tvdpi/holo_noactionbar_fullscreen_seekbar_0.png
new file mode 100644
index 0000000..b753e64
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_noactionbar_fullscreen_seekbar_0.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_noactionbar_fullscreen_seekbar_100.png b/tests/tests/holo/res/drawable-tvdpi/holo_noactionbar_fullscreen_seekbar_100.png
new file mode 100644
index 0000000..cbc2ffe
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_noactionbar_fullscreen_seekbar_100.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_noactionbar_fullscreen_seekbar_50.png b/tests/tests/holo/res/drawable-tvdpi/holo_noactionbar_fullscreen_seekbar_50.png
new file mode 100644
index 0000000..5e0370d
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_noactionbar_fullscreen_seekbar_50.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_noactionbar_fullscreen_spinner.png b/tests/tests/holo/res/drawable-tvdpi/holo_noactionbar_fullscreen_spinner.png
new file mode 100644
index 0000000..7824c9f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_noactionbar_fullscreen_spinner.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_noactionbar_fullscreen_switch.png b/tests/tests/holo/res/drawable-tvdpi/holo_noactionbar_fullscreen_switch.png
new file mode 100644
index 0000000..aa38e43
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_noactionbar_fullscreen_switch.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_noactionbar_fullscreen_switch_checked.png b/tests/tests/holo/res/drawable-tvdpi/holo_noactionbar_fullscreen_switch_checked.png
new file mode 100644
index 0000000..6c9fba9
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_noactionbar_fullscreen_switch_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_noactionbar_fullscreen_tabhost.png b/tests/tests/holo/res/drawable-tvdpi/holo_noactionbar_fullscreen_tabhost.png
new file mode 100644
index 0000000..17593a9
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_noactionbar_fullscreen_tabhost.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_noactionbar_fullscreen_textview.png b/tests/tests/holo/res/drawable-tvdpi/holo_noactionbar_fullscreen_textview.png
new file mode 100644
index 0000000..72df2cf
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_noactionbar_fullscreen_textview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_noactionbar_fullscreen_timepicker.png b/tests/tests/holo/res/drawable-tvdpi/holo_noactionbar_fullscreen_timepicker.png
new file mode 100644
index 0000000..72856ac
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_noactionbar_fullscreen_timepicker.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_noactionbar_fullscreen_toggle_button.png b/tests/tests/holo/res/drawable-tvdpi/holo_noactionbar_fullscreen_toggle_button.png
new file mode 100644
index 0000000..6129f1d
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_noactionbar_fullscreen_toggle_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_noactionbar_fullscreen_toggle_button_checked.png b/tests/tests/holo/res/drawable-tvdpi/holo_noactionbar_fullscreen_toggle_button_checked.png
new file mode 100644
index 0000000..779b70b
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_noactionbar_fullscreen_toggle_button_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_noactionbar_fullscreen_zoomcontrols.png b/tests/tests/holo/res/drawable-tvdpi/holo_noactionbar_fullscreen_zoomcontrols.png
new file mode 100644
index 0000000..6c2f5c5
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_noactionbar_fullscreen_zoomcontrols.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_noactionbar_progressbar.png b/tests/tests/holo/res/drawable-tvdpi/holo_noactionbar_progressbar.png
new file mode 100644
index 0000000..a5ca94f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_noactionbar_progressbar.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_noactionbar_progressbar_horizontal_0.png b/tests/tests/holo/res/drawable-tvdpi/holo_noactionbar_progressbar_horizontal_0.png
new file mode 100644
index 0000000..592bf27
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_noactionbar_progressbar_horizontal_0.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_noactionbar_progressbar_horizontal_100.png b/tests/tests/holo/res/drawable-tvdpi/holo_noactionbar_progressbar_horizontal_100.png
new file mode 100644
index 0000000..a68c5a0
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_noactionbar_progressbar_horizontal_100.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_noactionbar_progressbar_horizontal_50.png b/tests/tests/holo/res/drawable-tvdpi/holo_noactionbar_progressbar_horizontal_50.png
new file mode 100644
index 0000000..20965f7
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_noactionbar_progressbar_horizontal_50.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_noactionbar_progressbar_large.png b/tests/tests/holo/res/drawable-tvdpi/holo_noactionbar_progressbar_large.png
new file mode 100644
index 0000000..7482a47
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_noactionbar_progressbar_large.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_noactionbar_progressbar_small.png b/tests/tests/holo/res/drawable-tvdpi/holo_noactionbar_progressbar_small.png
new file mode 100644
index 0000000..e454f60
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_noactionbar_progressbar_small.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_noactionbar_radio_button.png b/tests/tests/holo/res/drawable-tvdpi/holo_noactionbar_radio_button.png
new file mode 100644
index 0000000..4c06326
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_noactionbar_radio_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_noactionbar_radio_button_checked.png b/tests/tests/holo/res/drawable-tvdpi/holo_noactionbar_radio_button_checked.png
new file mode 100644
index 0000000..ec14fb0
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_noactionbar_radio_button_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_noactionbar_radiogroup_horizontal.png b/tests/tests/holo/res/drawable-tvdpi/holo_noactionbar_radiogroup_horizontal.png
new file mode 100644
index 0000000..52122d8
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_noactionbar_radiogroup_horizontal.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_noactionbar_radiogroup_vertical.png b/tests/tests/holo/res/drawable-tvdpi/holo_noactionbar_radiogroup_vertical.png
new file mode 100644
index 0000000..f1b20be
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_noactionbar_radiogroup_vertical.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_noactionbar_ratingbar_0.png b/tests/tests/holo/res/drawable-tvdpi/holo_noactionbar_ratingbar_0.png
new file mode 100644
index 0000000..2816574
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_noactionbar_ratingbar_0.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_noactionbar_ratingbar_0_pressed.png b/tests/tests/holo/res/drawable-tvdpi/holo_noactionbar_ratingbar_0_pressed.png
new file mode 100644
index 0000000..c6943d2
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_noactionbar_ratingbar_0_pressed.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_noactionbar_ratingbar_2point5.png b/tests/tests/holo/res/drawable-tvdpi/holo_noactionbar_ratingbar_2point5.png
new file mode 100644
index 0000000..bdba081
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_noactionbar_ratingbar_2point5.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_noactionbar_ratingbar_2point5_pressed.png b/tests/tests/holo/res/drawable-tvdpi/holo_noactionbar_ratingbar_2point5_pressed.png
new file mode 100644
index 0000000..7f95415
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_noactionbar_ratingbar_2point5_pressed.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_noactionbar_ratingbar_5.png b/tests/tests/holo/res/drawable-tvdpi/holo_noactionbar_ratingbar_5.png
new file mode 100644
index 0000000..196404a
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_noactionbar_ratingbar_5.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_noactionbar_ratingbar_5_pressed.png b/tests/tests/holo/res/drawable-tvdpi/holo_noactionbar_ratingbar_5_pressed.png
new file mode 100644
index 0000000..6a21e3e
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_noactionbar_ratingbar_5_pressed.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_noactionbar_searchview.png b/tests/tests/holo/res/drawable-tvdpi/holo_noactionbar_searchview.png
new file mode 100644
index 0000000..fbf4ca0
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_noactionbar_searchview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_noactionbar_searchview_query.png b/tests/tests/holo/res/drawable-tvdpi/holo_noactionbar_searchview_query.png
new file mode 100644
index 0000000..6f437d9
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_noactionbar_searchview_query.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_noactionbar_searchview_query_hint.png b/tests/tests/holo/res/drawable-tvdpi/holo_noactionbar_searchview_query_hint.png
new file mode 100644
index 0000000..bbc8e92
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_noactionbar_searchview_query_hint.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_noactionbar_seekbar_0.png b/tests/tests/holo/res/drawable-tvdpi/holo_noactionbar_seekbar_0.png
new file mode 100644
index 0000000..b753e64
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_noactionbar_seekbar_0.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_noactionbar_seekbar_100.png b/tests/tests/holo/res/drawable-tvdpi/holo_noactionbar_seekbar_100.png
new file mode 100644
index 0000000..cbc2ffe
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_noactionbar_seekbar_100.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_noactionbar_seekbar_50.png b/tests/tests/holo/res/drawable-tvdpi/holo_noactionbar_seekbar_50.png
new file mode 100644
index 0000000..5e0370d
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_noactionbar_seekbar_50.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_noactionbar_spinner.png b/tests/tests/holo/res/drawable-tvdpi/holo_noactionbar_spinner.png
new file mode 100644
index 0000000..7824c9f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_noactionbar_spinner.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_noactionbar_switch.png b/tests/tests/holo/res/drawable-tvdpi/holo_noactionbar_switch.png
new file mode 100644
index 0000000..aa38e43
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_noactionbar_switch.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_noactionbar_switch_checked.png b/tests/tests/holo/res/drawable-tvdpi/holo_noactionbar_switch_checked.png
new file mode 100644
index 0000000..6c9fba9
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_noactionbar_switch_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_noactionbar_tabhost.png b/tests/tests/holo/res/drawable-tvdpi/holo_noactionbar_tabhost.png
new file mode 100644
index 0000000..17593a9
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_noactionbar_tabhost.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_noactionbar_textview.png b/tests/tests/holo/res/drawable-tvdpi/holo_noactionbar_textview.png
new file mode 100644
index 0000000..72df2cf
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_noactionbar_textview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_noactionbar_timepicker.png b/tests/tests/holo/res/drawable-tvdpi/holo_noactionbar_timepicker.png
new file mode 100644
index 0000000..72856ac
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_noactionbar_timepicker.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_noactionbar_toggle_button.png b/tests/tests/holo/res/drawable-tvdpi/holo_noactionbar_toggle_button.png
new file mode 100644
index 0000000..6129f1d
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_noactionbar_toggle_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_noactionbar_toggle_button_checked.png b/tests/tests/holo/res/drawable-tvdpi/holo_noactionbar_toggle_button_checked.png
new file mode 100644
index 0000000..779b70b
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_noactionbar_toggle_button_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_noactionbar_zoomcontrols.png b/tests/tests/holo/res/drawable-tvdpi/holo_noactionbar_zoomcontrols.png
new file mode 100644
index 0000000..6c2f5c5
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_noactionbar_zoomcontrols.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_panel_button.png b/tests/tests/holo/res/drawable-tvdpi/holo_panel_button.png
new file mode 100644
index 0000000..415b686
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_panel_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_panel_button_pressed.png b/tests/tests/holo/res/drawable-tvdpi/holo_panel_button_pressed.png
new file mode 100644
index 0000000..8ec08df
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_panel_button_pressed.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_panel_calendar_view.png b/tests/tests/holo/res/drawable-tvdpi/holo_panel_calendar_view.png
new file mode 100644
index 0000000..9029d16
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_panel_calendar_view.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_panel_calendar_view_feb.png b/tests/tests/holo/res/drawable-tvdpi/holo_panel_calendar_view_feb.png
new file mode 100644
index 0000000..f6682f0
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_panel_calendar_view_feb.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_panel_checkbox.png b/tests/tests/holo/res/drawable-tvdpi/holo_panel_checkbox.png
new file mode 100644
index 0000000..d1d23c7
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_panel_checkbox.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_panel_checkbox_checked.png b/tests/tests/holo/res/drawable-tvdpi/holo_panel_checkbox_checked.png
new file mode 100644
index 0000000..765dc1f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_panel_checkbox_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_panel_chronometer.png b/tests/tests/holo/res/drawable-tvdpi/holo_panel_chronometer.png
new file mode 100644
index 0000000..6e2b2ca
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_panel_chronometer.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_panel_color_blue_bright.png b/tests/tests/holo/res/drawable-tvdpi/holo_panel_color_blue_bright.png
new file mode 100644
index 0000000..ac9c0fb
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_panel_color_blue_bright.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_panel_color_blue_dark.png b/tests/tests/holo/res/drawable-tvdpi/holo_panel_color_blue_dark.png
new file mode 100644
index 0000000..2a7cbb1
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_panel_color_blue_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_panel_color_blue_light.png b/tests/tests/holo/res/drawable-tvdpi/holo_panel_color_blue_light.png
new file mode 100644
index 0000000..dd9df4e
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_panel_color_blue_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_panel_color_green_dark.png b/tests/tests/holo/res/drawable-tvdpi/holo_panel_color_green_dark.png
new file mode 100644
index 0000000..3c8ed40
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_panel_color_green_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_panel_color_green_light.png b/tests/tests/holo/res/drawable-tvdpi/holo_panel_color_green_light.png
new file mode 100644
index 0000000..f5bf1da
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_panel_color_green_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_panel_color_orange_dark.png b/tests/tests/holo/res/drawable-tvdpi/holo_panel_color_orange_dark.png
new file mode 100644
index 0000000..f6a8a84
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_panel_color_orange_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_panel_color_orange_light.png b/tests/tests/holo/res/drawable-tvdpi/holo_panel_color_orange_light.png
new file mode 100644
index 0000000..707642b
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_panel_color_orange_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_panel_color_purple.png b/tests/tests/holo/res/drawable-tvdpi/holo_panel_color_purple.png
new file mode 100644
index 0000000..7eefbff
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_panel_color_purple.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_panel_color_red_dark.png b/tests/tests/holo/res/drawable-tvdpi/holo_panel_color_red_dark.png
new file mode 100644
index 0000000..799dfbc
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_panel_color_red_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_panel_color_red_light.png b/tests/tests/holo/res/drawable-tvdpi/holo_panel_color_red_light.png
new file mode 100644
index 0000000..5ec82eb
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_panel_color_red_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_panel_edittext.png b/tests/tests/holo/res/drawable-tvdpi/holo_panel_edittext.png
new file mode 100644
index 0000000..b9c74da
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_panel_edittext.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_panel_progressbar.png b/tests/tests/holo/res/drawable-tvdpi/holo_panel_progressbar.png
new file mode 100644
index 0000000..a5ca94f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_panel_progressbar.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_panel_progressbar_horizontal_0.png b/tests/tests/holo/res/drawable-tvdpi/holo_panel_progressbar_horizontal_0.png
new file mode 100644
index 0000000..592bf27
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_panel_progressbar_horizontal_0.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_panel_progressbar_horizontal_100.png b/tests/tests/holo/res/drawable-tvdpi/holo_panel_progressbar_horizontal_100.png
new file mode 100644
index 0000000..a68c5a0
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_panel_progressbar_horizontal_100.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_panel_progressbar_horizontal_50.png b/tests/tests/holo/res/drawable-tvdpi/holo_panel_progressbar_horizontal_50.png
new file mode 100644
index 0000000..20965f7
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_panel_progressbar_horizontal_50.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_panel_progressbar_large.png b/tests/tests/holo/res/drawable-tvdpi/holo_panel_progressbar_large.png
new file mode 100644
index 0000000..7482a47
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_panel_progressbar_large.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_panel_progressbar_small.png b/tests/tests/holo/res/drawable-tvdpi/holo_panel_progressbar_small.png
new file mode 100644
index 0000000..e454f60
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_panel_progressbar_small.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_panel_radio_button.png b/tests/tests/holo/res/drawable-tvdpi/holo_panel_radio_button.png
new file mode 100644
index 0000000..4c06326
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_panel_radio_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_panel_radio_button_checked.png b/tests/tests/holo/res/drawable-tvdpi/holo_panel_radio_button_checked.png
new file mode 100644
index 0000000..ec14fb0
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_panel_radio_button_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_panel_radiogroup_horizontal.png b/tests/tests/holo/res/drawable-tvdpi/holo_panel_radiogroup_horizontal.png
new file mode 100644
index 0000000..52122d8
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_panel_radiogroup_horizontal.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_panel_radiogroup_vertical.png b/tests/tests/holo/res/drawable-tvdpi/holo_panel_radiogroup_vertical.png
new file mode 100644
index 0000000..f1b20be
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_panel_radiogroup_vertical.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_panel_ratingbar_0.png b/tests/tests/holo/res/drawable-tvdpi/holo_panel_ratingbar_0.png
new file mode 100644
index 0000000..2816574
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_panel_ratingbar_0.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_panel_ratingbar_0_pressed.png b/tests/tests/holo/res/drawable-tvdpi/holo_panel_ratingbar_0_pressed.png
new file mode 100644
index 0000000..c6943d2
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_panel_ratingbar_0_pressed.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_panel_ratingbar_2point5.png b/tests/tests/holo/res/drawable-tvdpi/holo_panel_ratingbar_2point5.png
new file mode 100644
index 0000000..bdba081
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_panel_ratingbar_2point5.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_panel_ratingbar_2point5_pressed.png b/tests/tests/holo/res/drawable-tvdpi/holo_panel_ratingbar_2point5_pressed.png
new file mode 100644
index 0000000..7f95415
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_panel_ratingbar_2point5_pressed.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_panel_ratingbar_5.png b/tests/tests/holo/res/drawable-tvdpi/holo_panel_ratingbar_5.png
new file mode 100644
index 0000000..196404a
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_panel_ratingbar_5.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_panel_ratingbar_5_pressed.png b/tests/tests/holo/res/drawable-tvdpi/holo_panel_ratingbar_5_pressed.png
new file mode 100644
index 0000000..6a21e3e
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_panel_ratingbar_5_pressed.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_panel_searchview.png b/tests/tests/holo/res/drawable-tvdpi/holo_panel_searchview.png
new file mode 100644
index 0000000..fbf4ca0
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_panel_searchview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_panel_searchview_query.png b/tests/tests/holo/res/drawable-tvdpi/holo_panel_searchview_query.png
new file mode 100644
index 0000000..6f437d9
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_panel_searchview_query.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_panel_searchview_query_hint.png b/tests/tests/holo/res/drawable-tvdpi/holo_panel_searchview_query_hint.png
new file mode 100644
index 0000000..bbc8e92
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_panel_searchview_query_hint.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_panel_seekbar_0.png b/tests/tests/holo/res/drawable-tvdpi/holo_panel_seekbar_0.png
new file mode 100644
index 0000000..b753e64
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_panel_seekbar_0.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_panel_seekbar_100.png b/tests/tests/holo/res/drawable-tvdpi/holo_panel_seekbar_100.png
new file mode 100644
index 0000000..cbc2ffe
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_panel_seekbar_100.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_panel_seekbar_50.png b/tests/tests/holo/res/drawable-tvdpi/holo_panel_seekbar_50.png
new file mode 100644
index 0000000..5e0370d
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_panel_seekbar_50.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_panel_spinner.png b/tests/tests/holo/res/drawable-tvdpi/holo_panel_spinner.png
new file mode 100644
index 0000000..7824c9f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_panel_spinner.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_panel_switch.png b/tests/tests/holo/res/drawable-tvdpi/holo_panel_switch.png
new file mode 100644
index 0000000..aa38e43
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_panel_switch.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_panel_switch_checked.png b/tests/tests/holo/res/drawable-tvdpi/holo_panel_switch_checked.png
new file mode 100644
index 0000000..6c9fba9
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_panel_switch_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_panel_tabhost.png b/tests/tests/holo/res/drawable-tvdpi/holo_panel_tabhost.png
new file mode 100644
index 0000000..17593a9
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_panel_tabhost.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_panel_textview.png b/tests/tests/holo/res/drawable-tvdpi/holo_panel_textview.png
new file mode 100644
index 0000000..72df2cf
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_panel_textview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_panel_timepicker.png b/tests/tests/holo/res/drawable-tvdpi/holo_panel_timepicker.png
new file mode 100644
index 0000000..72856ac
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_panel_timepicker.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_panel_toggle_button.png b/tests/tests/holo/res/drawable-tvdpi/holo_panel_toggle_button.png
new file mode 100644
index 0000000..6129f1d
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_panel_toggle_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_panel_toggle_button_checked.png b/tests/tests/holo/res/drawable-tvdpi/holo_panel_toggle_button_checked.png
new file mode 100644
index 0000000..779b70b
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_panel_toggle_button_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_panel_zoomcontrols.png b/tests/tests/holo/res/drawable-tvdpi/holo_panel_zoomcontrols.png
new file mode 100644
index 0000000..6c2f5c5
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_panel_zoomcontrols.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_progressbar.png b/tests/tests/holo/res/drawable-tvdpi/holo_progressbar.png
new file mode 100644
index 0000000..a5ca94f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_progressbar.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_progressbar_horizontal_0.png b/tests/tests/holo/res/drawable-tvdpi/holo_progressbar_horizontal_0.png
new file mode 100644
index 0000000..592bf27
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_progressbar_horizontal_0.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_progressbar_horizontal_100.png b/tests/tests/holo/res/drawable-tvdpi/holo_progressbar_horizontal_100.png
new file mode 100644
index 0000000..a68c5a0
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_progressbar_horizontal_100.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_progressbar_horizontal_50.png b/tests/tests/holo/res/drawable-tvdpi/holo_progressbar_horizontal_50.png
new file mode 100644
index 0000000..20965f7
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_progressbar_horizontal_50.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_progressbar_large.png b/tests/tests/holo/res/drawable-tvdpi/holo_progressbar_large.png
new file mode 100644
index 0000000..7482a47
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_progressbar_large.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_progressbar_small.png b/tests/tests/holo/res/drawable-tvdpi/holo_progressbar_small.png
new file mode 100644
index 0000000..e454f60
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_progressbar_small.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_radio_button.png b/tests/tests/holo/res/drawable-tvdpi/holo_radio_button.png
new file mode 100644
index 0000000..4c06326
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_radio_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_radio_button_checked.png b/tests/tests/holo/res/drawable-tvdpi/holo_radio_button_checked.png
new file mode 100644
index 0000000..ec14fb0
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_radio_button_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_radiogroup_horizontal.png b/tests/tests/holo/res/drawable-tvdpi/holo_radiogroup_horizontal.png
new file mode 100644
index 0000000..52122d8
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_radiogroup_horizontal.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_radiogroup_vertical.png b/tests/tests/holo/res/drawable-tvdpi/holo_radiogroup_vertical.png
new file mode 100644
index 0000000..f1b20be
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_radiogroup_vertical.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_ratingbar_0.png b/tests/tests/holo/res/drawable-tvdpi/holo_ratingbar_0.png
new file mode 100644
index 0000000..2816574
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_ratingbar_0.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_ratingbar_0_pressed.png b/tests/tests/holo/res/drawable-tvdpi/holo_ratingbar_0_pressed.png
new file mode 100644
index 0000000..c6943d2
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_ratingbar_0_pressed.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_ratingbar_2point5.png b/tests/tests/holo/res/drawable-tvdpi/holo_ratingbar_2point5.png
new file mode 100644
index 0000000..bdba081
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_ratingbar_2point5.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_ratingbar_2point5_pressed.png b/tests/tests/holo/res/drawable-tvdpi/holo_ratingbar_2point5_pressed.png
new file mode 100644
index 0000000..7f95415
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_ratingbar_2point5_pressed.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_ratingbar_5.png b/tests/tests/holo/res/drawable-tvdpi/holo_ratingbar_5.png
new file mode 100644
index 0000000..196404a
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_ratingbar_5.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_ratingbar_5_pressed.png b/tests/tests/holo/res/drawable-tvdpi/holo_ratingbar_5_pressed.png
new file mode 100644
index 0000000..6a21e3e
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_ratingbar_5_pressed.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_searchview.png b/tests/tests/holo/res/drawable-tvdpi/holo_searchview.png
new file mode 100644
index 0000000..fbf4ca0
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_searchview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_searchview_query.png b/tests/tests/holo/res/drawable-tvdpi/holo_searchview_query.png
new file mode 100644
index 0000000..6f437d9
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_searchview_query.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_searchview_query_hint.png b/tests/tests/holo/res/drawable-tvdpi/holo_searchview_query_hint.png
new file mode 100644
index 0000000..bbc8e92
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_searchview_query_hint.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_seekbar_0.png b/tests/tests/holo/res/drawable-tvdpi/holo_seekbar_0.png
new file mode 100644
index 0000000..b753e64
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_seekbar_0.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_seekbar_100.png b/tests/tests/holo/res/drawable-tvdpi/holo_seekbar_100.png
new file mode 100644
index 0000000..cbc2ffe
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_seekbar_100.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_seekbar_50.png b/tests/tests/holo/res/drawable-tvdpi/holo_seekbar_50.png
new file mode 100644
index 0000000..5e0370d
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_seekbar_50.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_spinner.png b/tests/tests/holo/res/drawable-tvdpi/holo_spinner.png
new file mode 100644
index 0000000..7824c9f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_spinner.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_switch.png b/tests/tests/holo/res/drawable-tvdpi/holo_switch.png
new file mode 100644
index 0000000..aa38e43
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_switch.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_switch_checked.png b/tests/tests/holo/res/drawable-tvdpi/holo_switch_checked.png
new file mode 100644
index 0000000..6c9fba9
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_switch_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_tabhost.png b/tests/tests/holo/res/drawable-tvdpi/holo_tabhost.png
new file mode 100644
index 0000000..17593a9
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_tabhost.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_textview.png b/tests/tests/holo/res/drawable-tvdpi/holo_textview.png
new file mode 100644
index 0000000..72df2cf
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_textview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_timepicker.png b/tests/tests/holo/res/drawable-tvdpi/holo_timepicker.png
new file mode 100644
index 0000000..72856ac
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_timepicker.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_toggle_button.png b/tests/tests/holo/res/drawable-tvdpi/holo_toggle_button.png
new file mode 100644
index 0000000..6129f1d
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_toggle_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_toggle_button_checked.png b/tests/tests/holo/res/drawable-tvdpi/holo_toggle_button_checked.png
new file mode 100644
index 0000000..779b70b
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_toggle_button_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_wallpaper_button.png b/tests/tests/holo/res/drawable-tvdpi/holo_wallpaper_button.png
new file mode 100644
index 0000000..415b686
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_wallpaper_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_wallpaper_button_pressed.png b/tests/tests/holo/res/drawable-tvdpi/holo_wallpaper_button_pressed.png
new file mode 100644
index 0000000..8ec08df
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_wallpaper_button_pressed.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_wallpaper_calendar_view.png b/tests/tests/holo/res/drawable-tvdpi/holo_wallpaper_calendar_view.png
new file mode 100644
index 0000000..9029d16
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_wallpaper_calendar_view.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_wallpaper_calendar_view_feb.png b/tests/tests/holo/res/drawable-tvdpi/holo_wallpaper_calendar_view_feb.png
new file mode 100644
index 0000000..f6682f0
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_wallpaper_calendar_view_feb.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_wallpaper_checkbox.png b/tests/tests/holo/res/drawable-tvdpi/holo_wallpaper_checkbox.png
new file mode 100644
index 0000000..d1d23c7
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_wallpaper_checkbox.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_wallpaper_checkbox_checked.png b/tests/tests/holo/res/drawable-tvdpi/holo_wallpaper_checkbox_checked.png
new file mode 100644
index 0000000..765dc1f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_wallpaper_checkbox_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_wallpaper_chronometer.png b/tests/tests/holo/res/drawable-tvdpi/holo_wallpaper_chronometer.png
new file mode 100644
index 0000000..6e2b2ca
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_wallpaper_chronometer.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_wallpaper_color_blue_bright.png b/tests/tests/holo/res/drawable-tvdpi/holo_wallpaper_color_blue_bright.png
new file mode 100644
index 0000000..ac9c0fb
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_wallpaper_color_blue_bright.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_wallpaper_color_blue_dark.png b/tests/tests/holo/res/drawable-tvdpi/holo_wallpaper_color_blue_dark.png
new file mode 100644
index 0000000..2a7cbb1
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_wallpaper_color_blue_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_wallpaper_color_blue_light.png b/tests/tests/holo/res/drawable-tvdpi/holo_wallpaper_color_blue_light.png
new file mode 100644
index 0000000..dd9df4e
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_wallpaper_color_blue_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_wallpaper_color_green_dark.png b/tests/tests/holo/res/drawable-tvdpi/holo_wallpaper_color_green_dark.png
new file mode 100644
index 0000000..3c8ed40
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_wallpaper_color_green_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_wallpaper_color_green_light.png b/tests/tests/holo/res/drawable-tvdpi/holo_wallpaper_color_green_light.png
new file mode 100644
index 0000000..f5bf1da
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_wallpaper_color_green_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_wallpaper_color_orange_dark.png b/tests/tests/holo/res/drawable-tvdpi/holo_wallpaper_color_orange_dark.png
new file mode 100644
index 0000000..f6a8a84
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_wallpaper_color_orange_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_wallpaper_color_orange_light.png b/tests/tests/holo/res/drawable-tvdpi/holo_wallpaper_color_orange_light.png
new file mode 100644
index 0000000..707642b
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_wallpaper_color_orange_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_wallpaper_color_purple.png b/tests/tests/holo/res/drawable-tvdpi/holo_wallpaper_color_purple.png
new file mode 100644
index 0000000..7eefbff
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_wallpaper_color_purple.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_wallpaper_color_red_dark.png b/tests/tests/holo/res/drawable-tvdpi/holo_wallpaper_color_red_dark.png
new file mode 100644
index 0000000..799dfbc
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_wallpaper_color_red_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_wallpaper_color_red_light.png b/tests/tests/holo/res/drawable-tvdpi/holo_wallpaper_color_red_light.png
new file mode 100644
index 0000000..5ec82eb
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_wallpaper_color_red_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_wallpaper_edittext.png b/tests/tests/holo/res/drawable-tvdpi/holo_wallpaper_edittext.png
new file mode 100644
index 0000000..b9c74da
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_wallpaper_edittext.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_wallpaper_notitlebar_button.png b/tests/tests/holo/res/drawable-tvdpi/holo_wallpaper_notitlebar_button.png
new file mode 100644
index 0000000..415b686
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_wallpaper_notitlebar_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_wallpaper_notitlebar_button_pressed.png b/tests/tests/holo/res/drawable-tvdpi/holo_wallpaper_notitlebar_button_pressed.png
new file mode 100644
index 0000000..8ec08df
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_wallpaper_notitlebar_button_pressed.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_wallpaper_notitlebar_calendar_view.png b/tests/tests/holo/res/drawable-tvdpi/holo_wallpaper_notitlebar_calendar_view.png
new file mode 100644
index 0000000..9029d16
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_wallpaper_notitlebar_calendar_view.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_wallpaper_notitlebar_calendar_view_feb.png b/tests/tests/holo/res/drawable-tvdpi/holo_wallpaper_notitlebar_calendar_view_feb.png
new file mode 100644
index 0000000..f6682f0
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_wallpaper_notitlebar_calendar_view_feb.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_wallpaper_notitlebar_checkbox.png b/tests/tests/holo/res/drawable-tvdpi/holo_wallpaper_notitlebar_checkbox.png
new file mode 100644
index 0000000..d1d23c7
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_wallpaper_notitlebar_checkbox.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_wallpaper_notitlebar_checkbox_checked.png b/tests/tests/holo/res/drawable-tvdpi/holo_wallpaper_notitlebar_checkbox_checked.png
new file mode 100644
index 0000000..765dc1f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_wallpaper_notitlebar_checkbox_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_wallpaper_notitlebar_chronometer.png b/tests/tests/holo/res/drawable-tvdpi/holo_wallpaper_notitlebar_chronometer.png
new file mode 100644
index 0000000..6e2b2ca
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_wallpaper_notitlebar_chronometer.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_wallpaper_notitlebar_color_blue_bright.png b/tests/tests/holo/res/drawable-tvdpi/holo_wallpaper_notitlebar_color_blue_bright.png
new file mode 100644
index 0000000..ac9c0fb
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_wallpaper_notitlebar_color_blue_bright.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_wallpaper_notitlebar_color_blue_dark.png b/tests/tests/holo/res/drawable-tvdpi/holo_wallpaper_notitlebar_color_blue_dark.png
new file mode 100644
index 0000000..2a7cbb1
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_wallpaper_notitlebar_color_blue_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_wallpaper_notitlebar_color_blue_light.png b/tests/tests/holo/res/drawable-tvdpi/holo_wallpaper_notitlebar_color_blue_light.png
new file mode 100644
index 0000000..dd9df4e
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_wallpaper_notitlebar_color_blue_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_wallpaper_notitlebar_color_green_dark.png b/tests/tests/holo/res/drawable-tvdpi/holo_wallpaper_notitlebar_color_green_dark.png
new file mode 100644
index 0000000..3c8ed40
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_wallpaper_notitlebar_color_green_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_wallpaper_notitlebar_color_green_light.png b/tests/tests/holo/res/drawable-tvdpi/holo_wallpaper_notitlebar_color_green_light.png
new file mode 100644
index 0000000..f5bf1da
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_wallpaper_notitlebar_color_green_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_wallpaper_notitlebar_color_orange_dark.png b/tests/tests/holo/res/drawable-tvdpi/holo_wallpaper_notitlebar_color_orange_dark.png
new file mode 100644
index 0000000..f6a8a84
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_wallpaper_notitlebar_color_orange_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_wallpaper_notitlebar_color_orange_light.png b/tests/tests/holo/res/drawable-tvdpi/holo_wallpaper_notitlebar_color_orange_light.png
new file mode 100644
index 0000000..707642b
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_wallpaper_notitlebar_color_orange_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_wallpaper_notitlebar_color_purple.png b/tests/tests/holo/res/drawable-tvdpi/holo_wallpaper_notitlebar_color_purple.png
new file mode 100644
index 0000000..7eefbff
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_wallpaper_notitlebar_color_purple.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_wallpaper_notitlebar_color_red_dark.png b/tests/tests/holo/res/drawable-tvdpi/holo_wallpaper_notitlebar_color_red_dark.png
new file mode 100644
index 0000000..799dfbc
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_wallpaper_notitlebar_color_red_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_wallpaper_notitlebar_color_red_light.png b/tests/tests/holo/res/drawable-tvdpi/holo_wallpaper_notitlebar_color_red_light.png
new file mode 100644
index 0000000..5ec82eb
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_wallpaper_notitlebar_color_red_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_wallpaper_notitlebar_edittext.png b/tests/tests/holo/res/drawable-tvdpi/holo_wallpaper_notitlebar_edittext.png
new file mode 100644
index 0000000..b9c74da
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_wallpaper_notitlebar_edittext.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_wallpaper_notitlebar_progressbar.png b/tests/tests/holo/res/drawable-tvdpi/holo_wallpaper_notitlebar_progressbar.png
new file mode 100644
index 0000000..a5ca94f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_wallpaper_notitlebar_progressbar.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_wallpaper_notitlebar_progressbar_horizontal_0.png b/tests/tests/holo/res/drawable-tvdpi/holo_wallpaper_notitlebar_progressbar_horizontal_0.png
new file mode 100644
index 0000000..592bf27
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_wallpaper_notitlebar_progressbar_horizontal_0.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_wallpaper_notitlebar_progressbar_horizontal_100.png b/tests/tests/holo/res/drawable-tvdpi/holo_wallpaper_notitlebar_progressbar_horizontal_100.png
new file mode 100644
index 0000000..a68c5a0
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_wallpaper_notitlebar_progressbar_horizontal_100.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_wallpaper_notitlebar_progressbar_horizontal_50.png b/tests/tests/holo/res/drawable-tvdpi/holo_wallpaper_notitlebar_progressbar_horizontal_50.png
new file mode 100644
index 0000000..20965f7
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_wallpaper_notitlebar_progressbar_horizontal_50.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_wallpaper_notitlebar_progressbar_large.png b/tests/tests/holo/res/drawable-tvdpi/holo_wallpaper_notitlebar_progressbar_large.png
new file mode 100644
index 0000000..7482a47
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_wallpaper_notitlebar_progressbar_large.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_wallpaper_notitlebar_progressbar_small.png b/tests/tests/holo/res/drawable-tvdpi/holo_wallpaper_notitlebar_progressbar_small.png
new file mode 100644
index 0000000..e454f60
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_wallpaper_notitlebar_progressbar_small.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_wallpaper_notitlebar_radio_button.png b/tests/tests/holo/res/drawable-tvdpi/holo_wallpaper_notitlebar_radio_button.png
new file mode 100644
index 0000000..4c06326
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_wallpaper_notitlebar_radio_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_wallpaper_notitlebar_radio_button_checked.png b/tests/tests/holo/res/drawable-tvdpi/holo_wallpaper_notitlebar_radio_button_checked.png
new file mode 100644
index 0000000..ec14fb0
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_wallpaper_notitlebar_radio_button_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_wallpaper_notitlebar_radiogroup_horizontal.png b/tests/tests/holo/res/drawable-tvdpi/holo_wallpaper_notitlebar_radiogroup_horizontal.png
new file mode 100644
index 0000000..52122d8
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_wallpaper_notitlebar_radiogroup_horizontal.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_wallpaper_notitlebar_radiogroup_vertical.png b/tests/tests/holo/res/drawable-tvdpi/holo_wallpaper_notitlebar_radiogroup_vertical.png
new file mode 100644
index 0000000..f1b20be
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_wallpaper_notitlebar_radiogroup_vertical.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_wallpaper_notitlebar_ratingbar_0.png b/tests/tests/holo/res/drawable-tvdpi/holo_wallpaper_notitlebar_ratingbar_0.png
new file mode 100644
index 0000000..2816574
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_wallpaper_notitlebar_ratingbar_0.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_wallpaper_notitlebar_ratingbar_0_pressed.png b/tests/tests/holo/res/drawable-tvdpi/holo_wallpaper_notitlebar_ratingbar_0_pressed.png
new file mode 100644
index 0000000..c6943d2
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_wallpaper_notitlebar_ratingbar_0_pressed.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_wallpaper_notitlebar_ratingbar_2point5.png b/tests/tests/holo/res/drawable-tvdpi/holo_wallpaper_notitlebar_ratingbar_2point5.png
new file mode 100644
index 0000000..bdba081
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_wallpaper_notitlebar_ratingbar_2point5.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_wallpaper_notitlebar_ratingbar_2point5_pressed.png b/tests/tests/holo/res/drawable-tvdpi/holo_wallpaper_notitlebar_ratingbar_2point5_pressed.png
new file mode 100644
index 0000000..7f95415
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_wallpaper_notitlebar_ratingbar_2point5_pressed.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_wallpaper_notitlebar_ratingbar_5.png b/tests/tests/holo/res/drawable-tvdpi/holo_wallpaper_notitlebar_ratingbar_5.png
new file mode 100644
index 0000000..196404a
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_wallpaper_notitlebar_ratingbar_5.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_wallpaper_notitlebar_ratingbar_5_pressed.png b/tests/tests/holo/res/drawable-tvdpi/holo_wallpaper_notitlebar_ratingbar_5_pressed.png
new file mode 100644
index 0000000..6a21e3e
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_wallpaper_notitlebar_ratingbar_5_pressed.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_wallpaper_notitlebar_searchview.png b/tests/tests/holo/res/drawable-tvdpi/holo_wallpaper_notitlebar_searchview.png
new file mode 100644
index 0000000..fbf4ca0
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_wallpaper_notitlebar_searchview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_wallpaper_notitlebar_searchview_query.png b/tests/tests/holo/res/drawable-tvdpi/holo_wallpaper_notitlebar_searchview_query.png
new file mode 100644
index 0000000..6f437d9
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_wallpaper_notitlebar_searchview_query.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_wallpaper_notitlebar_searchview_query_hint.png b/tests/tests/holo/res/drawable-tvdpi/holo_wallpaper_notitlebar_searchview_query_hint.png
new file mode 100644
index 0000000..bbc8e92
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_wallpaper_notitlebar_searchview_query_hint.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_wallpaper_notitlebar_seekbar_0.png b/tests/tests/holo/res/drawable-tvdpi/holo_wallpaper_notitlebar_seekbar_0.png
new file mode 100644
index 0000000..b753e64
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_wallpaper_notitlebar_seekbar_0.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_wallpaper_notitlebar_seekbar_100.png b/tests/tests/holo/res/drawable-tvdpi/holo_wallpaper_notitlebar_seekbar_100.png
new file mode 100644
index 0000000..cbc2ffe
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_wallpaper_notitlebar_seekbar_100.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_wallpaper_notitlebar_seekbar_50.png b/tests/tests/holo/res/drawable-tvdpi/holo_wallpaper_notitlebar_seekbar_50.png
new file mode 100644
index 0000000..5e0370d
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_wallpaper_notitlebar_seekbar_50.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_wallpaper_notitlebar_spinner.png b/tests/tests/holo/res/drawable-tvdpi/holo_wallpaper_notitlebar_spinner.png
new file mode 100644
index 0000000..7824c9f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_wallpaper_notitlebar_spinner.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_wallpaper_notitlebar_switch.png b/tests/tests/holo/res/drawable-tvdpi/holo_wallpaper_notitlebar_switch.png
new file mode 100644
index 0000000..aa38e43
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_wallpaper_notitlebar_switch.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_wallpaper_notitlebar_switch_checked.png b/tests/tests/holo/res/drawable-tvdpi/holo_wallpaper_notitlebar_switch_checked.png
new file mode 100644
index 0000000..6c9fba9
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_wallpaper_notitlebar_switch_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_wallpaper_notitlebar_tabhost.png b/tests/tests/holo/res/drawable-tvdpi/holo_wallpaper_notitlebar_tabhost.png
new file mode 100644
index 0000000..17593a9
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_wallpaper_notitlebar_tabhost.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_wallpaper_notitlebar_textview.png b/tests/tests/holo/res/drawable-tvdpi/holo_wallpaper_notitlebar_textview.png
new file mode 100644
index 0000000..72df2cf
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_wallpaper_notitlebar_textview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_wallpaper_notitlebar_timepicker.png b/tests/tests/holo/res/drawable-tvdpi/holo_wallpaper_notitlebar_timepicker.png
new file mode 100644
index 0000000..72856ac
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_wallpaper_notitlebar_timepicker.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_wallpaper_notitlebar_toggle_button.png b/tests/tests/holo/res/drawable-tvdpi/holo_wallpaper_notitlebar_toggle_button.png
new file mode 100644
index 0000000..6129f1d
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_wallpaper_notitlebar_toggle_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_wallpaper_notitlebar_toggle_button_checked.png b/tests/tests/holo/res/drawable-tvdpi/holo_wallpaper_notitlebar_toggle_button_checked.png
new file mode 100644
index 0000000..779b70b
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_wallpaper_notitlebar_toggle_button_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_wallpaper_notitlebar_zoomcontrols.png b/tests/tests/holo/res/drawable-tvdpi/holo_wallpaper_notitlebar_zoomcontrols.png
new file mode 100644
index 0000000..6c2f5c5
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_wallpaper_notitlebar_zoomcontrols.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_wallpaper_progressbar.png b/tests/tests/holo/res/drawable-tvdpi/holo_wallpaper_progressbar.png
new file mode 100644
index 0000000..a5ca94f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_wallpaper_progressbar.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_wallpaper_progressbar_horizontal_0.png b/tests/tests/holo/res/drawable-tvdpi/holo_wallpaper_progressbar_horizontal_0.png
new file mode 100644
index 0000000..592bf27
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_wallpaper_progressbar_horizontal_0.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_wallpaper_progressbar_horizontal_100.png b/tests/tests/holo/res/drawable-tvdpi/holo_wallpaper_progressbar_horizontal_100.png
new file mode 100644
index 0000000..a68c5a0
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_wallpaper_progressbar_horizontal_100.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_wallpaper_progressbar_horizontal_50.png b/tests/tests/holo/res/drawable-tvdpi/holo_wallpaper_progressbar_horizontal_50.png
new file mode 100644
index 0000000..20965f7
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_wallpaper_progressbar_horizontal_50.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_wallpaper_progressbar_large.png b/tests/tests/holo/res/drawable-tvdpi/holo_wallpaper_progressbar_large.png
new file mode 100644
index 0000000..7482a47
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_wallpaper_progressbar_large.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_wallpaper_progressbar_small.png b/tests/tests/holo/res/drawable-tvdpi/holo_wallpaper_progressbar_small.png
new file mode 100644
index 0000000..e454f60
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_wallpaper_progressbar_small.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_wallpaper_radio_button.png b/tests/tests/holo/res/drawable-tvdpi/holo_wallpaper_radio_button.png
new file mode 100644
index 0000000..4c06326
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_wallpaper_radio_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_wallpaper_radio_button_checked.png b/tests/tests/holo/res/drawable-tvdpi/holo_wallpaper_radio_button_checked.png
new file mode 100644
index 0000000..ec14fb0
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_wallpaper_radio_button_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_wallpaper_radiogroup_horizontal.png b/tests/tests/holo/res/drawable-tvdpi/holo_wallpaper_radiogroup_horizontal.png
new file mode 100644
index 0000000..52122d8
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_wallpaper_radiogroup_horizontal.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_wallpaper_radiogroup_vertical.png b/tests/tests/holo/res/drawable-tvdpi/holo_wallpaper_radiogroup_vertical.png
new file mode 100644
index 0000000..f1b20be
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_wallpaper_radiogroup_vertical.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_wallpaper_ratingbar_0.png b/tests/tests/holo/res/drawable-tvdpi/holo_wallpaper_ratingbar_0.png
new file mode 100644
index 0000000..2816574
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_wallpaper_ratingbar_0.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_wallpaper_ratingbar_0_pressed.png b/tests/tests/holo/res/drawable-tvdpi/holo_wallpaper_ratingbar_0_pressed.png
new file mode 100644
index 0000000..c6943d2
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_wallpaper_ratingbar_0_pressed.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_wallpaper_ratingbar_2point5.png b/tests/tests/holo/res/drawable-tvdpi/holo_wallpaper_ratingbar_2point5.png
new file mode 100644
index 0000000..bdba081
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_wallpaper_ratingbar_2point5.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_wallpaper_ratingbar_2point5_pressed.png b/tests/tests/holo/res/drawable-tvdpi/holo_wallpaper_ratingbar_2point5_pressed.png
new file mode 100644
index 0000000..7f95415
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_wallpaper_ratingbar_2point5_pressed.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_wallpaper_ratingbar_5.png b/tests/tests/holo/res/drawable-tvdpi/holo_wallpaper_ratingbar_5.png
new file mode 100644
index 0000000..196404a
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_wallpaper_ratingbar_5.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_wallpaper_ratingbar_5_pressed.png b/tests/tests/holo/res/drawable-tvdpi/holo_wallpaper_ratingbar_5_pressed.png
new file mode 100644
index 0000000..6a21e3e
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_wallpaper_ratingbar_5_pressed.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_wallpaper_searchview.png b/tests/tests/holo/res/drawable-tvdpi/holo_wallpaper_searchview.png
new file mode 100644
index 0000000..fbf4ca0
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_wallpaper_searchview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_wallpaper_searchview_query.png b/tests/tests/holo/res/drawable-tvdpi/holo_wallpaper_searchview_query.png
new file mode 100644
index 0000000..6f437d9
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_wallpaper_searchview_query.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_wallpaper_searchview_query_hint.png b/tests/tests/holo/res/drawable-tvdpi/holo_wallpaper_searchview_query_hint.png
new file mode 100644
index 0000000..bbc8e92
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_wallpaper_searchview_query_hint.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_wallpaper_seekbar_0.png b/tests/tests/holo/res/drawable-tvdpi/holo_wallpaper_seekbar_0.png
new file mode 100644
index 0000000..b753e64
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_wallpaper_seekbar_0.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_wallpaper_seekbar_100.png b/tests/tests/holo/res/drawable-tvdpi/holo_wallpaper_seekbar_100.png
new file mode 100644
index 0000000..cbc2ffe
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_wallpaper_seekbar_100.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_wallpaper_seekbar_50.png b/tests/tests/holo/res/drawable-tvdpi/holo_wallpaper_seekbar_50.png
new file mode 100644
index 0000000..5e0370d
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_wallpaper_seekbar_50.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_wallpaper_spinner.png b/tests/tests/holo/res/drawable-tvdpi/holo_wallpaper_spinner.png
new file mode 100644
index 0000000..7824c9f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_wallpaper_spinner.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_wallpaper_switch.png b/tests/tests/holo/res/drawable-tvdpi/holo_wallpaper_switch.png
new file mode 100644
index 0000000..aa38e43
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_wallpaper_switch.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_wallpaper_switch_checked.png b/tests/tests/holo/res/drawable-tvdpi/holo_wallpaper_switch_checked.png
new file mode 100644
index 0000000..6c9fba9
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_wallpaper_switch_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_wallpaper_tabhost.png b/tests/tests/holo/res/drawable-tvdpi/holo_wallpaper_tabhost.png
new file mode 100644
index 0000000..17593a9
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_wallpaper_tabhost.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_wallpaper_textview.png b/tests/tests/holo/res/drawable-tvdpi/holo_wallpaper_textview.png
new file mode 100644
index 0000000..72df2cf
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_wallpaper_textview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_wallpaper_timepicker.png b/tests/tests/holo/res/drawable-tvdpi/holo_wallpaper_timepicker.png
new file mode 100644
index 0000000..72856ac
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_wallpaper_timepicker.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_wallpaper_toggle_button.png b/tests/tests/holo/res/drawable-tvdpi/holo_wallpaper_toggle_button.png
new file mode 100644
index 0000000..6129f1d
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_wallpaper_toggle_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_wallpaper_toggle_button_checked.png b/tests/tests/holo/res/drawable-tvdpi/holo_wallpaper_toggle_button_checked.png
new file mode 100644
index 0000000..779b70b
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_wallpaper_toggle_button_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_wallpaper_zoomcontrols.png b/tests/tests/holo/res/drawable-tvdpi/holo_wallpaper_zoomcontrols.png
new file mode 100644
index 0000000..6c2f5c5
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_wallpaper_zoomcontrols.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-tvdpi/holo_zoomcontrols.png b/tests/tests/holo/res/drawable-tvdpi/holo_zoomcontrols.png
new file mode 100644
index 0000000..6c2f5c5
--- /dev/null
+++ b/tests/tests/holo/res/drawable-tvdpi/holo_zoomcontrols.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_alertdialog_list.png b/tests/tests/holo/res/drawable-xhdpi/holo_alertdialog_list.png
new file mode 100644
index 0000000..2791d02
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_alertdialog_list.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_alertdialog_multichoice.png b/tests/tests/holo/res/drawable-xhdpi/holo_alertdialog_multichoice.png
new file mode 100644
index 0000000..8f6b6df
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_alertdialog_multichoice.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_alertdialog_onebutton.png b/tests/tests/holo/res/drawable-xhdpi/holo_alertdialog_onebutton.png
new file mode 100644
index 0000000..e0fabdf
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_alertdialog_onebutton.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_alertdialog_singlechoice.png b/tests/tests/holo/res/drawable-xhdpi/holo_alertdialog_singlechoice.png
new file mode 100644
index 0000000..2aec266
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_alertdialog_singlechoice.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_alertdialog_threebuttons.png b/tests/tests/holo/res/drawable-xhdpi/holo_alertdialog_threebuttons.png
new file mode 100644
index 0000000..9d73083
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_alertdialog_threebuttons.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_alertdialog_twobuttons.png b/tests/tests/holo/res/drawable-xhdpi/holo_alertdialog_twobuttons.png
new file mode 100644
index 0000000..34810fa
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_alertdialog_twobuttons.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_button.png b/tests/tests/holo/res/drawable-xhdpi/holo_button.png
new file mode 100644
index 0000000..0478b2e
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_button_pressed.png b/tests/tests/holo/res/drawable-xhdpi/holo_button_pressed.png
new file mode 100644
index 0000000..fa826df
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_button_pressed.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_calendar_view.png b/tests/tests/holo/res/drawable-xhdpi/holo_calendar_view.png
new file mode 100644
index 0000000..7fb7333
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_calendar_view.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_calendar_view_feb.png b/tests/tests/holo/res/drawable-xhdpi/holo_calendar_view_feb.png
new file mode 100644
index 0000000..37f6f4f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_calendar_view_feb.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_checkbox.png b/tests/tests/holo/res/drawable-xhdpi/holo_checkbox.png
new file mode 100644
index 0000000..2e1963f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_checkbox.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_checkbox_checked.png b/tests/tests/holo/res/drawable-xhdpi/holo_checkbox_checked.png
new file mode 100644
index 0000000..4eb39c9
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_checkbox_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_chronometer.png b/tests/tests/holo/res/drawable-xhdpi/holo_chronometer.png
new file mode 100644
index 0000000..2a62d85
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_chronometer.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_color_blue_bright.png b/tests/tests/holo/res/drawable-xhdpi/holo_color_blue_bright.png
new file mode 100644
index 0000000..d1a3f99
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_color_blue_bright.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_color_blue_dark.png b/tests/tests/holo/res/drawable-xhdpi/holo_color_blue_dark.png
new file mode 100644
index 0000000..52a4de2
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_color_blue_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_color_blue_light.png b/tests/tests/holo/res/drawable-xhdpi/holo_color_blue_light.png
new file mode 100644
index 0000000..f9439e8
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_color_blue_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_color_green_dark.png b/tests/tests/holo/res/drawable-xhdpi/holo_color_green_dark.png
new file mode 100644
index 0000000..4f8af58
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_color_green_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_color_green_light.png b/tests/tests/holo/res/drawable-xhdpi/holo_color_green_light.png
new file mode 100644
index 0000000..6ad2394
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_color_green_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_color_orange_dark.png b/tests/tests/holo/res/drawable-xhdpi/holo_color_orange_dark.png
new file mode 100644
index 0000000..73f8418
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_color_orange_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_color_orange_light.png b/tests/tests/holo/res/drawable-xhdpi/holo_color_orange_light.png
new file mode 100644
index 0000000..90ab999
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_color_orange_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_color_purple.png b/tests/tests/holo/res/drawable-xhdpi/holo_color_purple.png
new file mode 100644
index 0000000..30f2d23
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_color_purple.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_color_red_dark.png b/tests/tests/holo/res/drawable-xhdpi/holo_color_red_dark.png
new file mode 100644
index 0000000..c0cbef0
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_color_red_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_color_red_light.png b/tests/tests/holo/res/drawable-xhdpi/holo_color_red_light.png
new file mode 100644
index 0000000..e99df2c
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_color_red_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_dialog_alertdialog_list.png b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_alertdialog_list.png
new file mode 100644
index 0000000..2791d02
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_alertdialog_list.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_dialog_alertdialog_multichoice.png b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_alertdialog_multichoice.png
new file mode 100644
index 0000000..8f6b6df
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_alertdialog_multichoice.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_dialog_alertdialog_onebutton.png b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_alertdialog_onebutton.png
new file mode 100644
index 0000000..e0fabdf
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_alertdialog_onebutton.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_dialog_alertdialog_singlechoice.png b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_alertdialog_singlechoice.png
new file mode 100644
index 0000000..2aec266
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_alertdialog_singlechoice.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_dialog_alertdialog_threebuttons.png b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_alertdialog_threebuttons.png
new file mode 100644
index 0000000..9d73083
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_alertdialog_threebuttons.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_dialog_alertdialog_twobuttons.png b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_alertdialog_twobuttons.png
new file mode 100644
index 0000000..34810fa
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_alertdialog_twobuttons.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_dialog_button.png b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_button.png
new file mode 100644
index 0000000..0478b2e
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_dialog_button_pressed.png b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_button_pressed.png
new file mode 100644
index 0000000..fa826df
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_button_pressed.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_dialog_calendar_view.png b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_calendar_view.png
new file mode 100644
index 0000000..7fb7333
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_calendar_view.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_dialog_calendar_view_feb.png b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_calendar_view_feb.png
new file mode 100644
index 0000000..37f6f4f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_calendar_view_feb.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_dialog_checkbox.png b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_checkbox.png
new file mode 100644
index 0000000..2e1963f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_checkbox.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_dialog_checkbox_checked.png b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_checkbox_checked.png
new file mode 100644
index 0000000..4eb39c9
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_checkbox_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_dialog_chronometer.png b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_chronometer.png
new file mode 100644
index 0000000..2a62d85
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_chronometer.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_dialog_color_blue_bright.png b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_color_blue_bright.png
new file mode 100644
index 0000000..d1a3f99
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_color_blue_bright.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_dialog_color_blue_dark.png b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_color_blue_dark.png
new file mode 100644
index 0000000..52a4de2
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_color_blue_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_dialog_color_blue_light.png b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_color_blue_light.png
new file mode 100644
index 0000000..f9439e8
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_color_blue_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_dialog_color_green_dark.png b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_color_green_dark.png
new file mode 100644
index 0000000..4f8af58
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_color_green_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_dialog_color_green_light.png b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_color_green_light.png
new file mode 100644
index 0000000..6ad2394
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_color_green_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_dialog_color_orange_dark.png b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_color_orange_dark.png
new file mode 100644
index 0000000..73f8418
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_color_orange_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_dialog_color_orange_light.png b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_color_orange_light.png
new file mode 100644
index 0000000..90ab999
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_color_orange_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_dialog_color_purple.png b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_color_purple.png
new file mode 100644
index 0000000..30f2d23
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_color_purple.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_dialog_color_red_dark.png b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_color_red_dark.png
new file mode 100644
index 0000000..c0cbef0
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_color_red_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_dialog_color_red_light.png b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_color_red_light.png
new file mode 100644
index 0000000..e99df2c
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_color_red_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_dialog_edittext.png b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_edittext.png
new file mode 100644
index 0000000..4b41717
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_edittext.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_dialog_minwidth_alertdialog_list.png b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_minwidth_alertdialog_list.png
new file mode 100644
index 0000000..2791d02
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_minwidth_alertdialog_list.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_dialog_minwidth_alertdialog_multichoice.png b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_minwidth_alertdialog_multichoice.png
new file mode 100644
index 0000000..8f6b6df
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_minwidth_alertdialog_multichoice.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_dialog_minwidth_alertdialog_onebutton.png b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_minwidth_alertdialog_onebutton.png
new file mode 100644
index 0000000..e0fabdf
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_minwidth_alertdialog_onebutton.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_dialog_minwidth_alertdialog_singlechoice.png b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_minwidth_alertdialog_singlechoice.png
new file mode 100644
index 0000000..2aec266
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_minwidth_alertdialog_singlechoice.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_dialog_minwidth_alertdialog_threebuttons.png b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_minwidth_alertdialog_threebuttons.png
new file mode 100644
index 0000000..9d73083
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_minwidth_alertdialog_threebuttons.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_dialog_minwidth_alertdialog_twobuttons.png b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_minwidth_alertdialog_twobuttons.png
new file mode 100644
index 0000000..34810fa
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_minwidth_alertdialog_twobuttons.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_dialog_minwidth_button.png b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_minwidth_button.png
new file mode 100644
index 0000000..0478b2e
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_minwidth_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_dialog_minwidth_button_pressed.png b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_minwidth_button_pressed.png
new file mode 100644
index 0000000..fa826df
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_minwidth_button_pressed.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_dialog_minwidth_calendar_view.png b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_minwidth_calendar_view.png
new file mode 100644
index 0000000..7fb7333
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_minwidth_calendar_view.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_dialog_minwidth_calendar_view_feb.png b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_minwidth_calendar_view_feb.png
new file mode 100644
index 0000000..37f6f4f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_minwidth_calendar_view_feb.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_dialog_minwidth_checkbox.png b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_minwidth_checkbox.png
new file mode 100644
index 0000000..2e1963f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_minwidth_checkbox.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_dialog_minwidth_checkbox_checked.png b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_minwidth_checkbox_checked.png
new file mode 100644
index 0000000..4eb39c9
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_minwidth_checkbox_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_dialog_minwidth_chronometer.png b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_minwidth_chronometer.png
new file mode 100644
index 0000000..2a62d85
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_minwidth_chronometer.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_dialog_minwidth_color_blue_bright.png b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_minwidth_color_blue_bright.png
new file mode 100644
index 0000000..d1a3f99
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_minwidth_color_blue_bright.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_dialog_minwidth_color_blue_dark.png b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_minwidth_color_blue_dark.png
new file mode 100644
index 0000000..52a4de2
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_minwidth_color_blue_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_dialog_minwidth_color_blue_light.png b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_minwidth_color_blue_light.png
new file mode 100644
index 0000000..f9439e8
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_minwidth_color_blue_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_dialog_minwidth_color_green_dark.png b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_minwidth_color_green_dark.png
new file mode 100644
index 0000000..4f8af58
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_minwidth_color_green_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_dialog_minwidth_color_green_light.png b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_minwidth_color_green_light.png
new file mode 100644
index 0000000..6ad2394
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_minwidth_color_green_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_dialog_minwidth_color_orange_dark.png b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_minwidth_color_orange_dark.png
new file mode 100644
index 0000000..73f8418
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_minwidth_color_orange_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_dialog_minwidth_color_orange_light.png b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_minwidth_color_orange_light.png
new file mode 100644
index 0000000..90ab999
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_minwidth_color_orange_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_dialog_minwidth_color_purple.png b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_minwidth_color_purple.png
new file mode 100644
index 0000000..30f2d23
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_minwidth_color_purple.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_dialog_minwidth_color_red_dark.png b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_minwidth_color_red_dark.png
new file mode 100644
index 0000000..c0cbef0
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_minwidth_color_red_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_dialog_minwidth_color_red_light.png b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_minwidth_color_red_light.png
new file mode 100644
index 0000000..e99df2c
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_minwidth_color_red_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_dialog_minwidth_edittext.png b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_minwidth_edittext.png
new file mode 100644
index 0000000..4b41717
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_minwidth_edittext.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_dialog_minwidth_progressbar.png b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_minwidth_progressbar.png
new file mode 100644
index 0000000..8bb3363
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_minwidth_progressbar.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_dialog_minwidth_progressbar_horizontal_0.png b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_minwidth_progressbar_horizontal_0.png
new file mode 100644
index 0000000..f1d481d
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_minwidth_progressbar_horizontal_0.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_dialog_minwidth_progressbar_horizontal_100.png b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_minwidth_progressbar_horizontal_100.png
new file mode 100644
index 0000000..a586079
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_minwidth_progressbar_horizontal_100.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_dialog_minwidth_progressbar_horizontal_50.png b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_minwidth_progressbar_horizontal_50.png
new file mode 100644
index 0000000..9467831
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_minwidth_progressbar_horizontal_50.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_dialog_minwidth_progressbar_large.png b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_minwidth_progressbar_large.png
new file mode 100644
index 0000000..98344af
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_minwidth_progressbar_large.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_dialog_minwidth_progressbar_small.png b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_minwidth_progressbar_small.png
new file mode 100644
index 0000000..88ef977
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_minwidth_progressbar_small.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_dialog_minwidth_progressdialog_horizontal.png b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_minwidth_progressdialog_horizontal.png
new file mode 100644
index 0000000..68cc076
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_minwidth_progressdialog_horizontal.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_dialog_minwidth_radio_button.png b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_minwidth_radio_button.png
new file mode 100644
index 0000000..db61da3
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_minwidth_radio_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_dialog_minwidth_radio_button_checked.png b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_minwidth_radio_button_checked.png
new file mode 100644
index 0000000..ea35686
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_minwidth_radio_button_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_dialog_minwidth_radiogroup_horizontal.png b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_minwidth_radiogroup_horizontal.png
new file mode 100644
index 0000000..72b7077
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_minwidth_radiogroup_horizontal.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_dialog_minwidth_radiogroup_vertical.png b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_minwidth_radiogroup_vertical.png
new file mode 100644
index 0000000..c145b7a
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_minwidth_radiogroup_vertical.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_dialog_minwidth_ratingbar_0.png b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_minwidth_ratingbar_0.png
new file mode 100644
index 0000000..517f3d6
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_minwidth_ratingbar_0.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_dialog_minwidth_ratingbar_0_pressed.png b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_minwidth_ratingbar_0_pressed.png
new file mode 100644
index 0000000..c31df16
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_minwidth_ratingbar_0_pressed.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_dialog_minwidth_ratingbar_2point5.png b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_minwidth_ratingbar_2point5.png
new file mode 100644
index 0000000..d184a4f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_minwidth_ratingbar_2point5.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_dialog_minwidth_ratingbar_2point5_pressed.png b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_minwidth_ratingbar_2point5_pressed.png
new file mode 100644
index 0000000..e4fcb80
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_minwidth_ratingbar_2point5_pressed.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_dialog_minwidth_ratingbar_5.png b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_minwidth_ratingbar_5.png
new file mode 100644
index 0000000..ce1c817
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_minwidth_ratingbar_5.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_dialog_minwidth_ratingbar_5_pressed.png b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_minwidth_ratingbar_5_pressed.png
new file mode 100644
index 0000000..f9f41d4
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_minwidth_ratingbar_5_pressed.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_dialog_minwidth_searchview.png b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_minwidth_searchview.png
new file mode 100644
index 0000000..73c611f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_minwidth_searchview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_dialog_minwidth_searchview_query.png b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_minwidth_searchview_query.png
new file mode 100644
index 0000000..a61d007
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_minwidth_searchview_query.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_dialog_minwidth_searchview_query_hint.png b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_minwidth_searchview_query_hint.png
new file mode 100644
index 0000000..139aacc
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_minwidth_searchview_query_hint.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_dialog_minwidth_seekbar_0.png b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_minwidth_seekbar_0.png
new file mode 100644
index 0000000..eb26838
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_minwidth_seekbar_0.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_dialog_minwidth_seekbar_100.png b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_minwidth_seekbar_100.png
new file mode 100644
index 0000000..a5ae2ba
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_minwidth_seekbar_100.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_dialog_minwidth_seekbar_50.png b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_minwidth_seekbar_50.png
new file mode 100644
index 0000000..8438db8
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_minwidth_seekbar_50.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_dialog_minwidth_spinner.png b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_minwidth_spinner.png
new file mode 100644
index 0000000..713ea22
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_minwidth_spinner.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_dialog_minwidth_switch.png b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_minwidth_switch.png
new file mode 100644
index 0000000..001e106
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_minwidth_switch.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_dialog_minwidth_switch_checked.png b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_minwidth_switch_checked.png
new file mode 100644
index 0000000..79e75f3
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_minwidth_switch_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_dialog_minwidth_tabhost.png b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_minwidth_tabhost.png
new file mode 100644
index 0000000..eaeeae7
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_minwidth_tabhost.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_dialog_minwidth_textview.png b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_minwidth_textview.png
new file mode 100644
index 0000000..0d908a5
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_minwidth_textview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_dialog_minwidth_timepicker.png b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_minwidth_timepicker.png
new file mode 100644
index 0000000..c3a4951
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_minwidth_timepicker.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_dialog_minwidth_toggle_button.png b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_minwidth_toggle_button.png
new file mode 100644
index 0000000..cdfb783
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_minwidth_toggle_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_dialog_minwidth_toggle_button_checked.png b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_minwidth_toggle_button_checked.png
new file mode 100644
index 0000000..2c604ee
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_minwidth_toggle_button_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_dialog_minwidth_zoomcontrols.png b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_minwidth_zoomcontrols.png
new file mode 100644
index 0000000..21d17f9
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_minwidth_zoomcontrols.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_dialog_noactionbar_alertdialog_list.png b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_noactionbar_alertdialog_list.png
new file mode 100644
index 0000000..2791d02
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_noactionbar_alertdialog_list.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_dialog_noactionbar_alertdialog_multichoice.png b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_noactionbar_alertdialog_multichoice.png
new file mode 100644
index 0000000..8f6b6df
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_noactionbar_alertdialog_multichoice.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_dialog_noactionbar_alertdialog_onebutton.png b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_noactionbar_alertdialog_onebutton.png
new file mode 100644
index 0000000..e0fabdf
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_noactionbar_alertdialog_onebutton.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_dialog_noactionbar_alertdialog_singlechoice.png b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_noactionbar_alertdialog_singlechoice.png
new file mode 100644
index 0000000..2aec266
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_noactionbar_alertdialog_singlechoice.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_dialog_noactionbar_alertdialog_threebuttons.png b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_noactionbar_alertdialog_threebuttons.png
new file mode 100644
index 0000000..9d73083
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_noactionbar_alertdialog_threebuttons.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_dialog_noactionbar_alertdialog_twobuttons.png b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_noactionbar_alertdialog_twobuttons.png
new file mode 100644
index 0000000..34810fa
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_noactionbar_alertdialog_twobuttons.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_dialog_noactionbar_button.png b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_noactionbar_button.png
new file mode 100644
index 0000000..0478b2e
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_noactionbar_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_dialog_noactionbar_button_pressed.png b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_noactionbar_button_pressed.png
new file mode 100644
index 0000000..fa826df
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_noactionbar_button_pressed.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_dialog_noactionbar_calendar_view.png b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_noactionbar_calendar_view.png
new file mode 100644
index 0000000..7fb7333
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_noactionbar_calendar_view.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_dialog_noactionbar_calendar_view_feb.png b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_noactionbar_calendar_view_feb.png
new file mode 100644
index 0000000..37f6f4f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_noactionbar_calendar_view_feb.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_dialog_noactionbar_checkbox.png b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_noactionbar_checkbox.png
new file mode 100644
index 0000000..2e1963f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_noactionbar_checkbox.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_dialog_noactionbar_checkbox_checked.png b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_noactionbar_checkbox_checked.png
new file mode 100644
index 0000000..4eb39c9
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_noactionbar_checkbox_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_dialog_noactionbar_chronometer.png b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_noactionbar_chronometer.png
new file mode 100644
index 0000000..2a62d85
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_noactionbar_chronometer.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_dialog_noactionbar_color_blue_bright.png b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_noactionbar_color_blue_bright.png
new file mode 100644
index 0000000..d1a3f99
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_noactionbar_color_blue_bright.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_dialog_noactionbar_color_blue_dark.png b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_noactionbar_color_blue_dark.png
new file mode 100644
index 0000000..52a4de2
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_noactionbar_color_blue_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_dialog_noactionbar_color_blue_light.png b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_noactionbar_color_blue_light.png
new file mode 100644
index 0000000..f9439e8
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_noactionbar_color_blue_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_dialog_noactionbar_color_green_dark.png b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_noactionbar_color_green_dark.png
new file mode 100644
index 0000000..4f8af58
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_noactionbar_color_green_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_dialog_noactionbar_color_green_light.png b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_noactionbar_color_green_light.png
new file mode 100644
index 0000000..6ad2394
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_noactionbar_color_green_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_dialog_noactionbar_color_orange_dark.png b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_noactionbar_color_orange_dark.png
new file mode 100644
index 0000000..73f8418
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_noactionbar_color_orange_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_dialog_noactionbar_color_orange_light.png b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_noactionbar_color_orange_light.png
new file mode 100644
index 0000000..90ab999
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_noactionbar_color_orange_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_dialog_noactionbar_color_purple.png b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_noactionbar_color_purple.png
new file mode 100644
index 0000000..30f2d23
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_noactionbar_color_purple.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_dialog_noactionbar_color_red_dark.png b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_noactionbar_color_red_dark.png
new file mode 100644
index 0000000..c0cbef0
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_noactionbar_color_red_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_dialog_noactionbar_color_red_light.png b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_noactionbar_color_red_light.png
new file mode 100644
index 0000000..e99df2c
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_noactionbar_color_red_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_dialog_noactionbar_edittext.png b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_noactionbar_edittext.png
new file mode 100644
index 0000000..4b41717
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_noactionbar_edittext.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_dialog_noactionbar_minwidth_alertdialog_list.png b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_noactionbar_minwidth_alertdialog_list.png
new file mode 100644
index 0000000..2791d02
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_noactionbar_minwidth_alertdialog_list.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_dialog_noactionbar_minwidth_alertdialog_multichoice.png b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_noactionbar_minwidth_alertdialog_multichoice.png
new file mode 100644
index 0000000..8f6b6df
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_noactionbar_minwidth_alertdialog_multichoice.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_dialog_noactionbar_minwidth_alertdialog_onebutton.png b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_noactionbar_minwidth_alertdialog_onebutton.png
new file mode 100644
index 0000000..e0fabdf
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_noactionbar_minwidth_alertdialog_onebutton.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_dialog_noactionbar_minwidth_alertdialog_singlechoice.png b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_noactionbar_minwidth_alertdialog_singlechoice.png
new file mode 100644
index 0000000..2aec266
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_noactionbar_minwidth_alertdialog_singlechoice.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_dialog_noactionbar_minwidth_alertdialog_threebuttons.png b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_noactionbar_minwidth_alertdialog_threebuttons.png
new file mode 100644
index 0000000..9d73083
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_noactionbar_minwidth_alertdialog_threebuttons.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_dialog_noactionbar_minwidth_alertdialog_twobuttons.png b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_noactionbar_minwidth_alertdialog_twobuttons.png
new file mode 100644
index 0000000..34810fa
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_noactionbar_minwidth_alertdialog_twobuttons.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_dialog_noactionbar_minwidth_button.png b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_noactionbar_minwidth_button.png
new file mode 100644
index 0000000..0478b2e
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_noactionbar_minwidth_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_dialog_noactionbar_minwidth_button_pressed.png b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_noactionbar_minwidth_button_pressed.png
new file mode 100644
index 0000000..fa826df
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_noactionbar_minwidth_button_pressed.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_dialog_noactionbar_minwidth_calendar_view.png b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_noactionbar_minwidth_calendar_view.png
new file mode 100644
index 0000000..7fb7333
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_noactionbar_minwidth_calendar_view.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_dialog_noactionbar_minwidth_calendar_view_feb.png b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_noactionbar_minwidth_calendar_view_feb.png
new file mode 100644
index 0000000..37f6f4f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_noactionbar_minwidth_calendar_view_feb.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_dialog_noactionbar_minwidth_checkbox.png b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_noactionbar_minwidth_checkbox.png
new file mode 100644
index 0000000..2e1963f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_noactionbar_minwidth_checkbox.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_dialog_noactionbar_minwidth_checkbox_checked.png b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_noactionbar_minwidth_checkbox_checked.png
new file mode 100644
index 0000000..4eb39c9
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_noactionbar_minwidth_checkbox_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_dialog_noactionbar_minwidth_chronometer.png b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_noactionbar_minwidth_chronometer.png
new file mode 100644
index 0000000..2a62d85
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_noactionbar_minwidth_chronometer.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_dialog_noactionbar_minwidth_color_blue_bright.png b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_noactionbar_minwidth_color_blue_bright.png
new file mode 100644
index 0000000..d1a3f99
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_noactionbar_minwidth_color_blue_bright.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_dialog_noactionbar_minwidth_color_blue_dark.png b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_noactionbar_minwidth_color_blue_dark.png
new file mode 100644
index 0000000..52a4de2
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_noactionbar_minwidth_color_blue_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_dialog_noactionbar_minwidth_color_blue_light.png b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_noactionbar_minwidth_color_blue_light.png
new file mode 100644
index 0000000..f9439e8
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_noactionbar_minwidth_color_blue_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_dialog_noactionbar_minwidth_color_green_dark.png b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_noactionbar_minwidth_color_green_dark.png
new file mode 100644
index 0000000..4f8af58
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_noactionbar_minwidth_color_green_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_dialog_noactionbar_minwidth_color_green_light.png b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_noactionbar_minwidth_color_green_light.png
new file mode 100644
index 0000000..6ad2394
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_noactionbar_minwidth_color_green_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_dialog_noactionbar_minwidth_color_orange_dark.png b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_noactionbar_minwidth_color_orange_dark.png
new file mode 100644
index 0000000..73f8418
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_noactionbar_minwidth_color_orange_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_dialog_noactionbar_minwidth_color_orange_light.png b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_noactionbar_minwidth_color_orange_light.png
new file mode 100644
index 0000000..90ab999
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_noactionbar_minwidth_color_orange_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_dialog_noactionbar_minwidth_color_purple.png b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_noactionbar_minwidth_color_purple.png
new file mode 100644
index 0000000..30f2d23
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_noactionbar_minwidth_color_purple.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_dialog_noactionbar_minwidth_color_red_dark.png b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_noactionbar_minwidth_color_red_dark.png
new file mode 100644
index 0000000..c0cbef0
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_noactionbar_minwidth_color_red_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_dialog_noactionbar_minwidth_color_red_light.png b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_noactionbar_minwidth_color_red_light.png
new file mode 100644
index 0000000..e99df2c
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_noactionbar_minwidth_color_red_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_dialog_noactionbar_minwidth_edittext.png b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_noactionbar_minwidth_edittext.png
new file mode 100644
index 0000000..4b41717
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_noactionbar_minwidth_edittext.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_dialog_noactionbar_minwidth_progressbar.png b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_noactionbar_minwidth_progressbar.png
new file mode 100644
index 0000000..8bb3363
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_noactionbar_minwidth_progressbar.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_dialog_noactionbar_minwidth_progressbar_horizontal_0.png b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_noactionbar_minwidth_progressbar_horizontal_0.png
new file mode 100644
index 0000000..f1d481d
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_noactionbar_minwidth_progressbar_horizontal_0.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_dialog_noactionbar_minwidth_progressbar_horizontal_100.png b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_noactionbar_minwidth_progressbar_horizontal_100.png
new file mode 100644
index 0000000..a586079
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_noactionbar_minwidth_progressbar_horizontal_100.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_dialog_noactionbar_minwidth_progressbar_horizontal_50.png b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_noactionbar_minwidth_progressbar_horizontal_50.png
new file mode 100644
index 0000000..9467831
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_noactionbar_minwidth_progressbar_horizontal_50.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_dialog_noactionbar_minwidth_progressbar_large.png b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_noactionbar_minwidth_progressbar_large.png
new file mode 100644
index 0000000..98344af
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_noactionbar_minwidth_progressbar_large.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_dialog_noactionbar_minwidth_progressbar_small.png b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_noactionbar_minwidth_progressbar_small.png
new file mode 100644
index 0000000..88ef977
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_noactionbar_minwidth_progressbar_small.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_dialog_noactionbar_minwidth_progressdialog_horizontal.png b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_noactionbar_minwidth_progressdialog_horizontal.png
new file mode 100644
index 0000000..68cc076
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_noactionbar_minwidth_progressdialog_horizontal.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_dialog_noactionbar_minwidth_radio_button.png b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_noactionbar_minwidth_radio_button.png
new file mode 100644
index 0000000..db61da3
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_noactionbar_minwidth_radio_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_dialog_noactionbar_minwidth_radio_button_checked.png b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_noactionbar_minwidth_radio_button_checked.png
new file mode 100644
index 0000000..ea35686
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_noactionbar_minwidth_radio_button_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_dialog_noactionbar_minwidth_radiogroup_horizontal.png b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_noactionbar_minwidth_radiogroup_horizontal.png
new file mode 100644
index 0000000..72b7077
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_noactionbar_minwidth_radiogroup_horizontal.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_dialog_noactionbar_minwidth_radiogroup_vertical.png b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_noactionbar_minwidth_radiogroup_vertical.png
new file mode 100644
index 0000000..c145b7a
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_noactionbar_minwidth_radiogroup_vertical.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_dialog_noactionbar_minwidth_ratingbar_0.png b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_noactionbar_minwidth_ratingbar_0.png
new file mode 100644
index 0000000..517f3d6
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_noactionbar_minwidth_ratingbar_0.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_dialog_noactionbar_minwidth_ratingbar_0_pressed.png b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_noactionbar_minwidth_ratingbar_0_pressed.png
new file mode 100644
index 0000000..c31df16
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_noactionbar_minwidth_ratingbar_0_pressed.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_dialog_noactionbar_minwidth_ratingbar_2point5.png b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_noactionbar_minwidth_ratingbar_2point5.png
new file mode 100644
index 0000000..d184a4f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_noactionbar_minwidth_ratingbar_2point5.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_dialog_noactionbar_minwidth_ratingbar_2point5_pressed.png b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_noactionbar_minwidth_ratingbar_2point5_pressed.png
new file mode 100644
index 0000000..e4fcb80
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_noactionbar_minwidth_ratingbar_2point5_pressed.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_dialog_noactionbar_minwidth_ratingbar_5.png b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_noactionbar_minwidth_ratingbar_5.png
new file mode 100644
index 0000000..ce1c817
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_noactionbar_minwidth_ratingbar_5.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_dialog_noactionbar_minwidth_ratingbar_5_pressed.png b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_noactionbar_minwidth_ratingbar_5_pressed.png
new file mode 100644
index 0000000..f9f41d4
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_noactionbar_minwidth_ratingbar_5_pressed.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_dialog_noactionbar_minwidth_searchview.png b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_noactionbar_minwidth_searchview.png
new file mode 100644
index 0000000..73c611f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_noactionbar_minwidth_searchview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_dialog_noactionbar_minwidth_searchview_query.png b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_noactionbar_minwidth_searchview_query.png
new file mode 100644
index 0000000..a61d007
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_noactionbar_minwidth_searchview_query.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_dialog_noactionbar_minwidth_searchview_query_hint.png b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_noactionbar_minwidth_searchview_query_hint.png
new file mode 100644
index 0000000..139aacc
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_noactionbar_minwidth_searchview_query_hint.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_dialog_noactionbar_minwidth_seekbar_0.png b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_noactionbar_minwidth_seekbar_0.png
new file mode 100644
index 0000000..eb26838
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_noactionbar_minwidth_seekbar_0.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_dialog_noactionbar_minwidth_seekbar_100.png b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_noactionbar_minwidth_seekbar_100.png
new file mode 100644
index 0000000..a5ae2ba
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_noactionbar_minwidth_seekbar_100.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_dialog_noactionbar_minwidth_seekbar_50.png b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_noactionbar_minwidth_seekbar_50.png
new file mode 100644
index 0000000..8438db8
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_noactionbar_minwidth_seekbar_50.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_dialog_noactionbar_minwidth_spinner.png b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_noactionbar_minwidth_spinner.png
new file mode 100644
index 0000000..713ea22
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_noactionbar_minwidth_spinner.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_dialog_noactionbar_minwidth_switch.png b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_noactionbar_minwidth_switch.png
new file mode 100644
index 0000000..001e106
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_noactionbar_minwidth_switch.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_dialog_noactionbar_minwidth_switch_checked.png b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_noactionbar_minwidth_switch_checked.png
new file mode 100644
index 0000000..79e75f3
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_noactionbar_minwidth_switch_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_dialog_noactionbar_minwidth_tabhost.png b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_noactionbar_minwidth_tabhost.png
new file mode 100644
index 0000000..eaeeae7
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_noactionbar_minwidth_tabhost.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_dialog_noactionbar_minwidth_textview.png b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_noactionbar_minwidth_textview.png
new file mode 100644
index 0000000..0d908a5
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_noactionbar_minwidth_textview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_dialog_noactionbar_minwidth_timepicker.png b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_noactionbar_minwidth_timepicker.png
new file mode 100644
index 0000000..c3a4951
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_noactionbar_minwidth_timepicker.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_dialog_noactionbar_minwidth_toggle_button.png b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_noactionbar_minwidth_toggle_button.png
new file mode 100644
index 0000000..cdfb783
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_noactionbar_minwidth_toggle_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_dialog_noactionbar_minwidth_toggle_button_checked.png b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_noactionbar_minwidth_toggle_button_checked.png
new file mode 100644
index 0000000..2c604ee
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_noactionbar_minwidth_toggle_button_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_dialog_noactionbar_minwidth_zoomcontrols.png b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_noactionbar_minwidth_zoomcontrols.png
new file mode 100644
index 0000000..21d17f9
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_noactionbar_minwidth_zoomcontrols.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_dialog_noactionbar_progressbar.png b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_noactionbar_progressbar.png
new file mode 100644
index 0000000..8bb3363
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_noactionbar_progressbar.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_dialog_noactionbar_progressbar_horizontal_0.png b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_noactionbar_progressbar_horizontal_0.png
new file mode 100644
index 0000000..f1d481d
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_noactionbar_progressbar_horizontal_0.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_dialog_noactionbar_progressbar_horizontal_100.png b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_noactionbar_progressbar_horizontal_100.png
new file mode 100644
index 0000000..a586079
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_noactionbar_progressbar_horizontal_100.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_dialog_noactionbar_progressbar_horizontal_50.png b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_noactionbar_progressbar_horizontal_50.png
new file mode 100644
index 0000000..9467831
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_noactionbar_progressbar_horizontal_50.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_dialog_noactionbar_progressbar_large.png b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_noactionbar_progressbar_large.png
new file mode 100644
index 0000000..98344af
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_noactionbar_progressbar_large.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_dialog_noactionbar_progressbar_small.png b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_noactionbar_progressbar_small.png
new file mode 100644
index 0000000..88ef977
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_noactionbar_progressbar_small.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_dialog_noactionbar_progressdialog_horizontal.png b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_noactionbar_progressdialog_horizontal.png
new file mode 100644
index 0000000..68cc076
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_noactionbar_progressdialog_horizontal.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_dialog_noactionbar_radio_button.png b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_noactionbar_radio_button.png
new file mode 100644
index 0000000..db61da3
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_noactionbar_radio_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_dialog_noactionbar_radio_button_checked.png b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_noactionbar_radio_button_checked.png
new file mode 100644
index 0000000..ea35686
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_noactionbar_radio_button_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_dialog_noactionbar_radiogroup_horizontal.png b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_noactionbar_radiogroup_horizontal.png
new file mode 100644
index 0000000..72b7077
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_noactionbar_radiogroup_horizontal.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_dialog_noactionbar_radiogroup_vertical.png b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_noactionbar_radiogroup_vertical.png
new file mode 100644
index 0000000..c145b7a
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_noactionbar_radiogroup_vertical.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_dialog_noactionbar_ratingbar_0.png b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_noactionbar_ratingbar_0.png
new file mode 100644
index 0000000..517f3d6
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_noactionbar_ratingbar_0.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_dialog_noactionbar_ratingbar_0_pressed.png b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_noactionbar_ratingbar_0_pressed.png
new file mode 100644
index 0000000..c31df16
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_noactionbar_ratingbar_0_pressed.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_dialog_noactionbar_ratingbar_2point5.png b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_noactionbar_ratingbar_2point5.png
new file mode 100644
index 0000000..d184a4f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_noactionbar_ratingbar_2point5.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_dialog_noactionbar_ratingbar_2point5_pressed.png b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_noactionbar_ratingbar_2point5_pressed.png
new file mode 100644
index 0000000..e4fcb80
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_noactionbar_ratingbar_2point5_pressed.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_dialog_noactionbar_ratingbar_5.png b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_noactionbar_ratingbar_5.png
new file mode 100644
index 0000000..ce1c817
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_noactionbar_ratingbar_5.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_dialog_noactionbar_ratingbar_5_pressed.png b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_noactionbar_ratingbar_5_pressed.png
new file mode 100644
index 0000000..f9f41d4
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_noactionbar_ratingbar_5_pressed.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_dialog_noactionbar_searchview.png b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_noactionbar_searchview.png
new file mode 100644
index 0000000..73c611f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_noactionbar_searchview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_dialog_noactionbar_searchview_query.png b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_noactionbar_searchview_query.png
new file mode 100644
index 0000000..a61d007
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_noactionbar_searchview_query.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_dialog_noactionbar_searchview_query_hint.png b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_noactionbar_searchview_query_hint.png
new file mode 100644
index 0000000..139aacc
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_noactionbar_searchview_query_hint.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_dialog_noactionbar_seekbar_0.png b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_noactionbar_seekbar_0.png
new file mode 100644
index 0000000..eb26838
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_noactionbar_seekbar_0.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_dialog_noactionbar_seekbar_100.png b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_noactionbar_seekbar_100.png
new file mode 100644
index 0000000..a5ae2ba
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_noactionbar_seekbar_100.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_dialog_noactionbar_seekbar_50.png b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_noactionbar_seekbar_50.png
new file mode 100644
index 0000000..8438db8
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_noactionbar_seekbar_50.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_dialog_noactionbar_spinner.png b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_noactionbar_spinner.png
new file mode 100644
index 0000000..713ea22
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_noactionbar_spinner.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_dialog_noactionbar_switch.png b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_noactionbar_switch.png
new file mode 100644
index 0000000..001e106
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_noactionbar_switch.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_dialog_noactionbar_switch_checked.png b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_noactionbar_switch_checked.png
new file mode 100644
index 0000000..79e75f3
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_noactionbar_switch_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_dialog_noactionbar_tabhost.png b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_noactionbar_tabhost.png
new file mode 100644
index 0000000..eaeeae7
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_noactionbar_tabhost.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_dialog_noactionbar_textview.png b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_noactionbar_textview.png
new file mode 100644
index 0000000..0d908a5
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_noactionbar_textview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_dialog_noactionbar_timepicker.png b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_noactionbar_timepicker.png
new file mode 100644
index 0000000..c3a4951
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_noactionbar_timepicker.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_dialog_noactionbar_toggle_button.png b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_noactionbar_toggle_button.png
new file mode 100644
index 0000000..cdfb783
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_noactionbar_toggle_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_dialog_noactionbar_toggle_button_checked.png b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_noactionbar_toggle_button_checked.png
new file mode 100644
index 0000000..2c604ee
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_noactionbar_toggle_button_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_dialog_noactionbar_zoomcontrols.png b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_noactionbar_zoomcontrols.png
new file mode 100644
index 0000000..21d17f9
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_noactionbar_zoomcontrols.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_dialog_progressbar.png b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_progressbar.png
new file mode 100644
index 0000000..8bb3363
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_progressbar.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_dialog_progressbar_horizontal_0.png b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_progressbar_horizontal_0.png
new file mode 100644
index 0000000..f1d481d
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_progressbar_horizontal_0.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_dialog_progressbar_horizontal_100.png b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_progressbar_horizontal_100.png
new file mode 100644
index 0000000..a586079
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_progressbar_horizontal_100.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_dialog_progressbar_horizontal_50.png b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_progressbar_horizontal_50.png
new file mode 100644
index 0000000..9467831
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_progressbar_horizontal_50.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_dialog_progressbar_large.png b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_progressbar_large.png
new file mode 100644
index 0000000..98344af
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_progressbar_large.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_dialog_progressbar_small.png b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_progressbar_small.png
new file mode 100644
index 0000000..88ef977
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_progressbar_small.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_dialog_progressdialog_horizontal.png b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_progressdialog_horizontal.png
new file mode 100644
index 0000000..68cc076
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_progressdialog_horizontal.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_dialog_radio_button.png b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_radio_button.png
new file mode 100644
index 0000000..db61da3
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_radio_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_dialog_radio_button_checked.png b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_radio_button_checked.png
new file mode 100644
index 0000000..ea35686
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_radio_button_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_dialog_radiogroup_horizontal.png b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_radiogroup_horizontal.png
new file mode 100644
index 0000000..72b7077
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_radiogroup_horizontal.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_dialog_radiogroup_vertical.png b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_radiogroup_vertical.png
new file mode 100644
index 0000000..c145b7a
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_radiogroup_vertical.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_dialog_ratingbar_0.png b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_ratingbar_0.png
new file mode 100644
index 0000000..517f3d6
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_ratingbar_0.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_dialog_ratingbar_0_pressed.png b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_ratingbar_0_pressed.png
new file mode 100644
index 0000000..c31df16
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_ratingbar_0_pressed.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_dialog_ratingbar_2point5.png b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_ratingbar_2point5.png
new file mode 100644
index 0000000..d184a4f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_ratingbar_2point5.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_dialog_ratingbar_2point5_pressed.png b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_ratingbar_2point5_pressed.png
new file mode 100644
index 0000000..e4fcb80
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_ratingbar_2point5_pressed.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_dialog_ratingbar_5.png b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_ratingbar_5.png
new file mode 100644
index 0000000..ce1c817
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_ratingbar_5.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_dialog_ratingbar_5_pressed.png b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_ratingbar_5_pressed.png
new file mode 100644
index 0000000..f9f41d4
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_ratingbar_5_pressed.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_dialog_searchview.png b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_searchview.png
new file mode 100644
index 0000000..73c611f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_searchview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_dialog_searchview_query.png b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_searchview_query.png
new file mode 100644
index 0000000..a61d007
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_searchview_query.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_dialog_searchview_query_hint.png b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_searchview_query_hint.png
new file mode 100644
index 0000000..139aacc
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_searchview_query_hint.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_dialog_seekbar_0.png b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_seekbar_0.png
new file mode 100644
index 0000000..eb26838
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_seekbar_0.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_dialog_seekbar_100.png b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_seekbar_100.png
new file mode 100644
index 0000000..a5ae2ba
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_seekbar_100.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_dialog_seekbar_50.png b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_seekbar_50.png
new file mode 100644
index 0000000..8438db8
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_seekbar_50.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_dialog_spinner.png b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_spinner.png
new file mode 100644
index 0000000..713ea22
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_spinner.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_dialog_switch.png b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_switch.png
new file mode 100644
index 0000000..001e106
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_switch.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_dialog_switch_checked.png b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_switch_checked.png
new file mode 100644
index 0000000..79e75f3
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_switch_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_dialog_tabhost.png b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_tabhost.png
new file mode 100644
index 0000000..eaeeae7
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_tabhost.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_dialog_textview.png b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_textview.png
new file mode 100644
index 0000000..0d908a5
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_textview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_dialog_timepicker.png b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_timepicker.png
new file mode 100644
index 0000000..c3a4951
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_timepicker.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_dialog_toggle_button.png b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_toggle_button.png
new file mode 100644
index 0000000..cdfb783
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_toggle_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_dialog_toggle_button_checked.png b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_toggle_button_checked.png
new file mode 100644
index 0000000..2c604ee
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_toggle_button_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_dialog_zoomcontrols.png b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_zoomcontrols.png
new file mode 100644
index 0000000..21d17f9
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_dialog_zoomcontrols.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_dialogwhenlarge_alertdialog_list.png b/tests/tests/holo/res/drawable-xhdpi/holo_dialogwhenlarge_alertdialog_list.png
new file mode 100644
index 0000000..2791d02
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_dialogwhenlarge_alertdialog_list.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_dialogwhenlarge_alertdialog_multichoice.png b/tests/tests/holo/res/drawable-xhdpi/holo_dialogwhenlarge_alertdialog_multichoice.png
new file mode 100644
index 0000000..8f6b6df
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_dialogwhenlarge_alertdialog_multichoice.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_dialogwhenlarge_alertdialog_onebutton.png b/tests/tests/holo/res/drawable-xhdpi/holo_dialogwhenlarge_alertdialog_onebutton.png
new file mode 100644
index 0000000..e0fabdf
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_dialogwhenlarge_alertdialog_onebutton.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_dialogwhenlarge_alertdialog_singlechoice.png b/tests/tests/holo/res/drawable-xhdpi/holo_dialogwhenlarge_alertdialog_singlechoice.png
new file mode 100644
index 0000000..2aec266
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_dialogwhenlarge_alertdialog_singlechoice.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_dialogwhenlarge_alertdialog_threebuttons.png b/tests/tests/holo/res/drawable-xhdpi/holo_dialogwhenlarge_alertdialog_threebuttons.png
new file mode 100644
index 0000000..9d73083
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_dialogwhenlarge_alertdialog_threebuttons.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_dialogwhenlarge_alertdialog_twobuttons.png b/tests/tests/holo/res/drawable-xhdpi/holo_dialogwhenlarge_alertdialog_twobuttons.png
new file mode 100644
index 0000000..34810fa
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_dialogwhenlarge_alertdialog_twobuttons.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_dialogwhenlarge_button.png b/tests/tests/holo/res/drawable-xhdpi/holo_dialogwhenlarge_button.png
new file mode 100644
index 0000000..0478b2e
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_dialogwhenlarge_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_dialogwhenlarge_button_pressed.png b/tests/tests/holo/res/drawable-xhdpi/holo_dialogwhenlarge_button_pressed.png
new file mode 100644
index 0000000..fa826df
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_dialogwhenlarge_button_pressed.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_dialogwhenlarge_calendar_view.png b/tests/tests/holo/res/drawable-xhdpi/holo_dialogwhenlarge_calendar_view.png
new file mode 100644
index 0000000..7fb7333
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_dialogwhenlarge_calendar_view.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_dialogwhenlarge_calendar_view_feb.png b/tests/tests/holo/res/drawable-xhdpi/holo_dialogwhenlarge_calendar_view_feb.png
new file mode 100644
index 0000000..37f6f4f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_dialogwhenlarge_calendar_view_feb.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_dialogwhenlarge_checkbox.png b/tests/tests/holo/res/drawable-xhdpi/holo_dialogwhenlarge_checkbox.png
new file mode 100644
index 0000000..2e1963f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_dialogwhenlarge_checkbox.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_dialogwhenlarge_checkbox_checked.png b/tests/tests/holo/res/drawable-xhdpi/holo_dialogwhenlarge_checkbox_checked.png
new file mode 100644
index 0000000..4eb39c9
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_dialogwhenlarge_checkbox_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_dialogwhenlarge_chronometer.png b/tests/tests/holo/res/drawable-xhdpi/holo_dialogwhenlarge_chronometer.png
new file mode 100644
index 0000000..2a62d85
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_dialogwhenlarge_chronometer.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_dialogwhenlarge_color_blue_bright.png b/tests/tests/holo/res/drawable-xhdpi/holo_dialogwhenlarge_color_blue_bright.png
new file mode 100644
index 0000000..d1a3f99
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_dialogwhenlarge_color_blue_bright.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_dialogwhenlarge_color_blue_dark.png b/tests/tests/holo/res/drawable-xhdpi/holo_dialogwhenlarge_color_blue_dark.png
new file mode 100644
index 0000000..52a4de2
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_dialogwhenlarge_color_blue_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_dialogwhenlarge_color_blue_light.png b/tests/tests/holo/res/drawable-xhdpi/holo_dialogwhenlarge_color_blue_light.png
new file mode 100644
index 0000000..f9439e8
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_dialogwhenlarge_color_blue_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_dialogwhenlarge_color_green_dark.png b/tests/tests/holo/res/drawable-xhdpi/holo_dialogwhenlarge_color_green_dark.png
new file mode 100644
index 0000000..4f8af58
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_dialogwhenlarge_color_green_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_dialogwhenlarge_color_green_light.png b/tests/tests/holo/res/drawable-xhdpi/holo_dialogwhenlarge_color_green_light.png
new file mode 100644
index 0000000..6ad2394
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_dialogwhenlarge_color_green_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_dialogwhenlarge_color_orange_dark.png b/tests/tests/holo/res/drawable-xhdpi/holo_dialogwhenlarge_color_orange_dark.png
new file mode 100644
index 0000000..73f8418
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_dialogwhenlarge_color_orange_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_dialogwhenlarge_color_orange_light.png b/tests/tests/holo/res/drawable-xhdpi/holo_dialogwhenlarge_color_orange_light.png
new file mode 100644
index 0000000..90ab999
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_dialogwhenlarge_color_orange_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_dialogwhenlarge_color_purple.png b/tests/tests/holo/res/drawable-xhdpi/holo_dialogwhenlarge_color_purple.png
new file mode 100644
index 0000000..30f2d23
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_dialogwhenlarge_color_purple.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_dialogwhenlarge_color_red_dark.png b/tests/tests/holo/res/drawable-xhdpi/holo_dialogwhenlarge_color_red_dark.png
new file mode 100644
index 0000000..c0cbef0
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_dialogwhenlarge_color_red_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_dialogwhenlarge_color_red_light.png b/tests/tests/holo/res/drawable-xhdpi/holo_dialogwhenlarge_color_red_light.png
new file mode 100644
index 0000000..e99df2c
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_dialogwhenlarge_color_red_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_dialogwhenlarge_edittext.png b/tests/tests/holo/res/drawable-xhdpi/holo_dialogwhenlarge_edittext.png
new file mode 100644
index 0000000..4b41717
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_dialogwhenlarge_edittext.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_dialogwhenlarge_noactionbar_alertdialog_list.png b/tests/tests/holo/res/drawable-xhdpi/holo_dialogwhenlarge_noactionbar_alertdialog_list.png
new file mode 100644
index 0000000..2791d02
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_dialogwhenlarge_noactionbar_alertdialog_list.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_dialogwhenlarge_noactionbar_alertdialog_multichoice.png b/tests/tests/holo/res/drawable-xhdpi/holo_dialogwhenlarge_noactionbar_alertdialog_multichoice.png
new file mode 100644
index 0000000..8f6b6df
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_dialogwhenlarge_noactionbar_alertdialog_multichoice.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_dialogwhenlarge_noactionbar_alertdialog_onebutton.png b/tests/tests/holo/res/drawable-xhdpi/holo_dialogwhenlarge_noactionbar_alertdialog_onebutton.png
new file mode 100644
index 0000000..e0fabdf
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_dialogwhenlarge_noactionbar_alertdialog_onebutton.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_dialogwhenlarge_noactionbar_alertdialog_singlechoice.png b/tests/tests/holo/res/drawable-xhdpi/holo_dialogwhenlarge_noactionbar_alertdialog_singlechoice.png
new file mode 100644
index 0000000..2aec266
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_dialogwhenlarge_noactionbar_alertdialog_singlechoice.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_dialogwhenlarge_noactionbar_alertdialog_threebuttons.png b/tests/tests/holo/res/drawable-xhdpi/holo_dialogwhenlarge_noactionbar_alertdialog_threebuttons.png
new file mode 100644
index 0000000..9d73083
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_dialogwhenlarge_noactionbar_alertdialog_threebuttons.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_dialogwhenlarge_noactionbar_alertdialog_twobuttons.png b/tests/tests/holo/res/drawable-xhdpi/holo_dialogwhenlarge_noactionbar_alertdialog_twobuttons.png
new file mode 100644
index 0000000..34810fa
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_dialogwhenlarge_noactionbar_alertdialog_twobuttons.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_dialogwhenlarge_noactionbar_button.png b/tests/tests/holo/res/drawable-xhdpi/holo_dialogwhenlarge_noactionbar_button.png
new file mode 100644
index 0000000..0478b2e
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_dialogwhenlarge_noactionbar_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_dialogwhenlarge_noactionbar_button_pressed.png b/tests/tests/holo/res/drawable-xhdpi/holo_dialogwhenlarge_noactionbar_button_pressed.png
new file mode 100644
index 0000000..fa826df
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_dialogwhenlarge_noactionbar_button_pressed.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_dialogwhenlarge_noactionbar_calendar_view.png b/tests/tests/holo/res/drawable-xhdpi/holo_dialogwhenlarge_noactionbar_calendar_view.png
new file mode 100644
index 0000000..7fb7333
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_dialogwhenlarge_noactionbar_calendar_view.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_dialogwhenlarge_noactionbar_calendar_view_feb.png b/tests/tests/holo/res/drawable-xhdpi/holo_dialogwhenlarge_noactionbar_calendar_view_feb.png
new file mode 100644
index 0000000..37f6f4f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_dialogwhenlarge_noactionbar_calendar_view_feb.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_dialogwhenlarge_noactionbar_checkbox.png b/tests/tests/holo/res/drawable-xhdpi/holo_dialogwhenlarge_noactionbar_checkbox.png
new file mode 100644
index 0000000..2e1963f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_dialogwhenlarge_noactionbar_checkbox.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_dialogwhenlarge_noactionbar_checkbox_checked.png b/tests/tests/holo/res/drawable-xhdpi/holo_dialogwhenlarge_noactionbar_checkbox_checked.png
new file mode 100644
index 0000000..4eb39c9
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_dialogwhenlarge_noactionbar_checkbox_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_dialogwhenlarge_noactionbar_chronometer.png b/tests/tests/holo/res/drawable-xhdpi/holo_dialogwhenlarge_noactionbar_chronometer.png
new file mode 100644
index 0000000..2a62d85
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_dialogwhenlarge_noactionbar_chronometer.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_dialogwhenlarge_noactionbar_color_blue_bright.png b/tests/tests/holo/res/drawable-xhdpi/holo_dialogwhenlarge_noactionbar_color_blue_bright.png
new file mode 100644
index 0000000..d1a3f99
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_dialogwhenlarge_noactionbar_color_blue_bright.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_dialogwhenlarge_noactionbar_color_blue_dark.png b/tests/tests/holo/res/drawable-xhdpi/holo_dialogwhenlarge_noactionbar_color_blue_dark.png
new file mode 100644
index 0000000..52a4de2
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_dialogwhenlarge_noactionbar_color_blue_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_dialogwhenlarge_noactionbar_color_blue_light.png b/tests/tests/holo/res/drawable-xhdpi/holo_dialogwhenlarge_noactionbar_color_blue_light.png
new file mode 100644
index 0000000..f9439e8
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_dialogwhenlarge_noactionbar_color_blue_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_dialogwhenlarge_noactionbar_color_green_dark.png b/tests/tests/holo/res/drawable-xhdpi/holo_dialogwhenlarge_noactionbar_color_green_dark.png
new file mode 100644
index 0000000..4f8af58
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_dialogwhenlarge_noactionbar_color_green_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_dialogwhenlarge_noactionbar_color_green_light.png b/tests/tests/holo/res/drawable-xhdpi/holo_dialogwhenlarge_noactionbar_color_green_light.png
new file mode 100644
index 0000000..6ad2394
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_dialogwhenlarge_noactionbar_color_green_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_dialogwhenlarge_noactionbar_color_orange_dark.png b/tests/tests/holo/res/drawable-xhdpi/holo_dialogwhenlarge_noactionbar_color_orange_dark.png
new file mode 100644
index 0000000..73f8418
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_dialogwhenlarge_noactionbar_color_orange_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_dialogwhenlarge_noactionbar_color_orange_light.png b/tests/tests/holo/res/drawable-xhdpi/holo_dialogwhenlarge_noactionbar_color_orange_light.png
new file mode 100644
index 0000000..90ab999
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_dialogwhenlarge_noactionbar_color_orange_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_dialogwhenlarge_noactionbar_color_purple.png b/tests/tests/holo/res/drawable-xhdpi/holo_dialogwhenlarge_noactionbar_color_purple.png
new file mode 100644
index 0000000..30f2d23
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_dialogwhenlarge_noactionbar_color_purple.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_dialogwhenlarge_noactionbar_color_red_dark.png b/tests/tests/holo/res/drawable-xhdpi/holo_dialogwhenlarge_noactionbar_color_red_dark.png
new file mode 100644
index 0000000..c0cbef0
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_dialogwhenlarge_noactionbar_color_red_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_dialogwhenlarge_noactionbar_color_red_light.png b/tests/tests/holo/res/drawable-xhdpi/holo_dialogwhenlarge_noactionbar_color_red_light.png
new file mode 100644
index 0000000..e99df2c
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_dialogwhenlarge_noactionbar_color_red_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_dialogwhenlarge_noactionbar_edittext.png b/tests/tests/holo/res/drawable-xhdpi/holo_dialogwhenlarge_noactionbar_edittext.png
new file mode 100644
index 0000000..4b41717
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_dialogwhenlarge_noactionbar_edittext.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_dialogwhenlarge_noactionbar_progressbar.png b/tests/tests/holo/res/drawable-xhdpi/holo_dialogwhenlarge_noactionbar_progressbar.png
new file mode 100644
index 0000000..8bb3363
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_dialogwhenlarge_noactionbar_progressbar.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_dialogwhenlarge_noactionbar_progressbar_horizontal_0.png b/tests/tests/holo/res/drawable-xhdpi/holo_dialogwhenlarge_noactionbar_progressbar_horizontal_0.png
new file mode 100644
index 0000000..f1d481d
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_dialogwhenlarge_noactionbar_progressbar_horizontal_0.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_dialogwhenlarge_noactionbar_progressbar_horizontal_100.png b/tests/tests/holo/res/drawable-xhdpi/holo_dialogwhenlarge_noactionbar_progressbar_horizontal_100.png
new file mode 100644
index 0000000..a586079
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_dialogwhenlarge_noactionbar_progressbar_horizontal_100.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_dialogwhenlarge_noactionbar_progressbar_horizontal_50.png b/tests/tests/holo/res/drawable-xhdpi/holo_dialogwhenlarge_noactionbar_progressbar_horizontal_50.png
new file mode 100644
index 0000000..9467831
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_dialogwhenlarge_noactionbar_progressbar_horizontal_50.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_dialogwhenlarge_noactionbar_progressbar_large.png b/tests/tests/holo/res/drawable-xhdpi/holo_dialogwhenlarge_noactionbar_progressbar_large.png
new file mode 100644
index 0000000..98344af
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_dialogwhenlarge_noactionbar_progressbar_large.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_dialogwhenlarge_noactionbar_progressbar_small.png b/tests/tests/holo/res/drawable-xhdpi/holo_dialogwhenlarge_noactionbar_progressbar_small.png
new file mode 100644
index 0000000..88ef977
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_dialogwhenlarge_noactionbar_progressbar_small.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_dialogwhenlarge_noactionbar_progressdialog_horizontal.png b/tests/tests/holo/res/drawable-xhdpi/holo_dialogwhenlarge_noactionbar_progressdialog_horizontal.png
new file mode 100644
index 0000000..68cc076
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_dialogwhenlarge_noactionbar_progressdialog_horizontal.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_dialogwhenlarge_noactionbar_radio_button.png b/tests/tests/holo/res/drawable-xhdpi/holo_dialogwhenlarge_noactionbar_radio_button.png
new file mode 100644
index 0000000..db61da3
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_dialogwhenlarge_noactionbar_radio_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_dialogwhenlarge_noactionbar_radio_button_checked.png b/tests/tests/holo/res/drawable-xhdpi/holo_dialogwhenlarge_noactionbar_radio_button_checked.png
new file mode 100644
index 0000000..ea35686
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_dialogwhenlarge_noactionbar_radio_button_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_dialogwhenlarge_noactionbar_radiogroup_horizontal.png b/tests/tests/holo/res/drawable-xhdpi/holo_dialogwhenlarge_noactionbar_radiogroup_horizontal.png
new file mode 100644
index 0000000..72b7077
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_dialogwhenlarge_noactionbar_radiogroup_horizontal.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_dialogwhenlarge_noactionbar_radiogroup_vertical.png b/tests/tests/holo/res/drawable-xhdpi/holo_dialogwhenlarge_noactionbar_radiogroup_vertical.png
new file mode 100644
index 0000000..c145b7a
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_dialogwhenlarge_noactionbar_radiogroup_vertical.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_dialogwhenlarge_noactionbar_ratingbar_0.png b/tests/tests/holo/res/drawable-xhdpi/holo_dialogwhenlarge_noactionbar_ratingbar_0.png
new file mode 100644
index 0000000..517f3d6
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_dialogwhenlarge_noactionbar_ratingbar_0.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_dialogwhenlarge_noactionbar_ratingbar_0_pressed.png b/tests/tests/holo/res/drawable-xhdpi/holo_dialogwhenlarge_noactionbar_ratingbar_0_pressed.png
new file mode 100644
index 0000000..c31df16
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_dialogwhenlarge_noactionbar_ratingbar_0_pressed.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_dialogwhenlarge_noactionbar_ratingbar_2point5.png b/tests/tests/holo/res/drawable-xhdpi/holo_dialogwhenlarge_noactionbar_ratingbar_2point5.png
new file mode 100644
index 0000000..d184a4f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_dialogwhenlarge_noactionbar_ratingbar_2point5.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_dialogwhenlarge_noactionbar_ratingbar_2point5_pressed.png b/tests/tests/holo/res/drawable-xhdpi/holo_dialogwhenlarge_noactionbar_ratingbar_2point5_pressed.png
new file mode 100644
index 0000000..e4fcb80
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_dialogwhenlarge_noactionbar_ratingbar_2point5_pressed.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_dialogwhenlarge_noactionbar_ratingbar_5.png b/tests/tests/holo/res/drawable-xhdpi/holo_dialogwhenlarge_noactionbar_ratingbar_5.png
new file mode 100644
index 0000000..ce1c817
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_dialogwhenlarge_noactionbar_ratingbar_5.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_dialogwhenlarge_noactionbar_ratingbar_5_pressed.png b/tests/tests/holo/res/drawable-xhdpi/holo_dialogwhenlarge_noactionbar_ratingbar_5_pressed.png
new file mode 100644
index 0000000..f9f41d4
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_dialogwhenlarge_noactionbar_ratingbar_5_pressed.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_dialogwhenlarge_noactionbar_searchview.png b/tests/tests/holo/res/drawable-xhdpi/holo_dialogwhenlarge_noactionbar_searchview.png
new file mode 100644
index 0000000..73c611f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_dialogwhenlarge_noactionbar_searchview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_dialogwhenlarge_noactionbar_searchview_query.png b/tests/tests/holo/res/drawable-xhdpi/holo_dialogwhenlarge_noactionbar_searchview_query.png
new file mode 100644
index 0000000..a61d007
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_dialogwhenlarge_noactionbar_searchview_query.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_dialogwhenlarge_noactionbar_searchview_query_hint.png b/tests/tests/holo/res/drawable-xhdpi/holo_dialogwhenlarge_noactionbar_searchview_query_hint.png
new file mode 100644
index 0000000..139aacc
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_dialogwhenlarge_noactionbar_searchview_query_hint.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_dialogwhenlarge_noactionbar_seekbar_0.png b/tests/tests/holo/res/drawable-xhdpi/holo_dialogwhenlarge_noactionbar_seekbar_0.png
new file mode 100644
index 0000000..eb26838
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_dialogwhenlarge_noactionbar_seekbar_0.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_dialogwhenlarge_noactionbar_seekbar_100.png b/tests/tests/holo/res/drawable-xhdpi/holo_dialogwhenlarge_noactionbar_seekbar_100.png
new file mode 100644
index 0000000..a5ae2ba
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_dialogwhenlarge_noactionbar_seekbar_100.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_dialogwhenlarge_noactionbar_seekbar_50.png b/tests/tests/holo/res/drawable-xhdpi/holo_dialogwhenlarge_noactionbar_seekbar_50.png
new file mode 100644
index 0000000..8438db8
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_dialogwhenlarge_noactionbar_seekbar_50.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_dialogwhenlarge_noactionbar_spinner.png b/tests/tests/holo/res/drawable-xhdpi/holo_dialogwhenlarge_noactionbar_spinner.png
new file mode 100644
index 0000000..713ea22
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_dialogwhenlarge_noactionbar_spinner.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_dialogwhenlarge_noactionbar_switch.png b/tests/tests/holo/res/drawable-xhdpi/holo_dialogwhenlarge_noactionbar_switch.png
new file mode 100644
index 0000000..001e106
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_dialogwhenlarge_noactionbar_switch.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_dialogwhenlarge_noactionbar_switch_checked.png b/tests/tests/holo/res/drawable-xhdpi/holo_dialogwhenlarge_noactionbar_switch_checked.png
new file mode 100644
index 0000000..79e75f3
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_dialogwhenlarge_noactionbar_switch_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_dialogwhenlarge_noactionbar_tabhost.png b/tests/tests/holo/res/drawable-xhdpi/holo_dialogwhenlarge_noactionbar_tabhost.png
new file mode 100644
index 0000000..eaeeae7
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_dialogwhenlarge_noactionbar_tabhost.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_dialogwhenlarge_noactionbar_textview.png b/tests/tests/holo/res/drawable-xhdpi/holo_dialogwhenlarge_noactionbar_textview.png
new file mode 100644
index 0000000..0d908a5
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_dialogwhenlarge_noactionbar_textview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_dialogwhenlarge_noactionbar_timepicker.png b/tests/tests/holo/res/drawable-xhdpi/holo_dialogwhenlarge_noactionbar_timepicker.png
new file mode 100644
index 0000000..c3a4951
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_dialogwhenlarge_noactionbar_timepicker.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_dialogwhenlarge_noactionbar_toggle_button.png b/tests/tests/holo/res/drawable-xhdpi/holo_dialogwhenlarge_noactionbar_toggle_button.png
new file mode 100644
index 0000000..cdfb783
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_dialogwhenlarge_noactionbar_toggle_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_dialogwhenlarge_noactionbar_toggle_button_checked.png b/tests/tests/holo/res/drawable-xhdpi/holo_dialogwhenlarge_noactionbar_toggle_button_checked.png
new file mode 100644
index 0000000..2c604ee
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_dialogwhenlarge_noactionbar_toggle_button_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_dialogwhenlarge_noactionbar_zoomcontrols.png b/tests/tests/holo/res/drawable-xhdpi/holo_dialogwhenlarge_noactionbar_zoomcontrols.png
new file mode 100644
index 0000000..21d17f9
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_dialogwhenlarge_noactionbar_zoomcontrols.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_dialogwhenlarge_progressbar.png b/tests/tests/holo/res/drawable-xhdpi/holo_dialogwhenlarge_progressbar.png
new file mode 100644
index 0000000..8bb3363
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_dialogwhenlarge_progressbar.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_dialogwhenlarge_progressbar_horizontal_0.png b/tests/tests/holo/res/drawable-xhdpi/holo_dialogwhenlarge_progressbar_horizontal_0.png
new file mode 100644
index 0000000..f1d481d
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_dialogwhenlarge_progressbar_horizontal_0.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_dialogwhenlarge_progressbar_horizontal_100.png b/tests/tests/holo/res/drawable-xhdpi/holo_dialogwhenlarge_progressbar_horizontal_100.png
new file mode 100644
index 0000000..a586079
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_dialogwhenlarge_progressbar_horizontal_100.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_dialogwhenlarge_progressbar_horizontal_50.png b/tests/tests/holo/res/drawable-xhdpi/holo_dialogwhenlarge_progressbar_horizontal_50.png
new file mode 100644
index 0000000..9467831
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_dialogwhenlarge_progressbar_horizontal_50.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_dialogwhenlarge_progressbar_large.png b/tests/tests/holo/res/drawable-xhdpi/holo_dialogwhenlarge_progressbar_large.png
new file mode 100644
index 0000000..98344af
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_dialogwhenlarge_progressbar_large.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_dialogwhenlarge_progressbar_small.png b/tests/tests/holo/res/drawable-xhdpi/holo_dialogwhenlarge_progressbar_small.png
new file mode 100644
index 0000000..88ef977
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_dialogwhenlarge_progressbar_small.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_dialogwhenlarge_progressdialog_horizontal.png b/tests/tests/holo/res/drawable-xhdpi/holo_dialogwhenlarge_progressdialog_horizontal.png
new file mode 100644
index 0000000..68cc076
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_dialogwhenlarge_progressdialog_horizontal.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_dialogwhenlarge_radio_button.png b/tests/tests/holo/res/drawable-xhdpi/holo_dialogwhenlarge_radio_button.png
new file mode 100644
index 0000000..db61da3
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_dialogwhenlarge_radio_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_dialogwhenlarge_radio_button_checked.png b/tests/tests/holo/res/drawable-xhdpi/holo_dialogwhenlarge_radio_button_checked.png
new file mode 100644
index 0000000..ea35686
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_dialogwhenlarge_radio_button_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_dialogwhenlarge_radiogroup_horizontal.png b/tests/tests/holo/res/drawable-xhdpi/holo_dialogwhenlarge_radiogroup_horizontal.png
new file mode 100644
index 0000000..72b7077
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_dialogwhenlarge_radiogroup_horizontal.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_dialogwhenlarge_radiogroup_vertical.png b/tests/tests/holo/res/drawable-xhdpi/holo_dialogwhenlarge_radiogroup_vertical.png
new file mode 100644
index 0000000..c145b7a
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_dialogwhenlarge_radiogroup_vertical.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_dialogwhenlarge_ratingbar_0.png b/tests/tests/holo/res/drawable-xhdpi/holo_dialogwhenlarge_ratingbar_0.png
new file mode 100644
index 0000000..517f3d6
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_dialogwhenlarge_ratingbar_0.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_dialogwhenlarge_ratingbar_0_pressed.png b/tests/tests/holo/res/drawable-xhdpi/holo_dialogwhenlarge_ratingbar_0_pressed.png
new file mode 100644
index 0000000..c31df16
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_dialogwhenlarge_ratingbar_0_pressed.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_dialogwhenlarge_ratingbar_2point5.png b/tests/tests/holo/res/drawable-xhdpi/holo_dialogwhenlarge_ratingbar_2point5.png
new file mode 100644
index 0000000..d184a4f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_dialogwhenlarge_ratingbar_2point5.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_dialogwhenlarge_ratingbar_2point5_pressed.png b/tests/tests/holo/res/drawable-xhdpi/holo_dialogwhenlarge_ratingbar_2point5_pressed.png
new file mode 100644
index 0000000..e4fcb80
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_dialogwhenlarge_ratingbar_2point5_pressed.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_dialogwhenlarge_ratingbar_5.png b/tests/tests/holo/res/drawable-xhdpi/holo_dialogwhenlarge_ratingbar_5.png
new file mode 100644
index 0000000..ce1c817
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_dialogwhenlarge_ratingbar_5.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_dialogwhenlarge_ratingbar_5_pressed.png b/tests/tests/holo/res/drawable-xhdpi/holo_dialogwhenlarge_ratingbar_5_pressed.png
new file mode 100644
index 0000000..f9f41d4
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_dialogwhenlarge_ratingbar_5_pressed.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_dialogwhenlarge_searchview.png b/tests/tests/holo/res/drawable-xhdpi/holo_dialogwhenlarge_searchview.png
new file mode 100644
index 0000000..73c611f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_dialogwhenlarge_searchview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_dialogwhenlarge_searchview_query.png b/tests/tests/holo/res/drawable-xhdpi/holo_dialogwhenlarge_searchview_query.png
new file mode 100644
index 0000000..a61d007
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_dialogwhenlarge_searchview_query.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_dialogwhenlarge_searchview_query_hint.png b/tests/tests/holo/res/drawable-xhdpi/holo_dialogwhenlarge_searchview_query_hint.png
new file mode 100644
index 0000000..139aacc
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_dialogwhenlarge_searchview_query_hint.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_dialogwhenlarge_seekbar_0.png b/tests/tests/holo/res/drawable-xhdpi/holo_dialogwhenlarge_seekbar_0.png
new file mode 100644
index 0000000..eb26838
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_dialogwhenlarge_seekbar_0.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_dialogwhenlarge_seekbar_100.png b/tests/tests/holo/res/drawable-xhdpi/holo_dialogwhenlarge_seekbar_100.png
new file mode 100644
index 0000000..a5ae2ba
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_dialogwhenlarge_seekbar_100.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_dialogwhenlarge_seekbar_50.png b/tests/tests/holo/res/drawable-xhdpi/holo_dialogwhenlarge_seekbar_50.png
new file mode 100644
index 0000000..8438db8
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_dialogwhenlarge_seekbar_50.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_dialogwhenlarge_spinner.png b/tests/tests/holo/res/drawable-xhdpi/holo_dialogwhenlarge_spinner.png
new file mode 100644
index 0000000..713ea22
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_dialogwhenlarge_spinner.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_dialogwhenlarge_switch.png b/tests/tests/holo/res/drawable-xhdpi/holo_dialogwhenlarge_switch.png
new file mode 100644
index 0000000..001e106
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_dialogwhenlarge_switch.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_dialogwhenlarge_switch_checked.png b/tests/tests/holo/res/drawable-xhdpi/holo_dialogwhenlarge_switch_checked.png
new file mode 100644
index 0000000..79e75f3
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_dialogwhenlarge_switch_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_dialogwhenlarge_tabhost.png b/tests/tests/holo/res/drawable-xhdpi/holo_dialogwhenlarge_tabhost.png
new file mode 100644
index 0000000..eaeeae7
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_dialogwhenlarge_tabhost.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_dialogwhenlarge_textview.png b/tests/tests/holo/res/drawable-xhdpi/holo_dialogwhenlarge_textview.png
new file mode 100644
index 0000000..0d908a5
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_dialogwhenlarge_textview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_dialogwhenlarge_timepicker.png b/tests/tests/holo/res/drawable-xhdpi/holo_dialogwhenlarge_timepicker.png
new file mode 100644
index 0000000..c3a4951
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_dialogwhenlarge_timepicker.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_dialogwhenlarge_toggle_button.png b/tests/tests/holo/res/drawable-xhdpi/holo_dialogwhenlarge_toggle_button.png
new file mode 100644
index 0000000..cdfb783
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_dialogwhenlarge_toggle_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_dialogwhenlarge_toggle_button_checked.png b/tests/tests/holo/res/drawable-xhdpi/holo_dialogwhenlarge_toggle_button_checked.png
new file mode 100644
index 0000000..2c604ee
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_dialogwhenlarge_toggle_button_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_dialogwhenlarge_zoomcontrols.png b/tests/tests/holo/res/drawable-xhdpi/holo_dialogwhenlarge_zoomcontrols.png
new file mode 100644
index 0000000..21d17f9
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_dialogwhenlarge_zoomcontrols.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_edittext.png b/tests/tests/holo/res/drawable-xhdpi/holo_edittext.png
new file mode 100644
index 0000000..4b41717
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_edittext.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_inputmethod_alertdialog_list.png b/tests/tests/holo/res/drawable-xhdpi/holo_inputmethod_alertdialog_list.png
new file mode 100644
index 0000000..2089f47
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_inputmethod_alertdialog_list.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_inputmethod_alertdialog_multichoice.png b/tests/tests/holo/res/drawable-xhdpi/holo_inputmethod_alertdialog_multichoice.png
new file mode 100644
index 0000000..4abe60e
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_inputmethod_alertdialog_multichoice.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_inputmethod_alertdialog_onebutton.png b/tests/tests/holo/res/drawable-xhdpi/holo_inputmethod_alertdialog_onebutton.png
new file mode 100644
index 0000000..88175a0
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_inputmethod_alertdialog_onebutton.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_inputmethod_alertdialog_singlechoice.png b/tests/tests/holo/res/drawable-xhdpi/holo_inputmethod_alertdialog_singlechoice.png
new file mode 100644
index 0000000..709dfb2
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_inputmethod_alertdialog_singlechoice.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_inputmethod_alertdialog_threebuttons.png b/tests/tests/holo/res/drawable-xhdpi/holo_inputmethod_alertdialog_threebuttons.png
new file mode 100644
index 0000000..5c018d6
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_inputmethod_alertdialog_threebuttons.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_inputmethod_alertdialog_twobuttons.png b/tests/tests/holo/res/drawable-xhdpi/holo_inputmethod_alertdialog_twobuttons.png
new file mode 100644
index 0000000..18569e7
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_inputmethod_alertdialog_twobuttons.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_inputmethod_button.png b/tests/tests/holo/res/drawable-xhdpi/holo_inputmethod_button.png
new file mode 100644
index 0000000..06fae2d
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_inputmethod_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_inputmethod_button_pressed.png b/tests/tests/holo/res/drawable-xhdpi/holo_inputmethod_button_pressed.png
new file mode 100644
index 0000000..415f4cb
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_inputmethod_button_pressed.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_inputmethod_calendar_view.png b/tests/tests/holo/res/drawable-xhdpi/holo_inputmethod_calendar_view.png
new file mode 100644
index 0000000..0e2ee26
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_inputmethod_calendar_view.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_inputmethod_calendar_view_feb.png b/tests/tests/holo/res/drawable-xhdpi/holo_inputmethod_calendar_view_feb.png
new file mode 100644
index 0000000..3e7e915
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_inputmethod_calendar_view_feb.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_inputmethod_checkbox.png b/tests/tests/holo/res/drawable-xhdpi/holo_inputmethod_checkbox.png
new file mode 100644
index 0000000..9cd44e5
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_inputmethod_checkbox.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_inputmethod_checkbox_checked.png b/tests/tests/holo/res/drawable-xhdpi/holo_inputmethod_checkbox_checked.png
new file mode 100644
index 0000000..4d87f34
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_inputmethod_checkbox_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_inputmethod_chronometer.png b/tests/tests/holo/res/drawable-xhdpi/holo_inputmethod_chronometer.png
new file mode 100644
index 0000000..90229f0
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_inputmethod_chronometer.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_inputmethod_color_blue_bright.png b/tests/tests/holo/res/drawable-xhdpi/holo_inputmethod_color_blue_bright.png
new file mode 100644
index 0000000..d1a3f99
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_inputmethod_color_blue_bright.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_inputmethod_color_blue_dark.png b/tests/tests/holo/res/drawable-xhdpi/holo_inputmethod_color_blue_dark.png
new file mode 100644
index 0000000..52a4de2
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_inputmethod_color_blue_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_inputmethod_color_blue_light.png b/tests/tests/holo/res/drawable-xhdpi/holo_inputmethod_color_blue_light.png
new file mode 100644
index 0000000..f9439e8
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_inputmethod_color_blue_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_inputmethod_color_green_dark.png b/tests/tests/holo/res/drawable-xhdpi/holo_inputmethod_color_green_dark.png
new file mode 100644
index 0000000..4f8af58
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_inputmethod_color_green_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_inputmethod_color_green_light.png b/tests/tests/holo/res/drawable-xhdpi/holo_inputmethod_color_green_light.png
new file mode 100644
index 0000000..6ad2394
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_inputmethod_color_green_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_inputmethod_color_orange_dark.png b/tests/tests/holo/res/drawable-xhdpi/holo_inputmethod_color_orange_dark.png
new file mode 100644
index 0000000..73f8418
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_inputmethod_color_orange_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_inputmethod_color_orange_light.png b/tests/tests/holo/res/drawable-xhdpi/holo_inputmethod_color_orange_light.png
new file mode 100644
index 0000000..90ab999
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_inputmethod_color_orange_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_inputmethod_color_purple.png b/tests/tests/holo/res/drawable-xhdpi/holo_inputmethod_color_purple.png
new file mode 100644
index 0000000..30f2d23
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_inputmethod_color_purple.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_inputmethod_color_red_dark.png b/tests/tests/holo/res/drawable-xhdpi/holo_inputmethod_color_red_dark.png
new file mode 100644
index 0000000..c0cbef0
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_inputmethod_color_red_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_inputmethod_color_red_light.png b/tests/tests/holo/res/drawable-xhdpi/holo_inputmethod_color_red_light.png
new file mode 100644
index 0000000..e99df2c
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_inputmethod_color_red_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_inputmethod_edittext.png b/tests/tests/holo/res/drawable-xhdpi/holo_inputmethod_edittext.png
new file mode 100644
index 0000000..e24fc71
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_inputmethod_edittext.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_inputmethod_progressbar.png b/tests/tests/holo/res/drawable-xhdpi/holo_inputmethod_progressbar.png
new file mode 100644
index 0000000..8bb3363
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_inputmethod_progressbar.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_inputmethod_progressbar_horizontal_0.png b/tests/tests/holo/res/drawable-xhdpi/holo_inputmethod_progressbar_horizontal_0.png
new file mode 100644
index 0000000..efecebb
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_inputmethod_progressbar_horizontal_0.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_inputmethod_progressbar_horizontal_100.png b/tests/tests/holo/res/drawable-xhdpi/holo_inputmethod_progressbar_horizontal_100.png
new file mode 100644
index 0000000..76245b8
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_inputmethod_progressbar_horizontal_100.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_inputmethod_progressbar_horizontal_50.png b/tests/tests/holo/res/drawable-xhdpi/holo_inputmethod_progressbar_horizontal_50.png
new file mode 100644
index 0000000..16c7322
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_inputmethod_progressbar_horizontal_50.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_inputmethod_progressbar_large.png b/tests/tests/holo/res/drawable-xhdpi/holo_inputmethod_progressbar_large.png
new file mode 100644
index 0000000..98344af
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_inputmethod_progressbar_large.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_inputmethod_progressbar_small.png b/tests/tests/holo/res/drawable-xhdpi/holo_inputmethod_progressbar_small.png
new file mode 100644
index 0000000..88ef977
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_inputmethod_progressbar_small.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_inputmethod_progressdialog_horizontal.png b/tests/tests/holo/res/drawable-xhdpi/holo_inputmethod_progressdialog_horizontal.png
new file mode 100644
index 0000000..c049776
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_inputmethod_progressdialog_horizontal.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_inputmethod_radio_button.png b/tests/tests/holo/res/drawable-xhdpi/holo_inputmethod_radio_button.png
new file mode 100644
index 0000000..e1fa030
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_inputmethod_radio_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_inputmethod_radio_button_checked.png b/tests/tests/holo/res/drawable-xhdpi/holo_inputmethod_radio_button_checked.png
new file mode 100644
index 0000000..e998ddc
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_inputmethod_radio_button_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_inputmethod_radiogroup_horizontal.png b/tests/tests/holo/res/drawable-xhdpi/holo_inputmethod_radiogroup_horizontal.png
new file mode 100644
index 0000000..bc60c67
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_inputmethod_radiogroup_horizontal.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_inputmethod_radiogroup_vertical.png b/tests/tests/holo/res/drawable-xhdpi/holo_inputmethod_radiogroup_vertical.png
new file mode 100644
index 0000000..13033aa
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_inputmethod_radiogroup_vertical.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_inputmethod_ratingbar_0.png b/tests/tests/holo/res/drawable-xhdpi/holo_inputmethod_ratingbar_0.png
new file mode 100644
index 0000000..340ff5c
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_inputmethod_ratingbar_0.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_inputmethod_ratingbar_0_pressed.png b/tests/tests/holo/res/drawable-xhdpi/holo_inputmethod_ratingbar_0_pressed.png
new file mode 100644
index 0000000..60c731e
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_inputmethod_ratingbar_0_pressed.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_inputmethod_ratingbar_2point5.png b/tests/tests/holo/res/drawable-xhdpi/holo_inputmethod_ratingbar_2point5.png
new file mode 100644
index 0000000..260866a
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_inputmethod_ratingbar_2point5.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_inputmethod_ratingbar_2point5_pressed.png b/tests/tests/holo/res/drawable-xhdpi/holo_inputmethod_ratingbar_2point5_pressed.png
new file mode 100644
index 0000000..1ba8025
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_inputmethod_ratingbar_2point5_pressed.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_inputmethod_ratingbar_5.png b/tests/tests/holo/res/drawable-xhdpi/holo_inputmethod_ratingbar_5.png
new file mode 100644
index 0000000..c1f38bd
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_inputmethod_ratingbar_5.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_inputmethod_ratingbar_5_pressed.png b/tests/tests/holo/res/drawable-xhdpi/holo_inputmethod_ratingbar_5_pressed.png
new file mode 100644
index 0000000..c981c8a
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_inputmethod_ratingbar_5_pressed.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_inputmethod_searchview.png b/tests/tests/holo/res/drawable-xhdpi/holo_inputmethod_searchview.png
new file mode 100644
index 0000000..43c9f5c
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_inputmethod_searchview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_inputmethod_searchview_query.png b/tests/tests/holo/res/drawable-xhdpi/holo_inputmethod_searchview_query.png
new file mode 100644
index 0000000..ee24814
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_inputmethod_searchview_query.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_inputmethod_searchview_query_hint.png b/tests/tests/holo/res/drawable-xhdpi/holo_inputmethod_searchview_query_hint.png
new file mode 100644
index 0000000..1a543aa
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_inputmethod_searchview_query_hint.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_inputmethod_seekbar_0.png b/tests/tests/holo/res/drawable-xhdpi/holo_inputmethod_seekbar_0.png
new file mode 100644
index 0000000..c61a55c
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_inputmethod_seekbar_0.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_inputmethod_seekbar_100.png b/tests/tests/holo/res/drawable-xhdpi/holo_inputmethod_seekbar_100.png
new file mode 100644
index 0000000..a5ae2ba
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_inputmethod_seekbar_100.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_inputmethod_seekbar_50.png b/tests/tests/holo/res/drawable-xhdpi/holo_inputmethod_seekbar_50.png
new file mode 100644
index 0000000..c45851e
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_inputmethod_seekbar_50.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_inputmethod_spinner.png b/tests/tests/holo/res/drawable-xhdpi/holo_inputmethod_spinner.png
new file mode 100644
index 0000000..2bb082b
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_inputmethod_spinner.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_inputmethod_switch.png b/tests/tests/holo/res/drawable-xhdpi/holo_inputmethod_switch.png
new file mode 100644
index 0000000..a7db1ed
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_inputmethod_switch.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_inputmethod_switch_checked.png b/tests/tests/holo/res/drawable-xhdpi/holo_inputmethod_switch_checked.png
new file mode 100644
index 0000000..469effd
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_inputmethod_switch_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_inputmethod_tabhost.png b/tests/tests/holo/res/drawable-xhdpi/holo_inputmethod_tabhost.png
new file mode 100644
index 0000000..361cf06
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_inputmethod_tabhost.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_inputmethod_textview.png b/tests/tests/holo/res/drawable-xhdpi/holo_inputmethod_textview.png
new file mode 100644
index 0000000..821c866
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_inputmethod_textview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_inputmethod_timepicker.png b/tests/tests/holo/res/drawable-xhdpi/holo_inputmethod_timepicker.png
new file mode 100644
index 0000000..7a269fd
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_inputmethod_timepicker.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_inputmethod_toggle_button.png b/tests/tests/holo/res/drawable-xhdpi/holo_inputmethod_toggle_button.png
new file mode 100644
index 0000000..c9e16e3
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_inputmethod_toggle_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_inputmethod_toggle_button_checked.png b/tests/tests/holo/res/drawable-xhdpi/holo_inputmethod_toggle_button_checked.png
new file mode 100644
index 0000000..c974143
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_inputmethod_toggle_button_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_inputmethod_zoomcontrols.png b/tests/tests/holo/res/drawable-xhdpi/holo_inputmethod_zoomcontrols.png
new file mode 100644
index 0000000..21d17f9
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_inputmethod_zoomcontrols.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_alertdialog_list.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_alertdialog_list.png
new file mode 100644
index 0000000..2089f47
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_alertdialog_list.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_alertdialog_multichoice.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_alertdialog_multichoice.png
new file mode 100644
index 0000000..4abe60e
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_alertdialog_multichoice.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_alertdialog_onebutton.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_alertdialog_onebutton.png
new file mode 100644
index 0000000..88175a0
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_alertdialog_onebutton.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_alertdialog_singlechoice.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_alertdialog_singlechoice.png
new file mode 100644
index 0000000..709dfb2
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_alertdialog_singlechoice.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_alertdialog_threebuttons.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_alertdialog_threebuttons.png
new file mode 100644
index 0000000..5c018d6
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_alertdialog_threebuttons.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_alertdialog_twobuttons.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_alertdialog_twobuttons.png
new file mode 100644
index 0000000..18569e7
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_alertdialog_twobuttons.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_button.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_button.png
new file mode 100644
index 0000000..06fae2d
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_button_pressed.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_button_pressed.png
new file mode 100644
index 0000000..415f4cb
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_button_pressed.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_calendar_view.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_calendar_view.png
new file mode 100644
index 0000000..0e2ee26
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_calendar_view.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_calendar_view_feb.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_calendar_view_feb.png
new file mode 100644
index 0000000..3e7e915
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_calendar_view_feb.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_checkbox.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_checkbox.png
new file mode 100644
index 0000000..9cd44e5
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_checkbox.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_checkbox_checked.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_checkbox_checked.png
new file mode 100644
index 0000000..4d87f34
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_checkbox_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_chronometer.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_chronometer.png
new file mode 100644
index 0000000..90229f0
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_chronometer.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_color_blue_bright.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_color_blue_bright.png
new file mode 100644
index 0000000..d1a3f99
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_color_blue_bright.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_color_blue_dark.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_color_blue_dark.png
new file mode 100644
index 0000000..52a4de2
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_color_blue_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_color_blue_light.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_color_blue_light.png
new file mode 100644
index 0000000..f9439e8
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_color_blue_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_color_green_dark.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_color_green_dark.png
new file mode 100644
index 0000000..4f8af58
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_color_green_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_color_green_light.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_color_green_light.png
new file mode 100644
index 0000000..6ad2394
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_color_green_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_color_orange_dark.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_color_orange_dark.png
new file mode 100644
index 0000000..73f8418
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_color_orange_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_color_orange_light.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_color_orange_light.png
new file mode 100644
index 0000000..90ab999
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_color_orange_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_color_purple.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_color_purple.png
new file mode 100644
index 0000000..30f2d23
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_color_purple.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_color_red_dark.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_color_red_dark.png
new file mode 100644
index 0000000..c0cbef0
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_color_red_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_color_red_light.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_color_red_light.png
new file mode 100644
index 0000000..e99df2c
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_color_red_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_darkactionbar_alertdialog_list.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_darkactionbar_alertdialog_list.png
new file mode 100644
index 0000000..2089f47
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_darkactionbar_alertdialog_list.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_darkactionbar_alertdialog_multichoice.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_darkactionbar_alertdialog_multichoice.png
new file mode 100644
index 0000000..4abe60e
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_darkactionbar_alertdialog_multichoice.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_darkactionbar_alertdialog_onebutton.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_darkactionbar_alertdialog_onebutton.png
new file mode 100644
index 0000000..88175a0
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_darkactionbar_alertdialog_onebutton.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_darkactionbar_alertdialog_singlechoice.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_darkactionbar_alertdialog_singlechoice.png
new file mode 100644
index 0000000..709dfb2
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_darkactionbar_alertdialog_singlechoice.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_darkactionbar_alertdialog_threebuttons.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_darkactionbar_alertdialog_threebuttons.png
new file mode 100644
index 0000000..5c018d6
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_darkactionbar_alertdialog_threebuttons.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_darkactionbar_alertdialog_twobuttons.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_darkactionbar_alertdialog_twobuttons.png
new file mode 100644
index 0000000..18569e7
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_darkactionbar_alertdialog_twobuttons.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_darkactionbar_button.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_darkactionbar_button.png
new file mode 100644
index 0000000..06fae2d
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_darkactionbar_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_darkactionbar_button_pressed.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_darkactionbar_button_pressed.png
new file mode 100644
index 0000000..415f4cb
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_darkactionbar_button_pressed.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_darkactionbar_calendar_view.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_darkactionbar_calendar_view.png
new file mode 100644
index 0000000..0e2ee26
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_darkactionbar_calendar_view.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_darkactionbar_calendar_view_feb.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_darkactionbar_calendar_view_feb.png
new file mode 100644
index 0000000..3e7e915
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_darkactionbar_calendar_view_feb.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_darkactionbar_checkbox.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_darkactionbar_checkbox.png
new file mode 100644
index 0000000..9cd44e5
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_darkactionbar_checkbox.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_darkactionbar_checkbox_checked.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_darkactionbar_checkbox_checked.png
new file mode 100644
index 0000000..4d87f34
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_darkactionbar_checkbox_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_darkactionbar_chronometer.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_darkactionbar_chronometer.png
new file mode 100644
index 0000000..90229f0
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_darkactionbar_chronometer.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_darkactionbar_color_blue_bright.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_darkactionbar_color_blue_bright.png
new file mode 100644
index 0000000..d1a3f99
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_darkactionbar_color_blue_bright.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_darkactionbar_color_blue_dark.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_darkactionbar_color_blue_dark.png
new file mode 100644
index 0000000..52a4de2
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_darkactionbar_color_blue_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_darkactionbar_color_blue_light.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_darkactionbar_color_blue_light.png
new file mode 100644
index 0000000..f9439e8
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_darkactionbar_color_blue_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_darkactionbar_color_green_dark.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_darkactionbar_color_green_dark.png
new file mode 100644
index 0000000..4f8af58
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_darkactionbar_color_green_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_darkactionbar_color_green_light.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_darkactionbar_color_green_light.png
new file mode 100644
index 0000000..6ad2394
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_darkactionbar_color_green_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_darkactionbar_color_orange_dark.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_darkactionbar_color_orange_dark.png
new file mode 100644
index 0000000..73f8418
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_darkactionbar_color_orange_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_darkactionbar_color_orange_light.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_darkactionbar_color_orange_light.png
new file mode 100644
index 0000000..90ab999
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_darkactionbar_color_orange_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_darkactionbar_color_purple.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_darkactionbar_color_purple.png
new file mode 100644
index 0000000..30f2d23
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_darkactionbar_color_purple.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_darkactionbar_color_red_dark.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_darkactionbar_color_red_dark.png
new file mode 100644
index 0000000..c0cbef0
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_darkactionbar_color_red_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_darkactionbar_color_red_light.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_darkactionbar_color_red_light.png
new file mode 100644
index 0000000..e99df2c
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_darkactionbar_color_red_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_darkactionbar_edittext.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_darkactionbar_edittext.png
new file mode 100644
index 0000000..e24fc71
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_darkactionbar_edittext.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_darkactionbar_progressbar.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_darkactionbar_progressbar.png
new file mode 100644
index 0000000..8bb3363
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_darkactionbar_progressbar.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_darkactionbar_progressbar_horizontal_0.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_darkactionbar_progressbar_horizontal_0.png
new file mode 100644
index 0000000..efecebb
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_darkactionbar_progressbar_horizontal_0.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_darkactionbar_progressbar_horizontal_100.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_darkactionbar_progressbar_horizontal_100.png
new file mode 100644
index 0000000..76245b8
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_darkactionbar_progressbar_horizontal_100.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_darkactionbar_progressbar_horizontal_50.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_darkactionbar_progressbar_horizontal_50.png
new file mode 100644
index 0000000..16c7322
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_darkactionbar_progressbar_horizontal_50.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_darkactionbar_progressbar_large.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_darkactionbar_progressbar_large.png
new file mode 100644
index 0000000..98344af
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_darkactionbar_progressbar_large.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_darkactionbar_progressbar_small.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_darkactionbar_progressbar_small.png
new file mode 100644
index 0000000..88ef977
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_darkactionbar_progressbar_small.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_darkactionbar_progressdialog_horizontal.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_darkactionbar_progressdialog_horizontal.png
new file mode 100644
index 0000000..c049776
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_darkactionbar_progressdialog_horizontal.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_darkactionbar_radio_button.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_darkactionbar_radio_button.png
new file mode 100644
index 0000000..e1fa030
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_darkactionbar_radio_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_darkactionbar_radio_button_checked.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_darkactionbar_radio_button_checked.png
new file mode 100644
index 0000000..e998ddc
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_darkactionbar_radio_button_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_darkactionbar_radiogroup_horizontal.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_darkactionbar_radiogroup_horizontal.png
new file mode 100644
index 0000000..bc60c67
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_darkactionbar_radiogroup_horizontal.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_darkactionbar_radiogroup_vertical.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_darkactionbar_radiogroup_vertical.png
new file mode 100644
index 0000000..13033aa
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_darkactionbar_radiogroup_vertical.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_darkactionbar_ratingbar_0.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_darkactionbar_ratingbar_0.png
new file mode 100644
index 0000000..340ff5c
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_darkactionbar_ratingbar_0.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_darkactionbar_ratingbar_0_pressed.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_darkactionbar_ratingbar_0_pressed.png
new file mode 100644
index 0000000..60c731e
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_darkactionbar_ratingbar_0_pressed.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_darkactionbar_ratingbar_2point5.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_darkactionbar_ratingbar_2point5.png
new file mode 100644
index 0000000..260866a
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_darkactionbar_ratingbar_2point5.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_darkactionbar_ratingbar_2point5_pressed.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_darkactionbar_ratingbar_2point5_pressed.png
new file mode 100644
index 0000000..1ba8025
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_darkactionbar_ratingbar_2point5_pressed.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_darkactionbar_ratingbar_5.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_darkactionbar_ratingbar_5.png
new file mode 100644
index 0000000..c1f38bd
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_darkactionbar_ratingbar_5.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_darkactionbar_ratingbar_5_pressed.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_darkactionbar_ratingbar_5_pressed.png
new file mode 100644
index 0000000..c981c8a
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_darkactionbar_ratingbar_5_pressed.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_darkactionbar_searchview.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_darkactionbar_searchview.png
new file mode 100644
index 0000000..43c9f5c
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_darkactionbar_searchview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_darkactionbar_searchview_query.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_darkactionbar_searchview_query.png
new file mode 100644
index 0000000..ee24814
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_darkactionbar_searchview_query.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_darkactionbar_searchview_query_hint.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_darkactionbar_searchview_query_hint.png
new file mode 100644
index 0000000..1a543aa
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_darkactionbar_searchview_query_hint.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_darkactionbar_seekbar_0.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_darkactionbar_seekbar_0.png
new file mode 100644
index 0000000..c61a55c
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_darkactionbar_seekbar_0.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_darkactionbar_seekbar_100.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_darkactionbar_seekbar_100.png
new file mode 100644
index 0000000..a5ae2ba
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_darkactionbar_seekbar_100.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_darkactionbar_seekbar_50.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_darkactionbar_seekbar_50.png
new file mode 100644
index 0000000..c45851e
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_darkactionbar_seekbar_50.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_darkactionbar_spinner.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_darkactionbar_spinner.png
new file mode 100644
index 0000000..2bb082b
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_darkactionbar_spinner.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_darkactionbar_switch.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_darkactionbar_switch.png
new file mode 100644
index 0000000..a7db1ed
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_darkactionbar_switch.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_darkactionbar_switch_checked.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_darkactionbar_switch_checked.png
new file mode 100644
index 0000000..469effd
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_darkactionbar_switch_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_darkactionbar_tabhost.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_darkactionbar_tabhost.png
new file mode 100644
index 0000000..361cf06
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_darkactionbar_tabhost.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_darkactionbar_textview.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_darkactionbar_textview.png
new file mode 100644
index 0000000..821c866
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_darkactionbar_textview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_darkactionbar_timepicker.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_darkactionbar_timepicker.png
new file mode 100644
index 0000000..7a269fd
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_darkactionbar_timepicker.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_darkactionbar_toggle_button.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_darkactionbar_toggle_button.png
new file mode 100644
index 0000000..c9e16e3
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_darkactionbar_toggle_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_darkactionbar_toggle_button_checked.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_darkactionbar_toggle_button_checked.png
new file mode 100644
index 0000000..c974143
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_darkactionbar_toggle_button_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_darkactionbar_zoomcontrols.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_darkactionbar_zoomcontrols.png
new file mode 100644
index 0000000..21d17f9
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_darkactionbar_zoomcontrols.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_alertdialog_list.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_alertdialog_list.png
new file mode 100644
index 0000000..2089f47
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_alertdialog_list.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_alertdialog_multichoice.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_alertdialog_multichoice.png
new file mode 100644
index 0000000..4abe60e
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_alertdialog_multichoice.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_alertdialog_onebutton.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_alertdialog_onebutton.png
new file mode 100644
index 0000000..88175a0
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_alertdialog_onebutton.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_alertdialog_singlechoice.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_alertdialog_singlechoice.png
new file mode 100644
index 0000000..709dfb2
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_alertdialog_singlechoice.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_alertdialog_threebuttons.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_alertdialog_threebuttons.png
new file mode 100644
index 0000000..5c018d6
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_alertdialog_threebuttons.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_alertdialog_twobuttons.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_alertdialog_twobuttons.png
new file mode 100644
index 0000000..18569e7
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_alertdialog_twobuttons.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_button.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_button.png
new file mode 100644
index 0000000..06fae2d
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_button_pressed.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_button_pressed.png
new file mode 100644
index 0000000..415f4cb
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_button_pressed.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_calendar_view.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_calendar_view.png
new file mode 100644
index 0000000..0e2ee26
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_calendar_view.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_calendar_view_feb.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_calendar_view_feb.png
new file mode 100644
index 0000000..3e7e915
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_calendar_view_feb.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_checkbox.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_checkbox.png
new file mode 100644
index 0000000..9cd44e5
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_checkbox.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_checkbox_checked.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_checkbox_checked.png
new file mode 100644
index 0000000..4d87f34
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_checkbox_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_chronometer.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_chronometer.png
new file mode 100644
index 0000000..90229f0
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_chronometer.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_color_blue_bright.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_color_blue_bright.png
new file mode 100644
index 0000000..d1a3f99
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_color_blue_bright.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_color_blue_dark.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_color_blue_dark.png
new file mode 100644
index 0000000..52a4de2
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_color_blue_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_color_blue_light.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_color_blue_light.png
new file mode 100644
index 0000000..f9439e8
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_color_blue_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_color_green_dark.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_color_green_dark.png
new file mode 100644
index 0000000..4f8af58
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_color_green_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_color_green_light.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_color_green_light.png
new file mode 100644
index 0000000..6ad2394
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_color_green_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_color_orange_dark.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_color_orange_dark.png
new file mode 100644
index 0000000..73f8418
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_color_orange_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_color_orange_light.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_color_orange_light.png
new file mode 100644
index 0000000..90ab999
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_color_orange_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_color_purple.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_color_purple.png
new file mode 100644
index 0000000..30f2d23
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_color_purple.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_color_red_dark.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_color_red_dark.png
new file mode 100644
index 0000000..c0cbef0
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_color_red_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_color_red_light.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_color_red_light.png
new file mode 100644
index 0000000..e99df2c
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_color_red_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_edittext.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_edittext.png
new file mode 100644
index 0000000..e24fc71
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_edittext.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_minwidth_alertdialog_list.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_minwidth_alertdialog_list.png
new file mode 100644
index 0000000..2089f47
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_minwidth_alertdialog_list.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_minwidth_alertdialog_multichoice.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_minwidth_alertdialog_multichoice.png
new file mode 100644
index 0000000..4abe60e
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_minwidth_alertdialog_multichoice.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_minwidth_alertdialog_onebutton.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_minwidth_alertdialog_onebutton.png
new file mode 100644
index 0000000..88175a0
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_minwidth_alertdialog_onebutton.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_minwidth_alertdialog_singlechoice.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_minwidth_alertdialog_singlechoice.png
new file mode 100644
index 0000000..709dfb2
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_minwidth_alertdialog_singlechoice.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_minwidth_alertdialog_threebuttons.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_minwidth_alertdialog_threebuttons.png
new file mode 100644
index 0000000..5c018d6
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_minwidth_alertdialog_threebuttons.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_minwidth_alertdialog_twobuttons.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_minwidth_alertdialog_twobuttons.png
new file mode 100644
index 0000000..18569e7
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_minwidth_alertdialog_twobuttons.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_minwidth_button.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_minwidth_button.png
new file mode 100644
index 0000000..06fae2d
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_minwidth_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_minwidth_button_pressed.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_minwidth_button_pressed.png
new file mode 100644
index 0000000..415f4cb
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_minwidth_button_pressed.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_minwidth_calendar_view.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_minwidth_calendar_view.png
new file mode 100644
index 0000000..0e2ee26
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_minwidth_calendar_view.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_minwidth_calendar_view_feb.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_minwidth_calendar_view_feb.png
new file mode 100644
index 0000000..3e7e915
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_minwidth_calendar_view_feb.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_minwidth_checkbox.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_minwidth_checkbox.png
new file mode 100644
index 0000000..9cd44e5
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_minwidth_checkbox.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_minwidth_checkbox_checked.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_minwidth_checkbox_checked.png
new file mode 100644
index 0000000..4d87f34
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_minwidth_checkbox_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_minwidth_chronometer.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_minwidth_chronometer.png
new file mode 100644
index 0000000..90229f0
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_minwidth_chronometer.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_minwidth_color_blue_bright.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_minwidth_color_blue_bright.png
new file mode 100644
index 0000000..d1a3f99
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_minwidth_color_blue_bright.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_minwidth_color_blue_dark.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_minwidth_color_blue_dark.png
new file mode 100644
index 0000000..52a4de2
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_minwidth_color_blue_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_minwidth_color_blue_light.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_minwidth_color_blue_light.png
new file mode 100644
index 0000000..f9439e8
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_minwidth_color_blue_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_minwidth_color_green_dark.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_minwidth_color_green_dark.png
new file mode 100644
index 0000000..4f8af58
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_minwidth_color_green_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_minwidth_color_green_light.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_minwidth_color_green_light.png
new file mode 100644
index 0000000..6ad2394
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_minwidth_color_green_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_minwidth_color_orange_dark.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_minwidth_color_orange_dark.png
new file mode 100644
index 0000000..73f8418
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_minwidth_color_orange_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_minwidth_color_orange_light.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_minwidth_color_orange_light.png
new file mode 100644
index 0000000..90ab999
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_minwidth_color_orange_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_minwidth_color_purple.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_minwidth_color_purple.png
new file mode 100644
index 0000000..30f2d23
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_minwidth_color_purple.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_minwidth_color_red_dark.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_minwidth_color_red_dark.png
new file mode 100644
index 0000000..c0cbef0
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_minwidth_color_red_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_minwidth_color_red_light.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_minwidth_color_red_light.png
new file mode 100644
index 0000000..e99df2c
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_minwidth_color_red_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_minwidth_edittext.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_minwidth_edittext.png
new file mode 100644
index 0000000..e24fc71
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_minwidth_edittext.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_minwidth_progressbar.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_minwidth_progressbar.png
new file mode 100644
index 0000000..8bb3363
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_minwidth_progressbar.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_minwidth_progressbar_horizontal_0.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_minwidth_progressbar_horizontal_0.png
new file mode 100644
index 0000000..efecebb
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_minwidth_progressbar_horizontal_0.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_minwidth_progressbar_horizontal_100.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_minwidth_progressbar_horizontal_100.png
new file mode 100644
index 0000000..76245b8
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_minwidth_progressbar_horizontal_100.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_minwidth_progressbar_horizontal_50.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_minwidth_progressbar_horizontal_50.png
new file mode 100644
index 0000000..16c7322
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_minwidth_progressbar_horizontal_50.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_minwidth_progressbar_large.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_minwidth_progressbar_large.png
new file mode 100644
index 0000000..98344af
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_minwidth_progressbar_large.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_minwidth_progressbar_small.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_minwidth_progressbar_small.png
new file mode 100644
index 0000000..88ef977
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_minwidth_progressbar_small.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_minwidth_progressdialog_horizontal.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_minwidth_progressdialog_horizontal.png
new file mode 100644
index 0000000..c049776
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_minwidth_progressdialog_horizontal.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_minwidth_radio_button.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_minwidth_radio_button.png
new file mode 100644
index 0000000..e1fa030
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_minwidth_radio_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_minwidth_radio_button_checked.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_minwidth_radio_button_checked.png
new file mode 100644
index 0000000..e998ddc
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_minwidth_radio_button_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_minwidth_radiogroup_horizontal.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_minwidth_radiogroup_horizontal.png
new file mode 100644
index 0000000..bc60c67
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_minwidth_radiogroup_horizontal.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_minwidth_radiogroup_vertical.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_minwidth_radiogroup_vertical.png
new file mode 100644
index 0000000..13033aa
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_minwidth_radiogroup_vertical.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_minwidth_ratingbar_0.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_minwidth_ratingbar_0.png
new file mode 100644
index 0000000..340ff5c
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_minwidth_ratingbar_0.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_minwidth_ratingbar_0_pressed.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_minwidth_ratingbar_0_pressed.png
new file mode 100644
index 0000000..60c731e
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_minwidth_ratingbar_0_pressed.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_minwidth_ratingbar_2point5.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_minwidth_ratingbar_2point5.png
new file mode 100644
index 0000000..260866a
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_minwidth_ratingbar_2point5.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_minwidth_ratingbar_2point5_pressed.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_minwidth_ratingbar_2point5_pressed.png
new file mode 100644
index 0000000..1ba8025
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_minwidth_ratingbar_2point5_pressed.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_minwidth_ratingbar_5.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_minwidth_ratingbar_5.png
new file mode 100644
index 0000000..c1f38bd
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_minwidth_ratingbar_5.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_minwidth_ratingbar_5_pressed.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_minwidth_ratingbar_5_pressed.png
new file mode 100644
index 0000000..c981c8a
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_minwidth_ratingbar_5_pressed.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_minwidth_searchview.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_minwidth_searchview.png
new file mode 100644
index 0000000..43c9f5c
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_minwidth_searchview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_minwidth_searchview_query.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_minwidth_searchview_query.png
new file mode 100644
index 0000000..ee24814
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_minwidth_searchview_query.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_minwidth_searchview_query_hint.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_minwidth_searchview_query_hint.png
new file mode 100644
index 0000000..1a543aa
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_minwidth_searchview_query_hint.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_minwidth_seekbar_0.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_minwidth_seekbar_0.png
new file mode 100644
index 0000000..c61a55c
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_minwidth_seekbar_0.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_minwidth_seekbar_100.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_minwidth_seekbar_100.png
new file mode 100644
index 0000000..a5ae2ba
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_minwidth_seekbar_100.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_minwidth_seekbar_50.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_minwidth_seekbar_50.png
new file mode 100644
index 0000000..c45851e
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_minwidth_seekbar_50.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_minwidth_spinner.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_minwidth_spinner.png
new file mode 100644
index 0000000..2bb082b
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_minwidth_spinner.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_minwidth_switch.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_minwidth_switch.png
new file mode 100644
index 0000000..a7db1ed
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_minwidth_switch.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_minwidth_switch_checked.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_minwidth_switch_checked.png
new file mode 100644
index 0000000..469effd
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_minwidth_switch_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_minwidth_tabhost.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_minwidth_tabhost.png
new file mode 100644
index 0000000..361cf06
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_minwidth_tabhost.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_minwidth_textview.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_minwidth_textview.png
new file mode 100644
index 0000000..821c866
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_minwidth_textview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_minwidth_timepicker.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_minwidth_timepicker.png
new file mode 100644
index 0000000..7a269fd
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_minwidth_timepicker.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_minwidth_toggle_button.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_minwidth_toggle_button.png
new file mode 100644
index 0000000..c9e16e3
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_minwidth_toggle_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_minwidth_toggle_button_checked.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_minwidth_toggle_button_checked.png
new file mode 100644
index 0000000..c974143
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_minwidth_toggle_button_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_minwidth_zoomcontrols.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_minwidth_zoomcontrols.png
new file mode 100644
index 0000000..21d17f9
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_minwidth_zoomcontrols.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_noactionbar_alertdialog_list.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_noactionbar_alertdialog_list.png
new file mode 100644
index 0000000..2089f47
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_noactionbar_alertdialog_list.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_noactionbar_alertdialog_multichoice.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_noactionbar_alertdialog_multichoice.png
new file mode 100644
index 0000000..4abe60e
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_noactionbar_alertdialog_multichoice.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_noactionbar_alertdialog_onebutton.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_noactionbar_alertdialog_onebutton.png
new file mode 100644
index 0000000..88175a0
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_noactionbar_alertdialog_onebutton.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_noactionbar_alertdialog_singlechoice.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_noactionbar_alertdialog_singlechoice.png
new file mode 100644
index 0000000..709dfb2
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_noactionbar_alertdialog_singlechoice.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_noactionbar_alertdialog_threebuttons.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_noactionbar_alertdialog_threebuttons.png
new file mode 100644
index 0000000..5c018d6
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_noactionbar_alertdialog_threebuttons.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_noactionbar_alertdialog_twobuttons.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_noactionbar_alertdialog_twobuttons.png
new file mode 100644
index 0000000..18569e7
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_noactionbar_alertdialog_twobuttons.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_noactionbar_button.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_noactionbar_button.png
new file mode 100644
index 0000000..06fae2d
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_noactionbar_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_noactionbar_button_pressed.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_noactionbar_button_pressed.png
new file mode 100644
index 0000000..415f4cb
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_noactionbar_button_pressed.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_noactionbar_calendar_view.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_noactionbar_calendar_view.png
new file mode 100644
index 0000000..0e2ee26
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_noactionbar_calendar_view.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_noactionbar_calendar_view_feb.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_noactionbar_calendar_view_feb.png
new file mode 100644
index 0000000..3e7e915
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_noactionbar_calendar_view_feb.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_noactionbar_checkbox.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_noactionbar_checkbox.png
new file mode 100644
index 0000000..9cd44e5
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_noactionbar_checkbox.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_noactionbar_checkbox_checked.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_noactionbar_checkbox_checked.png
new file mode 100644
index 0000000..4d87f34
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_noactionbar_checkbox_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_noactionbar_chronometer.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_noactionbar_chronometer.png
new file mode 100644
index 0000000..90229f0
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_noactionbar_chronometer.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_noactionbar_color_blue_bright.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_noactionbar_color_blue_bright.png
new file mode 100644
index 0000000..d1a3f99
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_noactionbar_color_blue_bright.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_noactionbar_color_blue_dark.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_noactionbar_color_blue_dark.png
new file mode 100644
index 0000000..52a4de2
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_noactionbar_color_blue_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_noactionbar_color_blue_light.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_noactionbar_color_blue_light.png
new file mode 100644
index 0000000..f9439e8
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_noactionbar_color_blue_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_noactionbar_color_green_dark.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_noactionbar_color_green_dark.png
new file mode 100644
index 0000000..4f8af58
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_noactionbar_color_green_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_noactionbar_color_green_light.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_noactionbar_color_green_light.png
new file mode 100644
index 0000000..6ad2394
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_noactionbar_color_green_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_noactionbar_color_orange_dark.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_noactionbar_color_orange_dark.png
new file mode 100644
index 0000000..73f8418
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_noactionbar_color_orange_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_noactionbar_color_orange_light.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_noactionbar_color_orange_light.png
new file mode 100644
index 0000000..90ab999
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_noactionbar_color_orange_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_noactionbar_color_purple.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_noactionbar_color_purple.png
new file mode 100644
index 0000000..30f2d23
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_noactionbar_color_purple.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_noactionbar_color_red_dark.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_noactionbar_color_red_dark.png
new file mode 100644
index 0000000..c0cbef0
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_noactionbar_color_red_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_noactionbar_color_red_light.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_noactionbar_color_red_light.png
new file mode 100644
index 0000000..e99df2c
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_noactionbar_color_red_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_noactionbar_edittext.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_noactionbar_edittext.png
new file mode 100644
index 0000000..e24fc71
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_noactionbar_edittext.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_noactionbar_minwidth_alertdialog_list.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_noactionbar_minwidth_alertdialog_list.png
new file mode 100644
index 0000000..2089f47
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_noactionbar_minwidth_alertdialog_list.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_noactionbar_minwidth_alertdialog_multichoice.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_noactionbar_minwidth_alertdialog_multichoice.png
new file mode 100644
index 0000000..4abe60e
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_noactionbar_minwidth_alertdialog_multichoice.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_noactionbar_minwidth_alertdialog_onebutton.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_noactionbar_minwidth_alertdialog_onebutton.png
new file mode 100644
index 0000000..88175a0
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_noactionbar_minwidth_alertdialog_onebutton.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_noactionbar_minwidth_alertdialog_singlechoice.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_noactionbar_minwidth_alertdialog_singlechoice.png
new file mode 100644
index 0000000..709dfb2
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_noactionbar_minwidth_alertdialog_singlechoice.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_noactionbar_minwidth_alertdialog_threebuttons.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_noactionbar_minwidth_alertdialog_threebuttons.png
new file mode 100644
index 0000000..5c018d6
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_noactionbar_minwidth_alertdialog_threebuttons.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_noactionbar_minwidth_alertdialog_twobuttons.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_noactionbar_minwidth_alertdialog_twobuttons.png
new file mode 100644
index 0000000..18569e7
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_noactionbar_minwidth_alertdialog_twobuttons.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_noactionbar_minwidth_button.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_noactionbar_minwidth_button.png
new file mode 100644
index 0000000..06fae2d
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_noactionbar_minwidth_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_noactionbar_minwidth_button_pressed.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_noactionbar_minwidth_button_pressed.png
new file mode 100644
index 0000000..415f4cb
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_noactionbar_minwidth_button_pressed.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_noactionbar_minwidth_calendar_view.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_noactionbar_minwidth_calendar_view.png
new file mode 100644
index 0000000..0e2ee26
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_noactionbar_minwidth_calendar_view.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_noactionbar_minwidth_calendar_view_feb.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_noactionbar_minwidth_calendar_view_feb.png
new file mode 100644
index 0000000..3e7e915
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_noactionbar_minwidth_calendar_view_feb.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_noactionbar_minwidth_checkbox.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_noactionbar_minwidth_checkbox.png
new file mode 100644
index 0000000..9cd44e5
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_noactionbar_minwidth_checkbox.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_noactionbar_minwidth_checkbox_checked.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_noactionbar_minwidth_checkbox_checked.png
new file mode 100644
index 0000000..4d87f34
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_noactionbar_minwidth_checkbox_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_noactionbar_minwidth_chronometer.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_noactionbar_minwidth_chronometer.png
new file mode 100644
index 0000000..90229f0
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_noactionbar_minwidth_chronometer.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_noactionbar_minwidth_color_blue_bright.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_noactionbar_minwidth_color_blue_bright.png
new file mode 100644
index 0000000..d1a3f99
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_noactionbar_minwidth_color_blue_bright.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_noactionbar_minwidth_color_blue_dark.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_noactionbar_minwidth_color_blue_dark.png
new file mode 100644
index 0000000..52a4de2
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_noactionbar_minwidth_color_blue_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_noactionbar_minwidth_color_blue_light.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_noactionbar_minwidth_color_blue_light.png
new file mode 100644
index 0000000..f9439e8
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_noactionbar_minwidth_color_blue_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_noactionbar_minwidth_color_green_dark.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_noactionbar_minwidth_color_green_dark.png
new file mode 100644
index 0000000..4f8af58
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_noactionbar_minwidth_color_green_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_noactionbar_minwidth_color_green_light.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_noactionbar_minwidth_color_green_light.png
new file mode 100644
index 0000000..6ad2394
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_noactionbar_minwidth_color_green_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_noactionbar_minwidth_color_orange_dark.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_noactionbar_minwidth_color_orange_dark.png
new file mode 100644
index 0000000..73f8418
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_noactionbar_minwidth_color_orange_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_noactionbar_minwidth_color_orange_light.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_noactionbar_minwidth_color_orange_light.png
new file mode 100644
index 0000000..90ab999
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_noactionbar_minwidth_color_orange_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_noactionbar_minwidth_color_purple.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_noactionbar_minwidth_color_purple.png
new file mode 100644
index 0000000..30f2d23
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_noactionbar_minwidth_color_purple.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_noactionbar_minwidth_color_red_dark.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_noactionbar_minwidth_color_red_dark.png
new file mode 100644
index 0000000..c0cbef0
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_noactionbar_minwidth_color_red_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_noactionbar_minwidth_color_red_light.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_noactionbar_minwidth_color_red_light.png
new file mode 100644
index 0000000..e99df2c
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_noactionbar_minwidth_color_red_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_noactionbar_minwidth_edittext.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_noactionbar_minwidth_edittext.png
new file mode 100644
index 0000000..e24fc71
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_noactionbar_minwidth_edittext.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_noactionbar_minwidth_progressbar.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_noactionbar_minwidth_progressbar.png
new file mode 100644
index 0000000..8bb3363
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_noactionbar_minwidth_progressbar.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_noactionbar_minwidth_progressbar_horizontal_0.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_noactionbar_minwidth_progressbar_horizontal_0.png
new file mode 100644
index 0000000..efecebb
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_noactionbar_minwidth_progressbar_horizontal_0.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_noactionbar_minwidth_progressbar_horizontal_100.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_noactionbar_minwidth_progressbar_horizontal_100.png
new file mode 100644
index 0000000..76245b8
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_noactionbar_minwidth_progressbar_horizontal_100.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_noactionbar_minwidth_progressbar_horizontal_50.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_noactionbar_minwidth_progressbar_horizontal_50.png
new file mode 100644
index 0000000..16c7322
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_noactionbar_minwidth_progressbar_horizontal_50.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_noactionbar_minwidth_progressbar_large.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_noactionbar_minwidth_progressbar_large.png
new file mode 100644
index 0000000..98344af
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_noactionbar_minwidth_progressbar_large.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_noactionbar_minwidth_progressbar_small.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_noactionbar_minwidth_progressbar_small.png
new file mode 100644
index 0000000..88ef977
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_noactionbar_minwidth_progressbar_small.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_noactionbar_minwidth_progressdialog_horizontal.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_noactionbar_minwidth_progressdialog_horizontal.png
new file mode 100644
index 0000000..c049776
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_noactionbar_minwidth_progressdialog_horizontal.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_noactionbar_minwidth_radio_button.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_noactionbar_minwidth_radio_button.png
new file mode 100644
index 0000000..e1fa030
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_noactionbar_minwidth_radio_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_noactionbar_minwidth_radio_button_checked.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_noactionbar_minwidth_radio_button_checked.png
new file mode 100644
index 0000000..e998ddc
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_noactionbar_minwidth_radio_button_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_noactionbar_minwidth_radiogroup_horizontal.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_noactionbar_minwidth_radiogroup_horizontal.png
new file mode 100644
index 0000000..bc60c67
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_noactionbar_minwidth_radiogroup_horizontal.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_noactionbar_minwidth_radiogroup_vertical.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_noactionbar_minwidth_radiogroup_vertical.png
new file mode 100644
index 0000000..13033aa
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_noactionbar_minwidth_radiogroup_vertical.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_noactionbar_minwidth_ratingbar_0.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_noactionbar_minwidth_ratingbar_0.png
new file mode 100644
index 0000000..340ff5c
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_noactionbar_minwidth_ratingbar_0.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_noactionbar_minwidth_ratingbar_0_pressed.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_noactionbar_minwidth_ratingbar_0_pressed.png
new file mode 100644
index 0000000..60c731e
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_noactionbar_minwidth_ratingbar_0_pressed.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_noactionbar_minwidth_ratingbar_2point5.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_noactionbar_minwidth_ratingbar_2point5.png
new file mode 100644
index 0000000..260866a
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_noactionbar_minwidth_ratingbar_2point5.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_noactionbar_minwidth_ratingbar_2point5_pressed.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_noactionbar_minwidth_ratingbar_2point5_pressed.png
new file mode 100644
index 0000000..1ba8025
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_noactionbar_minwidth_ratingbar_2point5_pressed.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_noactionbar_minwidth_ratingbar_5.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_noactionbar_minwidth_ratingbar_5.png
new file mode 100644
index 0000000..c1f38bd
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_noactionbar_minwidth_ratingbar_5.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_noactionbar_minwidth_ratingbar_5_pressed.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_noactionbar_minwidth_ratingbar_5_pressed.png
new file mode 100644
index 0000000..c981c8a
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_noactionbar_minwidth_ratingbar_5_pressed.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_noactionbar_minwidth_searchview.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_noactionbar_minwidth_searchview.png
new file mode 100644
index 0000000..43c9f5c
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_noactionbar_minwidth_searchview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_noactionbar_minwidth_searchview_query.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_noactionbar_minwidth_searchview_query.png
new file mode 100644
index 0000000..ee24814
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_noactionbar_minwidth_searchview_query.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_noactionbar_minwidth_searchview_query_hint.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_noactionbar_minwidth_searchview_query_hint.png
new file mode 100644
index 0000000..1a543aa
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_noactionbar_minwidth_searchview_query_hint.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_noactionbar_minwidth_seekbar_0.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_noactionbar_minwidth_seekbar_0.png
new file mode 100644
index 0000000..c61a55c
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_noactionbar_minwidth_seekbar_0.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_noactionbar_minwidth_seekbar_100.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_noactionbar_minwidth_seekbar_100.png
new file mode 100644
index 0000000..a5ae2ba
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_noactionbar_minwidth_seekbar_100.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_noactionbar_minwidth_seekbar_50.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_noactionbar_minwidth_seekbar_50.png
new file mode 100644
index 0000000..c45851e
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_noactionbar_minwidth_seekbar_50.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_noactionbar_minwidth_spinner.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_noactionbar_minwidth_spinner.png
new file mode 100644
index 0000000..2bb082b
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_noactionbar_minwidth_spinner.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_noactionbar_minwidth_switch.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_noactionbar_minwidth_switch.png
new file mode 100644
index 0000000..a7db1ed
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_noactionbar_minwidth_switch.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_noactionbar_minwidth_switch_checked.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_noactionbar_minwidth_switch_checked.png
new file mode 100644
index 0000000..469effd
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_noactionbar_minwidth_switch_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_noactionbar_minwidth_tabhost.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_noactionbar_minwidth_tabhost.png
new file mode 100644
index 0000000..361cf06
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_noactionbar_minwidth_tabhost.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_noactionbar_minwidth_textview.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_noactionbar_minwidth_textview.png
new file mode 100644
index 0000000..821c866
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_noactionbar_minwidth_textview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_noactionbar_minwidth_timepicker.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_noactionbar_minwidth_timepicker.png
new file mode 100644
index 0000000..7a269fd
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_noactionbar_minwidth_timepicker.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_noactionbar_minwidth_toggle_button.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_noactionbar_minwidth_toggle_button.png
new file mode 100644
index 0000000..c9e16e3
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_noactionbar_minwidth_toggle_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_noactionbar_minwidth_toggle_button_checked.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_noactionbar_minwidth_toggle_button_checked.png
new file mode 100644
index 0000000..c974143
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_noactionbar_minwidth_toggle_button_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_noactionbar_minwidth_zoomcontrols.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_noactionbar_minwidth_zoomcontrols.png
new file mode 100644
index 0000000..21d17f9
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_noactionbar_minwidth_zoomcontrols.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_noactionbar_progressbar.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_noactionbar_progressbar.png
new file mode 100644
index 0000000..8bb3363
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_noactionbar_progressbar.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_noactionbar_progressbar_horizontal_0.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_noactionbar_progressbar_horizontal_0.png
new file mode 100644
index 0000000..efecebb
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_noactionbar_progressbar_horizontal_0.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_noactionbar_progressbar_horizontal_100.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_noactionbar_progressbar_horizontal_100.png
new file mode 100644
index 0000000..76245b8
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_noactionbar_progressbar_horizontal_100.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_noactionbar_progressbar_horizontal_50.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_noactionbar_progressbar_horizontal_50.png
new file mode 100644
index 0000000..16c7322
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_noactionbar_progressbar_horizontal_50.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_noactionbar_progressbar_large.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_noactionbar_progressbar_large.png
new file mode 100644
index 0000000..98344af
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_noactionbar_progressbar_large.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_noactionbar_progressbar_small.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_noactionbar_progressbar_small.png
new file mode 100644
index 0000000..88ef977
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_noactionbar_progressbar_small.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_noactionbar_progressdialog_horizontal.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_noactionbar_progressdialog_horizontal.png
new file mode 100644
index 0000000..c049776
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_noactionbar_progressdialog_horizontal.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_noactionbar_radio_button.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_noactionbar_radio_button.png
new file mode 100644
index 0000000..e1fa030
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_noactionbar_radio_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_noactionbar_radio_button_checked.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_noactionbar_radio_button_checked.png
new file mode 100644
index 0000000..e998ddc
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_noactionbar_radio_button_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_noactionbar_radiogroup_horizontal.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_noactionbar_radiogroup_horizontal.png
new file mode 100644
index 0000000..bc60c67
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_noactionbar_radiogroup_horizontal.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_noactionbar_radiogroup_vertical.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_noactionbar_radiogroup_vertical.png
new file mode 100644
index 0000000..13033aa
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_noactionbar_radiogroup_vertical.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_noactionbar_ratingbar_0.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_noactionbar_ratingbar_0.png
new file mode 100644
index 0000000..340ff5c
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_noactionbar_ratingbar_0.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_noactionbar_ratingbar_0_pressed.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_noactionbar_ratingbar_0_pressed.png
new file mode 100644
index 0000000..60c731e
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_noactionbar_ratingbar_0_pressed.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_noactionbar_ratingbar_2point5.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_noactionbar_ratingbar_2point5.png
new file mode 100644
index 0000000..260866a
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_noactionbar_ratingbar_2point5.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_noactionbar_ratingbar_2point5_pressed.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_noactionbar_ratingbar_2point5_pressed.png
new file mode 100644
index 0000000..1ba8025
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_noactionbar_ratingbar_2point5_pressed.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_noactionbar_ratingbar_5.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_noactionbar_ratingbar_5.png
new file mode 100644
index 0000000..c1f38bd
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_noactionbar_ratingbar_5.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_noactionbar_ratingbar_5_pressed.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_noactionbar_ratingbar_5_pressed.png
new file mode 100644
index 0000000..c981c8a
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_noactionbar_ratingbar_5_pressed.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_noactionbar_searchview.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_noactionbar_searchview.png
new file mode 100644
index 0000000..43c9f5c
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_noactionbar_searchview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_noactionbar_searchview_query.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_noactionbar_searchview_query.png
new file mode 100644
index 0000000..ee24814
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_noactionbar_searchview_query.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_noactionbar_searchview_query_hint.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_noactionbar_searchview_query_hint.png
new file mode 100644
index 0000000..1a543aa
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_noactionbar_searchview_query_hint.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_noactionbar_seekbar_0.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_noactionbar_seekbar_0.png
new file mode 100644
index 0000000..c61a55c
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_noactionbar_seekbar_0.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_noactionbar_seekbar_100.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_noactionbar_seekbar_100.png
new file mode 100644
index 0000000..a5ae2ba
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_noactionbar_seekbar_100.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_noactionbar_seekbar_50.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_noactionbar_seekbar_50.png
new file mode 100644
index 0000000..c45851e
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_noactionbar_seekbar_50.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_noactionbar_spinner.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_noactionbar_spinner.png
new file mode 100644
index 0000000..2bb082b
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_noactionbar_spinner.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_noactionbar_switch.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_noactionbar_switch.png
new file mode 100644
index 0000000..a7db1ed
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_noactionbar_switch.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_noactionbar_switch_checked.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_noactionbar_switch_checked.png
new file mode 100644
index 0000000..469effd
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_noactionbar_switch_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_noactionbar_tabhost.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_noactionbar_tabhost.png
new file mode 100644
index 0000000..361cf06
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_noactionbar_tabhost.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_noactionbar_textview.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_noactionbar_textview.png
new file mode 100644
index 0000000..821c866
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_noactionbar_textview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_noactionbar_timepicker.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_noactionbar_timepicker.png
new file mode 100644
index 0000000..7a269fd
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_noactionbar_timepicker.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_noactionbar_toggle_button.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_noactionbar_toggle_button.png
new file mode 100644
index 0000000..c9e16e3
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_noactionbar_toggle_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_noactionbar_toggle_button_checked.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_noactionbar_toggle_button_checked.png
new file mode 100644
index 0000000..c974143
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_noactionbar_toggle_button_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_noactionbar_zoomcontrols.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_noactionbar_zoomcontrols.png
new file mode 100644
index 0000000..21d17f9
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_noactionbar_zoomcontrols.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_progressbar.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_progressbar.png
new file mode 100644
index 0000000..8bb3363
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_progressbar.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_progressbar_horizontal_0.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_progressbar_horizontal_0.png
new file mode 100644
index 0000000..efecebb
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_progressbar_horizontal_0.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_progressbar_horizontal_100.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_progressbar_horizontal_100.png
new file mode 100644
index 0000000..76245b8
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_progressbar_horizontal_100.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_progressbar_horizontal_50.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_progressbar_horizontal_50.png
new file mode 100644
index 0000000..16c7322
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_progressbar_horizontal_50.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_progressbar_large.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_progressbar_large.png
new file mode 100644
index 0000000..98344af
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_progressbar_large.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_progressbar_small.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_progressbar_small.png
new file mode 100644
index 0000000..88ef977
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_progressbar_small.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_progressdialog_horizontal.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_progressdialog_horizontal.png
new file mode 100644
index 0000000..c049776
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_progressdialog_horizontal.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_radio_button.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_radio_button.png
new file mode 100644
index 0000000..e1fa030
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_radio_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_radio_button_checked.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_radio_button_checked.png
new file mode 100644
index 0000000..e998ddc
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_radio_button_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_radiogroup_horizontal.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_radiogroup_horizontal.png
new file mode 100644
index 0000000..bc60c67
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_radiogroup_horizontal.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_radiogroup_vertical.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_radiogroup_vertical.png
new file mode 100644
index 0000000..13033aa
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_radiogroup_vertical.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_ratingbar_0.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_ratingbar_0.png
new file mode 100644
index 0000000..340ff5c
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_ratingbar_0.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_ratingbar_0_pressed.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_ratingbar_0_pressed.png
new file mode 100644
index 0000000..60c731e
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_ratingbar_0_pressed.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_ratingbar_2point5.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_ratingbar_2point5.png
new file mode 100644
index 0000000..260866a
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_ratingbar_2point5.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_ratingbar_2point5_pressed.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_ratingbar_2point5_pressed.png
new file mode 100644
index 0000000..1ba8025
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_ratingbar_2point5_pressed.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_ratingbar_5.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_ratingbar_5.png
new file mode 100644
index 0000000..c1f38bd
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_ratingbar_5.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_ratingbar_5_pressed.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_ratingbar_5_pressed.png
new file mode 100644
index 0000000..c981c8a
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_ratingbar_5_pressed.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_searchview.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_searchview.png
new file mode 100644
index 0000000..43c9f5c
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_searchview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_searchview_query.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_searchview_query.png
new file mode 100644
index 0000000..ee24814
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_searchview_query.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_searchview_query_hint.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_searchview_query_hint.png
new file mode 100644
index 0000000..1a543aa
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_searchview_query_hint.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_seekbar_0.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_seekbar_0.png
new file mode 100644
index 0000000..c61a55c
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_seekbar_0.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_seekbar_100.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_seekbar_100.png
new file mode 100644
index 0000000..a5ae2ba
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_seekbar_100.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_seekbar_50.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_seekbar_50.png
new file mode 100644
index 0000000..c45851e
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_seekbar_50.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_spinner.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_spinner.png
new file mode 100644
index 0000000..2bb082b
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_spinner.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_switch.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_switch.png
new file mode 100644
index 0000000..a7db1ed
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_switch.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_switch_checked.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_switch_checked.png
new file mode 100644
index 0000000..469effd
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_switch_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_tabhost.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_tabhost.png
new file mode 100644
index 0000000..361cf06
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_tabhost.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_textview.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_textview.png
new file mode 100644
index 0000000..821c866
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_textview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_timepicker.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_timepicker.png
new file mode 100644
index 0000000..7a269fd
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_timepicker.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_toggle_button.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_toggle_button.png
new file mode 100644
index 0000000..c9e16e3
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_toggle_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_toggle_button_checked.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_toggle_button_checked.png
new file mode 100644
index 0000000..c974143
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_toggle_button_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_zoomcontrols.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_zoomcontrols.png
new file mode 100644
index 0000000..21d17f9
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialog_zoomcontrols.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_dialogwhenlarge_alertdialog_list.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialogwhenlarge_alertdialog_list.png
new file mode 100644
index 0000000..2089f47
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialogwhenlarge_alertdialog_list.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_dialogwhenlarge_alertdialog_multichoice.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialogwhenlarge_alertdialog_multichoice.png
new file mode 100644
index 0000000..4abe60e
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialogwhenlarge_alertdialog_multichoice.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_dialogwhenlarge_alertdialog_onebutton.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialogwhenlarge_alertdialog_onebutton.png
new file mode 100644
index 0000000..88175a0
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialogwhenlarge_alertdialog_onebutton.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_dialogwhenlarge_alertdialog_singlechoice.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialogwhenlarge_alertdialog_singlechoice.png
new file mode 100644
index 0000000..709dfb2
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialogwhenlarge_alertdialog_singlechoice.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_dialogwhenlarge_alertdialog_threebuttons.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialogwhenlarge_alertdialog_threebuttons.png
new file mode 100644
index 0000000..5c018d6
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialogwhenlarge_alertdialog_threebuttons.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_dialogwhenlarge_alertdialog_twobuttons.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialogwhenlarge_alertdialog_twobuttons.png
new file mode 100644
index 0000000..18569e7
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialogwhenlarge_alertdialog_twobuttons.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_dialogwhenlarge_button.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialogwhenlarge_button.png
new file mode 100644
index 0000000..06fae2d
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialogwhenlarge_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_dialogwhenlarge_button_pressed.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialogwhenlarge_button_pressed.png
new file mode 100644
index 0000000..415f4cb
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialogwhenlarge_button_pressed.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_dialogwhenlarge_calendar_view.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialogwhenlarge_calendar_view.png
new file mode 100644
index 0000000..0e2ee26
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialogwhenlarge_calendar_view.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_dialogwhenlarge_calendar_view_feb.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialogwhenlarge_calendar_view_feb.png
new file mode 100644
index 0000000..3e7e915
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialogwhenlarge_calendar_view_feb.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_dialogwhenlarge_checkbox.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialogwhenlarge_checkbox.png
new file mode 100644
index 0000000..9cd44e5
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialogwhenlarge_checkbox.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_dialogwhenlarge_checkbox_checked.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialogwhenlarge_checkbox_checked.png
new file mode 100644
index 0000000..4d87f34
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialogwhenlarge_checkbox_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_dialogwhenlarge_chronometer.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialogwhenlarge_chronometer.png
new file mode 100644
index 0000000..90229f0
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialogwhenlarge_chronometer.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_dialogwhenlarge_color_blue_bright.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialogwhenlarge_color_blue_bright.png
new file mode 100644
index 0000000..d1a3f99
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialogwhenlarge_color_blue_bright.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_dialogwhenlarge_color_blue_dark.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialogwhenlarge_color_blue_dark.png
new file mode 100644
index 0000000..52a4de2
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialogwhenlarge_color_blue_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_dialogwhenlarge_color_blue_light.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialogwhenlarge_color_blue_light.png
new file mode 100644
index 0000000..f9439e8
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialogwhenlarge_color_blue_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_dialogwhenlarge_color_green_dark.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialogwhenlarge_color_green_dark.png
new file mode 100644
index 0000000..4f8af58
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialogwhenlarge_color_green_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_dialogwhenlarge_color_green_light.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialogwhenlarge_color_green_light.png
new file mode 100644
index 0000000..6ad2394
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialogwhenlarge_color_green_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_dialogwhenlarge_color_orange_dark.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialogwhenlarge_color_orange_dark.png
new file mode 100644
index 0000000..73f8418
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialogwhenlarge_color_orange_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_dialogwhenlarge_color_orange_light.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialogwhenlarge_color_orange_light.png
new file mode 100644
index 0000000..90ab999
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialogwhenlarge_color_orange_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_dialogwhenlarge_color_purple.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialogwhenlarge_color_purple.png
new file mode 100644
index 0000000..30f2d23
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialogwhenlarge_color_purple.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_dialogwhenlarge_color_red_dark.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialogwhenlarge_color_red_dark.png
new file mode 100644
index 0000000..c0cbef0
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialogwhenlarge_color_red_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_dialogwhenlarge_color_red_light.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialogwhenlarge_color_red_light.png
new file mode 100644
index 0000000..e99df2c
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialogwhenlarge_color_red_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_dialogwhenlarge_edittext.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialogwhenlarge_edittext.png
new file mode 100644
index 0000000..e24fc71
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialogwhenlarge_edittext.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_dialogwhenlarge_noactionbar_alertdialog_list.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialogwhenlarge_noactionbar_alertdialog_list.png
new file mode 100644
index 0000000..2089f47
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialogwhenlarge_noactionbar_alertdialog_list.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_dialogwhenlarge_noactionbar_alertdialog_multichoice.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialogwhenlarge_noactionbar_alertdialog_multichoice.png
new file mode 100644
index 0000000..4abe60e
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialogwhenlarge_noactionbar_alertdialog_multichoice.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_dialogwhenlarge_noactionbar_alertdialog_onebutton.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialogwhenlarge_noactionbar_alertdialog_onebutton.png
new file mode 100644
index 0000000..88175a0
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialogwhenlarge_noactionbar_alertdialog_onebutton.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_dialogwhenlarge_noactionbar_alertdialog_singlechoice.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialogwhenlarge_noactionbar_alertdialog_singlechoice.png
new file mode 100644
index 0000000..709dfb2
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialogwhenlarge_noactionbar_alertdialog_singlechoice.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_dialogwhenlarge_noactionbar_alertdialog_threebuttons.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialogwhenlarge_noactionbar_alertdialog_threebuttons.png
new file mode 100644
index 0000000..5c018d6
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialogwhenlarge_noactionbar_alertdialog_threebuttons.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_dialogwhenlarge_noactionbar_alertdialog_twobuttons.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialogwhenlarge_noactionbar_alertdialog_twobuttons.png
new file mode 100644
index 0000000..18569e7
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialogwhenlarge_noactionbar_alertdialog_twobuttons.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_dialogwhenlarge_noactionbar_button.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialogwhenlarge_noactionbar_button.png
new file mode 100644
index 0000000..06fae2d
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialogwhenlarge_noactionbar_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_dialogwhenlarge_noactionbar_button_pressed.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialogwhenlarge_noactionbar_button_pressed.png
new file mode 100644
index 0000000..415f4cb
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialogwhenlarge_noactionbar_button_pressed.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_dialogwhenlarge_noactionbar_calendar_view.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialogwhenlarge_noactionbar_calendar_view.png
new file mode 100644
index 0000000..0e2ee26
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialogwhenlarge_noactionbar_calendar_view.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_dialogwhenlarge_noactionbar_calendar_view_feb.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialogwhenlarge_noactionbar_calendar_view_feb.png
new file mode 100644
index 0000000..3e7e915
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialogwhenlarge_noactionbar_calendar_view_feb.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_dialogwhenlarge_noactionbar_checkbox.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialogwhenlarge_noactionbar_checkbox.png
new file mode 100644
index 0000000..9cd44e5
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialogwhenlarge_noactionbar_checkbox.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_dialogwhenlarge_noactionbar_checkbox_checked.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialogwhenlarge_noactionbar_checkbox_checked.png
new file mode 100644
index 0000000..4d87f34
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialogwhenlarge_noactionbar_checkbox_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_dialogwhenlarge_noactionbar_chronometer.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialogwhenlarge_noactionbar_chronometer.png
new file mode 100644
index 0000000..90229f0
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialogwhenlarge_noactionbar_chronometer.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_dialogwhenlarge_noactionbar_color_blue_bright.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialogwhenlarge_noactionbar_color_blue_bright.png
new file mode 100644
index 0000000..d1a3f99
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialogwhenlarge_noactionbar_color_blue_bright.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_dialogwhenlarge_noactionbar_color_blue_dark.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialogwhenlarge_noactionbar_color_blue_dark.png
new file mode 100644
index 0000000..52a4de2
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialogwhenlarge_noactionbar_color_blue_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_dialogwhenlarge_noactionbar_color_blue_light.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialogwhenlarge_noactionbar_color_blue_light.png
new file mode 100644
index 0000000..f9439e8
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialogwhenlarge_noactionbar_color_blue_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_dialogwhenlarge_noactionbar_color_green_dark.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialogwhenlarge_noactionbar_color_green_dark.png
new file mode 100644
index 0000000..4f8af58
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialogwhenlarge_noactionbar_color_green_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_dialogwhenlarge_noactionbar_color_green_light.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialogwhenlarge_noactionbar_color_green_light.png
new file mode 100644
index 0000000..6ad2394
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialogwhenlarge_noactionbar_color_green_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_dialogwhenlarge_noactionbar_color_orange_dark.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialogwhenlarge_noactionbar_color_orange_dark.png
new file mode 100644
index 0000000..73f8418
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialogwhenlarge_noactionbar_color_orange_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_dialogwhenlarge_noactionbar_color_orange_light.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialogwhenlarge_noactionbar_color_orange_light.png
new file mode 100644
index 0000000..90ab999
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialogwhenlarge_noactionbar_color_orange_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_dialogwhenlarge_noactionbar_color_purple.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialogwhenlarge_noactionbar_color_purple.png
new file mode 100644
index 0000000..30f2d23
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialogwhenlarge_noactionbar_color_purple.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_dialogwhenlarge_noactionbar_color_red_dark.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialogwhenlarge_noactionbar_color_red_dark.png
new file mode 100644
index 0000000..c0cbef0
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialogwhenlarge_noactionbar_color_red_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_dialogwhenlarge_noactionbar_color_red_light.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialogwhenlarge_noactionbar_color_red_light.png
new file mode 100644
index 0000000..e99df2c
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialogwhenlarge_noactionbar_color_red_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_dialogwhenlarge_noactionbar_edittext.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialogwhenlarge_noactionbar_edittext.png
new file mode 100644
index 0000000..e24fc71
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialogwhenlarge_noactionbar_edittext.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_dialogwhenlarge_noactionbar_progressbar.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialogwhenlarge_noactionbar_progressbar.png
new file mode 100644
index 0000000..8bb3363
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialogwhenlarge_noactionbar_progressbar.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_dialogwhenlarge_noactionbar_progressbar_horizontal_0.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialogwhenlarge_noactionbar_progressbar_horizontal_0.png
new file mode 100644
index 0000000..efecebb
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialogwhenlarge_noactionbar_progressbar_horizontal_0.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_dialogwhenlarge_noactionbar_progressbar_horizontal_100.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialogwhenlarge_noactionbar_progressbar_horizontal_100.png
new file mode 100644
index 0000000..76245b8
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialogwhenlarge_noactionbar_progressbar_horizontal_100.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_dialogwhenlarge_noactionbar_progressbar_horizontal_50.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialogwhenlarge_noactionbar_progressbar_horizontal_50.png
new file mode 100644
index 0000000..16c7322
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialogwhenlarge_noactionbar_progressbar_horizontal_50.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_dialogwhenlarge_noactionbar_progressbar_large.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialogwhenlarge_noactionbar_progressbar_large.png
new file mode 100644
index 0000000..98344af
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialogwhenlarge_noactionbar_progressbar_large.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_dialogwhenlarge_noactionbar_progressbar_small.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialogwhenlarge_noactionbar_progressbar_small.png
new file mode 100644
index 0000000..88ef977
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialogwhenlarge_noactionbar_progressbar_small.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_dialogwhenlarge_noactionbar_progressdialog_horizontal.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialogwhenlarge_noactionbar_progressdialog_horizontal.png
new file mode 100644
index 0000000..c049776
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialogwhenlarge_noactionbar_progressdialog_horizontal.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_dialogwhenlarge_noactionbar_radio_button.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialogwhenlarge_noactionbar_radio_button.png
new file mode 100644
index 0000000..e1fa030
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialogwhenlarge_noactionbar_radio_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_dialogwhenlarge_noactionbar_radio_button_checked.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialogwhenlarge_noactionbar_radio_button_checked.png
new file mode 100644
index 0000000..e998ddc
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialogwhenlarge_noactionbar_radio_button_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_dialogwhenlarge_noactionbar_radiogroup_horizontal.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialogwhenlarge_noactionbar_radiogroup_horizontal.png
new file mode 100644
index 0000000..bc60c67
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialogwhenlarge_noactionbar_radiogroup_horizontal.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_dialogwhenlarge_noactionbar_radiogroup_vertical.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialogwhenlarge_noactionbar_radiogroup_vertical.png
new file mode 100644
index 0000000..13033aa
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialogwhenlarge_noactionbar_radiogroup_vertical.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_dialogwhenlarge_noactionbar_ratingbar_0.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialogwhenlarge_noactionbar_ratingbar_0.png
new file mode 100644
index 0000000..340ff5c
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialogwhenlarge_noactionbar_ratingbar_0.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_dialogwhenlarge_noactionbar_ratingbar_0_pressed.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialogwhenlarge_noactionbar_ratingbar_0_pressed.png
new file mode 100644
index 0000000..60c731e
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialogwhenlarge_noactionbar_ratingbar_0_pressed.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_dialogwhenlarge_noactionbar_ratingbar_2point5.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialogwhenlarge_noactionbar_ratingbar_2point5.png
new file mode 100644
index 0000000..260866a
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialogwhenlarge_noactionbar_ratingbar_2point5.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_dialogwhenlarge_noactionbar_ratingbar_2point5_pressed.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialogwhenlarge_noactionbar_ratingbar_2point5_pressed.png
new file mode 100644
index 0000000..1ba8025
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialogwhenlarge_noactionbar_ratingbar_2point5_pressed.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_dialogwhenlarge_noactionbar_ratingbar_5.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialogwhenlarge_noactionbar_ratingbar_5.png
new file mode 100644
index 0000000..c1f38bd
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialogwhenlarge_noactionbar_ratingbar_5.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_dialogwhenlarge_noactionbar_ratingbar_5_pressed.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialogwhenlarge_noactionbar_ratingbar_5_pressed.png
new file mode 100644
index 0000000..c981c8a
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialogwhenlarge_noactionbar_ratingbar_5_pressed.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_dialogwhenlarge_noactionbar_searchview.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialogwhenlarge_noactionbar_searchview.png
new file mode 100644
index 0000000..43c9f5c
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialogwhenlarge_noactionbar_searchview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_dialogwhenlarge_noactionbar_searchview_query.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialogwhenlarge_noactionbar_searchview_query.png
new file mode 100644
index 0000000..ee24814
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialogwhenlarge_noactionbar_searchview_query.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_dialogwhenlarge_noactionbar_searchview_query_hint.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialogwhenlarge_noactionbar_searchview_query_hint.png
new file mode 100644
index 0000000..1a543aa
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialogwhenlarge_noactionbar_searchview_query_hint.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_dialogwhenlarge_noactionbar_seekbar_0.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialogwhenlarge_noactionbar_seekbar_0.png
new file mode 100644
index 0000000..c61a55c
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialogwhenlarge_noactionbar_seekbar_0.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_dialogwhenlarge_noactionbar_seekbar_100.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialogwhenlarge_noactionbar_seekbar_100.png
new file mode 100644
index 0000000..a5ae2ba
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialogwhenlarge_noactionbar_seekbar_100.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_dialogwhenlarge_noactionbar_seekbar_50.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialogwhenlarge_noactionbar_seekbar_50.png
new file mode 100644
index 0000000..c45851e
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialogwhenlarge_noactionbar_seekbar_50.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_dialogwhenlarge_noactionbar_spinner.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialogwhenlarge_noactionbar_spinner.png
new file mode 100644
index 0000000..2bb082b
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialogwhenlarge_noactionbar_spinner.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_dialogwhenlarge_noactionbar_switch.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialogwhenlarge_noactionbar_switch.png
new file mode 100644
index 0000000..a7db1ed
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialogwhenlarge_noactionbar_switch.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_dialogwhenlarge_noactionbar_switch_checked.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialogwhenlarge_noactionbar_switch_checked.png
new file mode 100644
index 0000000..469effd
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialogwhenlarge_noactionbar_switch_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_dialogwhenlarge_noactionbar_tabhost.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialogwhenlarge_noactionbar_tabhost.png
new file mode 100644
index 0000000..361cf06
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialogwhenlarge_noactionbar_tabhost.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_dialogwhenlarge_noactionbar_textview.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialogwhenlarge_noactionbar_textview.png
new file mode 100644
index 0000000..821c866
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialogwhenlarge_noactionbar_textview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_dialogwhenlarge_noactionbar_timepicker.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialogwhenlarge_noactionbar_timepicker.png
new file mode 100644
index 0000000..7a269fd
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialogwhenlarge_noactionbar_timepicker.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_dialogwhenlarge_noactionbar_toggle_button.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialogwhenlarge_noactionbar_toggle_button.png
new file mode 100644
index 0000000..c9e16e3
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialogwhenlarge_noactionbar_toggle_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_dialogwhenlarge_noactionbar_toggle_button_checked.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialogwhenlarge_noactionbar_toggle_button_checked.png
new file mode 100644
index 0000000..c974143
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialogwhenlarge_noactionbar_toggle_button_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_dialogwhenlarge_noactionbar_zoomcontrols.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialogwhenlarge_noactionbar_zoomcontrols.png
new file mode 100644
index 0000000..21d17f9
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialogwhenlarge_noactionbar_zoomcontrols.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_dialogwhenlarge_progressbar.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialogwhenlarge_progressbar.png
new file mode 100644
index 0000000..8bb3363
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialogwhenlarge_progressbar.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_dialogwhenlarge_progressbar_horizontal_0.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialogwhenlarge_progressbar_horizontal_0.png
new file mode 100644
index 0000000..efecebb
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialogwhenlarge_progressbar_horizontal_0.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_dialogwhenlarge_progressbar_horizontal_100.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialogwhenlarge_progressbar_horizontal_100.png
new file mode 100644
index 0000000..76245b8
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialogwhenlarge_progressbar_horizontal_100.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_dialogwhenlarge_progressbar_horizontal_50.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialogwhenlarge_progressbar_horizontal_50.png
new file mode 100644
index 0000000..16c7322
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialogwhenlarge_progressbar_horizontal_50.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_dialogwhenlarge_progressbar_large.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialogwhenlarge_progressbar_large.png
new file mode 100644
index 0000000..98344af
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialogwhenlarge_progressbar_large.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_dialogwhenlarge_progressbar_small.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialogwhenlarge_progressbar_small.png
new file mode 100644
index 0000000..88ef977
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialogwhenlarge_progressbar_small.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_dialogwhenlarge_progressdialog_horizontal.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialogwhenlarge_progressdialog_horizontal.png
new file mode 100644
index 0000000..c049776
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialogwhenlarge_progressdialog_horizontal.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_dialogwhenlarge_radio_button.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialogwhenlarge_radio_button.png
new file mode 100644
index 0000000..e1fa030
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialogwhenlarge_radio_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_dialogwhenlarge_radio_button_checked.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialogwhenlarge_radio_button_checked.png
new file mode 100644
index 0000000..e998ddc
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialogwhenlarge_radio_button_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_dialogwhenlarge_radiogroup_horizontal.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialogwhenlarge_radiogroup_horizontal.png
new file mode 100644
index 0000000..bc60c67
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialogwhenlarge_radiogroup_horizontal.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_dialogwhenlarge_radiogroup_vertical.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialogwhenlarge_radiogroup_vertical.png
new file mode 100644
index 0000000..13033aa
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialogwhenlarge_radiogroup_vertical.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_dialogwhenlarge_ratingbar_0.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialogwhenlarge_ratingbar_0.png
new file mode 100644
index 0000000..340ff5c
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialogwhenlarge_ratingbar_0.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_dialogwhenlarge_ratingbar_0_pressed.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialogwhenlarge_ratingbar_0_pressed.png
new file mode 100644
index 0000000..60c731e
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialogwhenlarge_ratingbar_0_pressed.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_dialogwhenlarge_ratingbar_2point5.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialogwhenlarge_ratingbar_2point5.png
new file mode 100644
index 0000000..260866a
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialogwhenlarge_ratingbar_2point5.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_dialogwhenlarge_ratingbar_2point5_pressed.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialogwhenlarge_ratingbar_2point5_pressed.png
new file mode 100644
index 0000000..1ba8025
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialogwhenlarge_ratingbar_2point5_pressed.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_dialogwhenlarge_ratingbar_5.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialogwhenlarge_ratingbar_5.png
new file mode 100644
index 0000000..c1f38bd
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialogwhenlarge_ratingbar_5.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_dialogwhenlarge_ratingbar_5_pressed.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialogwhenlarge_ratingbar_5_pressed.png
new file mode 100644
index 0000000..c981c8a
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialogwhenlarge_ratingbar_5_pressed.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_dialogwhenlarge_searchview.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialogwhenlarge_searchview.png
new file mode 100644
index 0000000..43c9f5c
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialogwhenlarge_searchview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_dialogwhenlarge_searchview_query.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialogwhenlarge_searchview_query.png
new file mode 100644
index 0000000..ee24814
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialogwhenlarge_searchview_query.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_dialogwhenlarge_searchview_query_hint.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialogwhenlarge_searchview_query_hint.png
new file mode 100644
index 0000000..1a543aa
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialogwhenlarge_searchview_query_hint.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_dialogwhenlarge_seekbar_0.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialogwhenlarge_seekbar_0.png
new file mode 100644
index 0000000..c61a55c
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialogwhenlarge_seekbar_0.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_dialogwhenlarge_seekbar_100.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialogwhenlarge_seekbar_100.png
new file mode 100644
index 0000000..a5ae2ba
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialogwhenlarge_seekbar_100.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_dialogwhenlarge_seekbar_50.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialogwhenlarge_seekbar_50.png
new file mode 100644
index 0000000..c45851e
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialogwhenlarge_seekbar_50.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_dialogwhenlarge_spinner.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialogwhenlarge_spinner.png
new file mode 100644
index 0000000..2bb082b
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialogwhenlarge_spinner.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_dialogwhenlarge_switch.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialogwhenlarge_switch.png
new file mode 100644
index 0000000..a7db1ed
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialogwhenlarge_switch.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_dialogwhenlarge_switch_checked.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialogwhenlarge_switch_checked.png
new file mode 100644
index 0000000..469effd
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialogwhenlarge_switch_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_dialogwhenlarge_tabhost.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialogwhenlarge_tabhost.png
new file mode 100644
index 0000000..361cf06
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialogwhenlarge_tabhost.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_dialogwhenlarge_textview.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialogwhenlarge_textview.png
new file mode 100644
index 0000000..821c866
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialogwhenlarge_textview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_dialogwhenlarge_timepicker.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialogwhenlarge_timepicker.png
new file mode 100644
index 0000000..7a269fd
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialogwhenlarge_timepicker.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_dialogwhenlarge_toggle_button.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialogwhenlarge_toggle_button.png
new file mode 100644
index 0000000..c9e16e3
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialogwhenlarge_toggle_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_dialogwhenlarge_toggle_button_checked.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialogwhenlarge_toggle_button_checked.png
new file mode 100644
index 0000000..c974143
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialogwhenlarge_toggle_button_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_dialogwhenlarge_zoomcontrols.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialogwhenlarge_zoomcontrols.png
new file mode 100644
index 0000000..21d17f9
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_dialogwhenlarge_zoomcontrols.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_edittext.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_edittext.png
new file mode 100644
index 0000000..e24fc71
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_edittext.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_noactionbar_alertdialog_list.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_noactionbar_alertdialog_list.png
new file mode 100644
index 0000000..2089f47
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_noactionbar_alertdialog_list.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_noactionbar_alertdialog_multichoice.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_noactionbar_alertdialog_multichoice.png
new file mode 100644
index 0000000..4abe60e
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_noactionbar_alertdialog_multichoice.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_noactionbar_alertdialog_onebutton.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_noactionbar_alertdialog_onebutton.png
new file mode 100644
index 0000000..88175a0
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_noactionbar_alertdialog_onebutton.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_noactionbar_alertdialog_singlechoice.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_noactionbar_alertdialog_singlechoice.png
new file mode 100644
index 0000000..709dfb2
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_noactionbar_alertdialog_singlechoice.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_noactionbar_alertdialog_threebuttons.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_noactionbar_alertdialog_threebuttons.png
new file mode 100644
index 0000000..5c018d6
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_noactionbar_alertdialog_threebuttons.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_noactionbar_alertdialog_twobuttons.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_noactionbar_alertdialog_twobuttons.png
new file mode 100644
index 0000000..18569e7
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_noactionbar_alertdialog_twobuttons.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_noactionbar_button.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_noactionbar_button.png
new file mode 100644
index 0000000..06fae2d
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_noactionbar_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_noactionbar_button_pressed.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_noactionbar_button_pressed.png
new file mode 100644
index 0000000..415f4cb
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_noactionbar_button_pressed.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_noactionbar_calendar_view.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_noactionbar_calendar_view.png
new file mode 100644
index 0000000..0e2ee26
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_noactionbar_calendar_view.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_noactionbar_calendar_view_feb.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_noactionbar_calendar_view_feb.png
new file mode 100644
index 0000000..3e7e915
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_noactionbar_calendar_view_feb.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_noactionbar_checkbox.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_noactionbar_checkbox.png
new file mode 100644
index 0000000..9cd44e5
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_noactionbar_checkbox.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_noactionbar_checkbox_checked.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_noactionbar_checkbox_checked.png
new file mode 100644
index 0000000..4d87f34
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_noactionbar_checkbox_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_noactionbar_chronometer.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_noactionbar_chronometer.png
new file mode 100644
index 0000000..90229f0
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_noactionbar_chronometer.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_noactionbar_color_blue_bright.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_noactionbar_color_blue_bright.png
new file mode 100644
index 0000000..d1a3f99
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_noactionbar_color_blue_bright.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_noactionbar_color_blue_dark.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_noactionbar_color_blue_dark.png
new file mode 100644
index 0000000..52a4de2
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_noactionbar_color_blue_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_noactionbar_color_blue_light.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_noactionbar_color_blue_light.png
new file mode 100644
index 0000000..f9439e8
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_noactionbar_color_blue_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_noactionbar_color_green_dark.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_noactionbar_color_green_dark.png
new file mode 100644
index 0000000..4f8af58
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_noactionbar_color_green_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_noactionbar_color_green_light.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_noactionbar_color_green_light.png
new file mode 100644
index 0000000..6ad2394
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_noactionbar_color_green_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_noactionbar_color_orange_dark.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_noactionbar_color_orange_dark.png
new file mode 100644
index 0000000..73f8418
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_noactionbar_color_orange_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_noactionbar_color_orange_light.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_noactionbar_color_orange_light.png
new file mode 100644
index 0000000..90ab999
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_noactionbar_color_orange_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_noactionbar_color_purple.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_noactionbar_color_purple.png
new file mode 100644
index 0000000..30f2d23
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_noactionbar_color_purple.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_noactionbar_color_red_dark.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_noactionbar_color_red_dark.png
new file mode 100644
index 0000000..c0cbef0
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_noactionbar_color_red_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_noactionbar_color_red_light.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_noactionbar_color_red_light.png
new file mode 100644
index 0000000..e99df2c
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_noactionbar_color_red_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_noactionbar_edittext.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_noactionbar_edittext.png
new file mode 100644
index 0000000..e24fc71
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_noactionbar_edittext.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_noactionbar_fullscreen_alertdialog_list.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_noactionbar_fullscreen_alertdialog_list.png
new file mode 100644
index 0000000..2089f47
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_noactionbar_fullscreen_alertdialog_list.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_noactionbar_fullscreen_alertdialog_multichoice.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_noactionbar_fullscreen_alertdialog_multichoice.png
new file mode 100644
index 0000000..4abe60e
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_noactionbar_fullscreen_alertdialog_multichoice.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_noactionbar_fullscreen_alertdialog_onebutton.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_noactionbar_fullscreen_alertdialog_onebutton.png
new file mode 100644
index 0000000..88175a0
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_noactionbar_fullscreen_alertdialog_onebutton.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_noactionbar_fullscreen_alertdialog_singlechoice.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_noactionbar_fullscreen_alertdialog_singlechoice.png
new file mode 100644
index 0000000..709dfb2
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_noactionbar_fullscreen_alertdialog_singlechoice.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_noactionbar_fullscreen_alertdialog_threebuttons.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_noactionbar_fullscreen_alertdialog_threebuttons.png
new file mode 100644
index 0000000..5c018d6
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_noactionbar_fullscreen_alertdialog_threebuttons.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_noactionbar_fullscreen_alertdialog_twobuttons.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_noactionbar_fullscreen_alertdialog_twobuttons.png
new file mode 100644
index 0000000..18569e7
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_noactionbar_fullscreen_alertdialog_twobuttons.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_noactionbar_fullscreen_button.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_noactionbar_fullscreen_button.png
new file mode 100644
index 0000000..06fae2d
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_noactionbar_fullscreen_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_noactionbar_fullscreen_button_pressed.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_noactionbar_fullscreen_button_pressed.png
new file mode 100644
index 0000000..415f4cb
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_noactionbar_fullscreen_button_pressed.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_noactionbar_fullscreen_calendar_view.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_noactionbar_fullscreen_calendar_view.png
new file mode 100644
index 0000000..0e2ee26
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_noactionbar_fullscreen_calendar_view.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_noactionbar_fullscreen_calendar_view_feb.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_noactionbar_fullscreen_calendar_view_feb.png
new file mode 100644
index 0000000..3e7e915
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_noactionbar_fullscreen_calendar_view_feb.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_noactionbar_fullscreen_checkbox.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_noactionbar_fullscreen_checkbox.png
new file mode 100644
index 0000000..9cd44e5
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_noactionbar_fullscreen_checkbox.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_noactionbar_fullscreen_checkbox_checked.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_noactionbar_fullscreen_checkbox_checked.png
new file mode 100644
index 0000000..4d87f34
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_noactionbar_fullscreen_checkbox_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_noactionbar_fullscreen_chronometer.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_noactionbar_fullscreen_chronometer.png
new file mode 100644
index 0000000..90229f0
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_noactionbar_fullscreen_chronometer.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_noactionbar_fullscreen_color_blue_bright.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_noactionbar_fullscreen_color_blue_bright.png
new file mode 100644
index 0000000..d1a3f99
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_noactionbar_fullscreen_color_blue_bright.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_noactionbar_fullscreen_color_blue_dark.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_noactionbar_fullscreen_color_blue_dark.png
new file mode 100644
index 0000000..52a4de2
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_noactionbar_fullscreen_color_blue_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_noactionbar_fullscreen_color_blue_light.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_noactionbar_fullscreen_color_blue_light.png
new file mode 100644
index 0000000..f9439e8
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_noactionbar_fullscreen_color_blue_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_noactionbar_fullscreen_color_green_dark.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_noactionbar_fullscreen_color_green_dark.png
new file mode 100644
index 0000000..4f8af58
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_noactionbar_fullscreen_color_green_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_noactionbar_fullscreen_color_green_light.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_noactionbar_fullscreen_color_green_light.png
new file mode 100644
index 0000000..6ad2394
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_noactionbar_fullscreen_color_green_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_noactionbar_fullscreen_color_orange_dark.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_noactionbar_fullscreen_color_orange_dark.png
new file mode 100644
index 0000000..73f8418
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_noactionbar_fullscreen_color_orange_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_noactionbar_fullscreen_color_orange_light.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_noactionbar_fullscreen_color_orange_light.png
new file mode 100644
index 0000000..90ab999
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_noactionbar_fullscreen_color_orange_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_noactionbar_fullscreen_color_purple.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_noactionbar_fullscreen_color_purple.png
new file mode 100644
index 0000000..30f2d23
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_noactionbar_fullscreen_color_purple.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_noactionbar_fullscreen_color_red_dark.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_noactionbar_fullscreen_color_red_dark.png
new file mode 100644
index 0000000..c0cbef0
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_noactionbar_fullscreen_color_red_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_noactionbar_fullscreen_color_red_light.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_noactionbar_fullscreen_color_red_light.png
new file mode 100644
index 0000000..e99df2c
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_noactionbar_fullscreen_color_red_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_noactionbar_fullscreen_edittext.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_noactionbar_fullscreen_edittext.png
new file mode 100644
index 0000000..e24fc71
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_noactionbar_fullscreen_edittext.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_noactionbar_fullscreen_progressbar.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_noactionbar_fullscreen_progressbar.png
new file mode 100644
index 0000000..8bb3363
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_noactionbar_fullscreen_progressbar.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_noactionbar_fullscreen_progressbar_horizontal_0.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_noactionbar_fullscreen_progressbar_horizontal_0.png
new file mode 100644
index 0000000..efecebb
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_noactionbar_fullscreen_progressbar_horizontal_0.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_noactionbar_fullscreen_progressbar_horizontal_100.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_noactionbar_fullscreen_progressbar_horizontal_100.png
new file mode 100644
index 0000000..76245b8
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_noactionbar_fullscreen_progressbar_horizontal_100.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_noactionbar_fullscreen_progressbar_horizontal_50.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_noactionbar_fullscreen_progressbar_horizontal_50.png
new file mode 100644
index 0000000..16c7322
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_noactionbar_fullscreen_progressbar_horizontal_50.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_noactionbar_fullscreen_progressbar_large.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_noactionbar_fullscreen_progressbar_large.png
new file mode 100644
index 0000000..98344af
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_noactionbar_fullscreen_progressbar_large.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_noactionbar_fullscreen_progressbar_small.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_noactionbar_fullscreen_progressbar_small.png
new file mode 100644
index 0000000..88ef977
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_noactionbar_fullscreen_progressbar_small.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_noactionbar_fullscreen_progressdialog_horizontal.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_noactionbar_fullscreen_progressdialog_horizontal.png
new file mode 100644
index 0000000..c049776
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_noactionbar_fullscreen_progressdialog_horizontal.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_noactionbar_fullscreen_radio_button.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_noactionbar_fullscreen_radio_button.png
new file mode 100644
index 0000000..e1fa030
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_noactionbar_fullscreen_radio_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_noactionbar_fullscreen_radio_button_checked.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_noactionbar_fullscreen_radio_button_checked.png
new file mode 100644
index 0000000..e998ddc
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_noactionbar_fullscreen_radio_button_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_noactionbar_fullscreen_radiogroup_horizontal.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_noactionbar_fullscreen_radiogroup_horizontal.png
new file mode 100644
index 0000000..bc60c67
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_noactionbar_fullscreen_radiogroup_horizontal.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_noactionbar_fullscreen_radiogroup_vertical.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_noactionbar_fullscreen_radiogroup_vertical.png
new file mode 100644
index 0000000..13033aa
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_noactionbar_fullscreen_radiogroup_vertical.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_noactionbar_fullscreen_ratingbar_0.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_noactionbar_fullscreen_ratingbar_0.png
new file mode 100644
index 0000000..340ff5c
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_noactionbar_fullscreen_ratingbar_0.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_noactionbar_fullscreen_ratingbar_0_pressed.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_noactionbar_fullscreen_ratingbar_0_pressed.png
new file mode 100644
index 0000000..60c731e
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_noactionbar_fullscreen_ratingbar_0_pressed.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_noactionbar_fullscreen_ratingbar_2point5.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_noactionbar_fullscreen_ratingbar_2point5.png
new file mode 100644
index 0000000..260866a
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_noactionbar_fullscreen_ratingbar_2point5.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_noactionbar_fullscreen_ratingbar_2point5_pressed.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_noactionbar_fullscreen_ratingbar_2point5_pressed.png
new file mode 100644
index 0000000..1ba8025
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_noactionbar_fullscreen_ratingbar_2point5_pressed.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_noactionbar_fullscreen_ratingbar_5.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_noactionbar_fullscreen_ratingbar_5.png
new file mode 100644
index 0000000..c1f38bd
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_noactionbar_fullscreen_ratingbar_5.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_noactionbar_fullscreen_ratingbar_5_pressed.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_noactionbar_fullscreen_ratingbar_5_pressed.png
new file mode 100644
index 0000000..c981c8a
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_noactionbar_fullscreen_ratingbar_5_pressed.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_noactionbar_fullscreen_searchview.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_noactionbar_fullscreen_searchview.png
new file mode 100644
index 0000000..43c9f5c
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_noactionbar_fullscreen_searchview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_noactionbar_fullscreen_searchview_query.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_noactionbar_fullscreen_searchview_query.png
new file mode 100644
index 0000000..ee24814
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_noactionbar_fullscreen_searchview_query.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_noactionbar_fullscreen_searchview_query_hint.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_noactionbar_fullscreen_searchview_query_hint.png
new file mode 100644
index 0000000..1a543aa
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_noactionbar_fullscreen_searchview_query_hint.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_noactionbar_fullscreen_seekbar_0.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_noactionbar_fullscreen_seekbar_0.png
new file mode 100644
index 0000000..c61a55c
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_noactionbar_fullscreen_seekbar_0.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_noactionbar_fullscreen_seekbar_100.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_noactionbar_fullscreen_seekbar_100.png
new file mode 100644
index 0000000..a5ae2ba
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_noactionbar_fullscreen_seekbar_100.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_noactionbar_fullscreen_seekbar_50.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_noactionbar_fullscreen_seekbar_50.png
new file mode 100644
index 0000000..c45851e
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_noactionbar_fullscreen_seekbar_50.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_noactionbar_fullscreen_spinner.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_noactionbar_fullscreen_spinner.png
new file mode 100644
index 0000000..2bb082b
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_noactionbar_fullscreen_spinner.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_noactionbar_fullscreen_switch.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_noactionbar_fullscreen_switch.png
new file mode 100644
index 0000000..a7db1ed
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_noactionbar_fullscreen_switch.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_noactionbar_fullscreen_switch_checked.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_noactionbar_fullscreen_switch_checked.png
new file mode 100644
index 0000000..469effd
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_noactionbar_fullscreen_switch_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_noactionbar_fullscreen_tabhost.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_noactionbar_fullscreen_tabhost.png
new file mode 100644
index 0000000..361cf06
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_noactionbar_fullscreen_tabhost.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_noactionbar_fullscreen_textview.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_noactionbar_fullscreen_textview.png
new file mode 100644
index 0000000..821c866
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_noactionbar_fullscreen_textview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_noactionbar_fullscreen_timepicker.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_noactionbar_fullscreen_timepicker.png
new file mode 100644
index 0000000..7a269fd
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_noactionbar_fullscreen_timepicker.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_noactionbar_fullscreen_toggle_button.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_noactionbar_fullscreen_toggle_button.png
new file mode 100644
index 0000000..c9e16e3
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_noactionbar_fullscreen_toggle_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_noactionbar_fullscreen_toggle_button_checked.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_noactionbar_fullscreen_toggle_button_checked.png
new file mode 100644
index 0000000..c974143
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_noactionbar_fullscreen_toggle_button_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_noactionbar_fullscreen_zoomcontrols.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_noactionbar_fullscreen_zoomcontrols.png
new file mode 100644
index 0000000..21d17f9
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_noactionbar_fullscreen_zoomcontrols.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_noactionbar_progressbar.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_noactionbar_progressbar.png
new file mode 100644
index 0000000..8bb3363
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_noactionbar_progressbar.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_noactionbar_progressbar_horizontal_0.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_noactionbar_progressbar_horizontal_0.png
new file mode 100644
index 0000000..efecebb
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_noactionbar_progressbar_horizontal_0.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_noactionbar_progressbar_horizontal_100.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_noactionbar_progressbar_horizontal_100.png
new file mode 100644
index 0000000..76245b8
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_noactionbar_progressbar_horizontal_100.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_noactionbar_progressbar_horizontal_50.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_noactionbar_progressbar_horizontal_50.png
new file mode 100644
index 0000000..16c7322
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_noactionbar_progressbar_horizontal_50.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_noactionbar_progressbar_large.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_noactionbar_progressbar_large.png
new file mode 100644
index 0000000..98344af
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_noactionbar_progressbar_large.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_noactionbar_progressbar_small.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_noactionbar_progressbar_small.png
new file mode 100644
index 0000000..88ef977
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_noactionbar_progressbar_small.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_noactionbar_progressdialog_horizontal.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_noactionbar_progressdialog_horizontal.png
new file mode 100644
index 0000000..c049776
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_noactionbar_progressdialog_horizontal.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_noactionbar_radio_button.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_noactionbar_radio_button.png
new file mode 100644
index 0000000..e1fa030
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_noactionbar_radio_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_noactionbar_radio_button_checked.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_noactionbar_radio_button_checked.png
new file mode 100644
index 0000000..e998ddc
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_noactionbar_radio_button_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_noactionbar_radiogroup_horizontal.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_noactionbar_radiogroup_horizontal.png
new file mode 100644
index 0000000..bc60c67
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_noactionbar_radiogroup_horizontal.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_noactionbar_radiogroup_vertical.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_noactionbar_radiogroup_vertical.png
new file mode 100644
index 0000000..13033aa
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_noactionbar_radiogroup_vertical.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_noactionbar_ratingbar_0.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_noactionbar_ratingbar_0.png
new file mode 100644
index 0000000..340ff5c
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_noactionbar_ratingbar_0.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_noactionbar_ratingbar_0_pressed.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_noactionbar_ratingbar_0_pressed.png
new file mode 100644
index 0000000..60c731e
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_noactionbar_ratingbar_0_pressed.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_noactionbar_ratingbar_2point5.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_noactionbar_ratingbar_2point5.png
new file mode 100644
index 0000000..260866a
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_noactionbar_ratingbar_2point5.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_noactionbar_ratingbar_2point5_pressed.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_noactionbar_ratingbar_2point5_pressed.png
new file mode 100644
index 0000000..1ba8025
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_noactionbar_ratingbar_2point5_pressed.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_noactionbar_ratingbar_5.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_noactionbar_ratingbar_5.png
new file mode 100644
index 0000000..c1f38bd
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_noactionbar_ratingbar_5.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_noactionbar_ratingbar_5_pressed.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_noactionbar_ratingbar_5_pressed.png
new file mode 100644
index 0000000..c981c8a
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_noactionbar_ratingbar_5_pressed.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_noactionbar_searchview.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_noactionbar_searchview.png
new file mode 100644
index 0000000..43c9f5c
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_noactionbar_searchview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_noactionbar_searchview_query.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_noactionbar_searchview_query.png
new file mode 100644
index 0000000..ee24814
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_noactionbar_searchview_query.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_noactionbar_searchview_query_hint.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_noactionbar_searchview_query_hint.png
new file mode 100644
index 0000000..1a543aa
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_noactionbar_searchview_query_hint.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_noactionbar_seekbar_0.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_noactionbar_seekbar_0.png
new file mode 100644
index 0000000..c61a55c
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_noactionbar_seekbar_0.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_noactionbar_seekbar_100.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_noactionbar_seekbar_100.png
new file mode 100644
index 0000000..a5ae2ba
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_noactionbar_seekbar_100.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_noactionbar_seekbar_50.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_noactionbar_seekbar_50.png
new file mode 100644
index 0000000..c45851e
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_noactionbar_seekbar_50.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_noactionbar_spinner.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_noactionbar_spinner.png
new file mode 100644
index 0000000..2bb082b
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_noactionbar_spinner.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_noactionbar_switch.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_noactionbar_switch.png
new file mode 100644
index 0000000..a7db1ed
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_noactionbar_switch.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_noactionbar_switch_checked.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_noactionbar_switch_checked.png
new file mode 100644
index 0000000..469effd
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_noactionbar_switch_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_noactionbar_tabhost.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_noactionbar_tabhost.png
new file mode 100644
index 0000000..361cf06
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_noactionbar_tabhost.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_noactionbar_textview.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_noactionbar_textview.png
new file mode 100644
index 0000000..821c866
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_noactionbar_textview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_noactionbar_timepicker.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_noactionbar_timepicker.png
new file mode 100644
index 0000000..7a269fd
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_noactionbar_timepicker.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_noactionbar_toggle_button.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_noactionbar_toggle_button.png
new file mode 100644
index 0000000..c9e16e3
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_noactionbar_toggle_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_noactionbar_toggle_button_checked.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_noactionbar_toggle_button_checked.png
new file mode 100644
index 0000000..c974143
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_noactionbar_toggle_button_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_noactionbar_zoomcontrols.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_noactionbar_zoomcontrols.png
new file mode 100644
index 0000000..21d17f9
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_noactionbar_zoomcontrols.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_panel_alertdialog_list.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_panel_alertdialog_list.png
new file mode 100644
index 0000000..2089f47
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_panel_alertdialog_list.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_panel_alertdialog_multichoice.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_panel_alertdialog_multichoice.png
new file mode 100644
index 0000000..4abe60e
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_panel_alertdialog_multichoice.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_panel_alertdialog_onebutton.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_panel_alertdialog_onebutton.png
new file mode 100644
index 0000000..88175a0
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_panel_alertdialog_onebutton.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_panel_alertdialog_singlechoice.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_panel_alertdialog_singlechoice.png
new file mode 100644
index 0000000..709dfb2
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_panel_alertdialog_singlechoice.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_panel_alertdialog_threebuttons.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_panel_alertdialog_threebuttons.png
new file mode 100644
index 0000000..5c018d6
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_panel_alertdialog_threebuttons.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_panel_alertdialog_twobuttons.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_panel_alertdialog_twobuttons.png
new file mode 100644
index 0000000..18569e7
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_panel_alertdialog_twobuttons.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_panel_button.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_panel_button.png
new file mode 100644
index 0000000..06fae2d
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_panel_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_panel_button_pressed.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_panel_button_pressed.png
new file mode 100644
index 0000000..415f4cb
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_panel_button_pressed.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_panel_calendar_view.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_panel_calendar_view.png
new file mode 100644
index 0000000..0e2ee26
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_panel_calendar_view.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_panel_calendar_view_feb.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_panel_calendar_view_feb.png
new file mode 100644
index 0000000..3e7e915
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_panel_calendar_view_feb.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_panel_checkbox.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_panel_checkbox.png
new file mode 100644
index 0000000..9cd44e5
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_panel_checkbox.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_panel_checkbox_checked.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_panel_checkbox_checked.png
new file mode 100644
index 0000000..4d87f34
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_panel_checkbox_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_panel_chronometer.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_panel_chronometer.png
new file mode 100644
index 0000000..90229f0
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_panel_chronometer.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_panel_color_blue_bright.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_panel_color_blue_bright.png
new file mode 100644
index 0000000..d1a3f99
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_panel_color_blue_bright.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_panel_color_blue_dark.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_panel_color_blue_dark.png
new file mode 100644
index 0000000..52a4de2
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_panel_color_blue_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_panel_color_blue_light.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_panel_color_blue_light.png
new file mode 100644
index 0000000..f9439e8
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_panel_color_blue_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_panel_color_green_dark.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_panel_color_green_dark.png
new file mode 100644
index 0000000..4f8af58
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_panel_color_green_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_panel_color_green_light.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_panel_color_green_light.png
new file mode 100644
index 0000000..6ad2394
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_panel_color_green_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_panel_color_orange_dark.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_panel_color_orange_dark.png
new file mode 100644
index 0000000..73f8418
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_panel_color_orange_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_panel_color_orange_light.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_panel_color_orange_light.png
new file mode 100644
index 0000000..90ab999
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_panel_color_orange_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_panel_color_purple.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_panel_color_purple.png
new file mode 100644
index 0000000..30f2d23
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_panel_color_purple.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_panel_color_red_dark.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_panel_color_red_dark.png
new file mode 100644
index 0000000..c0cbef0
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_panel_color_red_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_panel_color_red_light.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_panel_color_red_light.png
new file mode 100644
index 0000000..e99df2c
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_panel_color_red_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_panel_edittext.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_panel_edittext.png
new file mode 100644
index 0000000..e24fc71
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_panel_edittext.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_panel_progressbar.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_panel_progressbar.png
new file mode 100644
index 0000000..8bb3363
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_panel_progressbar.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_panel_progressbar_horizontal_0.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_panel_progressbar_horizontal_0.png
new file mode 100644
index 0000000..efecebb
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_panel_progressbar_horizontal_0.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_panel_progressbar_horizontal_100.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_panel_progressbar_horizontal_100.png
new file mode 100644
index 0000000..76245b8
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_panel_progressbar_horizontal_100.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_panel_progressbar_horizontal_50.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_panel_progressbar_horizontal_50.png
new file mode 100644
index 0000000..16c7322
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_panel_progressbar_horizontal_50.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_panel_progressbar_large.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_panel_progressbar_large.png
new file mode 100644
index 0000000..98344af
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_panel_progressbar_large.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_panel_progressbar_small.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_panel_progressbar_small.png
new file mode 100644
index 0000000..88ef977
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_panel_progressbar_small.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_panel_progressdialog_horizontal.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_panel_progressdialog_horizontal.png
new file mode 100644
index 0000000..c049776
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_panel_progressdialog_horizontal.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_panel_radio_button.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_panel_radio_button.png
new file mode 100644
index 0000000..e1fa030
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_panel_radio_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_panel_radio_button_checked.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_panel_radio_button_checked.png
new file mode 100644
index 0000000..e998ddc
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_panel_radio_button_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_panel_radiogroup_horizontal.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_panel_radiogroup_horizontal.png
new file mode 100644
index 0000000..bc60c67
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_panel_radiogroup_horizontal.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_panel_radiogroup_vertical.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_panel_radiogroup_vertical.png
new file mode 100644
index 0000000..13033aa
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_panel_radiogroup_vertical.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_panel_ratingbar_0.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_panel_ratingbar_0.png
new file mode 100644
index 0000000..340ff5c
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_panel_ratingbar_0.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_panel_ratingbar_0_pressed.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_panel_ratingbar_0_pressed.png
new file mode 100644
index 0000000..60c731e
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_panel_ratingbar_0_pressed.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_panel_ratingbar_2point5.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_panel_ratingbar_2point5.png
new file mode 100644
index 0000000..260866a
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_panel_ratingbar_2point5.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_panel_ratingbar_2point5_pressed.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_panel_ratingbar_2point5_pressed.png
new file mode 100644
index 0000000..1ba8025
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_panel_ratingbar_2point5_pressed.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_panel_ratingbar_5.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_panel_ratingbar_5.png
new file mode 100644
index 0000000..c1f38bd
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_panel_ratingbar_5.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_panel_ratingbar_5_pressed.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_panel_ratingbar_5_pressed.png
new file mode 100644
index 0000000..c981c8a
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_panel_ratingbar_5_pressed.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_panel_searchview.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_panel_searchview.png
new file mode 100644
index 0000000..43c9f5c
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_panel_searchview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_panel_searchview_query.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_panel_searchview_query.png
new file mode 100644
index 0000000..ee24814
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_panel_searchview_query.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_panel_searchview_query_hint.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_panel_searchview_query_hint.png
new file mode 100644
index 0000000..1a543aa
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_panel_searchview_query_hint.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_panel_seekbar_0.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_panel_seekbar_0.png
new file mode 100644
index 0000000..c61a55c
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_panel_seekbar_0.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_panel_seekbar_100.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_panel_seekbar_100.png
new file mode 100644
index 0000000..a5ae2ba
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_panel_seekbar_100.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_panel_seekbar_50.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_panel_seekbar_50.png
new file mode 100644
index 0000000..c45851e
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_panel_seekbar_50.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_panel_spinner.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_panel_spinner.png
new file mode 100644
index 0000000..2bb082b
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_panel_spinner.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_panel_switch.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_panel_switch.png
new file mode 100644
index 0000000..a7db1ed
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_panel_switch.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_panel_switch_checked.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_panel_switch_checked.png
new file mode 100644
index 0000000..469effd
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_panel_switch_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_panel_tabhost.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_panel_tabhost.png
new file mode 100644
index 0000000..361cf06
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_panel_tabhost.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_panel_textview.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_panel_textview.png
new file mode 100644
index 0000000..821c866
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_panel_textview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_panel_timepicker.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_panel_timepicker.png
new file mode 100644
index 0000000..7a269fd
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_panel_timepicker.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_panel_toggle_button.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_panel_toggle_button.png
new file mode 100644
index 0000000..c9e16e3
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_panel_toggle_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_panel_toggle_button_checked.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_panel_toggle_button_checked.png
new file mode 100644
index 0000000..c974143
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_panel_toggle_button_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_panel_zoomcontrols.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_panel_zoomcontrols.png
new file mode 100644
index 0000000..21d17f9
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_panel_zoomcontrols.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_progressbar.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_progressbar.png
new file mode 100644
index 0000000..8bb3363
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_progressbar.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_progressbar_horizontal_0.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_progressbar_horizontal_0.png
new file mode 100644
index 0000000..efecebb
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_progressbar_horizontal_0.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_progressbar_horizontal_100.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_progressbar_horizontal_100.png
new file mode 100644
index 0000000..76245b8
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_progressbar_horizontal_100.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_progressbar_horizontal_50.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_progressbar_horizontal_50.png
new file mode 100644
index 0000000..16c7322
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_progressbar_horizontal_50.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_progressbar_large.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_progressbar_large.png
new file mode 100644
index 0000000..98344af
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_progressbar_large.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_progressbar_small.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_progressbar_small.png
new file mode 100644
index 0000000..88ef977
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_progressbar_small.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_progressdialog_horizontal.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_progressdialog_horizontal.png
new file mode 100644
index 0000000..c049776
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_progressdialog_horizontal.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_radio_button.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_radio_button.png
new file mode 100644
index 0000000..e1fa030
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_radio_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_radio_button_checked.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_radio_button_checked.png
new file mode 100644
index 0000000..e998ddc
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_radio_button_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_radiogroup_horizontal.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_radiogroup_horizontal.png
new file mode 100644
index 0000000..bc60c67
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_radiogroup_horizontal.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_radiogroup_vertical.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_radiogroup_vertical.png
new file mode 100644
index 0000000..13033aa
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_radiogroup_vertical.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_ratingbar_0.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_ratingbar_0.png
new file mode 100644
index 0000000..340ff5c
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_ratingbar_0.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_ratingbar_0_pressed.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_ratingbar_0_pressed.png
new file mode 100644
index 0000000..60c731e
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_ratingbar_0_pressed.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_ratingbar_2point5.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_ratingbar_2point5.png
new file mode 100644
index 0000000..260866a
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_ratingbar_2point5.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_ratingbar_2point5_pressed.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_ratingbar_2point5_pressed.png
new file mode 100644
index 0000000..1ba8025
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_ratingbar_2point5_pressed.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_ratingbar_5.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_ratingbar_5.png
new file mode 100644
index 0000000..c1f38bd
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_ratingbar_5.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_ratingbar_5_pressed.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_ratingbar_5_pressed.png
new file mode 100644
index 0000000..c981c8a
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_ratingbar_5_pressed.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_searchview.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_searchview.png
new file mode 100644
index 0000000..43c9f5c
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_searchview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_searchview_query.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_searchview_query.png
new file mode 100644
index 0000000..ee24814
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_searchview_query.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_searchview_query_hint.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_searchview_query_hint.png
new file mode 100644
index 0000000..1a543aa
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_searchview_query_hint.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_seekbar_0.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_seekbar_0.png
new file mode 100644
index 0000000..c61a55c
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_seekbar_0.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_seekbar_100.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_seekbar_100.png
new file mode 100644
index 0000000..a5ae2ba
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_seekbar_100.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_seekbar_50.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_seekbar_50.png
new file mode 100644
index 0000000..c45851e
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_seekbar_50.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_spinner.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_spinner.png
new file mode 100644
index 0000000..2bb082b
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_spinner.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_switch.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_switch.png
new file mode 100644
index 0000000..a7db1ed
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_switch.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_switch_checked.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_switch_checked.png
new file mode 100644
index 0000000..469effd
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_switch_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_tabhost.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_tabhost.png
new file mode 100644
index 0000000..361cf06
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_tabhost.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_textview.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_textview.png
new file mode 100644
index 0000000..821c866
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_textview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_timepicker.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_timepicker.png
new file mode 100644
index 0000000..7a269fd
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_timepicker.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_toggle_button.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_toggle_button.png
new file mode 100644
index 0000000..c9e16e3
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_toggle_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_toggle_button_checked.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_toggle_button_checked.png
new file mode 100644
index 0000000..c974143
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_toggle_button_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_light_zoomcontrols.png b/tests/tests/holo/res/drawable-xhdpi/holo_light_zoomcontrols.png
new file mode 100644
index 0000000..21d17f9
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_light_zoomcontrols.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_noactionbar_alertdialog_list.png b/tests/tests/holo/res/drawable-xhdpi/holo_noactionbar_alertdialog_list.png
new file mode 100644
index 0000000..2791d02
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_noactionbar_alertdialog_list.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_noactionbar_alertdialog_multichoice.png b/tests/tests/holo/res/drawable-xhdpi/holo_noactionbar_alertdialog_multichoice.png
new file mode 100644
index 0000000..8f6b6df
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_noactionbar_alertdialog_multichoice.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_noactionbar_alertdialog_onebutton.png b/tests/tests/holo/res/drawable-xhdpi/holo_noactionbar_alertdialog_onebutton.png
new file mode 100644
index 0000000..e0fabdf
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_noactionbar_alertdialog_onebutton.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_noactionbar_alertdialog_singlechoice.png b/tests/tests/holo/res/drawable-xhdpi/holo_noactionbar_alertdialog_singlechoice.png
new file mode 100644
index 0000000..2aec266
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_noactionbar_alertdialog_singlechoice.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_noactionbar_alertdialog_threebuttons.png b/tests/tests/holo/res/drawable-xhdpi/holo_noactionbar_alertdialog_threebuttons.png
new file mode 100644
index 0000000..9d73083
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_noactionbar_alertdialog_threebuttons.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_noactionbar_alertdialog_twobuttons.png b/tests/tests/holo/res/drawable-xhdpi/holo_noactionbar_alertdialog_twobuttons.png
new file mode 100644
index 0000000..34810fa
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_noactionbar_alertdialog_twobuttons.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_noactionbar_button.png b/tests/tests/holo/res/drawable-xhdpi/holo_noactionbar_button.png
new file mode 100644
index 0000000..0478b2e
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_noactionbar_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_noactionbar_button_pressed.png b/tests/tests/holo/res/drawable-xhdpi/holo_noactionbar_button_pressed.png
new file mode 100644
index 0000000..fa826df
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_noactionbar_button_pressed.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_noactionbar_calendar_view.png b/tests/tests/holo/res/drawable-xhdpi/holo_noactionbar_calendar_view.png
new file mode 100644
index 0000000..7fb7333
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_noactionbar_calendar_view.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_noactionbar_calendar_view_feb.png b/tests/tests/holo/res/drawable-xhdpi/holo_noactionbar_calendar_view_feb.png
new file mode 100644
index 0000000..37f6f4f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_noactionbar_calendar_view_feb.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_noactionbar_checkbox.png b/tests/tests/holo/res/drawable-xhdpi/holo_noactionbar_checkbox.png
new file mode 100644
index 0000000..2e1963f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_noactionbar_checkbox.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_noactionbar_checkbox_checked.png b/tests/tests/holo/res/drawable-xhdpi/holo_noactionbar_checkbox_checked.png
new file mode 100644
index 0000000..4eb39c9
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_noactionbar_checkbox_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_noactionbar_chronometer.png b/tests/tests/holo/res/drawable-xhdpi/holo_noactionbar_chronometer.png
new file mode 100644
index 0000000..2a62d85
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_noactionbar_chronometer.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_noactionbar_color_blue_bright.png b/tests/tests/holo/res/drawable-xhdpi/holo_noactionbar_color_blue_bright.png
new file mode 100644
index 0000000..d1a3f99
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_noactionbar_color_blue_bright.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_noactionbar_color_blue_dark.png b/tests/tests/holo/res/drawable-xhdpi/holo_noactionbar_color_blue_dark.png
new file mode 100644
index 0000000..52a4de2
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_noactionbar_color_blue_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_noactionbar_color_blue_light.png b/tests/tests/holo/res/drawable-xhdpi/holo_noactionbar_color_blue_light.png
new file mode 100644
index 0000000..f9439e8
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_noactionbar_color_blue_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_noactionbar_color_green_dark.png b/tests/tests/holo/res/drawable-xhdpi/holo_noactionbar_color_green_dark.png
new file mode 100644
index 0000000..4f8af58
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_noactionbar_color_green_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_noactionbar_color_green_light.png b/tests/tests/holo/res/drawable-xhdpi/holo_noactionbar_color_green_light.png
new file mode 100644
index 0000000..6ad2394
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_noactionbar_color_green_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_noactionbar_color_orange_dark.png b/tests/tests/holo/res/drawable-xhdpi/holo_noactionbar_color_orange_dark.png
new file mode 100644
index 0000000..73f8418
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_noactionbar_color_orange_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_noactionbar_color_orange_light.png b/tests/tests/holo/res/drawable-xhdpi/holo_noactionbar_color_orange_light.png
new file mode 100644
index 0000000..90ab999
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_noactionbar_color_orange_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_noactionbar_color_purple.png b/tests/tests/holo/res/drawable-xhdpi/holo_noactionbar_color_purple.png
new file mode 100644
index 0000000..30f2d23
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_noactionbar_color_purple.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_noactionbar_color_red_dark.png b/tests/tests/holo/res/drawable-xhdpi/holo_noactionbar_color_red_dark.png
new file mode 100644
index 0000000..c0cbef0
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_noactionbar_color_red_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_noactionbar_color_red_light.png b/tests/tests/holo/res/drawable-xhdpi/holo_noactionbar_color_red_light.png
new file mode 100644
index 0000000..e99df2c
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_noactionbar_color_red_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_noactionbar_edittext.png b/tests/tests/holo/res/drawable-xhdpi/holo_noactionbar_edittext.png
new file mode 100644
index 0000000..4b41717
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_noactionbar_edittext.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_noactionbar_fullscreen_alertdialog_list.png b/tests/tests/holo/res/drawable-xhdpi/holo_noactionbar_fullscreen_alertdialog_list.png
new file mode 100644
index 0000000..2791d02
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_noactionbar_fullscreen_alertdialog_list.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_noactionbar_fullscreen_alertdialog_multichoice.png b/tests/tests/holo/res/drawable-xhdpi/holo_noactionbar_fullscreen_alertdialog_multichoice.png
new file mode 100644
index 0000000..8f6b6df
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_noactionbar_fullscreen_alertdialog_multichoice.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_noactionbar_fullscreen_alertdialog_onebutton.png b/tests/tests/holo/res/drawable-xhdpi/holo_noactionbar_fullscreen_alertdialog_onebutton.png
new file mode 100644
index 0000000..e0fabdf
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_noactionbar_fullscreen_alertdialog_onebutton.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_noactionbar_fullscreen_alertdialog_singlechoice.png b/tests/tests/holo/res/drawable-xhdpi/holo_noactionbar_fullscreen_alertdialog_singlechoice.png
new file mode 100644
index 0000000..2aec266
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_noactionbar_fullscreen_alertdialog_singlechoice.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_noactionbar_fullscreen_alertdialog_threebuttons.png b/tests/tests/holo/res/drawable-xhdpi/holo_noactionbar_fullscreen_alertdialog_threebuttons.png
new file mode 100644
index 0000000..9d73083
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_noactionbar_fullscreen_alertdialog_threebuttons.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_noactionbar_fullscreen_alertdialog_twobuttons.png b/tests/tests/holo/res/drawable-xhdpi/holo_noactionbar_fullscreen_alertdialog_twobuttons.png
new file mode 100644
index 0000000..34810fa
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_noactionbar_fullscreen_alertdialog_twobuttons.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_noactionbar_fullscreen_button.png b/tests/tests/holo/res/drawable-xhdpi/holo_noactionbar_fullscreen_button.png
new file mode 100644
index 0000000..0478b2e
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_noactionbar_fullscreen_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_noactionbar_fullscreen_button_pressed.png b/tests/tests/holo/res/drawable-xhdpi/holo_noactionbar_fullscreen_button_pressed.png
new file mode 100644
index 0000000..fa826df
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_noactionbar_fullscreen_button_pressed.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_noactionbar_fullscreen_calendar_view.png b/tests/tests/holo/res/drawable-xhdpi/holo_noactionbar_fullscreen_calendar_view.png
new file mode 100644
index 0000000..7fb7333
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_noactionbar_fullscreen_calendar_view.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_noactionbar_fullscreen_calendar_view_feb.png b/tests/tests/holo/res/drawable-xhdpi/holo_noactionbar_fullscreen_calendar_view_feb.png
new file mode 100644
index 0000000..37f6f4f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_noactionbar_fullscreen_calendar_view_feb.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_noactionbar_fullscreen_checkbox.png b/tests/tests/holo/res/drawable-xhdpi/holo_noactionbar_fullscreen_checkbox.png
new file mode 100644
index 0000000..2e1963f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_noactionbar_fullscreen_checkbox.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_noactionbar_fullscreen_checkbox_checked.png b/tests/tests/holo/res/drawable-xhdpi/holo_noactionbar_fullscreen_checkbox_checked.png
new file mode 100644
index 0000000..4eb39c9
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_noactionbar_fullscreen_checkbox_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_noactionbar_fullscreen_chronometer.png b/tests/tests/holo/res/drawable-xhdpi/holo_noactionbar_fullscreen_chronometer.png
new file mode 100644
index 0000000..2a62d85
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_noactionbar_fullscreen_chronometer.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_noactionbar_fullscreen_color_blue_bright.png b/tests/tests/holo/res/drawable-xhdpi/holo_noactionbar_fullscreen_color_blue_bright.png
new file mode 100644
index 0000000..d1a3f99
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_noactionbar_fullscreen_color_blue_bright.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_noactionbar_fullscreen_color_blue_dark.png b/tests/tests/holo/res/drawable-xhdpi/holo_noactionbar_fullscreen_color_blue_dark.png
new file mode 100644
index 0000000..52a4de2
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_noactionbar_fullscreen_color_blue_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_noactionbar_fullscreen_color_blue_light.png b/tests/tests/holo/res/drawable-xhdpi/holo_noactionbar_fullscreen_color_blue_light.png
new file mode 100644
index 0000000..f9439e8
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_noactionbar_fullscreen_color_blue_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_noactionbar_fullscreen_color_green_dark.png b/tests/tests/holo/res/drawable-xhdpi/holo_noactionbar_fullscreen_color_green_dark.png
new file mode 100644
index 0000000..4f8af58
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_noactionbar_fullscreen_color_green_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_noactionbar_fullscreen_color_green_light.png b/tests/tests/holo/res/drawable-xhdpi/holo_noactionbar_fullscreen_color_green_light.png
new file mode 100644
index 0000000..6ad2394
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_noactionbar_fullscreen_color_green_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_noactionbar_fullscreen_color_orange_dark.png b/tests/tests/holo/res/drawable-xhdpi/holo_noactionbar_fullscreen_color_orange_dark.png
new file mode 100644
index 0000000..73f8418
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_noactionbar_fullscreen_color_orange_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_noactionbar_fullscreen_color_orange_light.png b/tests/tests/holo/res/drawable-xhdpi/holo_noactionbar_fullscreen_color_orange_light.png
new file mode 100644
index 0000000..90ab999
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_noactionbar_fullscreen_color_orange_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_noactionbar_fullscreen_color_purple.png b/tests/tests/holo/res/drawable-xhdpi/holo_noactionbar_fullscreen_color_purple.png
new file mode 100644
index 0000000..30f2d23
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_noactionbar_fullscreen_color_purple.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_noactionbar_fullscreen_color_red_dark.png b/tests/tests/holo/res/drawable-xhdpi/holo_noactionbar_fullscreen_color_red_dark.png
new file mode 100644
index 0000000..c0cbef0
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_noactionbar_fullscreen_color_red_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_noactionbar_fullscreen_color_red_light.png b/tests/tests/holo/res/drawable-xhdpi/holo_noactionbar_fullscreen_color_red_light.png
new file mode 100644
index 0000000..e99df2c
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_noactionbar_fullscreen_color_red_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_noactionbar_fullscreen_edittext.png b/tests/tests/holo/res/drawable-xhdpi/holo_noactionbar_fullscreen_edittext.png
new file mode 100644
index 0000000..4b41717
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_noactionbar_fullscreen_edittext.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_noactionbar_fullscreen_progressbar.png b/tests/tests/holo/res/drawable-xhdpi/holo_noactionbar_fullscreen_progressbar.png
new file mode 100644
index 0000000..8bb3363
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_noactionbar_fullscreen_progressbar.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_noactionbar_fullscreen_progressbar_horizontal_0.png b/tests/tests/holo/res/drawable-xhdpi/holo_noactionbar_fullscreen_progressbar_horizontal_0.png
new file mode 100644
index 0000000..f1d481d
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_noactionbar_fullscreen_progressbar_horizontal_0.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_noactionbar_fullscreen_progressbar_horizontal_100.png b/tests/tests/holo/res/drawable-xhdpi/holo_noactionbar_fullscreen_progressbar_horizontal_100.png
new file mode 100644
index 0000000..a586079
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_noactionbar_fullscreen_progressbar_horizontal_100.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_noactionbar_fullscreen_progressbar_horizontal_50.png b/tests/tests/holo/res/drawable-xhdpi/holo_noactionbar_fullscreen_progressbar_horizontal_50.png
new file mode 100644
index 0000000..9467831
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_noactionbar_fullscreen_progressbar_horizontal_50.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_noactionbar_fullscreen_progressbar_large.png b/tests/tests/holo/res/drawable-xhdpi/holo_noactionbar_fullscreen_progressbar_large.png
new file mode 100644
index 0000000..98344af
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_noactionbar_fullscreen_progressbar_large.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_noactionbar_fullscreen_progressbar_small.png b/tests/tests/holo/res/drawable-xhdpi/holo_noactionbar_fullscreen_progressbar_small.png
new file mode 100644
index 0000000..88ef977
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_noactionbar_fullscreen_progressbar_small.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_noactionbar_fullscreen_progressdialog_horizontal.png b/tests/tests/holo/res/drawable-xhdpi/holo_noactionbar_fullscreen_progressdialog_horizontal.png
new file mode 100644
index 0000000..68cc076
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_noactionbar_fullscreen_progressdialog_horizontal.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_noactionbar_fullscreen_radio_button.png b/tests/tests/holo/res/drawable-xhdpi/holo_noactionbar_fullscreen_radio_button.png
new file mode 100644
index 0000000..db61da3
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_noactionbar_fullscreen_radio_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_noactionbar_fullscreen_radio_button_checked.png b/tests/tests/holo/res/drawable-xhdpi/holo_noactionbar_fullscreen_radio_button_checked.png
new file mode 100644
index 0000000..ea35686
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_noactionbar_fullscreen_radio_button_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_noactionbar_fullscreen_radiogroup_horizontal.png b/tests/tests/holo/res/drawable-xhdpi/holo_noactionbar_fullscreen_radiogroup_horizontal.png
new file mode 100644
index 0000000..72b7077
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_noactionbar_fullscreen_radiogroup_horizontal.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_noactionbar_fullscreen_radiogroup_vertical.png b/tests/tests/holo/res/drawable-xhdpi/holo_noactionbar_fullscreen_radiogroup_vertical.png
new file mode 100644
index 0000000..c145b7a
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_noactionbar_fullscreen_radiogroup_vertical.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_noactionbar_fullscreen_ratingbar_0.png b/tests/tests/holo/res/drawable-xhdpi/holo_noactionbar_fullscreen_ratingbar_0.png
new file mode 100644
index 0000000..517f3d6
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_noactionbar_fullscreen_ratingbar_0.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_noactionbar_fullscreen_ratingbar_0_pressed.png b/tests/tests/holo/res/drawable-xhdpi/holo_noactionbar_fullscreen_ratingbar_0_pressed.png
new file mode 100644
index 0000000..c31df16
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_noactionbar_fullscreen_ratingbar_0_pressed.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_noactionbar_fullscreen_ratingbar_2point5.png b/tests/tests/holo/res/drawable-xhdpi/holo_noactionbar_fullscreen_ratingbar_2point5.png
new file mode 100644
index 0000000..d184a4f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_noactionbar_fullscreen_ratingbar_2point5.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_noactionbar_fullscreen_ratingbar_2point5_pressed.png b/tests/tests/holo/res/drawable-xhdpi/holo_noactionbar_fullscreen_ratingbar_2point5_pressed.png
new file mode 100644
index 0000000..e4fcb80
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_noactionbar_fullscreen_ratingbar_2point5_pressed.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_noactionbar_fullscreen_ratingbar_5.png b/tests/tests/holo/res/drawable-xhdpi/holo_noactionbar_fullscreen_ratingbar_5.png
new file mode 100644
index 0000000..ce1c817
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_noactionbar_fullscreen_ratingbar_5.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_noactionbar_fullscreen_ratingbar_5_pressed.png b/tests/tests/holo/res/drawable-xhdpi/holo_noactionbar_fullscreen_ratingbar_5_pressed.png
new file mode 100644
index 0000000..f9f41d4
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_noactionbar_fullscreen_ratingbar_5_pressed.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_noactionbar_fullscreen_searchview.png b/tests/tests/holo/res/drawable-xhdpi/holo_noactionbar_fullscreen_searchview.png
new file mode 100644
index 0000000..73c611f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_noactionbar_fullscreen_searchview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_noactionbar_fullscreen_searchview_query.png b/tests/tests/holo/res/drawable-xhdpi/holo_noactionbar_fullscreen_searchview_query.png
new file mode 100644
index 0000000..a61d007
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_noactionbar_fullscreen_searchview_query.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_noactionbar_fullscreen_searchview_query_hint.png b/tests/tests/holo/res/drawable-xhdpi/holo_noactionbar_fullscreen_searchview_query_hint.png
new file mode 100644
index 0000000..139aacc
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_noactionbar_fullscreen_searchview_query_hint.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_noactionbar_fullscreen_seekbar_0.png b/tests/tests/holo/res/drawable-xhdpi/holo_noactionbar_fullscreen_seekbar_0.png
new file mode 100644
index 0000000..eb26838
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_noactionbar_fullscreen_seekbar_0.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_noactionbar_fullscreen_seekbar_100.png b/tests/tests/holo/res/drawable-xhdpi/holo_noactionbar_fullscreen_seekbar_100.png
new file mode 100644
index 0000000..a5ae2ba
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_noactionbar_fullscreen_seekbar_100.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_noactionbar_fullscreen_seekbar_50.png b/tests/tests/holo/res/drawable-xhdpi/holo_noactionbar_fullscreen_seekbar_50.png
new file mode 100644
index 0000000..8438db8
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_noactionbar_fullscreen_seekbar_50.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_noactionbar_fullscreen_spinner.png b/tests/tests/holo/res/drawable-xhdpi/holo_noactionbar_fullscreen_spinner.png
new file mode 100644
index 0000000..713ea22
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_noactionbar_fullscreen_spinner.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_noactionbar_fullscreen_switch.png b/tests/tests/holo/res/drawable-xhdpi/holo_noactionbar_fullscreen_switch.png
new file mode 100644
index 0000000..001e106
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_noactionbar_fullscreen_switch.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_noactionbar_fullscreen_switch_checked.png b/tests/tests/holo/res/drawable-xhdpi/holo_noactionbar_fullscreen_switch_checked.png
new file mode 100644
index 0000000..79e75f3
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_noactionbar_fullscreen_switch_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_noactionbar_fullscreen_tabhost.png b/tests/tests/holo/res/drawable-xhdpi/holo_noactionbar_fullscreen_tabhost.png
new file mode 100644
index 0000000..eaeeae7
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_noactionbar_fullscreen_tabhost.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_noactionbar_fullscreen_textview.png b/tests/tests/holo/res/drawable-xhdpi/holo_noactionbar_fullscreen_textview.png
new file mode 100644
index 0000000..0d908a5
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_noactionbar_fullscreen_textview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_noactionbar_fullscreen_timepicker.png b/tests/tests/holo/res/drawable-xhdpi/holo_noactionbar_fullscreen_timepicker.png
new file mode 100644
index 0000000..c3a4951
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_noactionbar_fullscreen_timepicker.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_noactionbar_fullscreen_toggle_button.png b/tests/tests/holo/res/drawable-xhdpi/holo_noactionbar_fullscreen_toggle_button.png
new file mode 100644
index 0000000..cdfb783
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_noactionbar_fullscreen_toggle_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_noactionbar_fullscreen_toggle_button_checked.png b/tests/tests/holo/res/drawable-xhdpi/holo_noactionbar_fullscreen_toggle_button_checked.png
new file mode 100644
index 0000000..2c604ee
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_noactionbar_fullscreen_toggle_button_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_noactionbar_fullscreen_zoomcontrols.png b/tests/tests/holo/res/drawable-xhdpi/holo_noactionbar_fullscreen_zoomcontrols.png
new file mode 100644
index 0000000..21d17f9
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_noactionbar_fullscreen_zoomcontrols.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_noactionbar_progressbar.png b/tests/tests/holo/res/drawable-xhdpi/holo_noactionbar_progressbar.png
new file mode 100644
index 0000000..8bb3363
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_noactionbar_progressbar.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_noactionbar_progressbar_horizontal_0.png b/tests/tests/holo/res/drawable-xhdpi/holo_noactionbar_progressbar_horizontal_0.png
new file mode 100644
index 0000000..f1d481d
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_noactionbar_progressbar_horizontal_0.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_noactionbar_progressbar_horizontal_100.png b/tests/tests/holo/res/drawable-xhdpi/holo_noactionbar_progressbar_horizontal_100.png
new file mode 100644
index 0000000..a586079
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_noactionbar_progressbar_horizontal_100.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_noactionbar_progressbar_horizontal_50.png b/tests/tests/holo/res/drawable-xhdpi/holo_noactionbar_progressbar_horizontal_50.png
new file mode 100644
index 0000000..9467831
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_noactionbar_progressbar_horizontal_50.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_noactionbar_progressbar_large.png b/tests/tests/holo/res/drawable-xhdpi/holo_noactionbar_progressbar_large.png
new file mode 100644
index 0000000..98344af
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_noactionbar_progressbar_large.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_noactionbar_progressbar_small.png b/tests/tests/holo/res/drawable-xhdpi/holo_noactionbar_progressbar_small.png
new file mode 100644
index 0000000..88ef977
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_noactionbar_progressbar_small.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_noactionbar_progressdialog_horizontal.png b/tests/tests/holo/res/drawable-xhdpi/holo_noactionbar_progressdialog_horizontal.png
new file mode 100644
index 0000000..68cc076
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_noactionbar_progressdialog_horizontal.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_noactionbar_radio_button.png b/tests/tests/holo/res/drawable-xhdpi/holo_noactionbar_radio_button.png
new file mode 100644
index 0000000..db61da3
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_noactionbar_radio_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_noactionbar_radio_button_checked.png b/tests/tests/holo/res/drawable-xhdpi/holo_noactionbar_radio_button_checked.png
new file mode 100644
index 0000000..ea35686
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_noactionbar_radio_button_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_noactionbar_radiogroup_horizontal.png b/tests/tests/holo/res/drawable-xhdpi/holo_noactionbar_radiogroup_horizontal.png
new file mode 100644
index 0000000..72b7077
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_noactionbar_radiogroup_horizontal.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_noactionbar_radiogroup_vertical.png b/tests/tests/holo/res/drawable-xhdpi/holo_noactionbar_radiogroup_vertical.png
new file mode 100644
index 0000000..c145b7a
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_noactionbar_radiogroup_vertical.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_noactionbar_ratingbar_0.png b/tests/tests/holo/res/drawable-xhdpi/holo_noactionbar_ratingbar_0.png
new file mode 100644
index 0000000..517f3d6
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_noactionbar_ratingbar_0.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_noactionbar_ratingbar_0_pressed.png b/tests/tests/holo/res/drawable-xhdpi/holo_noactionbar_ratingbar_0_pressed.png
new file mode 100644
index 0000000..c31df16
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_noactionbar_ratingbar_0_pressed.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_noactionbar_ratingbar_2point5.png b/tests/tests/holo/res/drawable-xhdpi/holo_noactionbar_ratingbar_2point5.png
new file mode 100644
index 0000000..d184a4f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_noactionbar_ratingbar_2point5.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_noactionbar_ratingbar_2point5_pressed.png b/tests/tests/holo/res/drawable-xhdpi/holo_noactionbar_ratingbar_2point5_pressed.png
new file mode 100644
index 0000000..e4fcb80
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_noactionbar_ratingbar_2point5_pressed.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_noactionbar_ratingbar_5.png b/tests/tests/holo/res/drawable-xhdpi/holo_noactionbar_ratingbar_5.png
new file mode 100644
index 0000000..ce1c817
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_noactionbar_ratingbar_5.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_noactionbar_ratingbar_5_pressed.png b/tests/tests/holo/res/drawable-xhdpi/holo_noactionbar_ratingbar_5_pressed.png
new file mode 100644
index 0000000..f9f41d4
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_noactionbar_ratingbar_5_pressed.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_noactionbar_searchview.png b/tests/tests/holo/res/drawable-xhdpi/holo_noactionbar_searchview.png
new file mode 100644
index 0000000..73c611f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_noactionbar_searchview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_noactionbar_searchview_query.png b/tests/tests/holo/res/drawable-xhdpi/holo_noactionbar_searchview_query.png
new file mode 100644
index 0000000..a61d007
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_noactionbar_searchview_query.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_noactionbar_searchview_query_hint.png b/tests/tests/holo/res/drawable-xhdpi/holo_noactionbar_searchview_query_hint.png
new file mode 100644
index 0000000..139aacc
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_noactionbar_searchview_query_hint.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_noactionbar_seekbar_0.png b/tests/tests/holo/res/drawable-xhdpi/holo_noactionbar_seekbar_0.png
new file mode 100644
index 0000000..eb26838
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_noactionbar_seekbar_0.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_noactionbar_seekbar_100.png b/tests/tests/holo/res/drawable-xhdpi/holo_noactionbar_seekbar_100.png
new file mode 100644
index 0000000..a5ae2ba
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_noactionbar_seekbar_100.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_noactionbar_seekbar_50.png b/tests/tests/holo/res/drawable-xhdpi/holo_noactionbar_seekbar_50.png
new file mode 100644
index 0000000..8438db8
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_noactionbar_seekbar_50.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_noactionbar_spinner.png b/tests/tests/holo/res/drawable-xhdpi/holo_noactionbar_spinner.png
new file mode 100644
index 0000000..713ea22
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_noactionbar_spinner.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_noactionbar_switch.png b/tests/tests/holo/res/drawable-xhdpi/holo_noactionbar_switch.png
new file mode 100644
index 0000000..001e106
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_noactionbar_switch.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_noactionbar_switch_checked.png b/tests/tests/holo/res/drawable-xhdpi/holo_noactionbar_switch_checked.png
new file mode 100644
index 0000000..79e75f3
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_noactionbar_switch_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_noactionbar_tabhost.png b/tests/tests/holo/res/drawable-xhdpi/holo_noactionbar_tabhost.png
new file mode 100644
index 0000000..eaeeae7
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_noactionbar_tabhost.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_noactionbar_textview.png b/tests/tests/holo/res/drawable-xhdpi/holo_noactionbar_textview.png
new file mode 100644
index 0000000..0d908a5
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_noactionbar_textview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_noactionbar_timepicker.png b/tests/tests/holo/res/drawable-xhdpi/holo_noactionbar_timepicker.png
new file mode 100644
index 0000000..c3a4951
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_noactionbar_timepicker.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_noactionbar_toggle_button.png b/tests/tests/holo/res/drawable-xhdpi/holo_noactionbar_toggle_button.png
new file mode 100644
index 0000000..cdfb783
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_noactionbar_toggle_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_noactionbar_toggle_button_checked.png b/tests/tests/holo/res/drawable-xhdpi/holo_noactionbar_toggle_button_checked.png
new file mode 100644
index 0000000..2c604ee
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_noactionbar_toggle_button_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_noactionbar_zoomcontrols.png b/tests/tests/holo/res/drawable-xhdpi/holo_noactionbar_zoomcontrols.png
new file mode 100644
index 0000000..21d17f9
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_noactionbar_zoomcontrols.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_panel_alertdialog_list.png b/tests/tests/holo/res/drawable-xhdpi/holo_panel_alertdialog_list.png
new file mode 100644
index 0000000..2791d02
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_panel_alertdialog_list.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_panel_alertdialog_multichoice.png b/tests/tests/holo/res/drawable-xhdpi/holo_panel_alertdialog_multichoice.png
new file mode 100644
index 0000000..8f6b6df
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_panel_alertdialog_multichoice.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_panel_alertdialog_onebutton.png b/tests/tests/holo/res/drawable-xhdpi/holo_panel_alertdialog_onebutton.png
new file mode 100644
index 0000000..e0fabdf
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_panel_alertdialog_onebutton.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_panel_alertdialog_singlechoice.png b/tests/tests/holo/res/drawable-xhdpi/holo_panel_alertdialog_singlechoice.png
new file mode 100644
index 0000000..2aec266
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_panel_alertdialog_singlechoice.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_panel_alertdialog_threebuttons.png b/tests/tests/holo/res/drawable-xhdpi/holo_panel_alertdialog_threebuttons.png
new file mode 100644
index 0000000..9d73083
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_panel_alertdialog_threebuttons.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_panel_alertdialog_twobuttons.png b/tests/tests/holo/res/drawable-xhdpi/holo_panel_alertdialog_twobuttons.png
new file mode 100644
index 0000000..34810fa
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_panel_alertdialog_twobuttons.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_panel_button.png b/tests/tests/holo/res/drawable-xhdpi/holo_panel_button.png
new file mode 100644
index 0000000..0478b2e
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_panel_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_panel_button_pressed.png b/tests/tests/holo/res/drawable-xhdpi/holo_panel_button_pressed.png
new file mode 100644
index 0000000..fa826df
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_panel_button_pressed.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_panel_calendar_view.png b/tests/tests/holo/res/drawable-xhdpi/holo_panel_calendar_view.png
new file mode 100644
index 0000000..7fb7333
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_panel_calendar_view.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_panel_calendar_view_feb.png b/tests/tests/holo/res/drawable-xhdpi/holo_panel_calendar_view_feb.png
new file mode 100644
index 0000000..37f6f4f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_panel_calendar_view_feb.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_panel_checkbox.png b/tests/tests/holo/res/drawable-xhdpi/holo_panel_checkbox.png
new file mode 100644
index 0000000..2e1963f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_panel_checkbox.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_panel_checkbox_checked.png b/tests/tests/holo/res/drawable-xhdpi/holo_panel_checkbox_checked.png
new file mode 100644
index 0000000..4eb39c9
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_panel_checkbox_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_panel_chronometer.png b/tests/tests/holo/res/drawable-xhdpi/holo_panel_chronometer.png
new file mode 100644
index 0000000..2a62d85
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_panel_chronometer.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_panel_color_blue_bright.png b/tests/tests/holo/res/drawable-xhdpi/holo_panel_color_blue_bright.png
new file mode 100644
index 0000000..d1a3f99
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_panel_color_blue_bright.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_panel_color_blue_dark.png b/tests/tests/holo/res/drawable-xhdpi/holo_panel_color_blue_dark.png
new file mode 100644
index 0000000..52a4de2
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_panel_color_blue_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_panel_color_blue_light.png b/tests/tests/holo/res/drawable-xhdpi/holo_panel_color_blue_light.png
new file mode 100644
index 0000000..f9439e8
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_panel_color_blue_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_panel_color_green_dark.png b/tests/tests/holo/res/drawable-xhdpi/holo_panel_color_green_dark.png
new file mode 100644
index 0000000..4f8af58
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_panel_color_green_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_panel_color_green_light.png b/tests/tests/holo/res/drawable-xhdpi/holo_panel_color_green_light.png
new file mode 100644
index 0000000..6ad2394
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_panel_color_green_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_panel_color_orange_dark.png b/tests/tests/holo/res/drawable-xhdpi/holo_panel_color_orange_dark.png
new file mode 100644
index 0000000..73f8418
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_panel_color_orange_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_panel_color_orange_light.png b/tests/tests/holo/res/drawable-xhdpi/holo_panel_color_orange_light.png
new file mode 100644
index 0000000..90ab999
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_panel_color_orange_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_panel_color_purple.png b/tests/tests/holo/res/drawable-xhdpi/holo_panel_color_purple.png
new file mode 100644
index 0000000..30f2d23
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_panel_color_purple.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_panel_color_red_dark.png b/tests/tests/holo/res/drawable-xhdpi/holo_panel_color_red_dark.png
new file mode 100644
index 0000000..c0cbef0
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_panel_color_red_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_panel_color_red_light.png b/tests/tests/holo/res/drawable-xhdpi/holo_panel_color_red_light.png
new file mode 100644
index 0000000..e99df2c
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_panel_color_red_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_panel_edittext.png b/tests/tests/holo/res/drawable-xhdpi/holo_panel_edittext.png
new file mode 100644
index 0000000..4b41717
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_panel_edittext.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_panel_progressbar.png b/tests/tests/holo/res/drawable-xhdpi/holo_panel_progressbar.png
new file mode 100644
index 0000000..8bb3363
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_panel_progressbar.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_panel_progressbar_horizontal_0.png b/tests/tests/holo/res/drawable-xhdpi/holo_panel_progressbar_horizontal_0.png
new file mode 100644
index 0000000..f1d481d
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_panel_progressbar_horizontal_0.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_panel_progressbar_horizontal_100.png b/tests/tests/holo/res/drawable-xhdpi/holo_panel_progressbar_horizontal_100.png
new file mode 100644
index 0000000..a586079
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_panel_progressbar_horizontal_100.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_panel_progressbar_horizontal_50.png b/tests/tests/holo/res/drawable-xhdpi/holo_panel_progressbar_horizontal_50.png
new file mode 100644
index 0000000..9467831
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_panel_progressbar_horizontal_50.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_panel_progressbar_large.png b/tests/tests/holo/res/drawable-xhdpi/holo_panel_progressbar_large.png
new file mode 100644
index 0000000..98344af
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_panel_progressbar_large.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_panel_progressbar_small.png b/tests/tests/holo/res/drawable-xhdpi/holo_panel_progressbar_small.png
new file mode 100644
index 0000000..88ef977
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_panel_progressbar_small.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_panel_progressdialog_horizontal.png b/tests/tests/holo/res/drawable-xhdpi/holo_panel_progressdialog_horizontal.png
new file mode 100644
index 0000000..68cc076
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_panel_progressdialog_horizontal.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_panel_radio_button.png b/tests/tests/holo/res/drawable-xhdpi/holo_panel_radio_button.png
new file mode 100644
index 0000000..db61da3
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_panel_radio_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_panel_radio_button_checked.png b/tests/tests/holo/res/drawable-xhdpi/holo_panel_radio_button_checked.png
new file mode 100644
index 0000000..ea35686
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_panel_radio_button_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_panel_radiogroup_horizontal.png b/tests/tests/holo/res/drawable-xhdpi/holo_panel_radiogroup_horizontal.png
new file mode 100644
index 0000000..72b7077
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_panel_radiogroup_horizontal.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_panel_radiogroup_vertical.png b/tests/tests/holo/res/drawable-xhdpi/holo_panel_radiogroup_vertical.png
new file mode 100644
index 0000000..c145b7a
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_panel_radiogroup_vertical.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_panel_ratingbar_0.png b/tests/tests/holo/res/drawable-xhdpi/holo_panel_ratingbar_0.png
new file mode 100644
index 0000000..517f3d6
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_panel_ratingbar_0.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_panel_ratingbar_0_pressed.png b/tests/tests/holo/res/drawable-xhdpi/holo_panel_ratingbar_0_pressed.png
new file mode 100644
index 0000000..c31df16
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_panel_ratingbar_0_pressed.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_panel_ratingbar_2point5.png b/tests/tests/holo/res/drawable-xhdpi/holo_panel_ratingbar_2point5.png
new file mode 100644
index 0000000..d184a4f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_panel_ratingbar_2point5.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_panel_ratingbar_2point5_pressed.png b/tests/tests/holo/res/drawable-xhdpi/holo_panel_ratingbar_2point5_pressed.png
new file mode 100644
index 0000000..e4fcb80
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_panel_ratingbar_2point5_pressed.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_panel_ratingbar_5.png b/tests/tests/holo/res/drawable-xhdpi/holo_panel_ratingbar_5.png
new file mode 100644
index 0000000..ce1c817
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_panel_ratingbar_5.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_panel_ratingbar_5_pressed.png b/tests/tests/holo/res/drawable-xhdpi/holo_panel_ratingbar_5_pressed.png
new file mode 100644
index 0000000..f9f41d4
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_panel_ratingbar_5_pressed.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_panel_searchview.png b/tests/tests/holo/res/drawable-xhdpi/holo_panel_searchview.png
new file mode 100644
index 0000000..73c611f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_panel_searchview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_panel_searchview_query.png b/tests/tests/holo/res/drawable-xhdpi/holo_panel_searchview_query.png
new file mode 100644
index 0000000..a61d007
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_panel_searchview_query.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_panel_searchview_query_hint.png b/tests/tests/holo/res/drawable-xhdpi/holo_panel_searchview_query_hint.png
new file mode 100644
index 0000000..139aacc
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_panel_searchview_query_hint.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_panel_seekbar_0.png b/tests/tests/holo/res/drawable-xhdpi/holo_panel_seekbar_0.png
new file mode 100644
index 0000000..eb26838
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_panel_seekbar_0.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_panel_seekbar_100.png b/tests/tests/holo/res/drawable-xhdpi/holo_panel_seekbar_100.png
new file mode 100644
index 0000000..a5ae2ba
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_panel_seekbar_100.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_panel_seekbar_50.png b/tests/tests/holo/res/drawable-xhdpi/holo_panel_seekbar_50.png
new file mode 100644
index 0000000..8438db8
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_panel_seekbar_50.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_panel_spinner.png b/tests/tests/holo/res/drawable-xhdpi/holo_panel_spinner.png
new file mode 100644
index 0000000..713ea22
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_panel_spinner.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_panel_switch.png b/tests/tests/holo/res/drawable-xhdpi/holo_panel_switch.png
new file mode 100644
index 0000000..001e106
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_panel_switch.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_panel_switch_checked.png b/tests/tests/holo/res/drawable-xhdpi/holo_panel_switch_checked.png
new file mode 100644
index 0000000..79e75f3
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_panel_switch_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_panel_tabhost.png b/tests/tests/holo/res/drawable-xhdpi/holo_panel_tabhost.png
new file mode 100644
index 0000000..eaeeae7
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_panel_tabhost.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_panel_textview.png b/tests/tests/holo/res/drawable-xhdpi/holo_panel_textview.png
new file mode 100644
index 0000000..0d908a5
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_panel_textview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_panel_timepicker.png b/tests/tests/holo/res/drawable-xhdpi/holo_panel_timepicker.png
new file mode 100644
index 0000000..c3a4951
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_panel_timepicker.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_panel_toggle_button.png b/tests/tests/holo/res/drawable-xhdpi/holo_panel_toggle_button.png
new file mode 100644
index 0000000..cdfb783
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_panel_toggle_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_panel_toggle_button_checked.png b/tests/tests/holo/res/drawable-xhdpi/holo_panel_toggle_button_checked.png
new file mode 100644
index 0000000..2c604ee
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_panel_toggle_button_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_panel_zoomcontrols.png b/tests/tests/holo/res/drawable-xhdpi/holo_panel_zoomcontrols.png
new file mode 100644
index 0000000..21d17f9
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_panel_zoomcontrols.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_progressbar.png b/tests/tests/holo/res/drawable-xhdpi/holo_progressbar.png
new file mode 100644
index 0000000..8bb3363
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_progressbar.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_progressbar_horizontal_0.png b/tests/tests/holo/res/drawable-xhdpi/holo_progressbar_horizontal_0.png
new file mode 100644
index 0000000..f1d481d
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_progressbar_horizontal_0.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_progressbar_horizontal_100.png b/tests/tests/holo/res/drawable-xhdpi/holo_progressbar_horizontal_100.png
new file mode 100644
index 0000000..a586079
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_progressbar_horizontal_100.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_progressbar_horizontal_50.png b/tests/tests/holo/res/drawable-xhdpi/holo_progressbar_horizontal_50.png
new file mode 100644
index 0000000..9467831
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_progressbar_horizontal_50.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_progressbar_large.png b/tests/tests/holo/res/drawable-xhdpi/holo_progressbar_large.png
new file mode 100644
index 0000000..98344af
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_progressbar_large.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_progressbar_small.png b/tests/tests/holo/res/drawable-xhdpi/holo_progressbar_small.png
new file mode 100644
index 0000000..88ef977
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_progressbar_small.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_progressdialog_horizontal.png b/tests/tests/holo/res/drawable-xhdpi/holo_progressdialog_horizontal.png
new file mode 100644
index 0000000..68cc076
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_progressdialog_horizontal.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_radio_button.png b/tests/tests/holo/res/drawable-xhdpi/holo_radio_button.png
new file mode 100644
index 0000000..db61da3
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_radio_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_radio_button_checked.png b/tests/tests/holo/res/drawable-xhdpi/holo_radio_button_checked.png
new file mode 100644
index 0000000..ea35686
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_radio_button_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_radiogroup_horizontal.png b/tests/tests/holo/res/drawable-xhdpi/holo_radiogroup_horizontal.png
new file mode 100644
index 0000000..72b7077
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_radiogroup_horizontal.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_radiogroup_vertical.png b/tests/tests/holo/res/drawable-xhdpi/holo_radiogroup_vertical.png
new file mode 100644
index 0000000..c145b7a
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_radiogroup_vertical.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_ratingbar_0.png b/tests/tests/holo/res/drawable-xhdpi/holo_ratingbar_0.png
new file mode 100644
index 0000000..517f3d6
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_ratingbar_0.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_ratingbar_0_pressed.png b/tests/tests/holo/res/drawable-xhdpi/holo_ratingbar_0_pressed.png
new file mode 100644
index 0000000..c31df16
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_ratingbar_0_pressed.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_ratingbar_2point5.png b/tests/tests/holo/res/drawable-xhdpi/holo_ratingbar_2point5.png
new file mode 100644
index 0000000..d184a4f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_ratingbar_2point5.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_ratingbar_2point5_pressed.png b/tests/tests/holo/res/drawable-xhdpi/holo_ratingbar_2point5_pressed.png
new file mode 100644
index 0000000..e4fcb80
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_ratingbar_2point5_pressed.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_ratingbar_5.png b/tests/tests/holo/res/drawable-xhdpi/holo_ratingbar_5.png
new file mode 100644
index 0000000..ce1c817
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_ratingbar_5.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_ratingbar_5_pressed.png b/tests/tests/holo/res/drawable-xhdpi/holo_ratingbar_5_pressed.png
new file mode 100644
index 0000000..f9f41d4
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_ratingbar_5_pressed.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_searchview.png b/tests/tests/holo/res/drawable-xhdpi/holo_searchview.png
new file mode 100644
index 0000000..73c611f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_searchview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_searchview_query.png b/tests/tests/holo/res/drawable-xhdpi/holo_searchview_query.png
new file mode 100644
index 0000000..a61d007
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_searchview_query.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_searchview_query_hint.png b/tests/tests/holo/res/drawable-xhdpi/holo_searchview_query_hint.png
new file mode 100644
index 0000000..139aacc
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_searchview_query_hint.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_seekbar_0.png b/tests/tests/holo/res/drawable-xhdpi/holo_seekbar_0.png
new file mode 100644
index 0000000..eb26838
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_seekbar_0.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_seekbar_100.png b/tests/tests/holo/res/drawable-xhdpi/holo_seekbar_100.png
new file mode 100644
index 0000000..a5ae2ba
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_seekbar_100.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_seekbar_50.png b/tests/tests/holo/res/drawable-xhdpi/holo_seekbar_50.png
new file mode 100644
index 0000000..8438db8
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_seekbar_50.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_spinner.png b/tests/tests/holo/res/drawable-xhdpi/holo_spinner.png
new file mode 100644
index 0000000..713ea22
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_spinner.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_switch.png b/tests/tests/holo/res/drawable-xhdpi/holo_switch.png
new file mode 100644
index 0000000..001e106
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_switch.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_switch_checked.png b/tests/tests/holo/res/drawable-xhdpi/holo_switch_checked.png
new file mode 100644
index 0000000..79e75f3
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_switch_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_tabhost.png b/tests/tests/holo/res/drawable-xhdpi/holo_tabhost.png
new file mode 100644
index 0000000..eaeeae7
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_tabhost.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_textview.png b/tests/tests/holo/res/drawable-xhdpi/holo_textview.png
new file mode 100644
index 0000000..0d908a5
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_textview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_timepicker.png b/tests/tests/holo/res/drawable-xhdpi/holo_timepicker.png
new file mode 100644
index 0000000..c3a4951
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_timepicker.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_toggle_button.png b/tests/tests/holo/res/drawable-xhdpi/holo_toggle_button.png
new file mode 100644
index 0000000..cdfb783
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_toggle_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_toggle_button_checked.png b/tests/tests/holo/res/drawable-xhdpi/holo_toggle_button_checked.png
new file mode 100644
index 0000000..2c604ee
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_toggle_button_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_wallpaper_alertdialog_list.png b/tests/tests/holo/res/drawable-xhdpi/holo_wallpaper_alertdialog_list.png
new file mode 100644
index 0000000..2791d02
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_wallpaper_alertdialog_list.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_wallpaper_alertdialog_multichoice.png b/tests/tests/holo/res/drawable-xhdpi/holo_wallpaper_alertdialog_multichoice.png
new file mode 100644
index 0000000..8f6b6df
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_wallpaper_alertdialog_multichoice.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_wallpaper_alertdialog_onebutton.png b/tests/tests/holo/res/drawable-xhdpi/holo_wallpaper_alertdialog_onebutton.png
new file mode 100644
index 0000000..e0fabdf
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_wallpaper_alertdialog_onebutton.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_wallpaper_alertdialog_singlechoice.png b/tests/tests/holo/res/drawable-xhdpi/holo_wallpaper_alertdialog_singlechoice.png
new file mode 100644
index 0000000..2aec266
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_wallpaper_alertdialog_singlechoice.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_wallpaper_alertdialog_threebuttons.png b/tests/tests/holo/res/drawable-xhdpi/holo_wallpaper_alertdialog_threebuttons.png
new file mode 100644
index 0000000..9d73083
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_wallpaper_alertdialog_threebuttons.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_wallpaper_alertdialog_twobuttons.png b/tests/tests/holo/res/drawable-xhdpi/holo_wallpaper_alertdialog_twobuttons.png
new file mode 100644
index 0000000..34810fa
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_wallpaper_alertdialog_twobuttons.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_wallpaper_button.png b/tests/tests/holo/res/drawable-xhdpi/holo_wallpaper_button.png
new file mode 100644
index 0000000..0478b2e
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_wallpaper_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_wallpaper_button_pressed.png b/tests/tests/holo/res/drawable-xhdpi/holo_wallpaper_button_pressed.png
new file mode 100644
index 0000000..fa826df
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_wallpaper_button_pressed.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_wallpaper_calendar_view.png b/tests/tests/holo/res/drawable-xhdpi/holo_wallpaper_calendar_view.png
new file mode 100644
index 0000000..7fb7333
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_wallpaper_calendar_view.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_wallpaper_calendar_view_feb.png b/tests/tests/holo/res/drawable-xhdpi/holo_wallpaper_calendar_view_feb.png
new file mode 100644
index 0000000..37f6f4f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_wallpaper_calendar_view_feb.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_wallpaper_checkbox.png b/tests/tests/holo/res/drawable-xhdpi/holo_wallpaper_checkbox.png
new file mode 100644
index 0000000..2e1963f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_wallpaper_checkbox.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_wallpaper_checkbox_checked.png b/tests/tests/holo/res/drawable-xhdpi/holo_wallpaper_checkbox_checked.png
new file mode 100644
index 0000000..4eb39c9
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_wallpaper_checkbox_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_wallpaper_chronometer.png b/tests/tests/holo/res/drawable-xhdpi/holo_wallpaper_chronometer.png
new file mode 100644
index 0000000..2a62d85
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_wallpaper_chronometer.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_wallpaper_color_blue_bright.png b/tests/tests/holo/res/drawable-xhdpi/holo_wallpaper_color_blue_bright.png
new file mode 100644
index 0000000..d1a3f99
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_wallpaper_color_blue_bright.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_wallpaper_color_blue_dark.png b/tests/tests/holo/res/drawable-xhdpi/holo_wallpaper_color_blue_dark.png
new file mode 100644
index 0000000..52a4de2
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_wallpaper_color_blue_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_wallpaper_color_blue_light.png b/tests/tests/holo/res/drawable-xhdpi/holo_wallpaper_color_blue_light.png
new file mode 100644
index 0000000..f9439e8
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_wallpaper_color_blue_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_wallpaper_color_green_dark.png b/tests/tests/holo/res/drawable-xhdpi/holo_wallpaper_color_green_dark.png
new file mode 100644
index 0000000..4f8af58
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_wallpaper_color_green_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_wallpaper_color_green_light.png b/tests/tests/holo/res/drawable-xhdpi/holo_wallpaper_color_green_light.png
new file mode 100644
index 0000000..6ad2394
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_wallpaper_color_green_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_wallpaper_color_orange_dark.png b/tests/tests/holo/res/drawable-xhdpi/holo_wallpaper_color_orange_dark.png
new file mode 100644
index 0000000..73f8418
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_wallpaper_color_orange_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_wallpaper_color_orange_light.png b/tests/tests/holo/res/drawable-xhdpi/holo_wallpaper_color_orange_light.png
new file mode 100644
index 0000000..90ab999
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_wallpaper_color_orange_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_wallpaper_color_purple.png b/tests/tests/holo/res/drawable-xhdpi/holo_wallpaper_color_purple.png
new file mode 100644
index 0000000..30f2d23
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_wallpaper_color_purple.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_wallpaper_color_red_dark.png b/tests/tests/holo/res/drawable-xhdpi/holo_wallpaper_color_red_dark.png
new file mode 100644
index 0000000..c0cbef0
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_wallpaper_color_red_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_wallpaper_color_red_light.png b/tests/tests/holo/res/drawable-xhdpi/holo_wallpaper_color_red_light.png
new file mode 100644
index 0000000..e99df2c
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_wallpaper_color_red_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_wallpaper_edittext.png b/tests/tests/holo/res/drawable-xhdpi/holo_wallpaper_edittext.png
new file mode 100644
index 0000000..4b41717
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_wallpaper_edittext.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_wallpaper_notitlebar_alertdialog_list.png b/tests/tests/holo/res/drawable-xhdpi/holo_wallpaper_notitlebar_alertdialog_list.png
new file mode 100644
index 0000000..2791d02
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_wallpaper_notitlebar_alertdialog_list.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_wallpaper_notitlebar_alertdialog_multichoice.png b/tests/tests/holo/res/drawable-xhdpi/holo_wallpaper_notitlebar_alertdialog_multichoice.png
new file mode 100644
index 0000000..8f6b6df
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_wallpaper_notitlebar_alertdialog_multichoice.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_wallpaper_notitlebar_alertdialog_onebutton.png b/tests/tests/holo/res/drawable-xhdpi/holo_wallpaper_notitlebar_alertdialog_onebutton.png
new file mode 100644
index 0000000..e0fabdf
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_wallpaper_notitlebar_alertdialog_onebutton.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_wallpaper_notitlebar_alertdialog_singlechoice.png b/tests/tests/holo/res/drawable-xhdpi/holo_wallpaper_notitlebar_alertdialog_singlechoice.png
new file mode 100644
index 0000000..2aec266
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_wallpaper_notitlebar_alertdialog_singlechoice.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_wallpaper_notitlebar_alertdialog_threebuttons.png b/tests/tests/holo/res/drawable-xhdpi/holo_wallpaper_notitlebar_alertdialog_threebuttons.png
new file mode 100644
index 0000000..9d73083
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_wallpaper_notitlebar_alertdialog_threebuttons.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_wallpaper_notitlebar_alertdialog_twobuttons.png b/tests/tests/holo/res/drawable-xhdpi/holo_wallpaper_notitlebar_alertdialog_twobuttons.png
new file mode 100644
index 0000000..34810fa
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_wallpaper_notitlebar_alertdialog_twobuttons.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_wallpaper_notitlebar_button.png b/tests/tests/holo/res/drawable-xhdpi/holo_wallpaper_notitlebar_button.png
new file mode 100644
index 0000000..0478b2e
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_wallpaper_notitlebar_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_wallpaper_notitlebar_button_pressed.png b/tests/tests/holo/res/drawable-xhdpi/holo_wallpaper_notitlebar_button_pressed.png
new file mode 100644
index 0000000..fa826df
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_wallpaper_notitlebar_button_pressed.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_wallpaper_notitlebar_calendar_view.png b/tests/tests/holo/res/drawable-xhdpi/holo_wallpaper_notitlebar_calendar_view.png
new file mode 100644
index 0000000..7fb7333
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_wallpaper_notitlebar_calendar_view.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_wallpaper_notitlebar_calendar_view_feb.png b/tests/tests/holo/res/drawable-xhdpi/holo_wallpaper_notitlebar_calendar_view_feb.png
new file mode 100644
index 0000000..37f6f4f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_wallpaper_notitlebar_calendar_view_feb.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_wallpaper_notitlebar_checkbox.png b/tests/tests/holo/res/drawable-xhdpi/holo_wallpaper_notitlebar_checkbox.png
new file mode 100644
index 0000000..2e1963f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_wallpaper_notitlebar_checkbox.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_wallpaper_notitlebar_checkbox_checked.png b/tests/tests/holo/res/drawable-xhdpi/holo_wallpaper_notitlebar_checkbox_checked.png
new file mode 100644
index 0000000..4eb39c9
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_wallpaper_notitlebar_checkbox_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_wallpaper_notitlebar_chronometer.png b/tests/tests/holo/res/drawable-xhdpi/holo_wallpaper_notitlebar_chronometer.png
new file mode 100644
index 0000000..2a62d85
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_wallpaper_notitlebar_chronometer.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_wallpaper_notitlebar_color_blue_bright.png b/tests/tests/holo/res/drawable-xhdpi/holo_wallpaper_notitlebar_color_blue_bright.png
new file mode 100644
index 0000000..d1a3f99
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_wallpaper_notitlebar_color_blue_bright.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_wallpaper_notitlebar_color_blue_dark.png b/tests/tests/holo/res/drawable-xhdpi/holo_wallpaper_notitlebar_color_blue_dark.png
new file mode 100644
index 0000000..52a4de2
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_wallpaper_notitlebar_color_blue_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_wallpaper_notitlebar_color_blue_light.png b/tests/tests/holo/res/drawable-xhdpi/holo_wallpaper_notitlebar_color_blue_light.png
new file mode 100644
index 0000000..f9439e8
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_wallpaper_notitlebar_color_blue_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_wallpaper_notitlebar_color_green_dark.png b/tests/tests/holo/res/drawable-xhdpi/holo_wallpaper_notitlebar_color_green_dark.png
new file mode 100644
index 0000000..4f8af58
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_wallpaper_notitlebar_color_green_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_wallpaper_notitlebar_color_green_light.png b/tests/tests/holo/res/drawable-xhdpi/holo_wallpaper_notitlebar_color_green_light.png
new file mode 100644
index 0000000..6ad2394
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_wallpaper_notitlebar_color_green_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_wallpaper_notitlebar_color_orange_dark.png b/tests/tests/holo/res/drawable-xhdpi/holo_wallpaper_notitlebar_color_orange_dark.png
new file mode 100644
index 0000000..73f8418
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_wallpaper_notitlebar_color_orange_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_wallpaper_notitlebar_color_orange_light.png b/tests/tests/holo/res/drawable-xhdpi/holo_wallpaper_notitlebar_color_orange_light.png
new file mode 100644
index 0000000..90ab999
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_wallpaper_notitlebar_color_orange_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_wallpaper_notitlebar_color_purple.png b/tests/tests/holo/res/drawable-xhdpi/holo_wallpaper_notitlebar_color_purple.png
new file mode 100644
index 0000000..30f2d23
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_wallpaper_notitlebar_color_purple.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_wallpaper_notitlebar_color_red_dark.png b/tests/tests/holo/res/drawable-xhdpi/holo_wallpaper_notitlebar_color_red_dark.png
new file mode 100644
index 0000000..c0cbef0
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_wallpaper_notitlebar_color_red_dark.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_wallpaper_notitlebar_color_red_light.png b/tests/tests/holo/res/drawable-xhdpi/holo_wallpaper_notitlebar_color_red_light.png
new file mode 100644
index 0000000..e99df2c
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_wallpaper_notitlebar_color_red_light.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_wallpaper_notitlebar_edittext.png b/tests/tests/holo/res/drawable-xhdpi/holo_wallpaper_notitlebar_edittext.png
new file mode 100644
index 0000000..4b41717
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_wallpaper_notitlebar_edittext.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_wallpaper_notitlebar_progressbar.png b/tests/tests/holo/res/drawable-xhdpi/holo_wallpaper_notitlebar_progressbar.png
new file mode 100644
index 0000000..8bb3363
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_wallpaper_notitlebar_progressbar.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_wallpaper_notitlebar_progressbar_horizontal_0.png b/tests/tests/holo/res/drawable-xhdpi/holo_wallpaper_notitlebar_progressbar_horizontal_0.png
new file mode 100644
index 0000000..f1d481d
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_wallpaper_notitlebar_progressbar_horizontal_0.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_wallpaper_notitlebar_progressbar_horizontal_100.png b/tests/tests/holo/res/drawable-xhdpi/holo_wallpaper_notitlebar_progressbar_horizontal_100.png
new file mode 100644
index 0000000..a586079
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_wallpaper_notitlebar_progressbar_horizontal_100.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_wallpaper_notitlebar_progressbar_horizontal_50.png b/tests/tests/holo/res/drawable-xhdpi/holo_wallpaper_notitlebar_progressbar_horizontal_50.png
new file mode 100644
index 0000000..9467831
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_wallpaper_notitlebar_progressbar_horizontal_50.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_wallpaper_notitlebar_progressbar_large.png b/tests/tests/holo/res/drawable-xhdpi/holo_wallpaper_notitlebar_progressbar_large.png
new file mode 100644
index 0000000..98344af
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_wallpaper_notitlebar_progressbar_large.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_wallpaper_notitlebar_progressbar_small.png b/tests/tests/holo/res/drawable-xhdpi/holo_wallpaper_notitlebar_progressbar_small.png
new file mode 100644
index 0000000..88ef977
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_wallpaper_notitlebar_progressbar_small.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_wallpaper_notitlebar_progressdialog_horizontal.png b/tests/tests/holo/res/drawable-xhdpi/holo_wallpaper_notitlebar_progressdialog_horizontal.png
new file mode 100644
index 0000000..68cc076
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_wallpaper_notitlebar_progressdialog_horizontal.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_wallpaper_notitlebar_radio_button.png b/tests/tests/holo/res/drawable-xhdpi/holo_wallpaper_notitlebar_radio_button.png
new file mode 100644
index 0000000..db61da3
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_wallpaper_notitlebar_radio_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_wallpaper_notitlebar_radio_button_checked.png b/tests/tests/holo/res/drawable-xhdpi/holo_wallpaper_notitlebar_radio_button_checked.png
new file mode 100644
index 0000000..ea35686
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_wallpaper_notitlebar_radio_button_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_wallpaper_notitlebar_radiogroup_horizontal.png b/tests/tests/holo/res/drawable-xhdpi/holo_wallpaper_notitlebar_radiogroup_horizontal.png
new file mode 100644
index 0000000..72b7077
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_wallpaper_notitlebar_radiogroup_horizontal.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_wallpaper_notitlebar_radiogroup_vertical.png b/tests/tests/holo/res/drawable-xhdpi/holo_wallpaper_notitlebar_radiogroup_vertical.png
new file mode 100644
index 0000000..c145b7a
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_wallpaper_notitlebar_radiogroup_vertical.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_wallpaper_notitlebar_ratingbar_0.png b/tests/tests/holo/res/drawable-xhdpi/holo_wallpaper_notitlebar_ratingbar_0.png
new file mode 100644
index 0000000..517f3d6
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_wallpaper_notitlebar_ratingbar_0.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_wallpaper_notitlebar_ratingbar_0_pressed.png b/tests/tests/holo/res/drawable-xhdpi/holo_wallpaper_notitlebar_ratingbar_0_pressed.png
new file mode 100644
index 0000000..c31df16
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_wallpaper_notitlebar_ratingbar_0_pressed.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_wallpaper_notitlebar_ratingbar_2point5.png b/tests/tests/holo/res/drawable-xhdpi/holo_wallpaper_notitlebar_ratingbar_2point5.png
new file mode 100644
index 0000000..d184a4f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_wallpaper_notitlebar_ratingbar_2point5.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_wallpaper_notitlebar_ratingbar_2point5_pressed.png b/tests/tests/holo/res/drawable-xhdpi/holo_wallpaper_notitlebar_ratingbar_2point5_pressed.png
new file mode 100644
index 0000000..e4fcb80
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_wallpaper_notitlebar_ratingbar_2point5_pressed.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_wallpaper_notitlebar_ratingbar_5.png b/tests/tests/holo/res/drawable-xhdpi/holo_wallpaper_notitlebar_ratingbar_5.png
new file mode 100644
index 0000000..ce1c817
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_wallpaper_notitlebar_ratingbar_5.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_wallpaper_notitlebar_ratingbar_5_pressed.png b/tests/tests/holo/res/drawable-xhdpi/holo_wallpaper_notitlebar_ratingbar_5_pressed.png
new file mode 100644
index 0000000..f9f41d4
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_wallpaper_notitlebar_ratingbar_5_pressed.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_wallpaper_notitlebar_searchview.png b/tests/tests/holo/res/drawable-xhdpi/holo_wallpaper_notitlebar_searchview.png
new file mode 100644
index 0000000..73c611f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_wallpaper_notitlebar_searchview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_wallpaper_notitlebar_searchview_query.png b/tests/tests/holo/res/drawable-xhdpi/holo_wallpaper_notitlebar_searchview_query.png
new file mode 100644
index 0000000..a61d007
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_wallpaper_notitlebar_searchview_query.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_wallpaper_notitlebar_searchview_query_hint.png b/tests/tests/holo/res/drawable-xhdpi/holo_wallpaper_notitlebar_searchview_query_hint.png
new file mode 100644
index 0000000..139aacc
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_wallpaper_notitlebar_searchview_query_hint.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_wallpaper_notitlebar_seekbar_0.png b/tests/tests/holo/res/drawable-xhdpi/holo_wallpaper_notitlebar_seekbar_0.png
new file mode 100644
index 0000000..eb26838
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_wallpaper_notitlebar_seekbar_0.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_wallpaper_notitlebar_seekbar_100.png b/tests/tests/holo/res/drawable-xhdpi/holo_wallpaper_notitlebar_seekbar_100.png
new file mode 100644
index 0000000..a5ae2ba
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_wallpaper_notitlebar_seekbar_100.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_wallpaper_notitlebar_seekbar_50.png b/tests/tests/holo/res/drawable-xhdpi/holo_wallpaper_notitlebar_seekbar_50.png
new file mode 100644
index 0000000..8438db8
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_wallpaper_notitlebar_seekbar_50.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_wallpaper_notitlebar_spinner.png b/tests/tests/holo/res/drawable-xhdpi/holo_wallpaper_notitlebar_spinner.png
new file mode 100644
index 0000000..713ea22
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_wallpaper_notitlebar_spinner.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_wallpaper_notitlebar_switch.png b/tests/tests/holo/res/drawable-xhdpi/holo_wallpaper_notitlebar_switch.png
new file mode 100644
index 0000000..001e106
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_wallpaper_notitlebar_switch.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_wallpaper_notitlebar_switch_checked.png b/tests/tests/holo/res/drawable-xhdpi/holo_wallpaper_notitlebar_switch_checked.png
new file mode 100644
index 0000000..79e75f3
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_wallpaper_notitlebar_switch_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_wallpaper_notitlebar_tabhost.png b/tests/tests/holo/res/drawable-xhdpi/holo_wallpaper_notitlebar_tabhost.png
new file mode 100644
index 0000000..eaeeae7
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_wallpaper_notitlebar_tabhost.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_wallpaper_notitlebar_textview.png b/tests/tests/holo/res/drawable-xhdpi/holo_wallpaper_notitlebar_textview.png
new file mode 100644
index 0000000..0d908a5
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_wallpaper_notitlebar_textview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_wallpaper_notitlebar_timepicker.png b/tests/tests/holo/res/drawable-xhdpi/holo_wallpaper_notitlebar_timepicker.png
new file mode 100644
index 0000000..c3a4951
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_wallpaper_notitlebar_timepicker.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_wallpaper_notitlebar_toggle_button.png b/tests/tests/holo/res/drawable-xhdpi/holo_wallpaper_notitlebar_toggle_button.png
new file mode 100644
index 0000000..cdfb783
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_wallpaper_notitlebar_toggle_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_wallpaper_notitlebar_toggle_button_checked.png b/tests/tests/holo/res/drawable-xhdpi/holo_wallpaper_notitlebar_toggle_button_checked.png
new file mode 100644
index 0000000..2c604ee
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_wallpaper_notitlebar_toggle_button_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_wallpaper_notitlebar_zoomcontrols.png b/tests/tests/holo/res/drawable-xhdpi/holo_wallpaper_notitlebar_zoomcontrols.png
new file mode 100644
index 0000000..21d17f9
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_wallpaper_notitlebar_zoomcontrols.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_wallpaper_progressbar.png b/tests/tests/holo/res/drawable-xhdpi/holo_wallpaper_progressbar.png
new file mode 100644
index 0000000..8bb3363
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_wallpaper_progressbar.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_wallpaper_progressbar_horizontal_0.png b/tests/tests/holo/res/drawable-xhdpi/holo_wallpaper_progressbar_horizontal_0.png
new file mode 100644
index 0000000..f1d481d
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_wallpaper_progressbar_horizontal_0.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_wallpaper_progressbar_horizontal_100.png b/tests/tests/holo/res/drawable-xhdpi/holo_wallpaper_progressbar_horizontal_100.png
new file mode 100644
index 0000000..a586079
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_wallpaper_progressbar_horizontal_100.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_wallpaper_progressbar_horizontal_50.png b/tests/tests/holo/res/drawable-xhdpi/holo_wallpaper_progressbar_horizontal_50.png
new file mode 100644
index 0000000..9467831
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_wallpaper_progressbar_horizontal_50.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_wallpaper_progressbar_large.png b/tests/tests/holo/res/drawable-xhdpi/holo_wallpaper_progressbar_large.png
new file mode 100644
index 0000000..98344af
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_wallpaper_progressbar_large.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_wallpaper_progressbar_small.png b/tests/tests/holo/res/drawable-xhdpi/holo_wallpaper_progressbar_small.png
new file mode 100644
index 0000000..88ef977
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_wallpaper_progressbar_small.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_wallpaper_progressdialog_horizontal.png b/tests/tests/holo/res/drawable-xhdpi/holo_wallpaper_progressdialog_horizontal.png
new file mode 100644
index 0000000..68cc076
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_wallpaper_progressdialog_horizontal.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_wallpaper_radio_button.png b/tests/tests/holo/res/drawable-xhdpi/holo_wallpaper_radio_button.png
new file mode 100644
index 0000000..db61da3
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_wallpaper_radio_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_wallpaper_radio_button_checked.png b/tests/tests/holo/res/drawable-xhdpi/holo_wallpaper_radio_button_checked.png
new file mode 100644
index 0000000..ea35686
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_wallpaper_radio_button_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_wallpaper_radiogroup_horizontal.png b/tests/tests/holo/res/drawable-xhdpi/holo_wallpaper_radiogroup_horizontal.png
new file mode 100644
index 0000000..72b7077
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_wallpaper_radiogroup_horizontal.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_wallpaper_radiogroup_vertical.png b/tests/tests/holo/res/drawable-xhdpi/holo_wallpaper_radiogroup_vertical.png
new file mode 100644
index 0000000..c145b7a
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_wallpaper_radiogroup_vertical.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_wallpaper_ratingbar_0.png b/tests/tests/holo/res/drawable-xhdpi/holo_wallpaper_ratingbar_0.png
new file mode 100644
index 0000000..517f3d6
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_wallpaper_ratingbar_0.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_wallpaper_ratingbar_0_pressed.png b/tests/tests/holo/res/drawable-xhdpi/holo_wallpaper_ratingbar_0_pressed.png
new file mode 100644
index 0000000..c31df16
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_wallpaper_ratingbar_0_pressed.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_wallpaper_ratingbar_2point5.png b/tests/tests/holo/res/drawable-xhdpi/holo_wallpaper_ratingbar_2point5.png
new file mode 100644
index 0000000..d184a4f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_wallpaper_ratingbar_2point5.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_wallpaper_ratingbar_2point5_pressed.png b/tests/tests/holo/res/drawable-xhdpi/holo_wallpaper_ratingbar_2point5_pressed.png
new file mode 100644
index 0000000..e4fcb80
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_wallpaper_ratingbar_2point5_pressed.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_wallpaper_ratingbar_5.png b/tests/tests/holo/res/drawable-xhdpi/holo_wallpaper_ratingbar_5.png
new file mode 100644
index 0000000..ce1c817
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_wallpaper_ratingbar_5.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_wallpaper_ratingbar_5_pressed.png b/tests/tests/holo/res/drawable-xhdpi/holo_wallpaper_ratingbar_5_pressed.png
new file mode 100644
index 0000000..f9f41d4
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_wallpaper_ratingbar_5_pressed.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_wallpaper_searchview.png b/tests/tests/holo/res/drawable-xhdpi/holo_wallpaper_searchview.png
new file mode 100644
index 0000000..73c611f
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_wallpaper_searchview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_wallpaper_searchview_query.png b/tests/tests/holo/res/drawable-xhdpi/holo_wallpaper_searchview_query.png
new file mode 100644
index 0000000..a61d007
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_wallpaper_searchview_query.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_wallpaper_searchview_query_hint.png b/tests/tests/holo/res/drawable-xhdpi/holo_wallpaper_searchview_query_hint.png
new file mode 100644
index 0000000..139aacc
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_wallpaper_searchview_query_hint.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_wallpaper_seekbar_0.png b/tests/tests/holo/res/drawable-xhdpi/holo_wallpaper_seekbar_0.png
new file mode 100644
index 0000000..eb26838
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_wallpaper_seekbar_0.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_wallpaper_seekbar_100.png b/tests/tests/holo/res/drawable-xhdpi/holo_wallpaper_seekbar_100.png
new file mode 100644
index 0000000..a5ae2ba
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_wallpaper_seekbar_100.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_wallpaper_seekbar_50.png b/tests/tests/holo/res/drawable-xhdpi/holo_wallpaper_seekbar_50.png
new file mode 100644
index 0000000..8438db8
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_wallpaper_seekbar_50.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_wallpaper_spinner.png b/tests/tests/holo/res/drawable-xhdpi/holo_wallpaper_spinner.png
new file mode 100644
index 0000000..713ea22
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_wallpaper_spinner.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_wallpaper_switch.png b/tests/tests/holo/res/drawable-xhdpi/holo_wallpaper_switch.png
new file mode 100644
index 0000000..001e106
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_wallpaper_switch.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_wallpaper_switch_checked.png b/tests/tests/holo/res/drawable-xhdpi/holo_wallpaper_switch_checked.png
new file mode 100644
index 0000000..79e75f3
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_wallpaper_switch_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_wallpaper_tabhost.png b/tests/tests/holo/res/drawable-xhdpi/holo_wallpaper_tabhost.png
new file mode 100644
index 0000000..eaeeae7
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_wallpaper_tabhost.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_wallpaper_textview.png b/tests/tests/holo/res/drawable-xhdpi/holo_wallpaper_textview.png
new file mode 100644
index 0000000..0d908a5
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_wallpaper_textview.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_wallpaper_timepicker.png b/tests/tests/holo/res/drawable-xhdpi/holo_wallpaper_timepicker.png
new file mode 100644
index 0000000..c3a4951
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_wallpaper_timepicker.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_wallpaper_toggle_button.png b/tests/tests/holo/res/drawable-xhdpi/holo_wallpaper_toggle_button.png
new file mode 100644
index 0000000..cdfb783
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_wallpaper_toggle_button.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_wallpaper_toggle_button_checked.png b/tests/tests/holo/res/drawable-xhdpi/holo_wallpaper_toggle_button_checked.png
new file mode 100644
index 0000000..2c604ee
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_wallpaper_toggle_button_checked.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_wallpaper_zoomcontrols.png b/tests/tests/holo/res/drawable-xhdpi/holo_wallpaper_zoomcontrols.png
new file mode 100644
index 0000000..21d17f9
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_wallpaper_zoomcontrols.png
Binary files differ
diff --git a/tests/tests/holo/res/drawable-xhdpi/holo_zoomcontrols.png b/tests/tests/holo/res/drawable-xhdpi/holo_zoomcontrols.png
new file mode 100644
index 0000000..21d17f9
--- /dev/null
+++ b/tests/tests/holo/res/drawable-xhdpi/holo_zoomcontrols.png
Binary files differ
diff --git a/tests/tests/holo/res/layout/button.xml b/tests/tests/holo/res/layout/button.xml
new file mode 100644
index 0000000..ca9f542
--- /dev/null
+++ b/tests/tests/holo/res/layout/button.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2011 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+  
+          http://www.apache.org/licenses/LICENSE-2.0
+  
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<Button xmlns:android="http://schemas.android.com/apk/res/android"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/button"
+        />
diff --git a/tests/tests/holo/res/layout/calendarview.xml b/tests/tests/holo/res/layout/calendarview.xml
new file mode 100644
index 0000000..9c5f9ef
--- /dev/null
+++ b/tests/tests/holo/res/layout/calendarview.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2011 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<CalendarView xmlns:android="http://schemas.android.com/apk/res/android"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        />
diff --git a/tests/tests/holo/res/layout/checkbox.xml b/tests/tests/holo/res/layout/checkbox.xml
new file mode 100644
index 0000000..8eeac39
--- /dev/null
+++ b/tests/tests/holo/res/layout/checkbox.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2011 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<CheckBox xmlns:android="http://schemas.android.com/apk/res/android"
+        android:text="@string/checkbox"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        />
+
diff --git a/tests/tests/holo/res/layout/checkbox_checked.xml b/tests/tests/holo/res/layout/checkbox_checked.xml
new file mode 100644
index 0000000..4991c0f
--- /dev/null
+++ b/tests/tests/holo/res/layout/checkbox_checked.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2011 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<CheckBox xmlns:android="http://schemas.android.com/apk/res/android"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        />
+
diff --git a/tests/tests/holo/res/layout/chronometer.xml b/tests/tests/holo/res/layout/chronometer.xml
new file mode 100644
index 0000000..11dc388
--- /dev/null
+++ b/tests/tests/holo/res/layout/chronometer.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2011 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+  
+          http://www.apache.org/licenses/LICENSE-2.0
+  
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<Chronometer xmlns:android="http://schemas.android.com/apk/res/android"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        />
diff --git a/tests/tests/holo/res/layout/color_blue_bright.xml b/tests/tests/holo/res/layout/color_blue_bright.xml
new file mode 100644
index 0000000..aa1f7d0
--- /dev/null
+++ b/tests/tests/holo/res/layout/color_blue_bright.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2011 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<TextView xmlns:android="http://schemas.android.com/apk/res/android" 
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/textview"
+        android:textColor="@android:color/holo_blue_bright"
+        />
diff --git a/tests/tests/holo/res/layout/color_blue_dark.xml b/tests/tests/holo/res/layout/color_blue_dark.xml
new file mode 100644
index 0000000..7956d34
--- /dev/null
+++ b/tests/tests/holo/res/layout/color_blue_dark.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2011 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<TextView xmlns:android="http://schemas.android.com/apk/res/android" 
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/textview"
+        android:textColor="@android:color/holo_blue_dark"
+        />
diff --git a/tests/tests/holo/res/layout/color_blue_light.xml b/tests/tests/holo/res/layout/color_blue_light.xml
new file mode 100644
index 0000000..f4215c3
--- /dev/null
+++ b/tests/tests/holo/res/layout/color_blue_light.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2011 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<TextView xmlns:android="http://schemas.android.com/apk/res/android" 
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/textview"
+        android:textColor="@android:color/holo_blue_light"
+        />
diff --git a/tests/tests/holo/res/layout/color_green_dark.xml b/tests/tests/holo/res/layout/color_green_dark.xml
new file mode 100644
index 0000000..4ab111b
--- /dev/null
+++ b/tests/tests/holo/res/layout/color_green_dark.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2011 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<TextView xmlns:android="http://schemas.android.com/apk/res/android" 
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/textview"
+        android:textColor="@android:color/holo_green_dark"
+        />
diff --git a/tests/tests/holo/res/layout/color_green_light.xml b/tests/tests/holo/res/layout/color_green_light.xml
new file mode 100644
index 0000000..ba57dff
--- /dev/null
+++ b/tests/tests/holo/res/layout/color_green_light.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2011 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<TextView xmlns:android="http://schemas.android.com/apk/res/android" 
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/textview"
+        android:textColor="@android:color/holo_green_light"
+        />
diff --git a/tests/tests/holo/res/layout/color_orange_dark.xml b/tests/tests/holo/res/layout/color_orange_dark.xml
new file mode 100644
index 0000000..761f08a
--- /dev/null
+++ b/tests/tests/holo/res/layout/color_orange_dark.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2011 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<TextView xmlns:android="http://schemas.android.com/apk/res/android" 
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/textview"
+        android:textColor="@android:color/holo_orange_dark"
+        />
diff --git a/tests/tests/holo/res/layout/color_orange_light.xml b/tests/tests/holo/res/layout/color_orange_light.xml
new file mode 100644
index 0000000..de43795
--- /dev/null
+++ b/tests/tests/holo/res/layout/color_orange_light.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2011 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<TextView xmlns:android="http://schemas.android.com/apk/res/android" 
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/textview"
+        android:textColor="@android:color/holo_orange_light"
+        />
diff --git a/tests/tests/holo/res/layout/color_purple.xml b/tests/tests/holo/res/layout/color_purple.xml
new file mode 100644
index 0000000..8a2c0aa
--- /dev/null
+++ b/tests/tests/holo/res/layout/color_purple.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2011 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<TextView xmlns:android="http://schemas.android.com/apk/res/android" 
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/textview"
+        android:textColor="@android:color/holo_purple"
+        />
diff --git a/tests/tests/holo/res/layout/color_red_dark.xml b/tests/tests/holo/res/layout/color_red_dark.xml
new file mode 100644
index 0000000..7e5f629
--- /dev/null
+++ b/tests/tests/holo/res/layout/color_red_dark.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2011 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<TextView xmlns:android="http://schemas.android.com/apk/res/android" 
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/textview"
+        android:textColor="@android:color/holo_red_dark"
+        />
diff --git a/tests/tests/holo/res/layout/color_red_light.xml b/tests/tests/holo/res/layout/color_red_light.xml
new file mode 100644
index 0000000..8afb202
--- /dev/null
+++ b/tests/tests/holo/res/layout/color_red_light.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2011 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<TextView xmlns:android="http://schemas.android.com/apk/res/android" 
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/textview"
+        android:textColor="@android:color/holo_red_light"
+        />
diff --git a/tests/tests/holo/res/layout/datepicker.xml b/tests/tests/holo/res/layout/datepicker.xml
new file mode 100644
index 0000000..1ae9550
--- /dev/null
+++ b/tests/tests/holo/res/layout/datepicker.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2011 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+  
+          http://www.apache.org/licenses/LICENSE-2.0
+  
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<DatePicker xmlns:android="http://schemas.android.com/apk/res/android"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        />
diff --git a/tests/tests/holo/res/layout/display_info.xml b/tests/tests/holo/res/layout/display_info.xml
new file mode 100644
index 0000000..130ce1f
--- /dev/null
+++ b/tests/tests/holo/res/layout/display_info.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2011 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<TextView xmlns:android="http://schemas.android.com/apk/res/android"
+        android:id="@+id/text"
+        android:layout_width="fill_parent"
+        android:layout_height="fill_parent"
+        />
diff --git a/tests/tests/holo/res/layout/edittext.xml b/tests/tests/holo/res/layout/edittext.xml
new file mode 100644
index 0000000..5515010
--- /dev/null
+++ b/tests/tests/holo/res/layout/edittext.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2011 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<EditText xmlns:android="http://schemas.android.com/apk/res/android"    
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        />
diff --git a/tests/tests/holo/res/layout/empty.xml b/tests/tests/holo/res/layout/empty.xml
new file mode 100644
index 0000000..562bf1a
--- /dev/null
+++ b/tests/tests/holo/res/layout/empty.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2011 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+        android:layout_width="0dip"
+        android:layout_height="0dip"
+        />
diff --git a/tests/tests/holo/res/layout/holo_test.xml b/tests/tests/holo/res/layout/holo_test.xml
new file mode 100644
index 0000000..c22d10d
--- /dev/null
+++ b/tests/tests/holo/res/layout/holo_test.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2010 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.
+-->
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+        android:orientation="vertical"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+    <android.holo.cts.ReferenceViewGroup
+            android:id="@+id/reference_view_group"
+            android:orientation="vertical"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            />
+</LinearLayout>
diff --git a/tests/tests/holo/res/layout/progressbar.xml b/tests/tests/holo/res/layout/progressbar.xml
new file mode 100644
index 0000000..4e810fc
--- /dev/null
+++ b/tests/tests/holo/res/layout/progressbar.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2011 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<ProgressBar xmlns:android="http://schemas.android.com/apk/res/android"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:animationResolution="60000"
+        />
diff --git a/tests/tests/holo/res/layout/progressbar_horizontal_0.xml b/tests/tests/holo/res/layout/progressbar_horizontal_0.xml
new file mode 100644
index 0000000..f5a515e
--- /dev/null
+++ b/tests/tests/holo/res/layout/progressbar_horizontal_0.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2011 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<ProgressBar xmlns:android="http://schemas.android.com/apk/res/android"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:progress="0"
+        android:max="100"    
+        style="?android:attr/progressBarStyleHorizontal"
+        />
diff --git a/tests/tests/holo/res/layout/progressbar_horizontal_100.xml b/tests/tests/holo/res/layout/progressbar_horizontal_100.xml
new file mode 100644
index 0000000..3266479
--- /dev/null
+++ b/tests/tests/holo/res/layout/progressbar_horizontal_100.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2011 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<ProgressBar xmlns:android="http://schemas.android.com/apk/res/android"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:progress="100"
+        android:max="100"    
+        style="?android:attr/progressBarStyleHorizontal"
+        />
diff --git a/tests/tests/holo/res/layout/progressbar_horizontal_50.xml b/tests/tests/holo/res/layout/progressbar_horizontal_50.xml
new file mode 100644
index 0000000..a64bb96
--- /dev/null
+++ b/tests/tests/holo/res/layout/progressbar_horizontal_50.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2011 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<ProgressBar xmlns:android="http://schemas.android.com/apk/res/android"
+        android:id="@+id/progressBar1"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:progress="50"
+        android:max="100"
+        style="?android:attr/progressBarStyleHorizontal"
+        />
diff --git a/tests/tests/holo/res/layout/progressbar_large.xml b/tests/tests/holo/res/layout/progressbar_large.xml
new file mode 100644
index 0000000..4b66447
--- /dev/null
+++ b/tests/tests/holo/res/layout/progressbar_large.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2011 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<ProgressBar xmlns:android="http://schemas.android.com/apk/res/android"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:animationResolution="60000"
+        style="?android:attr/progressBarStyleLarge"
+        />
diff --git a/tests/tests/holo/res/layout/progressbar_small.xml b/tests/tests/holo/res/layout/progressbar_small.xml
new file mode 100644
index 0000000..ae813d6
--- /dev/null
+++ b/tests/tests/holo/res/layout/progressbar_small.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2011 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<ProgressBar xmlns:android="http://schemas.android.com/apk/res/android"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:animationResolution="60000"        
+        style="?android:attr/progressBarStyleSmall"
+        />
diff --git a/tests/tests/holo/res/layout/radiobutton.xml b/tests/tests/holo/res/layout/radiobutton.xml
new file mode 100644
index 0000000..f03d0f5
--- /dev/null
+++ b/tests/tests/holo/res/layout/radiobutton.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2011 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<RadioButton xmlns:android="http://schemas.android.com/apk/res/android"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/radiobutton"
+        />
diff --git a/tests/tests/holo/res/layout/radiobutton_checked.xml b/tests/tests/holo/res/layout/radiobutton_checked.xml
new file mode 100644
index 0000000..6d57cc1
--- /dev/null
+++ b/tests/tests/holo/res/layout/radiobutton_checked.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2011 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<RadioButton xmlns:android="http://schemas.android.com/apk/res/android"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:checked="true"
+        android:text="@string/radiobutton_checked"
+        />
diff --git a/tests/tests/holo/res/layout/radiogroup_horizontal.xml b/tests/tests/holo/res/layout/radiogroup_horizontal.xml
new file mode 100644
index 0000000..cdbf1c3
--- /dev/null
+++ b/tests/tests/holo/res/layout/radiogroup_horizontal.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2011 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<RadioGroup xmlns:android="http://schemas.android.com/apk/res/android"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        >
+    <RadioButton android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/radiobutton_1" 
+            />
+    <RadioButton android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/radiobutton_2"
+            />
+</RadioGroup>
diff --git a/tests/tests/holo/res/layout/radiogroup_vertical.xml b/tests/tests/holo/res/layout/radiogroup_vertical.xml
new file mode 100644
index 0000000..9f570eb
--- /dev/null
+++ b/tests/tests/holo/res/layout/radiogroup_vertical.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2011 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<RadioGroup xmlns:android="http://schemas.android.com/apk/res/android"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        >
+    <RadioButton android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/radiobutton_1"
+            />
+    <RadioButton android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/radiobutton_2"
+            />
+</RadioGroup>
diff --git a/tests/tests/holo/res/layout/ratingbar_0.xml b/tests/tests/holo/res/layout/ratingbar_0.xml
new file mode 100644
index 0000000..8a5a9dd
--- /dev/null
+++ b/tests/tests/holo/res/layout/ratingbar_0.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2011 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<RatingBar xmlns:android="http://schemas.android.com/apk/res/android"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:rating="0"
+        android:numStars="5"
+        />
diff --git a/tests/tests/holo/res/layout/ratingbar_2point5.xml b/tests/tests/holo/res/layout/ratingbar_2point5.xml
new file mode 100644
index 0000000..38a2a50
--- /dev/null
+++ b/tests/tests/holo/res/layout/ratingbar_2point5.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2011 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<RatingBar xmlns:android="http://schemas.android.com/apk/res/android"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:rating="2.5"
+        android:numStars="5"
+        />
diff --git a/tests/tests/holo/res/layout/ratingbar_5.xml b/tests/tests/holo/res/layout/ratingbar_5.xml
new file mode 100644
index 0000000..9e09d4c
--- /dev/null
+++ b/tests/tests/holo/res/layout/ratingbar_5.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2011 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<RatingBar xmlns:android="http://schemas.android.com/apk/res/android"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:rating="5"
+        android:numStars="5"
+        />   
diff --git a/tests/tests/holo/res/layout/searchview.xml b/tests/tests/holo/res/layout/searchview.xml
new file mode 100644
index 0000000..a1822ca
--- /dev/null
+++ b/tests/tests/holo/res/layout/searchview.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2011 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<SearchView xmlns:android="http://schemas.android.com/apk/res/android"    
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        />
diff --git a/tests/tests/holo/res/layout/seekbar_0.xml b/tests/tests/holo/res/layout/seekbar_0.xml
new file mode 100644
index 0000000..fac24c7
--- /dev/null
+++ b/tests/tests/holo/res/layout/seekbar_0.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2011 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<SeekBar xmlns:android="http://schemas.android.com/apk/res/android"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:progress="0"
+        android:max="100"
+        />
diff --git a/tests/tests/holo/res/layout/seekbar_100.xml b/tests/tests/holo/res/layout/seekbar_100.xml
new file mode 100644
index 0000000..179b39a
--- /dev/null
+++ b/tests/tests/holo/res/layout/seekbar_100.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2011 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<SeekBar xmlns:android="http://schemas.android.com/apk/res/android"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:progress="100"
+        android:max="100"
+        />
diff --git a/tests/tests/holo/res/layout/seekbar_50.xml b/tests/tests/holo/res/layout/seekbar_50.xml
new file mode 100644
index 0000000..cfb91ab
--- /dev/null
+++ b/tests/tests/holo/res/layout/seekbar_50.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2011 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<SeekBar xmlns:android="http://schemas.android.com/apk/res/android"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:progress="50"
+        android:max="100"
+        />
diff --git a/tests/tests/holo/res/layout/spinner.xml b/tests/tests/holo/res/layout/spinner.xml
new file mode 100644
index 0000000..1647416
--- /dev/null
+++ b/tests/tests/holo/res/layout/spinner.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2011 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<Spinner xmlns:android="http://schemas.android.com/apk/res/android"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:prompt="@string/spinner_prompt"
+        android:entries="@array/spinner_entries"
+        />
diff --git a/tests/tests/holo/res/layout/switch_button.xml b/tests/tests/holo/res/layout/switch_button.xml
new file mode 100644
index 0000000..15f7038
--- /dev/null
+++ b/tests/tests/holo/res/layout/switch_button.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2011 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+  
+          http://www.apache.org/licenses/LICENSE-2.0
+  
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<Switch xmlns:android="http://schemas.android.com/apk/res/android"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/switch_button"
+        />
diff --git a/tests/tests/holo/res/layout/switch_button_checked.xml b/tests/tests/holo/res/layout/switch_button_checked.xml
new file mode 100644
index 0000000..9cf7687
--- /dev/null
+++ b/tests/tests/holo/res/layout/switch_button_checked.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2011 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+  
+          http://www.apache.org/licenses/LICENSE-2.0
+  
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<Switch xmlns:android="http://schemas.android.com/apk/res/android"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:checked="true"
+        android:text="@string/switch_button"
+        />
diff --git a/tests/tests/holo/res/layout/tabhost.xml b/tests/tests/holo/res/layout/tabhost.xml
new file mode 100644
index 0000000..4b7bcca
--- /dev/null
+++ b/tests/tests/holo/res/layout/tabhost.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2011 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<TabHost xmlns:android="http://schemas.android.com/apk/res/android"
+        android:layout_width="fill_parent"
+        android:layout_height="fill_parent"
+        >
+    <LinearLayout android:layout_width="fill_parent"
+            android:layout_height="fill_parent"
+            android:orientation="vertical"            
+            android:padding="5dp">
+        <TabWidget android:id="@android:id/tabs"
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content" 
+                />
+        <FrameLayout android:id="@android:id/tabcontent"
+                android:layout_width="fill_parent"
+                android:layout_height="fill_parent"
+                android:padding="5dp"
+                >
+            <LinearLayout android:id="@+id/tab_inner_view"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    />
+        </FrameLayout>
+    </LinearLayout>
+</TabHost>
diff --git a/tests/tests/holo/res/layout/textview.xml b/tests/tests/holo/res/layout/textview.xml
new file mode 100644
index 0000000..d45bc3a
--- /dev/null
+++ b/tests/tests/holo/res/layout/textview.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2011 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<TextView xmlns:android="http://schemas.android.com/apk/res/android"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/textview"
+        />
diff --git a/tests/tests/holo/res/layout/timepicker.xml b/tests/tests/holo/res/layout/timepicker.xml
new file mode 100644
index 0000000..1e0f334
--- /dev/null
+++ b/tests/tests/holo/res/layout/timepicker.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2011 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+  
+          http://www.apache.org/licenses/LICENSE-2.0
+  
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<TimePicker xmlns:android="http://schemas.android.com/apk/res/android"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        />
diff --git a/tests/tests/holo/res/layout/togglebutton.xml b/tests/tests/holo/res/layout/togglebutton.xml
new file mode 100644
index 0000000..d15e899
--- /dev/null
+++ b/tests/tests/holo/res/layout/togglebutton.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2011 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<ToggleButton xmlns:android="http://schemas.android.com/apk/res/android"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        />
+
diff --git a/tests/tests/holo/res/layout/togglebutton_checked.xml b/tests/tests/holo/res/layout/togglebutton_checked.xml
new file mode 100644
index 0000000..bd8cabd
--- /dev/null
+++ b/tests/tests/holo/res/layout/togglebutton_checked.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2011 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<ToggleButton xmlns:android="http://schemas.android.com/apk/res/android"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:checked="true"
+        />
diff --git a/tests/tests/holo/res/layout/zoomcontrols.xml b/tests/tests/holo/res/layout/zoomcontrols.xml
new file mode 100644
index 0000000..80ac8fb
--- /dev/null
+++ b/tests/tests/holo/res/layout/zoomcontrols.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2011 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<ZoomControls xmlns:android="http://schemas.android.com/apk/res/android"    
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        />
diff --git a/tests/tests/holo/res/values/arrays.xml b/tests/tests/holo/res/values/arrays.xml
new file mode 100644
index 0000000..f6e6c92
--- /dev/null
+++ b/tests/tests/holo/res/values/arrays.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2011 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<resources>
+    <string-array name="spinner_entries">
+        <item>Spinner 1</item>
+        <item>Spinner 2</item>
+        <item>Spinner 3</item>
+    </string-array>
+</resources>
diff --git a/tests/tests/holo/res/values/dimens.xml b/tests/tests/holo/res/values/dimens.xml
new file mode 100755
index 0000000..76de0d0
--- /dev/null
+++ b/tests/tests/holo/res/values/dimens.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2011 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<resources>
+    <dimen name="reference_width">320dp</dimen>
+    <dimen name="reference_height">480dp</dimen>
+</resources>
+
diff --git a/tests/tests/holo/res/values/strings.xml b/tests/tests/holo/res/values/strings.xml
new file mode 100644
index 0000000..5eb7d82
--- /dev/null
+++ b/tests/tests/holo/res/values/strings.xml
@@ -0,0 +1,107 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2011 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<resources>
+    <string name="holo_test_utilities">Holo Test Utilities</string>
+    <string name="task_view_display_info">View Display Info</string>
+    <string name="task_view_tests">View Tests</string>
+    <string name="task_generate_one_bitmap">Generate Single Test Bitmaps</string>
+    <string name="task_generate_all_bitmaps">Generate All Test Bitmaps</string>
+    <string name="task_clear_reference_bitmaps">Clear Reference Bitmaps</string>
+    <string name="task_clear_failure_bitmaps">Clear Failure Bitmaps</string>
+    <string name="task_clear_diff_bitmaps">Clear Diff Bitmaps</string>
+
+    <string name="display_info">Display Info</string>
+    <string name="display_info_text">Density DPI: %1$d\nDensity Bucket: %2$s</string>
+
+    <string name="pick_theme">Pick Theme</string>
+    <string name="pick_layout">Pick Layout</string>
+
+    <string name="deleting_bitmaps">Deleting bitmaps...</string>
+    <string name="deleting_bitmaps_finished">Successfully deleted bitmaps!</string>
+    <string name="deleting_bitmaps_error">Failed to delete bitmaps. Is external storage mounted?</string>
+    <string name="generate_bitmap_success">Saved bitmap to %s</string>
+    <string name="generate_bitmap_failure">Failed to save bitmap to %s</string>
+    <string name="comparison_success">Bitmap matches the reference bitmap!</string>
+    <string name="comparison_failure">Bitmap does not match reference bitmap. 
+            Saved failed image to %1$s and diff analysis to %2$s.</string>
+
+    <string name="button">Button</string>
+    <string name="button_pressed">Button Pressed</string>
+    <string name="calendarview_jan">CalendarView (January)</string>
+    <string name="calendarview_feb">CalendarView (February)</string>
+    <string name="checkbox">CheckBox</string>
+    <string name="checkbox_checked">CheckBox Checked</string>
+    <string name="chronometer">Chronometer</string>
+    <string name="datepicker">DatePicker</string>
+    <string name="edittext">EditText</string>
+    <string name="progressbar">ProgressBar</string>
+    <string name="progressbar_small">ProgressBar Small</string>
+    <string name="progressbar_large">ProgressBar Large</string>
+    <string name="progressbar_horizontal_0">ProgressBar Horizontal 0%</string>
+    <string name="progressbar_horizontal_50">ProgressBar Horizontal 50%</string>
+    <string name="progressbar_horizontal_100">ProgressBar Horizontal 100%</string>
+    <string name="radiobutton">RadioButton</string>
+    <string name="radiobutton_checked">RadioButton Checked</string>
+    <string name="radiogroup_horizontal">RadioGroup Horizontal</string>
+    <string name="radiogroup_vertical">RadioGroup Vertical</string>
+    <string name="ratingbar_0">RatingBar 0 Stars</string>
+    <string name="ratingbar_2point5">RatingBar 2.5 Stars</string>
+    <string name="ratingbar_5">RatingBar 5 Stars</string>
+    <string name="ratingbar_0_pressed">RatingBar 0 Stars Pressed</string>
+    <string name="ratingbar_2point5_pressed">RatingBar 2.5 Stars Pressed</string>
+    <string name="ratingbar_5_pressed">RatingBar 5 Stars Pressed</string>
+    <string name="searchview">SearchView</string>
+    <string name="searchview_query">SearchView Query</string>
+    <string name="searchview_query_hint">SearchView Query Hint</string>
+    <string name="seekbar_0">SeekBar 0%</string>
+    <string name="seekbar_50">SeekBar 50%</string>
+    <string name="seekbar_100">SeekBar 100%</string>
+    <string name="spinner">Spinner</string>
+    <string name="switch_button">Switch</string>
+    <string name="switch_button_checked">Switch Checked</string>
+    <string name="tabhost">TabHost</string>
+    <string name="textview">TextView</string>
+    <string name="timepicker">TimePicker</string>    
+    <string name="togglebutton">ToggleButton</string>
+    <string name="togglebutton_checked">ToggleButton Checked</string>
+    <string name="zoomcontrols">ZoomControls</string>
+
+    <string name="alertdialog_onebutton">AlertDialog One Button</string>
+    <string name="alertdialog_twobuttons">AlertDialog Two Buttons</string>
+    <string name="alertdialog_threebuttons">AlertDialog Three Buttons</string>
+    <string name="alertdialog_list">AlertDialog List</string>
+    <string name="alertdialog_singlechoice">AlertDialog Single Choice</string>
+    <string name="alertdialog_multichoice">AlertDialog Multiple Choice</string>
+    <string name="progressdialog_spinner">ProgressDialog Spinner</string>
+    <string name="progressdialog_horizontal">ProgressDialog Horizontal</string>
+
+    <string name="color_blue_bright">Bright Blue Color</string>
+    <string name="color_blue_dark">Dark Blue Color</string>
+    <string name="color_blue_light">Light Blue Color</string>
+    <string name="color_green_dark">Dark Green Color</string>
+    <string name="color_green_light">Light Green Color</string>
+    <string name="color_orange_dark">Dark Orange Color</string>
+    <string name="color_orange_light">Light Orange Color</string>
+    <string name="color_purple">Purple Color</string>
+    <string name="color_red_dark">Dark Red Color</string>
+    <string name="color_red_light">Light Red Color</string>
+    
+    <string name="spinner_prompt">Spinner Prompt</string>
+    <string name="radiobutton_1">Radio Button 1</string>
+    <string name="radiobutton_2">Radio Button 2</string>
+    <string name="loading">Loading...</string>
+
+</resources>
diff --git a/tests/tests/holo/src/android/holo/cts/AllThemesIterator.java b/tests/tests/holo/src/android/holo/cts/AllThemesIterator.java
new file mode 100644
index 0000000..4ddc187
--- /dev/null
+++ b/tests/tests/holo/src/android/holo/cts/AllThemesIterator.java
@@ -0,0 +1,68 @@
+/*
+ * Copyright (C) 2011 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package android.holo.cts;
+
+import android.content.Intent;
+
+import java.util.Iterator;
+
+/**
+ * {@link Iterator} over all the possible permutations of theme and layout intents.
+ */
+class AllThemesIterator implements Iterator<Intent> {
+
+    private final ThemeAdapter mThemeAdapter = new ThemeAdapter(null);
+    private final LayoutAdapter mLayoutAdapter;
+
+    private final int mTask;
+    private final int mAdapterMode;
+    private int mThemeIndex;
+    private int mLayoutIndex;
+
+    AllThemesIterator(int task, int adapterMode) {
+        mTask = task;
+        mAdapterMode = adapterMode;
+        mLayoutAdapter = new LayoutAdapter(null, adapterMode);
+    }
+
+    @Override
+    public boolean hasNext() {
+        return mThemeIndex < mThemeAdapter.getCount();
+    }
+
+    @Override
+    public Intent next() {
+        Intent intent = new Intent();
+        intent.putExtra(LayoutTestActivity.EXTRA_THEME_INDEX, mThemeIndex);
+        intent.putExtra(LayoutTestActivity.EXTRA_LAYOUT_INDEX, mLayoutIndex);
+        intent.putExtra(LayoutTestActivity.EXTRA_LAYOUT_ADAPTER_MODE, mAdapterMode);
+        intent.putExtra(LayoutTestActivity.EXTRA_TASK, mTask);
+
+        mLayoutIndex++;
+        if (mLayoutIndex >= mLayoutAdapter.getCount()) {
+            mThemeIndex++;
+            mLayoutIndex = 0;
+        }
+
+        return intent;
+    }
+
+    @Override
+    public void remove() {
+        throw new UnsupportedOperationException("I don't think so...");
+    }
+}
diff --git a/tests/tests/holo/src/android/holo/cts/BitmapAssets.java b/tests/tests/holo/src/android/holo/cts/BitmapAssets.java
new file mode 100644
index 0000000..e676a96
--- /dev/null
+++ b/tests/tests/holo/src/android/holo/cts/BitmapAssets.java
@@ -0,0 +1,136 @@
+/*
+ * Copyright (C) 2011 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package android.holo.cts;
+
+import android.content.Context;
+import android.content.res.Resources;
+import android.graphics.Bitmap;
+import android.graphics.Bitmap.CompressFormat;
+import android.graphics.drawable.BitmapDrawable;
+import android.graphics.drawable.Drawable;
+import android.holo.cts.LayoutAdapter.LayoutInfo;
+import android.holo.cts.ThemeAdapter.ThemeInfo;
+import android.os.Environment;
+import android.util.Log;
+
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+
+/**
+ * Collection of utility methods to handle creation and deletion of assets.
+ *
+ * It creates a directory called "cts-holo-assets" on the external storage.
+ * Below that it creates a directory called "reference" to store images
+ * generated by the generator and "failure" to store images that failed to
+ * match when running the test.
+ */
+class BitmapAssets {
+
+    private static final String TAG = BitmapAssets.class.getSimpleName();
+
+    static final int TYPE_REFERENCE = 0;
+
+    static final int TYPE_FAILED = 1;
+
+    static final int TYPE_DIFF = 2;
+
+    public static boolean clearDirectory(int type) {
+        if (!isExternalStorageReady()) {
+            return false;
+        }
+
+        File dir = getBitmapDir(type);
+        if (dir.exists()) {
+            File[] files = dir.listFiles();
+            int numFiles = files.length;
+            for (int i = 0; i < numFiles; i++) {
+                files[i].delete();
+            }
+        }
+        return true;
+    }
+
+    private static boolean isExternalStorageReady() {
+        return Environment.MEDIA_MOUNTED.equals(Environment.getExternalStorageState());
+    }
+
+    public static File getBitmapDir(int type) {
+        String subDir;
+        switch (type) {
+            case TYPE_REFERENCE:
+                subDir = "reference";
+                break;
+            case TYPE_FAILED:
+                subDir = "failed";
+                break;
+            case TYPE_DIFF:
+                subDir = "diff";
+                break;
+            default:
+                throw new IllegalArgumentException("Bad type: " + type);
+        }
+
+        File file = new File(Environment.getExternalStorageDirectory(), "cts-holo-assets");
+        return new File(file, subDir);
+    }
+
+    public static String getBitmapName(ThemeInfo themeInfo, LayoutInfo layoutInfo) {
+        return themeInfo.getBitmapName() + "_" + layoutInfo.getBitmapName();
+    }
+
+    public static Bitmap getBitmap(Context context, String bitmapName) {
+        Resources resources = context.getResources();
+        int resourceId = resources.getIdentifier(bitmapName, "drawable", context.getPackageName());
+        return ((BitmapDrawable) resources.getDrawable(resourceId)).getBitmap();
+    }
+
+    public static File getBitmapPath(String bitmapName, int type) {
+        String prefix;
+        switch (type) {
+            case TYPE_REFERENCE:
+                prefix = "";
+                break;
+            case TYPE_FAILED:
+                prefix = "failed_";
+                break;
+            case TYPE_DIFF:
+                prefix = "diff_";
+                break;
+            default:
+                throw new IllegalArgumentException("Bad type: " + type);
+        }
+
+        return new File(getBitmapDir(type), prefix + bitmapName + ".png");
+    }
+
+    public static String saveBitmap(Bitmap bitmap, String bitmapName, int type) throws IOException {
+        if (!isExternalStorageReady()) {
+            Log.i(TAG, "External storage for saving bitmaps is not mounted");
+            return null;
+        }
+
+        File file = getBitmapPath(bitmapName, type);
+        File dir = file.getParentFile();
+        dir.mkdirs();
+
+        FileOutputStream stream = new FileOutputStream(file);
+        bitmap.compress(CompressFormat.PNG, 100, stream);
+        stream.close();
+        return file.getAbsolutePath();
+    }
+}
diff --git a/tests/tests/holo/src/android/holo/cts/BitmapDeletionActivity.java b/tests/tests/holo/src/android/holo/cts/BitmapDeletionActivity.java
new file mode 100644
index 0000000..c496efe
--- /dev/null
+++ b/tests/tests/holo/src/android/holo/cts/BitmapDeletionActivity.java
@@ -0,0 +1,103 @@
+/*
+ * Copyright (C) 2011 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package android.holo.cts;
+
+import com.android.cts.holo.R;
+
+import android.app.Activity;
+import android.app.AlertDialog;
+import android.app.Dialog;
+import android.app.ProgressDialog;
+import android.content.DialogInterface;
+import android.os.AsyncTask;
+import android.os.Bundle;
+
+/**
+ * {@link Activity} that iterates over all the test layouts for a single theme
+ * and either compares or generates bitmaps.
+ */
+public class BitmapDeletionActivity extends Activity {
+
+    static final String EXTRA_BITMAP_TYPE = "bitmapType";
+
+    private static final int DIALOG_DELETING_ID = 1;
+    private static final int DIALOG_FINISHED_DELETING_ID = 2;
+    private static final int DIALOG_ERROR_DELETING_ID = 3;
+
+    private int mBitmapType;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        mBitmapType = getIntent().getIntExtra(EXTRA_BITMAP_TYPE, -1);
+        new DeleteBitmapsTask().execute();
+    }
+
+    class DeleteBitmapsTask extends AsyncTask<Void, Void, Boolean> {
+
+        @Override
+        protected void onPreExecute() {
+            super.onPreExecute();
+            showDialog(DIALOG_DELETING_ID);
+        }
+
+        @Override
+        protected Boolean doInBackground(Void... darthVoider) {
+            return BitmapAssets.clearDirectory(mBitmapType);
+        }
+
+        @Override
+        protected void onPostExecute(Boolean success) {
+            dismissDialog(DIALOG_DELETING_ID);
+            showDialog(success ? DIALOG_FINISHED_DELETING_ID : DIALOG_ERROR_DELETING_ID);
+        }
+    }
+
+    @Override
+    protected Dialog onCreateDialog(int id, Bundle args) {
+        switch (id) {
+            case DIALOG_DELETING_ID:
+                ProgressDialog dialog = new ProgressDialog(BitmapDeletionActivity.this);
+                dialog.setMessage(getString(R.string.deleting_bitmaps));
+                return dialog;
+
+            case DIALOG_FINISHED_DELETING_ID:
+                return createFinishingDialog(R.string.deleting_bitmaps_finished);
+
+            case DIALOG_ERROR_DELETING_ID:
+                return createFinishingDialog(R.string.deleting_bitmaps_error);
+
+            default:
+                return super.onCreateDialog(id, args);
+        }
+    }
+
+    private AlertDialog createFinishingDialog(int message) {
+        DialogInterface.OnClickListener finishListener =
+                new DialogInterface.OnClickListener() {
+                    @Override
+                    public void onClick(DialogInterface dialog, int which) {
+                        finish();
+                    }
+                };
+        return new AlertDialog.Builder(BitmapDeletionActivity.this)
+                .setMessage(message)
+                .setCancelable(false)
+                .setPositiveButton(android.R.string.ok, finishListener)
+                .create();
+    }
+}
diff --git a/tests/tests/holo/src/android/holo/cts/DisplayInfoActivity.java b/tests/tests/holo/src/android/holo/cts/DisplayInfoActivity.java
new file mode 100644
index 0000000..a11179a
--- /dev/null
+++ b/tests/tests/holo/src/android/holo/cts/DisplayInfoActivity.java
@@ -0,0 +1,66 @@
+/*
+ * Copyright (C) 2011 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package android.holo.cts;
+
+import com.android.cts.holo.R;
+
+import android.app.Activity;
+import android.os.Bundle;
+import android.util.DisplayMetrics;
+import android.view.Display;
+import android.view.WindowManager;
+import android.widget.TextView;
+
+public class DisplayInfoActivity extends Activity {
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.display_info);
+
+        WindowManager windowManager = (WindowManager) getSystemService(WINDOW_SERVICE);
+        Display display = windowManager.getDefaultDisplay();
+        DisplayMetrics metrics = new DisplayMetrics();
+        display.getMetrics(metrics);
+
+        TextView text = (TextView) findViewById(R.id.text);
+        text.setText(getString(R.string.display_info_text, metrics.densityDpi,
+                getScreenDensityBucket(metrics)));
+    }
+
+    private String getScreenDensityBucket(DisplayMetrics metrics) {
+        switch (metrics.densityDpi) {
+            case DisplayMetrics.DENSITY_LOW:
+                return "ldpi";
+
+            case DisplayMetrics.DENSITY_MEDIUM:
+                return "mdpi";
+
+            case DisplayMetrics.DENSITY_HIGH:
+                return "hdpi";
+
+            case DisplayMetrics.DENSITY_XHIGH:
+                return "xdpi";
+
+            case DisplayMetrics.DENSITY_TV:
+                return "tvdpi";
+
+            default:
+                return "" + metrics.densityDpi;
+        }
+    }
+}
diff --git a/tests/tests/holo/src/android/holo/cts/HoloTest.java b/tests/tests/holo/src/android/holo/cts/HoloTest.java
new file mode 100644
index 0000000..f3e7e63
--- /dev/null
+++ b/tests/tests/holo/src/android/holo/cts/HoloTest.java
@@ -0,0 +1,148 @@
+/*
+ * Copyright (C) 2011 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package android.holo.cts;
+
+import android.content.Intent;
+import android.holo.cts.ThemeTestActivity.Result;
+import android.test.ActivityInstrumentationTestCase2;
+
+/** Tests for the Holo theme. */
+public class HoloTest extends ActivityInstrumentationTestCase2<ThemeTestActivity> {
+
+    /*
+     * The tests take a long time, so the test is sharded into separate themes.
+     */
+
+    public HoloTest() {
+        super(ThemeTestActivity.class);
+    }
+
+    public void testHolo() throws Exception {
+        runThemeTest(0);
+    }
+
+    public void testHoloDialog() throws Exception {
+        runThemeTest(1);
+    }
+
+    public void testHoloDialogMinimumWidth() throws Exception {
+        runThemeTest(2);
+    }
+
+    public void testHoloDialogNoActionBar() throws Exception {
+        runThemeTest(3);
+    }
+
+    public void testHoloDialogNoActionBarMinimumWidth() throws Exception {
+        runThemeTest(4);
+    }
+
+    public void testHoloDialogWhenLarge() throws Exception {
+        runThemeTest(5);
+    }
+
+    public void testHoloDialogWhenLargeNoActionBar() throws Exception {
+        runThemeTest(6);
+    }
+
+    public void testHoloInputMethod() throws Exception {
+        runThemeTest(7);
+    }
+
+    public void testHoloLight() throws Exception {
+        runThemeTest(8);
+    }
+
+    public void testHoloLightDarkActionBar() throws Exception {
+        runThemeTest(9);
+    }
+
+    public void testHoloLightDialog() throws Exception {
+        runThemeTest(10);
+    }
+
+    public void testHoloLightDialogMinimumWidth() throws Exception {
+        runThemeTest(11);
+    }
+
+    public void testHoloLightDialogNoActionBar() throws Exception {
+        runThemeTest(12);
+    }
+
+    public void testHoloLightDialogNoActionBarMinimumWidth() throws Exception {
+        runThemeTest(13);
+    }
+
+    public void testHoloLightDialogWhenLarge() throws Exception {
+        runThemeTest(14);
+    }
+
+    public void testHoloLightDialogWhenLargeNoActionBar() throws Exception {
+        runThemeTest(15);
+    }
+
+    public void testHoloLightNoActionBar() throws Exception {
+        runThemeTest(16);
+    }
+
+    public void testHoloLightNoActionBarFullscreen() throws Exception {
+        runThemeTest(17);
+    }
+
+    public void testHoloLightPanel() throws Exception {
+        runThemeTest(18);
+    }
+
+    public void testHoloNoActionBar() throws Exception {
+        runThemeTest(19);
+    }
+
+    public void testHoloNoActionBarFullscreen() throws Exception {
+        runThemeTest(20);
+    }
+
+    public void testHoloPanel() throws Exception {
+        runThemeTest(21);
+    }
+
+    public void testHoloWallpaper() throws Exception {
+        runThemeTest(22);
+    }
+
+    public void testHoloWallpaperNoTitleBar() throws Exception {
+        runThemeTest(23);
+    }
+
+    private void runThemeTest(int themeIndex) throws Exception {
+        Intent intent = new Intent();
+        intent.putExtra(ThemeTestActivity.EXTRA_TASK, ThemeTestActivity.TASK_COMPARE_BITMAPS);
+        intent.putExtra(ThemeTestActivity.EXTRA_THEME_INDEX, themeIndex);
+        intent.putExtra(ThemeTestActivity.EXTRA_LAYOUT_ADAPTER_MODE, LayoutAdapter.MODE_TESTING);
+        setActivityIntent(intent);
+
+        // Enable touch mode or else widgets will be highlighted causing bitmap
+        // comparison failures.
+        setActivityInitialTouchMode(true);
+
+        ThemeTestActivity activity = getActivity();
+        Result result = activity.getResultFuture().get();
+        assertTrue("Failed bitmap names: " + result.getFailedBitmapNames()
+                + " Check " + BitmapAssets.getBitmapDir(BitmapAssets.TYPE_FAILED)
+                + " and " + BitmapAssets.getBitmapDir(BitmapAssets.TYPE_DIFF) + " for details."
+                , result.passed());
+    }
+}
diff --git a/tests/tests/holo/src/android/holo/cts/HoloTestUtilitiesActivity.java b/tests/tests/holo/src/android/holo/cts/HoloTestUtilitiesActivity.java
new file mode 100644
index 0000000..3092490
--- /dev/null
+++ b/tests/tests/holo/src/android/holo/cts/HoloTestUtilitiesActivity.java
@@ -0,0 +1,149 @@
+/*
+ * Copyright (C) 2011 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package android.holo.cts;
+
+import com.android.cts.holo.R;
+
+import android.app.ListActivity;
+import android.content.Intent;
+import android.os.Bundle;
+import android.view.View;
+import android.widget.ArrayAdapter;
+import android.widget.ListView;
+
+/**
+ * {@link ListActivity} with helpful utilities like viewing the layout tests
+ * and generating the reference assets that can be packaged back into the
+ * test APK.
+ */
+public class HoloTestUtilitiesActivity extends ListActivity {
+
+    private static final int TASK_VIEW_DISPLAY_INFO = 0;
+    private static final int TASK_VIEW_TESTS = 1;
+    private static final int TASK_GENERATE_ONE_BITMAP = 2;
+    private static final int TASK_GENERATE_ALL_BITMAPS = 3;
+    private static final int TASK_CLEAR_REFERENCE_BITMAPS = 4;
+    private static final int TASK_CLEAR_FAILED_BITMAPS = 5;
+    private static final int TASK_CLEAR_DIFF_BITMAPS = 6;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        ArrayAdapter<Task> taskAdapter = new ArrayAdapter<Task>(this,
+                android.R.layout.simple_list_item_1);
+        taskAdapter.add(new Task(R.string.task_view_display_info, TASK_VIEW_DISPLAY_INFO));
+        taskAdapter.add(new Task(R.string.task_view_tests, TASK_VIEW_TESTS));
+        taskAdapter.add(new Task(R.string.task_generate_one_bitmap, TASK_GENERATE_ONE_BITMAP));
+        taskAdapter.add(new Task(R.string.task_generate_all_bitmaps, TASK_GENERATE_ALL_BITMAPS));
+        taskAdapter.add(new Task(R.string.task_clear_reference_bitmaps,
+                TASK_CLEAR_REFERENCE_BITMAPS));
+        taskAdapter.add(new Task(R.string.task_clear_failure_bitmaps,
+                TASK_CLEAR_FAILED_BITMAPS));
+        taskAdapter.add(new Task(R.string.task_clear_diff_bitmaps,
+                TASK_CLEAR_DIFF_BITMAPS));
+        setListAdapter(taskAdapter);
+    }
+
+    class Task {
+        private final int mTextId;
+        private final int mTaskId;
+
+        private Task(int textId, int taskId) {
+            mTextId = textId;
+            mTaskId = taskId;
+        }
+
+        @Override
+        public String toString() {
+            return getString(mTextId);
+        }
+    }
+
+    @SuppressWarnings("unchecked")
+    @Override
+    public ArrayAdapter<Task> getListAdapter() {
+        return (ArrayAdapter<Task>) super.getListAdapter();
+    }
+
+    @Override
+    protected void onListItemClick(ListView listView, View view, int position, long id) {
+        Task task = getListAdapter().getItem(position);
+        switch (task.mTaskId) {
+            case TASK_VIEW_DISPLAY_INFO:
+                viewDisplayInfo();
+                break;
+
+            case TASK_VIEW_TESTS:
+                viewTests();
+                break;
+
+            case TASK_GENERATE_ONE_BITMAP:
+                generateSingleTestBitmaps();
+                break;
+
+            case TASK_GENERATE_ALL_BITMAPS:
+                generateAllBitmaps();
+                break;
+
+            case TASK_CLEAR_REFERENCE_BITMAPS:
+                clearBitmaps(BitmapAssets.TYPE_REFERENCE);
+                break;
+
+            case TASK_CLEAR_FAILED_BITMAPS:
+                clearBitmaps(BitmapAssets.TYPE_FAILED);
+                break;
+
+            case TASK_CLEAR_DIFF_BITMAPS:
+                clearBitmaps(BitmapAssets.TYPE_DIFF);
+                break;
+
+            default:
+                throw new IllegalArgumentException("Bad task id: " + task.mTaskId);
+        }
+    }
+
+    private void viewDisplayInfo() {
+        Intent intent = new Intent(this, DisplayInfoActivity.class);
+        startActivity(intent);
+    }
+
+    private void viewTests() {
+        Intent intent = new Intent(this, ThemePickerActivity.class);
+        intent.putExtra(ThemePickerActivity.EXTRA_TASK, ThemeTestActivity.TASK_VIEW_LAYOUTS);
+        startActivity(intent);
+    }
+
+    private void generateSingleTestBitmaps() {
+        Intent intent = new Intent(this, LayoutPickerActivity.class);
+        intent.putExtra(ThemePickerActivity.EXTRA_TASK, ThemeTestActivity.TASK_GENERATE_BITMAPS);
+        startActivity(intent);
+    }
+
+    private void generateAllBitmaps() {
+        Intent intent = new Intent(this, ThemeTestActivity.class);
+        intent.putExtra(ThemeTestActivity.EXTRA_TASK, ThemeTestActivity.TASK_GENERATE_BITMAPS);
+        intent.putExtra(ThemeTestActivity.EXTRA_LAYOUT_ADAPTER_MODE, LayoutAdapter.MODE_TESTING);
+        startActivity(intent);
+    }
+
+    private void clearBitmaps(int type) {
+        Intent intent = new Intent(this, BitmapDeletionActivity.class);
+        intent.putExtra(BitmapDeletionActivity.EXTRA_BITMAP_TYPE, type);
+        startActivity(intent);
+    }
+}
diff --git a/tests/tests/holo/src/android/holo/cts/LayoutAdapter.java b/tests/tests/holo/src/android/holo/cts/LayoutAdapter.java
new file mode 100644
index 0000000..5e10b38
--- /dev/null
+++ b/tests/tests/holo/src/android/holo/cts/LayoutAdapter.java
@@ -0,0 +1,352 @@
+/*
+ * Copyright (C) 2011 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package android.holo.cts;
+
+import com.android.cts.holo.R;
+
+import android.holo.cts.modifiers.CalendarViewModifier;
+import android.holo.cts.modifiers.SearchViewModifier;
+import android.holo.cts.modifiers.TabHostModifier;
+import android.holo.cts.modifiers.TimePickerModifier;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.BaseAdapter;
+import android.widget.TextView;
+
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.List;
+
+/**
+ * {@link BaseAdapter} for all the layouts used to test the Holo theme.
+ */
+class LayoutAdapter extends BaseAdapter {
+
+    /** Mode where we are just viewing all the layouts. */
+    static final int MODE_VIEWING = 0;
+
+    /** Mode where we are testing and may not include some layouts based on the device state. */
+    static final int MODE_TESTING = 1;
+
+    /** No timeout for widgets in layouts that aren't changed after inflation.  */
+    private static final int NO_TIMEOUT_MS = 0;
+
+    /** Small timeout for letting things like button presses to be handled. */
+    private static final int SHORT_TIMEOUT_MS = 500;
+
+    /** Longer timeout for widgets that have one-time animations. */
+    private static final int LONG_TIMEOUT_MS = 3000;
+
+    static class LayoutInfo {
+        private final int mDisplayName;
+        private final String mFileName;
+        private final int mLayout;
+        private final LayoutModifier mModifier;
+        private final long mTimeoutMs;
+
+        private LayoutInfo(int displayName, String fileName, int layout, LayoutModifier modifier,
+                long timeoutMs) {
+            mDisplayName = displayName;
+            mFileName = fileName;
+            mLayout = layout;
+            mModifier = modifier;
+            mTimeoutMs = timeoutMs;
+        }
+
+        /** @return file name to use for creating reference and failure bitmaps. */
+        public String getBitmapName() {
+            return mFileName;
+        }
+
+        /** @return layout that will be inflated and captured to a bitmap */
+        public int getLayout() {
+            return mLayout;
+        }
+
+        /** @return whether or non the layout has a layout modifier */
+        public boolean hasModifier() {
+            return mModifier != null;
+        }
+
+        /** @return null or modifier that will manipulate the layout after it is inflated */
+        public LayoutModifier getModifier() {
+            return mModifier;
+        }
+
+        /** @return timeout before taking a snapshot of the layout */
+        public long getTimeoutMs() {
+            return mTimeoutMs;
+        }
+    }
+
+    private final List<LayoutInfo> mLayoutInfos = new ArrayList<LayoutInfo>();
+
+    private final LayoutInflater mInflater;
+
+    LayoutAdapter(LayoutInflater inflater, int adapterMode) {
+        mInflater = inflater;
+
+        // Widgets
+
+        addLayout(R.string.button, "button",
+                R.layout.button, null, NO_TIMEOUT_MS);
+
+//        addLayout(R.string.button_pressed, "button_pressed",
+//                R.layout.button, new ViewPressedModifier(), LONG_TIMEOUT_MS);
+
+        addCalendarLayouts(adapterMode);
+
+        addLayout(R.string.checkbox, "checkbox",
+                R.layout.checkbox, null, NO_TIMEOUT_MS);
+
+        addLayout(R.string.checkbox_checked, "checkbox_checked",
+                R.layout.checkbox_checked, null, SHORT_TIMEOUT_MS);
+
+        addLayout(R.string.chronometer, "chronometer",
+                R.layout.chronometer, null, NO_TIMEOUT_MS);
+
+        // TODO: DatePicker has a blinking cursor that can be captured in the bitmap...
+        // addLayout(R.string.datepicker, "datepicker",
+        //        R.layout.datepicker, new DatePickerModifier(), LONG_TIMEOUT_MS);
+
+        addLayout(R.string.edittext, "edittext",
+                R.layout.edittext, null, NO_TIMEOUT_MS);
+
+        addLayout(R.string.progressbar, "progressbar",
+                R.layout.progressbar, null, NO_TIMEOUT_MS);
+
+        addLayout(R.string.progressbar_small, "progressbar_small",
+                R.layout.progressbar_small, null, NO_TIMEOUT_MS);
+
+        addLayout(R.string.progressbar_large, "progressbar_large",
+                R.layout.progressbar_large, null, NO_TIMEOUT_MS);
+
+        addLayout(R.string.progressbar_horizontal_0, "progressbar_horizontal_0",
+                R.layout.progressbar_horizontal_0, null, NO_TIMEOUT_MS);
+
+        addLayout(R.string.progressbar_horizontal_50, "progressbar_horizontal_50",
+                R.layout.progressbar_horizontal_50, null, NO_TIMEOUT_MS);
+
+        addLayout(R.string.progressbar_horizontal_100, "progressbar_horizontal_100",
+                R.layout.progressbar_horizontal_100, null, NO_TIMEOUT_MS);
+
+        addLayout(R.string.radiobutton, "radio_button",
+                R.layout.radiobutton, null, NO_TIMEOUT_MS);
+
+        addLayout(R.string.radiobutton_checked, "radio_button_checked",
+                R.layout.radiobutton_checked, null, NO_TIMEOUT_MS);
+
+        addLayout(R.string.radiogroup_horizontal, "radiogroup_horizontal",
+                R.layout.radiogroup_horizontal, null, NO_TIMEOUT_MS);
+
+        addLayout(R.string.radiogroup_vertical, "radiogroup_vertical",
+                R.layout.radiogroup_vertical, null, NO_TIMEOUT_MS);
+
+        addLayout(R.string.ratingbar_0, "ratingbar_0",
+                R.layout.ratingbar_0, null, NO_TIMEOUT_MS);
+
+        addLayout(R.string.ratingbar_2point5, "ratingbar_2point5",
+                R.layout.ratingbar_2point5, null, NO_TIMEOUT_MS);
+
+        addLayout(R.string.ratingbar_5, "ratingbar_5",
+                R.layout.ratingbar_5, null, NO_TIMEOUT_MS);
+
+//        addLayout(R.string.ratingbar_0_pressed, "ratingbar_0_pressed",
+//                R.layout.ratingbar_0, new ViewPressedModifier(), LONG_TIMEOUT_MS);
+
+//        addLayout(R.string.ratingbar_2point5_pressed, "ratingbar_2point5_pressed",
+//                R.layout.ratingbar_2point5, new ViewPressedModifier(), LONG_TIMEOUT_MS);
+
+//        addLayout(R.string.ratingbar_5_pressed, "ratingbar_5_pressed",
+//                R.layout.ratingbar_5, new ViewPressedModifier(), LONG_TIMEOUT_MS);
+
+        addLayout(R.string.searchview, "searchview",
+                R.layout.searchview, null, NO_TIMEOUT_MS);
+
+        addLayout(R.string.searchview_query, "searchview_query",
+                R.layout.searchview, new SearchViewModifier(SearchViewModifier.QUERY),
+                SHORT_TIMEOUT_MS);
+
+        addLayout(R.string.searchview_query_hint, "searchview_query_hint",
+                R.layout.searchview, new SearchViewModifier(SearchViewModifier.QUERY_HINT),
+                SHORT_TIMEOUT_MS);
+
+        addLayout(R.string.seekbar_0, "seekbar_0",
+                R.layout.seekbar_0, null, NO_TIMEOUT_MS);
+
+        addLayout(R.string.seekbar_50, "seekbar_50",
+                R.layout.seekbar_50, null, NO_TIMEOUT_MS);
+
+        addLayout(R.string.seekbar_100, "seekbar_100",
+                R.layout.seekbar_100, null, NO_TIMEOUT_MS);
+
+        addLayout(R.string.spinner, "spinner",
+                R.layout.spinner, null, NO_TIMEOUT_MS);
+
+        addLayout(R.string.switch_button, "switch",
+                R.layout.switch_button, null, NO_TIMEOUT_MS);
+
+        addLayout(R.string.switch_button_checked, "switch_checked",
+                R.layout.switch_button_checked, null, NO_TIMEOUT_MS);
+
+        addLayout(R.string.tabhost, "tabhost",
+                R.layout.tabhost, new TabHostModifier(), SHORT_TIMEOUT_MS);
+
+        addLayout(R.string.textview, "textview",
+                R.layout.textview, null, NO_TIMEOUT_MS);
+
+        addLayout(R.string.timepicker, "timepicker",
+                R.layout.timepicker, new TimePickerModifier(), LONG_TIMEOUT_MS);
+
+        addLayout(R.string.togglebutton, "toggle_button",
+                R.layout.togglebutton, null, NO_TIMEOUT_MS);
+
+        addLayout(R.string.togglebutton_checked, "toggle_button_checked",
+                R.layout.togglebutton_checked, null, NO_TIMEOUT_MS);
+
+        addLayout(R.string.zoomcontrols, "zoomcontrols",
+                R.layout.zoomcontrols, null, NO_TIMEOUT_MS);
+
+        // Dialogs
+
+
+        // TODO: Dialogs are changing sizes depending on screen sizes, so we can't test these.
+
+//        addLayout(R.string.alertdialog_onebutton, "alertdialog_onebutton", R.layout.empty,
+//                new DialogModifier(new AlertDialogBuilder(AlertDialogBuilder.ONE_BUTTON)),
+//                SHORT_TIMEOUT_MS);
+//
+//        addLayout(R.string.alertdialog_twobuttons, "alertdialog_twobuttons", R.layout.empty,
+//                new DialogModifier(new AlertDialogBuilder(AlertDialogBuilder.TWO_BUTTONS)),
+//                SHORT_TIMEOUT_MS);
+//
+//        addLayout(R.string.alertdialog_threebuttons, "alertdialog_threebuttons", R.layout.empty,
+//                new DialogModifier(new AlertDialogBuilder(AlertDialogBuilder.THREE_BUTTONS)),
+//                SHORT_TIMEOUT_MS);
+//
+//        addLayout(R.string.alertdialog_list, "alertdialog_list", R.layout.empty,
+//                new DialogModifier(new AlertDialogBuilder(AlertDialogBuilder.LIST)),
+//                SHORT_TIMEOUT_MS);
+//
+//        addLayout(R.string.alertdialog_singlechoice, "alertdialog_singlechoice", R.layout.empty,
+//                new DialogModifier(new AlertDialogBuilder(AlertDialogBuilder.SINGLE_CHOICE)),
+//                SHORT_TIMEOUT_MS);
+//
+//        addLayout(R.string.alertdialog_multichoice, "alertdialog_multichoice", R.layout.empty,
+//                new DialogModifier(new AlertDialogBuilder(AlertDialogBuilder.MULTI_CHOICE)),
+//                SHORT_TIMEOUT_MS);
+
+        // TODO: We can't test the spinner, because there is no way to halt the animation.
+        // addLayout(R.string.progressdialog_spinner, "progressdialog_spinner", R.layout.empty,
+        //      new DialogModifier(new ProgressDialogBuilder(ProgressDialog.STYLE_SPINNER)));
+
+//        addLayout(R.string.progressdialog_horizontal, "progressdialog_horizontal", R.layout.empty,
+//                new DialogModifier(new ProgressDialogBuilder(ProgressDialog.STYLE_HORIZONTAL)),
+//                SHORT_TIMEOUT_MS);
+
+        // Colors
+
+        addLayout(R.string.color_blue_bright, "color_blue_bright",
+                R.layout.color_blue_bright, null, NO_TIMEOUT_MS);
+
+        addLayout(R.string.color_blue_dark, "color_blue_dark",
+                R.layout.color_blue_dark, null, NO_TIMEOUT_MS);
+
+        addLayout(R.string.color_blue_light, "color_blue_light",
+                R.layout.color_blue_light, null, NO_TIMEOUT_MS);
+
+        addLayout(R.string.color_green_dark, "color_green_dark",
+                R.layout.color_green_dark, null, NO_TIMEOUT_MS);
+
+        addLayout(R.string.color_green_light, "color_green_light",
+                R.layout.color_green_light, null, NO_TIMEOUT_MS);
+
+        addLayout(R.string.color_orange_dark, "color_orange_dark",
+                R.layout.color_orange_dark, null, NO_TIMEOUT_MS);
+
+        addLayout(R.string.color_orange_light, "color_orange_light",
+                R.layout.color_orange_light, null, NO_TIMEOUT_MS);
+
+        addLayout(R.string.color_purple, "color_purple",
+                R.layout.color_purple, null, NO_TIMEOUT_MS);
+
+        addLayout(R.string.color_red_dark, "color_red_dark",
+                R.layout.color_red_dark, null, NO_TIMEOUT_MS);
+
+        addLayout(R.string.color_red_light, "color_red_light",
+                R.layout.color_red_light, null, NO_TIMEOUT_MS);
+    }
+
+    private void addLayout(int displayName, String fileName, int layout, LayoutModifier modifier,
+            long timeoutMs) {
+        addLayout(new LayoutInfo(displayName, fileName, layout, modifier, timeoutMs));
+    }
+
+    private void addLayout(LayoutInfo info) {
+        mLayoutInfos.add(info);
+    }
+
+    private void addCalendarLayouts(int adapterMode) {
+        if (adapterMode == MODE_VIEWING || !CalendarViewModifier.isMonth(Calendar.JANUARY)) {
+            addLayout(getCalendarLayoutInfo());
+        }
+
+        if (adapterMode == MODE_VIEWING || !CalendarViewModifier.isMonth(Calendar.FEBRUARY)) {
+            addLayout(getFebruaryCalendarLayoutInfo());
+        }
+    }
+
+    private LayoutInfo getCalendarLayoutInfo() {
+        return new LayoutInfo(R.string.calendarview_jan, "calendar_view",
+            R.layout.calendarview, new CalendarViewModifier(true), SHORT_TIMEOUT_MS);
+    }
+
+    private LayoutInfo getFebruaryCalendarLayoutInfo() {
+        return new LayoutInfo(R.string.calendarview_feb, "calendar_view_feb",
+            R.layout.calendarview, new CalendarViewModifier(false), SHORT_TIMEOUT_MS);
+    }
+
+    @Override
+    public int getCount() {
+        return mLayoutInfos.size();
+    }
+
+    @Override
+    public LayoutInfo getItem(int position) {
+        return mLayoutInfos.get(position);
+    }
+
+    @Override
+    public long getItemId(int position) {
+        return getItem(position).mLayout;
+    }
+
+    @Override
+    public View getView(int position, View convertView, ViewGroup parent) {
+        TextView textView;
+        if (convertView != null) {
+            textView = (TextView) convertView;
+        } else {
+            textView = (TextView) mInflater.inflate(android.R.layout.simple_list_item_1,
+                    parent, false);
+        }
+        LayoutInfo layoutInfo = getItem(position);
+        textView.setText(layoutInfo.mDisplayName);
+        return textView;
+    }
+}
diff --git a/tests/tests/holo/src/android/holo/cts/LayoutModifier.java b/tests/tests/holo/src/android/holo/cts/LayoutModifier.java
new file mode 100644
index 0000000..8a9d41d
--- /dev/null
+++ b/tests/tests/holo/src/android/holo/cts/LayoutModifier.java
@@ -0,0 +1,34 @@
+/*
+ * Copyright (C) 2011 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package android.holo.cts;
+
+import android.view.View;
+
+/**
+ * Interface used to do further setup on a view after it has been inflated.
+ */
+public interface LayoutModifier {
+
+    /** Actions to take before inflating the view. */
+    void prepare();
+
+    /**
+     * @param view inflated by the test activity
+     * @return the same view or another view that will be snapshotted by the test
+     */
+    View modifyView(View view);
+}
diff --git a/tests/tests/holo/src/android/holo/cts/LayoutPickerActivity.java b/tests/tests/holo/src/android/holo/cts/LayoutPickerActivity.java
new file mode 100644
index 0000000..f808d59
--- /dev/null
+++ b/tests/tests/holo/src/android/holo/cts/LayoutPickerActivity.java
@@ -0,0 +1,53 @@
+/*
+ * Copyright (C) 2011 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package android.holo.cts;
+
+import android.app.ListActivity;
+import android.content.Intent;
+import android.os.Bundle;
+import android.view.View;
+import android.widget.ListView;
+
+/**
+ * {@link ListActivity} for picking layouts. Used by the Holo Test Utilities activity.
+ */
+public class LayoutPickerActivity extends ListActivity {
+
+    static final String EXTRA_THEME_INDEX = "themeIndex";
+    static final String EXTRA_TASK = "task";
+
+    private int mThemeIndex;
+    private int mTestTask;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        mThemeIndex = getIntent().getIntExtra(EXTRA_THEME_INDEX, -1);
+        mTestTask = getIntent().getIntExtra(EXTRA_TASK, -1);
+        setListAdapter(new LayoutAdapter(getLayoutInflater(), LayoutAdapter.MODE_VIEWING));
+    }
+
+    @Override
+    protected void onListItemClick(ListView l, View v, int position, long id) {
+        Intent intent = new Intent(this, ThemeTestActivity.class);
+        intent.putExtra(ThemeTestActivity.EXTRA_THEME_INDEX, mThemeIndex);
+        intent.putExtra(ThemeTestActivity.EXTRA_LAYOUT_INDEX, position);
+        intent.putExtra(ThemeTestActivity.EXTRA_TASK, mTestTask);
+        intent.putExtra(ThemeTestActivity.EXTRA_LAYOUT_ADAPTER_MODE, LayoutAdapter.MODE_VIEWING);
+        startActivity(intent);
+    }
+}
diff --git a/tests/tests/holo/src/android/holo/cts/LayoutTestActivity.java b/tests/tests/holo/src/android/holo/cts/LayoutTestActivity.java
new file mode 100644
index 0000000..c908a64
--- /dev/null
+++ b/tests/tests/holo/src/android/holo/cts/LayoutTestActivity.java
@@ -0,0 +1,260 @@
+/*
+ * Copyright (C) 2011 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package android.holo.cts;
+
+import com.android.cts.holo.R;
+
+import android.app.Activity;
+import android.content.Intent;
+import android.graphics.Bitmap;
+import android.graphics.Canvas;
+import android.graphics.Color;
+import android.holo.cts.LayoutAdapter.LayoutInfo;
+import android.holo.cts.ThemeAdapter.ThemeInfo;
+import android.os.AsyncTask;
+import android.os.Bundle;
+import android.util.Log;
+import android.view.View;
+import android.widget.Toast;
+
+import java.io.FileNotFoundException;
+import java.io.IOException;
+
+/**
+ * {@link Activity} that applies a theme, inflates a layout, and then either
+ * compares or generates a bitmap of the layout.
+ */
+public class LayoutTestActivity extends Activity {
+
+    private static final String TAG = LayoutTestActivity.class.getSimpleName();
+
+    // Input extras
+    static final String EXTRA_THEME_INDEX = "themeIndex";
+    static final String EXTRA_LAYOUT_INDEX = "layoutIndex";
+    static final String EXTRA_TASK = "task";
+    static final String EXTRA_LAYOUT_ADAPTER_MODE = "layoutAdapterMode";
+
+    // Output extras
+    static final String EXTRA_BITMAP_NAME = "bitmapName";
+    static final String EXTRA_MESSAGE = "message";
+    static final String EXTRA_SUCCESS = "success";
+
+    private View mTestView;
+    private String mBitmapName;
+
+    private ReferenceViewGroup mViewGroup;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        int themeIndex = getIntent().getIntExtra(EXTRA_THEME_INDEX, -1);
+        int layoutIndex = getIntent().getIntExtra(EXTRA_LAYOUT_INDEX, -1);
+        int layoutMode = getIntent().getIntExtra(EXTRA_LAYOUT_ADAPTER_MODE, -1);
+        int task = getIntent().getIntExtra(EXTRA_TASK, -1);
+
+        ThemeAdapter themeAdapter = new ThemeAdapter(getLayoutInflater());
+        LayoutAdapter layoutAdapter = new LayoutAdapter(getLayoutInflater(), layoutMode);
+
+        ThemeInfo themeInfo = themeAdapter.getItem(themeIndex);
+        LayoutInfo layoutInfo = layoutAdapter.getItem(layoutIndex);
+        mBitmapName = BitmapAssets.getBitmapName(themeInfo, layoutInfo);
+
+        setTheme(themeInfo.getTheme());
+        setContentView(R.layout.holo_test);
+
+        if (layoutInfo.hasModifier()) {
+            layoutInfo.getModifier().prepare();
+        }
+
+        // Inflate the view in our special view group that is fixed at a certain size
+        // and layout the inflated view with the fixed measurements...
+        mViewGroup = (ReferenceViewGroup) findViewById(R.id.reference_view_group);
+        mTestView = getLayoutInflater().inflate(layoutInfo.getLayout(), mViewGroup, false);
+        mViewGroup.addView(mTestView);
+        if (layoutInfo.hasModifier()) {
+            mTestView = layoutInfo.getModifier().modifyView(mTestView);
+        }
+        mViewGroup.measure(0,  0);
+        mViewGroup.layout(0, 0, mViewGroup.getMeasuredWidth(), mViewGroup.getMeasuredHeight());
+        mTestView.setFocusable(false);
+
+        switch (task) {
+            case ThemeTestActivity.TASK_VIEW_LAYOUTS:
+                break;
+
+            case ThemeTestActivity.TASK_GENERATE_BITMAPS:
+                mTestView.postDelayed(new GenerateBitmapRunnable(), layoutInfo.getTimeoutMs());
+                break;
+
+            case ThemeTestActivity.TASK_COMPARE_BITMAPS:
+                mTestView.postDelayed(new CompareBitmapRunnable(), layoutInfo.getTimeoutMs());
+                break;
+        }
+    }
+
+    class GenerateBitmapRunnable implements Runnable {
+        @Override
+        public void run() {
+            new GenerateBitmapTask().execute();
+        }
+    }
+
+    class CompareBitmapRunnable implements Runnable {
+        @Override
+        public void run() {
+            new CompareBitmapTask().execute();
+        }
+    }
+
+    class GenerateBitmapTask extends AsyncTask<Void, Void, Boolean> {
+
+        private Bitmap mBitmap;
+
+        @Override
+        protected void onPreExecute() {
+            super.onPreExecute();
+            mBitmap = getBitmap();
+        }
+
+        @Override
+        protected Boolean doInBackground(Void... avoid) {
+            try {
+                return saveBitmap(mBitmap, BitmapAssets.TYPE_REFERENCE) != null;
+            } finally {
+                mBitmap.recycle();
+                mBitmap = null;
+            }
+        }
+
+        @Override
+        protected void onPostExecute(Boolean success) {
+            String path = BitmapAssets.getBitmapPath(mBitmapName,
+                    BitmapAssets.TYPE_REFERENCE).toString();
+            String message = path != null
+                    ? getString(R.string.generate_bitmap_success, path)
+                    : getString(R.string.generate_bitmap_failure, path);
+            Toast.makeText(getApplicationContext(), message, Toast.LENGTH_SHORT).show();
+            finishWithResult(success, message);
+        }
+    }
+
+    class CompareBitmapTask extends AsyncTask<Void, Void, String[]> {
+        private Bitmap mBitmap;
+        private Bitmap mReferenceBitmap;
+        private boolean mSame;
+
+        @Override
+        protected void onPreExecute() {
+            mBitmap = getBitmap();
+            mReferenceBitmap = BitmapAssets.getBitmap(getApplicationContext(), mBitmapName);
+            mSame = mBitmap.sameAs(mReferenceBitmap);
+        }
+
+        @Override
+        protected String[] doInBackground(Void... devoid) {
+            try {
+                if (!mSame) {
+                    String[] paths = new String[2];
+                    paths[0] = saveDiffBitmap(mBitmap, mReferenceBitmap);
+                    paths[1] = saveBitmap(mBitmap, BitmapAssets.TYPE_FAILED);
+                    return paths;
+                } else {
+                    return null;
+                }
+            } finally {
+                mReferenceBitmap.recycle();
+                mReferenceBitmap = null;
+
+                mBitmap.recycle();
+                mBitmap = null;
+            }
+        }
+
+        private String saveDiffBitmap(Bitmap bitmap1, Bitmap bitmap2) {
+            int width = Math.max(bitmap1.getWidth(), bitmap2.getWidth());
+            int height = Math.max(bitmap1.getHeight(), bitmap2.getHeight());
+            Bitmap diff = Bitmap.createBitmap(width, height, Bitmap.Config.ARGB_8888);
+
+            try {
+                for (int i = 0; i < width; i++) {
+                    for (int j = 0; j < height; j++) {
+                        boolean inBounds1 = i < bitmap1.getWidth() && j < bitmap1.getHeight();
+                        boolean inBounds2 = i < bitmap2.getWidth() && j < bitmap2.getHeight();
+                        int color;
+
+                        if (inBounds1 && inBounds2) {
+                            int color1 = bitmap1.getPixel(i, j);
+                            int color2 = bitmap2.getPixel(i, j);
+                            color = color1 == color2 ? color1 : Color.RED;
+                        } else if (inBounds1 && !inBounds2) {
+                            color = Color.BLUE;
+                        } else if (!inBounds1 && inBounds2) {
+                            color = Color.GREEN;
+                        } else {
+                            color = Color.MAGENTA;
+                        }
+                        diff.setPixel(i, j, color);
+                    }
+                }
+
+                return saveBitmap(diff, BitmapAssets.TYPE_DIFF);
+            } finally {
+                diff.recycle();
+            }
+        }
+
+        @Override
+        protected void onPostExecute(String[] paths) {
+            String message = mSame
+                    ? getString(R.string.comparison_success)
+                    : getString(R.string.comparison_failure, paths[0], paths[1]);
+            finishWithResult(mSame, message);
+        }
+    }
+
+    private Bitmap getBitmap() {
+        Log.i(TAG, "Getting bitmap for " + mBitmapName);
+        Bitmap bitmap = Bitmap.createBitmap(mTestView.getWidth(), mTestView.getHeight(),
+                Bitmap.Config.ARGB_8888);
+        Canvas canvas = new Canvas(bitmap);
+        mTestView.draw(canvas);
+        return bitmap;
+    }
+
+    private String saveBitmap(Bitmap bitmap, int type) {
+        try {
+            Log.i(TAG, "Saving bitmap for " + mBitmapName);
+            return BitmapAssets.saveBitmap(bitmap, mBitmapName, type);
+        } catch (FileNotFoundException e) {
+            Log.e(TAG, "FileNotFoundException while saving " + mBitmapName, e);
+            return null;
+        } catch (IOException e) {
+            Log.e(TAG, "IOException while saving " + mBitmapName, e);
+            return null;
+        }
+    }
+
+    private void finishWithResult(boolean success, String message) {
+        Intent data = new Intent();
+        data.putExtra(EXTRA_SUCCESS, success);
+        data.putExtra(EXTRA_MESSAGE, message);
+        data.putExtra(EXTRA_BITMAP_NAME, mBitmapName);
+        setResult(RESULT_OK, data);
+        finish();
+    }
+}
diff --git a/tests/tests/holo/src/android/holo/cts/ReferenceViewGroup.java b/tests/tests/holo/src/android/holo/cts/ReferenceViewGroup.java
new file mode 100644
index 0000000..104ac1d
--- /dev/null
+++ b/tests/tests/holo/src/android/holo/cts/ReferenceViewGroup.java
@@ -0,0 +1,85 @@
+/*
+ * Copyright (C) 2011 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package android.holo.cts;
+
+import com.android.cts.holo.R;
+
+import android.content.Context;
+import android.content.res.Resources;
+import android.util.AttributeSet;
+import android.view.View;
+import android.view.ViewGroup;
+
+/**
+ * {@link ViewGroup} that inflates to a reference width and height.
+ */
+public class ReferenceViewGroup extends ViewGroup {
+
+    private final int mWidthDp;
+    private final int mHeightDp;
+
+    public ReferenceViewGroup(Context context) {
+        this(context, null);
+    }
+
+    public ReferenceViewGroup(Context context, AttributeSet attrs) {
+        super(context, attrs);
+        Resources resources = context.getResources();
+        mWidthDp = resources.getDimensionPixelSize(R.dimen.reference_width);
+        mHeightDp = resources.getDimensionPixelSize(R.dimen.reference_height);
+    }
+
+    @Override
+    protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
+        widthMeasureSpec = getMeasureSpec(LayoutParams.MATCH_PARENT, mWidthDp);
+        heightMeasureSpec = getMeasureSpec(LayoutParams.MATCH_PARENT, mHeightDp);
+
+        super.onMeasure(widthMeasureSpec, heightMeasureSpec);
+
+        int childCount = getChildCount();
+        for (int i = 0; i < childCount; i++) {
+            View child = getChildAt(i);
+            LayoutParams params = child.getLayoutParams();
+            int width = getMeasureSpec(params.width, mWidthDp);
+            int height = getMeasureSpec(params.height, mHeightDp);
+            child.measure(width, height);
+        }
+    }
+
+    private int getMeasureSpec(int value, int size) {
+        if (value == LayoutParams.MATCH_PARENT) {
+            return MeasureSpec.makeMeasureSpec(size, MeasureSpec.EXACTLY);
+        } else if (value == LayoutParams.WRAP_CONTENT) {
+            return MeasureSpec.makeMeasureSpec(size, MeasureSpec.AT_MOST);
+        } else {
+            return value;
+        }
+    }
+
+    @Override
+    protected void onLayout(boolean changed, int l, int t, int r, int b) {
+        if (!changed) {
+            return;
+        }
+
+        int childCount = getChildCount();
+        for (int i = 0; i < childCount; i++) {
+            View child = getChildAt(i);
+            child.layout(0, 0, child.getMeasuredWidth(), child.getMeasuredHeight());
+        }
+    }
+}
diff --git a/tests/tests/holo/src/android/holo/cts/SingleLayoutIterator.java b/tests/tests/holo/src/android/holo/cts/SingleLayoutIterator.java
new file mode 100644
index 0000000..afc0fbe
--- /dev/null
+++ b/tests/tests/holo/src/android/holo/cts/SingleLayoutIterator.java
@@ -0,0 +1,63 @@
+/*
+ * Copyright (C) 2011 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package android.holo.cts;
+
+import android.content.Intent;
+
+import java.util.Iterator;
+
+/**
+ * {@link Iterator} over all themes and a single layout.
+ */
+class SingleLayoutIterator implements Iterator<Intent> {
+
+    private final ThemeAdapter mThemeAdapter = new ThemeAdapter(null);
+
+    private final int mTask;
+    private final int mLayoutIndex;
+    private final int mLayoutAdapterMode;
+    private int mThemeIndex;
+
+    SingleLayoutIterator(int layoutIndex, int task, int layoutAdapterMode) {
+        mTask = task;
+        mLayoutAdapterMode = layoutAdapterMode;
+        mLayoutIndex = layoutIndex;
+    }
+
+    @Override
+    public boolean hasNext() {
+        return mThemeIndex < mThemeAdapter.getCount();
+    }
+
+    @Override
+    public Intent next() {
+        Intent intent = new Intent();
+        intent.putExtra(LayoutTestActivity.EXTRA_THEME_INDEX, mThemeIndex);
+        intent.putExtra(LayoutTestActivity.EXTRA_LAYOUT_INDEX, mLayoutIndex);
+        intent.putExtra(LayoutTestActivity.EXTRA_TASK, mTask);
+        intent.putExtra(LayoutTestActivity.EXTRA_LAYOUT_ADAPTER_MODE, mLayoutAdapterMode);
+
+        mThemeIndex++;
+
+        return intent;
+    }
+
+    @Override
+    public void remove() {
+        throw new UnsupportedOperationException("Nope!");
+    }
+}
diff --git a/tests/tests/holo/src/android/holo/cts/SingleThemeIterator.java b/tests/tests/holo/src/android/holo/cts/SingleThemeIterator.java
new file mode 100644
index 0000000..3c489ab
--- /dev/null
+++ b/tests/tests/holo/src/android/holo/cts/SingleThemeIterator.java
@@ -0,0 +1,64 @@
+/*
+ * Copyright (C) 2011 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package android.holo.cts;
+
+import android.content.Intent;
+
+import java.util.Iterator;
+
+/**
+ * {@link Iterator} over a single theme and all the layouts.
+ */
+class SingleThemeIterator implements Iterator<Intent> {
+
+    private final LayoutAdapter mLayoutAdapter;
+
+    private final int mTask;
+    private final int mThemeIndex;
+    private final int mLayoutAdapterMode;
+    private int mLayoutIndex;
+
+    SingleThemeIterator(int themeIndex, int task, int layoutAdapterMode) {
+        mTask = task;
+        mLayoutAdapterMode = layoutAdapterMode;
+        mLayoutAdapter = new LayoutAdapter(null, layoutAdapterMode);
+        mThemeIndex = themeIndex;
+    }
+
+    @Override
+    public boolean hasNext() {
+        return mLayoutIndex < mLayoutAdapter.getCount();
+    }
+
+    @Override
+    public Intent next() {
+        Intent intent = new Intent();
+        intent.putExtra(LayoutTestActivity.EXTRA_THEME_INDEX, mThemeIndex);
+        intent.putExtra(LayoutTestActivity.EXTRA_LAYOUT_INDEX, mLayoutIndex);
+        intent.putExtra(LayoutTestActivity.EXTRA_TASK, mTask);
+        intent.putExtra(LayoutTestActivity.EXTRA_LAYOUT_ADAPTER_MODE, mLayoutAdapterMode);
+
+        mLayoutIndex++;
+
+        return intent;
+    }
+
+    @Override
+    public void remove() {
+        throw new UnsupportedOperationException("Please stop! That tickles!");
+    }
+}
diff --git a/tests/tests/holo/src/android/holo/cts/SingleThemeLayoutIterator.java b/tests/tests/holo/src/android/holo/cts/SingleThemeLayoutIterator.java
new file mode 100644
index 0000000..5fe5086
--- /dev/null
+++ b/tests/tests/holo/src/android/holo/cts/SingleThemeLayoutIterator.java
@@ -0,0 +1,61 @@
+/*
+ * Copyright (C) 2011 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package android.holo.cts;
+
+import android.content.Intent;
+
+import java.util.Iterator;
+
+class SingleThemeLayoutIterator implements Iterator<Intent> {
+
+    private final int mThemeIndex;
+    private final int mLayoutIndex;
+    private final int mTask;
+    private final int mLayoutAdapterMode;
+
+    private boolean hasNext = true;
+
+    SingleThemeLayoutIterator(int themeIndex, int layoutIndex, int task, int layoutAdapterMode) {
+        mThemeIndex = themeIndex;
+        mLayoutIndex = layoutIndex;
+        mTask = task;
+        mLayoutAdapterMode = layoutAdapterMode;
+    }
+
+    @Override
+    public boolean hasNext() {
+        return hasNext;
+    }
+
+    @Override
+    public Intent next() {
+        Intent intent = new Intent();
+        intent.putExtra(LayoutTestActivity.EXTRA_THEME_INDEX, mThemeIndex);
+        intent.putExtra(LayoutTestActivity.EXTRA_LAYOUT_INDEX, mLayoutIndex);
+        intent.putExtra(LayoutTestActivity.EXTRA_TASK, mTask);
+        intent.putExtra(LayoutTestActivity.EXTRA_LAYOUT_ADAPTER_MODE, mLayoutAdapterMode);
+
+        hasNext = false;
+
+        return intent;
+    }
+
+    @Override
+    public void remove() {
+        throw new UnsupportedOperationException("I can't let you do that...");
+    }
+}
diff --git a/tests/tests/holo/src/android/holo/cts/ThemeAdapter.java b/tests/tests/holo/src/android/holo/cts/ThemeAdapter.java
new file mode 100644
index 0000000..60b4a15
--- /dev/null
+++ b/tests/tests/holo/src/android/holo/cts/ThemeAdapter.java
@@ -0,0 +1,196 @@
+/*
+ * Copyright (C) 2011 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package android.holo.cts;
+
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.BaseAdapter;
+import android.widget.TextView;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * {@link BaseAdapter} containing all the themes.
+ */
+class ThemeAdapter extends BaseAdapter  {
+
+    static class ThemeInfo {
+        private final String mName;
+        private final int mTheme;
+        private final String mFileName;
+
+        private ThemeInfo(String name, int theme, String fileName) {
+            mName = name;
+            mTheme = theme;
+            mFileName = fileName;
+        }
+
+        public String getName() {
+            return mName;
+        }
+
+        public int getTheme() {
+            return mTheme;
+        }
+
+        public String getBitmapName() {
+            return mFileName;
+        }
+    }
+
+    private final List<ThemeInfo> mThemeInfos = new ArrayList<ThemeInfo>();
+
+    private final LayoutInflater mInflater;
+
+    ThemeAdapter(LayoutInflater inflater) {
+        mInflater = inflater;
+
+        addTheme("Holo",
+                android.R.style.Theme_Holo,
+                "holo");
+
+        addTheme("Holo Dialog",
+                android.R.style.Theme_Holo_Dialog,
+                "holo_dialog");
+
+        addTheme("Holo Dialog Minimum Width",
+                android.R.style.Theme_Holo_Dialog_MinWidth,
+                "holo_dialog_minwidth");
+
+        addTheme("Holo Dialog No Action Bar",
+                android.R.style.Theme_Holo_Dialog_NoActionBar,
+                "holo_dialog_noactionbar");
+
+        addTheme("Holo Dialog No Action Bar Minimum Width",
+                android.R.style.Theme_Holo_Dialog_NoActionBar_MinWidth,
+                "holo_dialog_noactionbar_minwidth");
+
+        addTheme("Holo Dialog When Large",
+                android.R.style.Theme_Holo_DialogWhenLarge,
+                "holo_dialogwhenlarge");
+
+        addTheme("Holo Dialog When Large No Action Bar",
+                android.R.style.Theme_Holo_DialogWhenLarge_NoActionBar,
+                "holo_dialogwhenlarge_noactionbar");
+
+        addTheme("Holo Input Method",
+                android.R.style.Theme_Holo_InputMethod,
+                "holo_inputmethod");
+
+        addTheme("Holo Light",
+                android.R.style.Theme_Holo_Light,
+                "holo_light");
+
+        addTheme("Holo Light Dark Action Bar",
+                android.R.style.Theme_Holo_Light_DarkActionBar,
+                "holo_light_darkactionbar");
+
+        addTheme("Holo Light Dialog",
+                android.R.style.Theme_Holo_Light_Dialog,
+                "holo_light_dialog");
+
+        addTheme("Holo Light Dialog Minimum Width",
+                android.R.style.Theme_Holo_Light_Dialog_MinWidth,
+                "holo_light_dialog_minwidth");
+
+        addTheme("Holo Light Dialog No Action Bar",
+                android.R.style.Theme_Holo_Light_Dialog_NoActionBar,
+                "holo_light_dialog_noactionbar");
+
+        addTheme("Holo Light Dialog No Action Bar Minimum Width",
+                android.R.style.Theme_Holo_Light_Dialog_NoActionBar_MinWidth,
+                "holo_light_dialog_noactionbar_minwidth");
+
+        addTheme("Holo Light Dialog When Large",
+                android.R.style.Theme_Holo_Light_DialogWhenLarge,
+                "holo_light_dialogwhenlarge");
+
+        addTheme("Holo Light Dialog When Large No Action Bar",
+                android.R.style.Theme_Holo_Light_DialogWhenLarge_NoActionBar,
+                "holo_light_dialogwhenlarge_noactionbar");
+
+        addTheme("Holo Light No Action Bar",
+                android.R.style.Theme_Holo_Light_NoActionBar,
+                "holo_light_noactionbar");
+
+        addTheme("Holo Light No Action Bar Fullscreen",
+                android.R.style.Theme_Holo_Light_NoActionBar_Fullscreen,
+                "holo_light_noactionbar_fullscreen");
+
+        addTheme("Holo Light Panel",
+                android.R.style.Theme_Holo_Light_Panel,
+                "holo_light_panel");
+
+        addTheme("Holo No Action Bar",
+                android.R.style.Theme_Holo_NoActionBar,
+                "holo_noactionbar");
+
+        addTheme("Holo No Action Bar Fullscreen",
+                android.R.style.Theme_Holo_NoActionBar_Fullscreen,
+                "holo_noactionbar_fullscreen");
+
+        addTheme("Holo Panel",
+                android.R.style.Theme_Holo_Panel,
+                "holo_panel");
+
+        addTheme("Holo Wallpaper",
+                android.R.style.Theme_Holo_Wallpaper,
+                "holo_wallpaper");
+
+        addTheme("Holo Wallpaper No Title Bar",
+                android.R.style.Theme_Holo_Wallpaper_NoTitleBar,
+                "holo_wallpaper_notitlebar");
+
+        // NOTE: Adding a theme doesn't mean it will be tested. You have to add an explicit
+        //       test in HoloTest for it!
+    }
+
+    private void addTheme(String name, int theme, String fileNamePrefix) {
+        mThemeInfos.add(new ThemeInfo(name, theme, fileNamePrefix));
+    }
+
+    @Override
+    public int getCount() {
+        return mThemeInfos.size();
+    }
+
+    @Override
+    public ThemeInfo getItem(int position) {
+        return mThemeInfos.get(position);
+    }
+
+    @Override
+    public long getItemId(int position) {
+        return getItem(position).mTheme;
+    }
+
+    @Override
+    public View getView(int position, View convertView, ViewGroup parent) {
+        TextView textView;
+        if (convertView != null) {
+            textView = (TextView) convertView;
+        } else {
+            textView = (TextView) mInflater.inflate(android.R.layout.simple_list_item_1,
+                    parent, false);
+        }
+        ThemeInfo themeInfo = getItem(position);
+        textView.setText(themeInfo.mName);
+        return textView;
+    }
+}
diff --git a/tests/tests/holo/src/android/holo/cts/ThemePickerActivity.java b/tests/tests/holo/src/android/holo/cts/ThemePickerActivity.java
new file mode 100644
index 0000000..9ded478
--- /dev/null
+++ b/tests/tests/holo/src/android/holo/cts/ThemePickerActivity.java
@@ -0,0 +1,48 @@
+/*
+ * Copyright (C) 2011 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package android.holo.cts;
+
+import android.app.ListActivity;
+import android.content.Intent;
+import android.os.Bundle;
+import android.view.View;
+import android.widget.ListView;
+
+/**
+ * {@link ListActivity} for picking themes.
+ */
+public class ThemePickerActivity extends ListActivity {
+
+    static final String EXTRA_TASK = "task";
+
+    private int mTestTask;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        mTestTask = getIntent().getIntExtra(EXTRA_TASK, -1);
+        setListAdapter(new ThemeAdapter(getLayoutInflater()));
+    }
+
+    @Override
+    protected void onListItemClick(ListView l, View v, int position, long id) {
+        Intent intent = new Intent(this, LayoutPickerActivity.class);
+        intent.putExtra(LayoutPickerActivity.EXTRA_THEME_INDEX, position);
+        intent.putExtra(LayoutPickerActivity.EXTRA_TASK, mTestTask);
+        startActivity(intent);
+    }
+}
diff --git a/tests/tests/holo/src/android/holo/cts/ThemeTestActivity.java b/tests/tests/holo/src/android/holo/cts/ThemeTestActivity.java
new file mode 100644
index 0000000..08659df
--- /dev/null
+++ b/tests/tests/holo/src/android/holo/cts/ThemeTestActivity.java
@@ -0,0 +1,206 @@
+/*
+ * Copyright (C) 2011 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package android.holo.cts;
+
+import android.app.Activity;
+import android.content.Intent;
+import android.os.Bundle;
+import android.util.Log;
+
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.Future;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
+
+/**
+ * {@link Activity} that iterates over all the test layouts for a single theme
+ * and either compares or generates bitmaps.
+ */
+public class ThemeTestActivity extends Activity {
+
+    private static final String TAG = ThemeTestActivity.class.getSimpleName();
+
+    static final String EXTRA_TASK = "task";
+    static final String EXTRA_THEME_INDEX = "themeIndex";
+    static final String EXTRA_LAYOUT_INDEX = "layoutIndex";
+    static final String EXTRA_LAYOUT_ADAPTER_MODE = "layoutAdapterMode";
+
+    static final int TASK_VIEW_LAYOUTS = 1;
+    static final int TASK_GENERATE_BITMAPS = 2;
+    static final int TASK_COMPARE_BITMAPS = 3;
+
+    private static final int VIEW_TESTS_REQUEST_CODE = 1;
+    private static final int GENERATE_BITMAP_REQUEST_CODE = 2;
+    private static final int COMPARE_BITMAPS_REQUEST_CODE = 3;
+
+    private int mRequestCode;
+    private Iterator<Intent> mIterator;
+    private Result mPendingResult;
+    private ResultFuture<Result> mResultFuture;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        mResultFuture = new ResultFuture<Result>();
+        mPendingResult = new Result();
+
+        int task = getIntent().getIntExtra(EXTRA_TASK, -1);
+        switch (task) {
+            case TASK_VIEW_LAYOUTS:
+                mRequestCode = VIEW_TESTS_REQUEST_CODE;
+                break;
+
+            case TASK_GENERATE_BITMAPS:
+                mRequestCode = GENERATE_BITMAP_REQUEST_CODE;
+                break;
+
+            case TASK_COMPARE_BITMAPS:
+                // Don't delete any failure bitmap images that may be useful.
+                mRequestCode = COMPARE_BITMAPS_REQUEST_CODE;
+                break;
+
+            default:
+                throw new IllegalArgumentException("Bad task: " + task);
+        }
+
+        int themeIndex = getIntent().getIntExtra(EXTRA_THEME_INDEX, -1);
+        int layoutIndex = getIntent().getIntExtra(EXTRA_LAYOUT_INDEX, -1);
+        int adapterMode = getIntent().getIntExtra(EXTRA_LAYOUT_ADAPTER_MODE, -1);
+
+        Log.i(TAG, "Theme index: " + themeIndex + " Layout index: " + layoutIndex);
+
+        if (themeIndex < 0 && layoutIndex < 0) {
+            mIterator = new AllThemesIterator(task, adapterMode);
+        } else if (themeIndex >= 0 && layoutIndex >= 0) {
+            mIterator = new SingleThemeLayoutIterator(themeIndex, layoutIndex, task, adapterMode);
+        } else if (layoutIndex >= 0) {
+            mIterator = new SingleLayoutIterator(layoutIndex, task, adapterMode);
+        } else if (themeIndex >= 0) {
+            mIterator = new SingleThemeIterator(themeIndex, task, adapterMode);
+        } else {
+            throw new IllegalStateException();
+        }
+
+        generateNextBitmap();
+    }
+
+    private void generateNextBitmap() {
+        if (mIterator.hasNext()) {
+            Intent intent = mIterator.next();
+            intent.setClass(this, LayoutTestActivity.class);
+            startActivityForResult(intent, mRequestCode);
+        } else {
+            mResultFuture.set(mPendingResult);
+        }
+    }
+
+    @Override
+    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
+        switch (requestCode) {
+            case VIEW_TESTS_REQUEST_CODE:
+                return;
+
+            case GENERATE_BITMAP_REQUEST_CODE:
+            case COMPARE_BITMAPS_REQUEST_CODE:
+                handleResult(resultCode, data);
+                break;
+
+            default:
+                throw new IllegalArgumentException("Bad request code: " + requestCode);
+        }
+    }
+
+    private void handleResult(int resultCode, Intent data) {
+        if (resultCode == RESULT_CANCELED) {
+            throw new IllegalStateException("Did you interrupt the activity?");
+        }
+
+        boolean success = data.getBooleanExtra(LayoutTestActivity.EXTRA_SUCCESS, false);
+        if (!success) {
+            String bitmapName = data.getStringExtra(LayoutTestActivity.EXTRA_BITMAP_NAME);
+            mPendingResult.addFailedBitmapName(bitmapName);
+        }
+        generateNextBitmap();
+    }
+
+    public Future<Result> getResultFuture() {
+        return mResultFuture;
+    }
+
+    static class Result {
+
+        private List<String> mFailedBitmapNames = new ArrayList<String>();
+
+        public boolean passed() {
+            return mFailedBitmapNames.isEmpty();
+        }
+
+        public List<String> getFailedBitmapNames() {
+            return mFailedBitmapNames;
+        }
+
+        private void addFailedBitmapName(String bitmapName) {
+            mFailedBitmapNames.add(bitmapName);
+        }
+    }
+
+    class ResultFuture<T> implements Future<T> {
+
+        private final CountDownLatch mLatch = new CountDownLatch(1);
+
+        private T mResult;
+
+        public void set(T result) {
+            mResult = result;
+            mLatch.countDown();
+        }
+
+        @Override
+        public T get() throws InterruptedException {
+            mLatch.await();
+            return mResult;
+        }
+
+        @Override
+        public T get(long timeout, TimeUnit unit) throws InterruptedException,
+                TimeoutException {
+            if (!mLatch.await(timeout, unit)) {
+                throw new TimeoutException();
+            }
+            return mResult;
+        }
+
+        @Override
+        public boolean isDone() {
+            return mLatch.getCount() > 0;
+        }
+
+        @Override
+        public boolean cancel(boolean mayInterruptIfRunning) {
+            return false;
+        }
+
+        @Override
+        public boolean isCancelled() {
+            return false;
+        }
+    }
+}
diff --git a/tests/tests/holo/src/android/holo/cts/modifiers/AbstractLayoutModifier.java b/tests/tests/holo/src/android/holo/cts/modifiers/AbstractLayoutModifier.java
new file mode 100644
index 0000000..6c8b601
--- /dev/null
+++ b/tests/tests/holo/src/android/holo/cts/modifiers/AbstractLayoutModifier.java
@@ -0,0 +1,29 @@
+/*
+ * Copyright (C) 2011 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package android.holo.cts.modifiers;
+
+import android.holo.cts.LayoutModifier;
+
+/**
+ * {@link LayoutModifier} that does nothing in {@link #prepare()}.
+ */
+abstract class AbstractLayoutModifier implements LayoutModifier {
+
+    @Override
+    public void prepare() {
+    }
+}
diff --git a/tests/tests/holo/src/android/holo/cts/modifiers/AlertDialogBuilder.java b/tests/tests/holo/src/android/holo/cts/modifiers/AlertDialogBuilder.java
new file mode 100644
index 0000000..1f4c100
--- /dev/null
+++ b/tests/tests/holo/src/android/holo/cts/modifiers/AlertDialogBuilder.java
@@ -0,0 +1,82 @@
+/*
+ * Copyright (C) 2011 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package android.holo.cts.modifiers;
+
+import android.app.AlertDialog;
+import android.app.Dialog;
+import android.view.View;
+
+public class AlertDialogBuilder implements DialogBuilder {
+
+    public static final int ONE_BUTTON = 0;
+
+    public static final int TWO_BUTTONS = 1;
+
+    public static final int THREE_BUTTONS = 2;
+
+    public static final int LIST = 3;
+
+    public static final int SINGLE_CHOICE = 4;
+
+    public static final int MULTI_CHOICE = 5;
+
+    private int mDialogType;
+
+    private static final CharSequence[] ITEMS = {"Red", "Green", "Blue"};
+
+    public AlertDialogBuilder(int dialogType) {
+        mDialogType = dialogType;
+    }
+
+    @Override
+    public Dialog buildDialog(View view) {
+        AlertDialog.Builder builder = new AlertDialog.Builder(view.getContext());
+
+        switch (mDialogType) {
+            case ONE_BUTTON:
+                builder.setTitle("Exit Dialog")
+                        .setMessage("Are you sure you want to exit?")
+                        .setPositiveButton("Exit", null);
+                break;
+            case TWO_BUTTONS:
+                builder.setMessage("Are you sure you want to exit?")
+                        .setPositiveButton("Exit", null)
+                        .setNegativeButton("Cancel", null);
+                break;
+            case THREE_BUTTONS:
+                builder.setMessage("Are you sure you want to exit?")
+                        .setPositiveButton("Exit", null)
+                        .setNeutralButton("Neutral", null)
+                        .setNegativeButton("Cancel", null);
+                break;
+            case LIST:
+                builder.setTitle("Pick a Color")
+                        .setItems(ITEMS, null);
+                break;
+            case SINGLE_CHOICE:
+                builder.setTitle("Pick a Color")
+                        .setSingleChoiceItems(ITEMS, 1, null);
+                break;
+            case MULTI_CHOICE:
+                builder.setTitle("Pick a Color")
+                        .setMultiChoiceItems(ITEMS, new boolean[]{false, true, false}, null);
+                break;
+        }
+
+        return builder.show();
+    }
+}
\ No newline at end of file
diff --git a/tests/tests/holo/src/android/holo/cts/modifiers/CalendarViewModifier.java b/tests/tests/holo/src/android/holo/cts/modifiers/CalendarViewModifier.java
new file mode 100644
index 0000000..e27b6c1
--- /dev/null
+++ b/tests/tests/holo/src/android/holo/cts/modifiers/CalendarViewModifier.java
@@ -0,0 +1,62 @@
+/*
+ * Copyright (C) 2011 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package android.holo.cts.modifiers;
+
+import android.holo.cts.LayoutModifier;
+import android.view.View;
+import android.widget.CalendarView;
+
+import java.util.Calendar;
+import java.util.GregorianCalendar;
+import java.util.TimeZone;
+
+/**
+ * {@LayoutModifier} to set a precise date on a {@link CalendarView}.
+ */
+public class CalendarViewModifier implements LayoutModifier {
+    /**
+     * Long representation of a date that is 30 years in milliseconds from
+     * Unix epoch (January 1, 1970 00:00:00).
+     */
+    private static final long JANUARY_DATE = 946707779241L;
+
+    private static final long FEBRUARY_DATE = 951033600000L;
+
+    private static final TimeZone TZ = TimeZone.getTimeZone("GMT+00:00");
+
+    private final boolean mJanuary;
+
+    public CalendarViewModifier(boolean january) {
+        mJanuary = january;
+    }
+
+    @Override
+    public void prepare() {
+        TimeZone.setDefault(TZ);
+    }
+
+    @Override
+    public View modifyView(View view) {
+        ((CalendarView) view).setDate(mJanuary ? JANUARY_DATE : FEBRUARY_DATE);
+        return view;
+    }
+
+    public static boolean isMonth(int month) {
+        Calendar cal = new GregorianCalendar(TZ);
+        return cal.get(Calendar.MONTH) == month;
+    }
+}
diff --git a/tests/tests/holo/src/android/holo/cts/modifiers/DatePickerModifier.java b/tests/tests/holo/src/android/holo/cts/modifiers/DatePickerModifier.java
new file mode 100644
index 0000000..a828eb8
--- /dev/null
+++ b/tests/tests/holo/src/android/holo/cts/modifiers/DatePickerModifier.java
@@ -0,0 +1,34 @@
+/*
+ * Copyright (C) 2011 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package android.holo.cts.modifiers;
+
+import android.holo.cts.LayoutModifier;
+import android.view.View;
+import android.widget.DatePicker;
+
+/**
+ * {@link LayoutModifier} that sets a precise date on a {@link DatePicker}.
+ */
+public class DatePickerModifier extends AbstractLayoutModifier {
+
+    @Override
+    public View modifyView(View view) {
+        DatePicker tp = (DatePicker) view;
+        tp.updateDate(2011, 4, 20);
+        return view;
+    }
+}
diff --git a/tests/tests/holo/src/android/holo/cts/modifiers/DialogBuilder.java b/tests/tests/holo/src/android/holo/cts/modifiers/DialogBuilder.java
new file mode 100644
index 0000000..94712b5
--- /dev/null
+++ b/tests/tests/holo/src/android/holo/cts/modifiers/DialogBuilder.java
@@ -0,0 +1,31 @@
+/*
+ * Copyright (C) 2011 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package android.holo.cts.modifiers;
+
+import android.app.Dialog;
+import android.view.View;
+
+/**
+ * Interface to implement should you want to write a test that uses
+ * a Dialog. Since a Dialog shows in a new window, implementation
+ * of this interface is required in order to appropriately save
+ * the Dialog for testing.
+ */
+interface DialogBuilder {
+
+    Dialog buildDialog(View view);
+}
\ No newline at end of file
diff --git a/tests/tests/holo/src/android/holo/cts/modifiers/DialogModifier.java b/tests/tests/holo/src/android/holo/cts/modifiers/DialogModifier.java
new file mode 100644
index 0000000..38167e0
--- /dev/null
+++ b/tests/tests/holo/src/android/holo/cts/modifiers/DialogModifier.java
@@ -0,0 +1,54 @@
+/*
+ * Copyright (C) 2011 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package android.holo.cts.modifiers;
+
+import android.app.Dialog;
+import android.holo.cts.LayoutModifier;
+import android.view.View;
+import android.view.ViewGroup;
+
+/**
+ * Wacky {@link LayoutModifier} that takes a {@link Dialog} and transplants into the
+ * parent view group.
+ */
+public class DialogModifier extends AbstractLayoutModifier {
+
+    private DialogBuilder mBuilder;
+
+    public DialogModifier(DialogBuilder builder) {
+        mBuilder = builder;
+    }
+
+    @Override
+    public View modifyView(View view) {
+        Dialog dialog = mBuilder.buildDialog(view);
+
+        ViewGroup parent = (ViewGroup) view.getParent();
+        parent.removeView(view); // remove the filler view
+
+        // get the dialog as a view
+        View newView = dialog.getWindow().getDecorView();
+
+        // remove it from the dialog
+        dialog.getWindow().getWindowManager().removeView(newView);
+
+        // so we can add it to our ViewGroup
+        parent.addView(newView);
+
+        return newView;
+    }
+}
diff --git a/tests/tests/holo/src/android/holo/cts/modifiers/ProgressDialogBuilder.java b/tests/tests/holo/src/android/holo/cts/modifiers/ProgressDialogBuilder.java
new file mode 100644
index 0000000..b2c7744
--- /dev/null
+++ b/tests/tests/holo/src/android/holo/cts/modifiers/ProgressDialogBuilder.java
@@ -0,0 +1,56 @@
+/*
+ * Copyright (C) 2011 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package android.holo.cts.modifiers;
+
+import com.android.cts.holo.R;
+
+import android.app.Dialog;
+import android.app.ProgressDialog;
+import android.content.Context;
+import android.view.View;
+
+public class ProgressDialogBuilder implements DialogBuilder {
+
+    private int mDialogType;
+
+    public ProgressDialogBuilder(int dialogType) {
+        mDialogType = dialogType;
+    }
+
+    @Override
+    public Dialog buildDialog(View view) {
+        Context context = view.getContext();
+        ProgressDialog progressDialog = new ProgressDialog(view.getContext());
+        progressDialog.setMessage(context.getString(R.string.loading));
+
+        switch (mDialogType) {
+            case ProgressDialog.STYLE_SPINNER:
+                progressDialog.setProgressStyle(ProgressDialog.STYLE_SPINNER);
+                break;
+
+            case ProgressDialog.STYLE_HORIZONTAL:
+                progressDialog.setProgressStyle(ProgressDialog.STYLE_HORIZONTAL);
+                progressDialog.setMax(100);
+                break;
+
+            default:
+                throw new IllegalArgumentException("Bad dialog type: " + mDialogType);
+        }
+        progressDialog.show();
+        return progressDialog;
+    }
+}
diff --git a/tests/tests/holo/src/android/holo/cts/modifiers/SearchViewModifier.java b/tests/tests/holo/src/android/holo/cts/modifiers/SearchViewModifier.java
new file mode 100644
index 0000000..bbffa9e
--- /dev/null
+++ b/tests/tests/holo/src/android/holo/cts/modifiers/SearchViewModifier.java
@@ -0,0 +1,57 @@
+/*
+ * Copyright (C) 2011 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package android.holo.cts.modifiers;
+
+import com.android.cts.holo.R;
+
+import android.content.Context;
+import android.view.View;
+import android.widget.SearchView;
+
+public class SearchViewModifier extends AbstractLayoutModifier {
+
+    public static final int QUERY_HINT = 0;
+    public static final int QUERY = 1;
+
+    private int mSearchViewType;
+
+    public SearchViewModifier(int searchViewType) {
+        mSearchViewType = searchViewType;
+    }
+
+    @Override
+    public View modifyView(View view) {
+        SearchView searchView = (SearchView) view;
+        Context context = view.getContext();
+
+        switch (mSearchViewType) {
+            case QUERY_HINT:
+                searchView.setQueryHint(context.getString(R.string.searchview_query_hint));
+                break;
+
+            case QUERY:
+                searchView.setQuery(context.getString(R.string.searchview_query), false);
+                break;
+
+            default:
+                throw new IllegalArgumentException("Bad search view type: " + mSearchViewType);
+        }
+
+        searchView.setIconifiedByDefault(false);
+        return searchView;
+    }
+}
diff --git a/tests/tests/holo/src/android/holo/cts/modifiers/TabHostModifier.java b/tests/tests/holo/src/android/holo/cts/modifiers/TabHostModifier.java
new file mode 100644
index 0000000..34f171c
--- /dev/null
+++ b/tests/tests/holo/src/android/holo/cts/modifiers/TabHostModifier.java
@@ -0,0 +1,47 @@
+/*
+ * Copyright (C) 2011 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package android.holo.cts.modifiers;
+
+import com.android.cts.holo.R;
+
+import android.view.View;
+import android.widget.TabHost;
+
+public class TabHostModifier extends AbstractLayoutModifier {
+
+    @Override
+    public View modifyView(View view) {
+        TabHost tabHost = (TabHost) view;
+        tabHost.setup();
+
+        tabHost.addTab(tabHost.newTabSpec("1")
+                .setIndicator("Tab 1")
+                .setContent(R.id.tab_inner_view));
+
+        tabHost.addTab(tabHost.newTabSpec("2")
+                .setIndicator("Tab 2")
+                .setContent(R.id.tab_inner_view));
+
+        tabHost.addTab(tabHost.newTabSpec("3")
+                .setIndicator("Tab 3")
+                .setContent(R.id.tab_inner_view));
+
+        tabHost.setCurrentTab(2);
+
+        return view;
+    }
+}
diff --git a/tests/tests/holo/src/android/holo/cts/modifiers/TimePickerModifier.java b/tests/tests/holo/src/android/holo/cts/modifiers/TimePickerModifier.java
new file mode 100644
index 0000000..e9e13bb
--- /dev/null
+++ b/tests/tests/holo/src/android/holo/cts/modifiers/TimePickerModifier.java
@@ -0,0 +1,32 @@
+/*
+ * Copyright (C) 2011 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package android.holo.cts.modifiers;
+
+import android.view.View;
+import android.widget.TimePicker;
+
+public class TimePickerModifier extends AbstractLayoutModifier {
+
+    @Override
+    public View modifyView(View view) {
+        TimePicker timePicker = (TimePicker) view;
+        timePicker.setIs24HourView(true);
+        timePicker.setCurrentHour(13);
+        timePicker.setCurrentMinute(37);
+        return view;
+    }
+}
diff --git a/tests/tests/holo/src/android/holo/cts/modifiers/ViewPressedModifier.java b/tests/tests/holo/src/android/holo/cts/modifiers/ViewPressedModifier.java
new file mode 100644
index 0000000..4be06da
--- /dev/null
+++ b/tests/tests/holo/src/android/holo/cts/modifiers/ViewPressedModifier.java
@@ -0,0 +1,28 @@
+/*
+ * Copyright (C) 2011 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package android.holo.cts.modifiers;
+
+import android.view.View;
+
+public class ViewPressedModifier extends AbstractLayoutModifier {
+
+    @Override
+    public View modifyView(View view) {
+        view.setPressed(true);
+        return view;
+    }
+}
diff --git a/tests/tests/media/src/android/media/cts/AudioManagerTest.java b/tests/tests/media/src/android/media/cts/AudioManagerTest.java
index f4d60c8..74e4cc0 100644
--- a/tests/tests/media/src/android/media/cts/AudioManagerTest.java
+++ b/tests/tests/media/src/android/media/cts/AudioManagerTest.java
@@ -493,6 +493,9 @@
                           AudioManager.STREAM_VOICE_CALL,
                           AudioManager.STREAM_RING };
 
+        // set ringer mode to back normal to not interfere with volume tests
+        mAudioManager.setRingerMode(RINGER_MODE_NORMAL);
+
         TelephonyManager tm =
             (TelephonyManager)mContext.getSystemService(Context.TELEPHONY_SERVICE);
         //FIXME: use TelephonyManager.isVoiceCapable() when public
@@ -529,6 +532,9 @@
             mAudioManager.adjustStreamVolume(streams[i], ADJUST_LOWER, FLAG_SHOW_UI);
             assertEquals(0, mAudioManager.getStreamVolume(streams[i]));
 
+            // set ringer mode to back normal to not interfere with volume tests
+            mAudioManager.setRingerMode(RINGER_MODE_NORMAL);
+
             // volume raise
             mAudioManager.setStreamVolume(streams[i], 0, FLAG_SHOW_UI);
             for (int k = 0; k < maxVolume; k++) {
diff --git a/tests/tests/media/src/android/media/cts/CamcorderProfileTest.java b/tests/tests/media/src/android/media/cts/CamcorderProfileTest.java
index cbdf8b0..e34856c 100644
--- a/tests/tests/media/src/android/media/cts/CamcorderProfileTest.java
+++ b/tests/tests/media/src/android/media/cts/CamcorderProfileTest.java
@@ -21,6 +21,7 @@
 import dalvik.annotation.TestTargetNew;
 import dalvik.annotation.TestTargets;
 
+import android.content.pm.PackageManager;
 import android.hardware.Camera;
 import android.hardware.Camera.Parameters;
 import android.hardware.Camera.Size;
@@ -210,16 +211,14 @@
         checkProfile(highTimeLapseProfile, null);
 
         int[] specificProfileQualities = {CamcorderProfile.QUALITY_QCIF,
-                                          // replace this with CamcorderProfile.QUALITY_QVGA
-                                          7,
+                                          CamcorderProfile.QUALITY_QVGA,
                                           CamcorderProfile.QUALITY_CIF,
                                           CamcorderProfile.QUALITY_480P,
                                           CamcorderProfile.QUALITY_720P,
                                           CamcorderProfile.QUALITY_1080P};
 
         int[] specificTimeLapseProfileQualities = {CamcorderProfile.QUALITY_TIME_LAPSE_QCIF,
-                                                   // replace this with CamcorderProfile.QUALITY_TIME_LAPSE_QVGA
-                                                   1007,
+                                                   CamcorderProfile.QUALITY_TIME_LAPSE_QVGA,
                                                    CamcorderProfile.QUALITY_TIME_LAPSE_CIF,
                                                    CamcorderProfile.QUALITY_TIME_LAPSE_480P,
                                                    CamcorderProfile.QUALITY_TIME_LAPSE_720P,
@@ -239,6 +238,16 @@
         )
     })
     public void testGet() {
+        /*
+         * Device may not have rear camera for checkGet(-1).
+         * Checking PackageManager.FEATURE_CAMERA is included or not to decide the flow.
+         * Continue if the feature is included.
+         * Otherwise, exit test.
+         */
+        PackageManager pm = mContext.getPackageManager();
+        if (!pm.hasSystemFeature(PackageManager.FEATURE_CAMERA)) {
+            return;
+        }
         checkGet(-1);
     }
 
diff --git a/tests/tests/media/src/android/media/cts/MediaRecorderTest.java b/tests/tests/media/src/android/media/cts/MediaRecorderTest.java
index db136f2..65d17c1 100644
--- a/tests/tests/media/src/android/media/cts/MediaRecorderTest.java
+++ b/tests/tests/media/src/android/media/cts/MediaRecorderTest.java
@@ -25,26 +25,31 @@
 import android.media.MediaRecorder;
 import android.media.MediaRecorder.OnErrorListener;
 import android.media.MediaRecorder.OnInfoListener;
+import android.media.MediaMetadataRetriever;
 import android.os.Environment;
 import android.test.ActivityInstrumentationTestCase2;
 import android.test.UiThreadTest;
 import android.view.Surface;
 
+import android.util.Log;
+
 import java.io.File;
 import java.io.FileDescriptor;
 import java.io.FileOutputStream;
 
 @TestTargetClass(MediaRecorder.class)
 public class MediaRecorderTest extends ActivityInstrumentationTestCase2<MediaStubActivity> {
-
+    private final String TAG = "MediaRecorderTest";
     private final String OUTPUT_PATH;
     private final String OUTPUT_PATH2;
+    private static final float TOLERANCE = 0.0002f;
     private static final int RECORD_TIME = 3000;
     private static final int VIDEO_WIDTH = 176;
     private static final int VIDEO_HEIGHT = 144;
-    private static final int FRAME_RATE = 15;
     private static final long MAX_FILE_SIZE = 5000;
     private static final int MAX_DURATION_MSEC = 200;
+    private static final float LATITUDE = 0.0000f;
+    private static final float LONGITUDE  = -180.0f;
     private boolean mOnInfoCalled;
     private boolean mOnErrorCalled;
     private File mOutFile;
@@ -126,11 +131,6 @@
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            method = "setVideoFrameRate",
-            args = {int.class}
-        ),
-        @TestTargetNew(
-            level = TestLevel.COMPLETE,
             method = "setVideoSize",
             args = {int.class, int.class}
         ),
@@ -157,7 +157,6 @@
         mMediaRecorder.setVideoSource(MediaRecorder.VideoSource.CAMERA);
         mMediaRecorder.setOutputFormat(MediaRecorder.OutputFormat.DEFAULT);
         mMediaRecorder.setVideoEncoder(MediaRecorder.VideoEncoder.DEFAULT);
-        mMediaRecorder.setVideoFrameRate(FRAME_RATE);
         mMediaRecorder.setVideoSize(VIDEO_WIDTH, VIDEO_HEIGHT);
         mMediaRecorder.setPreviewDisplay(getActivity().getSurfaceHolder().getSurface());
         mMediaRecorder.prepare();
@@ -167,25 +166,45 @@
         checkOutputExist();
     }
 
-    @TestTargetNew(
-        level = TestLevel.COMPLETE,
-        method = "setCamera",
-        args = {Camera.class}
-    )
+    @TestTargets({
+        @TestTargetNew(
+            level = TestLevel.COMPLETE,
+            method = "setVideoFrameRate",
+            args = {int.class}
+        ),
+        @TestTargetNew(
+            level = TestLevel.COMPLETE,
+            method = "setLocation",
+            args = {float.class,float.class}
+        ),
+        @TestTargetNew(
+            level = TestLevel.COMPLETE,
+            method = "setCamera",
+            args = {Camera.class}
+        )
+    })
     @UiThreadTest
     public void testSetCamera() throws Exception {
         int nCamera = Camera.getNumberOfCameras();
         for (int cameraId = 0; cameraId < nCamera; cameraId++) {
             mCamera = Camera.open(cameraId);
+
+            // FIXME:
+            // We should add some test case to use Camera.Parameters.getPreviewFpsRange()
+            // to get the supported video frame rate range.
+            Camera.Parameters params = mCamera.getParameters();
+            int frameRate = params.getPreviewFrameRate();
+
             mCamera.unlock();
             mMediaRecorder.setCamera(mCamera);
             mMediaRecorder.setVideoSource(MediaRecorder.VideoSource.CAMERA);
             mMediaRecorder.setOutputFormat(MediaRecorder.OutputFormat.DEFAULT);
             mMediaRecorder.setVideoEncoder(MediaRecorder.VideoEncoder.DEFAULT);
-            mMediaRecorder.setVideoFrameRate(FRAME_RATE);
+            mMediaRecorder.setVideoFrameRate(frameRate);
             mMediaRecorder.setVideoSize(VIDEO_WIDTH, VIDEO_HEIGHT);
             mMediaRecorder.setPreviewDisplay(getActivity().getSurfaceHolder().getSurface());
             mMediaRecorder.setOutputFile(OUTPUT_PATH);
+            mMediaRecorder.setLocation(LATITUDE, LONGITUDE);
 
             mMediaRecorder.prepare();
             mMediaRecorder.start();
@@ -194,9 +213,38 @@
             assertTrue(mOutFile.exists());
 
             mCamera.release();
+            assertTrue(checkLocationInFile(OUTPUT_PATH));
         }
     }
 
+    private boolean checkLocationInFile(String fileName) {
+        MediaMetadataRetriever retriever = new MediaMetadataRetriever();
+        retriever.setDataSource(fileName);
+        String location = retriever.extractMetadata(MediaMetadataRetriever.METADATA_KEY_LOCATION);
+        if (location == null) {
+            Log.v(TAG, "No location information found in file " + fileName);
+            return false;
+        }
+
+        // parsing String location and recover the location inforamtion in floats
+        // Make sure the tolerance is very small - due to rounding errors?.
+        Log.v(TAG, "location: " + location);
+
+        // Get the position of the -/+ sign in location String, which indicates
+        // the beginning of the longtitude.
+        int index = location.lastIndexOf('-');
+        if (index == -1) {
+            index = location.lastIndexOf('+');
+        }
+        assertTrue("+ or - is not found", index != -1);
+        assertTrue("+ or - is only found at the beginning", index != 0);
+        float latitude = Float.parseFloat(location.substring(0, index - 1));
+        float longitude = Float.parseFloat(location.substring(index));
+        assertTrue("Incorrect latitude: " + latitude, Math.abs(latitude - LATITUDE) <= TOLERANCE);
+        assertTrue("Incorrect longitude: " + longitude, Math.abs(longitude - LONGITUDE) <= TOLERANCE);
+        return true;
+    }
+
     private void checkOutputExist() {
         assertTrue(mOutFile.exists());
         assertTrue(mOutFile.length() > 0);
@@ -236,11 +284,6 @@
         ),
         @TestTargetNew(
             level = TestLevel.COMPLETE,
-            method = "setVideoFrameRate",
-            args = {int.class}
-        ),
-        @TestTargetNew(
-            level = TestLevel.COMPLETE,
             method = "setVideoSize",
             args = {int.class, int.class}
         ),
@@ -274,13 +317,13 @@
         mMediaRecorder.setOutputFile(OUTPUT_PATH2);
         mMediaRecorder.setVideoEncoder(MediaRecorder.VideoEncoder.DEFAULT);
         mMediaRecorder.setPreviewDisplay(getActivity().getSurfaceHolder().getSurface());
-        mMediaRecorder.setVideoFrameRate(FRAME_RATE);
         mMediaRecorder.setVideoSize(VIDEO_WIDTH, VIDEO_HEIGHT);
         FileOutputStream fos = new FileOutputStream(OUTPUT_PATH2);
         FileDescriptor fd = fos.getFD();
         mMediaRecorder.setOutputFile(fd);
         long maxFileSize = MAX_FILE_SIZE * 10;
         recordMedia(maxFileSize, mOutFile2);
+        assertFalse(checkLocationInFile(OUTPUT_PATH2));
     }
 
     @TestTargets({
diff --git a/tests/tests/media/src/android/media/cts/MediaScannerNotificationTest.java b/tests/tests/media/src/android/media/cts/MediaScannerNotificationTest.java
index 3c201ca..f6ceacf 100644
--- a/tests/tests/media/src/android/media/cts/MediaScannerNotificationTest.java
+++ b/tests/tests/media/src/android/media/cts/MediaScannerNotificationTest.java
@@ -24,84 +24,72 @@
 import android.os.Environment;
 import android.test.AndroidTestCase;
 
+import java.io.File;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
 
 public class MediaScannerNotificationTest extends AndroidTestCase {
-    private static final int MEDIA_SCANNER_TIME_OUT = 2000;
 
-    private ScannerNotificationReceiver mScannerStartedReceiver;
-    private ScannerNotificationReceiver mScannerFinishedReceiver;
-    private boolean mScannerStarted;
-    private boolean mScannerFinished;
-
-    public void testMediaScannerNotification() throws InterruptedException {
-        mScannerStarted = false;
-        mScannerFinished = false;
-
-        IntentFilter scannerStartedIntentFilter = new IntentFilter(
+    public void testMediaScannerNotification() throws Exception {
+        ScannerNotificationReceiver startedReceiver = new ScannerNotificationReceiver(
                 Intent.ACTION_MEDIA_SCANNER_STARTED);
-        scannerStartedIntentFilter.addDataScheme("file");
-        IntentFilter scannerFinshedIntentFilter = new IntentFilter(
-                Intent.ACTION_MEDIA_SCANNER_FINISHED);
-        scannerFinshedIntentFilter.addDataScheme("file");
-
-        mScannerStartedReceiver = new ScannerNotificationReceiver(
-                Intent.ACTION_MEDIA_SCANNER_STARTED);
-        mScannerFinishedReceiver = new ScannerNotificationReceiver(
+        ScannerNotificationReceiver finishedReceiver = new ScannerNotificationReceiver(
                 Intent.ACTION_MEDIA_SCANNER_FINISHED);
 
-        getContext().registerReceiver(mScannerStartedReceiver, scannerStartedIntentFilter);
-        getContext().registerReceiver(mScannerFinishedReceiver, scannerFinshedIntentFilter);
+        IntentFilter startedIntentFilter = new IntentFilter(Intent.ACTION_MEDIA_SCANNER_STARTED);
+        startedIntentFilter.addDataScheme("file");
+        IntentFilter finshedIntentFilter = new IntentFilter(Intent.ACTION_MEDIA_SCANNER_FINISHED);
+        finshedIntentFilter.addDataScheme("file");
 
-        getContext().sendBroadcast(new Intent(Intent.ACTION_MEDIA_MOUNTED, Uri.parse("file://"
-            + Environment.getExternalStorageDirectory())));
-        mScannerStartedReceiver.waitForCalls(1, MEDIA_SCANNER_TIME_OUT);
-        mScannerFinishedReceiver.waitForCalls(1, MEDIA_SCANNER_TIME_OUT);
+        mContext.registerReceiver(startedReceiver, startedIntentFilter);
+        mContext.registerReceiver(finishedReceiver, finshedIntentFilter);
 
-        assertTrue(mScannerStarted);
-        assertTrue(mScannerFinished);
+        mContext.sendBroadcast(new Intent(Intent.ACTION_MEDIA_MOUNTED, Uri.parse("file://"
+                + Environment.getExternalStorageDirectory())));
+
+        startedReceiver.waitForBroadcast();
+        finishedReceiver.waitForBroadcast();
     }
 
-    class ScannerNotificationReceiver extends BroadcastReceiver {
-        private int mCalls;
-        private int mExpectedCalls;
-        private String mAction;
-        private Object mLock;
+    static class ScannerNotificationReceiver extends BroadcastReceiver {
+
+        private static final int TIMEOUT_MS = 4 * 60 * 1000;
+
+        private final String mAction;
+        private final CountDownLatch mLatch = new CountDownLatch(1);
 
         ScannerNotificationReceiver(String action) {
             mAction = action;
-            reset();
-            mLock = new Object();
-        }
-
-        void reset() {
-            mExpectedCalls = Integer.MAX_VALUE;
-            mCalls = 0;
         }
 
         @Override
         public void onReceive(Context context, Intent intent) {
             if (intent.getAction().equals(mAction)) {
-                if (mAction.equals(Intent.ACTION_MEDIA_SCANNER_STARTED)) {
-                    mScannerStarted = true;
-                } else if (mAction.equals(Intent.ACTION_MEDIA_SCANNER_FINISHED)) {
-                    mScannerFinished = true;
-                }
-                synchronized (mLock) {
-                    mCalls += 1;
-                    if (mCalls >= mExpectedCalls) {
-                        mLock.notify();
-                    }
-                }
+                mLatch.countDown();
             }
         }
 
-        public void waitForCalls(int expectedCalls, long timeout) throws InterruptedException {
-            synchronized(mLock) {
-                mExpectedCalls = expectedCalls;
-                if (mCalls < mExpectedCalls) {
-                    mLock.wait(timeout);
+        public void waitForBroadcast() throws InterruptedException {
+            if (!mLatch.await(TIMEOUT_MS, TimeUnit.MILLISECONDS)) {
+                int numFiles = countFiles(Environment.getExternalStorageDirectory());
+                fail("Failed to receive broadcast in " + TIMEOUT_MS + "ms for " + mAction
+                        + " while trying to scan " + numFiles + " files!");
+            }
+        }
+
+        private int countFiles(File dir) {
+            int count = 0;
+            File[] files = dir.listFiles();
+            if (files != null) {
+                for (File file : files) {
+                    if (file.isDirectory()) {
+                        count += countFiles(file);
+                    } else {
+                        count++;
+                    }
                 }
             }
+            return count;
         }
     }
 }
diff --git a/tests/tests/media/src/android/media/cts/RingtoneTest.java b/tests/tests/media/src/android/media/cts/RingtoneTest.java
index 84409a3..1ae652e 100644
--- a/tests/tests/media/src/android/media/cts/RingtoneTest.java
+++ b/tests/tests/media/src/android/media/cts/RingtoneTest.java
@@ -52,6 +52,8 @@
         int maxVolume = mAudioManager.getStreamMaxVolume(AudioManager.STREAM_RING);
         mAudioManager.setStreamVolume(AudioManager.STREAM_RING, maxVolume / 2,
                 AudioManager.FLAG_ALLOW_RINGER_MODES);
+        // make sure that we are not in silent mode
+        mAudioManager.setRingerMode(AudioManager.RINGER_MODE_NORMAL);
     }
 
     @Override
@@ -110,6 +112,9 @@
         assertEquals(AudioManager.STREAM_MUSIC, mRingtone.getStreamType());
         mRingtone.setStreamType(AudioManager.STREAM_ALARM);
         assertEquals(AudioManager.STREAM_ALARM, mRingtone.getStreamType());
+        // make sure we play on STREAM_RING because we the volume on this stream is not 0
+        mRingtone.setStreamType(AudioManager.STREAM_RING);
+        assertEquals(AudioManager.STREAM_RING, mRingtone.getStreamType());
 
         mRingtone.play();
         assertTrue(mRingtone.isPlaying());
diff --git a/tests/tests/mediastress/src/android/mediastress/cts/MediaRecorderStressTest.java b/tests/tests/mediastress/src/android/mediastress/cts/MediaRecorderStressTest.java
index 0ca8f99..1615159 100644
--- a/tests/tests/mediastress/src/android/mediastress/cts/MediaRecorderStressTest.java
+++ b/tests/tests/mediastress/src/android/mediastress/cts/MediaRecorderStressTest.java
@@ -39,7 +39,7 @@
     private static String TAG = "MediaRecorderStressTest";
     private static final int NUMBER_OF_CAMERA_STRESS_LOOPS = 50;
     private static final int NUMBER_OF_RECORDER_STRESS_LOOPS = 50;
-    private static final int NUMBER_OF_RECORDERANDPLAY_STRESS_LOOPS = 50;
+    private static final int NUMBER_OF_RECORDERANDPLAY_STRESS_LOOPS = 25;
     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
@@ -60,7 +60,6 @@
     private static CamcorderProfile profile =
                         CamcorderProfile.get(mCameraId, mProfileQuality);
 
-    private int mIterations = 50;
     private int mVideoEncoder;
     private int mAudioEncoder;
     private int mFrameRate;
@@ -326,7 +325,7 @@
                 + NUMBER_OF_RECORDERANDPLAY_STRESS_LOOPS + "\n");
 
         output.write("No of loop: ");
-        for (int i = 0; i < mIterations; i++){
+        for (int i = 0; i < NUMBER_OF_RECORDERANDPLAY_STRESS_LOOPS; i++){
             filename = OUTPUT_FILE + i + OUTPUT_FILE_EXT;
             Log.v(TAG, filename);
             runOnLooper(new Runnable() {
@@ -335,7 +334,7 @@
                     mRecorder = new MediaRecorder();
                 }
             });
-            Log.v(TAG, "iterations : " + mIterations);
+            Log.v(TAG, "iterations : " + i);
             Log.v(TAG, "videoEncoder : " + mVideoEncoder);
             Log.v(TAG, "audioEncoder : " + mAudioEncoder);
             Log.v(TAG, "frameRate : " + mFrameRate);
diff --git a/tests/tests/nativemedia/Android.mk b/tests/tests/nativemedia/Android.mk
index 928ebcd..94bc83e 100644
--- a/tests/tests/nativemedia/Android.mk
+++ b/tests/tests/nativemedia/Android.mk
@@ -3,7 +3,7 @@
 LOCAL_PATH:= $(call my-dir)
 include $(CLEAR_VARS)
 
-LOCAL_MODULE_TAGS := tests
+LOCAL_MODULE_TAGS := optional
 
 LOCAL_C_INCLUDES:= \
     bionic \
@@ -27,8 +27,9 @@
 
 LOCAL_CFLAGS += -DXP_UNIX
 
-LOCAL_MODULE:= NativeMediaTest
+LOCAL_MODULE := CtsNativeMediaTestCases
 
 LOCAL_MODULE_PATH := $(TARGET_OUT_DATA)/nativetest
 
-include $(BUILD_EXECUTABLE)
\ No newline at end of file
+LOCAL_CTS_TEST_PACKAGE := android.nativemedia
+include $(BUILD_CTS_EXECUTABLE)
diff --git a/tests/tests/nativemedia/src/SLObjectCreationTest.cpp b/tests/tests/nativemedia/src/SLObjectCreationTest.cpp
index e63e42fa3..e2f32c7 100644
--- a/tests/tests/nativemedia/src/SLObjectCreationTest.cpp
+++ b/tests/tests/nativemedia/src/SLObjectCreationTest.cpp
@@ -358,11 +358,6 @@
     AudioPlayerFromAdtsAbqToPcmBqCreation();
 }
 
-TEST_F(SLObjectCreationTest, testAudioRecorderCreation) {
-    LOGV("Test Fixture: AudioRecorderCreation");
-    AudioRecorderCreation();
-}
-
 int main(int argc, char **argv) {
     testing::InitGoogleTest(&argc, argv);
 
diff --git a/tests/tests/openglperf/Android.mk b/tests/tests/openglperf/Android.mk
index e510aa7..57e6ec3 100644
--- a/tests/tests/openglperf/Android.mk
+++ b/tests/tests/openglperf/Android.mk
@@ -27,7 +27,7 @@
 
 LOCAL_PACKAGE_NAME := CtsOpenGlPerfTestCases
 
-LOCAL_INSTRUMENTATION_FOR := replicaisland
+LOCAL_INSTRUMENTATION_FOR := com.replica.replicaisland
 
 LOCAL_SDK_VERSION := current
 
diff --git a/tests/tests/openglperf/AndroidManifest.xml b/tests/tests/openglperf/AndroidManifest.xml
index 8e48eb0..e47c0bc 100644
--- a/tests/tests/openglperf/AndroidManifest.xml
+++ b/tests/tests/openglperf/AndroidManifest.xml
@@ -25,7 +25,7 @@
 
     <!-- Two activities are used -->
     <instrumentation
-        android:targetPackage="replicaisland"
+        android:targetPackage="com.replica.replicaisland"
         android:name="android.test.InstrumentationTestRunner" />
     <instrumentation
         android:targetPackage="com.android.cts.openglperf"
@@ -42,6 +42,7 @@
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
+        <activity android:name="android.openglperf.cts.TextureTestActivity" />
     </application>
 
 </manifest>
diff --git a/tests/tests/openglperf/src/android/openglperf/cts/GlAppSwitchTest.java b/tests/tests/openglperf/src/android/openglperf/cts/GlAppSwitchTest.java
index 2d7df8a..aa4ca49 100644
--- a/tests/tests/openglperf/src/android/openglperf/cts/GlAppSwitchTest.java
+++ b/tests/tests/openglperf/src/android/openglperf/cts/GlAppSwitchTest.java
@@ -80,8 +80,6 @@
         mTaskIdSelf = activity.getTaskId();
         // wait further to render some frames
         Thread.sleep(1000);
-        // terminate if it is already running
-        terminateReplicaIsland();
 
         Intent intentIsland = new Intent(Intent.ACTION_MAIN);
         intentIsland.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
@@ -98,7 +96,6 @@
     @Override
     protected void tearDown() throws Exception {
         showOrHideReplicaIsland(false);
-        terminateReplicaIsland();
         super.tearDown();
     }
 
@@ -140,7 +137,8 @@
         List<ActivityManager.RunningTaskInfo> tasks =
                 mActivityManager.getRunningTasks(MAX_RUNNING_TASKS);
         for (ActivityManager.RunningTaskInfo info : tasks) {
-            if (info.id == mTaskIdReplica) {
+            String packageName = info.baseActivity.getPackageName();
+            if (packageName.contentEquals(REPLICA_ISLAND_PACKAGE)) {
                 foundReplica = true;
                 break;
             }
@@ -156,12 +154,4 @@
     private void showOrHideReplicaIsland(boolean show) {
         mActivityManager.moveTaskToFront(show ? mTaskIdReplica : mTaskIdSelf, 0);
     }
-
-    /**
-     * this API works only when the replica island is in background.
-     */
-    private void terminateReplicaIsland() {
-        mActivityManager.killBackgroundProcesses(REPLICA_ISLAND_PACKAGE);
-        getInstrumentation().waitForIdleSync();
-    }
 }
diff --git a/tests/tests/openglperf/src/android/openglperf/cts/GlTextureCoordTest.java b/tests/tests/openglperf/src/android/openglperf/cts/GlTextureCoordTest.java
new file mode 100644
index 0000000..6a0a14e
--- /dev/null
+++ b/tests/tests/openglperf/src/android/openglperf/cts/GlTextureCoordTest.java
@@ -0,0 +1,38 @@
+/*
+ * 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.openglperf.cts;
+
+import android.app.Instrumentation;
+import android.content.Intent;
+import android.test.ActivityInstrumentationTestCase2;
+import android.util.Log;
+
+/**
+ * check TextureTestRenderer for details
+ */
+public class GlTextureCoordTest extends
+        ActivityInstrumentationTestCase2<TextureTestActivity> {
+
+    public GlTextureCoordTest() {
+        super(TextureTestActivity.class);
+    }
+
+    public void testTextureCoord() throws InterruptedException {
+        getActivity();
+        Thread.sleep(3000); // give some time to render some frames
+    }
+}
diff --git a/tests/tests/openglperf/src/android/openglperf/cts/TextureTestActivity.java b/tests/tests/openglperf/src/android/openglperf/cts/TextureTestActivity.java
new file mode 100644
index 0000000..4d7d641
--- /dev/null
+++ b/tests/tests/openglperf/src/android/openglperf/cts/TextureTestActivity.java
@@ -0,0 +1,52 @@
+/*
+ * 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.openglperf.cts;
+
+import android.app.Activity;
+import android.content.Context;
+import android.opengl.GLSurfaceView;
+import android.os.Bundle;
+
+public class TextureTestActivity extends Activity {
+    private GLSurfaceView mGLView;
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        mGLView = new TextureTestSurfaceView(this);
+        setContentView(mGLView);
+    }
+
+    @Override
+    protected void onPause() {
+        super.onPause();
+        mGLView.onPause();
+    }
+
+    @Override
+    protected void onResume() {
+        super.onResume();
+        mGLView.onResume();
+    }
+}
+
+class TextureTestSurfaceView extends GLSurfaceView {
+
+    public TextureTestSurfaceView(Context context){
+        super(context);
+        setRenderer(new TextureTestRenderer());
+    }
+}
\ No newline at end of file
diff --git a/tests/tests/openglperf/src/android/openglperf/cts/TextureTestRenderer.java b/tests/tests/openglperf/src/android/openglperf/cts/TextureTestRenderer.java
new file mode 100644
index 0000000..96b2e44
--- /dev/null
+++ b/tests/tests/openglperf/src/android/openglperf/cts/TextureTestRenderer.java
@@ -0,0 +1,184 @@
+/*
+ * 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.openglperf.cts;
+
+import android.graphics.Bitmap;
+import android.graphics.Color;
+import android.opengl.GLSurfaceView;
+import android.opengl.GLU;
+import android.opengl.GLUtils;
+import android.util.Log;
+
+import java.nio.ByteBuffer;
+import java.nio.ByteOrder;
+import java.nio.FloatBuffer;
+import java.nio.IntBuffer;
+
+import javax.microedition.khronos.egl.EGLConfig;
+import javax.microedition.khronos.opengles.GL10;
+import javax.microedition.khronos.opengles.GL11;
+import javax.microedition.khronos.opengles.GL11Ext;
+
+import junit.framework.Assert;
+
+/**
+ * This test is for checking an issue
+ * mentioned in https://groups.google.com/group/android-developers/browse_thread/thread/
+ * 9c0ccb1a215586a8/2f28259213340eab?hl=en&lnk=gst&q=opengl+galaxy#2f28259213340eab
+ * The GPU driver seems to change texture coordinates inside glDrawTexfOES, and
+ * texture inside following drawing does not work as expected.
+ * The thread also mentions texture malfunctioning with rotation,
+ * but that was not observed, but the case will cover both.
+ */
+public class TextureTestRenderer implements GLSurfaceView.Renderer {
+    private static final String TAG = "TextureTest";
+    private static final float[] mVerticesData = {
+        // X, Y, Z, s, t
+        -1.0f, -1.0f, 0, 0.6f, 0.f,
+        1.0f, -1.0f, 0, 0.7f, 0.f,
+        -1.0f,  1.0f, 0, 0.6f, 0.1f,
+        1.0f,   1.0f, 0, 0.7f, 0.1f,
+    };
+    private static final int FLOAT_SIZE_BYTES = 4;
+    private static final int GEOMETRY_STRIDE = 20;
+
+    private final FloatBuffer mVertices;
+    private final Bitmap mBitmap;
+    private int mTextureID;
+    private boolean mOesDrawTextureSupported = false;
+    private int mWidth;
+    private int mHeight;
+    private float mRotationAngle = 0f;
+
+    public TextureTestRenderer() {
+        mVertices = ByteBuffer.allocateDirect(mVerticesData.length
+                * FLOAT_SIZE_BYTES).order(ByteOrder.nativeOrder()).asFloatBuffer();
+        mVertices.put(mVerticesData).position(0);
+        // 4x4 texture with 4 colors
+        int[] colors = {
+                Color.RED, Color.RED, Color.BLUE, Color.BLUE,
+                Color.RED, Color.RED, Color.BLUE, Color.BLUE,
+                Color.GREEN, Color.GREEN, Color.CYAN, Color.CYAN,
+                Color.GREEN, Color.GREEN, Color.CYAN, Color.CYAN
+        };
+        mBitmap = Bitmap.createBitmap(colors, 4, 4, Bitmap.Config.ARGB_8888);
+    }
+
+    public void onDrawFrame(GL10 gl) {
+        // Redraw background color
+        gl.glClear(GL10.GL_COLOR_BUFFER_BIT | GL10.GL_DEPTH_BUFFER_BIT);
+
+        gl.glTexEnvx(GL10.GL_TEXTURE_ENV, GL10.GL_TEXTURE_ENV_MODE,
+                GL10.GL_REPLACE);
+
+        // Set GL_MODELVIEW transformation mode
+        gl.glMatrixMode(GL10.GL_MODELVIEW);
+        gl.glLoadIdentity(); // reset the matrix to its default state
+
+        // When using GL_MODELVIEW, you must set the view point
+        GLU.gluLookAt(gl, 0, 0, -5, 0f, 0f, 0f, 0f, 1.0f, 0.0f);
+
+        gl.glActiveTexture(GL10.GL_TEXTURE0);
+        gl.glBindTexture(GL10.GL_TEXTURE_2D, mTextureID);
+        gl.glEnable(GL10.GL_TEXTURE_2D);
+
+        // red for default color
+        gl.glColor4f(1.0f, 0f, 0f, 1.0f);
+        gl.glVertexPointer(3, GL10.GL_FLOAT, GEOMETRY_STRIDE, mVertices);
+        gl.glTexCoordPointer(2, GL10.GL_FLOAT, GEOMETRY_STRIDE, mVertices
+                .duplicate().position(3));
+        if (mOesDrawTextureSupported) {
+            // left / bottom / width / height (negative w/h flip the image)
+            int crop[] = new int[] { 0, 0, 4, 4 };
+
+            ((GL11) gl).glTexParameteriv(GL10.GL_TEXTURE_2D,
+                    GL11Ext.GL_TEXTURE_CROP_RECT_OES, crop, 0);
+            // 4x4 drawing in left-bottom corner
+            ((GL11Ext) gl).glDrawTexfOES(0, 0, 0, 4, 4);
+        }
+        gl.glPushMatrix();
+        gl.glRotatef(mRotationAngle, 0f, 0f, 1f);
+        mRotationAngle += 10f;
+        if (mRotationAngle > 360f) {
+            mRotationAngle = 0f;
+        }
+        gl.glDrawArrays(GL10.GL_TRIANGLE_STRIP, 0, 4);
+        gl.glPopMatrix();
+        // for one pixel
+        IntBuffer pixel = ByteBuffer.allocateDirect(4).asIntBuffer();
+        gl.glReadPixels(mWidth / 2, mHeight / 2, 1, 1, GL10.GL_RGBA,
+                GL10.GL_UNSIGNED_BYTE, pixel);
+        pixel.position(0);
+        Log.i(TAG, "pixel read " + Integer.toHexString(pixel.get(0)));
+
+        Assert.assertEquals(0x0000ffff, pixel.get(0)); // BLUE in RGBA
+
+        checkGlError(gl, "onDrawFrame");
+    }
+
+    public void onSurfaceChanged(GL10 gl, int width, int height) {
+        mWidth = width;
+        mHeight = height;
+        gl.glViewport(0, 0, width, height);
+
+        // make adjustments for screen ratio
+        float ratio = (float) width / height;
+        gl.glMatrixMode(GL10.GL_PROJECTION); // set matrix to projection mode
+        gl.glLoadIdentity(); // reset the matrix to its default state
+        gl.glFrustumf(-2 * ratio, 2 * ratio, -2, 2, 3, 7);
+        checkGlError(gl, "onSurfaceChanged");
+    }
+
+    public void onSurfaceCreated(GL10 gl, EGLConfig config) {
+        String extensions = gl.glGetString(GL10.GL_EXTENSIONS);
+        Log.i(TAG, "extensions: " + extensions);
+        if (extensions.contains("GL_OES_draw_texture")) {
+            mOesDrawTextureSupported = true;
+        }
+        // Set the background frame color
+        gl.glClearColor(0f, 0f, 0f, 1.0f);
+        gl.glEnable(GL10.GL_TEXTURE_2D);
+
+        gl.glEnableClientState(GL10.GL_VERTEX_ARRAY);
+        gl.glEnableClientState(GL10.GL_TEXTURE_COORD_ARRAY);
+
+        int[] textures = new int[1];
+        gl.glGenTextures(1, textures, 0);
+
+        mTextureID = textures[0];
+        gl.glBindTexture(GL10.GL_TEXTURE_2D, mTextureID);
+
+        gl.glTexParameterf(GL10.GL_TEXTURE_2D, GL10.GL_TEXTURE_MIN_FILTER,
+                GL10.GL_NEAREST);
+        gl.glTexParameterf(GL10.GL_TEXTURE_2D, GL10.GL_TEXTURE_MAG_FILTER,
+                GL10.GL_NEAREST); // necessary due to low resolution texture
+
+        gl.glTexParameterf(GL10.GL_TEXTURE_2D, GL10.GL_TEXTURE_WRAP_S,
+                GL10.GL_CLAMP_TO_EDGE);
+        gl.glTexParameterf(GL10.GL_TEXTURE_2D, GL10.GL_TEXTURE_WRAP_T,
+                GL10.GL_CLAMP_TO_EDGE);
+        GLUtils.texImage2D(GL10.GL_TEXTURE_2D, 0, mBitmap, 0);
+        checkGlError(gl, "onSurfaceCreated");
+    }
+
+    private void checkGlError(GL10 gl, String op) {
+        int error;
+        while ((error = gl.glGetError()) != GL10.GL_NO_ERROR) {
+            Log.e(TAG, op + ": glError " + error);
+            throw new IllegalStateException(op + ": glError " + error);
+        }
+    }
+}
diff --git a/tests/tests/os/src/android/os/cts/BuildVersionTest.java b/tests/tests/os/src/android/os/cts/BuildVersionTest.java
index c264681..6cb09bb 100644
--- a/tests/tests/os/src/android/os/cts/BuildVersionTest.java
+++ b/tests/tests/os/src/android/os/cts/BuildVersionTest.java
@@ -16,8 +16,6 @@
 
 package android.os.cts;
 
-import dalvik.annotation.TestTargetClass;
-
 import android.os.Build;
 import android.util.Log;
 
@@ -27,14 +25,14 @@
 
 import junit.framework.TestCase;
 
-@TestTargetClass(Build.VERSION.class)
 public class BuildVersionTest extends TestCase {
 
     private static final String LOG_TAG = "BuildVersionTest";
     private static final Set<String> EXPECTED_RELEASES =
-            new HashSet<String>(Arrays.asList("4.0", "4.0.1", "4.0.2"));
-    private static final int EXPECTED_SDK = 14;
+            new HashSet<String>(Arrays.asList("4.0.3", "4.0.4"));
+    private static final int EXPECTED_SDK = 15;
 
+    @SuppressWarnings("deprecation")
     public void testReleaseVersion() {
         // Applications may rely on the exact release version
         assertTrue("Your Build.VERSION.RELEASE of " + Build.VERSION.RELEASE
@@ -50,7 +48,7 @@
     }
 
     /**
-     * Verifies {@link Build.FINGERPRINT} follows expected format:
+     * Verifies {@link Build#FINGERPRINT} follows expected format:
      * <p/>
      * <code>
      * (BRAND)/(PRODUCT)/(DEVICE):(VERSION.RELEASE)/(BUILD_ID)/
diff --git a/tests/tests/permission2/AndroidManifest.xml b/tests/tests/permission2/AndroidManifest.xml
index e8d3a3a..8f77fad 100755
--- a/tests/tests/permission2/AndroidManifest.xml
+++ b/tests/tests/permission2/AndroidManifest.xml
@@ -39,6 +39,8 @@
     <!--  need app that has CALL_PHONE but not PROCESS_OUTGOING_CALL -->
     <uses-permission android:name="android.permission.CALL_PHONE"/>
 
+    <uses-permission android:name="android.permission.WRITE_CONTACTS"/>
+
     <instrumentation android:name="android.test.InstrumentationTestRunner"
                      android:targetPackage="com.android.cts.permission2"
                      android:label="More CTS tests for permissions"/>
diff --git a/tests/tests/permission2/src/android/permission2/cts/ReadSocialStreamPermissionTest.java b/tests/tests/permission2/src/android/permission2/cts/ReadSocialStreamPermissionTest.java
new file mode 100644
index 0000000..eaf6fdf
--- /dev/null
+++ b/tests/tests/permission2/src/android/permission2/cts/ReadSocialStreamPermissionTest.java
@@ -0,0 +1,80 @@
+/*
+ * 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.permission2.cts;
+
+import android.content.ContentResolver;
+import android.content.ContentUris;
+import android.net.Uri;
+import android.provider.ContactsContract.Contacts;
+import android.provider.ContactsContract.RawContacts;
+import android.provider.ContactsContract.StreamItems;
+import android.test.AndroidTestCase;
+
+public class ReadSocialStreamPermissionTest extends AndroidTestCase {
+
+    private ContentResolver mResolver;
+
+    @Override
+    protected void setUp() throws Exception {
+        super.setUp();
+        mResolver = mContext.getContentResolver();
+    }
+
+    public void testReadSocialStreamPermission_byRawContactId() throws Exception {
+        try {
+            mResolver.query(Uri.withAppendedPath(
+                    ContentUris.withAppendedId(RawContacts.CONTENT_URI, 1337),
+                    Contacts.StreamItems.CONTENT_DIRECTORY), null, null, null, null);
+            fail("Expected a READ_SOCIAL_STREAM exception");
+        } catch (SecurityException e) {
+            // Expect a READ_SOCIAL_STREAM exception.
+        }
+    }
+
+    public void testReadSocialStreamPermission_byContactId() throws Exception {
+        try {
+            mResolver.query(Uri.withAppendedPath(
+                    ContentUris.withAppendedId(Contacts.CONTENT_URI, 1337),
+                    Contacts.StreamItems.CONTENT_DIRECTORY), null, null, null, null);
+            fail("Expected a READ_SOCIAL_STREAM exception");
+        } catch (SecurityException e) {
+            // Expect a READ_SOCIAL_STREAM exception.
+        }
+    }
+
+    public void testReadSocialStreamPermission_byLookUpKey() throws Exception {
+        try {
+            mResolver.query(Contacts.CONTENT_LOOKUP_URI.buildUpon()
+                    .appendPath("lookDownKey")
+                    .appendPath(Contacts.StreamItems.CONTENT_DIRECTORY)
+                    .build(), null, null, null, null);
+            fail("Expected a READ_SOCIAL_STREAM exception");
+        } catch (SecurityException e) {
+            // Expect a READ_SOCIAL_STREAM exception.
+        }
+    }
+
+    public void testReadSocialStreamPermission_byStreamItemId() throws Exception {
+        try {
+            mResolver.query(ContentUris.withAppendedId(StreamItems.CONTENT_URI, 1337),
+                    null, null, null, null);
+            fail("Expected a READ_SOCIAL_STREAM exception");
+        } catch (SecurityException e) {
+            // Expect a READ_SOCIAL_STREAM exception.
+        }
+    }
+}
diff --git a/tests/tests/permission2/src/android/permission2/cts/WriteSocialStreamPermissionTest.java b/tests/tests/permission2/src/android/permission2/cts/WriteSocialStreamPermissionTest.java
new file mode 100644
index 0000000..262fcfa
--- /dev/null
+++ b/tests/tests/permission2/src/android/permission2/cts/WriteSocialStreamPermissionTest.java
@@ -0,0 +1,58 @@
+/*
+ * 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.permission2.cts;
+
+import android.content.ContentResolver;
+import android.content.ContentUris;
+import android.content.ContentValues;
+import android.net.Uri;
+import android.provider.ContactsContract.RawContacts;
+import android.provider.ContactsContract.StreamItems;
+import android.test.AndroidTestCase;
+
+public class WriteSocialStreamPermissionTest extends AndroidTestCase {
+
+    private ContentResolver mResolver;
+
+    @Override
+    protected void setUp() throws Exception {
+        super.setUp();
+        mResolver = mContext.getContentResolver();
+    }
+
+    public void testWriteSocialStreamPermission_byContentDirectory() throws Exception {
+        try {
+            ContentValues values = new ContentValues();
+            mResolver.insert(Uri.withAppendedPath(
+                    ContentUris.withAppendedId(RawContacts.CONTENT_URI, 1337),
+                    RawContacts.StreamItems.CONTENT_DIRECTORY), values);
+            fail("Expected a WRITE_SOCIAL_STREAM exception");
+        } catch (SecurityException e) {
+            // Expect a WRITE_SOCIAL_STREAM exception.
+        }
+    }
+
+    public void testWriteSocialStreamPermission_byContentUri() throws Exception {
+        try {
+            ContentValues values = new ContentValues();
+            mResolver.insert(StreamItems.CONTENT_URI, values);
+            fail("Expected a WRITE_SOCIAL_STREAM exception");
+        } catch (SecurityException e) {
+            // Expect a WRITE_SOCIAL_STREAM exception.
+        }
+    }
+}
diff --git a/tests/tests/provider/src/android/provider/cts/CalendarTest.java b/tests/tests/provider/src/android/provider/cts/CalendarTest.java
index 9999d6c..e453820 100644
--- a/tests/tests/provider/src/android/provider/cts/CalendarTest.java
+++ b/tests/tests/provider/src/android/provider/cts/CalendarTest.java
@@ -23,6 +23,7 @@
 import android.content.EntityIterator;
 import android.database.Cursor;
 import android.database.DatabaseUtils;
+import android.database.SQLException;
 import android.net.Uri;
 import android.os.Bundle;
 import android.os.Environment;
@@ -30,6 +31,7 @@
 import android.provider.CalendarContract.Attendees;
 import android.provider.CalendarContract.CalendarEntity;
 import android.provider.CalendarContract.Calendars;
+import android.provider.CalendarContract.Colors;
 import android.provider.CalendarContract.Events;
 import android.provider.CalendarContract.EventsEntity;
 import android.provider.CalendarContract.ExtendedProperties;
@@ -39,6 +41,7 @@
 import android.test.InstrumentationTestCase;
 import android.test.InstrumentationCtsTestRunner;
 import android.test.suitebuilder.annotation.*;
+import android.text.TextUtils;
 import android.text.format.DateUtils;
 import android.text.format.Time;
 import android.util.Log;
@@ -79,6 +82,7 @@
                 Calendars.NAME,
                 Calendars.CALENDAR_DISPLAY_NAME,
                 Calendars.CALENDAR_COLOR,
+                Calendars.CALENDAR_COLOR_KEY,
                 Calendars.CALENDAR_ACCESS_LEVEL,
                 Calendars.VISIBLE,
                 Calendars.SYNC_EVENTS,
@@ -89,6 +93,8 @@
                 Calendars.CAN_MODIFY_TIME_ZONE,
                 Calendars.MAX_REMINDERS,
                 Calendars.ALLOWED_REMINDERS,
+                Calendars.ALLOWED_AVAILABILITY,
+                Calendars.ALLOWED_ATTENDEE_TYPES,
                 Calendars.DELETED,
                 Calendars.CAL_SYNC1,
                 Calendars.CAL_SYNC2,
@@ -145,6 +151,8 @@
             values.put(Calendars.CAN_MODIFY_TIME_ZONE, seed % 2);
             values.put(Calendars.MAX_REMINDERS, 3);
             values.put(Calendars.ALLOWED_REMINDERS, "0,1,2");   // does not include SMS (3)
+            values.put(Calendars.ALLOWED_ATTENDEE_TYPES, "0,1,2,3");
+            values.put(Calendars.ALLOWED_AVAILABILITY, "0,1,2,3");
             values.put(Calendars.CAL_SYNC1, "SYNC1:" + seedString);
             values.put(Calendars.CAL_SYNC2, "SYNC2:" + seedString);
             values.put(Calendars.CAL_SYNC3, "SYNC3:" + seedString);
@@ -299,6 +307,8 @@
             Events.DTEND,
             Events.EVENT_TIMEZONE,
             Events.EVENT_END_TIMEZONE,
+            Events.EVENT_COLOR,
+            Events.EVENT_COLOR_KEY,
             Events.DURATION,
             Events.ALL_DAY,
             Events.ACCESS_LEVEL,
@@ -325,10 +335,11 @@
             Events.SYNC_DATA5,
             Events.DIRTY,
             Events.SYNC_DATA8,
-            Events.SYNC_DATA2, // Events.SYNC_DATA1
-            // Events.SYNC_DATA2
-            // Events.SYNC_DATA3
-            // Events.SYNC_DATA4
+            Events.SYNC_DATA2,
+            Events.SYNC_DATA1,
+            Events.SYNC_DATA2,
+            Events.SYNC_DATA3,
+            Events.SYNC_DATA4,
         };
         // @formatter:on
 
@@ -355,6 +366,7 @@
             values.put(Events.DTSTART, seed);
             values.put(Events.DTEND, seed + DateUtils.HOUR_IN_MILLIS);
             values.put(Events.EVENT_TIMEZONE, TIME_ZONES[seed % TIME_ZONES.length]);
+            values.put(Events.EVENT_COLOR, seed);
             // values.put(Events.EVENT_TIMEZONE2, TIME_ZONES[(seed +1) %
             // TIME_ZONES.length]);
             if ((seed % 2) == 0) {
@@ -616,6 +628,115 @@
         }
     }
 
+    /**
+     * Helper class for manipulating entries in the Colors table.
+     */
+    private static class ColorHelper {
+        public static final String WHERE_COLOR_ACCOUNT = Colors.ACCOUNT_NAME + "=? AND "
+                + Colors.ACCOUNT_TYPE + "=?";
+        public static final String WHERE_COLOR_ACCOUNT_AND_INDEX = WHERE_COLOR_ACCOUNT + " AND "
+                + Colors.COLOR_KEY + "=?";
+
+        public static final String[] COLORS_PROJECTION = new String[] {
+                Colors._ID, // 0
+                Colors.ACCOUNT_NAME, // 1
+                Colors.ACCOUNT_TYPE, // 2
+                Colors.DATA, // 3
+                Colors.COLOR_TYPE, // 4
+                Colors.COLOR_KEY, // 5
+                Colors.COLOR, // 6
+        };
+        // indexes into projection
+        public static final int COLORS_ID_INDEX = 0;
+        public static final int COLORS_INDEX_INDEX = 5;
+        public static final int COLORS_COLOR_INDEX = 6;
+
+        public static final int[] DEFAULT_TYPES = new int[] {
+                Colors.TYPE_CALENDAR, Colors.TYPE_CALENDAR, Colors.TYPE_CALENDAR,
+                Colors.TYPE_CALENDAR, Colors.TYPE_EVENT, Colors.TYPE_EVENT, Colors.TYPE_EVENT,
+                Colors.TYPE_EVENT,
+        };
+        public static final int[] DEFAULT_COLORS = new int[] {
+                0xFFFF0000, 0xFF00FF00, 0xFF0000FF, 0xFFAA00AA, 0xFF00AAAA, 0xFF333333, 0xFFAAAA00,
+                0xFFAAAAAA,
+        };
+        public static final String[] DEFAULT_INDICES = new String[] {
+                "000", "001", "010", "011", "100", "101", "110", "111",
+        };
+
+        public static final int C_COLOR_0 = 0;
+        public static final int C_COLOR_1 = 1;
+        public static final int C_COLOR_2 = 2;
+        public static final int C_COLOR_3 = 3;
+        public static final int E_COLOR_0 = 4;
+        public static final int E_COLOR_1 = 5;
+        public static final int E_COLOR_2 = 6;
+        public static final int E_COLOR_3 = 7;
+
+        // do not instantiate
+        private ColorHelper() {
+        }
+
+        /**
+         * Adds a new color to the colors table.
+         *
+         * @return the _id of the new color, or -1 on failure
+         */
+        public static long addColor(ContentResolver resolver, String accountName,
+                String accountType, String data, String index, int type, int color) {
+            Uri uri = asSyncAdapter(Colors.CONTENT_URI, accountName, accountType);
+
+            ContentValues colorValues = new ContentValues();
+            colorValues.put(Colors.DATA, data);
+            colorValues.put(Colors.COLOR_KEY, index);
+            colorValues.put(Colors.COLOR_TYPE, type);
+            colorValues.put(Colors.COLOR, color);
+            Uri result = resolver.insert(uri, colorValues);
+            return ContentUris.parseId(result);
+        }
+
+        /**
+         * Finds the color specified by an account name/type and a color index.
+         * The returned cursor will use {@link ColorHelper#COLORS_PROJECTION}.
+         */
+        public static Cursor findColorByIndex(ContentResolver resolver, String accountName,
+                String accountType, String index) {
+            return resolver.query(Colors.CONTENT_URI, COLORS_PROJECTION,
+                    WHERE_COLOR_ACCOUNT_AND_INDEX,
+                    new String[] {accountName, accountType, index}, null);
+        }
+
+        public static Cursor findColorsByAccount(ContentResolver resolver, String accountName,
+                String accountType) {
+            return resolver.query(Colors.CONTENT_URI, COLORS_PROJECTION, WHERE_COLOR_ACCOUNT,
+                    new String[] { accountName, accountType }, null);
+        }
+
+        /**
+         * Adds a default set of test colors to the Colors table under the given
+         * account.
+         *
+         * @return true if the default colors were added successfully
+         */
+        public static boolean addDefaultColorsToAccount(ContentResolver resolver,
+                String accountName, String accountType) {
+            for (int i = 0; i < DEFAULT_INDICES.length; i++) {
+                long id = addColor(resolver, accountName, accountType, null, DEFAULT_INDICES[i],
+                        DEFAULT_TYPES[i], DEFAULT_COLORS[i]);
+                if (id == -1) {
+                    return false;
+                }
+            }
+            return true;
+        }
+
+        public static void deleteColorsByAccount(ContentResolver resolver, String accountName,
+                String accountType) {
+            Uri uri = asSyncAdapter(Colors.CONTENT_URI, accountName, accountType);
+            resolver.delete(uri, WHERE_COLOR_ACCOUNT, new String[] { accountName, accountType });
+        }
+    }
+
 
     /**
      * Helper class for manipulating entries in the Reminders table.
@@ -1322,6 +1443,339 @@
         removeAndVerifyCalendar(account, calendarId);
     }
 
+    @MediumTest
+    public void testColorWriteRequirements() {
+        String account = "colw_account";
+        String account2 = "colw2_account";
+        int seed = 0;
+        Uri uri = asSyncAdapter(Colors.CONTENT_URI, account, CTS_TEST_TYPE);
+        Uri uri2 = asSyncAdapter(Colors.CONTENT_URI, account2, CTS_TEST_TYPE);
+
+        // Clean up just in case
+        ColorHelper.deleteColorsByAccount(mContentResolver, account, CTS_TEST_TYPE);
+        ColorHelper.deleteColorsByAccount(mContentResolver, account2, CTS_TEST_TYPE);
+
+        ContentValues colorValues = new ContentValues();
+        // Account name/type must be in the query params, so may be left
+        // out here
+        colorValues.put(Colors.DATA, "0");
+        colorValues.put(Colors.COLOR_KEY, "1");
+        colorValues.put(Colors.COLOR_TYPE, 0);
+        colorValues.put(Colors.COLOR, 0xff000000);
+
+        // Verify only a sync adapter can write to Colors
+        try {
+            mContentResolver.insert(Colors.CONTENT_URI, colorValues);
+            fail("Should not allow non-sync adapter to insert colors");
+        } catch (IllegalArgumentException e) {
+            // WAI
+        }
+
+        // Verify everything except DATA is required
+        ContentValues testVals = new ContentValues(colorValues);
+        for (String key : colorValues.keySet()) {
+
+            testVals.remove(key);
+            try {
+                Uri colUri = mContentResolver.insert(uri, testVals);
+                if (!TextUtils.equals(key, Colors.DATA)) {
+                    // The DATA field is allowed to be empty.
+                    fail("Should not allow color creation without " + key);
+                }
+                ColorHelper.deleteColorsByAccount(mContentResolver, account, CTS_TEST_TYPE);
+            } catch (IllegalArgumentException e) {
+                if (TextUtils.equals(key, Colors.DATA)) {
+                    // The DATA field is allowed to be empty.
+                    fail("Should allow color creation without " + key);
+                }
+            }
+            testVals.put(key, colorValues.getAsString(key));
+        }
+
+        // Verify writing a color works
+        Uri col1 = mContentResolver.insert(uri, colorValues);
+
+        // Verify adding the same color fails
+        try {
+            mContentResolver.insert(uri, colorValues);
+            fail("Should not allow adding the same color twice");
+        } catch (IllegalArgumentException e) {
+            // WAI
+        }
+
+        // Verify specifying a different account than the query params doesn't work
+        colorValues.put(Colors.ACCOUNT_NAME, account2);
+        try {
+            mContentResolver.insert(uri, colorValues);
+            fail("Should use the account from the query params, not the values.");
+        } catch (IllegalArgumentException e) {
+            // WAI
+        }
+
+        // Verify adding a color to a different account works
+        Uri col2 = mContentResolver.insert(uri2, colorValues);
+
+        // And a different index on the same account
+        colorValues.put(Colors.COLOR_KEY, "2");
+        Uri col3 = mContentResolver.insert(uri2, colorValues);
+
+        // Verify that all three colors are in the table
+        Cursor c = ColorHelper.findColorsByAccount(mContentResolver, account, CTS_TEST_TYPE);
+        assertEquals(1, c.getCount());
+        c.close();
+        c = ColorHelper.findColorsByAccount(mContentResolver, account2, CTS_TEST_TYPE);
+        assertEquals(2, c.getCount());
+        c.close();
+
+        // Verify deleting them works
+        ColorHelper.deleteColorsByAccount(mContentResolver, account, CTS_TEST_TYPE);
+        ColorHelper.deleteColorsByAccount(mContentResolver, account2, CTS_TEST_TYPE);
+
+        c = ColorHelper.findColorsByAccount(mContentResolver, account, CTS_TEST_TYPE);
+        assertEquals(0, c.getCount());
+        c.close();
+        c = ColorHelper.findColorsByAccount(mContentResolver, account2, CTS_TEST_TYPE);
+        assertEquals(0, c.getCount());
+        c.close();
+    }
+
+    /**
+     * Tests Colors interaction with the Calendars table.
+     */
+    @MediumTest
+    public void testCalendarColors() {
+        String account = "cc_account";
+        int seed = 0;
+
+        // Clean up just in case
+        CalendarHelper.deleteCalendarByAccount(mContentResolver, account);
+        ColorHelper.deleteColorsByAccount(mContentResolver, account, CTS_TEST_TYPE);
+
+        // Test inserting a calendar with an invalid color index
+        ContentValues cv = CalendarHelper.getNewCalendarValues(account, seed++);
+        cv.put(Calendars.CALENDAR_COLOR_KEY, "badIndex");
+        Uri calSyncUri = asSyncAdapter(Calendars.CONTENT_URI, account, CTS_TEST_TYPE);
+        Uri colSyncUri = asSyncAdapter(Colors.CONTENT_URI, account, CTS_TEST_TYPE);
+
+        try {
+            Uri uri = mContentResolver.insert(calSyncUri, cv);
+            fail("Should not allow insertion of invalid color index into Calendars");
+        } catch (IllegalArgumentException e) {
+            // WAI
+        }
+
+        // Test updating a calendar with an invalid color index
+        long calendarId = createAndVerifyCalendar(account, seed++, null);
+        cv.clear();
+        cv.put(Calendars.CALENDAR_COLOR_KEY, "badIndex2");
+        Uri calendarUri = ContentUris.withAppendedId(Calendars.CONTENT_URI, calendarId);
+        try {
+            mContentResolver.update(calendarUri, cv, null, null);
+            fail("Should not allow update of invalid color index into Calendars");
+        } catch (IllegalArgumentException e) {
+            // WAI
+        }
+
+        assertTrue(ColorHelper.addDefaultColorsToAccount(mContentResolver, account, CTS_TEST_TYPE));
+
+        // Test that inserting a valid color index works
+        cv = CalendarHelper.getNewCalendarValues(account, seed++);
+        cv.put(Calendars.CALENDAR_COLOR_KEY, ColorHelper.DEFAULT_INDICES[ColorHelper.C_COLOR_0]);
+
+        Uri uri = mContentResolver.insert(calSyncUri, cv);
+        long calendarId2 = ContentUris.parseId(uri);
+        assertTrue(calendarId2 >= 0);
+        // And updates the calendar's color to the one in the table
+        cv.put(Calendars.CALENDAR_COLOR, ColorHelper.DEFAULT_COLORS[ColorHelper.C_COLOR_0]);
+        verifyCalendar(account, cv, calendarId2, 2);
+
+        // Test that updating a valid color index also updates the color in a
+        // calendar
+        cv.clear();
+        cv.put(Calendars.CALENDAR_COLOR_KEY, ColorHelper.DEFAULT_INDICES[ColorHelper.C_COLOR_0]);
+        mContentResolver.update(calendarUri, cv, null, null);
+        Cursor c = mContentResolver.query(calendarUri,
+                new String[] { Calendars.CALENDAR_COLOR_KEY, Calendars.CALENDAR_COLOR },
+                null, null, null);
+        try {
+            c.moveToFirst();
+            String index = c.getString(0);
+            int color = c.getInt(1);
+            assertEquals(index, ColorHelper.DEFAULT_INDICES[ColorHelper.C_COLOR_0]);
+            assertEquals(color, ColorHelper.DEFAULT_COLORS[ColorHelper.C_COLOR_0]);
+        } finally {
+            if (c != null) {
+                c.close();
+            }
+        }
+
+        // And clearing it doesn't change the color
+        cv.put(Calendars.CALENDAR_COLOR_KEY, (String) null);
+        mContentResolver.update(calendarUri, cv, null, null);
+        c = mContentResolver.query(calendarUri,
+                new String[] { Calendars.CALENDAR_COLOR_KEY, Calendars.CALENDAR_COLOR },
+                null, null, null);
+        try {
+            c.moveToFirst();
+            String index = c.getString(0);
+            int color = c.getInt(1);
+            assertEquals(index, null);
+            assertEquals(ColorHelper.DEFAULT_COLORS[ColorHelper.C_COLOR_0], color);
+        } finally {
+            if (c != null) {
+                c.close();
+            }
+        }
+
+        // Test that setting a calendar color to an event color fails
+        cv.put(Calendars.CALENDAR_COLOR_KEY, ColorHelper.DEFAULT_INDICES[ColorHelper.E_COLOR_0]);
+        try {
+            mContentResolver.update(calendarUri, cv, null, null);
+            fail("Should not allow a calendar to use an event color");
+        } catch (IllegalArgumentException e) {
+            // WAI
+        }
+
+        // Test that you can't remove a color that is referenced by a calendar
+        cv.put(Calendars.CALENDAR_COLOR_KEY, ColorHelper.DEFAULT_INDICES[ColorHelper.C_COLOR_3]);
+        mContentResolver.update(calendarUri, cv, null, null);
+
+        try {
+            mContentResolver.delete(colSyncUri, ColorHelper.WHERE_COLOR_ACCOUNT_AND_INDEX,
+                    new String[] {
+                            account, CTS_TEST_TYPE,
+                            ColorHelper.DEFAULT_INDICES[ColorHelper.C_COLOR_3]
+                    });
+            fail("Should not allow deleting referenced color");
+        } catch (UnsupportedOperationException e) {
+            // WAI
+        }
+
+        // Clean up
+        CalendarHelper.deleteCalendarByAccount(mContentResolver, account);
+        ColorHelper.deleteColorsByAccount(mContentResolver, account, CTS_TEST_TYPE);
+    }
+
+    /**
+     * Tests Colors interaction with the Events table.
+     */
+    @MediumTest
+    public void testEventColors() {
+        String account = "ec_account";
+        int seed = 0;
+
+        // Clean up just in case
+        CalendarHelper.deleteCalendarByAccount(mContentResolver, account);
+        ColorHelper.deleteColorsByAccount(mContentResolver, account, CTS_TEST_TYPE);
+
+        // Test inserting an event with an invalid color index
+        long cal_id = createAndVerifyCalendar(account, seed++, null);
+
+        Uri colSyncUri = asSyncAdapter(Colors.CONTENT_URI, account, CTS_TEST_TYPE);
+
+        ContentValues ev = EventHelper.getNewEventValues(account, seed++, cal_id, false);
+        ev.put(Events.EVENT_COLOR_KEY, "badIndex");
+
+        try {
+            Uri uri = mContentResolver.insert(Events.CONTENT_URI, ev);
+            fail("Should not allow insertion of invalid color index into Events");
+        } catch (IllegalArgumentException e) {
+            // WAI
+        }
+
+        // Test updating an event with an invalid color index fails
+        long event_id = createAndVerifyEvent(account, seed++, cal_id, false, null);
+        ev.clear();
+        ev.put(Events.EVENT_COLOR_KEY, "badIndex2");
+        Uri eventUri = ContentUris.withAppendedId(Events.CONTENT_URI, event_id);
+        try {
+            mContentResolver.update(eventUri, ev, null, null);
+            fail("Should not allow update of invalid color index into Events");
+        } catch (IllegalArgumentException e) {
+            // WAI
+        }
+
+        assertTrue(ColorHelper.addDefaultColorsToAccount(mContentResolver, account, CTS_TEST_TYPE));
+
+        // Test that inserting a valid color index works
+        ev = EventHelper.getNewEventValues(account, seed++, cal_id, false);
+        ev.put(Events.EVENT_COLOR_KEY, ColorHelper.DEFAULT_INDICES[ColorHelper.E_COLOR_0]);
+
+        Uri uri = mContentResolver.insert(Events.CONTENT_URI, ev);
+        long eventId2 = ContentUris.parseId(uri);
+        assertTrue(eventId2 >= 0);
+        // And updates the event's color to the one in the table
+        ev.put(Events.EVENT_COLOR, ColorHelper.DEFAULT_COLORS[ColorHelper.E_COLOR_0]);
+        verifyEvent(ev, eventId2);
+
+        // Test that updating a valid color index also updates the color in an
+        // event
+        ev.clear();
+        ev.put(Events.EVENT_COLOR_KEY, ColorHelper.DEFAULT_INDICES[ColorHelper.E_COLOR_1]);
+        mContentResolver.update(eventUri, ev, null, null);
+        Cursor c = mContentResolver.query(eventUri, new String[] {
+                Events.EVENT_COLOR_KEY, Events.EVENT_COLOR
+        }, null, null, null);
+        try {
+            c.moveToFirst();
+            String index = c.getString(0);
+            int color = c.getInt(1);
+            assertEquals(index, ColorHelper.DEFAULT_INDICES[ColorHelper.E_COLOR_1]);
+            assertEquals(color, ColorHelper.DEFAULT_COLORS[ColorHelper.E_COLOR_1]);
+        } finally {
+            if (c != null) {
+                c.close();
+            }
+        }
+
+        // And clearing it doesn't change the color
+        ev.put(Events.EVENT_COLOR_KEY, (String) null);
+        mContentResolver.update(eventUri, ev, null, null);
+        c = mContentResolver.query(eventUri, new String[] {
+                Events.EVENT_COLOR_KEY, Events.EVENT_COLOR
+        }, null, null, null);
+        try {
+            c.moveToFirst();
+            String index = c.getString(0);
+            int color = c.getInt(1);
+            assertEquals(index, null);
+            assertEquals(ColorHelper.DEFAULT_COLORS[ColorHelper.E_COLOR_1], color);
+        } finally {
+            if (c != null) {
+                c.close();
+            }
+        }
+
+        // Test that setting an event color to a calendar color fails
+        ev.put(Events.EVENT_COLOR_KEY, ColorHelper.DEFAULT_INDICES[ColorHelper.C_COLOR_2]);
+        try {
+            mContentResolver.update(eventUri, ev, null, null);
+            fail("Should not allow an event to use a calendar color");
+        } catch (IllegalArgumentException e) {
+            // WAI
+        }
+
+        // Test that you can't remove a color that is referenced by an event
+        ev.put(Events.EVENT_COLOR_KEY, ColorHelper.DEFAULT_INDICES[ColorHelper.E_COLOR_1]);
+        mContentResolver.update(eventUri, ev, null, null);
+        try {
+            mContentResolver.delete(colSyncUri, ColorHelper.WHERE_COLOR_ACCOUNT_AND_INDEX,
+                    new String[] {
+                            account, CTS_TEST_TYPE,
+                            ColorHelper.DEFAULT_INDICES[ColorHelper.E_COLOR_1]
+                    });
+            fail("Should not allow deleting referenced color");
+        } catch (UnsupportedOperationException e) {
+            // WAI
+        }
+
+        // TODO test colors with exceptions
+
+        // Clean up
+        CalendarHelper.deleteCalendarByAccount(mContentResolver, account);
+        ColorHelper.deleteColorsByAccount(mContentResolver, account, CTS_TEST_TYPE);
+    }
+
     /**
      * Tests creation and manipulation of ExtendedProperties.
      */
@@ -1517,7 +1971,7 @@
                 values, seed++);
         assertEquals(1, mContentResolver.update(uri, updateValues, null, null));
 
-        verifyCalendar(account, values, id);
+        verifyCalendar(account, values, id, 1);
 
         // Update the calendar using selection + args
         String selection = Calendars._ID + "=?";
@@ -1528,7 +1982,7 @@
         assertEquals(1, mContentResolver.update(
                 Calendars.CONTENT_URI, updateValues, selection, selectionArgs));
 
-        verifyCalendar(account, values, id);
+        verifyCalendar(account, values, id, 1);
 
         removeAndVerifyCalendar(account, id);
     }
@@ -1605,6 +2059,26 @@
 
         removeAndVerifyEvent(eventUri, eventValues, account);
 
+        // Attempt to create an event without a calendar ID.
+        ContentValues badValues = EventHelper.getNewEventValues(account, seed++, calendarId, true);
+        badValues.remove(Events.CALENDAR_ID);
+        try {
+            createAndVerifyEvent(account, seed, calendarId, true, badValues);
+            fail("was allowed to create an event without CALENDAR_ID");
+        } catch (IllegalArgumentException iae) {
+            // expected
+        }
+
+        // Validation may be relaxed for content providers, so test missing timezone as app.
+        badValues = EventHelper.getNewEventValues(account, seed++, calendarId, false);
+        badValues.remove(Events.EVENT_TIMEZONE);
+        try {
+            createAndVerifyEvent(account, seed, calendarId, false, badValues);
+            fail("was allowed to create an event without EVENT_TIMEZONE");
+        } catch (IllegalArgumentException iae) {
+            // expected
+        }
+
         removeAndVerifyCalendar(account, calendarId);
     }
 
@@ -1633,6 +2107,17 @@
         updateValues.put(Events.DIRTY, 1);      // provider should have marked as dirty
         verifyEvent(updateValues, eventId);
 
+        // Try nulling out a required value.
+        ContentValues badValues = new ContentValues(updateValues);
+        badValues.putNull(Events.EVENT_TIMEZONE);
+        badValues.remove(Events.DIRTY);
+        try {
+            mContentResolver.update(eventUri, badValues, null, null);
+            fail("was allowed to null out EVENT_TIMEZONE");
+        } catch (IllegalArgumentException iae) {
+            // good
+        }
+
         removeAndVerifyEvent(eventUri, eventValues, account);
 
         // delete the calendar
@@ -2596,6 +3081,7 @@
             insertUri = asSyncAdapter(insertUri, account, CTS_TEST_TYPE);
         }
         Uri uri = mContentResolver.insert(insertUri, values);
+        assertNotNull(uri);
 
         // Verify
         EventHelper.addDefaultReadOnlyValues(values, account, asSyncAdapter);
@@ -2744,7 +3230,7 @@
         long calendarId = ContentUris.parseId(uri);
         assertTrue(calendarId >= 0);
 
-        verifyCalendar(account, values, calendarId);
+        verifyCalendar(account, values, calendarId, 1);
         return calendarId;
     }
 
@@ -2768,19 +3254,21 @@
     }
 
     /**
-     * Check all the fields of a calendar contained in values + id. This assumes
-     * a single calendar has been created on the given account.
+     * Check all the fields of a calendar contained in values + id.
      *
      * @param account the account of the calendar
      * @param values the values to check against the db
      * @param id the _id of the calendar
+     * @param expectedCount the number of calendars expected on this account
      */
-    private void verifyCalendar(String account, ContentValues values, long id) {
+    private void verifyCalendar(String account, ContentValues values, long id, int expectedCount) {
         // Verify
         Cursor c = CalendarHelper.getCalendarsByAccount(mContentResolver, account);
-        assertEquals(1, c.getCount());
+        assertEquals(expectedCount, c.getCount());
         assertTrue(c.moveToFirst());
-        assertEquals(id, c.getLong(0));
+        while (c.getLong(0) != id) {
+            assertTrue(c.moveToNext());
+        }
         for (String key : values.keySet()) {
             int index = c.getColumnIndex(key);
             assertTrue("Key " + key + " not in projection", index >= 0);
diff --git a/tests/tests/provider/src/android/provider/cts/ContactsContract_CommonDataKinds_EmailTest.java b/tests/tests/provider/src/android/provider/cts/ContactsContract_CommonDataKinds_EmailTest.java
new file mode 100644
index 0000000..3f4bd7e
--- /dev/null
+++ b/tests/tests/provider/src/android/provider/cts/ContactsContract_CommonDataKinds_EmailTest.java
@@ -0,0 +1,55 @@
+/*
+ * 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.provider.cts;
+
+import android.content.res.Resources;
+import android.provider.ContactsContract.CommonDataKinds.Email;
+import android.test.AndroidTestCase;
+
+public class ContactsContract_CommonDataKinds_EmailTest extends AndroidTestCase {
+
+    private Resources mResources;
+
+    @Override
+    protected void setUp() throws Exception {
+        super.setUp();
+        mResources = mContext.getResources();
+    }
+
+    public void testGetTypeLabel() {
+        assertGetTypeLabel(Email.TYPE_HOME);
+        assertGetTypeLabel(Email.TYPE_MOBILE);
+        assertGetTypeLabel(Email.TYPE_OTHER);
+        assertGetTypeLabel(Email.TYPE_WORK);
+        assertGetTypeLabel(Email.TYPE_CUSTOM);
+        assertCustomTypeLabel("Custom Label");
+    }
+
+    private void assertGetTypeLabel(int type) {
+        int res = Email.getTypeLabelResource(type);
+        assertTrue(res != 0);
+
+        String label = mResources.getString(res);
+        assertEquals(label, Email.getTypeLabel(mResources, type, ""));
+    }
+
+    private void assertCustomTypeLabel(String label) {
+        int res = Email.getTypeLabelResource(Email.TYPE_CUSTOM);
+        assertTrue(res != 0);
+        assertEquals(label, Email.getTypeLabel(mResources, Email.TYPE_CUSTOM, label));
+    }
+}
diff --git a/tests/tests/provider/src/android/provider/cts/ContactsContract_CommonDataKinds_EventTest.java b/tests/tests/provider/src/android/provider/cts/ContactsContract_CommonDataKinds_EventTest.java
new file mode 100644
index 0000000..b996ad2
--- /dev/null
+++ b/tests/tests/provider/src/android/provider/cts/ContactsContract_CommonDataKinds_EventTest.java
@@ -0,0 +1,36 @@
+/*
+ * 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.provider.cts;
+
+import android.provider.ContactsContract.CommonDataKinds.Event;
+import android.test.AndroidTestCase;
+
+public class ContactsContract_CommonDataKinds_EventTest extends AndroidTestCase {
+
+    public void testGetTypeLabel() {
+        assertGetTypeLabel(Event.TYPE_ANNIVERSARY);
+        assertGetTypeLabel(Event.TYPE_BIRTHDAY);
+        assertGetTypeLabel(Event.TYPE_OTHER);
+        assertGetTypeLabel(Event.TYPE_CUSTOM);
+        assertGetTypeLabel(null);
+    }
+
+    private void assertGetTypeLabel(Integer type) {
+        int res = Event.getTypeResource(type);
+        assertTrue(res != 0);
+    }
+}
diff --git a/tests/tests/provider/src/android/provider/cts/ContactsContract_CommonDataKinds_ImTest.java b/tests/tests/provider/src/android/provider/cts/ContactsContract_CommonDataKinds_ImTest.java
new file mode 100644
index 0000000..eacceaa
--- /dev/null
+++ b/tests/tests/provider/src/android/provider/cts/ContactsContract_CommonDataKinds_ImTest.java
@@ -0,0 +1,82 @@
+/*
+ * 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.provider.cts;
+
+import android.content.res.Resources;
+import android.provider.ContactsContract.CommonDataKinds.Im;
+import android.test.AndroidTestCase;
+
+public class ContactsContract_CommonDataKinds_ImTest extends AndroidTestCase {
+
+    private Resources mResources;
+
+    @Override
+    protected void setUp() throws Exception {
+        super.setUp();
+        mResources = mContext.getResources();
+    }
+
+    public void testGetProtocolLabel() {
+        assertGetProtocolLabel(Im.PROTOCOL_AIM);
+        assertGetProtocolLabel(Im.PROTOCOL_CUSTOM);
+        assertGetProtocolLabel(Im.PROTOCOL_GOOGLE_TALK);
+        assertGetProtocolLabel(Im.PROTOCOL_ICQ);
+        assertGetProtocolLabel(Im.PROTOCOL_JABBER);
+        assertGetProtocolLabel(Im.PROTOCOL_MSN);
+        assertGetProtocolLabel(Im.PROTOCOL_NETMEETING);
+        assertGetProtocolLabel(Im.PROTOCOL_QQ);
+        assertGetProtocolLabel(Im.PROTOCOL_SKYPE);
+        assertGetProtocolLabel(Im.PROTOCOL_YAHOO);
+        assertCustomProtocolLabel("Custom Label");
+    }
+
+    public void testGetTypeLabel() {
+        assertGetTypeLabel(Im.TYPE_HOME);
+        assertGetTypeLabel(Im.TYPE_WORK);
+        assertGetTypeLabel(Im.TYPE_OTHER);
+        assertGetTypeLabel(Im.TYPE_CUSTOM);
+        assertCustomTypeLabel("Custom Label");
+    }
+
+    private void assertGetProtocolLabel(int type) {
+        int res = Im.getProtocolLabelResource(type);
+        assertTrue(res != 0);
+
+        String label = mResources.getString(res);
+        assertEquals(label, Im.getProtocolLabel(mResources, type, ""));
+    }
+
+    private void assertCustomProtocolLabel(String label) {
+        int res = Im.getProtocolLabelResource(Im.PROTOCOL_CUSTOM);
+        assertTrue(res != 0);
+        assertEquals(label, Im.getProtocolLabel(mResources, Im.PROTOCOL_CUSTOM, label));
+    }
+
+    private void assertGetTypeLabel(int type) {
+        int res = Im.getTypeLabelResource(type);
+        assertTrue(res != 0);
+
+        String label = mResources.getString(res);
+        assertEquals(label, Im.getTypeLabel(mResources, type, ""));
+    }
+
+    private void assertCustomTypeLabel(String label) {
+        int res = Im.getTypeLabelResource(Im.TYPE_CUSTOM);
+        assertTrue(res != 0);
+        assertEquals(label, Im.getTypeLabel(mResources, Im.TYPE_CUSTOM, label));
+    }
+}
diff --git a/tests/tests/provider/src/android/provider/cts/ContactsContract_CommonDataKinds_OrganizationTest.java b/tests/tests/provider/src/android/provider/cts/ContactsContract_CommonDataKinds_OrganizationTest.java
new file mode 100644
index 0000000..2de3b05
--- /dev/null
+++ b/tests/tests/provider/src/android/provider/cts/ContactsContract_CommonDataKinds_OrganizationTest.java
@@ -0,0 +1,54 @@
+/*
+ * 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.provider.cts;
+
+import android.content.res.Resources;
+import android.provider.ContactsContract.CommonDataKinds.Im;
+import android.provider.ContactsContract.CommonDataKinds.Organization;
+import android.test.AndroidTestCase;
+
+public class ContactsContract_CommonDataKinds_OrganizationTest extends AndroidTestCase {
+
+    private Resources mResources;
+
+    @Override
+    protected void setUp() throws Exception {
+        super.setUp();
+        mResources = mContext.getResources();
+    }
+
+    public void testGetTypeLabel() {
+        assertGetTypeLabel(Organization.TYPE_WORK);
+        assertGetTypeLabel(Organization.TYPE_OTHER);
+        assertGetTypeLabel(Organization.TYPE_CUSTOM);
+        assertCustomTypeLabel("Custom Label");
+    }
+
+    private void assertGetTypeLabel(int type) {
+        int res = Organization.getTypeLabelResource(type);
+        assertTrue(res != 0);
+
+        String label = mResources.getString(res);
+        assertEquals(label, Organization.getTypeLabel(mResources, type, ""));
+    }
+
+    private void assertCustomTypeLabel(String label) {
+        int res = Organization.getTypeLabelResource(Im.TYPE_CUSTOM);
+        assertTrue(res != 0);
+        assertEquals(label, Organization.getTypeLabel(mResources, Im.TYPE_CUSTOM, label));
+    }
+}
diff --git a/tests/tests/provider/src/android/provider/cts/ContactsContract_CommonDataKinds_PhoneTest.java b/tests/tests/provider/src/android/provider/cts/ContactsContract_CommonDataKinds_PhoneTest.java
new file mode 100644
index 0000000..433a32e
--- /dev/null
+++ b/tests/tests/provider/src/android/provider/cts/ContactsContract_CommonDataKinds_PhoneTest.java
@@ -0,0 +1,71 @@
+/*
+ * 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.provider.cts;
+
+import android.content.res.Resources;
+import android.provider.ContactsContract.CommonDataKinds.Phone;
+import android.test.AndroidTestCase;
+
+public class ContactsContract_CommonDataKinds_PhoneTest extends AndroidTestCase {
+
+    private Resources mResources;
+
+    @Override
+    protected void setUp() throws Exception {
+        super.setUp();
+        mResources = mContext.getResources();
+    }
+
+    public void testGetTypeLabel() {
+        assertGetTypeLabel(Phone.TYPE_ASSISTANT);
+        assertGetTypeLabel(Phone.TYPE_CALLBACK);
+        assertGetTypeLabel(Phone.TYPE_CAR);
+        assertGetTypeLabel(Phone.TYPE_COMPANY_MAIN);
+        assertGetTypeLabel(Phone.TYPE_FAX_HOME);
+        assertGetTypeLabel(Phone.TYPE_FAX_WORK);
+        assertGetTypeLabel(Phone.TYPE_HOME);
+        assertGetTypeLabel(Phone.TYPE_ISDN);
+        assertGetTypeLabel(Phone.TYPE_MAIN);
+        assertGetTypeLabel(Phone.TYPE_MMS);
+        assertGetTypeLabel(Phone.TYPE_MOBILE);
+        assertGetTypeLabel(Phone.TYPE_OTHER);
+        assertGetTypeLabel(Phone.TYPE_OTHER_FAX);
+        assertGetTypeLabel(Phone.TYPE_PAGER);
+        assertGetTypeLabel(Phone.TYPE_RADIO);
+        assertGetTypeLabel(Phone.TYPE_TELEX);
+        assertGetTypeLabel(Phone.TYPE_TTY_TDD);
+        assertGetTypeLabel(Phone.TYPE_WORK);
+        assertGetTypeLabel(Phone.TYPE_WORK_MOBILE);
+        assertGetTypeLabel(Phone.TYPE_WORK_PAGER);
+        assertGetTypeLabel(Phone.TYPE_CUSTOM);
+        assertCustomTypeLabel("Custom Label");
+    }
+
+    private void assertGetTypeLabel(int type) {
+        int res = Phone.getTypeLabelResource(type);
+        assertTrue(res != 0);
+
+        String label = mResources.getString(res);
+        assertEquals(label, Phone.getTypeLabel(mResources, type, ""));
+    }
+
+    private void assertCustomTypeLabel(String label) {
+        int res = Phone.getTypeLabelResource(Phone.TYPE_CUSTOM);
+        assertTrue(res != 0);
+        assertEquals(label, Phone.getTypeLabel(mResources, Phone.TYPE_CUSTOM, label));
+    }
+}
diff --git a/tests/tests/provider/src/android/provider/cts/ContactsContract_CommonDataKinds_RelationTest.java b/tests/tests/provider/src/android/provider/cts/ContactsContract_CommonDataKinds_RelationTest.java
new file mode 100644
index 0000000..f5e27ce
--- /dev/null
+++ b/tests/tests/provider/src/android/provider/cts/ContactsContract_CommonDataKinds_RelationTest.java
@@ -0,0 +1,65 @@
+/*
+ * 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.provider.cts;
+
+import android.content.res.Resources;
+import android.provider.ContactsContract.CommonDataKinds.Relation;
+import android.test.AndroidTestCase;
+
+public class ContactsContract_CommonDataKinds_RelationTest extends AndroidTestCase {
+
+    private Resources mResources;
+
+    @Override
+    protected void setUp() throws Exception {
+        super.setUp();
+        mResources = mContext.getResources();
+    }
+
+    public void testGetTypeLabel() {
+        assertGetTypeLabel(Relation.TYPE_ASSISTANT);
+        assertGetTypeLabel(Relation.TYPE_BROTHER);
+        assertGetTypeLabel(Relation.TYPE_CHILD);
+        assertGetTypeLabel(Relation.TYPE_DOMESTIC_PARTNER);
+        assertGetTypeLabel(Relation.TYPE_FATHER);
+        assertGetTypeLabel(Relation.TYPE_FRIEND);
+        assertGetTypeLabel(Relation.TYPE_MANAGER);
+        assertGetTypeLabel(Relation.TYPE_MOTHER);
+        assertGetTypeLabel(Relation.TYPE_PARENT);
+        assertGetTypeLabel(Relation.TYPE_PARTNER);
+        assertGetTypeLabel(Relation.TYPE_REFERRED_BY);
+        assertGetTypeLabel(Relation.TYPE_RELATIVE);
+        assertGetTypeLabel(Relation.TYPE_SISTER);
+        assertGetTypeLabel(Relation.TYPE_SPOUSE);
+        assertGetTypeLabel(Relation.TYPE_CUSTOM);
+        assertCustomTypeLabel("Custom Label");
+    }
+
+    private void assertGetTypeLabel(int type) {
+        int res = Relation.getTypeLabelResource(type);
+        assertTrue(res != 0);
+
+        String label = mResources.getString(res);
+        assertEquals(label, Relation.getTypeLabel(mResources, type, ""));
+    }
+
+    private void assertCustomTypeLabel(String label) {
+        int res = Relation.getTypeLabelResource(Relation.TYPE_CUSTOM);
+        assertTrue(res != 0);
+        assertEquals(label, Relation.getTypeLabel(mResources, Relation.TYPE_CUSTOM, label));
+    }
+}
diff --git a/tests/tests/provider/src/android/provider/cts/ContactsContract_CommonDataKinds_SipAddressTest.java b/tests/tests/provider/src/android/provider/cts/ContactsContract_CommonDataKinds_SipAddressTest.java
new file mode 100644
index 0000000..1406b40
--- /dev/null
+++ b/tests/tests/provider/src/android/provider/cts/ContactsContract_CommonDataKinds_SipAddressTest.java
@@ -0,0 +1,54 @@
+/*
+ * 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.provider.cts;
+
+import android.content.res.Resources;
+import android.provider.ContactsContract.CommonDataKinds.SipAddress;
+import android.test.AndroidTestCase;
+
+public class ContactsContract_CommonDataKinds_SipAddressTest extends AndroidTestCase {
+
+    private Resources mResources;
+
+    @Override
+    protected void setUp() throws Exception {
+        super.setUp();
+        mResources = mContext.getResources();
+    }
+
+    public void testGetTypeLabel() {
+        assertGetTypeLabel(SipAddress.TYPE_HOME);
+        assertGetTypeLabel(SipAddress.TYPE_OTHER);
+        assertGetTypeLabel(SipAddress.TYPE_WORK);
+        assertGetTypeLabel(SipAddress.TYPE_CUSTOM);
+        assertCustomTypeLabel("Custom Label");
+    }
+
+    private void assertGetTypeLabel(int type) {
+        int res = SipAddress.getTypeLabelResource(type);
+        assertTrue(res != 0);
+
+        String label = mResources.getString(res);
+        assertEquals(label, SipAddress.getTypeLabel(mResources, type, ""));
+    }
+
+    private void assertCustomTypeLabel(String label) {
+        int res = SipAddress.getTypeLabelResource(SipAddress.TYPE_CUSTOM);
+        assertTrue(res != 0);
+        assertEquals(label, SipAddress.getTypeLabel(mResources, SipAddress.TYPE_CUSTOM, label));
+    }
+}
diff --git a/tests/tests/provider/src/android/provider/cts/ContactsContract_CommonDataKinds_StructuredPostalTest.java b/tests/tests/provider/src/android/provider/cts/ContactsContract_CommonDataKinds_StructuredPostalTest.java
new file mode 100644
index 0000000..18a64ce
--- /dev/null
+++ b/tests/tests/provider/src/android/provider/cts/ContactsContract_CommonDataKinds_StructuredPostalTest.java
@@ -0,0 +1,55 @@
+/*
+ * 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.provider.cts;
+
+import android.content.res.Resources;
+import android.provider.ContactsContract.CommonDataKinds.StructuredPostal;
+import android.test.AndroidTestCase;
+
+public class ContactsContract_CommonDataKinds_StructuredPostalTest extends AndroidTestCase {
+
+    private Resources mResources;
+
+    @Override
+    protected void setUp() throws Exception {
+        super.setUp();
+        mResources = mContext.getResources();
+    }
+
+    public void testGetTypeLabel() {
+        assertGetTypeLabel(StructuredPostal.TYPE_HOME);
+        assertGetTypeLabel(StructuredPostal.TYPE_OTHER);
+        assertGetTypeLabel(StructuredPostal.TYPE_WORK);
+        assertGetTypeLabel(StructuredPostal.TYPE_CUSTOM);
+        assertCustomTypeLabel("Custom Label");
+    }
+
+    private void assertGetTypeLabel(int type) {
+        int res = StructuredPostal.getTypeLabelResource(type);
+        assertTrue(res != 0);
+
+        String label = mResources.getString(res);
+        assertEquals(label, StructuredPostal.getTypeLabel(mResources, type, ""));
+    }
+
+    private void assertCustomTypeLabel(String label) {
+        int res = StructuredPostal.getTypeLabelResource(StructuredPostal.TYPE_CUSTOM);
+        assertTrue(res != 0);
+        assertEquals(label, StructuredPostal.getTypeLabel(mResources,
+                StructuredPostal.TYPE_CUSTOM, label));
+    }
+}
diff --git a/tests/tests/provider/src/android/provider/cts/ContactsContract_ContactsTest.java b/tests/tests/provider/src/android/provider/cts/ContactsContract_ContactsTest.java
index a3c6a25..2220d96 100644
--- a/tests/tests/provider/src/android/provider/cts/ContactsContract_ContactsTest.java
+++ b/tests/tests/provider/src/android/provider/cts/ContactsContract_ContactsTest.java
@@ -16,17 +16,15 @@
 
 package android.provider.cts;
 
-import dalvik.annotation.TestLevel;
-import dalvik.annotation.TestTargetClass;
-import dalvik.annotation.TestTargetNew;
-
 import android.app.Instrumentation;
 import android.content.ContentResolver;
+import android.content.ContentUris;
 import android.content.Context;
 import android.content.IContentProvider;
 import android.content.Intent;
 import android.content.pm.PackageManager;
 import android.content.pm.ResolveInfo;
+import android.net.Uri;
 import android.provider.ContactsContract;
 import android.provider.ContactsContract.Contacts;
 import android.provider.cts.ContactsContract_TestDataBuilder.TestContact;
@@ -35,7 +33,6 @@
 
 import java.util.List;
 
-@TestTargetClass(ContactsContract.Contacts.class)
 public class ContactsContract_ContactsTest extends InstrumentationTestCase {
     private ContentResolver mContentResolver;
     private ContactsContract_TestDataBuilder mBuilder;
@@ -54,12 +51,6 @@
         mBuilder.cleanup();
     }
 
-    @TestTargetNew(
-            level = TestLevel.COMPLETE,
-            notes = "Test markAsContacted(ContentResolver resolver, long contactId)",
-            method = "markAsContacted",
-            args = {android.content.ContentResolver.class, long.class}
-    )
     public void testMarkAsContacted() throws Exception {
         TestRawContact rawContact = mBuilder.newRawContact().insert().load();
         TestContact contact = rawContact.getContact().load();
@@ -88,5 +79,24 @@
         assertFalse("Device does not support the activity intent: " + intent,
                 resolveInfos.isEmpty());
     }
+
+    public void testLookupUri() throws Exception {
+        TestRawContact rawContact = mBuilder.newRawContact().insert().load();
+        TestContact contact = rawContact.getContact().load();
+
+        Uri contactUri = contact.getUri();
+        long contactId = contact.getId();
+        String lookupKey = contact.getString(Contacts.LOOKUP_KEY);
+
+        Uri lookupUri = Contacts.getLookupUri(contactId, lookupKey);
+        assertEquals(ContentUris.withAppendedId(Uri.withAppendedPath(Contacts.CONTENT_LOOKUP_URI,
+                lookupKey), contactId), lookupUri);
+
+        Uri lookupUri2 = Contacts.getLookupUri(mContentResolver, contactUri);
+        assertEquals(lookupUri, lookupUri2);
+
+        Uri contactUri2 = Contacts.lookupContact(mContentResolver, lookupUri);
+        assertEquals(contactUri, contactUri2);
+    }
 }
 
diff --git a/tests/tests/provider/src/android/provider/cts/ContactsContract_PhotoTest.java b/tests/tests/provider/src/android/provider/cts/ContactsContract_PhotoTest.java
index 68ed1b8..edab42f 100644
--- a/tests/tests/provider/src/android/provider/cts/ContactsContract_PhotoTest.java
+++ b/tests/tests/provider/src/android/provider/cts/ContactsContract_PhotoTest.java
@@ -22,6 +22,8 @@
 import android.content.IContentProvider;
 import android.provider.ContactsContract;
 import android.provider.ContactsContract.CommonDataKinds.Photo;
+import android.provider.ContactsContract.Contacts;
+import android.provider.cts.ContactsContract_TestDataBuilder.TestContact;
 import android.provider.cts.ContactsContract_TestDataBuilder.TestData;
 import android.provider.cts.ContactsContract_TestDataBuilder.TestRawContact;
 import android.test.InstrumentationTestCase;
@@ -35,12 +37,13 @@
 
     private static final byte[] EMPTY_TEST_PHOTO_DATA = "".getBytes();
 
+    private ContentResolver mResolver;
+
     @Override
     protected void setUp() throws Exception {
         super.setUp();
-        ContentResolver contentResolver =
-                getInstrumentation().getTargetContext().getContentResolver();
-        IContentProvider provider = contentResolver.acquireProvider(ContactsContract.AUTHORITY);
+        mResolver = getInstrumentation().getTargetContext().getContentResolver();
+        IContentProvider provider = mResolver.acquireProvider(ContactsContract.AUTHORITY);
         mBuilder = new ContactsContract_TestDataBuilder(provider);
     }
 
@@ -51,7 +54,13 @@
     }
 
     public void testAddPhoto() throws Exception {
-        TestRawContact rawContact = mBuilder.newRawContact().insert();
+        TestRawContact rawContact = mBuilder.newRawContact().insert().load();
+        TestContact contact = rawContact.getContact().load();
+
+        assertNull(Contacts.openContactPhotoInputStream(mResolver, contact.getUri()));
+        assertNull(Contacts.openContactPhotoInputStream(mResolver, contact.getUri(), true));
+        assertNull(Contacts.openContactPhotoInputStream(mResolver, contact.getUri(), false));
+
         TestData photoData = rawContact.newDataRow(Photo.CONTENT_ITEM_TYPE)
                 .with(Photo.PHOTO, getTestPhotoData())
                 .insert();
@@ -59,14 +68,28 @@
         photoData.load();
         photoData.assertColumn(Photo.RAW_CONTACT_ID, rawContact.getId());
         photoData.assertBlobColumnNotNull(Photo.PHOTO);
+
+        assertPhotoStream(Contacts.openContactPhotoInputStream(mResolver, contact.getUri()));
+        assertPhotoStream(Contacts.openContactPhotoInputStream(mResolver, contact.getUri(), true));
+        assertPhotoStream(Contacts.openContactPhotoInputStream(mResolver, contact.getUri(), false));
     }
 
     public void testAddEmptyPhoto() throws Exception {
-        TestRawContact rawContact = mBuilder.newRawContact().insert();
+        TestRawContact rawContact = mBuilder.newRawContact().insert().load();
+        TestContact contact = rawContact.getContact().load();
+
+        assertNull(Contacts.openContactPhotoInputStream(mResolver, contact.getUri()));
+        assertNull(Contacts.openContactPhotoInputStream(mResolver, contact.getUri(), true));
+        assertNull(Contacts.openContactPhotoInputStream(mResolver, contact.getUri(), false));
+
         TestData photoData = rawContact.newDataRow(Photo.CONTENT_ITEM_TYPE)
                 .with(Photo.PHOTO, EMPTY_TEST_PHOTO_DATA)
                 .insert();
         assertNotNull(photoData.load());
+
+        assertNull(Contacts.openContactPhotoInputStream(mResolver, contact.getUri()));
+        assertNull(Contacts.openContactPhotoInputStream(mResolver, contact.getUri(), true));
+        assertNull(Contacts.openContactPhotoInputStream(mResolver, contact.getUri(), false));
     }
 
     private byte[] getTestPhotoData() {
@@ -89,5 +112,17 @@
         }
         return os.toByteArray();
     }
+
+    private void assertPhotoStream(InputStream photoStream) throws IOException {
+        try {
+            assertNotNull(photoStream);
+            byte[] actualBytes = readInputStreamFully(photoStream);
+            assertTrue(actualBytes.length > 0);
+        } finally {
+            if (photoStream != null) {
+                photoStream.close();
+            }
+        }
+    }
 }
 
diff --git a/tests/tests/provider/src/android/provider/cts/ContactsContract_StreamItemsTest.java b/tests/tests/provider/src/android/provider/cts/ContactsContract_StreamItemsTest.java
new file mode 100644
index 0000000..5ca04ab
--- /dev/null
+++ b/tests/tests/provider/src/android/provider/cts/ContactsContract_StreamItemsTest.java
@@ -0,0 +1,174 @@
+/*
+ * 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.provider.cts;
+
+import android.content.ContentProviderOperation;
+import android.content.ContentProviderResult;
+import android.content.ContentResolver;
+import android.content.ContentUris;
+import android.content.ContentValues;
+import android.database.Cursor;
+import android.net.Uri;
+import android.provider.ContactsContract;
+import android.provider.ContactsContract.Data;
+import android.provider.ContactsContract.RawContacts;
+import android.provider.ContactsContract.StreamItems;
+import android.test.AndroidTestCase;
+
+import java.util.ArrayList;
+
+public class ContactsContract_StreamItemsTest extends AndroidTestCase {
+
+    private static final String ACCOUNT_TYPE = "com.android.cts";
+    private static final String ACCOUNT_NAME = "ContactsContract_StreamItemsTest";
+
+    private static final String INSERT_TEXT = "Wrote a test for the StreamItems class";
+    private static final long INSERT_TIMESTAMP = 3007;
+    private static final String INSERT_COMMENTS = "1337 people reshared this";
+
+    private static final String UPDATE_TEXT = "Wrote more tests for the StreamItems class";
+    private static final long UPDATE_TIMESTAMP = 8008;
+    private static final String UPDATE_COMMENTS = "3007 people reshared this";
+
+    private ContentResolver mResolver;
+
+    @Override
+    protected void setUp() throws Exception {
+        super.setUp();
+        mResolver = mContext.getContentResolver();
+    }
+
+    public void testContentDirectoryUri() throws Exception {
+        // Create a contact to attach the stream item to it.
+        ContentValues values = new ContentValues();
+        values.put(RawContacts.ACCOUNT_TYPE, ACCOUNT_TYPE);
+        values.put(RawContacts.ACCOUNT_NAME, ACCOUNT_NAME);
+
+        Uri contactUri = mResolver.insert(RawContacts.CONTENT_URI, values);
+        long rawContactId = ContentUris.parseId(contactUri);
+        assertTrue(rawContactId != -1);
+
+        // Attach a stream item to the contact.
+        values.clear();
+        values.put(RawContacts.ACCOUNT_TYPE, ACCOUNT_TYPE);
+        values.put(RawContacts.ACCOUNT_NAME, ACCOUNT_NAME);
+        values.put(StreamItems.TEXT, INSERT_TEXT);
+        values.put(StreamItems.TIMESTAMP, INSERT_TIMESTAMP);
+        values.put(StreamItems.COMMENTS, INSERT_COMMENTS);
+
+        Uri contactStreamUri = Uri.withAppendedPath(
+                ContentUris.withAppendedId(RawContacts.CONTENT_URI, rawContactId),
+                RawContacts.StreamItems.CONTENT_DIRECTORY);
+        Uri streamItemUri = mResolver.insert(contactStreamUri, values);
+        long streamItemId = ContentUris.parseId(streamItemUri);
+        assertTrue(streamItemId != -1);
+
+        // Check that the provider returns the stream id in it's URI.
+        assertEquals(streamItemUri,
+                ContentUris.withAppendedId(RawContacts.CONTENT_URI, rawContactId).buildUpon()
+                        .appendPath(RawContacts.StreamItems.CONTENT_DIRECTORY)
+                        .appendPath(Long.toString(streamItemId))
+                        .build());
+
+        // Check that the provider stored what we put into it.
+        assertInsertedItem(streamItemUri);
+
+        // Update the stream item.
+        values.clear();
+        values.put(Data.RAW_CONTACT_ID, rawContactId);
+        values.put(RawContacts.ACCOUNT_TYPE, ACCOUNT_TYPE);
+        values.put(RawContacts.ACCOUNT_NAME, ACCOUNT_NAME);
+        values.put(StreamItems.TEXT, UPDATE_TEXT);
+        values.put(StreamItems.TIMESTAMP, UPDATE_TIMESTAMP);
+        values.put(StreamItems.COMMENTS, UPDATE_COMMENTS);
+
+        assertEquals(1, mResolver.update(streamItemUri, values, null, null));
+        assertUpdatedItem(streamItemUri);
+    }
+
+    public void testContentUri() throws Exception {
+        // Create a contact with one stream item in it.
+        ArrayList<ContentProviderOperation> ops = new ArrayList<ContentProviderOperation>();
+
+        ops.add(ContentProviderOperation.newInsert(RawContacts.CONTENT_URI)
+                .withValue(RawContacts.ACCOUNT_TYPE, ACCOUNT_TYPE)
+                .withValue(RawContacts.ACCOUNT_NAME, ACCOUNT_NAME)
+                .build());
+
+        ops.add(ContentProviderOperation.newInsert(StreamItems.CONTENT_URI)
+                .withValueBackReference(Data.RAW_CONTACT_ID, 0)
+                .withValue(RawContacts.ACCOUNT_TYPE, ACCOUNT_TYPE)
+                .withValue(RawContacts.ACCOUNT_NAME, ACCOUNT_NAME)
+                .withValue(StreamItems.TEXT, INSERT_TEXT)
+                .withValue(StreamItems.TIMESTAMP, INSERT_TIMESTAMP)
+                .withValue(StreamItems.COMMENTS, INSERT_COMMENTS)
+                .build());
+
+        ContentProviderResult[] results = mResolver.applyBatch(ContactsContract.AUTHORITY, ops);
+        long rawContactId = ContentUris.parseId(results[0].uri);
+        assertTrue(rawContactId != -1);
+
+        Uri streamItemUri = results[1].uri;
+        long streamItemId = ContentUris.parseId(streamItemUri);
+        assertTrue(streamItemId != -1);
+
+        // Check that the provider returns the stream id in it's URI.
+        assertEquals(streamItemUri,
+                ContentUris.withAppendedId(StreamItems.CONTENT_URI, streamItemId));
+
+        // Check that the provider stored what we put into it.
+        assertInsertedItem(streamItemUri);
+
+        // Update the stream item.
+        ops.clear();
+        ops.add(ContentProviderOperation.newUpdate(streamItemUri)
+                .withValue(Data.RAW_CONTACT_ID, rawContactId)
+                .withValue(RawContacts.ACCOUNT_TYPE, ACCOUNT_TYPE)
+                .withValue(RawContacts.ACCOUNT_NAME, ACCOUNT_NAME)
+                .withValue(StreamItems.TEXT, UPDATE_TEXT)
+                .withValue(StreamItems.TIMESTAMP, UPDATE_TIMESTAMP)
+                .withValue(StreamItems.COMMENTS, UPDATE_COMMENTS)
+                .build());
+
+        results = mResolver.applyBatch(ContactsContract.AUTHORITY, ops);
+        assertEquals(Integer.valueOf(1), results[0].count);
+        assertUpdatedItem(streamItemUri);
+    }
+
+    private void assertInsertedItem(Uri itemUri) {
+        assertStreamItem(itemUri, INSERT_TEXT, INSERT_TIMESTAMP, INSERT_COMMENTS);
+    }
+
+    private void assertUpdatedItem(Uri itemUri) {
+        assertStreamItem(itemUri, UPDATE_TEXT, UPDATE_TIMESTAMP, UPDATE_COMMENTS);
+    }
+
+    private void assertStreamItem(Uri uri, String text, long timestamp, String comments) {
+        Cursor cursor = mResolver.query(uri, null, null, null, null);
+        try {
+            assertTrue(cursor.moveToFirst());
+            assertEquals(text, cursor.getString(
+                    cursor.getColumnIndexOrThrow(StreamItems.TEXT)));
+            assertEquals(timestamp, cursor.getLong(
+                    cursor.getColumnIndexOrThrow(StreamItems.TIMESTAMP)));
+            assertEquals(comments, cursor.getString(
+                    cursor.getColumnIndexOrThrow(StreamItems.COMMENTS)));
+        } finally {
+            cursor.close();
+        }
+    }
+}
diff --git a/tests/tests/provider/src/android/provider/cts/ContactsContract_TestDataBuilder.java b/tests/tests/provider/src/android/provider/cts/ContactsContract_TestDataBuilder.java
index c73830e..e1feda6 100644
--- a/tests/tests/provider/src/android/provider/cts/ContactsContract_TestDataBuilder.java
+++ b/tests/tests/provider/src/android/provider/cts/ContactsContract_TestDataBuilder.java
@@ -198,6 +198,10 @@
             return mCursor.getLong(mCursor.getColumnIndex(columnName));
         }
 
+        public String getString(String columnName) {
+            return mCursor.getString(mCursor.getColumnIndex(columnName));
+        }
+
         public void assertColumn(String columnName, long value) {
             assertEquals(value, mCursor.getLong(getColumnIndex(columnName)));
         }
diff --git a/tests/tests/provider/src/android/provider/cts/Contacts_PeopleTest.java b/tests/tests/provider/src/android/provider/cts/Contacts_PeopleTest.java
index 0f36626..b9d26e6 100644
--- a/tests/tests/provider/src/android/provider/cts/Contacts_PeopleTest.java
+++ b/tests/tests/provider/src/android/provider/cts/Contacts_PeopleTest.java
@@ -40,6 +40,7 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.ArrayList;
+import java.util.List;
 
 @TestTargetClass(android.provider.Contacts.People.class)
 public class Contacts_PeopleTest extends InstrumentationTestCase {
@@ -209,9 +210,16 @@
             cursor.close();
             mRowsAdded.add(People.addToGroup(mContentResolver, personId, groupId));
             cursor = People.queryGroups(mContentResolver, personId);
-            cursor.moveToFirst();
-            assertEquals(personId, cursor.getInt(MEMBERSHIP_PERSON_ID_INDEX));
-            assertEquals(groupId, cursor.getInt(MEMBERSHIP_GROUP_ID_INDEX));
+            boolean found = false;
+            while (cursor.moveToNext()) {
+                assertEquals(personId, cursor.getInt(MEMBERSHIP_PERSON_ID_INDEX));
+                if (cursor.getInt(MEMBERSHIP_GROUP_ID_INDEX) == groupId) {
+                    found = true;
+                    break;
+                }
+            }
+            assertTrue(found);
+
             cursor.close();
 
             // People: test_people_2, Group: test_group_1
@@ -223,14 +231,24 @@
             String groupName = "test_group_1";
             mRowsAdded.add(People.addToGroup(mContentResolver, personId, groupName));
             cursor = People.queryGroups(mContentResolver, personId);
-            cursor.moveToFirst();
-            assertEquals(personId, cursor.getInt(MEMBERSHIP_PERSON_ID_INDEX));
-            groupId = cursor.getInt(MEMBERSHIP_GROUP_ID_INDEX);
+            List<Integer> groupIds = new ArrayList<Integer>();
+            while (cursor.moveToNext()) {
+                assertEquals(personId, cursor.getInt(MEMBERSHIP_PERSON_ID_INDEX));
+                groupIds.add(cursor.getInt(MEMBERSHIP_GROUP_ID_INDEX));
+            }
             cursor.close();
-            cursor = mProvider.query(Groups.CONTENT_URI, GROUPS_PROJECTION,
-                    Groups._ID + "=" + groupId, null, null);
-            cursor.moveToFirst();
-            assertEquals(groupName, cursor.getString(GROUPS_NAME_INDEX));
+
+            found = false;
+            for (int id : groupIds) {
+                cursor = mProvider.query(Groups.CONTENT_URI, GROUPS_PROJECTION,
+                        Groups._ID + "=" + id, null, null);
+                cursor.moveToFirst();
+                if (groupName.equals(cursor.getString(GROUPS_NAME_INDEX))) {
+                    found = true;
+                    break;
+                }
+            }
+            assertTrue(found);
             cursor.close();
         } catch (RemoteException e) {
             fail("Unexpected RemoteException");
diff --git a/tests/tests/provider/src/android/provider/cts/MediaStoreTest.java b/tests/tests/provider/src/android/provider/cts/MediaStoreTest.java
index 717b468..7d78bd6 100644
--- a/tests/tests/provider/src/android/provider/cts/MediaStoreTest.java
+++ b/tests/tests/provider/src/android/provider/cts/MediaStoreTest.java
@@ -16,10 +16,6 @@
 
 package android.provider.cts;
 
-import dalvik.annotation.TestLevel;
-import dalvik.annotation.TestTargetClass;
-import dalvik.annotation.TestTargetNew;
-
 import android.content.ContentResolver;
 import android.content.ContentValues;
 import android.database.Cursor;
@@ -27,7 +23,6 @@
 import android.provider.MediaStore;
 import android.test.InstrumentationTestCase;
 
-@TestTargetClass(MediaStore.class)
 public class MediaStoreTest extends InstrumentationTestCase {
     private static final String TEST_VOLUME_NAME = "volume_for_cts";
 
@@ -62,11 +57,7 @@
         super.tearDown();
     }
 
-    @TestTargetNew(
-      level = TestLevel.COMPLETE,
-      method = "getMediaScannerUri",
-      args = {}
-    )
+
     public void testGetMediaScannerUri() {
         ContentValues values = new ContentValues();
         String selection = MediaStore.MEDIA_SCANNER_VOLUME + "=?";
@@ -93,4 +84,9 @@
         assertEquals(1, mContentResolver.delete(mScannerUri, null, null));
         assertNull(mContentResolver.query(mScannerUri, PROJECTION, null, null, null));
     }
+
+    public void testGetVersion() {
+        // Could be a version string or null...just check it doesn't blow up.
+        MediaStore.getVersion(getInstrumentation().getTargetContext());
+    }
 }
diff --git a/tests/tests/provider/src/android/provider/cts/MediaStore_Audio_GenresTest.java b/tests/tests/provider/src/android/provider/cts/MediaStore_Audio_GenresTest.java
index 4e343cc..1138233 100644
--- a/tests/tests/provider/src/android/provider/cts/MediaStore_Audio_GenresTest.java
+++ b/tests/tests/provider/src/android/provider/cts/MediaStore_Audio_GenresTest.java
@@ -16,20 +16,18 @@
 
 package android.provider.cts;
 
-import dalvik.annotation.TestLevel;
-import dalvik.annotation.TestTargetClass;
-import dalvik.annotation.TestTargetNew;
-import dalvik.annotation.ToBeFixed;
-
 import android.content.ContentResolver;
+import android.content.ContentUris;
 import android.content.ContentValues;
 import android.database.Cursor;
 import android.database.SQLException;
 import android.net.Uri;
 import android.provider.MediaStore.Audio.Genres;
+import android.provider.MediaStore.Audio.Media;
+import android.provider.MediaStore.Audio.Genres.Members;
+import android.provider.cts.MediaStoreAudioTestHelper.Audio1;
 import android.test.InstrumentationTestCase;
 
-@TestTargetClass(Genres.class)
 public class MediaStore_Audio_GenresTest extends InstrumentationTestCase {
     private ContentResolver mContentResolver;
 
@@ -40,14 +38,6 @@
         mContentResolver = getInstrumentation().getContext().getContentResolver();
     }
 
-    @TestTargetNew(
-      level = TestLevel.COMPLETE,
-      method = "getContentUri",
-      args = {String.class}
-    )
-    @ToBeFixed(bug = "1695243", explanation = "Android API javadocs are incomplete. There is no "
-            + "document related to the possible values of param volumeName. @throw clause "
-            + "should be added in to javadoc when getting uri for internal volume.")
     public void testGetContentUri() {
         assertNotNull(mContentResolver.query(
                 Genres.getContentUri(MediaStoreAudioTestHelper.EXTERNAL_VOLUME_NAME), null, null,
@@ -103,4 +93,44 @@
         Uri uri = mContentResolver.insert(Genres.INTERNAL_CONTENT_URI, values);
         assertNull(uri);
     }
+
+    public void testGetContentUriForAudioId() {
+        // Insert an audio file into the content provider.
+        ContentValues values = Audio1.getInstance().getContentValues(true);
+        Uri audioUri = mContentResolver.insert(Media.EXTERNAL_CONTENT_URI, values);
+        long audioId = ContentUris.parseId(audioUri);
+        assertTrue(audioId != -1);
+
+        // Insert a genre into the content provider.
+        values.clear();
+        values.put(Genres.NAME, "Soda Pop");
+        Uri genreUri = mContentResolver.insert(Genres.EXTERNAL_CONTENT_URI, values);
+        long genreId = ContentUris.parseId(genreUri);
+        assertTrue(genreId != -1);
+
+        Cursor cursor = null;
+        try {
+            String volumeName = MediaStoreAudioTestHelper.EXTERNAL_VOLUME_NAME;
+
+            // Check that the audio file has no genres yet.
+            Uri audioGenresUri = Genres.getContentUriForAudioId(volumeName, (int) audioId);
+            cursor = mContentResolver.query(audioGenresUri, null, null, null, null);
+            assertFalse(cursor.moveToNext());
+
+            // Link the audio file to the genre.
+            values.clear();
+            values.put(Members.AUDIO_ID, audioId);
+            Uri membersUri = Members.getContentUri(volumeName, genreId);
+            assertNotNull(mContentResolver.insert(membersUri, values));
+
+            // Check that the audio file has the genre it was linked to.
+            cursor = mContentResolver.query(audioGenresUri, null, null, null, null);
+            assertTrue(cursor.moveToNext());
+            assertEquals(genreId, cursor.getLong(cursor.getColumnIndex(Genres._ID)));
+        } finally {
+            if (cursor != null) {
+                cursor.close();
+            }
+        }
+    }
 }
diff --git a/tests/tests/provider/src/android/provider/cts/MediaStore_FilesTest.java b/tests/tests/provider/src/android/provider/cts/MediaStore_FilesTest.java
new file mode 100644
index 0000000..9432066
--- /dev/null
+++ b/tests/tests/provider/src/android/provider/cts/MediaStore_FilesTest.java
@@ -0,0 +1,112 @@
+/*
+ * 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.provider.cts;
+
+import android.content.ContentResolver;
+import android.content.ContentUris;
+import android.content.ContentValues;
+import android.database.Cursor;
+import android.net.Uri;
+import android.provider.MediaStore;
+import android.provider.MediaStore.MediaColumns;
+import android.test.AndroidTestCase;
+
+public class MediaStore_FilesTest extends AndroidTestCase {
+
+    private ContentResolver mResolver;
+
+    @Override
+    protected void setUp() throws Exception {
+        super.setUp();
+        mResolver = mContext.getContentResolver();
+    }
+
+    public void testGetContentUri() {
+        String volumeName = MediaStoreAudioTestHelper.EXTERNAL_VOLUME_NAME;
+        Uri allFilesUri = MediaStore.Files.getContentUri(volumeName);
+
+        // Get the current file count. We will check if this increases after
+        // adding a file to the provider.
+        int fileCount = getFileCount(allFilesUri);
+
+        // Check that inserting empty values causes an exception.
+        ContentValues values = new ContentValues();
+        try {
+            mResolver.insert(allFilesUri, values);
+            fail("Should throw an exception");
+        } catch (IllegalArgumentException e) {
+            // Expecting an exception
+        }
+
+        // Add a path for a file and check that the returned uri appends a
+        // path properly.
+        String dataPath = "does_not_really_exist.txt";
+        values.put(MediaColumns.DATA, dataPath);
+        Uri fileUri = mResolver.insert(allFilesUri, values);
+        long fileId = ContentUris.parseId(fileUri);
+        assertEquals(fileUri, ContentUris.withAppendedId(allFilesUri, fileId));
+
+        // Check that getContentUri with the file id produces the same url
+        Uri rowUri = MediaStore.Files.getContentUri(volumeName, fileId);
+        assertEquals(fileUri, rowUri);
+
+        // Check that the file count has increased.
+        int newFileCount = getFileCount(allFilesUri);
+        assertEquals(fileCount + 1, newFileCount);
+
+        // Check that the path we inserted was stored properly.
+        assertStringColumn(fileUri, MediaColumns.DATA, dataPath);
+
+        // Update the path and check that the database changed.
+        String updatedPath = "still_does_not_exist.txt";
+        values.put(MediaColumns.DATA, updatedPath);
+        assertEquals(1, mResolver.update(fileUri, values, null, null));
+        assertStringColumn(fileUri, MediaColumns.DATA, updatedPath);
+
+        // Delete the file and observe that the file count decreased.
+        assertEquals(1, mResolver.delete(fileUri, null, null));
+        assertEquals(fileCount, getFileCount(allFilesUri));
+
+        // Make sure the deleted file is not returned by the cursor.
+        Cursor cursor = mResolver.query(fileUri, null, null, null, null);
+        try {
+            assertFalse(cursor.moveToNext());
+        } finally {
+            cursor.close();
+        }
+    }
+
+    private int getFileCount(Uri uri) {
+        Cursor cursor = mResolver.query(uri, null, null, null, null);
+        try {
+            return cursor.getCount();
+        } finally {
+            cursor.close();
+        }
+    }
+
+    private void assertStringColumn(Uri fileUri, String columnName, String expectedValue) {
+        Cursor cursor = mResolver.query(fileUri, null, null, null, null);
+        try {
+            assertTrue(cursor.moveToNext());
+            int index = cursor.getColumnIndexOrThrow(columnName);
+            assertEquals(expectedValue, cursor.getString(index));
+        } finally {
+            cursor.close();
+        }
+    }
+}
diff --git a/tests/tests/provider/src/android/provider/cts/MediaStore_Images_MediaTest.java b/tests/tests/provider/src/android/provider/cts/MediaStore_Images_MediaTest.java
index 8e8d650..5203326 100644
--- a/tests/tests/provider/src/android/provider/cts/MediaStore_Images_MediaTest.java
+++ b/tests/tests/provider/src/android/provider/cts/MediaStore_Images_MediaTest.java
@@ -18,11 +18,6 @@
 
 import com.android.cts.stub.R;
 
-import dalvik.annotation.TestLevel;
-import dalvik.annotation.TestTargetClass;
-import dalvik.annotation.TestTargetNew;
-import dalvik.annotation.TestTargets;
-
 import android.content.ContentResolver;
 import android.content.ContentValues;
 import android.content.Context;
@@ -31,18 +26,14 @@
 import android.graphics.BitmapFactory;
 import android.net.Uri;
 import android.os.Environment;
-import android.provider.MediaStore;
 import android.provider.MediaStore.Images.Media;
 import android.provider.MediaStore.Images.Thumbnails;
 import android.test.InstrumentationTestCase;
 
 import java.io.File;
 import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.IOException;
 import java.util.ArrayList;
 
-@TestTargetClass(MediaStore.Images.Media.class)
 public class MediaStore_Images_MediaTest extends InstrumentationTestCase {
     private static final String MIME_TYPE_JPEG = "image/jpeg";
 
@@ -87,33 +78,7 @@
         mRowsAdded = new ArrayList<Uri>();
     }
 
-    @TestTargets({
-      @TestTargetNew(
-        level = TestLevel.COMPLETE,
-        notes = "This test will fail if there is no sdcard attached because the method "
-                    + "{@link Images#Media#insertImage(ContentResolver, String, String, String)} "
-                    + "will store images on the sdcard",
-        method = "insertImage",
-        args = {ContentResolver.class, String.class, String.class, String.class}
-      ),
-      @TestTargetNew(
-        level = TestLevel.COMPLETE,
-        method = "query",
-        args = {ContentResolver.class, Uri.class, String[].class}
-      ),
-      @TestTargetNew(
-        level = TestLevel.COMPLETE,
-        method = "query",
-        args = {ContentResolver.class, Uri.class, String[].class, String.class, String.class}
-      ),
-      @TestTargetNew(
-        level = TestLevel.COMPLETE,
-        method = "query",
-        args = {ContentResolver.class, Uri.class, String[].class,  String.class, String[].class,
-                String.class}
-      )
-    })
-    public void testInsertImageWithImagePath() {
+    public void testInsertImageWithImagePath() throws Exception {
         Cursor c = Media.query(mContentResolver, Media.EXTERNAL_CONTENT_URI, null, null,
                 "_id ASC");
         int previousCount = c.getCount();
@@ -184,21 +149,7 @@
         c.close();
     }
 
-    @TestTargets({
-      @TestTargetNew(
-        level = TestLevel.COMPLETE,
-        notes = "This test will fail if there is no sdcard attached because the method "
-                + "will store images on the sdcard",
-        method = "insertImage",
-        args = {ContentResolver.class, Bitmap.class, String.class, String.class}
-      ),
-      @TestTargetNew(
-        level = TestLevel.COMPLETE,
-        method = "getBitmap",
-        args = {ContentResolver.class, Uri.class}
-      )
-    })
-    public void testInsertImageWithBitmap() {
+    public void testInsertImageWithBitmap() throws Exception {
         // insert the image by bitmap
         Bitmap src = BitmapFactory.decodeResource(mContext.getResources(), R.raw.scenery);
         String stringUrl = null;
@@ -215,27 +166,15 @@
                 null, "_id ASC");
         c.moveToFirst();
         // get the bimap by the path
-        Bitmap result = null;
-        try {
-            result = Media.getBitmap(mContentResolver,
+        Bitmap result = Media.getBitmap(mContentResolver,
                     Uri.fromFile(new File(c.getString(c.getColumnIndex(Media.DATA)))));
-        } catch (FileNotFoundException e) {
-            fail(e.getMessage());
-        } catch (IOException e) {
-            fail(e.getMessage());
-        }
+
         // can not check the identity between the result and source bitmap because
         // source bitmap is compressed before it is saved as result bitmap
-        assertNotNull(result);
         assertEquals(src.getWidth(), result.getWidth());
         assertEquals(src.getHeight(), result.getHeight());
     }
 
-    @TestTargetNew(
-      level = TestLevel.COMPLETE,
-      method = "getContentUri",
-      args = {String.class}
-    )
     public void testGetContentUri() {
         assertNotNull(mContentResolver.query(Media.getContentUri("internal"), null, null, null,
                 null));
diff --git a/tests/tests/provider/src/android/provider/cts/MediaStore_Images_ThumbnailsTest.java b/tests/tests/provider/src/android/provider/cts/MediaStore_Images_ThumbnailsTest.java
index 98ad62e..7ec7937 100644
--- a/tests/tests/provider/src/android/provider/cts/MediaStore_Images_ThumbnailsTest.java
+++ b/tests/tests/provider/src/android/provider/cts/MediaStore_Images_ThumbnailsTest.java
@@ -18,11 +18,6 @@
 
 import com.android.cts.stub.R;
 
-import dalvik.annotation.TestLevel;
-import dalvik.annotation.TestTargetClass;
-import dalvik.annotation.TestTargetNew;
-import dalvik.annotation.TestTargets;
-
 import android.content.ContentResolver;
 import android.content.ContentValues;
 import android.content.Context;
@@ -31,15 +26,12 @@
 import android.graphics.BitmapFactory;
 import android.net.Uri;
 import android.os.Environment;
-import android.provider.MediaStore;
 import android.provider.MediaStore.Images.Media;
 import android.provider.MediaStore.Images.Thumbnails;
 import android.test.InstrumentationTestCase;
-import android.util.Log;
 
 import java.util.ArrayList;
 
-@TestTargetClass(MediaStore.Images.Thumbnails.class)
 public class MediaStore_Images_ThumbnailsTest extends InstrumentationTestCase {
     private ArrayList<Uri> mRowsAdded;
 
@@ -75,19 +67,7 @@
         mRowsAdded = new ArrayList<Uri>();
     }
 
-    @TestTargets({
-      @TestTargetNew(
-        level = TestLevel.COMPLETE,
-        method = "queryMiniThumbnails",
-        args = {ContentResolver.class, Uri.class, int.class, String[].class}
-      ),
-      @TestTargetNew(
-        level = TestLevel.COMPLETE,
-        method = "query",
-        args = {ContentResolver.class, Uri.class, String[].class}
-      )
-    })
-    public void testQueryInternalThumbnails() {
+    public void testQueryInternalThumbnails() throws Exception {
         Cursor c = Thumbnails.queryMiniThumbnails(mContentResolver,
                 Thumbnails.INTERNAL_CONTENT_URI, Thumbnails.MICRO_KIND, null);
         int previousMicroKindCount = c.getCount();
@@ -125,18 +105,6 @@
         c.close();
     }
 
-    @TestTargets({
-      @TestTargetNew(
-        level = TestLevel.COMPLETE,
-        method = "queryMiniThumbnail",
-        args = {ContentResolver.class, long.class, int.class, String[].class}
-      ),
-      @TestTargetNew(
-        level = TestLevel.COMPLETE,
-        method = "query",
-        args = {ContentResolver.class, Uri.class, String[].class}
-      )
-    })
     public void testQueryExternalMiniThumbnails() {
         // insert the image by bitmap
         Bitmap src = BitmapFactory.decodeResource(mContext.getResources(), R.raw.scenery);
@@ -174,11 +142,6 @@
         c.close();
     }
 
-    @TestTargetNew(
-      level = TestLevel.COMPLETE,
-      method = "getContentUri",
-      args = {String.class}
-    )
     public void testGetContentUri() {
         assertNotNull(mContentResolver.query(Thumbnails.getContentUri("internal"), null, null,
                 null, null));
diff --git a/tests/tests/provider/src/android/provider/cts/MediaStore_VideoTest.java b/tests/tests/provider/src/android/provider/cts/MediaStore_VideoTest.java
index 31d9f2c..366fc57 100644
--- a/tests/tests/provider/src/android/provider/cts/MediaStore_VideoTest.java
+++ b/tests/tests/provider/src/android/provider/cts/MediaStore_VideoTest.java
@@ -18,23 +18,17 @@
 
 import com.android.cts.stub.R;
 
-import dalvik.annotation.TestLevel;
-import dalvik.annotation.TestTargetClass;
-import dalvik.annotation.TestTargetNew;
-
 import android.content.ContentResolver;
 import android.content.ContentValues;
 import android.content.Context;
 import android.database.Cursor;
 import android.net.Uri;
-import android.provider.MediaStore;
 import android.provider.MediaStore.Video;
 import android.provider.MediaStore.Video.VideoColumns;
 import android.test.InstrumentationTestCase;
 
 import java.util.ArrayList;
 
-@TestTargetClass(MediaStore.Video.class)
 public class MediaStore_VideoTest extends InstrumentationTestCase {
     private static final String TEST_VIDEO_3GP = "testVideo.3gp";
 
@@ -64,12 +58,7 @@
         mRowsAdded = new ArrayList<Uri>();
     }
 
-    @TestTargetNew(
-      level = TestLevel.COMPLETE,
-      method = "query",
-      args = {ContentResolver.class, Uri.class, String[].class}
-    )
-    public void testQuery() {
+    public void testQuery() throws Exception {
         ContentValues values = new ContentValues();
         String valueOfData = mHelper.copy(R.raw.testvideo, TEST_VIDEO_3GP);
         values.put(VideoColumns.DATA, valueOfData);
diff --git a/tests/tests/provider/src/android/provider/cts/MediaStore_Video_ThumbnailsTest.java b/tests/tests/provider/src/android/provider/cts/MediaStore_Video_ThumbnailsTest.java
new file mode 100644
index 0000000..935b255
--- /dev/null
+++ b/tests/tests/provider/src/android/provider/cts/MediaStore_Video_ThumbnailsTest.java
@@ -0,0 +1,105 @@
+/*
+ * 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.provider.cts;
+
+import com.android.cts.stub.R;
+
+import android.content.ContentResolver;
+import android.content.ContentUris;
+import android.content.ContentValues;
+import android.database.Cursor;
+import android.net.Uri;
+import android.os.Environment;
+import android.provider.MediaStore.Video.Media;
+import android.provider.MediaStore.Video.Thumbnails;
+import android.provider.MediaStore.Video.VideoColumns;
+import android.test.AndroidTestCase;
+
+import java.io.File;
+import java.io.IOException;
+
+public class MediaStore_Video_ThumbnailsTest extends AndroidTestCase {
+
+    private ContentResolver mResolver;
+
+    private FileCopyHelper mFileHelper;
+
+    @Override
+    protected void setUp() throws Exception {
+        super.setUp();
+        mResolver = mContext.getContentResolver();
+        mFileHelper = new FileCopyHelper(mContext);
+    }
+
+    @Override
+    protected void tearDown() throws Exception {
+        mFileHelper.clear();
+        super.tearDown();
+    }
+
+    public void testGetContentUri() {
+        Uri internalUri = Thumbnails.getContentUri(MediaStoreAudioTestHelper.INTERNAL_VOLUME_NAME);
+        Uri externalUri = Thumbnails.getContentUri(MediaStoreAudioTestHelper.EXTERNAL_VOLUME_NAME);
+        assertEquals(Thumbnails.INTERNAL_CONTENT_URI, internalUri);
+        assertEquals(Thumbnails.EXTERNAL_CONTENT_URI, externalUri);
+    }
+
+    public void testGetThumbnail() throws Exception {
+        // Insert a video into the provider.
+        Uri videoUri = insertVideo();
+        long videoId = ContentUris.parseId(videoUri);
+        assertTrue(videoId != -1);
+        assertEquals(ContentUris.withAppendedId(Media.EXTERNAL_CONTENT_URI, videoId),
+                videoUri);
+
+        // Get the current thumbnail count for future comparison.
+        int count = getThumbnailCount(Thumbnails.EXTERNAL_CONTENT_URI);
+
+        // Calling getThumbnail should generate a new thumbnail.
+        assertNotNull(Thumbnails.getThumbnail(mResolver, videoId, Thumbnails.MINI_KIND, null));
+        assertNotNull(Thumbnails.getThumbnail(mResolver, videoId, Thumbnails.MICRO_KIND, null));
+
+        try {
+            Thumbnails.getThumbnail(mResolver, videoId, Thumbnails.FULL_SCREEN_KIND, null);
+            fail();
+        } catch (IllegalArgumentException e) {
+            // Full screen thumbnails not supported by getThumbnail...
+        }
+
+        // Check that an additional thumbnails have been registered.
+        int count2 = getThumbnailCount(Thumbnails.EXTERNAL_CONTENT_URI);
+        assertTrue(count2 > count);
+    }
+
+    private Uri insertVideo() throws IOException {
+        File file = new File(Environment.getExternalStorageDirectory(), "testVideo.3gp");
+        mFileHelper.copyToExternalStorage(R.raw.testvideo, file);
+
+        ContentValues values = new ContentValues();
+        values.put(VideoColumns.DATA, file.getAbsolutePath());
+        return mResolver.insert(Media.EXTERNAL_CONTENT_URI, values);
+    }
+
+    private int getThumbnailCount(Uri uri) {
+        Cursor cursor = mResolver.query(uri, null, null, null, null);
+        try {
+            return cursor.getCount();
+        } finally {
+            cursor.close();
+        }
+    }
+}
diff --git a/tests/tests/renderscript/src/android/renderscript/cts/ComputeTest.java b/tests/tests/renderscript/src/android/renderscript/cts/ComputeTest.java
index 59c4de4..5418a80 100644
--- a/tests/tests/renderscript/src/android/renderscript/cts/ComputeTest.java
+++ b/tests/tests/renderscript/src/android/renderscript/cts/ComputeTest.java
@@ -324,6 +324,18 @@
         assertEquals(result, RS_MSG_TEST_PASSED);
     }
 
+    /**
+     * Test utility functions.
+     */
+    public void testUtilityFunctions() {
+        ScriptC_primitives t = new ScriptC_primitives(mRS,
+                                                      mRes,
+                                                      R.raw.utils);
+        t.invoke_test();
+        waitForMessage();
+        assertEquals(result, RS_MSG_TEST_PASSED);
+    }
+
     void setUpAllocation(Allocation a, int val) {
         Type t = a.getType();
         int x = t.getX();
diff --git a/tests/tests/renderscript/src/android/renderscript/cts/ContextCreationTest.java b/tests/tests/renderscript/src/android/renderscript/cts/ContextCreationTest.java
index 84c8ade..358c494 100644
--- a/tests/tests/renderscript/src/android/renderscript/cts/ContextCreationTest.java
+++ b/tests/tests/renderscript/src/android/renderscript/cts/ContextCreationTest.java
@@ -50,6 +50,12 @@
         super.setUp();
         mActivity = getActivity();
     }
+    
+    @Override
+    protected void tearDown() throws Exception {
+        mActivity.destroyAll();
+        super.tearDown();
+    }
 
     /**
      * Test repeated recreation of the renderscript context with a
@@ -74,7 +80,7 @@
     public void testCreationWithoutDelay() {
         for (int i = 0; i < NUM_RECREATE_ITERATIONS_WITHOUT_DELAY; i++) {
             if (LOG_RECREATE) {
-                Log.w(TAG, "Recreate (no delay) step " + i + " - pause");
+                Log.w(TAG, "Recreate (no delay) step " + i);
             }
             mActivity.recreateView();
         }
diff --git a/tests/tests/security/src/android/security/cts/PackageSignatureTest.java b/tests/tests/security/src/android/security/cts/PackageSignatureTest.java
index 3822035..f278b0f 100644
--- a/tests/tests/security/src/android/security/cts/PackageSignatureTest.java
+++ b/tests/tests/security/src/android/security/cts/PackageSignatureTest.java
@@ -83,7 +83,13 @@
             "android.tests.devicesetup",
 
             // APK for the Android core tests runner used only during CTS
-            "android.core.tests.runner"
+            "android.core.tests.runner",
+
+            // Wifi test utility used by Tradefed...
+            "com.android.tradefed.utils.wifi",
+
+            // Game used for CTS testing...
+            "com.replica.replicaisland"
             ));
 
     private boolean isWhitelistedPackage(String packageName) {
diff --git a/tests/tests/security/src/android/security/cts/VoldExploitTest.java b/tests/tests/security/src/android/security/cts/VoldExploitTest.java
index 3957bbe..ab14f12 100644
--- a/tests/tests/security/src/android/security/cts/VoldExploitTest.java
+++ b/tests/tests/security/src/android/security/cts/VoldExploitTest.java
@@ -41,6 +41,20 @@
 public class VoldExploitTest extends AndroidTestCase {
 
     /**
+     * Try to inject vold commands.
+     */
+    public void testTryCommandInjection() throws Exception {
+        final StorageManager sm = (StorageManager) getContext().getSystemService(
+                Context.STORAGE_SERVICE);
+        try {
+            sm.getMountedObbPath("/dev/null\0asec list");
+            fail("able to inject vold commands");
+        } catch(IllegalArgumentException e) {
+            // expected
+        }
+    }
+
+    /**
      * Validate that this device isn't vulnerable to the "ZergRush"
      * vold vulnerability (CVE-2011-3874).
      *
diff --git a/tests/tests/telephony/src/android/telephony/cts/SmsManagerTest.java b/tests/tests/telephony/src/android/telephony/cts/SmsManagerTest.java
index c0c26ef..bda7172 100755
--- a/tests/tests/telephony/src/android/telephony/cts/SmsManagerTest.java
+++ b/tests/tests/telephony/src/android/telephony/cts/SmsManagerTest.java
@@ -158,19 +158,24 @@
         assertNotNull(dividedMessages);
         int numParts;
         if (TelephonyUtils.isSkt(mTelephonyManager)) {
-            numParts = 5;
+            assertTrue(isComplete(dividedMessages, 5) || isComplete(dividedMessages, 3));
         } else if (TelephonyUtils.isKt(mTelephonyManager)) {
-            numParts = 4;
+            assertTrue(isComplete(dividedMessages, 4) || isComplete(dividedMessages, 3));
         } else {
-            numParts = 3;
+            assertTrue(isComplete(dividedMessages, 3));
         }
-        assertEquals(numParts, dividedMessages.size());
+    }
+
+    private boolean isComplete(List<String> dividedMessages, int numParts) {
+        if (dividedMessages.size() != numParts) {
+            return false;
+        }
 
         String actualMessage = "";
         for (int i = 0; i < numParts; i++) {
             actualMessage += dividedMessages.get(i);
         }
-        assertEquals(LONG_TEXT, actualMessage);
+        return LONG_TEXT.equals(actualMessage);
     }
 
     @TestTargets({
diff --git a/tests/tests/telephony/src/android/telephony/cts/SmsMessageTest.java b/tests/tests/telephony/src/android/telephony/cts/SmsMessageTest.java
index 27f290b..4b5b55a 100644
--- a/tests/tests/telephony/src/android/telephony/cts/SmsMessageTest.java
+++ b/tests/tests/telephony/src/android/telephony/cts/SmsMessageTest.java
@@ -65,6 +65,8 @@
     private static final int STATUS_ON_ICC_DEF = -1;
     private static final int TPLAYER_LENGTH_FOR_PDU = 23;
     private static final long TIMESTAMP_MILLIS = 1149631383000l;
+    private static final int SEPTETS_SKT = 80;
+    private static final int SEPTETS_KT = 90;
 
     @Override
     protected void setUp() throws Exception {
@@ -188,7 +190,7 @@
         int[] result = SmsMessage.calculateLength(sms.getMessageBody(), true);
         assertEquals(SMS_NUMBER1, result[0]);
         assertEquals(sms.getMessageBody().length(), result[1]);
-        assertEquals(getNumSeptets() - sms.getMessageBody().length(), result[2]);
+        assertRemaining(sms.getMessageBody().length(), result[2]);
         assertEquals(SmsMessage.ENCODING_7BIT, result[3]);
         assertEquals(pdu, toHexString(sms.getPdu()));
 
@@ -220,7 +222,7 @@
         result = SmsMessage.calculateLength(msgBody, false);
         assertEquals(SMS_NUMBER2, result[0]);
         assertEquals(sms.getMessageBody().length(), result[1]);
-        assertEquals(getNumSeptets() - sms.getMessageBody().length(), result[2]);
+        assertRemaining(sms.getMessageBody().length(), result[2]);
         assertEquals(SmsMessage.ENCODING_7BIT, result[3]);
 
         // Test createFromPdu Ucs to Sms
@@ -231,20 +233,26 @@
         result = SmsMessage.calculateLength(sms.getMessageBody(), true);
         assertEquals(SMS_NUMBER3, result[0]);
         assertEquals(sms.getMessageBody().length(), result[1]);
-        assertEquals(getNumSeptets() - sms.getMessageBody().length(), result[2]);
+        assertRemaining(sms.getMessageBody().length(), result[2]);
         assertEquals(SmsMessage.ENCODING_7BIT, result[3]);
     }
 
-    private int getNumSeptets() {
+    private void assertRemaining(int messageLength, int remaining) {
         if (TelephonyUtils.isSkt(mTelephonyManager)) {
-            return 80;
+            assertTrue(checkRemaining(SEPTETS_SKT, messageLength, remaining)
+                    || checkRemaining(SmsMessage.MAX_USER_DATA_SEPTETS, messageLength, remaining));
         } else if (TelephonyUtils.isKt(mTelephonyManager)) {
-            return 90;
+            assertTrue(checkRemaining(SEPTETS_KT, messageLength, remaining)
+                    || checkRemaining(SmsMessage.MAX_USER_DATA_SEPTETS, messageLength, remaining));
         } else {
-            return SmsMessage.MAX_USER_DATA_SEPTETS;
+            assertTrue(checkRemaining(SmsMessage.MAX_USER_DATA_SEPTETS, messageLength, remaining));
         }
     }
 
+    private boolean checkRemaining(int total, int messageLength, int remaining) {
+        return total - messageLength == remaining;
+    }
+
     @TestTargets({
         @TestTargetNew(
             level = TestLevel.COMPLETE,
diff --git a/tests/tests/theme/Android.mk b/tests/tests/theme/Android.mk
deleted file mode 100644
index b28e6b3..0000000
--- a/tests/tests/theme/Android.mk
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright (C) 2011 The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-# don't include this package in any target
-LOCAL_MODULE_TAGS := optional
-# and when built explicitly put it in the data partition
-LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS)
-
-LOCAL_JAVA_LIBRARIES := android.test.runner
-
-# Include all test java files.
-LOCAL_SRC_FILES := $(call all-java-files-under, src)
-
-LOCAL_PACKAGE_NAME := CtsThemeTestCases
-
-LOCAL_MODULE_TAGS := tests
-
-LOCAL_INSTRUMENTATION_FOR := CtsTestStubs
-
-include $(BUILD_PACKAGE)
diff --git a/tests/tests/theme/AndroidManifest.xml b/tests/tests/theme/AndroidManifest.xml
deleted file mode 100644
index 55afc7d..0000000
--- a/tests/tests/theme/AndroidManifest.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2011 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.android.cts.theme">
-
-    <!-- We add an application tag here just so that we can indicate that
-         this package needs to link against the android.test library,
-         which is needed when building test cases. -->
-    <application>
-        <uses-library android:name="android.test.runner" />
-    </application>
-
-  <instrumentation android:name="android.test.InstrumentationCtsTestRunner"
-      android:targetPackage="com.android.cts.stub"
-      android:label="CTS tests for themes">
-  </instrumentation>
-
-</manifest>
diff --git a/tests/tests/theme/src/android/theme/cts/ActivitySnapshotTests.java b/tests/tests/theme/src/android/theme/cts/ActivitySnapshotTests.java
deleted file mode 100644
index 0e93a75..0000000
--- a/tests/tests/theme/src/android/theme/cts/ActivitySnapshotTests.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * Copyright (C) 2011 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package android.theme.cts;
-
-import android.test.ActivityInstrumentationTestCase2;
-
-/**
- * This class performs both the generation and testing for all of the tests
- * that take a snapshot of an entire activity and compare against a known-good version.
- */
-public class ActivitySnapshotTests
-        extends ActivityInstrumentationTestCase2<SnapshotActivity> implements TestReset {
-    /**
-     * Creates an {@link ActivityInstrumentationTestCase2}
-     * for the {@link SnapshotActivity} activity.
-     */
-    public ActivitySnapshotTests() {
-        super(SnapshotActivity.class);
-    }
-
-    /**
-     * Generates the master versions of the bitmaps for the activity tests
-     * in the normal mode.
-     */
-    public void generateActivityBitmaps() {
-        ActivitySnapshotTester tester = new ActivitySnapshotTester(this, false);
-        tester.genOrTestActivityBitmaps(true, true);
-        tester.genOrTestActivityBitmaps(true, false);
-    }
-
-    /**
-     * Runs the activity snapshot tests.
-     */
-    public void testActivityBitmaps() {
-        ActivitySnapshotTester tester = new ActivitySnapshotTester(this, false);
-        tester.genOrTestActivityBitmaps(false, true);
-        tester.genOrTestActivityBitmaps(false, false);
-    }
-
-    public void reset() {
-        try {
-            tearDown();
-            setUp();
-        } catch (Exception e) {
-            fail("Failed at tearing down the activity so we can start a new one.");
-        }
-    }
-}
diff --git a/tests/tests/theme/src/android/theme/cts/SplitActivitySnapshotTests.java b/tests/tests/theme/src/android/theme/cts/SplitActivitySnapshotTests.java
deleted file mode 100644
index 9a71a6c..0000000
--- a/tests/tests/theme/src/android/theme/cts/SplitActivitySnapshotTests.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * Copyright (C) 2011 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package android.theme.cts;
-
-import android.test.ActivityInstrumentationTestCase2;
-
-/**
- * This class performs both the generation and testing for all of the tests
- * that take a snapshot of an entire activity and compare against a known-good version.
- *
- * Note that this class is essentially duplicated from {@link ActivitySnapshotTests}.
- * This unfortunate situation occurs because taking tests with a SplitActionBar
- * requires setting uiOptions on an activity in the AndroidManifest.xml. Since
- * this class requires an activity via generics, there has to be two separate
- * classes ({@link ActivitySnapshotTests} and this one) so that the tests can
- * be run both in normal mode and SplitActionBar mode.
- */
-public class SplitActivitySnapshotTests
-        extends ActivityInstrumentationTestCase2<SplitSnapshotActivity> implements TestReset {
-    /**
-     * Creates an {@link ActivityInstrumentationTestCase2}
-     * for the {@link SplitSnapshotActivity} activity.
-     */
-    public SplitActivitySnapshotTests() {
-        super(SplitSnapshotActivity.class);
-    }
-
-    /**
-     * Generates the master versions of the bitmaps for the activity tests
-     * in the normal mode.
-     */
-    public void generateActivityBitmaps() {
-        ActivitySnapshotTester tester = new ActivitySnapshotTester(this, true);
-        tester.genOrTestActivityBitmaps(true, true);
-        tester.genOrTestActivityBitmaps(true, false);
-    }
-
-    /**
-     * Runs the activity snapshot tests.
-     */
-    public void testActivityBitmaps() {
-        ActivitySnapshotTester tester = new ActivitySnapshotTester(this, true);
-        tester.genOrTestActivityBitmaps(false, true);
-        tester.genOrTestActivityBitmaps(false, false);
-    }
-
-    public void reset() {
-        try {
-            tearDown();
-            setUp();
-        } catch (Exception e) {
-            fail("Failed at tearing down the activity so we can start a new one.");
-        }
-    }
-}
diff --git a/tests/tests/theme/src/android/theme/cts/ThemeGenerator.java b/tests/tests/theme/src/android/theme/cts/ThemeGenerator.java
deleted file mode 100644
index 4fe2a25..0000000
--- a/tests/tests/theme/src/android/theme/cts/ThemeGenerator.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- * Copyright (C) 2011 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package android.theme.cts;
-
-import android.app.Instrumentation;
-import android.content.Intent;
-import android.content.pm.ActivityInfo;
-import android.test.ActivityInstrumentationTestCase2;
-
-/**
- * This class generates the masters for the theme tests that
- * takes snapshots of views (typically widgets such as buttons, etc).
- */
-public class ThemeGenerator extends ActivityInstrumentationTestCase2<ThemeTestGeneratorActivity> {
-    /**
-     * Creates an {@link ActivityInstrumentationTestCase2}
-     * for the {@link ThemeTestGeneratorActivity} activity.
-     */
-    public ThemeGenerator() {
-        super(ThemeTestGeneratorActivity.class);
-    }
-
-    /**
-     * Generates the master bitmaps for all of the themes. Since it is not named "test something"
-     * it is not run by CTS by default. However, you can run it via am instrument by specifying
-     * the method name.
-     */
-    public void generateThemeBitmaps() {
-        ThemeInfo[] themes = ThemeTests.getThemes();
-
-        for (ThemeInfo theme : themes) {
-            generateThemeBitmap(theme.getResourceId(), theme.getThemeName(),
-                    ActivityInfo.SCREEN_ORIENTATION_PORTRAIT);
-            generateThemeBitmap(theme.getResourceId(), theme.getThemeName(),
-                    ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE);
-        }
-    }
-
-    private void generateThemeBitmap(int resourceId, String themeName, int orientation) {
-        Instrumentation instrumentation = getInstrumentation();
-
-        Intent intent = new Intent();
-        intent.putExtra(ThemeTests.EXTRA_THEME_ID, resourceId);
-        intent.putExtra(ThemeTests.EXTRA_THEME_NAME, themeName);
-        intent.putExtra(ThemeTests.EXTRA_ORIENTATION, orientation);
-        setActivityIntent(intent);
-
-        final ThemeTestGeneratorActivity activity = getActivity();
-
-        activity.runOnUiThread(new Runnable() {
-           public void run() {
-               activity.generateTests();
-           }
-        });
-
-        instrumentation.waitForIdleSync();
-
-        try {
-            tearDown();
-            setUp();
-        } catch (Exception e) {
-            fail("Failed at tearing down the activity so we can start a new one.");
-        }
-    }
-}
diff --git a/tests/tests/theme/src/android/theme/cts/ThemeTest.java b/tests/tests/theme/src/android/theme/cts/ThemeTest.java
deleted file mode 100644
index 4871a0e..0000000
--- a/tests/tests/theme/src/android/theme/cts/ThemeTest.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- * Copyright (C) 2011 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package android.theme.cts;
-
-import android.app.Instrumentation;
-import android.content.Intent;
-import android.content.pm.ActivityInfo;
-import android.test.ActivityInstrumentationTestCase2;
-
-/**
- * This class runs the theme tests that takes snapshots of views (typically widgets
- * such as buttons, etc).
- */
-public class ThemeTest extends ActivityInstrumentationTestCase2<ThemeTestRunnerActivity> {
-    /**
-     * Creates an {@link ActivityInstrumentationTestCase2}
-     * for the {@link ThemeTestRunnerActivity} activity.
-     */
-    public ThemeTest() {
-        super(ThemeTestRunnerActivity.class);
-    }
-
-    public void testThemes() {
-        ThemeInfo[] themes = ThemeTests.getThemes();
-
-        for (ThemeInfo theme : themes) {
-            runThemeTest(theme.getResourceId(), theme.getThemeName(),
-                    ActivityInfo.SCREEN_ORIENTATION_PORTRAIT);
-            runThemeTest(theme.getResourceId(), theme.getThemeName(),
-                    ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE);
-        }
-    }
-
-    /**
-     * Runs the theme test given the appropriate theme resource id and theme name.
-     * @param resourceId Resource ID of the theme being tested.
-     * @param themeName Name of the theme being tested, e.g., "holo", "holo_light", etc
-     */
-    private void runThemeTest(int resourceId, String themeName, int orientation) {
-        Instrumentation instrumentation = getInstrumentation();
-
-        Intent intent = new Intent();
-        intent.putExtra(ThemeTests.EXTRA_THEME_ID, resourceId);
-        intent.putExtra(ThemeTests.EXTRA_THEME_NAME, themeName);
-        intent.putExtra(ThemeTests.EXTRA_ORIENTATION, orientation);
-        setActivityIntent(intent);
-
-        final ThemeTestRunnerActivity activity = getActivity();
-
-        activity.runOnUiThread(new Runnable() {
-           public void run() {
-               activity.runTests();
-           }
-        });
-
-        instrumentation.waitForIdleSync();
-
-        try {
-            tearDown();
-            setUp();
-        } catch (Exception e) {
-            fail("Failed at tearing down the activity so we can start a new one.");
-        }
-    }
-}
diff --git a/tests/tests/view/src/android/view/cts/DisplayRefreshRateTest.java b/tests/tests/view/src/android/view/cts/DisplayRefreshRateTest.java
new file mode 100644
index 0000000..a4c9318
--- /dev/null
+++ b/tests/tests/view/src/android/view/cts/DisplayRefreshRateTest.java
@@ -0,0 +1,171 @@
+/*
+ * Copyright (C) 2011 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package android.view.cts;
+
+import android.content.Context;
+import android.opengl.GLSurfaceView;
+import android.opengl.cts.GLSurfaceViewStubActivity;
+import android.test.ActivityInstrumentationTestCase2;
+import android.test.UiThreadTest;
+import android.view.Display;
+import android.view.WindowManager;
+import android.util.Log;
+
+import java.util.ArrayList;
+import javax.microedition.khronos.egl.EGLConfig;
+import javax.microedition.khronos.opengles.GL10;
+
+/**
+ * Test that the screen refresh rate claimed by
+ * android.view.Display.getRefreshRate() matches the steady-state framerate
+ * achieved by vsync-limited eglSwapBuffers(). The primary goal is to test
+ * Display.getRefreshRate() -- using GL is just an easy and hopefully reliable
+ * way of measuring the actual refresh rate.
+ */
+public class DisplayRefreshRateTest extends
+        ActivityInstrumentationTestCase2<GLSurfaceViewStubActivity> {
+
+    // The test passes if
+    //   abs(measured_fps - Display.getRefreshRate()) <= FPS_TOLERANCE.
+    // A smaller tolerance requires a more accurate measured_fps in order
+    // to avoid false negatives.
+    private static final float FPS_TOLERANCE = 2.0f;
+
+    private static final String TAG = "DisplayRefreshRateTest";
+
+    private class FpsResult {
+        private float mFps;
+        private boolean mValid = false;
+
+        public final synchronized void notifyResult(float fps) {
+            if (!mValid) {
+                mFps = fps;
+                mValid = true;
+                notifyAll();
+            }
+        }
+
+        public final synchronized float waitResult() {
+            while (!mValid) {
+                try {
+                    wait();
+                } catch (InterruptedException e) {/* ignore and retry */}
+            }
+            return mFps;
+        }
+    }
+
+    private class Renderer implements GLSurfaceView.Renderer {
+        // Measurement knobs.
+        // NB: Some devices need a surprisingly long warmup period before the
+        // framerate becomes stable.
+        private static final float WARMUP_SECONDS = 2.0f;
+        private static final float TEST_SECONDS   = 8.0f;
+
+        // Test states
+        private static final int STATE_START  = 0;
+        private static final int STATE_WARMUP = 1;
+        private static final int STATE_TEST   = 2;
+        private static final int STATE_DONE   = 3;
+
+        private FpsResult mResult;
+        private int       mState     = STATE_START;
+        private float     mStartTime = 0.0f;
+        private int       mNumFrames = 0;
+
+        public Renderer(FpsResult result) {
+            mResult = result;
+        }
+
+        public void onDrawFrame(GL10 gl) {
+            float t = (float)System.nanoTime() * 1.0e-9f;
+            switch (mState) {
+                case STATE_START:
+                    mStartTime = t;
+                    mState = STATE_WARMUP;
+                    break;
+
+                case STATE_WARMUP:
+                    if ((t - mStartTime) >= WARMUP_SECONDS) {
+                        mStartTime = t;
+                        mNumFrames = 0;
+                        mState = STATE_TEST;
+                    }
+                    break;
+
+                case STATE_TEST:
+                    mNumFrames++;
+                    float elapsed = t - mStartTime;
+                    if (elapsed >= TEST_SECONDS) {
+                        mResult.notifyResult((float)mNumFrames / elapsed);
+                        mState = STATE_DONE;
+                    }
+                    break;
+
+                case STATE_DONE:
+                    break;
+            }
+
+            // prevent unwanted optimizations or hidden costs (e.g. reading
+            // previous frame on tilers).
+            gl.glClearColor(0.0f, 0.0f, 0.0f, 0.0f);
+            gl.glClear(gl.GL_COLOR_BUFFER_BIT);
+        }
+
+        public void onSurfaceChanged(GL10 gl, int width, int height) {
+            // Do nothing.
+        }
+
+        public void onSurfaceCreated(GL10 gl, EGLConfig config) {
+            // Do nothing.
+        }
+    }
+
+    private FpsResult mResult;
+
+    public DisplayRefreshRateTest() {
+        super(GLSurfaceViewStubActivity.class);
+        mResult = new FpsResult();
+    }
+
+    @Override
+    protected void setUp() throws Exception {
+        super.setUp();
+        GLSurfaceViewStubActivity.setRenderer(new Renderer(mResult));
+        GLSurfaceViewStubActivity.setRenderMode(
+                GLSurfaceView.RENDERMODE_CONTINUOUSLY);
+    }
+
+    public void testRefreshRate() {
+        GLSurfaceViewStubActivity activity = getActivity();
+        float achievedFps = mResult.waitResult();
+        activity.finish();
+
+        WindowManager wm = (WindowManager)activity
+                .getView()
+                .getContext()
+                .getSystemService(Context.WINDOW_SERVICE);
+        Display dpy = wm.getDefaultDisplay();
+        float claimedFps = dpy.getRefreshRate();
+
+        Log.d(TAG, "claimed " + claimedFps + " fps, " +
+                   "achieved " + achievedFps + " fps");
+
+        assertTrue(Math.abs(claimedFps - achievedFps) <= FPS_TOLERANCE);
+    }
+
+}
diff --git a/tests/tests/webkit/src/android/webkit/cts/TestHtmlConstants.java b/tests/tests/webkit/src/android/webkit/cts/TestHtmlConstants.java
index b2bdfc8..a31e0c0 100644
--- a/tests/tests/webkit/src/android/webkit/cts/TestHtmlConstants.java
+++ b/tests/tests/webkit/src/android/webkit/cts/TestHtmlConstants.java
@@ -56,6 +56,12 @@
 
     public static final String EXT_WEB_URL1 = "http://www.example.com/";
 
+    public static final String LOCAL_FILESYSTEM_URL = "file:///etc/hosts";
+
+    // Must match the title of the page at
+    // android/frameworks/base/core/res/res/raw/loaderror.html
+    public static final String WEBPAGE_NOT_AVAILABLE_TITLE = "Webpage not available";
+
     public static final String getFileUrl(String assetName) {
         if (assetName.contains(":") || assetName.startsWith("/")) {
             throw new IllegalArgumentException();
diff --git a/tests/tests/webkit/src/android/webkit/cts/WebSettingsTest.java b/tests/tests/webkit/src/android/webkit/cts/WebSettingsTest.java
index 639f795..05e668b 100644
--- a/tests/tests/webkit/src/android/webkit/cts/WebSettingsTest.java
+++ b/tests/tests/webkit/src/android/webkit/cts/WebSettingsTest.java
@@ -214,7 +214,6 @@
             args = {boolean.class}
         )
     })
-    @ToBeFixed(explanation = "Cannot block file access using setAllowFileAccess(false)")
     public void testAccessAllowFileAccess() {
         assertTrue(mSettings.getAllowFileAccess());
 
@@ -225,11 +224,15 @@
         fileUrl = TestHtmlConstants.getFileUrl(TestHtmlConstants.BR_TAG_URL);
         mSettings.setAllowFileAccess(false);
         assertFalse(mSettings.getAllowFileAccess());
+
         loadUrl(fileUrl);
-        // direct file:// access still works with access disabled
+        // android_asset URLs should still be loaded when even with file access
+        // disabled.
         assertEquals(TestHtmlConstants.BR_TAG_TITLE, mWebView.getTitle());
 
-        // ToBeFixed: How does this API prevent file access?
+        // Files on the file system should not be loaded.
+        loadUrl(TestHtmlConstants.LOCAL_FILESYSTEM_URL);
+        assertEquals(TestHtmlConstants.WEBPAGE_NOT_AVAILABLE_TITLE, mWebView.getTitle());
     }
 
     @TestTargets({
diff --git a/tests/tests/webkit/src/android/webkit/cts/WebViewTest.java b/tests/tests/webkit/src/android/webkit/cts/WebViewTest.java
index b06109a..db0f685 100755
--- a/tests/tests/webkit/src/android/webkit/cts/WebViewTest.java
+++ b/tests/tests/webkit/src/android/webkit/cts/WebViewTest.java
@@ -622,26 +622,26 @@
                 "<body onload=\"document.title = typeof window.injectedObject;\"></body></html>";
 
         // Test that the property is initially undefined.
-        mWebView.loadData(setTitleToPropertyTypeHtml, "text/html", "UTF-8");
+        mWebView.loadData(setTitleToPropertyTypeHtml, "text/html", null);
         waitForLoadComplete();
         assertEquals("undefined", mWebView.getTitle());
 
         // Test that adding a null object has no effect.
         mWebView.addJavascriptInterface(null, "injectedObject");
-        mWebView.loadData(setTitleToPropertyTypeHtml, "text/html", "UTF-8");
+        mWebView.loadData(setTitleToPropertyTypeHtml, "text/html", null);
         waitForLoadComplete();
         assertEquals("undefined", mWebView.getTitle());
 
         // Test that adding an object gives an object type.
         final Object obj = new Object();
         mWebView.addJavascriptInterface(obj, "injectedObject");
-        mWebView.loadData(setTitleToPropertyTypeHtml, "text/html", "UTF-8");
+        mWebView.loadData(setTitleToPropertyTypeHtml, "text/html", null);
         waitForLoadComplete();
         assertEquals("object", mWebView.getTitle());
 
         // Test that trying to replace with a null object has no effect.
         mWebView.addJavascriptInterface(null, "injectedObject");
-        mWebView.loadData(setTitleToPropertyTypeHtml, "text/html", "UTF-8");
+        mWebView.loadData(setTitleToPropertyTypeHtml, "text/html", null);
         waitForLoadComplete();
         assertEquals("object", mWebView.getTitle());
     }
@@ -677,12 +677,12 @@
                     "</head><body onload=\"updateTitle();\"></body></html>";
 
             mWebView.addJavascriptInterface(obj, name);
-            mWebView.loadData(Uri.encode(setTitleToPropertyTypeHtml), "text/html", "UTF-8");
+            mWebView.loadData(Uri.encode(setTitleToPropertyTypeHtml), "text/html", null);
             waitForLoadComplete();
             assertEquals("object", mWebView.getTitle());
 
             mWebView.removeJavascriptInterface(name);
-            mWebView.loadData(Uri.encode(setTitleToPropertyTypeHtml), "text/html", "UTF-8");
+            mWebView.loadData(Uri.encode(setTitleToPropertyTypeHtml), "text/html", null);
             waitForLoadComplete();
             assertEquals("undefined", mWebView.getTitle());
         }
@@ -702,13 +702,13 @@
 
         // Test that adding an object gives an object type.
         mWebView.addJavascriptInterface(new Object(), "injectedObject");
-        mWebView.loadData(setTitleToPropertyTypeHtml, "text/html", "UTF-8");
+        mWebView.loadData(setTitleToPropertyTypeHtml, "text/html", null);
         waitForLoadComplete();
         assertEquals("object", mWebView.getTitle());
 
         // Test that reloading the page after removing the object leaves the property undefined.
         mWebView.removeJavascriptInterface("injectedObject");
-        mWebView.loadData(setTitleToPropertyTypeHtml, "text/html", "UTF-8");
+        mWebView.loadData(setTitleToPropertyTypeHtml, "text/html", null);
         waitForLoadComplete();
         assertEquals("undefined", mWebView.getTitle());
     }
@@ -763,7 +763,7 @@
                 mWebView.loadData("<html><head></head>" +
                         "<body onload=\"window.removedObject.remove();" +
                         "resultObject.setResult(removedObject.toString());\"></body></html>",
-                        "text/html", "UTF-8");
+                        "text/html", null);
             }
         });
         assertEquals("removedObject", resultObject.getResult());
@@ -1100,7 +1100,7 @@
                 assertNull(mWebView.getTitle());
                 mWebView.loadData("<html><head><title>Hello,World!</title></head><body></body>" +
                         "</html>",
-                        "text/html", "UTF-8");
+                        "text/html", null);
                 waitForLoadComplete();
                 assertEquals("Hello,World!", mWebView.getTitle());
             }
@@ -1138,7 +1138,7 @@
                         "document.title = " +
                         "document.getElementById('frame').contentWindow.location.href;" +
                         "\"><iframe id=\"frame\" src=\"" + crossOriginUrl + "\"></body></html>",
-                        "text/html", "UTF-8");
+                        "text/html", null);
             }
         });
         assertEquals(ConsoleMessage.MessageLevel.ERROR, webChromeClient.getMessageLevel());
@@ -1217,7 +1217,7 @@
     public void testFindAll() {
         String p = "<p>Find all instances of find on the page and highlight them.</p>";
 
-        mWebView.loadData("<html><body>" + p + "</body></html>", "text/html", "UTF-8");
+        mWebView.loadData("<html><body>" + p + "</body></html>", "text/html", null);
         waitForLoadComplete();
 
         assertEquals(2, mWebView.findAll("find"));
@@ -1278,7 +1278,7 @@
                 String p = "<p style=\"height:" + dimension + "px;\">" +
                         "Find all instances of a word on the page and highlight them.</p>";
 
-                mWebView.loadData("<html><body>" + p + p + "</body></html>", "text/html", "UTF-8");
+                mWebView.loadData("<html><body>" + p + p + "</body></html>", "text/html", null);
                 waitForLoadComplete();
 
                 // highlight all the strings found
@@ -1369,7 +1369,7 @@
         runTestOnUiThread(new Runnable() {
             public void run() {
                 mWebView.loadData("<html><body><img src=\"" + imgUrl + "\"/></body></html>",
-                        "text/html", "UTF-8");
+                        "text/html", null);
                 waitForLoadComplete();
                 Message response = new Message();
                 response.setTarget(handler);
@@ -1425,7 +1425,7 @@
                 int dimension = 2 * Math.max(metrics.widthPixels, metrics.heightPixels);
                 String p = "<p style=\"height:" + dimension + "px;\">" +
                         "Scroll by half the size of the page.</p>";
-                mWebView.loadData("<html><body>" + p + p + "</body></html>", "text/html", "UTF-8");
+                mWebView.loadData("<html><body>" + p + p + "</body></html>", "text/html", null);
                 waitForLoadComplete();
             }
         });
@@ -1508,7 +1508,7 @@
 
         runTestOnUiThread(new Runnable() {
             public void run() {
-                mWebView.loadData("<html><body></body></html>", "text/html", "UTF-8");
+                mWebView.loadData("<html><body></body></html>", "text/html", null);
                 waitForLoadComplete();
             }
         });
@@ -1521,7 +1521,7 @@
         runTestOnUiThread(new Runnable() {
             public void run() {
                 assertEquals(mWebView.getHeight(), mWebView.getContentHeight() * mWebView.getScale(), 2f);
-                mWebView.loadData("<html><body>" + p + "</body></html>", "text/html", "UTF-8");
+                mWebView.loadData("<html><body>" + p + "</body></html>", "text/html", null);
                 waitForLoadComplete();
             }
         });
@@ -1534,7 +1534,7 @@
 
         runTestOnUiThread(new Runnable() {
             public void run() {
-                mWebView.loadData("<html><body>" + p + p + "</body></html>", "text/html", "UTF-8");
+                mWebView.loadData("<html><body>" + p + p + "</body></html>", "text/html", null);
                 waitForLoadComplete();
             }
         });
@@ -1647,7 +1647,7 @@
                 int dimension = 2 * Math.max(metrics.widthPixels, metrics.heightPixels);
                 String p = "<p style=\"height:" + dimension + "px;" +
                         "width:" + dimension + "px\">Test fling scroll.</p>";
-                mWebView.loadData("<html><body>" + p + "</body></html>", "text/html", "UTF-8");
+                mWebView.loadData("<html><body>" + p + "</body></html>", "text/html", null);
                 waitForLoadComplete();
             }
         });
@@ -1696,7 +1696,7 @@
                 + "\">HTML_URL2</A></DL><p>";
         runTestOnUiThread(new Runnable() {
             public void run() {
-                mWebView.loadData("<html><body>" + links + "</body></html>", "text/html", "UTF-8");
+                mWebView.loadData("<html><body>" + links + "</body></html>", "text/html", null);
                 waitForLoadComplete();
             }
         });
@@ -1774,7 +1774,7 @@
         runTestOnUiThread(new Runnable() {
             public void run() {
                 mWebView.loadData("<html><title>Title</title><body><img src=\"" + imgUrl
-                        + "\"/></body></html>", "text/html", "UTF-8");
+                        + "\"/></body></html>", "text/html", null);
                 waitForLoadComplete();
             }
         });
@@ -1912,7 +1912,7 @@
 
         runTestOnUiThread(new Runnable() {
             public void run() {
-                mWebView.loadData("<html><body>" + p + "</body></html>", "text/html", "UTF-8");
+                mWebView.loadData("<html><body>" + p + "</body></html>", "text/html", null);
                 waitForLoadComplete();
             }
         });
@@ -1924,7 +1924,7 @@
 
                 mWebView.setInitialScale(0);
                 // modify content to fool WebKit into re-loading
-                mWebView.loadData("<html><body>" + p + "2" + "</body></html>", "text/html", "UTF-8");
+                mWebView.loadData("<html><body>" + p + "2" + "</body></html>", "text/html", null);
                 waitForLoadComplete();
             }
         });
@@ -1935,7 +1935,7 @@
                 assertEquals(defaultScale, mWebView.getScale(), .01f);
 
                 mWebView.setInitialScale(50);
-                mWebView.loadData("<html><body>" + p + "3" + "</body></html>", "text/html", "UTF-8");
+                mWebView.loadData("<html><body>" + p + "3" + "</body></html>", "text/html", null);
                 waitForLoadComplete();
             }
         });
@@ -1946,7 +1946,7 @@
                 assertEquals(0.5f, mWebView.getScale(), .02f);
 
                 mWebView.setInitialScale(0);
-                mWebView.loadData("<html><body>" + p + "4" + "</body></html>", "text/html", "UTF-8");
+                mWebView.loadData("<html><body>" + p + "4" + "</body></html>", "text/html", null);
                 waitForLoadComplete();
             }
         });
@@ -2432,7 +2432,7 @@
                 DisplayMetrics metrics = mWebView.getContext().getResources().getDisplayMetrics();
                 final int dimension = 2 * Math.max(metrics.widthPixels, metrics.heightPixels);
                 String p = "<p style=\"height:" + dimension + "px;width:" + dimension + "px\">&nbsp;</p>";
-                mWebView.loadData("<html><body>" + p + "</body></html>", "text/html", "UTF-8");
+                mWebView.loadData("<html><body>" + p + "</body></html>", "text/html", null);
                 waitForLoadComplete();
             }
         });
@@ -2501,8 +2501,14 @@
                 mWebView.setWebViewClient(new WebViewClient());
                 mWebView.setDownloadListener(listener);
                 mWebView.loadData("<html><body><a href=\"" + url + "\">link</a></body></html>",
-                        "text/html", "UTF-8");
+                        "text/html", null);
                 waitForLoadComplete();
+            }
+        });
+        // Wait for layout to complete before setting focus.
+        getInstrumentation().waitForIdleSync();
+        runTestOnUiThread(new Runnable() {
+            public void run() {
                 assertTrue(mWebView.requestFocus(View.FOCUS_DOWN, null));
             }
         });
@@ -2809,8 +2815,8 @@
 
         @Override
         public void handleMessage(Message msg) {
-            mHadRecieved = true;
             mResultUrl = msg.getData().getString("url");
+            mHadRecieved = true;
         }
     }
 
diff --git a/tests/tests/widget/src/android/widget/cts/AlphabetIndexerTest.java b/tests/tests/widget/src/android/widget/cts/AlphabetIndexerTest.java
index 59b940c..291f886 100644
--- a/tests/tests/widget/src/android/widget/cts/AlphabetIndexerTest.java
+++ b/tests/tests/widget/src/android/widget/cts/AlphabetIndexerTest.java
@@ -16,19 +16,16 @@
 
 package android.widget.cts;
 
-import com.android.common.ArrayListCursor;
-
 import dalvik.annotation.TestLevel;
 import dalvik.annotation.TestTargetClass;
 import dalvik.annotation.TestTargetNew;
 import dalvik.annotation.TestTargets;
 
 import android.database.Cursor;
+import android.database.MatrixCursor;
 import android.test.AndroidTestCase;
 import android.widget.AlphabetIndexer;
 
-import java.util.ArrayList;
-
 @TestTargetClass(AlphabetIndexer.class)
 public class AlphabetIndexerTest extends AndroidTestCase {
     private static final String[] COUNTRIES_LIST = new String[]
@@ -36,7 +33,7 @@
     private static final String[] NAMES_LIST = new String[]
         {"Andy", "Bergkamp", "David", "Jacky", "Kevin", "Messi", "Michael", "Steven"};
     private static final String ALPHABET = " ABCDEFGHIJKLMNOPQRSTUVWXYZ";
-    private static final int SORTED_COLUMN_INDEX = 0;
+    private static final int SORTED_COLUMN_INDEX = 1;
 
     private static final int INDEX_OF_ARGENTINA = 0;
     private static final int INDEX_OF_CHINA = 2;
@@ -151,16 +148,13 @@
 
     @SuppressWarnings("unchecked")
     private Cursor createCursor(String listName, String[] listData) {
-        String[] columns = { listName };
+        String[] columns = { "_id", listName };
 
-        ArrayList<ArrayList> list = new ArrayList<ArrayList>();
-        for (String cell : listData) {
-            ArrayList<String> row = new ArrayList<String>();
-            row.add(cell);
-            list.add(row);
+        MatrixCursor cursor = new MatrixCursor(columns, listData.length);
+        for (int i = 0; i < listData.length; i++) {
+            cursor.addRow(new Object[] { i, listData[i] });
         }
-
-        return new ArrayListCursor(columns, list);
+        return cursor;
     }
 
     /**
diff --git a/tests/tests/widget/src/android/widget/cts/ResourceCursorAdapterTest.java b/tests/tests/widget/src/android/widget/cts/ResourceCursorAdapterTest.java
index 38ec995..64935c5 100644
--- a/tests/tests/widget/src/android/widget/cts/ResourceCursorAdapterTest.java
+++ b/tests/tests/widget/src/android/widget/cts/ResourceCursorAdapterTest.java
@@ -17,7 +17,6 @@
 package android.widget.cts;
 
 import com.android.cts.stub.R;
-import com.android.common.ArrayListCursor;
 
 import dalvik.annotation.TestLevel;
 import dalvik.annotation.TestTargetClass;
@@ -26,14 +25,13 @@
 
 import android.content.Context;
 import android.database.Cursor;
+import android.database.MatrixCursor;
 import android.test.InstrumentationTestCase;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ResourceCursorAdapter;
 
-import java.util.ArrayList;
-
 /**
  * Test {@link ResourceCursorAdapter}.
  */
@@ -185,21 +183,22 @@
      */
     @SuppressWarnings("unchecked")
     private Cursor createTestCursor(int colCount, int rowCount) {
-        ArrayList<ArrayList> list = new ArrayList<ArrayList>();
-        String[] columns = new String[colCount];
+        String[] columns = new String[colCount + 1];
         for (int i = 0; i < colCount; i++) {
             columns[i] = "column" + i;
         }
+        columns[colCount] = "_id";
 
+        MatrixCursor cursor = new MatrixCursor(columns, rowCount);
+        Object[] row = new Object[colCount + 1];
         for (int i = 0; i < rowCount; i++) {
-            ArrayList<String> row = new ArrayList<String>();
             for (int j = 0; j < colCount; j++) {
-                row.add("" + i + "" + j);
+                row[j] = "" + i + "" + j;
             }
-            list.add(row);
+            row[colCount] = i;
+            cursor.addRow(row);
         }
-
-        return new ArrayListCursor(columns, list);
+        return cursor;
     }
 
     private static class MockResourceCursorAdapter extends ResourceCursorAdapter {
diff --git a/tests/tests/widget/src/android/widget/cts/ResourceCursorTreeAdapterTest.java b/tests/tests/widget/src/android/widget/cts/ResourceCursorTreeAdapterTest.java
index 716104d..62f0709 100644
--- a/tests/tests/widget/src/android/widget/cts/ResourceCursorTreeAdapterTest.java
+++ b/tests/tests/widget/src/android/widget/cts/ResourceCursorTreeAdapterTest.java
@@ -17,7 +17,6 @@
 package android.widget.cts;
 
 import com.android.cts.stub.R;
-import com.android.common.ArrayListCursor;
 
 import dalvik.annotation.TestTargets;
 import dalvik.annotation.TestLevel;
@@ -26,14 +25,13 @@
 
 import android.content.Context;
 import android.database.Cursor;
+import android.database.MatrixCursor;
 import android.test.InstrumentationTestCase;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ResourceCursorTreeAdapter;
 
-import java.util.ArrayList;
-
 /**
  * Test {@link ResourceCursorTreeAdapter}.
  */
@@ -186,21 +184,22 @@
      */
     @SuppressWarnings("unchecked")
     private Cursor createTestCursor(int colCount, int rowCount) {
-        ArrayList<ArrayList> list = new ArrayList<ArrayList>();
-        String[] columns = new String[colCount];
+        String[] columns = new String[colCount + 1];
         for (int i = 0; i < colCount; i++) {
             columns[i] = "column" + i;
         }
+        columns[colCount] = "_id";
 
+        MatrixCursor cursor = new MatrixCursor(columns, rowCount);
+        Object[] row = new Object[colCount + 1];
         for (int i = 0; i < rowCount; i++) {
-            ArrayList<String> row = new ArrayList<String>();
             for (int j = 0; j < colCount; j++) {
-                row.add("" + rowCount + "" + colCount);
+                row[j] = "" + rowCount + "" + colCount;
             }
-            list.add(row);
+            row[colCount] = i;
+            cursor.addRow(row);
         }
-
-        return new ArrayListCursor(columns, list);
+        return cursor;
     }
 
     private class MockResourceCursorTreeAdapter extends ResourceCursorTreeAdapter {
diff --git a/tests/tests/widget/src/android/widget/cts/SimpleCursorAdapterTest.java b/tests/tests/widget/src/android/widget/cts/SimpleCursorAdapterTest.java
index 08e425a..e6e9d47 100644
--- a/tests/tests/widget/src/android/widget/cts/SimpleCursorAdapterTest.java
+++ b/tests/tests/widget/src/android/widget/cts/SimpleCursorAdapterTest.java
@@ -17,7 +17,6 @@
 package android.widget.cts;
 
 import com.android.cts.stub.R;
-import com.android.common.ArrayListCursor;
 
 import dalvik.annotation.TestLevel;
 import dalvik.annotation.TestTargetClass;
@@ -27,6 +26,7 @@
 
 import android.content.Context;
 import android.database.Cursor;
+import android.database.MatrixCursor;
 import android.graphics.Bitmap;
 import android.graphics.drawable.BitmapDrawable;
 import android.test.InstrumentationTestCase;
@@ -43,7 +43,6 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
-import java.util.ArrayList;
 
 /**
  * Test {@link SimpleCursorAdapter}.
@@ -470,21 +469,22 @@
      */
     @SuppressWarnings("unchecked")
     private Cursor createTestCursor(int colCount, int rowCount) {
-        ArrayList<ArrayList> list = new ArrayList<ArrayList>();
-        String[] columns = new String[colCount];
+        String[] columns = new String[colCount + 1];
         for (int i = 0; i < colCount; i++) {
             columns[i] = "column" + i;
         }
+        columns[colCount] = "_id";
 
+        MatrixCursor cursor = new MatrixCursor(columns, rowCount);
+        Object[] row = new Object[colCount + 1];
         for (int i = 0; i < rowCount; i++) {
-            ArrayList<String> row = new ArrayList<String>();
             for (int j = 0; j < colCount; j++) {
-                row.add("" + i + "" + j);
+                row[j] = "" + i + "" + j;
             }
-            list.add(row);
+            row[colCount] = i;
+            cursor.addRow(row);
         }
-
-        return new ArrayListCursor(columns, list);
+        return cursor;
     }
 
     private static class MockViewBinder implements ViewBinder {
diff --git a/tests/tests/widget/src/android/widget/cts/SimpleCursorTreeAdapterTest.java b/tests/tests/widget/src/android/widget/cts/SimpleCursorTreeAdapterTest.java
index 8e6f0f3..bbb96c4 100644
--- a/tests/tests/widget/src/android/widget/cts/SimpleCursorTreeAdapterTest.java
+++ b/tests/tests/widget/src/android/widget/cts/SimpleCursorTreeAdapterTest.java
@@ -17,7 +17,6 @@
 package android.widget.cts;
 
 import com.android.cts.stub.R;
-import com.android.common.ArrayListCursor;
 
 import dalvik.annotation.TestLevel;
 import dalvik.annotation.TestTargetClass;
@@ -27,6 +26,7 @@
 
 import android.content.Context;
 import android.database.Cursor;
+import android.database.MatrixCursor;
 import android.graphics.Bitmap;
 import android.graphics.drawable.BitmapDrawable;
 import android.test.InstrumentationTestCase;
@@ -35,8 +35,6 @@
 import android.widget.SimpleCursorTreeAdapter;
 import android.widget.TextView;
 
-import java.util.ArrayList;
-
 /**
  * Test {@link SimpleCursorTreeAdapter}.
  */
@@ -232,21 +230,22 @@
      */
     @SuppressWarnings("unchecked")
     private Cursor createTestCursor(int colCount, int rowCount, String prefix) {
-        ArrayList<ArrayList> list = new ArrayList<ArrayList>();
-        String[] columns = new String[colCount];
+        String[] columns = new String[colCount + 1];
         for (int i = 0; i < colCount; i++) {
             columns[i] = "column" + i;
         }
+        columns[colCount] = "_id";
 
+        MatrixCursor cursor = new MatrixCursor(columns, rowCount);
+        Object[] row = new Object[colCount + 1];
         for (int i = 0; i < rowCount; i++) {
-            ArrayList<String> row = new ArrayList<String>();
             for (int j = 0; j < colCount; j++) {
-                row.add(prefix + i + "" + j);
+                row[j] = prefix + i + "" + j;
             }
-            list.add(row);
+            row[colCount] = i;
+            cursor.addRow(row);
         }
-
-        return new ArrayListCursor(columns, list);
+        return cursor;
     }
 
     private class MockSimpleCursorTreeAdapter extends SimpleCursorTreeAdapter {
diff --git a/tests/tests/widget/src/android/widget/cts/ViewFlipperTest.java b/tests/tests/widget/src/android/widget/cts/ViewFlipperTest.java
index 98e807e..b61e59c 100644
--- a/tests/tests/widget/src/android/widget/cts/ViewFlipperTest.java
+++ b/tests/tests/widget/src/android/widget/cts/ViewFlipperTest.java
@@ -16,24 +16,23 @@
 
 package android.widget.cts;
 
-import org.xmlpull.v1.XmlPullParser;
-
 import com.android.cts.stub.R;
 
+import dalvik.annotation.TestLevel;
+import dalvik.annotation.TestTargetClass;
+import dalvik.annotation.TestTargetNew;
+import dalvik.annotation.TestTargets;
+import dalvik.annotation.ToBeFixed;
+
+import org.xmlpull.v1.XmlPullParser;
+
 import android.app.Activity;
-import android.content.Context;
 import android.test.ActivityInstrumentationTestCase;
-import android.test.UiThreadTest;
 import android.util.AttributeSet;
 import android.util.Xml;
 import android.view.View;
 import android.widget.TextView;
 import android.widget.ViewFlipper;
-import dalvik.annotation.TestTargets;
-import dalvik.annotation.TestLevel;
-import dalvik.annotation.TestTargetNew;
-import dalvik.annotation.TestTargetClass;
-import dalvik.annotation.ToBeFixed;
 
 /**
  * Test {@link ViewFlipper}.
@@ -114,36 +113,63 @@
             args = {}
         )
     })
-    @UiThreadTest
-    public void testViewFlipper() {
-        ViewFlipper viewFlipper = (ViewFlipper) mActivity.findViewById(R.id.viewflipper_test);
-
+    public void testViewFlipper() throws Throwable {
+        // NOTE: This value needs to be kept in sync with the value set in
+        // layout/viewflipper_layout.xml
         final int FLIP_INTERVAL = 1000;
-        TextView iv1 = (TextView) mActivity.findViewById(R.id.viewflipper_textview1);
-        TextView iv2 = (TextView) mActivity.findViewById(R.id.viewflipper_textview2);
 
-        assertFalse(viewFlipper.isFlipping());
-        assertSame(iv1, viewFlipper.getCurrentView());
+        runTestOnUiThread(new Runnable() {
+            public void run() {
+                ViewFlipper viewFlipper =
+                        (ViewFlipper) mActivity.findViewById(R.id.viewflipper_test);
 
-        viewFlipper.startFlipping();
-        assertTrue(viewFlipper.isFlipping());
-        assertSame(iv1, viewFlipper.getCurrentView());
-        assertEquals(View.VISIBLE, iv1.getVisibility());
-        assertEquals(View.GONE, iv2.getVisibility());
+                TextView iv1 = (TextView) mActivity.findViewById(R.id.viewflipper_textview1);
+                TextView iv2 = (TextView) mActivity.findViewById(R.id.viewflipper_textview2);
+
+                assertFalse(viewFlipper.isFlipping());
+                assertSame(iv1, viewFlipper.getCurrentView());
+
+                viewFlipper.startFlipping();
+                assertTrue(viewFlipper.isFlipping());
+                assertSame(iv1, viewFlipper.getCurrentView());
+                assertEquals(View.VISIBLE, iv1.getVisibility());
+                assertEquals(View.GONE, iv2.getVisibility());
+            }
+        });
 
         // wait for a longer time to make sure the view flipping is completed.
         waitForViewFlipping(FLIP_INTERVAL + 200);
-        assertSame(iv2, viewFlipper.getCurrentView());
-        assertEquals(View.GONE, iv1.getVisibility());
-        assertEquals(View.VISIBLE, iv2.getVisibility());
+        runTestOnUiThread(new Runnable() {
+            public void run() {
+                ViewFlipper viewFlipper =
+                        (ViewFlipper) mActivity.findViewById(R.id.viewflipper_test);
+
+                TextView iv1 = (TextView) mActivity.findViewById(R.id.viewflipper_textview1);
+                TextView iv2 = (TextView) mActivity.findViewById(R.id.viewflipper_textview2);
+
+                assertSame(iv2, viewFlipper.getCurrentView());
+                assertEquals(View.GONE, iv1.getVisibility());
+                assertEquals(View.VISIBLE, iv2.getVisibility());
+            }
+        });
 
         waitForViewFlipping(FLIP_INTERVAL + 200);
-        assertSame(iv1, viewFlipper.getCurrentView());
-        assertEquals(View.VISIBLE, iv1.getVisibility());
-        assertEquals(View.GONE, iv2.getVisibility());
+        runTestOnUiThread(new Runnable() {
+            public void run() {
+                ViewFlipper viewFlipper =
+                        (ViewFlipper) mActivity.findViewById(R.id.viewflipper_test);
 
-        viewFlipper.stopFlipping();
-        assertFalse(viewFlipper.isFlipping());
+                TextView iv1 = (TextView) mActivity.findViewById(R.id.viewflipper_textview1);
+                TextView iv2 = (TextView) mActivity.findViewById(R.id.viewflipper_textview2);
+
+                assertSame(iv1, viewFlipper.getCurrentView());
+                assertEquals(View.VISIBLE, iv1.getVisibility());
+                assertEquals(View.GONE, iv2.getVisibility());
+
+                viewFlipper.stopFlipping();
+                assertFalse(viewFlipper.isFlipping());
+            }
+        });
     }
 
     private void waitForViewFlipping(int timeout) {
diff --git a/tools/build/test_executable.mk b/tools/build/test_executable.mk
new file mode 100644
index 0000000..bfd5bee
--- /dev/null
+++ b/tools/build/test_executable.mk
@@ -0,0 +1,38 @@
+# Copyright (C) 2011 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+#
+# Builds an executable and defines a rule to generate the associated test
+# package XML needed by CTS.
+#
+# 1. Replace "include $(BUILD_EXECUTABLE)"
+#    with "include $(BUILD_CTS_EXECUTABLE)"
+#
+# 2. Define LOCAL_CTS_TEST_PACKAGE to group the tests under a package
+#    as needed by CTS.
+#
+
+include $(BUILD_EXECUTABLE)
+
+cts_executable_xml := $(CTS_NATIVE_XML_OUT)/$(LOCAL_MODULE).xml
+
+$(cts_executable_xml): PRIVATE_PATH := $(LOCAL_PATH)
+$(cts_executable_xml): PRIVATE_TEST_PACKAGE := $(LOCAL_CTS_TEST_PACKAGE)
+$(cts_executable_xml): PRIVATE_EXECUTABLE := $(LOCAL_MODULE)
+$(cts_executable_xml): $(addprefix $(LOCAL_PATH)/,$(LOCAL_SRC_FILES)) | $(CTS_NATIVE_XML_GENERATOR)
+	$(hide) echo Generating test description for native package $(PRIVATE_TEST_PACKAGE)
+	$(hide) $(CTS_NATIVE_XML_GENERATOR) -p $(PRIVATE_TEST_PACKAGE) \
+			-n $(PRIVATE_EXECUTABLE) \
+			-s $(PRIVATE_PATH) \
+			-o $@
diff --git a/tools/cts-native-xml-generator/Android.mk b/tools/cts-native-xml-generator/Android.mk
new file mode 100644
index 0000000..c02d745
--- /dev/null
+++ b/tools/cts-native-xml-generator/Android.mk
@@ -0,0 +1,43 @@
+# Copyright (C) 2011 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+LOCAL_PATH := $(call my-dir)
+
+# We use copy-file-to-new-target so that the installed
+# script file's timestamp is at least as new as the
+# .jar file it wraps.
+
+# the hat script
+# ============================================================
+include $(CLEAR_VARS)
+LOCAL_IS_HOST_MODULE := true
+LOCAL_MODULE_CLASS := EXECUTABLES
+LOCAL_MODULE := cts-native-xml-generator
+LOCAL_MODULE_TAGS := optional
+
+include $(BUILD_SYSTEM)/base_rules.mk
+
+$(LOCAL_BUILT_MODULE): $(HOST_OUT_JAVA_LIBRARIES)/$(LOCAL_MODULE)$(COMMON_JAVA_PACKAGE_SUFFIX)
+$(LOCAL_BUILT_MODULE): $(LOCAL_PATH)/etc/$(LOCAL_MODULE) | $(ACP)
+	@echo "Copy: $(PRIVATE_MODULE) ($@)"
+	$(copy-file-to-new-target)
+	$(hide) chmod 755 $@
+
+# the other stuff
+# ============================================================
+subdirs := $(addprefix $(LOCAL_PATH)/,$(addsuffix /Android.mk, \
+		src \
+	))
+
+include $(subdirs)
diff --git a/tools/cts-native-xml-generator/etc/cts-native-xml-generator b/tools/cts-native-xml-generator/etc/cts-native-xml-generator
new file mode 100644
index 0000000..cae5f4a
--- /dev/null
+++ b/tools/cts-native-xml-generator/etc/cts-native-xml-generator
@@ -0,0 +1,46 @@
+#!/bin/bash
+#
+# Copyright (C) 2011, The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# Set up prog to be the path of this script, including following symlinks,
+# and set up progdir to be the fully-qualified pathname of its directory.
+prog="$0"
+while [ -h "${prog}" ]; do
+    newProg=`/bin/ls -ld "${prog}"`
+    newProg=`expr "${newProg}" : ".* -> \(.*\)$"`
+    if expr "x${newProg}" : 'x/' >/dev/null; then
+        prog="${newProg}"
+    else
+        progdir=`dirname "${prog}"`
+        prog="${progdir}/${newProg}"
+    fi
+done
+oldwd=`pwd`
+progdir=`dirname "${prog}"`
+cd "${progdir}"
+progdir=`pwd`
+prog="${progdir}"/`basename "${prog}"`
+cd "${oldwd}"
+
+libdir=`dirname $progdir`/framework
+
+javaOpts=""
+while expr "x$1" : 'x-J' >/dev/null; do
+    opt=`expr "$1" : '-J\(.*\)'`
+    javaOpts="${javaOpts} -${opt}"
+    shift
+done
+
+exec java $javaOpts -jar $libdir/cts-native-xml-generator.jar "$@"
diff --git a/tools/cts-native-xml-generator/src/Android.mk b/tools/cts-native-xml-generator/src/Android.mk
new file mode 100644
index 0000000..70b9f49
--- /dev/null
+++ b/tools/cts-native-xml-generator/src/Android.mk
@@ -0,0 +1,29 @@
+# Copyright (C) 2011 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+LOCAL_PATH := $(call my-dir)
+
+
+# cts-native-xml-generator java library
+# ============================================================
+include $(CLEAR_VARS)
+
+LOCAL_SRC_FILES := $(call all-subdir-java-files)
+LOCAL_JAVA_RESOURCE_DIRS := res
+LOCAL_JAR_MANIFEST := MANIFEST.mf
+
+LOCAL_MODULE := cts-native-xml-generator
+LOCAL_MODULE_TAGS := optional
+
+include $(BUILD_HOST_JAVA_LIBRARY)
diff --git a/tools/cts-native-xml-generator/src/MANIFEST.mf b/tools/cts-native-xml-generator/src/MANIFEST.mf
new file mode 100644
index 0000000..b8bde72
--- /dev/null
+++ b/tools/cts-native-xml-generator/src/MANIFEST.mf
@@ -0,0 +1,2 @@
+Manifest-Version: 1.0
+Main-Class: com.android.cts.nativexml.CtsNativeXmlGenerator
diff --git a/tools/cts-native-xml-generator/src/com/android/cts/nativexml/CtsNativeXmlGenerator.java b/tools/cts-native-xml-generator/src/com/android/cts/nativexml/CtsNativeXmlGenerator.java
new file mode 100644
index 0000000..1a436dd
--- /dev/null
+++ b/tools/cts-native-xml-generator/src/com/android/cts/nativexml/CtsNativeXmlGenerator.java
@@ -0,0 +1,89 @@
+/*
+ * Copyright (C) 2011 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.cts.nativexml;
+
+import java.io.File;
+import java.util.Arrays;
+
+/**
+ * Class that searches a source directory for native gTests and outputs a
+ * test package xml.
+ */
+public class CtsNativeXmlGenerator {
+
+    private static void usage(String[] args) {
+        System.err.println("Arguments: " + Arrays.asList(args));
+        System.err.println("Usage: cts-native-xml-generator -p PACKAGE_NAME -n EXECUTABLE_NAME "
+                + "-s SOURCE_DIR [-o OUTPUT_FILE]");
+        System.exit(1);
+    }
+
+    public static void main(String[] args) throws Exception {
+        String appPackageName = null;
+        String name = null;
+        File sourceDir = null;
+        String outputPath = null;
+
+        for (int i = 0; i < args.length; i++) {
+            if ("-p".equals(args[i])) {
+                if (i + 1 < args.length) {
+                    appPackageName = args[++i];
+                } else {
+                    System.err.println("Missing value for test package");
+                    usage(args);
+                }
+            } else if ("-n".equals(args[i])) {
+                if (i + 1 < args.length) {
+                    name = args[++i];
+                } else {
+                    System.err.println("Missing value for executable name");
+                    usage(args);
+                }
+            } else if ("-o".equals(args[i])) {
+                if (i + 1 < args.length) {
+                    outputPath = args[++i];
+                } else {
+                    System.err.println("Missing value for output file");
+                    usage(args);
+                }
+            } else if ("-s".equals(args[i])) {
+                if (i + 1 < args.length) {
+                    sourceDir = new File(args[++i]);
+                } else {
+                    System.err.println("Missing value for source directory");
+                    usage(args);
+                }
+            } else {
+                System.err.println("Unsupported flag: " + args[i]);
+                usage(args);
+            }
+        }
+
+        if (appPackageName == null) {
+            System.out.println("Package name is required");
+            usage(args);
+        } else if (name == null) {
+            System.out.println("Executable name is required");
+            usage(args);
+        } else if (sourceDir == null) {
+            System.out.println("Source directory is required");
+            usage(args);
+        }
+
+        Generator generator = new Generator(appPackageName, name, sourceDir, outputPath);
+        generator.writePackageXml();
+    }
+}
diff --git a/tools/cts-native-xml-generator/src/com/android/cts/nativexml/Generator.java b/tools/cts-native-xml-generator/src/com/android/cts/nativexml/Generator.java
new file mode 100644
index 0000000..7c074b8
--- /dev/null
+++ b/tools/cts-native-xml-generator/src/com/android/cts/nativexml/Generator.java
@@ -0,0 +1,177 @@
+/*
+ * Copyright (C) 2011 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.cts.nativexml;
+
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.FilenameFilter;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.io.PrintWriter;
+import java.util.Scanner;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+/**
+ * Generator of TestPackage XML files for native gTests.
+ *
+ * It scours all the C++ source files in a given source directory looking
+ * for test declarations and outputs a XML test listing.
+ */
+class Generator {
+
+    /** Test package name like "android.nativemedia" to group the tests. */
+    private final String mAppPackageName;
+
+    /** Name of the native executable. */
+    private final String mName;
+
+    /** Directory to recursively scan for gTest test declarations. */
+    private final File mSourceDir;
+
+    /** Path to output file or null to just dump to standard out. */
+    private final String mOutputPath;
+
+    Generator(String appPackageName, String name, File sourceDir, String outputPath) {
+        mAppPackageName = appPackageName;
+        mName = name;
+        mSourceDir = sourceDir;
+        mOutputPath = outputPath;
+    }
+
+    public void writePackageXml() throws IOException {
+        OutputStream output = System.out;
+        if (mOutputPath != null) {
+            File outputFile = new File(mOutputPath);
+            File outputDir = outputFile.getParentFile();
+            if (!outputDir.exists()) {
+                outputDir.mkdirs();
+                if (!outputDir.exists()) {
+                    System.err.println("Couldn't make output directory: " + outputDir);
+                    System.exit(1);
+                }
+            }
+            output = new FileOutputStream(outputFile);
+        }
+
+        PrintWriter writer = null;
+        try {
+            writer = new PrintWriter(output);
+            writer.println("<?xml version=\"1.0\" encoding=\"UTF-8\"?>");
+            writeTestPackage(writer);
+        } finally {
+            if (writer != null) {
+                writer.close();
+            }
+        }
+    }
+
+    private void writeTestPackage(PrintWriter writer) throws FileNotFoundException {
+        writer.append("<TestPackage appPackageName=\"")
+                .append(mAppPackageName)
+                .append("\" name=\"")
+                .append(mName)
+                .println("\" testType=\"native\" version=\"1.0\">");
+        writeTestSuite(writer);
+        writer.println("</TestPackage>");
+    }
+
+    private void writeTestSuite(PrintWriter writer) throws FileNotFoundException {
+        /*
+         * Given "android.foo.bar.baz"...
+         *
+         * <TestSuite name="android">
+         *   <TestSuite name="foo">
+         *     <TestSuite name="bar">
+         *       <TestSuite name="baz">
+         */
+        Scanner scanner = null;
+        try {
+            scanner = new Scanner(mAppPackageName);
+            scanner.useDelimiter("\\.");
+
+            int numLevels = 0;
+            for (; scanner.hasNext(); numLevels++) {
+                String packagePart = scanner.next();
+                writer.append("<TestSuite name=\"").append(packagePart).println("\">");
+            }
+
+            writeTestCases(writer, mSourceDir);
+
+            for (; numLevels > 0; numLevels--) {
+                writer.println("</TestSuite>");
+            }
+        } finally {
+            if (scanner != null) {
+                scanner.close();
+            }
+        }
+    }
+
+    private void writeTestCases(PrintWriter writer, File dir) throws FileNotFoundException {
+        // Find both C++ files to find tests and directories to look for more tests!
+        File[] files = dir.listFiles(new FilenameFilter() {
+            @Override
+            public boolean accept(File dir, String filename) {
+                return filename.endsWith(".cpp") || new File(dir, filename).isDirectory();
+            }
+        });
+
+        for (int i = 0; i < files.length; i++) {
+            File file = files[i];
+            if (file.isDirectory()) {
+                writeTestCases(writer, file);
+            } else {
+                // Take the test name from the name of the file. It's probably
+                // more accurate to take the name from inside the file...
+                String fileName = file.getName();
+                int extension = fileName.lastIndexOf('.');
+                if (extension != -1) {
+                    fileName = fileName.substring(0, extension);
+                }
+
+                writer.append("<TestCase name=\"").append(fileName).println("\">");
+                writeTests(writer, file);
+                writer.println("</TestCase>");
+            }
+        }
+    }
+
+    // We want to find lines like TEST_F(SLObjectCreationTest, testAudioPlayerFromFdCreation) { ...
+    // and extract the "testAudioPlayerFromFdCreation" as group #1
+    private static final Pattern TEST_REGEX = Pattern.compile("\\s*TEST_F\\(\\w+,\\s*(\\w+)\\).*");
+
+    private void writeTests(PrintWriter writer, File file) throws FileNotFoundException {
+        Scanner scanner = null;
+        try {
+            scanner = new Scanner(file);
+            while (scanner.hasNextLine()) {
+                String line = scanner.nextLine();
+                Matcher matcher = TEST_REGEX.matcher(line);
+                if (matcher.matches()) {
+                    String name = matcher.group(1);
+                    writer.append("<Test name=\"").append(name).println("\" />");
+                }
+            }
+        } finally {
+            if (scanner != null) {
+                scanner.close();
+            }
+        }
+    }
+}
diff --git a/tools/device-setup/TestDeviceSetup/src/android/tests/getinfo/DeviceInfoActivity.java b/tools/device-setup/TestDeviceSetup/src/android/tests/getinfo/DeviceInfoActivity.java
index bcba1cb..3614e22 100644
--- a/tools/device-setup/TestDeviceSetup/src/android/tests/getinfo/DeviceInfoActivity.java
+++ b/tools/device-setup/TestDeviceSetup/src/android/tests/getinfo/DeviceInfoActivity.java
@@ -17,31 +17,33 @@
 package android.tests.getinfo;
 
 import android.app.Activity;
+import android.app.ActivityManager;
+import android.content.Context;
+import android.content.pm.ConfigurationInfo;
 import android.content.res.Configuration;
 import android.os.Bundle;
-import android.widget.TextView;
 
 import java.util.Locale;
+import java.util.concurrent.CountDownLatch;
 
 
 /**
  * Collect device information on target device.
  */
 public class DeviceInfoActivity extends Activity {
-    private boolean isActivityFinished = false;
-    private Object sync = new Object();
+
+    // work done should be reported in GLES..View
+    private CountDownLatch mDone = new CountDownLatch(1);
+    private GLESSurfaceView mGLView;
 
     /**
      * Other classes can call this function to wait for this activity
      * to finish. */
     public void waitForAcitityToFinish() {
-        synchronized (sync) {
-            while (!isActivityFinished) {
-                try {
-                    sync.wait();
-                } catch (InterruptedException e) {
-                }
-            }
+        try {
+            mDone.await();
+        } catch (InterruptedException e) {
+            // just move on
         }
     }
 
@@ -49,9 +51,14 @@
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
-        TextView view = new TextView(this);
-        view.setText("hello");
-        setContentView(view);
+        ActivityManager am =
+                (ActivityManager) getSystemService(Context.ACTIVITY_SERVICE);
+        ConfigurationInfo info = am.getDeviceConfigurationInfo();
+        boolean useGL20 = (info.reqGlEsVersion >= 0x20000);
+
+        mGLView = new GLESSurfaceView(this, useGL20, mDone);
+        setContentView(mGLView);
+
         Configuration con = getResources().getConfiguration();
         String touchScreen = null;
         if (con.touchscreen == Configuration.TOUCHSCREEN_UNDEFINED) {
@@ -112,10 +119,5 @@
         }
         DeviceInfoInstrument.addResult(DeviceInfoConstants.LOCALES,
                 localeList.toString());
-
-        synchronized (sync) {
-            sync.notify();
-            isActivityFinished = true;
-        }
     }
 }
diff --git a/tools/device-setup/TestDeviceSetup/src/android/tests/getinfo/DeviceInfoConstants.java b/tools/device-setup/TestDeviceSetup/src/android/tests/getinfo/DeviceInfoConstants.java
index 57b0dad..dd9681a 100644
--- a/tools/device-setup/TestDeviceSetup/src/android/tests/getinfo/DeviceInfoConstants.java
+++ b/tools/device-setup/TestDeviceSetup/src/android/tests/getinfo/DeviceInfoConstants.java
@@ -23,6 +23,9 @@
  */
 public interface DeviceInfoConstants {
 
+    public static final String OPEN_GL_COMPRESSED_TEXTURE_FORMATS =
+            "openGlCompressedTextureFormats";
+    public static final String SYS_LIBRARIES = "systemlibraries";
     public static final String PARTITIONS = "partitions";
     public static final String OPEN_GL_ES_VERSION = "openGlEsVersion";
     public static final String PROCESSES = "processes";
diff --git a/tools/device-setup/TestDeviceSetup/src/android/tests/getinfo/DeviceInfoInstrument.java b/tools/device-setup/TestDeviceSetup/src/android/tests/getinfo/DeviceInfoInstrument.java
index 1b705e7..ca0c803 100644
--- a/tools/device-setup/TestDeviceSetup/src/android/tests/getinfo/DeviceInfoInstrument.java
+++ b/tools/device-setup/TestDeviceSetup/src/android/tests/getinfo/DeviceInfoInstrument.java
@@ -131,6 +131,10 @@
         String partitions = getPartitions();
         addResult(PARTITIONS, partitions);
 
+        // System libraries
+        String sysLibraries = getSystemLibraries();
+        addResult(SYS_LIBRARIES, sysLibraries);
+
         finish(Activity.RESULT_OK, mResults);
     }
 
@@ -319,4 +323,18 @@
             return "Not able to run df for partition information.";
         }
     }
+
+    private String getSystemLibraries() {
+        PackageManager pm = getContext().getPackageManager();
+        String list[] = pm.getSystemSharedLibraryNames();
+
+        StringBuilder builder = new StringBuilder();
+        for (String lib : list) {
+            builder.append(lib);
+            builder.append(";");
+        }
+
+        return builder.toString();
+    }
+
 }
diff --git a/tools/device-setup/TestDeviceSetup/src/android/tests/getinfo/GLESSurfaceView.java b/tools/device-setup/TestDeviceSetup/src/android/tests/getinfo/GLESSurfaceView.java
new file mode 100644
index 0000000..0ec11b7
--- /dev/null
+++ b/tools/device-setup/TestDeviceSetup/src/android/tests/getinfo/GLESSurfaceView.java
@@ -0,0 +1,96 @@
+/*
+ * Copyright (C) 2011 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package android.tests.getinfo;
+
+import android.content.Context;
+import android.opengl.GLES20;
+import android.opengl.GLSurfaceView;
+import android.util.Log;
+
+import java.util.Scanner;
+import java.util.concurrent.CountDownLatch;
+
+import javax.microedition.khronos.egl.EGLConfig;
+import javax.microedition.khronos.opengles.GL10;
+
+class GLESSurfaceView extends GLSurfaceView {
+    private static final String TAG = "GLESSurfaceView";
+
+    private boolean mUseGL20;
+    CountDownLatch mDone;
+
+    /**
+     *
+     * @param context
+     * @param useGL20 whether to use GLES2.0 API or not inside the view
+     * @param done to notify the completion of the task
+     */
+    public GLESSurfaceView(Context context, boolean useGL20, CountDownLatch done){
+        super(context);
+
+        mUseGL20 = useGL20;
+        mDone = done;
+        if (mUseGL20) {
+            setEGLContextClientVersion(2);
+        }
+        setRenderer(new OpenGLESRenderer());
+    }
+
+    public class OpenGLESRenderer implements GLSurfaceView.Renderer {
+
+        @Override
+        public void onSurfaceCreated(GL10 gl, EGLConfig config) {
+            String extensions;
+            if (mUseGL20) {
+                extensions = GLES20.glGetString(GLES20.GL_EXTENSIONS);
+            } else {
+                extensions = gl.glGetString(GL10.GL_EXTENSIONS);
+            }
+            Log.i(TAG, "extensions : " + extensions);
+            Scanner scanner = new Scanner(extensions);
+            scanner.useDelimiter(" ");
+            StringBuilder builder = new StringBuilder();
+            while (scanner.hasNext()) {
+                String ext = scanner.next();
+                if (ext.contains("texture")) {
+                    if (ext.contains("compression") || ext.contains("compressed")) {
+                        Log.i(TAG, "Compression supported: " + ext);
+                        builder.append(ext);
+                        builder.append(";");
+                    }
+                }
+            }
+
+            DeviceInfoInstrument.addResult(
+                    DeviceInfoConstants.OPEN_GL_COMPRESSED_TEXTURE_FORMATS,
+                    builder.toString());
+
+            mDone.countDown();
+        }
+
+        @Override
+        public void onSurfaceChanged(GL10 gl, int width, int height) {
+
+        }
+
+        @Override
+        public void onDrawFrame(GL10 gl) {
+
+        }
+
+    }
+}
\ No newline at end of file
diff --git a/tools/host/Android.mk b/tools/host/Android.mk
deleted file mode 100644
index 4798233..0000000
--- a/tools/host/Android.mk
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright (C) 2008 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.
-
-CTS_LOCAL_DIR := $(call my-dir)
-include $(CTS_LOCAL_DIR)/etc/Android.mk
-include $(CTS_LOCAL_DIR)/src/Android.mk
diff --git a/tools/host/etc/Android.mk b/tools/host/etc/Android.mk
deleted file mode 100644
index 993f4ac..0000000
--- a/tools/host/etc/Android.mk
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright (C) 2008 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.
-
-LOCAL_PATH := $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_PREBUILT_EXECUTABLES := cts
-include $(BUILD_HOST_PREBUILT)
-
diff --git a/tools/host/etc/cts b/tools/host/etc/cts
deleted file mode 100755
index ec8ff0b..0000000
--- a/tools/host/etc/cts
+++ /dev/null
@@ -1,88 +0,0 @@
-#!/bin/bash
-
-# Copyright (C) 2008 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.
-
-
-CTS_SH=cts
-CTS_LIB=cts.jar
-DDMS_LIB=ddmlib-prebuilt.jar
-JUNIT_LIB=junit.jar
-HOSTTEST_LIB=hosttestlib.jar
-
-# Checking if "adb" is known by the system
-PATH=.:${PATH}
-ADB_TOOLS=adb
-ADB_PATH=`which ${ADB_TOOLS}`
-if [ "${ANDROID_ROOT}" == "" ] && [ -f "${ADB_PATH}" ]; then
-    ANDROID_ROOT=`dirname ${ADB_PATH}`/..
-fi;
-
-# Checking Android dependancies
-BINARY_DIR=bin
-JAR_DIR=framework
-if [ -f ${ANDROID_ROOT}/tools/${ADB_TOOLS} ]; then
-    # Default SDK paths
-    BINARY_DIR=tools
-    JAR_DIR=tools/lib
-else if [ ! -f ${ANDROID_ROOT}/bin/${ADB_TOOLS} ]; then
-    echo "Missing ${ANDROID_ROOT}/bin/${ADB_TOOLS}"
-    exit -1;
-fi;
-fi;
-
-if [ ! -f ${ANDROID_ROOT}/${JAR_DIR}/${DDMS_LIB} ]; then
-    echo "Missing ${ANDROID_ROOT}/${JAR_DIR}/${DDMS_LIB}"
-    exit -1;
-fi;
-
-
-# -------------------------------------------------------------------------
-
-CTS_PATH=`which ${CTS_SH}`
-if [ ! -f "${CTS_PATH}" ]; then
-    CTS_PATH=$0
-fi;
-
-CTS_DIR=`dirname ${CTS_PATH}`
-# Setup the correct path for getting "adb"
-PATH=${PATH}:${ANDROID_ROOT}/${BINARY_DIR}
-# Add paths to JAR files in Android framework
-CTS_LIBS=\
-${ANDROID_ROOT}/${JAR_DIR}/${DDMS_LIB}:\
-${ANDROID_ROOT}/${JAR_DIR}/${JUNIT_LIB}:\
-${ANDROID_ROOT}/${JAR_DIR}/${HOSTTEST_LIB}:\
-${ANDROID_ROOT}/${JAR_DIR}/${CTS_LIB}
-# Add path to CTS JAR file in the CTS archive
-CTS_LIBS=${CTS_LIBS}:${CTS_DIR}/${CTS_LIB}
-
-# Default location of the repository
-CTS_REPO=${CTS_DIR}/../cts/android-cts/repository
-
-# Try to locate CTS repository
-if [ $# -eq 1 ] || [ $(echo "$*" | grep -c -e --config -) -gt 0 ];
-then
-    # single parameter or --config argument specifies config file
-    :
-else
-    # config file not specified, try to locate if not already defined
-    if [ -z "${CTS_HOST_CFG}" ] && [ -d "${CTS_REPO}" ]; then
-       CTS_HOST_CFG=${CTS_REPO}/host_config.xml
-    fi;
-fi;
-
-JAVA_OPTS="-Xmx512M"
-JAVA_OPTS="${JAVA_OPTS} -Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=1337"
-
-java ${JAVA_OPTS} -cp ${CTS_LIBS} -DHOST_CONFIG=${CTS_HOST_CFG} com.android.cts.TestHost "$@"
diff --git a/tools/host/etc/cts.bat b/tools/host/etc/cts.bat
deleted file mode 100644
index fe346c4..0000000
--- a/tools/host/etc/cts.bat
+++ /dev/null
@@ -1,64 +0,0 @@
-@echo off
-rem Copyright (C) 2008 The Android Open Source Project
-rem
-rem Licensed under the Apache License, Version 2.0 (the "License");
-rem you may not use this file except in compliance with the License.
-rem You may obtain a copy of the License at
-rem
-rem      http://www.apache.org/licenses/LICENSE-2.0
-rem
-rem Unless required by applicable law or agreed to in writing, software
-rem distributed under the License is distributed on an "AS IS" BASIS,
-rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-rem See the License for the specific language governing permissions and
-rem limitations under the License.
-
-rem don't modify the caller's environment
-setlocal
-
-rem Set up prog to be the path of this script, including following symlinks,
-rem and set up progdir to be the fully-qualified pathname of its directory.
-set prog=%~f0
-
-set curdir=%CD%
-
-rem Change current directory to where cts is, to avoid issues with directories
-rem containing whitespaces.
-cd %~dp0
-
-set jarfile=cts.jar
-set frameworkdir=
-set libdir=
-
-rem parse the argument
-if (%1)==() (
-    set argument=%CTS_HOST_CFG%
-    goto ArgumentOk
-) else (
-    set argument=%1
-)
-
-if not "%argument:~1,1%"==":" (
-    set argument=%curdir%\%argument%
-)
-
-:ArgumentOk
-
-if exist %frameworkdir%%jarfile% goto JarFileOk
-    set frameworkdir=lib\
-    set libdir=lib\
-
-if exist %frameworkdir%%jarfile% goto JarFileOk
-    set frameworkdir=..\framework\
-    set libdir=..\lib\
-
-:JarFileOk
-
-if debug NEQ "%1" goto NoDebug
-    set java_debug=-agentlib:jdwp=transport=dt_socket,server=y,address=8050,suspend=y
-    shift 1
-:NoDebug
-
-set jarpath=%frameworkdir%%jarfile%
-
-call java %java_debug% -Djava.ext.dirs=%frameworkdir% -Djava.library.path=%libdir% -Dcom.android.cts.bindir= -jar %jarpath% %argument%
diff --git a/tools/host/etc/manifest.txt b/tools/host/etc/manifest.txt
deleted file mode 100644
index c212928..0000000
--- a/tools/host/etc/manifest.txt
+++ /dev/null
@@ -1 +0,0 @@
-Main-Class: com.android.cts.TestHost
diff --git a/tools/host/src/Android.mk b/tools/host/src/Android.mk
deleted file mode 100644
index dabee3d..0000000
--- a/tools/host/src/Android.mk
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright (C) 2008 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.
-
-LOCAL_PATH := $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_SRC_FILES := $(call all-subdir-java-files)
-
-LOCAL_JAVA_RESOURCE_DIRS := res
-
-LOCAL_JAR_MANIFEST := ../etc/manifest.txt
-LOCAL_JAVA_LIBRARIES := \
-    ddmlib-prebuilt junit hosttestlib
-
-LOCAL_STATIC_JAVA_LIBRARIES := ctsdeviceinfolib
-
-LOCAL_MODULE := cts
-
-include $(BUILD_HOST_JAVA_LIBRARY)
diff --git a/tools/host/src/com/android/cts/ADBServerNeedRestartException.java b/tools/host/src/com/android/cts/ADBServerNeedRestartException.java
deleted file mode 100644
index 8c5f15b..0000000
--- a/tools/host/src/com/android/cts/ADBServerNeedRestartException.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Copyright (C) 2009 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 com.android.cts;
-
-/**
- * Throw out ADBServerNeedRestartException to request restarting ADB server.
- */
-public class ADBServerNeedRestartException extends Exception {
-
-    public ADBServerNeedRestartException(String message) {
-        super(message);
-    }
-}
diff --git a/tools/host/src/com/android/cts/CTSCommand.java b/tools/host/src/com/android/cts/CTSCommand.java
deleted file mode 100644
index a1a2222..0000000
--- a/tools/host/src/com/android/cts/CTSCommand.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Copyright (C) 2008 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 com.android.cts;
-
-/**
- * Constant value for CTS command
- */
-public interface CTSCommand {
-    // Define the commands
-    static final String EXIT = "exit";
-    static final String HELP = "help";
-    static final String ADD = "add";
-    static final String REMOVE = "rm";
-    static final String START = "start";
-    static final String LIST = "ls";
-    static final String H = "h";
-    static final String HISTORY = "history";
-
-    // Define command options
-    static final String OPTION_D = "-d";
-    static final String OPTION_DEVICE = "--device";
-    static final String OPTION_P = "-p";
-    static final String OPTION_PACKAGE = "--package";
-    static final String OPTION_R = "-r";
-    static final String OPTION_RESULT = "--result";
-    static final String OPTION_PLAN = "--plan";
-    static final String OPTION_T = "-t";
-    static final String OPTION_TEST = "--test";
-    static final String OPTION_E = "-e";
-    static final String OPTION_S = "-s";
-    static final String OPTION_SESSION = "--session";
-    static final String OPTION_CFG = "--config";
-    static final String OPTION_DERIVED_PLAN = "--derivedplan";
-    static final String OPTION_QUICK = "-q";
-}
diff --git a/tools/host/src/com/android/cts/CUIOutputStream.java b/tools/host/src/com/android/cts/CUIOutputStream.java
deleted file mode 100644
index 6f9b957..0000000
--- a/tools/host/src/com/android/cts/CUIOutputStream.java
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
- * Copyright (C) 2008 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 com.android.cts;
-
-import java.io.PrintStream;
-
-/**
- * CTS UI output stream. Handle all output of CTS UI
- */
-final class CUIOutputStream {
-
-    private static PrintStream sOutput = System.out;
-    public static final String CTS_PROMPT_SIGN = "cts_host > ";
-
-    /**
-     * Print a line of message onto the CTS host console.
-     *
-     * @param msg The message to be print.
-     */
-    static public void print(final String msg) {
-        sOutput.print(msg);
-
-        Log.log(msg);
-    }
-
-    /**
-     * Print a line of message onto the CTS host console with a carriage return.
-     *
-     * @param msg The message to be print.
-     */
-    static public void println(final String msg) {
-        sOutput.println(msg);
-
-        Log.log(msg);
-    }
-
-    /**
-     * Write the buffer with given offset and length.
-     *
-     * @param buf The buffer.
-     * @param off The offset to start writing.
-     * @param len The length in byte to write.
-     */
-    static public void write(byte[] buf, int off, int len) {
-        sOutput.write(buf, off, len);
-    }
-
-    /**
-     * Write a byte.
-     *
-     * @param c The byte to write.
-     */
-    static public void write(int c) {
-        sOutput.write(c);
-    }
-
-    /**
-     * Flush the write buffer.
-     */
-    static public void flush() {
-        sOutput.flush();
-    }
-
-    /**
-     * Print prompt.
-     */
-    static public void printPrompt() {
-        print(CTS_PROMPT_SIGN);
-
-        Log.log(CTS_PROMPT_SIGN);
-    }
-}
diff --git a/tools/host/src/com/android/cts/CommandHistory.java b/tools/host/src/com/android/cts/CommandHistory.java
deleted file mode 100644
index b86506e..0000000
--- a/tools/host/src/com/android/cts/CommandHistory.java
+++ /dev/null
@@ -1,147 +0,0 @@
-/*
- * Copyright (C) 2008 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 com.android.cts;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * CommandHistory holds max 50 executed command.
- * User can view what has been input and select one to execute again.
- * Example:
- * <ul>
- *    <li> "cts_host > h"  to view latest 50 executed command.
- *    <li> "cts_host > h 10" to view latest 10 executed command.
- *    <li> "cts_host > h -e 5" to execute the 5th executed command.
- * </ul>
- */
-public class CommandHistory {
-    private static final int CMD_RECORD_DEPTH = 50;
-
-    private List<String> mCmdRecords;
-
-    public CommandHistory() {
-        mCmdRecords = new ArrayList<String>();
-    }
-
-    /**
-     * Check if the command is history command.
-     *
-     * @param cmd The command string.
-     * @return If it's history command, return true; else return false.
-     */
-    public boolean isHistoryCommand(final String cmd) {
-        return CTSCommand.HISTORY.equals(cmd) || CTSCommand.H.equals(cmd);
-    }
-
-    /**
-     * Get the number of commands recorded.
-     *
-     * @return The number of commands recorded.
-     */
-    public int size() {
-        return mCmdRecords.size();
-    }
-
-    /**
-     * Get command by index from command history cache.
-     *
-     * @param index The command index.
-     * @return The command corresponding to the command index.
-     */
-    public String get(final int index) {
-        return mCmdRecords.get(index);
-    }
-
-    /**
-     * display specified number of commands from command history cache onto CTS console.
-     *
-     * @param cmdCount The command count requested.
-     */
-    public void show(final int cmdCount) {
-        int cmdSize = mCmdRecords.size();
-        int start = 0;
-
-        if (cmdSize == 0) {
-            CUIOutputStream.println("no history command list");
-            return;
-        }
-        if (cmdCount < cmdSize) {
-            start = cmdSize - cmdCount;
-        }
-
-        for (; start < cmdSize; start ++) {
-            String cmdLine = mCmdRecords.get(start);
-            CUIOutputStream.println("  " + Long.toString(start) + "\t" + cmdLine);
-        }
-    }
-
-    /**
-     * Add a command to the command cache.
-     *
-     * @param cp The command container.
-     * @param cmdLine The command line.
-     */
-    public void addCommand(final CommandParser cp,
-            final String cmdLine) {
-        if ((cmdLine == null) || (cmdLine.length() == 0)) {
-            return;
-        }
-
-        if (isValidCommand(cp.getAction()) && (!hasCommand(cmdLine))) {
-            mCmdRecords.add(cmdLine);
-            if (mCmdRecords.size() > CMD_RECORD_DEPTH) {
-                mCmdRecords.remove(0);
-            }
-        }
-    }
-
-    /**
-     * Check if the command contains valid action.
-     *
-     * @param action The action contained in the command.
-     * @return If valid, return true; else, return false.
-     */
-    private boolean isValidCommand(final String action) {
-        if (!(CTSCommand.HISTORY.equals(action) || CTSCommand.H.equals(action))) {
-            if (CTSCommand.ADD.equals(action)
-                    || CTSCommand.EXIT.equals(action)
-                    || CTSCommand.HELP.equals(action)
-                    || CTSCommand.LIST.equals(action)
-                    || CTSCommand.REMOVE.equals(action)
-                    || CTSCommand.START.equals(action)) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    /**
-     * Check if the command is a duplicate one.
-     *
-     * @param cmdLine The command to be checked against the commands recorded.
-     * @return If duplicated, return true; else, return false.
-     */
-    private boolean hasCommand(final String cmdLine) {
-        for(String cmd : mCmdRecords) {
-            if (cmd.equals(cmdLine)) {
-                return true;
-            }
-        }
-        return false;
-    }
-}
diff --git a/tools/host/src/com/android/cts/CommandNotFoundException.java b/tools/host/src/com/android/cts/CommandNotFoundException.java
deleted file mode 100644
index ebaa5ae..0000000
--- a/tools/host/src/com/android/cts/CommandNotFoundException.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Copyright (C) 2008 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 com.android.cts;
-
-/**
- * Throw out CommandNotFoundException if no command action.
- */
-public class CommandNotFoundException extends Exception {
-
-    private static final long serialVersionUID = -9101779063189977021L;
-
-    public CommandNotFoundException() {
-        super();
-    }
-
-    public CommandNotFoundException(String message) {
-        super(message);
-    }
-}
diff --git a/tools/host/src/com/android/cts/CommandParser.java b/tools/host/src/com/android/cts/CommandParser.java
deleted file mode 100644
index 85f8c2c..0000000
--- a/tools/host/src/com/android/cts/CommandParser.java
+++ /dev/null
@@ -1,296 +0,0 @@
-/*
- * Copyright (C) 2008 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 com.android.cts;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Set;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-/**
- * CommandParser is responsible for parsing command line arguments. To get
- * action, option or values easy via functions.
- * For example:
- * <ul>
- *    <li> CommandParser cp = CommandParser.parse("start -plan test_plan")
- *    <li> cp.getAction() will get "start"
- *    <li> cp.getValue("-plan") will get "test_plan"
- *    <li> cp.containsKey("-noplan") will get null
- * </ul>
- *
- */
-public class CommandParser {
-
-    /**
-     * The hash map mapping the options and option values.
-     */
-    private HashMap<String, String> mValues = new HashMap<String, String>();
-
-    /**
-     * The action the user chose to ask CTS host to take.
-     */
-    private String mAction;
-    private ArrayList<String> mActionValues = new ArrayList<String>();
-    private int mArgLength;
-    private static final String COMMAND_PARSE_EXPRESSION = "(((\\\\\\s)|[\\S&&[^\"]])+|\".+\")";
-
-    private static Set<String> sOptionsSet = new HashSet<String>(Arrays.asList(
-            CTSCommand.OPTION_CFG, CTSCommand.OPTION_PACKAGE, CTSCommand.OPTION_PLAN,
-            CTSCommand.OPTION_DEVICE, CTSCommand.OPTION_RESULT, CTSCommand.OPTION_E,
-            CTSCommand.OPTION_SESSION, CTSCommand.OPTION_TEST, CTSCommand.OPTION_DERIVED_PLAN,
-            CTSCommand.OPTION_QUICK));
-    private static HashMap<String, String> sOptionMap = new HashMap<String, String>();
-    static {
-        final String[] keys = new String[] {
-                CTSCommand.OPTION_CFG,
-                CTSCommand.OPTION_P,
-                CTSCommand.OPTION_PACKAGE,
-                CTSCommand.OPTION_PLAN,
-                CTSCommand.OPTION_D,
-                CTSCommand.OPTION_DEVICE,
-                CTSCommand.OPTION_R,
-                CTSCommand.OPTION_RESULT,
-                CTSCommand.OPTION_E,
-                CTSCommand.OPTION_S,
-                CTSCommand.OPTION_SESSION,
-                CTSCommand.OPTION_T,
-                CTSCommand.OPTION_TEST,
-                CTSCommand.OPTION_DERIVED_PLAN,
-                CTSCommand.OPTION_QUICK};
-
-        final String[] values = new String[] {
-                CTSCommand.OPTION_CFG,
-                CTSCommand.OPTION_PACKAGE,
-                CTSCommand.OPTION_PACKAGE,
-                CTSCommand.OPTION_PLAN,
-                CTSCommand.OPTION_DEVICE,
-                CTSCommand.OPTION_DEVICE,
-                CTSCommand.OPTION_RESULT,
-                CTSCommand.OPTION_RESULT,
-                CTSCommand.OPTION_E,
-                CTSCommand.OPTION_SESSION,
-                CTSCommand.OPTION_SESSION,
-                CTSCommand.OPTION_TEST,
-                CTSCommand.OPTION_TEST,
-                CTSCommand.OPTION_DERIVED_PLAN,
-                CTSCommand.OPTION_QUICK};
-
-        for (int i = 0; i < keys.length; i++) {
-            sOptionMap.put(keys[i], values[i]);
-        }
-    }
-
-    /**
-     * Parse the command line into array of argument.
-     *
-     * @param line The original command line.
-     * @return The command container.
-     */
-    public static CommandParser parse(final String line)
-            throws UnknownCommandException, CommandNotFoundException {
-        ArrayList<String> arglist = new ArrayList<String>();
-
-        Pattern p = Pattern.compile(COMMAND_PARSE_EXPRESSION);
-        Matcher m = p.matcher(line);
-        while (m.find()) {
-            arglist.add(m.group(1));
-        }
-        CommandParser cp = new CommandParser();
-        if (arglist.size() == 0) {
-            throw new CommandNotFoundException("No command");
-        }
-        cp.parse(arglist);
-        return cp;
-    }
-
-    /**
-     * Parse the argument list.
-     *
-     * @param arglist The argument list.
-     */
-    private void parse(ArrayList<String> arglist)
-            throws UnknownCommandException {
-        mArgLength = arglist.size();
-        int currentArgIndex = 0;
-        mAction = arglist.get(currentArgIndex).toLowerCase();
-        String originalOption = null;
-        String option = null;
-
-        // parse action values
-        while (++currentArgIndex < arglist.size()) {
-            originalOption = arglist.get(currentArgIndex).trim();
-            if (originalOption.startsWith("-")) {
-                if (isNumber(originalOption)) {
-                    mActionValues.add(originalOption);
-                } else {
-                    --currentArgIndex;
-                    break;
-                }
-            } else {
-                mActionValues.add(originalOption);
-            }
-        }
-
-        // parse option
-        while (++currentArgIndex < arglist.size()) {
-            originalOption = arglist.get(currentArgIndex).trim().toLowerCase();
-            option = originalOption;
-            if (!option.startsWith("-")) {
-                throw new UnknownCommandException(
-                        "Option should start with '-'");
-            }
-
-            option = inputToOption(option);
-            if (!sOptionsSet.contains(option)) {
-                throw new UnknownCommandException("Unknown option :"
-                        + originalOption);
-            }
-
-            if (mValues.containsKey(option)) {
-                throw new UnknownCommandException("Duplicate option: "
-                         + originalOption);
-            }
-
-            if (currentArgIndex + 1 == arglist.size()) {
-                mValues.put(option, "");
-                continue;
-            }
-
-            String value = arglist.get(++currentArgIndex).trim();
-            if (value.startsWith("-")) {
-                if (!isNumber(value)) {
-                    value = "";
-                    currentArgIndex--;
-                }
-            }
-
-            mValues.put(option, value);
-        }
-    }
-
-    /**
-     * Translate the input to option.
-     *
-     * @param option The option typed in.
-     * @return The option found.
-     */
-    private String inputToOption(String option) throws UnknownCommandException {
-        String op = sOptionMap.get(option);
-        if (op == null) {
-            throw new UnknownCommandException("Unknow option " + option);
-        }
-
-        return op;
-    }
-
-    /**
-     * Check if the option is a number.
-     *
-     * @param option The option.
-     * @return If the option is a number, return true; else, return false.
-     */
-    private boolean isNumber(String option) {
-        try {
-            Integer.parseInt(option);
-            return true;
-        } catch (Exception e) {
-            return false;
-        }
-    }
-
-    /**
-     * Get the arguments size.
-     *
-     * @return The argument size.
-     */
-    public int getArgSize() {
-        return mArgLength;
-    }
-
-    /**
-     * Get the action.
-     *
-     * @return The action.
-     */
-    public String getAction() {
-        return mAction;
-    }
-
-    /**
-     * Get the option size.
-     *
-     * @return The option size.
-     */
-    public int getOptionSize() {
-        return mValues.size();
-    }
-
-    /**
-     * Get command option by hash key from parsed argument list.
-     *
-     * @param key The key.
-     * @return The value according to the key.
-     */
-    public String getValue(String key) {
-        if (mValues.containsKey(key)) {
-            return mValues.get(key);
-        } else {
-            return null;
-        }
-    }
-
-    /**
-     * Check if option list contains the key.
-     *
-     * @param key The key.
-     * @return If containing the key, return true; else, return false.
-     */
-    public boolean containsKey(String key) {
-        return mValues.containsKey(key);
-    }
-
-    /**
-     * Get all of the option keys.
-     *
-     * @return All of the option keys.
-     */
-    public Set<String> getOptionKeys() {
-        return mValues.keySet();
-    }
-
-    /**
-     * Get action list.
-     *
-     * @return The action list.
-     */
-    public ArrayList<String> getActionValues() {
-        return mActionValues;
-    }
-
-    /**
-     * Remove a specific key.
-     *
-     * @param key The key to be removed.
-     */
-    public void removeKey(String key) {
-        mValues.remove(key);
-    }
-
-}
diff --git a/tools/host/src/com/android/cts/ConsoleUi.java b/tools/host/src/com/android/cts/ConsoleUi.java
deleted file mode 100644
index ce26d52..0000000
--- a/tools/host/src/com/android/cts/ConsoleUi.java
+++ /dev/null
@@ -1,1325 +0,0 @@
-/*
- * Copyright (C) 2008 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 com.android.cts;
-
-import com.android.cts.TestHost.ActionType;
-import com.android.cts.TestHost.MODE;
-
-import org.xml.sax.SAXException;
-
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.security.NoSuchAlgorithmException;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.List;
-
-import javax.xml.parsers.ParserConfigurationException;
-import javax.xml.transform.TransformerException;
-import javax.xml.transform.TransformerFactoryConfigurationError;
-
-/**
- * Main console of CTS providing user with the interface to interact. <BR>
- * Using CommandParser to parse command line argument and process.
- * <ul>
- *    <li> start a test plan
- *    <li> remove a test plan
- *    <li> add a test package
- *    <li> remove a test package
- *    <li> list current available devices
- *    <li> list current available test plan
- *    <li> list current available package
- *    <li> list current test result
- *    <li> view CTS' status, uninitialized, idle or running
- *    <li> view command history
- *    <li> select a history command to run
- * </ul>
- */
-public class ConsoleUi {
-
-    private static final String OS_NAME_LINUX = "Linux";
-    private static final String LS_PLAN_SEPARATOR = "=================================";
-    private static final String CMD_TYPE_LEADING_SPACE = "  ";
-    private static final String CMD_OPT_LEADING_SPACE = "    ";
-    private static final String CREATE_SESSION = "create a new session";
-    private static final String CHOOSE_SESSION = "choose a session";
-
-    private TestHost mHost;
-    private boolean mKeepRunning;
-    private BufferedReader mCommandInput;
-    // private static ConsoleInputStream sConsoleReader;
-    private CommandHistory mCommandHistory = new CommandHistory();
-    private String mOsName = "none";
-
-    // Define test case name pattern
-    static final String CASE_NAME_PATTERN_STR = "((\\S+\\.)+\\S+)\\.(\\S+):(\\S+)";
-    private static HashMap<String, Integer> mResultCodeMap;
-
-    static {
-        mResultCodeMap = new HashMap<String, Integer>();
-        mResultCodeMap.put(CtsTestResult.STR_PASS, CtsTestResult.CODE_PASS);
-        mResultCodeMap.put(CtsTestResult.STR_FAIL, CtsTestResult.CODE_FAIL);
-        mResultCodeMap.put(CtsTestResult.STR_ERROR, CtsTestResult.CODE_ERROR);
-        mResultCodeMap.put(CtsTestResult.STR_NOT_EXECUTED, CtsTestResult.CODE_NOT_EXECUTED);
-        mResultCodeMap.put(CtsTestResult.STR_TIMEOUT, CtsTestResult.CODE_TIMEOUT);
-    }
-
-    public ConsoleUi(TestHost host) {
-        mHost = host;
-        mCommandInput = new BufferedReader(new InputStreamReader(System.in));
-        mKeepRunning = true;
-
-        initInputStream();
-    }
-
-    /**
-     * Start the console user interface.
-     *
-     */
-    public void startUi() {
-        while (mKeepRunning) {
-            try {
-                String cmdLine = readLine(CUIOutputStream.CTS_PROMPT_SIGN);
-                CommandParser cp = CommandParser.parse(cmdLine);
-                processCommand(cp);
-                mCommandHistory.addCommand(cp, cmdLine);
-            } catch (CommandNotFoundException e) {
-                // avoid displaying help message for empty
-                // command by pressing ENTER over console directly
-            } catch (Exception e) {
-                Log.e("Got exception while processing command.", e);
-                showHelp();
-            }
-        }
-    }
-
-    /**
-     * Initialize the CommandProcessor.
-     */
-    private void initInputStream() {
-        // mOsName = System.getProperty("os.name");
-        if (mOsName.equals(OS_NAME_LINUX)) {
-            // sConsoleReader = new ConsoleInputStream(new FileInputStream(
-            // FileDescriptor.in), mCommandHistory);
-            // sConsoleReader.setup();
-        } else {
-            mCommandInput = new BufferedReader(new InputStreamReader(System.in));
-        }
-    }
-
-    /**
-     * Read a message line from console.
-     *
-     * @param prompt The notification message print out to console before reading.
-     * @return The string user typed in.
-     */
-    private String readLine(String prompt) throws IOException {
-        String cmdLine = null;
-        if (mOsName.equals(OS_NAME_LINUX)) {
-            // cmdLine = sConsoleReader.readLine(prompt).trim();
-        } else {
-            CUIOutputStream.print(prompt);
-            cmdLine = mCommandInput.readLine().trim();
-        }
-        return cmdLine;
-    }
-
-    /**
-     * Display the help message.
-     */
-    private void showHelp() {
-        CUIOutputStream.println("Usage: command options");
-        CUIOutputStream.println("Avaiable commands and options:");
-        showHostCmdHelp();
-        showPlanCmdHelp();
-        showPackageCmdHelp();
-        showResultCmdHelp();
-        showHistoryCmdHelp();
-        showDeviceCmdHelp();
-    }
-
-    /**
-     * Display the help message related to history commands.
-     */
-    private void showHistoryCmdHelp() {
-        final String cmdStr = CTSCommand.HISTORY + "/" + CTSCommand.H;
-
-        CUIOutputStream.println(CMD_TYPE_LEADING_SPACE + "History:");
-        CUIOutputStream.println(CMD_OPT_LEADING_SPACE
-                + cmdStr + ": list all commands in command history");
-        CUIOutputStream.println(CMD_OPT_LEADING_SPACE
-                + cmdStr + " count: list the latest count records in command history");
-        CUIOutputStream.println(CMD_OPT_LEADING_SPACE
-                + cmdStr + " " + CTSCommand.OPTION_E
-                + " num: run the command designated by 'num' in command history");
-    }
-
-    /**
-     * Display the help message related to result commands.
-     */
-    private void showResultCmdHelp() {
-        final String cmdStr = CTSCommand.LIST + " " + CTSCommand.OPTION_R
-                + "/" + CTSCommand.OPTION_RESULT;
-        final String sessionStr = CTSCommand.OPTION_S + "/" + CTSCommand.OPTION_SESSION;
-        final String resultsStr = " [" + CtsTestResult.STR_PASS
-                       + "/" + CtsTestResult.STR_FAIL
-                       + "/" + CtsTestResult.STR_NOT_EXECUTED
-                       + "/" + CtsTestResult.STR_TIMEOUT
-                       + "] ";
-
-        CUIOutputStream.println(CMD_TYPE_LEADING_SPACE + "Result:");
-        CUIOutputStream.println(CMD_OPT_LEADING_SPACE
-                + cmdStr + ": list all result of sessions");
-        CUIOutputStream.println(CMD_OPT_LEADING_SPACE
-                + cmdStr + " " + sessionStr
-                + " session_id: list detail case result of a specified session");
-        CUIOutputStream.println(CMD_OPT_LEADING_SPACE
-                + cmdStr + resultsStr + sessionStr
-                + " session_id: list detail cases of a specified"
-                + " session by the specified result.");
-    }
-
-    /**
-     * Display the help message related to package commands.
-     */
-    private void showPackageCmdHelp() {
-        final String cmdStr = CTSCommand.LIST + " " + CTSCommand.OPTION_P
-                + "/" + CTSCommand.OPTION_PACKAGE;
-        final String pkgStr = CTSCommand.OPTION_P + "/" + CTSCommand.OPTION_PACKAGE;
-
-        CUIOutputStream.println(CMD_TYPE_LEADING_SPACE + "Package:");
-        CUIOutputStream.println(CMD_OPT_LEADING_SPACE
-                + cmdStr + ": list available packages");
-        CUIOutputStream.println(CMD_OPT_LEADING_SPACE + cmdStr + " package_name: "
-                + "list contents of the package with specified name");
-
-        CUIOutputStream.println(CMD_OPT_LEADING_SPACE
-                + CTSCommand.ADD + " " + pkgStr
-                + " root: add packages from root to repository");
-        CUIOutputStream.println(CMD_OPT_LEADING_SPACE
-                + CTSCommand.REMOVE + " " + pkgStr + " package_name/all: "
-                + "remove a package or all packages from repository");
-    }
-
-    /**
-     * Display the help message related to plan commands.
-     */
-    private void showPlanCmdHelp() {
-        final String lsPlanStr = CTSCommand.LIST + " " + CTSCommand.OPTION_PLAN;
-        final String addPlanStr = CTSCommand.ADD + " " + CTSCommand.OPTION_PLAN;
-        final String rmPlanStr = CTSCommand.REMOVE + " " + CTSCommand.OPTION_PLAN;
-        final String addDerivedPlanStr = CTSCommand.ADD + " " + CTSCommand.OPTION_DERIVED_PLAN;
-
-        CUIOutputStream.println(CMD_TYPE_LEADING_SPACE + "Plan:");
-        CUIOutputStream.println(CMD_OPT_LEADING_SPACE
-                + lsPlanStr + ": list available plans");
-        CUIOutputStream.println(CMD_OPT_LEADING_SPACE
-                + lsPlanStr + " plan_name: list contents of the plan with specified name");
-        CUIOutputStream.println(CMD_OPT_LEADING_SPACE
-                + addPlanStr + " plan_name: add a new plan with specified name");
-        CUIOutputStream.println(CMD_OPT_LEADING_SPACE
-                + addDerivedPlanStr + " plan_name "
-                + CTSCommand.OPTION_S + "/" + CTSCommand.OPTION_SESSION + " session_id "
-                + CTSCommand.OPTION_R + "/" + CTSCommand.OPTION_RESULT + " result_type"
-                + ": derive a plan from the given session");
-        CUIOutputStream.println(CMD_OPT_LEADING_SPACE
-                + rmPlanStr + " plan_name/all: remove a plan or all plans from repository");
-        showStartSessionHelp();
-    }
-
-    /**
-     * Display the help message related to start session command.
-     */
-    private void showStartSessionHelp() {
-        final String cmdStr = CTSCommand.START + " " + CTSCommand.OPTION_PLAN;
-        final String testStr = CTSCommand.OPTION_T + "/" + CTSCommand.OPTION_TEST;
-        final String deviceStr = CTSCommand.OPTION_D + "/" + CTSCommand.OPTION_DEVICE;
-        final String pkgStr = CTSCommand.OPTION_P + "/" + CTSCommand.OPTION_PACKAGE;
-
-        CUIOutputStream.println(CMD_OPT_LEADING_SPACE
-                + cmdStr + " test_plan_name: run a test plan");
-        CUIOutputStream.println(CMD_OPT_LEADING_SPACE
-                + cmdStr + " test_plan_name " + deviceStr + " device_ID"
-                +  ": run a test plan using the specified device");
-        CUIOutputStream.println(CMD_OPT_LEADING_SPACE
-                + cmdStr + " test_plan_name " + testStr + " test_name"
-                + ": run a specific test");
-        CUIOutputStream.println(CMD_OPT_LEADING_SPACE
-                + cmdStr + " test_plan_name " + pkgStr + " java_package_name"
-                + ": run a specific java package");
-        CUIOutputStream.println(CMD_OPT_LEADING_SPACE
-                + cmdStr + " test_plan_name " + testStr + " test_name "
-                + deviceStr + " device_ID"
-                + ": run a specific test using the specified device");
-        CUIOutputStream.println(CMD_OPT_LEADING_SPACE
-                + cmdStr + " test_plan_name " + pkgStr + " java_package_name "
-                + deviceStr + " device_ID"
-                + ": run a specific java package using the specified device");
-    }
-
-    /**
-     * Display the help message related to host commands.
-     */
-    private void showHostCmdHelp() {
-        CUIOutputStream.println(CMD_TYPE_LEADING_SPACE + "Host:");
-        CUIOutputStream.println(CMD_OPT_LEADING_SPACE
-                + CTSCommand.HELP + ": show this message");
-        CUIOutputStream.println(CMD_OPT_LEADING_SPACE
-                + CTSCommand.EXIT + ": exit cts command line");
-    }
-
-    /**
-     * Display the help message related to device commands.
-     */
-    private void showDeviceCmdHelp() {
-        final String deviceStr = CTSCommand.OPTION_D + "/" + CTSCommand.OPTION_DEVICE;
-
-        CUIOutputStream.println(CMD_TYPE_LEADING_SPACE + "Device:");
-        CUIOutputStream.println(CMD_OPT_LEADING_SPACE
-                + CTSCommand.LIST + " " + deviceStr + ": list available devices");
-    }
-
-    /**
-     * Process the command from user's input.
-     *
-     * @param cp Command container.
-     */
-    public void processCommand(final CommandParser cp) throws Exception {
-        String action = cp.getAction();
-
-        if (action.equals(CTSCommand.EXIT)) {
-            if (cp.getArgSize() != 1) {
-                showHelp();
-                return;
-            }
-            Log.d("exit cts host");
-            mKeepRunning = false;
-            mHost.tearDown();
-        } else if (action.equals(CTSCommand.HELP)) {
-            showHelp();
-        } else if (mCommandHistory.isHistoryCommand(action)) {
-            processHistoryCommands(cp);
-        } else if (action.equals(CTSCommand.ADD)) {
-            processAddCommand(cp);
-        } else if (action.equals(CTSCommand.START)) {
-            processStartCommand(cp);
-        } else if (action.equals(CTSCommand.REMOVE)) {
-            processRmCommand(cp);
-        } else if (action.equals(CTSCommand.LIST)) {
-            processListCommand(cp);
-        } else {
-            showHelp();
-        }
-    }
-
-    /**
-     * Process start command.
-     *
-     * @param cp Command container.
-     */
-    private void processStartCommand(CommandParser cp) throws SAXException,
-            ParserConfigurationException {
-        if (cp.containsKey(CTSCommand.OPTION_PLAN)) {
-            processStartSessionCommand(cp);
-        } else if (cp.containsKey(CTSCommand.OPTION_P)
-                || cp.containsKey(CTSCommand.OPTION_PACKAGE)) {
-            processStartPackageCommand(cp);
-        } else {
-            showHelp();
-        }
-    }
-
-    /**
-     * Process start package command.
-     *
-     * <ul>
-     *     <li> Syntax:
-     *            start --package zipped-package-file
-     * </ul>
-     * @param cp Command container.
-     */
-    private void processStartPackageCommand(CommandParser cp) {
-        try {
-            String pathName = cp.getValue(CTSCommand.OPTION_PACKAGE);
-            mHost.startZippedPackage(pathName);
-        } catch (DeviceDisconnectedException e) {
-          Log.e("Device " + e.getMessage() + " disconnected", e);
-        } catch (Exception e) {
-            Log.e("Met exception during running zipped package.", e);
-        }
-    }
-
-    /**
-     * Validate the command parameters used to activate CTS.
-     *
-     * @param cp Command container.
-     * @return If command parameters are valid, return true; else, return false.
-     */
-    public boolean validateCommandParams(CommandParser cp) {
-        if (cp == null) {
-            return false;
-        }
-
-        if (cp.getAction() == null) {
-            return true;
-        } else if (isValidCommandOption(cp, CTSCommand.START,
-                CTSCommand.OPTION_PLAN)) {
-            return true;
-        } else if (isValidCommandOption(cp, CTSCommand.START,
-                CTSCommand.OPTION_PACKAGE)) {
-            return true;
-        } else if (isValidCommandOption(cp, CTSCommand.START,
-                CTSCommand.OPTION_P)) {
-            return true;
-        } else {
-            return false;
-        }
-    }
-
-    /**
-     * Check if the command option is valid.
-     *
-     * @param cp CommandParser which contains the command and options.
-     * @param command Command the user typed in.
-     * @param option Option the user typed in.
-     * @return If command option valid, return true; else, return false.
-     */
-    private static boolean isValidCommandOption(CommandParser cp,
-            String command, String option) {
-        return (cp.getAction().equals(command)) && (cp.containsKey(option))
-                && (cp.getValue(option) != null)
-                && (cp.getValue(option).length() != 0);
-    }
-
-    /**
-     * Process start session command.
-     * <ul>
-     *     <li> Syntax 1:
-     *            start --plan plan-name
-     *              [ --device device-id ]
-     *              [ --test test-name ]
-     *              [ --profile profile-name ]
-     *     <li> Syntax 2:
-     *            start --plan plan-name
-     *              [ --device device-id ]
-     *              [ --package java-package-name ]
-     *              [ --profile profile-name ]
-     * </ul>
-     * @param cp container which contained start command options and values
-     *           Process the list commands.
-     */
-    private void processStartSessionCommand(CommandParser cp)
-            throws SAXException, ParserConfigurationException {
-
-        if (mHost.getDeviceList().length == 0) {
-            Log.e("No device connected", null);
-            return;
-        }
-
-        String testPlanPath = null;
-        String deviceId = null;
-        String testName = null;
-        String javaPkgName = null;
-        String testPlanName = mHost.getPlanName(cp.getValue(CTSCommand.OPTION_PLAN));
-        try {
-            if (cp.getActionValues().size() != 0 || cp.getOptionSize() < 1
-                    || cp.getOptionSize() > 3) {
-                showStartSessionHelp();
-                return;
-            }
-            testPlanName = mHost.getPlanName(cp
-                    .getValue(CTSCommand.OPTION_PLAN));
-            testPlanPath = HostConfig.getInstance().getPlanRepository()
-                    .getPlanPath(testPlanName);
-            if (testPlanPath == null) {
-                CUIOutputStream.println("Plan " + testPlanName
-                        + " is not in repository, please create it!");
-                return;
-            }
-
-            ActionType actionType = ActionType.START_NEW_SESSION;
-            if (cp.containsKey(CTSCommand.OPTION_TEST)) {
-                testName = cp.getValue(CTSCommand.OPTION_TEST);
-                if (-1 == testName.indexOf(Test.METHOD_SEPARATOR)) {
-                    Log.e("Test full name must be in the form of:"
-                            + " java_package_name.class_name#method_name.", null);
-                    return;
-                }
-                actionType = ActionType.RUN_SINGLE_TEST;
-            } else if (cp.containsKey(CTSCommand.OPTION_PACKAGE)) {
-                javaPkgName = cp.getValue(CTSCommand.OPTION_PACKAGE);
-                actionType = ActionType.RUN_SINGLE_JAVA_PACKAGE;
-            }
-
-            TestSession ts = null;
-            ArrayList<TestSession> sessionList = mHost.getSessionList(testPlanName);
-            if ((sessionList != null) && (sessionList.size() > 0)) {
-                if ((testName == null) || (testName.length() == 0)) {
-                    String mode = chooseMode(sessionList);
-                    if (CREATE_SESSION.equals(mode)) {
-                        ts = TestHost.createSession(testPlanName);
-                    }
-                }
-                if (ts == null) {
-                    ts = chooseTestSession(sessionList);
-                    deviceId = ts.getDeviceId();
-                    if ((actionType != ActionType.RUN_SINGLE_TEST)
-                            && (actionType != ActionType.RUN_SINGLE_JAVA_PACKAGE)) {
-                        actionType = ActionType.RESUME_SESSION;
-                    }
-                }
-            }
-
-            if (cp.containsKey(CTSCommand.OPTION_DEVICE)) {
-                deviceId = cp.getValue(CTSCommand.OPTION_DEVICE);
-                String[] deviceIdList = deviceId.trim().split(",");
-                if (deviceIdList.length > 1) {
-                    Log.e("Just allow choosing one device ID.", null);
-                    return;
-                }
-            }
-
-            if (deviceId == null) {
-                TestDevice td = mHost.getFirstAvailableDevice();
-                if (td == null) {
-                    // no devices attached
-                    CUIOutputStream.println("No idle devices found.");
-                    return;
-                }
-                deviceId = td.getSerialNumber();
-            }
-
-            if (!checkDeviceExists(mHost.getDeviceList(), deviceId)) {
-                CUIOutputStream.println("Can't find specified device id.  Is it attached?");
-                return;
-            }
-
-            if (ts == null) {
-                ts = TestHost.createSession(testPlanName);
-            }
-
-            mHost.startSession(ts, deviceId, testName, javaPkgName, actionType);
-        } catch (IOException e) {
-            Log.e("Can't create test session", e);
-        } catch (DeviceNotAvailableException e) {
-            CUIOutputStream.println("Test plan(" + testPlanName + ") "
-                    + e.getMessage());
-            showStartSessionHelp();
-        } catch (TestNotFoundException e) {
-            CUIOutputStream.println(e.getMessage());
-        } catch (TestPlanNotFoundException e) {
-            CUIOutputStream.println("Can't find test plan " + testPlanName);
-        } catch (IllegalTestNameException e) {
-            CUIOutputStream.println("Illegal case name: " + testName);
-        } catch (DeviceDisconnectedException e) {
-            Log.e("Device " + e.getMessage() + " disconnected ", null);
-        } catch (NoSuchAlgorithmException e) {
-            Log.e("Fail to initialise SHA-1 algorithm", e);
-        } catch (InvalidApkPathException e) {
-            Log.e(e.getMessage(), null);
-        } catch (InvalidNameSpaceException e) {
-            Log.e(e.getMessage(), null);
-        }
-    }
-
-    /**
-     * Choose test session among the available test session list.
-     *
-     * @param sessionList The available test session list.
-     * @return The test session chosen.
-     */
-    private TestSession chooseTestSession(ArrayList<TestSession> sessionList) throws IOException {
-        if ((sessionList == null) || (sessionList.size() == 0)) {
-            return null;
-        }
-
-        if (sessionList.size() == 1) {
-            return sessionList.get(0);
-        }
-
-        int index = 0;
-        String notification = "Please choose a session from the existed session(s):\n";
-        for (TestSession session : sessionList) {
-            notification += "  " + session.getId() + "  [" + index + "] \n";
-            index ++;
-        }
-
-        return sessionList.get(getUserInputId(notification, 0, index));
-    }
-
-    /**
-     * Choose  between creating a new session and choosing a session among available ones.
-     *
-     * @param sessionList The available test session list.
-     * @return If choose to create a new session, return CREATE_SESSION;
-     *         else return CHOOSE_SESSION.
-     */
-    private String chooseMode(ArrayList<TestSession> sessionList) throws IOException {
-        if (TestHost.sMode == MODE.RUN || (sessionList == null) || (sessionList.size() == 0)) {
-            // do not prompt if the test run was started from command line mode, or when
-            // there are no existing sessions
-            return CREATE_SESSION;
-        }
-
-        String planName = sessionList.get(0).getSessionLog().getTestPlanName();
-        String notification = "There are " + sessionList.size()
-            + " existing session(s) for plan " + planName + ".\n"
-            + "Create a new session or choose an existing one?\n"
-            + "  Create a new session [0]\n"
-            + "  Choose a session     [1]\n";
-
-        int indexSelected = getUserInputId(notification, 0, 2);
-        if (indexSelected == 0) {
-            return CREATE_SESSION;
-        } else {
-            return CHOOSE_SESSION;
-        }
-    }
-
-    /**
-     * Validate the specified device ID against the available device array.
-     *
-     * @param availableDevices The available device array.
-     * @param specifiedId The specified device ID list.
-     * @return true if the id is valid
-     */
-    public boolean checkDeviceExists(TestDevice[] availableDevices, String specifiedId) {
-        for (TestDevice dev : availableDevices) {
-            if (specifiedId.equals(dev.getSerialNumber())) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    /**
-     * Get device ID from the device ID string against the available devices.
-     *
-     * @param availableDevices The available devices.
-     * @param idStr The device ID string.
-     * @return The device ID.
-     */
-    public int getDeviceId(TestDevice[] availableDevices, String idStr) {
-        for (int i = 0; i < availableDevices.length; i++) {
-            TestDevice dev = availableDevices[i];
-            if (idStr.equals(dev.getSerialNumber())) {
-                return i;
-            }
-        }
-        return -1;
-    }
-
-    /**
-     * Get the ID input by the against the specified range.
-     *
-     * @param notification The notification message to notify the user.
-     * @param startIndex The start index.
-     * @param endIndex The end index.
-     * @return The selected index of the ID the user chosen.
-     */
-    private int getUserInputId(String notification, int startIndex, int endIndex)
-                throws IOException {
-        int indexSelected = 0;
-        boolean success = false;
-        while (!success) {
-            String answer = readLine(notification);
-            try {
-                indexSelected = Integer.parseInt(answer);
-                if ((indexSelected >= 0) && (indexSelected < endIndex)) {
-                    success = true;
-                } else {
-                    CUIOutputStream.println("" + indexSelected
-                            + " is out of range [0," + (endIndex -1 ) + "].");
-                }
-            } catch (NumberFormatException e) {
-                CUIOutputStream.println("Invalid nuber is typed in.");
-            }
-        }
-        return indexSelected;
-    }
-
-    /**
-     * Check if the specified device ID is valid.
-     *
-     * @param numOfAvailableDevices The number of available devices.
-     * @param specifiedId The specified device ID.
-     * @return If the specified ID contained in available ID list,
-     *         return true; else, return false.
-     */
-    public boolean isValidDeviceId(int numOfAvailableDevices, int specifiedId) {
-        if (specifiedId < 0 || specifiedId >= numOfAvailableDevices) {
-            return false;
-        }
-        return true;
-    }
-
-    /**
-     * Process list commands.
-     * <ul>
-     *     <li> Syntax 1:
-     *            ls --device
-     *     <li> Syntax 2:
-     *            ls --plan [ plan-name ]
-     *     <li> Syntax 3:
-     *            ls --package [ package-name ]
-     *     <li> Syntax 4:
-     *            ls --result
-     *              [ pass/fail/notExecuted/timeout ]
-     *              [ --session session_id ]
-     * </ul>
-     *
-     * @param cp Command container.
-     */
-    private void processListCommand(CommandParser cp) throws SAXException,
-            IOException, ParserConfigurationException {
-        if (cp.containsKey(CTSCommand.OPTION_DEVICE)) {
-            if (cp.getActionValues().size() != 0 || cp.getOptionSize() != 1) {
-                showDeviceCmdHelp();
-                return;
-            }
-            if (cp.getValue(CTSCommand.OPTION_DEVICE).equals("")) {
-                listDevices();
-            } else {
-                showDeviceCmdHelp();
-            }
-        } else if (cp.containsKey(CTSCommand.OPTION_PLAN)) {
-            if (cp.getActionValues().size() != 0 || cp.getOptionSize() != 1) {
-                showPlanCmdHelp();
-                return;
-            }
-            String planValue = cp.getValue(CTSCommand.OPTION_PLAN);
-            if (planValue.equals("")) {
-                listPlans();
-            } else {
-                listSinglePlan(mHost.getPlanName(planValue));
-            }
-        } else if (cp.containsKey(CTSCommand.OPTION_RESULT)) {
-            if (cp.getActionValues().size() != 0
-                    || (cp.getOptionSize() < 1 || cp.getOptionSize() > 2)) {
-                showResultCmdHelp();
-                return;
-            }
-            String resultValue = cp.getValue(CTSCommand.OPTION_RESULT);
-            String sessionId = cp.getValue(CTSCommand.OPTION_SESSION);
-            Integer resultCode = null;
-
-            if (sessionId != null) {
-                if (resultValue.length() != 0
-                        && !mResultCodeMap.containsKey(resultValue)) {
-                    showResultCmdHelp();
-                } else {
-                    resultCode = mResultCodeMap.get(resultValue);
-                    listSessionResult(sessionId, resultCode);
-                }
-            } else if (resultValue.length() == 0) {
-                listResults();
-            } else {
-                showHelp();
-            }
-        } else if (cp.containsKey(CTSCommand.OPTION_PACKAGE)) {
-            if (cp.getActionValues().size() != 0 || cp.getOptionSize() != 1) {
-                showPackageCmdHelp();
-                return;
-            }
-            listPackages(cp);
-        } else {
-            showHelp();
-        }
-    }
-
-    /**
-     * Process the removing commands.
-     * <ul>
-     *     <li> Syntax 1:
-     *            rm --plan [ plan-name ] [ all ]
-     *     <li> Syntax 2:
-     *            rm --package [ package-name ] [ all ]
-     * </ul>
-     *
-     * @param cp Command container.
-     */
-    private void processRmCommand(CommandParser cp) throws IOException {
-        if (cp.containsKey(CTSCommand.OPTION_PLAN)) {
-            if (cp.getActionValues().size() != 0 || cp.getOptionSize() != 1) {
-                showPlanCmdHelp();
-                return;
-            }
-
-            String planName = mHost.getPlanName(cp.getValue(CTSCommand.OPTION_PLAN));
-            if (HostConfig.ALL.equals(planName)) {
-                String prompt = "Remove all of the plans?([y/N])";
-                String answer = readLine(prompt).trim();
-                if (!isConfirmation(answer, false)) {
-                    return;
-                }
-            }
-
-            mHost.removePlans(planName);
-        } else if (cp.containsKey(CTSCommand.OPTION_PACKAGE)) {
-            if (cp.getActionValues().size() != 0 || cp.getOptionSize() != 1) {
-                showPackageCmdHelp();
-                return;
-            }
-
-            String packageName = cp.getValue(CTSCommand.OPTION_PACKAGE);
-            if (HostConfig.ALL.equals(packageName)) {
-                String prompt = "Remove all of the packages?([y/N])";
-                String answer = readLine(prompt).trim();
-                if (!isConfirmation(answer, false)) {
-                    return;
-                }
-            }
-
-            mHost.removePackages(packageName);
-        } else {
-            showHelp();
-        }
-    }
-
-    /**
-     * Check if the answer is confirmation.
-     *
-     * @param answer The answer user typed in.
-     * @param defaultResult If true, default to yes; else, default to no.
-     * @return If confirmation, return true; else, return false.
-     */
-    public static boolean isConfirmation(String answer, boolean defaultResult) {
-        if ("".equals(answer)) {
-            return defaultResult;
-        }
-
-        return ("y".equals(answer.toLowerCase()) || "yes".equals(answer.toLowerCase()));
-    }
-
-    /**
-     * Process the add commands.
-     * <ul>
-     *     <li> Syntax 1:
-     *            add --plan plan-name
-     *     <li> Syntax 2:
-     *            add --package package-name
-     * </ul>
-     *
-     * @param cp Command container.
-     */
-    private void processAddCommand(CommandParser cp) {
-        if (cp.containsKey(CTSCommand.OPTION_PLAN)) {
-            if (isValidAddPlanArguments(cp)) {
-                createPlan(cp, CTSCommand.OPTION_PLAN);
-            } else {
-                showPlanCmdHelp();
-            }
-        } else if (cp.containsKey(CTSCommand.OPTION_DERIVED_PLAN)) {
-            if (isValidDerivedPlanArguments(cp)) {
-                createPlan(cp, CTSCommand.OPTION_DERIVED_PLAN);
-            } else {
-                showPlanCmdHelp();
-            }
-        } else if (cp.containsKey(CTSCommand.OPTION_PACKAGE)) {
-            try {
-                addPackage(cp);
-            } catch (IOException e) {
-                Log.e("Can't add package", e);
-            } catch (IndexOutOfBoundsException e) {
-                Log.e("Can't add package", e);
-            } catch (NoSuchAlgorithmException e) {
-                Log.e("Can't add package", e);
-            }
-        } else {
-            showHelp();
-        }
-    }
-
-    /**
-     * Check if it's valid arguments for adding plan.
-     *
-     * @param cp The command processor.
-     * @return if valid, return true; else, return false.
-     */
-    private boolean isValidAddPlanArguments(CommandParser cp) {
-        return (cp.getArgSize() == 3) && (cp.getActionValues().size() == 0)
-                && (cp.getOptionSize() == 1);
-    }
-
-    /**
-     * Check if it's valid arguments for deriving plan.
-     *
-     * @param cp The command processor.
-     * @return if valid, return true; else, return false.
-     */
-    private boolean isValidDerivedPlanArguments(CommandParser cp) {
-        //argument size: it's at least 3, as "add --plan plan_name"
-        //action values: no option contains more than one value
-        //option size: it's at least 1, as "add --plan plan_name"
-        return (cp.getArgSize() >= 3) && (cp.getActionValues().size() == 0)
-                && (cp.getOptionSize() >= 1);
-    }
-
-    /**
-     * Process the history commands.
-     * <ul>
-     *     <li> Syntax:
-     *            history [ -e ] [ number]
-     * </ul>
-     *
-     * @param cp Command container.
-     */
-    private void processHistoryCommands(final CommandParser cp)
-            throws Exception {
-        try {
-            if ((cp.getOptionSize() == 0) && (cp.getActionValues().size() == 0)) {
-                mCommandHistory.show(mCommandHistory.size());
-            } else if (cp.containsKey(CTSCommand.OPTION_E)
-                    && (cp.getActionValues().size() == 0)) {
-                int cmdNum = 0;
-                cmdNum = Integer.parseInt(cp.getValue(CTSCommand.OPTION_E));
-                if (cmdNum >= 0 && cmdNum < mCommandHistory.size()) {
-                    String cmdLine = mCommandHistory.get(cmdNum);
-                    CommandParser cpH = CommandParser.parse(cmdLine);
-                    CUIOutputStream.printPrompt();
-                    CUIOutputStream.println(cmdLine);// print(CTS_PROMPT_SIGN
-                                                        // + cmdLine);
-                    processCommand(cpH);
-                    mCommandHistory.addCommand(cpH, cmdLine);
-                } else {
-                    if (mCommandHistory.size() > 0) {
-                        Log.e("Command index " + cmdNum
-                                + " is out of command history range [0,"
-                                + (mCommandHistory.size() - 1) + "].", null);
-                    } else {
-                        Log.e("No command exists in command history.", null);
-                    }
-                }
-            } else if ((cp.getOptionSize() == 0)
-                    && (cp.getActionValues().size() == 1)) {
-                int cmdCount = Integer.parseInt(cp.getActionValues().iterator()
-                        .next());
-                if (cmdCount < 0 || cmdCount > mCommandHistory.size()) {
-                    cmdCount = mCommandHistory.size();
-                }
-                mCommandHistory.show(cmdCount);
-            } else {
-                showHistoryCmdHelp();
-            }
-
-        } catch (NumberFormatException e) {
-            showHistoryCmdHelp();
-        }
-    }
-
-    /**
-     * List a single plan by the plan name given.
-     *
-     * @param name The plan name.
-     */
-    private void listSinglePlan(String name) throws SAXException, IOException,
-            ParserConfigurationException {
-        String planName = null;
-        for (String str : mHost.getPlanRepository().getAllPlanNames()) {
-            if (str.startsWith(name)) {
-                planName = str;
-                break;
-            }
-        }
-
-        if (planName == null) {
-            Log.e("No plan named " + name + " in repository!", null);
-            return;
-        }
-
-        String planPath = mHost.getPlanRepository().getPlanPath(planName);
-        ArrayList<String> removedPkgList = new ArrayList<String>();
-        Collection<String> pkgNames = TestPlan.getEntries(planPath, removedPkgList);
-
-        if (removedPkgList.size() != 0) {
-            CUIOutputStream.println("The following package(s) contained in plan "
-                    + planName + " have been removed:");
-            for (String pkgName : removedPkgList) {
-                CUIOutputStream.println("    " + pkgName);
-            }
-        }
-
-        if (pkgNames.size() > 0) {
-            CUIOutputStream.println("Packages of plan " + planName
-                    + " (" + pkgNames.size() + " in total):");
-            CUIOutputStream.println(LS_PLAN_SEPARATOR);
-            for (String pkgName : pkgNames) {
-                CUIOutputStream.println(pkgName);
-            }
-        }
-    }
-
-    /**
-     * Create test plan via the test session and result type given.
-     *
-     * @param name The test plan name.
-     * @param ts The test session.
-     * @param resultType The result type.
-     */
-    private void createPlanFromSession(final String name, TestSession ts, final String resultType)
-            throws FileNotFoundException, IOException, ParserConfigurationException,
-            TransformerFactoryConfigurationError, TransformerException {
-
-        HashMap<String, ArrayList<String>> selectedResult =
-            new HashMap<String, ArrayList<String>>();
-        ArrayList<String> packageNames = new ArrayList<String>();
-
-        for (TestPackage pkg : ts.getSessionLog().getTestPackages()) {
-            String pkgName = pkg.getAppPackageName();
-            ArrayList<String> excludedList = pkg.getExcludedList(resultType);
-            if (excludedList != null) {
-                packageNames.add(pkgName);
-                selectedResult.put(pkgName, excludedList);
-            }
-        }
-
-        if ((selectedResult != null) && (selectedResult.size() > 0)) {
-            TestSessionBuilder.getInstance().serialize(name, packageNames, selectedResult);
-        } else {
-            if (resultType == null) {
-                Log.i("All tests of session " + ts.getId()
-                        + " have passed execution. The plan is not created!");
-            } else {
-                Log.i("No " + resultType +  " tests of session " + ts.getId()
-                        + ". The plan is not created!");
-            }
-        }
-    }
-
-    /**
-     * Add a derived plan from a given session.
-     *
-     * @param cp Command container.
-     * @param name The plan name.
-     * @param packageNames The package name list.
-     */
-    private void addDerivedPlan(final CommandParser cp, final String name,
-            ArrayList<String> packageNames) {
-
-        try {
-            String sessionId = null;
-            String resultType = null;
-            int id = TestSession.getLastSessionId();
-
-            if (cp.containsKey(CTSCommand.OPTION_SESSION)) {
-                sessionId = cp.getValue(CTSCommand.OPTION_SESSION);
-                id = Integer.parseInt(sessionId);
-            }
-            TestSession ts = mHost.getSession(id);
-            if (ts == null) {
-                Log.e("The session ID of " + id + " doesn't exist.", null);
-                return;
-            }
-
-            if (cp.containsKey(CTSCommand.OPTION_RESULT)) {
-                resultType = cp.getValue(CTSCommand.OPTION_RESULT);
-                if (!CtsTestResult.isValidResultType(resultType)) {
-                    Log.e("The following result type is invalid: " + resultType, null);
-                    return;
-                }
-            }
-            createPlanFromSession(name, ts, resultType);
-        } catch (Exception e) {
-            Log.e("Got exception while trying to add a plan!", e);
-            return;
-        }
-    }
-
-    /**
-     * Add a plan by the plan name given.
-     *
-     * @param cp Command container.
-     * @param name The plan name.
-     * @param packageNames The package name list.
-     */
-    private void addPlan(final CommandParser cp, final String name,
-            ArrayList<String> packageNames) {
-
-        try {
-            PlanBuilder planBuilder = new PlanBuilder(packageNames);
-
-            if (mOsName.equals(OS_NAME_LINUX)) {
-                // planBuilder.setInputStream(sConsoleReader);
-            } else {
-                planBuilder.setInputStream(mCommandInput);
-            }
-
-            HashMap<String, ArrayList<String>> selectedResult = planBuilder.doSelect();
-            if (selectedResult != null) {
-                TestSessionBuilder.getInstance().serialize(name, packageNames, selectedResult);
-            } else {
-                Log.i("Selected nothing for the plan of " + name + ". The plan is not created!");
-            }
-        } catch (Exception e) {
-            Log.e("Got exception while trying to add a plan!", e);
-            return;
-        }
-    }
-
-    /**
-     * Create a plan.
-     *
-     * @param cp Command container.
-     * @param type the action type.
-     */
-    private void createPlan(final CommandParser cp, final String type) {
-        String name = null;
-        if (CTSCommand.OPTION_PLAN.equals(type)) {
-            name = cp.getValue(CTSCommand.OPTION_PLAN);
-        } else if (CTSCommand.OPTION_DERIVED_PLAN.equals(type)) {
-            name = cp.getValue(CTSCommand.OPTION_DERIVED_PLAN);
-        } else {
-            return;
-        }
-
-        if (HostUtils.isFileExist(HostConfig.getInstance().getPlanRepository()
-                .getPlanPath(name)) == true) {
-            Log.e("Plan " + name + " already exist, please use another name!", null);
-            return;
-        }
-
-        try {
-            if ((name != null) && (!name.matches("\\w+"))) {
-                CUIOutputStream.println("Only letter of the alphabet, number and '_'"
-                        + " are available for test plan name");
-                return;
-            }
-
-            ArrayList<String> packageNames =
-                HostConfig.getInstance().getCaseRepository().getPackageNames();
-            Collection<TestPackage> testPackages = HostConfig.getInstance().getTestPackages();
-            if (testPackages.size() == 0) {
-                CUIOutputStream.println("No package found in repository, please add package first!");
-                return;
-            }
-            if (CTSCommand.OPTION_PLAN.equals(type)) {
-                addPlan(cp, name, packageNames);
-            } else if (CTSCommand.OPTION_DERIVED_PLAN.equals(type)) {
-                addDerivedPlan(cp, name, packageNames);
-            }
-        } catch (Exception e) {
-            Log.e("Got exception while trying to add a plan!", e);
-            return;
-        }
-    }
-
-    /**
-     * List all of the plans in the plan repository.
-     */
-    private void listPlans() {
-        ArrayList<String> plans = mHost.getPlanRepository().getAllPlanNames();
-
-        if (plans.size() == 0) {
-            CUIOutputStream.println("No plan created!");
-        } else {
-            CUIOutputStream.println("List of plans (" + plans.size() + " in total):");
-            for (String name : plans) {
-                CUIOutputStream.println(name);
-            }
-        }
-    }
-
-    /**
-     * List detailed case result of specified session. The result can be
-     * filtered, if resultType isn't null, by the specified resultType.
-     *
-     * @param idStr the session id.
-     * @param resultType the type of result, [pass, fail, notExecuted, timeout, null].
-     */
-    private void listSessionResult(final String idStr, final Integer resultType) {
-        if (!idStr.matches("\\d+")) {
-            showResultCmdHelp();
-            return;
-        }
-
-        int sessionId = Integer.parseInt(idStr);
-
-        TestSession ts = mHost.getSession(sessionId);
-        if (null == ts) {
-            Log.e("Can't find specified session", null);
-            return;
-        }
-
-        TestSessionLog log = ts.getSessionLog();
-        CUIOutputStream.println("Result of session " + ts.getId());
-        CUIOutputStream.println("Result\t\tCase name");
-        CUIOutputStream
-                .println("==============================================================");
-        for (Test test : log.getAllResults()) {
-            CtsTestResult result = test.getResult();
-            if ((resultType != null) && (result.getResultCode() != resultType.intValue())) {
-                continue;
-            }
-            CUIOutputStream.println(result.getResultString() + "\t\t"
-                    + test.getFullName());
-        }
-    }
-
-    /**
-     * List all of the test results.
-     */
-    private void listResults() {
-        Collection<TestSession> sessions = mHost.getSessions();
-        if (sessions.isEmpty()) {
-            CUIOutputStream.println("There aren't any test results!");
-        } else {
-            CUIOutputStream.println("List of all results: ");
-            CUIOutputStream.println("Session\t\tTest result\t\t\t\tStart time\t\tEnd time\t"
-                    + "\tTest plan name\t");
-            CUIOutputStream.println("\t\tPass\tFail\tTimeout\tNotExecuted");
-
-            for (TestSession session : sessions) {
-                TestSessionLog log = session.getSessionLog();
-                int passNum = log.getTestList(
-                        CtsTestResult.CODE_PASS).size();
-                int failNum = log.getTestList(
-                        CtsTestResult.CODE_FAIL).size();
-                int notExecutedNum = log.getTestList(
-                        CtsTestResult.CODE_NOT_EXECUTED).size();
-                int timeOutNum = log.getTestList(
-                        CtsTestResult.CODE_TIMEOUT).size();
-
-                String resStr = Long.toString(passNum) + "\t" + failNum;
-                resStr += "\t" + timeOutNum;
-                resStr += "\t" + notExecutedNum;
-
-                String startTimeStr =
-                    HostUtils.getFormattedTimeString(log.getStartTime().getTime(), " ", ".", ":");
-                String endTimeStr =
-                    HostUtils.getFormattedTimeString(log.getEndTime().getTime(), " ", ".", ":");
-                CUIOutputStream.println(Long.toString(session.getId()) + "\t\t"
-                        + resStr + "\t\t" + startTimeStr
-                        + "\t" + endTimeStr
-                        + "\t" + log.getTestPlanName());
-
-            }
-        }
-    }
-
-    /**
-     * Add a package by the path and package name.
-     *
-     * @param cp Command container.
-     */
-    private void addPackage(final CommandParser cp) throws IOException,
-            IndexOutOfBoundsException, NoSuchAlgorithmException {
-        if (cp.getActionValues().size() != 0 || cp.getOptionSize() != 1) {
-            showPackageCmdHelp();
-            return;
-        }
-        String pathName = cp.getValue(CTSCommand.OPTION_PACKAGE);
-        mHost.addPackage(pathName);
-    }
-
-    /**
-     * List current package in the case repository.
-     *
-     * @param cp Command container
-     */
-    private void listPackages(final CommandParser cp) {
-        // walk through the case root path
-        // and list available packages
-        String expectPackage = cp.getValue(CTSCommand.OPTION_PACKAGE);
-        String caseRoot = mHost.getCaseRepository().getRoot();
-        if (caseRoot == null) {
-            Log.e("Case repository is null", null);
-            return;
-        }
-
-        File root = new File(caseRoot);
-        if (!root.isDirectory()) {
-            Log.e("Case repository must be a directory!", null);
-            return;
-        }
-
-        Collection<TestPackage> testPackages = HostConfig.getInstance().getTestPackages();
-
-        if (testPackages.size() == 0) {
-            CUIOutputStream
-                    .println("No package available under case repository!");
-        } else {
-            if (expectPackage.equals("")) {
-                CUIOutputStream.println("Available packages ("
-                        + testPackages.size() + " in total):");
-                for (TestPackage pkg : testPackages) {
-                    CUIOutputStream.println(pkg.getAppPackageName());
-                }
-            } else {
-                List<ArrayList<String>> list = mHost.getCaseRepository()
-                        .listAvailablePackage(expectPackage);
-                ArrayList<String> packageList = list.get(0);
-                ArrayList<String> suiteList = list.get(1);
-                ArrayList<String> caseList = list.get(2);
-                ArrayList<String> testList = list.get(3);
-                if ((packageList.size() == 0) && (suiteList.size() == 0)
-                        && (caseList.size() == 0) && (testList.size() == 0)) {
-                    CUIOutputStream
-                            .println("Not available test package, suite, cases or tests: "
-                                    + expectPackage);
-                } else {
-                    if (packageList.size() != 0) {
-                        CUIOutputStream.println(
-                                "Test packages (" + packageList.size() + " in total):");
-                        for (String packageName : packageList) {
-                            CUIOutputStream.println(packageName);
-                        }
-                    }
-                    if (suiteList.size() != 0) {
-                        CUIOutputStream.println(
-                                "Test suites (" + suiteList.size() + " in total):");
-                        for (String suiteName : suiteList) {
-                            CUIOutputStream.println(suiteName);
-                        }
-                    }
-                    if (caseList.size() != 0) {
-                        CUIOutputStream.println("Test cases (" + caseList.size() + " in total):");
-                        for (String caseName : caseList) {
-                            CUIOutputStream.println(caseName);
-                        }
-                    }
-                    if (testList.size() != 0) {
-                        CUIOutputStream.println("Tests (" + testList.size() + " in total):");
-                        for (String testName : testList) {
-                            CUIOutputStream.println(testName);
-                        }
-                    }
-                }
-            }
-        }
-    }
-
-    /**
-     * List all of the devices connected.
-     */
-    private void listDevices() {
-        String[] deviceNames = mHost.listDevices();
-        if (deviceNames.length == 0) {
-            CUIOutputStream.println("No device connected.");
-            return;
-        }
-
-        CUIOutputStream.println("Id\t\tDevice Name\t\tStatus");
-
-        for (int i = 0; i < deviceNames.length; i++) {
-            CUIOutputStream.println(i + "\t\t" + deviceNames[i]);
-        }
-    }
-}
diff --git a/tools/host/src/com/android/cts/CtsTestResult.java b/tools/host/src/com/android/cts/CtsTestResult.java
deleted file mode 100644
index b64863d..0000000
--- a/tools/host/src/com/android/cts/CtsTestResult.java
+++ /dev/null
@@ -1,206 +0,0 @@
-/*
- * Copyright (C) 2009 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 com.android.cts;
-
-import junit.framework.TestFailure;
-import junit.framework.TestResult;
-
-import java.util.Enumeration;
-import java.util.HashMap;
-
-
-/**
- * Store the result of a specific test.
- */
-public class CtsTestResult {
-    private int mResultCode;
-    private String mFailedMessage;
-    private String mStackTrace;
-
-    public static final int CODE_INIT = -1;
-    public static final int CODE_NOT_EXECUTED = 0;
-    public static final int CODE_PASS = 1;
-    public static final int CODE_FAIL = 2;
-    public static final int CODE_ERROR = 3;
-    public static final int CODE_TIMEOUT = 4;
-    public static final int CODE_FIRST = CODE_INIT;
-    public static final int CODE_LAST = CODE_TIMEOUT;
-
-    public static final String STR_ERROR = "error";
-    public static final String STR_TIMEOUT = "timeout";
-    public static final String STR_NOT_EXECUTED = "notExecuted";
-    public static final String STR_FAIL = "fail";
-    public static final String STR_PASS = "pass";
-
-    private static HashMap<Integer, String> sCodeToResultMap;
-    private static HashMap<String, Integer> sResultToCodeMap;
-    static {
-        sCodeToResultMap = new HashMap<Integer, String>();
-        sCodeToResultMap.put(CODE_NOT_EXECUTED, STR_NOT_EXECUTED);
-        sCodeToResultMap.put(CODE_PASS, STR_PASS);
-        sCodeToResultMap.put(CODE_FAIL, STR_FAIL);
-        sCodeToResultMap.put(CODE_ERROR, STR_ERROR);
-        sCodeToResultMap.put(CODE_TIMEOUT, STR_TIMEOUT);
-        sResultToCodeMap = new HashMap<String, Integer>();
-        for (int code : sCodeToResultMap.keySet()) {
-            sResultToCodeMap.put(sCodeToResultMap.get(code), code);
-        }
-    }
-
-    public CtsTestResult(int resCode) {
-        mResultCode = resCode;
-    }
-
-    public CtsTestResult(int resCode, final String failedMessage, final String stackTrace) {
-        mResultCode = resCode;
-        mFailedMessage = failedMessage;
-        mStackTrace = stackTrace;
-    }
-
-    public CtsTestResult(final String result, final String failedMessage,
-            final String stackTrace) throws InvalidTestResultStringException {
-        if (!sResultToCodeMap.containsKey(result)) {
-            throw new InvalidTestResultStringException(result);
-        }
-
-        mResultCode = sResultToCodeMap.get(result);
-        mFailedMessage = failedMessage;
-        mStackTrace = stackTrace;
-    }
-
-    /**
-     * Check if the result indicates failure.
-     *
-     * @return If failed, return true; else, return false.
-     */
-    public boolean isFail() {
-        return mResultCode == CODE_FAIL;
-    }
-
-    /**
-     * Check if the result indicates pass.
-     *
-     * @return If pass, return true; else, return false.
-     */
-    public boolean isPass() {
-        return mResultCode == CODE_PASS;
-    }
-
-    /**
-     * Check if the result indicates not executed.
-     *
-     * @return If not executed, return true; else, return false.
-     */
-    public boolean isNotExecuted() {
-        return mResultCode == CODE_NOT_EXECUTED;
-    }
-
-    /**
-     * Get result code of the test.
-     *
-     * @return The result code of the test.
-     *         The following is the possible result codes:
-     * <ul>
-     *    <li> notExecuted
-     *    <li> pass
-     *    <li> fail
-     *    <li> error
-     *    <li> timeout
-     * </ul>
-     */
-    public int getResultCode() {
-        return mResultCode;
-    }
-
-    /**
-     * Get the failed message.
-     *
-     * @return The failed message.
-     */
-    public String getFailedMessage() {
-        return mFailedMessage;
-    }
-
-    /**
-     * Get the stack trace.
-     *
-     * @return The stack trace.
-     */
-    public String getStackTrace() {
-        return mStackTrace;
-    }
-
-    /**
-     * Set the result.
-     *
-     * @param testResult The result in the form of JUnit test result.
-     */
-    @SuppressWarnings("unchecked")
-    public void setResult(TestResult testResult) {
-        int resCode = CODE_PASS;
-        String failedMessage = null;
-        String stackTrace = null;
-        if ((testResult != null) && (testResult.failureCount() > 0 || testResult.errorCount() > 0)) {
-            resCode = CODE_FAIL;
-            Enumeration<TestFailure> failures = testResult.failures();
-            while (failures.hasMoreElements()) {
-                TestFailure failure = failures.nextElement();
-                failedMessage += failure.exceptionMessage();
-                stackTrace += failure.trace();
-            }
-            Enumeration<TestFailure> errors = testResult.errors();
-            while (errors.hasMoreElements()) {
-                TestFailure failure = errors.nextElement();
-                failedMessage += failure.exceptionMessage();
-                stackTrace += failure.trace();
-            }
-        }
-        mResultCode = resCode;
-        mFailedMessage = failedMessage;
-        mStackTrace = stackTrace;
-    }
-
-    /**
-     * Reverse the result code.
-     */
-    public void reverse() {
-        if (isPass()) {
-            mResultCode = CtsTestResult.CODE_FAIL;
-        } else if (isFail()){
-            mResultCode = CtsTestResult.CODE_PASS;
-        }
-    }
-
-    /**
-     * Get the test result as string.
-     *
-     * @return The readable result string.
-     */
-    public String getResultString() {
-        return sCodeToResultMap.get(mResultCode);
-    }
-
-    /**
-     * Check if the given resultType is a valid result type defined..
-     *
-     * @param resultType The result type to be checked.
-     * @return If valid, return true; else, return false.
-     */
-    static public boolean isValidResultType(final String resultType) {
-        return sResultToCodeMap.containsKey(resultType);
-    }
-}
diff --git a/tools/host/src/com/android/cts/DeviceDisconnectedException.java b/tools/host/src/com/android/cts/DeviceDisconnectedException.java
deleted file mode 100644
index 9a9c134..0000000
--- a/tools/host/src/com/android/cts/DeviceDisconnectedException.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Copyright (C) 2008 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 com.android.cts;
-
-/**
- * Throw out DeviceDisconnectedException if detected that the device is disconnected.
- */
-public class DeviceDisconnectedException extends Exception {
-
-    public DeviceDisconnectedException(String message) {
-        super(message);
-    }
-}
diff --git a/tools/host/src/com/android/cts/DeviceManager.java b/tools/host/src/com/android/cts/DeviceManager.java
deleted file mode 100644
index c794332..0000000
--- a/tools/host/src/com/android/cts/DeviceManager.java
+++ /dev/null
@@ -1,409 +0,0 @@
-/*
- * Copyright (C) 2008 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 com.android.cts;
-
-import com.android.ddmlib.AdbCommandRejectedException;
-import com.android.ddmlib.AndroidDebugBridge;
-import com.android.ddmlib.IDevice;
-import com.android.ddmlib.TimeoutException;
-import com.android.ddmlib.AndroidDebugBridge.IDeviceChangeListener;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.concurrent.Semaphore;
-import java.util.concurrent.TimeUnit;
-
-/**
- * Initializing and managing devices.
- */
-public class DeviceManager implements IDeviceChangeListener {
-
-    private static final int SHORT_DELAY = 1000 * 15; // 15 seconds
-    private static final int LONG_DELAY = 1000 * 60 * 10; // 10 minutes
-    /** Time to wait after issuing reboot command  */
-    private static final int REBOOT_DELAY = 5 * 1000; // 5 seconds
-    /** Time to wait after device reports that boot is complete. */
-    private static final int POST_BOOT_DELAY = 1000 * 60; // 1 minute
-    /** Maximal number of attempts to restart ADB connection. */
-    private static final int MAX_ADB_RESTART_ATTEMPTS = 10;
-    ArrayList<TestDevice> mDevices;
-    /** This is used during device restart for blocking until the device has been reconnected. */
-    private Semaphore mSemaphore = new Semaphore(0);
-
-    public DeviceManager() {
-        mDevices = new ArrayList<TestDevice>();
-    }
-
-    /**
-     * Initialize Android debug bridge. This function should be called after
-     * {@link DeviceManager} initialized.
-     */
-    public void initAdb() {
-        String adbLocation = getAdbLocation();
-
-        Log.d("init adb...");
-        AndroidDebugBridge.init(true);
-        AndroidDebugBridge.addDeviceChangeListener(this);
-        AndroidDebugBridge.createBridge(adbLocation, true);
-    }
-
-    /**
-     * Get the location of the adb command.
-     *
-     * @return The location of the adb location.
-     */
-    public static String getAdbLocation() {
-        return "adb";
-    }
-
-    /**
-     * Allocate devices by specified number for testing.
-     * @param num the number of required device
-     * @return the specified number of devices.
-     */
-    public TestDevice[] allocateDevices(final int num) throws DeviceNotAvailableException {
-
-        ArrayList<TestDevice> deviceList;
-        TestDevice td;
-        int index = 0;
-
-        if (num < 0) {
-            throw new IllegalArgumentException();
-        }
-        if (num > mDevices.size()) {
-            throw new DeviceNotAvailableException("The number of connected device("
-                    + mDevices.size() + " is less than the specified number("
-                    + num + "). Please plug in enough devices");
-        }
-        deviceList = new ArrayList<TestDevice>();
-
-        while (index < mDevices.size() && deviceList.size() != num) {
-            td = mDevices.get(index);
-            if (td.getStatus() == TestDevice.STATUS_IDLE) {
-                deviceList.add(td);
-            }
-            index++;
-        }
-        if (deviceList.size() != num) {
-            throw new DeviceNotAvailableException("Can't get the specified number("
-                    + num + ") of idle device(s).");
-        }
-        return deviceList.toArray(new TestDevice[num]);
-    }
-
-    /**
-     * Get TestDevice list that available for executing tests.
-     *
-     * @return The device list.
-     */
-    public final TestDevice[] getDeviceList() {
-        return mDevices.toArray(new TestDevice[mDevices.size()]);
-    }
-
-    /**
-     * Get the number of all free devices.
-     *
-     * @return the number of all free devices
-     */
-    public int getCountOfFreeDevices() {
-        int count = 0;
-        for (TestDevice td : mDevices) {
-            if (td.getStatus() == TestDevice.STATUS_IDLE) {
-                count++;
-            }
-        }
-        return count;
-    }
-
-    /**
-     * Append the device to the device list.
-     *
-     * @param device The device to be appended to the device list.
-     */
-    private void appendDevice(final IDevice device) {
-        if (-1 == getDeviceIndex(device)) {
-            TestDevice td = new TestDevice(device);
-            mDevices.add(td);
-        }
-    }
-
-    /**
-     * Remove specified TestDevice from managed list.
-     *
-     * @param device The device to be removed from the device list.
-     */
-    private void removeDevice(final IDevice device) {
-        int index = getDeviceIndex(device);
-        if (index == -1) {
-            Log.d("Can't find " + device + " in device list of DeviceManager");
-            return;
-        }
-        mDevices.get(index).disconnected();
-        mDevices.remove(index);
-    }
-
-    /**
-     * Get the index of the specified device in the device array.
-     *
-     * @param device The device to be found.
-     * @return The index of the device if it exists; else -1.
-     */
-    private int getDeviceIndex(final IDevice device) {
-        TestDevice td;
-
-        for (int index = 0; index < mDevices.size(); index++) {
-            td = mDevices.get(index);
-            if (td.getSerialNumber().equals(device.getSerialNumber())) {
-                return index;
-            }
-        }
-        return -1;
-    }
-
-    /**
-     * Search a <code>TestDevice</code> by serial number.
-     *
-     * @param deviceSerialNumber The serial number of the device to be found.
-     * @return The test device, if it exists, otherwise null.
-     */
-    private TestDevice searchTestDevice(final String deviceSerialNumber) {
-        for (TestDevice td : mDevices) {
-            if (td.getSerialNumber().equals(deviceSerialNumber)) {
-                return td;
-            }
-        }
-        return null;
-    }
-
-    /** {@inheritDoc} */
-    public void deviceChanged(IDevice device, int changeMask) {
-        Log.d("device " + device.getSerialNumber() + " changed with changeMask=" + changeMask);
-        Log.d("Device state:" + device.getState());
-    }
-
-    /** {@inheritDoc} */
-    public void deviceConnected(IDevice device) {
-        new DeviceServiceMonitor(device).start();
-    }
-
-    /**
-     * To make sure that connection between {@link AndroidDebugBridge}
-     * and {@link IDevice} is initialized properly. In fact, it just make sure
-     * the sync service isn't null and device's build values are collected
-     * before appending device.
-     */
-    private class DeviceServiceMonitor extends Thread {
-        private IDevice mDevice;
-
-        public DeviceServiceMonitor(IDevice device) {
-            mDevice = device;
-        }
-
-        @Override
-        public void run() {
-            try {
-               while (mDevice.getSyncService() == null || mDevice.getPropertyCount() == 0) {
-                    try {
-                        Thread.sleep(100);
-                    } catch (InterruptedException e) {
-                        Log.d("polling for device sync service interrupted");
-                    }
-                }
-                CUIOutputStream.println("Device(" + mDevice + ") connected");
-                if (!TestSession.isADBServerRestartedMode()) {
-                    CUIOutputStream.printPrompt();
-                }
-                appendDevice(mDevice);
-                // increment the counter semaphore to unblock threads waiting for devices
-                mSemaphore.release();
-            } catch (IOException e) {
-                // FIXME: handle failed connection to device.
-            } catch (TimeoutException e) {
-                // FIXME: handle failed connection to device.
-            } catch (AdbCommandRejectedException e) {
-                // FIXME: handle failed connection to device.
-            }
-        }
-    }
-
-    /** {@inheritDoc} */
-    public void deviceDisconnected(IDevice device) {
-        removeDevice(device);
-    }
-
-    /**
-     * Allocate device by specified Id for testing.
-     * @param deviceId the ID of the test device.
-     * @return a {@link TestDevice} if the specified device is free.
-     */
-    public TestDevice allocateFreeDeviceById(String deviceId) throws DeviceNotAvailableException {
-        for (TestDevice td : mDevices) {
-            if (td.getSerialNumber().equals(deviceId)) {
-                if (td.getStatus() != TestDevice.STATUS_IDLE) {
-                    String msg = "The specifed device(" + deviceId + ") is " +
-                    td.getStatusAsString();
-                    throw new DeviceNotAvailableException(msg);
-                }
-                return td;
-            }
-        }
-        throw new DeviceNotAvailableException("The specified device(" +
-                deviceId + "cannot be found");
-    }
-
-    /**
-     * Reset the online {@link TestDevice} to STATUS_IDLE
-     *
-     * @param device of the specified {@link TestDevice}
-     */
-    public void resetTestDevice(final TestDevice device) {
-        if (device.getStatus() != TestDevice.STATUS_OFFLINE) {
-            device.setStatus(TestDevice.STATUS_IDLE);
-        }
-    }
-
-    /**
-     * Restart ADB server.
-     *
-     * @param ts The test session.
-     */
-    public void restartADBServer(TestSession ts) throws DeviceDisconnectedException {
-        try {
-            Thread.sleep(SHORT_DELAY); // time to collect outstanding logs
-            Log.i("Restarting device ...");
-            rebootDevice(ts);
-            Log.i("Restart complete.");
-        } catch (InterruptedException e) {
-            e.printStackTrace();
-        }
-    }
-
-    /**
-     * Reboot the device.
-     *
-     * @param ts The test session.
-     */
-    private void rebootDevice(TestSession ts) throws InterruptedException,
-                DeviceDisconnectedException {
-
-        String deviceSerialNumber = ts.getDeviceId();
-        if (!deviceSerialNumber.toLowerCase().startsWith("emulator")) {
-            // try to reboot the device using the command line adb
-            // TODO: do we need logic to retry this
-            executeCommand("adb -s " + deviceSerialNumber + " reboot");
-            // wait to make sure the reboot gets through before we tear down the connection
-
-            // TODO: this is flaky, no guarantee device has actually rebooted, host should wait till
-            // device goes offline
-            Thread.sleep(REBOOT_DELAY);
-
-            int attempts = 0;
-            boolean deviceConnected = false;
-            while (!deviceConnected && (attempts < MAX_ADB_RESTART_ATTEMPTS)) {
-                AndroidDebugBridge.disconnectBridge();
-
-                // kill the server while the device is rebooting
-                executeCommand("adb kill-server");
-
-                // Reset the device counter semaphore. We will wait below until at least one device
-                // has come online. This can happen any time during or after the call to
-                // createBridge(). The counter gets increased by the DeviceServiceMonitor when a
-                // device is added.
-                mSemaphore.drainPermits();
-                AndroidDebugBridge.createBridge(getAdbLocation(), true);
-
-                boolean deviceFound = false;
-                while (!deviceFound) {
-                    // wait until at least one device has been added
-                    mSemaphore.tryAcquire(LONG_DELAY, TimeUnit.MILLISECONDS);
-                    TestDevice device = searchTestDevice(deviceSerialNumber);
-                    if (device != null) {
-                        ts.setTestDevice(device);
-                        deviceFound = true;
-                        deviceConnected = device.waitForBootComplete();
-                        // After boot is complete, the ADB connection sometimes drops
-                        // for a short time. Wait for things to stabilize.
-                        try {
-                            Thread.sleep(POST_BOOT_DELAY);
-                        } catch (InterruptedException ignored) {
-                            // ignore
-                        }
-                        // If the connection dropped during the sleep above, the TestDevice
-                        // instance is no longer valid.
-                        TestDevice newDevice = searchTestDevice(deviceSerialNumber);
-                        if (newDevice != null) {
-                            ts.setTestDevice(newDevice);
-                            if (newDevice != device) {
-                                // the connection was dropped or a second reboot occurred
-                                // TODO: replace the hardcoded /sdcard
-                                String cmd = String.format("adb -s %s shell bugreport -o " +
-                                            "/sdcard/bugreports/doubleReboot", deviceSerialNumber);
-                                executeCommand(cmd);
-                            }
-                        } else {
-                            // connection dropped and has not come back up
-                            deviceFound = false; // go wait for next semaphore permit
-                        }
-                    }
-                }
-                attempts += 1;
-            }
-        }
-    }
-
-    /**
-     * Execute the given command and wait for its completion.
-     *
-     * @param command The command to be executed.
-     * @return True if the command was executed successfully, otherwise false.
-     */
-    private boolean executeCommand(String command) {
-        Log.d("executeCommand(): cmd=" + command);
-        try {
-            Process proc = Runtime.getRuntime().exec(command);
-            TimeoutThread tt = new TimeoutThread(proc, SHORT_DELAY);
-            tt.start();
-            proc.waitFor(); // ignore exit value
-            tt.interrupt(); // wake timeout thread
-        } catch (Exception e) {
-            return false;
-        }
-        return true;
-    }
-
-    class TimeoutThread extends Thread {
-        Process mProcess;
-        long mTimeout;
-
-        TimeoutThread(Process process, long timeout) {
-            mProcess = process;
-            mTimeout = timeout;
-        }
-
-        @Override
-        public void run() {
-            try {
-                Thread.sleep(mTimeout);
-            } catch (InterruptedException e) {
-                // process has already completed
-                return;
-            }
-            // destroy process and wake up thread waiting for its completion
-            mProcess.destroy();
-        }
-    }
-}
diff --git a/tools/host/src/com/android/cts/DeviceNotAvailableException.java b/tools/host/src/com/android/cts/DeviceNotAvailableException.java
deleted file mode 100644
index 416950b..0000000
--- a/tools/host/src/com/android/cts/DeviceNotAvailableException.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Copyright (C) 2008 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
- *
- *      httprunPackage://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 com.android.cts;
-
-/**
- * Exception reporting that the device is not available.
- *
- */
-public class DeviceNotAvailableException extends Exception {
-
-    private static final long serialVersionUID = -5747916746880520094L;
-
-    public DeviceNotAvailableException() {
-        super();
-    }
-
-    public DeviceNotAvailableException(final String msg) {
-        super(msg);
-    }
-
-}
diff --git a/tools/host/src/com/android/cts/DeviceObserver.java b/tools/host/src/com/android/cts/DeviceObserver.java
deleted file mode 100644
index 7e6b7a6..0000000
--- a/tools/host/src/com/android/cts/DeviceObserver.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * Copyright (C) 2008 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 com.android.cts;
-
-public interface DeviceObserver {
-
-    /**
-     * Indicate the status of installing/uninstalling action:
-     * <ul>
-     *     <li>FAIL: indicate that the action is failed.
-     *     <li>SUCCESS: indicates that the action is success.
-     * </ul>
-     */
-    public static final int FAIL = -1;
-    public static final int SUCCESS = 1;
-
-    /**
-     * Notify after installing apk complete on the {@link TestDevice}
-     * no matter succeeded or failed.
-     *
-     * @param resultCode the result code of installation.
-     */
-    void notifyInstallingComplete(final int resultCode);
-
-    /**
-     * Notify after uninstalling apk complete on the {@link TestDevice}.
-     *
-     * @param resultCode the result code of uninstallation.
-     */
-    void notifyUninstallingComplete(final int resultCode);
-
-    /**
-     * Notify after installing apk timeout on the {@link TestDevice}
-     *
-     * @param testDevice the {@link TestDevice} whose install action timeout.
-     */
-    void notifyInstallingTimeout(final TestDevice testDevice);
-
-    /**
-     * Notify after uninstalling apk timeout.
-     *
-     * @param testDevice the {@link TestDevice} whose install action timeout
-     */
-    void notifyUninstallingTimeout(final TestDevice testDevice);
-
-    /**
-     * Notify after a {@link TestDevice}, which is used in testing,
-     * is disconnected to the {@link TestHost}.
-     *
-     */
-    void notifyTestingDeviceDisconnected();
-}
diff --git a/tools/host/src/com/android/cts/HostConfig.java b/tools/host/src/com/android/cts/HostConfig.java
deleted file mode 100644
index d42dcf4..0000000
--- a/tools/host/src/com/android/cts/HostConfig.java
+++ /dev/null
@@ -1,1101 +0,0 @@
-/*
- * Copyright (C) 2008 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 com.android.cts;
-
-import java.io.BufferedOutputStream;
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.security.NoSuchAlgorithmException;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Enumeration;
-import java.util.HashMap;
-import java.util.List;
-import java.util.zip.ZipEntry;
-import java.util.zip.ZipFile;
-
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.ParserConfigurationException;
-
-import org.w3c.dom.Document;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-import org.xml.sax.SAXException;
-
-/**
- * Holds CTS host configuration information, such as:
- * <ul>
- *    <li> test case repository
- *    <li> test plan repository
- *    <li> test result repository
- * </ul>
- */
-public class HostConfig extends XMLResourceHandler {
-    public static boolean DEBUG = false;
-
-    public static final String ALL = "all";
-
-    static final String SIGNATURE_TEST_PACKAGE_NAME = "SignatureTest";
-    static final String DEFAULT_HOST_CONFIG_FILE_NAME = "host_config.xml";
-    static final String FILE_SUFFIX_XML = ".xml";
-    static final String FILE_SUFFIX_APK = ".apk";
-    static final String FILE_SUFFIX_ZIP = ".zip";
-    static final String FILE_SUFFIX_JAR = ".jar";
-    static final String[] CTS_RESULT_RESOURCES = {"cts_result.xsl", "cts_result.css",
-                                                  "logo.gif", "newrule-green.png"};
-
-    private String mConfigRoot;
-    private String mLogRoot;
-    private CaseRepository mCaseRepos;
-    private ResultRepository mResultRepos;
-    private PlanRepository mPlanRepos;
-
-    // key: app package name
-    // value: TestPackage
-    private HashMap<String, TestPackage> mTestPackageMap;
-
-    enum Ints {
-        // Number of tests executed between reboots. A value <= 0 disables reboots.
-        maxTestCount (200),
-        // Max size [tests] for a package to be run in batch mode
-        maxTestsInBatchMode (0),
-        // Max time [ms] between test status updates for both individual and batch mode.
-        testStatusTimeoutMs (5 * 60 * 1000),
-        // Max time [ms] from start of package in batch mode and the first test status update.
-        batchStartTimeoutMs (30 * 60 * 1000),
-        // Max time [ms] from start of test in individual mode to the first test status update.
-        individualStartTimeoutMs (5 * 60 * 1000),
-        // Timeout [ms] for the signature check
-        signatureTestTimeoutMs (10 * 60 * 1000),
-        // Timeout [ms] for package installations
-        packageInstallTimeoutMs (2 * 60 * 1000),
-        // Time to wait [ms] after a package installation or removal
-        postInstallWaitMs (30 * 1000);
-
-        private int value;
-
-        Ints(int value) {
-            this.value = value;
-        }
-
-        int value() {
-            return value;
-        }
-
-        void setValue(int value) {
-            this.value = value;
-        }
-    }
-
-    private final static HostConfig sInstance = new HostConfig();
-
-    private HostConfig() {
-        mTestPackageMap = new HashMap<String, TestPackage>();
-    }
-
-    public static HostConfig getInstance() {
-        return sInstance;
-    }
-
-    /**
-     * Returns the max number of tests to run between reboots. A value of 0 or smaller indicates
-     * that reboots should not be used.
-     */
-    public static int getMaxTestCount() {
-        return Ints.maxTestCount.value();
-    }
-
-    /**
-     * Load configuration.
-     *
-     * @param configPath The configuration path.
-     * @return If succeed in loading, return true; else, return false.
-     */
-    public boolean load(String configPath) throws SAXException, IOException,
-            ParserConfigurationException {
-
-        String fileName = null;
-        String[] subDirs = configPath.split("\\" + File.separator);
-        for (String d : subDirs) {
-            if (d.contains(FILE_SUFFIX_XML)) {
-                fileName = d;
-            }
-        }
-
-        String configFile = null;
-        if (fileName == null) {
-            //remove the possible trailing "/" of the path
-            if (File.separatorChar == configPath.charAt(configPath.length() - 1)) {
-                configPath = configPath.substring(0, configPath.length() - 1);
-            }
-            mConfigRoot = configPath;
-            fileName = DEFAULT_HOST_CONFIG_FILE_NAME;
-        } else {
-            mConfigRoot = configPath.substring(0, configPath.length() - fileName.length() - 1);
-        }
-        configFile = mConfigRoot + File.separator + fileName;
-
-        Document doc = DocumentBuilderFactory.newInstance()
-                .newDocumentBuilder().parse(new File(configFile));
-
-        String repositoryRoot = getStringAttributeValue(doc
-                .getElementsByTagName("Repository").item(0), "root");
-        if ((null == repositoryRoot) || (repositoryRoot.length() == 0)) {
-            repositoryRoot = mConfigRoot;
-        }
-
-        String caseCfg = getStringAttributeValue(doc, "TestCase", "path", fileName);
-        String planCfg = getStringAttributeValue(doc, "TestPlan", "path", fileName);
-        String resCfg = getStringAttributeValue(doc, "TestResult", "path", fileName);
-        if ((caseCfg == null) || (planCfg == null) || (resCfg == null)) {
-            return false;
-        }
-
-        getConfigValues(doc);
-
-        String caseRoot = repositoryRoot + File.separator + caseCfg;
-        String planRoot = repositoryRoot + File.separator + planCfg;
-        String resRoot = repositoryRoot + File.separator + resCfg;
-
-        String logCfg = getStringAttributeValueOpt(doc, "TestLog", "path", fileName);
-        if (null == logCfg) {
-            mLogRoot = mConfigRoot;
-        } else {
-            mLogRoot = repositoryRoot + File.separator + logCfg;
-        }
-
-        boolean validCase = true;
-        if (!validateDirectory(caseRoot)) {
-            validCase = new File(caseRoot).mkdirs();
-        }
-        boolean validRes = true;
-        if (!validateDirectory(resRoot)) {
-            validRes = new File(resRoot).mkdirs();
-        }
-        if (validRes) {
-            extractResultResources(resRoot);
-        }
-        boolean validPlan = true;
-        if (!validateDirectory(planRoot)) {
-            validPlan = new File(planRoot).mkdirs();
-        }
-        boolean validLog = true;
-        if (!validateDirectory(mLogRoot)) {
-            validLog = new File(mLogRoot).mkdirs();
-        }
-
-        mCaseRepos = new CaseRepository(caseRoot);
-        mResultRepos = new ResultRepository(resRoot);
-        mPlanRepos = new PlanRepository(planRoot);
-
-        return validCase && validRes && validPlan && validLog;
-    }
-
-    /**
-     * Extract the result resources into the specified directory.
-     *
-     * @param resRoot the directory to extract the resources into.
-     */
-    public void extractResultResources(String resRoot) {
-        for (String res: CTS_RESULT_RESOURCES) {
-            extractResource(res, resRoot);
-        }
-    }
-
-    /**
-     * Get the test packages.
-     *
-     * @return The test packages.
-     */
-    public Collection<TestPackage> getTestPackages() {
-        return mTestPackageMap.values();
-    }
-
-    /**
-     * Get the test package by the name of the test package.
-     *
-     * @param packageName The package name.
-     * @return The test package.
-     */
-    public TestPackage getTestPackage(final String packageName) {
-        return mTestPackageMap.get(packageName);
-    }
-
-    /**
-     * Load repositories.
-     */
-    public void loadRepositories(boolean quick) throws NoSuchAlgorithmException {
-        loadTestPackages();
-        if (!quick) {
-            loadTestResults();
-        }
-    }
-
-    /**
-     * Load test results to create session accordingly.
-     */
-    private void loadTestResults() {
-        getResultRepository().loadTestResults();
-    }
-
-    /**
-     * Load all of the test packages.
-     */
-    public void loadTestPackages() throws NoSuchAlgorithmException {
-        if (mTestPackageMap.size() == 0) {
-            mCaseRepos.loadTestPackages();
-        }
-    }
-
-    /**
-     * Remove all of the test packages.
-     */
-    public void removeTestPacakges() {
-        mTestPackageMap.clear();
-    }
-
-    /**
-     * Get the package binary name.
-     *
-     * @param appPackageName The package name.
-     * @return The binary name of the package.
-     */
-    public String getPackageBinaryName(String appPackageName) {
-
-        for (TestPackage pkg : mTestPackageMap.values()) {
-            if (appPackageName.equals(pkg.getAppPackageName())) {
-                return pkg.getAppBinaryName();
-            }
-        }
-
-        return null;
-    }
-
-    /**
-     * Get the root directory of configuration.
-     *
-     * @return The root directory of configuration.
-     */
-    public String getConfigRoot() {
-        return mConfigRoot;
-    }
-
-    /**
-     * Get the root directory of log files.
-     *
-     * @return the root directory of log files.
-     */
-    public String getLogRoot() {
-        return mLogRoot;
-    }
-
-    /**
-     * Get string attribute value.
-     *
-     * @param doc The document.
-     * @param tagName The tag name.
-     * @param attrName The attribute name.
-     * @param fileName The file name.
-     * @return The attribute value.
-     */
-    private String getStringAttributeValue(final Document doc,
-            final String tagName, final String attrName, final String fileName) {
-
-        String cfgStr = null;
-        try {
-            cfgStr = getStringAttributeValue(doc
-                    .getElementsByTagName(tagName).item(0), attrName);
-            if ((null == cfgStr) || (cfgStr.length() == 0)) {
-                Log.e("Configure error (in " + fileName
-                        + "), pls make sure <" + tagName + ">'s attribute <"
-                        + attrName + ">'s value is correctly set.", null);
-                return null;
-            }
-        } catch (Exception e) {
-            Log.e("Configure error (in " + fileName
-                    + "), pls make sure <" + tagName
-                    + ">'s value is correctly set.", null);
-            return null;
-        }
-
-        return cfgStr;
-    }
-
-    /**
-     * Get string attribute value if it exists.
-     *
-     * @param doc The document.
-     * @param tagName The tag name.
-     * @param attrName The attribute name.
-     * @param fileName The file name.
-     * @return The attribute value.
-     */
-    private String getStringAttributeValueOpt(final Document doc,
-            final String tagName, final String attrName, final String fileName) {
-
-        String cfgStr = null;
-        try {
-            cfgStr = getStringAttributeValue(doc
-                    .getElementsByTagName(tagName).item(0), attrName);
-        } catch (Exception e) {
-            return null;
-        }
-
-        return cfgStr;
-    }
-
-    /**
-     * Load configuration values from config file.
-     *
-     * @param doc The document from which to load the values.
-     */
-    private void getConfigValues(final Document doc) {
-        NodeList intValues = doc.getElementsByTagName("IntValue");
-        for (int i = 0; i < intValues.getLength(); i++) {
-            Node n = intValues.item(i);
-            String name = getStringAttributeValue(n, "name");
-            String value = getStringAttributeValue(n, "value");
-            try {
-                Integer v = Integer.parseInt(value);
-                Ints.valueOf(name).setValue(v);
-            } catch (NumberFormatException e) {
-                Log.e("Configuration error. Illegal value for " + name, e);
-            } catch (IllegalArgumentException e) {
-                Log.e("Unknown configuration value " + name, e);
-            }
-        }
-    }
-
-    /**
-     * Validate the directory.
-     *
-     * @param path The path to be validated.
-     * @return If valid directory, return true; else, return false.
-     */
-    private boolean validateDirectory(final String path) {
-
-        File pathFile = new File(path);
-        if ((null == pathFile) || (pathFile.exists() == false)
-                || (pathFile.isDirectory() == false)) {
-            return false;
-        }
-
-        return true;
-    }
-
-    /**
-     * Extract a resource into the given destination directory. This is used
-     * for resource files such as images and CSS.
-     *
-     * @param name The name of the resource.
-     * @param dest The directory the resource should be extracted to.
-     * @return true, if successful, or the file already existed.
-     */
-    private boolean extractResource(String name, String dest) {
-        File file = new File(dest, name);
-        if (!file.exists()) {
-            // do not extract again if the file is already there
-            InputStream in = getClass().getResourceAsStream(File.separator + name);
-            if (in != null) {
-                try {
-                    FileOutputStream fout = new FileOutputStream(file);
-                    byte[] data = new byte[512];
-                    int len = in.read(data);
-                    while (len > 0) {
-                        fout.write(data, 0, len);
-                        len = in.read(data);
-                    }
-                    fout.flush();
-                    fout.close();
-                    in.close();
-                } catch (FileNotFoundException e) {
-                    return false;
-                } catch (IOException e) {
-                    return false;
-                }
-            }
-        }
-        return true;
-    }
-
-    /**
-     * Get the case repository.
-     *
-     * @return The case repository.
-     */
-    public CaseRepository getCaseRepository() {
-        return mCaseRepos;
-    }
-
-    /**
-     * Get the plan repository.
-     *
-     * @return The plan repository.
-     */
-    public PlanRepository getPlanRepository() {
-        return mPlanRepos;
-    }
-
-    /**
-     * Get the result repository.
-     *
-     * @return The result repository.
-     */
-    public ResultRepository getResultRepository() {
-        return mResultRepos;
-    }
-
-    /**
-     * Storing the root information of some repository.
-     *
-     */
-    class Repository {
-        protected String mRoot;
-
-        Repository(String root) {
-            mRoot = root;
-        }
-
-        /**
-         * Get the root of the repository.
-         *
-         * @return The root of the repository.
-         */
-        public String getRoot() {
-            return mRoot;
-        }
-
-        /**
-         * Check if the specified file is a valid XML file.
-         *
-         * @param f The file to be valid.
-         * @return If valid XML file, return true; else, return false.
-         */
-        public boolean isValidXmlFile(File f) {
-            if (f.getPath().endsWith(FILE_SUFFIX_XML)) {
-                return true;
-            }
-
-            return false;
-        }
-    }
-
-    /**
-     * Storing the information of result repository.
-     */
-    class ResultRepository extends Repository {
-
-        ResultRepository(String root) {
-            super(root);
-        }
-
-        /**
-         * Load test results to create session accordingly.
-         */
-        public void loadTestResults() {
-
-            for (File f : new File(mRoot).listFiles()) {
-                if (f.isDirectory()) {
-                    String pathName = mRoot + File.separator + f.getName()
-                                + File.separator + TestSessionLog.CTS_RESULT_FILE_NAME;
-                    if (HostUtils.isFileExist(pathName)) {
-                        try {
-                            TestSessionLog log =
-                                TestSessionLogBuilder.getInstance().build(pathName);
-                            TestSession ts = TestSessionBuilder.getInstance().build(log);
-                            if (ts != null) {
-                                TestHost.getInstance().addSession(ts);
-                            }
-                        } catch (Exception e) {
-                            Log.e("Error importing existing result from " + pathName, e);
-                        }
-                    }
-                }
-            }
-        }
-    }
-
-    /**
-     * Storing the information of case repository.
-     */
-    class CaseRepository extends Repository {
-        CaseRepository(String root) {
-            super(root);
-        }
-
-        /**
-         * Get package names.
-         *
-         * @return The package names.
-         */
-        public ArrayList<String> getPackageNames() {
-            ArrayList<String> packageNames = new ArrayList<String>();
-            for (TestPackage pkg : mTestPackageMap.values()) {
-                String binaryName = pkg.getAppBinaryName();
-                if (binaryName.equals(SIGNATURE_TEST_PACKAGE_NAME)) {
-                    packageNames.add(0, binaryName);
-                } else {
-                    packageNames.add(pkg.getAppPackageName());
-                }
-            }
-
-            return packageNames;
-        }
-
-        /**
-         * Get package binary names.
-         *
-         * @return The package binary names.
-         */
-        public ArrayList<String> getPackageBinaryNames() {
-            ArrayList<String> pkgBinaryNames = new ArrayList<String>();
-            for (TestPackage pkg : mTestPackageMap.values()) {
-                String pkgBinaryName = pkg.getAppBinaryName();
-                if (pkgBinaryName.equals(SIGNATURE_TEST_PACKAGE_NAME)) {
-                    pkgBinaryNames.add(0, pkgBinaryName);
-                } else {
-                    pkgBinaryNames.add(pkg.getAppBinaryName());
-                }
-            }
-
-            return pkgBinaryNames;
-        }
-
-        /**
-         * Load package XML file names.
-         *
-         * @return The package XML file names.
-         */
-        public List<String> loadPackageXmlFileNames() {
-            ArrayList<String> packageXmlFileNames = new ArrayList<String>();
-
-            for (File f : new File(mRoot).listFiles()) {
-                if (isValidXmlFile(f)) {
-                    String fileName = f.getName();
-                    String name = fileName.substring(0, fileName.lastIndexOf("."));
-                    packageXmlFileNames.add(name);
-                }
-            }
-
-            return packageXmlFileNames;
-        }
-
-        /**
-         * Load test packages.
-         */
-        public void loadTestPackages() throws NoSuchAlgorithmException {
-            List<String> pkgXmlFileNameList = loadPackageXmlFileNames();
-            for (String pkgXmlFileName : pkgXmlFileNameList) {
-                String xmlPath = getRoot() + File.separator
-                        + pkgXmlFileName + FILE_SUFFIX_XML;
-                TestPackage pkg = loadPackage(xmlPath);
-                if (isValidPackage(pkg)) {
-                    mTestPackageMap.put(pkg.getAppPackageName(), pkg);
-                }
-            }
-        }
-
-        /**
-         * Get package binary name.
-         *
-         * @param packagePath The package path.
-         * @return The package binary name.
-         */
-        private String getPackageBinaryName(String packagePath) {
-            return packagePath.substring(packagePath.lastIndexOf(File.separator) + 1,
-                    packagePath.lastIndexOf("."));
-        }
-
-        /**
-         * Check if the specified package is a valid package.
-         *
-         * @param pkg The specified package to be checked.
-         * @return If valid package, return true; else, return false.
-         */
-        private boolean isValidPackage(TestPackage pkg) {
-            if (pkg == null) {
-                return false;
-            }
-
-            String pkgFileName = pkg.getAppBinaryName();
-            String apkFilePath = mRoot + File.separator + pkgFileName + FILE_SUFFIX_APK;
-            String xmlFilePath = mRoot + File.separator + pkgFileName + FILE_SUFFIX_XML;
-            File xmlFile = new File(xmlFilePath);
-            if (pkg.isHostSideOnly()) {
-                if (xmlFile.exists() && xmlFile.isFile()) {
-                    return true;
-                }
-            } else {
-                File apkFile = new File(apkFilePath);
-                if (xmlFile.exists() && xmlFile.isFile()
-                        && apkFile.exists() && apkFile.isFile()) {
-                    return true;
-                }
-            }
-
-            return false;
-        }
-
-        /**
-         * Add package to case repository.
-         *
-         * @param packagePath The package to be added.
-         * @return If valid package and succeed in add it, return true; else, return false.
-         */
-        public boolean addPackage(String packagePath) throws FileNotFoundException,
-                IOException, NoSuchAlgorithmException {
-            ZipFile zipFile = new ZipFile(packagePath);
-            Enumeration<? extends ZipEntry> entries = zipFile.entries();
-
-            ArrayList<String> filePathList = new ArrayList<String>();
-            String xmlFilePath = null;
-            while (entries.hasMoreElements()) {
-                ZipEntry entry = entries.nextElement();
-
-                String name = entry.getName();
-                if (name.endsWith(FILE_SUFFIX_APK)
-                        || name.endsWith(FILE_SUFFIX_XML)
-                        || name.endsWith(FILE_SUFFIX_JAR)) {
-                    int index = name.lastIndexOf(File.separator);
-                    String fileName = name;
-                    if (index != -1) {
-                        fileName = name.substring(index + 1);
-                    }
-                    String filePath = mRoot + File.separator + fileName;
-                    writeToFile(zipFile.getInputStream(entry), filePath);
-                    filePathList.add(filePath);
-                    if (name.endsWith(FILE_SUFFIX_XML)) {
-                        xmlFilePath = filePath;
-                    }
-                }
-            }
-
-            String packageName = getPackageBinaryName(packagePath);
-            PackageZipFileValidator zipValidator = new PackageZipFileValidator();
-            if (zipValidator.validate(filePathList, packageName, xmlFilePath) == false) {
-                for (String filePath : filePathList) {
-                    deleteFile(filePath);
-                }
-                return false;
-            }
-
-            TestPackage pkg = loadPackage(xmlFilePath);
-            if (pkg != null) {
-                mTestPackageMap.put(pkg.getAppPackageName(), pkg);
-            }
-
-            return true;
-        }
-
-        /**
-         * Load the package from the package description XML file.
-         *
-         * @param xmlFileName The package description XML file.
-         * @return The TestPackage.
-         */
-        private TestPackage loadPackage(String xmlFileName) throws NoSuchAlgorithmException {
-            if ((xmlFileName == null) || (xmlFileName.length() == 0)) {
-                return null;
-            }
-
-            File xmlFile = new File(xmlFileName);
-            TestSessionBuilder sessionBuilder;
-            TestPackage pkg = null;
-            try {
-                sessionBuilder = TestSessionBuilder.getInstance();
-                pkg = sessionBuilder.loadPackage(xmlFile, null);
-            } catch (ParserConfigurationException e) {
-            } catch (SAXException e) {
-            } catch (IOException e) {
-            }
-            return pkg;
-        }
-
-        /**
-         * check if the packagePath is valid against the case repository
-         *
-         * @param packagePath the path to be checked
-         * @return if the path isn't suffixed with .zip, return false;
-         *         if the package name exists in case repository, return false;
-         *         for other conditions, return true;
-         */
-        public boolean isValidPackageName(String packagePath) {
-            if (!packagePath.endsWith(FILE_SUFFIX_ZIP)) {
-                Log.e("Package error: package name " + packagePath + " is not a zip file.", null);
-                return false;
-            }
-
-            String fileName = packagePath.substring(packagePath.lastIndexOf(File.separator) + 1,
-                       packagePath.length() - FILE_SUFFIX_ZIP.length());
-
-            String path = mRoot + File.separator + fileName;
-            if (HostUtils.isFileExist(path + FILE_SUFFIX_APK)
-                    || HostUtils.isFileExist(path + FILE_SUFFIX_XML)) {
-                Log.e("Package error: package name " + fileName + " exists already.", null);
-                return false;
-            }
-
-            return true;
-        }
-
-        /**
-         * Validate zipped package file against package logic
-         */
-        class PackageZipFileValidator {
-            /**
-             * validate the package content to see if it contains enough data
-             **
-             * @param filePathList The file path list contained in the package zip file.
-             * @param packageName The package name.
-             * @param xmlFilePath The description XML file path.
-             * @return If valid, return true; else, return false.
-             */
-            public boolean validate(ArrayList<String> filePathList, String packageName,
-                    String xmlFilePath) throws NoSuchAlgorithmException {
-                if (xmlFilePath == null) {
-                    Log.e("Package error: package doesn't contain XML file: "
-                            + packageName + FILE_SUFFIX_XML, null);
-                    return false;
-                } else {
-                    TestPackage pkg = loadPackage(xmlFilePath);
-                    if (pkg == null) {
-                        Log.e("Package error: the description XML file contained in : "
-                                + packageName + FILE_SUFFIX_APK + " is invalid.", null);
-                        return false;
-                    } else {
-                        if (!validateTargetApk(filePathList, pkg.getTargetBinaryName())) {
-                            return false;
-                        }
-
-                        if (!validateHostControllerJar(filePathList, pkg.getJarPath())) {
-                            return false;
-                        }
-
-                        String apkFilePath = mRoot + File.separator
-                                + packageName + FILE_SUFFIX_APK;
-                        if (!filePathList.contains(apkFilePath)) {
-                            Log.e("Package error: package doesn't contain APK file: "
-                                            + packageName + FILE_SUFFIX_APK, null);
-                            return false;
-                        }
-                    }
-                }
-
-                return true;
-            }
-
-            /**
-             * Validate host controller jar file described in the package description XML file.
-             *
-             * @param filePathList  The files contained in the zipped package file.
-             * @param hostControllerJarPath The host controller jar file path.
-             * @return If the host controller jar file contained in the zipped package,
-             *         return true; else, return false.
-             */
-            private boolean validateHostControllerJar(ArrayList<String> filePathList,
-                    String hostControllerJarPath) {
-                if ((hostControllerJarPath != null) && (hostControllerJarPath.length() != 0)) {
-                    String targetFilePath =
-                        mRoot + File.separator + hostControllerJarPath + FILE_SUFFIX_JAR;
-                    if (filePathList.contains(targetFilePath)) {
-                        return true;
-                    }
-                } else {
-                    return true;
-                }
-
-                //String jarFileName = getPackageName(hostControllerJarPath);
-                Log.e("Package error: host controler jar file "
-                        + hostControllerJarPath + FILE_SUFFIX_JAR
-                        + " is not contained in the package zip file.", null);
-                return false;
-            }
-
-            /**
-             * Validate target APK file described in the package description XML file.
-             *
-             * @param filePathList The files contained in the zipped package file.
-             * @param targetName The target APK name.
-             * @return If the target APK file contained in the zipped package file, return true;
-             *         else, return false.
-             */
-            private boolean validateTargetApk(ArrayList<String> filePathList, String targetName) {
-                if ((targetName != null) && (targetName.length() != 0)) {
-                    String targetFileName = mRoot + File.separator + targetName + FILE_SUFFIX_APK;
-                    if (filePathList.contains(targetFileName)) {
-                        return true;
-                    }
-                } else {
-                    return true;
-                }
-
-                Log.e("Package error: target file " + targetName + FILE_SUFFIX_APK
-                        + " is not contained in the package zip file.", null);
-                return false;
-            }
-        }
-
-        /**
-         * Write the input stream to file.
-         *
-         * @param in The input stream.
-         * @param path The file to write to.
-         */
-        private void writeToFile(InputStream in, String path) throws IOException {
-            OutputStream out = new BufferedOutputStream(new FileOutputStream(path));
-            byte[] buffer = new byte[1024];
-            int len;
-
-            while ((len = in.read(buffer)) >= 0) {
-                out.write(buffer, 0, len);
-            }
-
-            in.close();
-            out.close();
-        }
-
-        /**
-         * Remove packages from case repository.
-         *
-         * @param packageName Package to be removed.
-         */
-        public void removePackages(String packageName) {
-            if ((packageName == null) || (packageName.length() == 0)) {
-                return;
-            }
-
-            if (packageName.equals(ALL)) {
-                ArrayList<String> packageNames = getCaseRepository().getPackageNames();
-                for (String pkgName : packageNames) {
-                    removePackage(pkgName);
-                }
-            } else {
-                if (!getPackageNames().contains(packageName)) {
-                    Log.e("Package " + packageName + " doesn't exist in repository!", null);
-                    return;
-                }
-                removePackage(packageName);
-            }
-        }
-
-        /**
-         * Remove the specified package.
-         *
-         * @param packageName The package name.
-         */
-        private void removePackage(String packageName) {
-            TestPackage pkg = getTestPackage(packageName);
-            if (pkg != null) {
-                ArrayList<String> targetBinaryNames = getTargetBinaryNames();
-                String targetBinaryName = pkg.getTargetBinaryName();
-                if ((targetBinaryName != null) && (targetBinaryName.length() != 0)
-                        && (getReferenceCount(targetBinaryNames, targetBinaryName) == 1)) {
-                    String targetBinaryFileName = mRoot + File.separator + targetBinaryName
-                            + FILE_SUFFIX_APK;
-                    deleteFile(targetBinaryFileName);
-                }
-
-                ArrayList<String> hostControllers = getHostControllers();
-                String hostControllerPath = pkg.getJarPath();
-                if ((hostControllerPath != null) && (hostControllerPath.length() != 0)
-                        && (getReferenceCount(hostControllers, hostControllerPath) == 1)) {
-                    String jarFilePath = mRoot + File.separator
-                            + hostControllerPath + FILE_SUFFIX_JAR;
-                    deleteFile(jarFilePath);
-                }
-            }
-
-            String packageBinaryName = pkg.getAppBinaryName();
-            mTestPackageMap.remove(pkg.getAppPackageName());
-
-            String apkPath = mRoot + File.separator + packageBinaryName + FILE_SUFFIX_APK;
-            String xmlPath = mRoot + File.separator + packageBinaryName + FILE_SUFFIX_XML;
-            deleteFile(apkPath);
-            deleteFile(xmlPath);
-        }
-
-        /**
-         * Get the reference count of the specific value against the value list.
-         *
-         * @param list The value list to be checked against.
-         * @param value The value to be checked.
-         * @return The reference count.
-         */
-        private int getReferenceCount(ArrayList<String> list, String value) {
-            if ((list == null) || (list.size() == 0) || (value == null)) {
-                return 0;
-            }
-
-            int count = 0;
-            for (String str : list) {
-                if (value.equals(str)) {
-                    count ++;
-                }
-            }
-
-            return count;
-        }
-
-        /**
-         * Get the target binary names contained with the test package description XML files.
-         *
-         * @return The target binary names.
-         */
-        private ArrayList<String> getTargetBinaryNames() {
-            ArrayList<String> targetBinaryNames = new ArrayList<String>();
-            for (TestPackage pkg : mTestPackageMap.values()) {
-                targetBinaryNames.add(pkg.getTargetBinaryName());
-            }
-            return targetBinaryNames;
-        }
-
-        /**
-         * Get the host controllers contained with the test package description XML files.
-         *
-         * @return The host controllers.
-         */
-        private ArrayList<String> getHostControllers() {
-            ArrayList<String> hostControllers = new ArrayList<String>();
-            for (TestPackage pkg : mTestPackageMap.values()) {
-                hostControllers.add(pkg.getJarPath());
-            }
-            return hostControllers;
-        }
-
-        /**
-         * Delete the specific file.
-         *
-         * @param filepath The file to be deleted.
-         */
-        private void deleteFile(String filepath) {
-            File file = new File(filepath);
-            if (file.exists() && file.isFile()) {
-                file.delete();
-            }
-        }
-
-        /**
-         * Get package's APK file path via the package name.
-         *
-         * @param packageName The package name.
-         * @return The package's APK file path.
-         */
-        public String getApkPath(String packageName) {
-            return mRoot + File.separator + packageName + FILE_SUFFIX_APK;
-        }
-
-        /**
-         * Get package's XML file path via the package name.
-         * @param packageName The package name.
-         * @return The package's XML file path.
-         */
-        public String getXmlPath(String packageName) {
-            return mRoot + File.separator + packageName + FILE_SUFFIX_XML;
-        }
-
-        /**
-         * List available package and suite.
-         *
-         * @param expectPackage expected package name
-         * @return list which contains available packages, suites and cases.
-         */
-        @SuppressWarnings("unchecked")
-        public List<ArrayList<String>> listAvailablePackage(String expectPackage) {
-            ArrayList<String> packageList = new ArrayList<String>();
-            ArrayList<String> suiteList = new ArrayList<String>();
-            ArrayList<String> caseList = new ArrayList<String>();
-            ArrayList<String> testList = new ArrayList<String>();
-
-            for (TestPackage testPackage : mTestPackageMap.values()) {
-                String appPackageName = testPackage.getAppPackageName();
-                if (expectPackage.equals(appPackageName)) {
-                    testPackage.getTestSuiteNames(appPackageName, suiteList, caseList);
-                } else if (appPackageName.startsWith(expectPackage)) {
-                    packageList.add(appPackageName);
-                } else {
-                    if (expectPackage.indexOf(Test.METHOD_SEPARATOR) == -1) {
-                        testPackage.getTestCaseNames(expectPackage, caseList, testList);
-                    } else {
-                        testPackage.getTestNames(expectPackage, testList);
-                    }
-                }
-            }
-
-            return Arrays.asList(packageList, suiteList, caseList, testList);
-        }
-    }
-
-    /**
-     * Storing information of test plans.
-     *
-     */
-    class PlanRepository extends Repository {
-
-        PlanRepository(String root) {
-            super(root);
-        }
-
-        /**
-         * Get the path of the specified plan.
-         *
-         * @param name The plan name.
-         * @return The plan path.
-         */
-        public String getPlanPath(String name) {
-            if (mRoot == null) {
-                Log.e("Repository uninitialized!", null);
-                return null;
-            }
-
-            return mRoot + File.separator + name + FILE_SUFFIX_XML;
-        }
-
-        /**
-         * Get all plan names in the plan repository.
-         * @return Plan names.
-         */
-        public ArrayList<String> getAllPlanNames() {
-            ArrayList<String> plans = new ArrayList<String>();
-
-            if (mRoot == null) {
-                Log.e("Not specify repository, please check your cts config",
-                        null);
-                return plans;
-            }
-
-            File planRepository = new File(mRoot);
-            if (!planRepository.exists()) {
-                Log.e("Plan Repository doesn't exist: " + mRoot, null);
-                return null;
-            }
-
-            for (File f : planRepository.listFiles()) {
-                String name = f.getName();
-
-                if (name.endsWith(FILE_SUFFIX_XML)) {
-                    plans.add(name.substring(0, name.length() - FILE_SUFFIX_XML.length()));
-                }
-            }
-
-            return plans;
-        }
-    }
-}
diff --git a/tools/host/src/com/android/cts/HostLock.java b/tools/host/src/com/android/cts/HostLock.java
deleted file mode 100644
index 16750bf..0000000
--- a/tools/host/src/com/android/cts/HostLock.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
- * Copyright (C) 2008 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 com.android.cts;
-
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.nio.channels.FileLock;
-
-/**
- * Host lock to make sure just one CTS host is running.
- */
-public class HostLock {
-    private static FileOutputStream mFileOs;
-    private static FileLock mLock;
-    private static File mFile;
-
-    /**
-     * Lock the host.
-     *
-     * @return If succeed in locking the host, return true; else , return false.
-     */
-    public static boolean lock() {
-        try {
-            String tmpdir = System.getProperty("java.io.tmpdir");
-            mFile = new File(tmpdir + File.separator + "ctsLockFile.txt");
-            mFileOs = new FileOutputStream(mFile);
-            mLock = mFileOs.getChannel().tryLock();
-            if (mLock != null) {
-                return true;
-            } else {
-                return false;
-            }
-        } catch (FileNotFoundException e1) {
-            return false;
-        }catch (IOException e1) {
-            return false;
-        }
-    }
-
-    /**
-     * Release the host lock.
-     */
-    public static void release() {
-        try {
-            if (mLock != null) {
-                mLock.release();
-            }
-
-            if (mFileOs != null) {
-                mFileOs.close();
-            }
-            // On systems with permissions, it's possible for this lock file
-            // (depending on the default permissions set) to lock other users 
-            // out from using CTS on the same host.  So remove the file and 
-            // play nice with others.
-            mFile.delete();
-        } catch (IOException e) {
-        }
-    }
-}
diff --git a/tools/host/src/com/android/cts/HostSideOnlyPackage.java b/tools/host/src/com/android/cts/HostSideOnlyPackage.java
deleted file mode 100644
index 7ed31d5..0000000
--- a/tools/host/src/com/android/cts/HostSideOnlyPackage.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
- * Copyright (C) 2009 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 com.android.cts;
-
-import java.io.IOException;
-
-/**
- * The host side only package.
- */
-public class HostSideOnlyPackage extends TestPackage {
-
-    /**
-     * Construct a host side only package with given necessary information.
-     *
-     * @param testPkgBinaryName The binary name of the TestPackage.
-     * @param version The version of the CTS Host allowed.
-     * @param androidVersion The version of the Android platform allowed.
-     * @param jarPath The host controller's jar path and file.
-     * @param appPackageName The Java package name of the test package.
-     */
-    public HostSideOnlyPackage(final String testPkgBinaryName, final String version,
-            final String androidVersion, final String jarPath,
-            final String appPackageName) {
-        super(null, testPkgBinaryName, null, null, version,
-                androidVersion, jarPath, null, appPackageName, null);
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    public boolean isHostSideOnly() {
-        return true;
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    protected void runImpl(final String javaPkgName)
-            throws IOException, DeviceDisconnectedException, ADBServerNeedRestartException {
-        try {
-            if (!mTestStop) {
-                Log.d("run in individual mode...");
-                runInIndividualMode(javaPkgName);
-            }
-        } catch (DeviceDisconnectedException e) {
-            cleanUp();
-            throw e;
-        }
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    protected void runTestImpl(final Test test) throws DeviceDisconnectedException,
-                ADBServerNeedRestartException {
-        try {
-            if (!mTestStop) {
-                mCurrentTestSuite = test.getTestSuite();
-                mCurrentTestSuite.run(mDevice, test);
-            }
-        } catch (DeviceDisconnectedException e) {
-            cleanUp();
-            throw e;
-        }
-    }
-}
diff --git a/tools/host/src/com/android/cts/HostSideOnlyTest.java b/tools/host/src/com/android/cts/HostSideOnlyTest.java
deleted file mode 100644
index 187fc53..0000000
--- a/tools/host/src/com/android/cts/HostSideOnlyTest.java
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
- * Copyright (C) 2009 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 com.android.cts;
-
-import java.io.IOException;
-
-import junit.framework.TestResult;
-
-/**
- * Host side only test.
- */
-public class HostSideOnlyTest extends Test {
-    private HostSideTestRunner mHostSideTestRunner;
-
-    public HostSideOnlyTest(final TestCase parentCase, final String name,
-            final String type, final String knownFailure, final int resCode) {
-
-        super(parentCase, name, type, knownFailure, resCode);
-        mHostSideTestRunner = null;
-    }
-
-    /**
-     * The Thread to be run host side unit test.
-     */
-    class HostSideTestRunner extends Thread {
-
-        private HostSideOnlyTest mTest;
-
-        public HostSideTestRunner(final HostSideOnlyTest test) {
-            mTest = test;
-        }
-
-        @Override
-        public void run() {
-            HostUnitTestRunner runner = new HostUnitTestRunner(mTest);
-            TestController controller = mTest.getTestController();
-            TestResult testResult = null;
-            try {
-                testResult = runner.runTest(controller.getJarPath(),
-                        controller.getPackageName(), controller.getClassName(),
-                        controller.getMethodName());
-            } catch (IOException e) {
-                Log.e("IOException while running test from " +
-                      controller.getJarPath(), e);
-            } catch (ClassNotFoundException e) {
-                Log.e("The host controller JAR (" + controller.getJarPath() +
-                        ") file doesn't contain class: "
-                        + controller.getPackageName() + "."
-                        + controller.getClassName(), e);
-            }
-
-            synchronized (mTimeOutTimer) {
-                mResult.setResult(testResult);
-
-                if (!mTimeOutTimer.isTimeOut()) {
-                    Log.d("HostSideTestRunnerThread() detects that it needs to "
-                            + "cancel mTimeOutTimer");
-                    mTimeOutTimer.sendNotify();
-                }
-            }
-        }
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    protected void runImpl() {
-        mHostSideTestRunner = new HostSideTestRunner(this);
-        mHostSideTestRunner.start();
-    }
-}
diff --git a/tools/host/src/com/android/cts/HostTimer.java b/tools/host/src/com/android/cts/HostTimer.java
deleted file mode 100644
index f2181a9..0000000
--- a/tools/host/src/com/android/cts/HostTimer.java
+++ /dev/null
@@ -1,161 +0,0 @@
-/*
- * Copyright (C) 2008 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 com.android.cts;
-
-import java.util.Timer;
-import java.util.TimerTask;
-
-/**
- * Host timer.
- * Generally, there are two use cases of this general host timer:
- * <ul>
- *    <li> Use it as general timer to guard host from running for
- *         too long under some situations.
- *    <li> Use it as special timer where host needs to run very
- *         long to communicate with device to fetch result section
- *         by section which requires restarting the timer.
- * </ul>
- */
-public class HostTimer {
-    private final static int INIT = 0;
-    private final static int RUNNING = 1;
-    private final static int CANCELLED = 2;
-    private final static int TIMEOUT = 3;
-
-    private boolean mIsNotified;
-    private int mStatus;
-    private int mDelay;
-    private TimerTask mTimerTask;
-    private Timer mTimer;
-
-    public HostTimer(TimerTask task, int delay) {
-        mDelay = delay;
-        mTimerTask = task;
-        mStatus = INIT;
-        mIsNotified = false;
-        mTimer = null;
-    }
-
-    /**
-     * Mark notified.
-     */
-    public void setNotified() {
-        mIsNotified = true;
-    }
-
-    /**
-     * Get the notification status.
-     *
-     * @return The notification status.
-     */
-    public boolean isNotified() {
-        return mIsNotified;
-    }
-
-    /**
-     * Clear the status of notification.
-     */
-    public void resetNotified() {
-        mIsNotified = false;
-    }
-
-    /**
-     * Wait on.
-     */
-    public void waitOn() throws InterruptedException {
-        Log.d("HostTimer.waitOn(): mIsNotified=" + mIsNotified + ", this=" + this);
-        if (!mIsNotified) {
-            wait();
-        }
-        mIsNotified = false;
-    }
-
-    /**
-     * Set the time to delay.
-     *
-     * @param delay The time to delay.
-     */
-    public void setDelay(int delay) {
-        mDelay = delay;
-    }
-
-    /**
-     * Set the timer task.
-     *
-     * @param task The timer task.
-     */
-    public void setTimerTask(TimerTask task) {
-        mTimerTask = task;
-    }
-
-    /**
-     * Check if the watch dog timer timed out.
-     *
-     * @return If timeout, return true; else return false.
-     */
-    public boolean isTimeOut() {
-        return (mStatus == TIMEOUT);
-    }
-
-    /**
-     * Start the watch dog timer.
-     */
-    public void start() {
-        mTimer = new Timer();
-        mTimer.schedule(mTimerTask, mDelay);
-        mStatus = RUNNING;
-    }
-
-    /**
-     * Restart the watch dog timer.
-     */
-    public void restart(TimerTask task, int delay) {
-        mTimer.cancel();
-        mTimerTask = task;
-        mDelay = delay;
-        start();
-    }
-
-    /**
-     * Send notify to thread waiting on this object.
-     */
-    public void sendNotify() {
-        Log.d("HostTimer.sendNotify(): mIsNotified=" + mIsNotified + ", this=" + this);
-        mIsNotified = true;
-        notify();
-    }
-
-    /**
-     * Cancel the timer. To keep the status info, call this
-     * cancel in stead of the one inherited from parent.
-     *
-     * @param timeout If true, the cancellation is caused by timer timing out;
-     *                If false, the cancellation is no caused by timer timing out.
-     */
-    public void cancel(boolean timeout) {
-        if (mTimer != null) {
-            mTimer.cancel();
-        }
-        if (mStatus == RUNNING) {
-            if (timeout) {
-                mStatus = TIMEOUT;
-            } else {
-                mStatus = CANCELLED;
-            }
-        }
-    }
-}
diff --git a/tools/host/src/com/android/cts/HostUnitTestRunner.java b/tools/host/src/com/android/cts/HostUnitTestRunner.java
deleted file mode 100644
index 747e500..0000000
--- a/tools/host/src/com/android/cts/HostUnitTestRunner.java
+++ /dev/null
@@ -1,171 +0,0 @@
-/*
- * Copyright (C) 2008 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 com.android.cts;
-
-import com.android.hosttest.DeviceTest;
-
-import java.io.File;
-import java.io.IOException;
-import java.net.URL;
-import java.net.URLClassLoader;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestResult;
-import junit.runner.BaseTestRunner;
-
-/**
- * Unit test runner running host side unit test.
- *
- */
-public class HostUnitTestRunner extends BaseTestRunner{
-    private static String JAR_SUFFIX = ".jar";
-
-    private TestCase mTestCase;
-    private HostSideOnlyTest mTest;
-
-    public HostUnitTestRunner(HostSideOnlyTest test) {
-        mTestCase = null;
-        mTest = test;
-    }
-
-    /**
-     * Run the specified test.
-     *
-     * @param jarPath The jar file.
-     * @param testPkgName The package name.
-     * @param testClassName The class name.
-     * @param testMethodName The method name.
-     * @return The test result.
-     */
-    public TestResult runTest(final String jarPath, final String testPkgName,
-            String testClassName, String testMethodName)
-            throws ClassNotFoundException, IOException {
-
-        TestResult result = new TestResult();
-        loadTestCase(jarPath, testPkgName, testClassName, testMethodName);
-
-        if (mTestCase != null) {
-            if (mTestCase instanceof DeviceTest) {
-                DeviceTest deviceTest = (DeviceTest) mTestCase;
-                deviceTest.setDevice(mTest.mDevice.getDevice());
-                deviceTest.setTestAppPath(HostConfig.getInstance().getCaseRepository().getRoot());
-            }
-            mTestCase.run(result);
-        }
-        return result;
-    }
-
-    /**
-     * Load test case via test class name and test method.
-     *
-     * @param testClassName The class name.
-     * @param testMethodName The method name.
-     */
-    @SuppressWarnings("unchecked")
-    public TestCase loadTestCase(final String jarPath,
-            final String testPkgName, final String testClassName,
-            final String testMethodName) throws ClassNotFoundException, IOException {
-
-        Log.d("jarPath=" + jarPath + ",testPkgName=" + testPkgName
-                + ",testClassName=" + testClassName);
-
-        Class testClass = null;
-        if ((jarPath != null) && (jarPath.endsWith(JAR_SUFFIX))) {
-            testClass = loadClass(jarPath, testPkgName, testClassName);
-        } else {
-            testClass = Class.forName(testPkgName + "." + testClassName);
-        }
-
-        if ((testMethodName != null) && TestCase.class.isAssignableFrom(testClass)) {
-            mTestCase = buildTestMethod(testClass, testMethodName);
-        }
-
-        return mTestCase;
-    }
-
-    /**
-     * Load class from jar file.
-     *
-     * @param jarPath The jar file.
-     * @param testPkgName The package name.
-     * @param testClassName The class name.
-     * @return The class.
-     */
-    @SuppressWarnings("unchecked")
-    public Class loadClass(final String jarPath,
-            final String testPkgName, final String testClassName)
-            throws ClassNotFoundException, IOException {
-
-        URL urls[] = { new File(jarPath).getCanonicalFile().toURI().toURL() };
-        URLClassLoader cl = new URLClassLoader(urls);
-        Class testClass = cl.loadClass(testPkgName + "." + testClassName);
-        Log.d("succeed in load jarred class: " + jarPath + "." + testPkgName
-                + "." + testClassName);
-
-        return testClass;
-    }
-
-    /**
-     * Build test method.
-     *
-     * @param testClass The test class.
-     * @param testMethodName The method name.
-     * @return The test case.
-     */
-    @SuppressWarnings("unchecked")
-    private TestCase buildTestMethod(Class testClass,
-            String testMethodName) {
-        try {
-            TestCase testCase = (TestCase) testClass.newInstance();
-            testCase.setName(testMethodName);
-            return testCase;
-        } catch (IllegalAccessException e) {
-            runFailed("Could not access test class. Class: "
-                    + testClass.getName());
-        } catch (InstantiationException e) {
-            runFailed("Could not instantiate test class. Class: "
-                    + testClass.getName());
-        }
-
-        return null;
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    public void testStarted(String testName) {
-
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    public void testEnded(String testName) {
-
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    public void testFailed(int status, Test test, Throwable t) {
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    protected void runFailed(String message) {
-        throw new RuntimeException(message);
-    }
-
-}
diff --git a/tools/host/src/com/android/cts/HostUtils.java b/tools/host/src/com/android/cts/HostUtils.java
deleted file mode 100644
index 37222cc..0000000
--- a/tools/host/src/com/android/cts/HostUtils.java
+++ /dev/null
@@ -1,321 +0,0 @@
-/*
- * Copyright (C) 2008 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 com.android.cts;
-
-import com.android.ddmlib.RawImage;
-
-import java.awt.image.BufferedImage;
-import java.awt.image.DataBuffer;
-import java.awt.image.DataBufferUShort;
-import java.awt.image.Raster;
-import java.awt.image.SampleModel;
-import java.awt.image.SinglePixelPackedSampleModel;
-import java.io.BufferedInputStream;
-import java.io.BufferedOutputStream;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.FilenameFilter;
-import java.io.IOException;
-import java.io.InputStream;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.Formatter;
-import java.util.Locale;
-import java.util.zip.ZipEntry;
-import java.util.zip.ZipOutputStream;
-
-/**
- * Utilities for CTS host.
- *
- */
-public class HostUtils {
-
-    private static SimpleDateFormat dateFormat = new SimpleDateFormat("EEE MMM dd HH:mm:ss z yyyy",
-            Locale.ENGLISH);
-
-    /**
-     * Check if the given file exists
-     *
-     * @param name the file name to be checked
-     * @return if the file exists, return true;
-     *         else, return false
-     */
-    public static boolean isFileExist(final String name) {
-        return new File(name).exists();
-    }
-
-    /**
-     * Convert a 16bpp RawImage into a BufferedImage.
-     *
-     * @param rawImage the image to convert.
-     * @return the BufferedImage.
-     */
-    public static BufferedImage convertRawImageToBufferedImage(RawImage rawImage) {
-        assert rawImage.bpp == 16;
-
-        BufferedImage im = new BufferedImage(rawImage.width,
-                rawImage.height, BufferedImage.TYPE_USHORT_565_RGB);
-        SampleModel sampleModel = new SinglePixelPackedSampleModel(DataBuffer.TYPE_USHORT,
-                rawImage.width,
-                rawImage.height,
-                // RGB565
-                new int[] { 0xf800, 0x07e0, 0x001f });
-
-        // It would be more efficient to just subclass DataBuffer and provide a
-        // TYPE_USHORT interface to the byte array.  But Raster.createRaster at
-        // some point uses instanceof(DataBufferUShort) to verify that the DataBuffer
-        // is of the right type (instead of just checking DataBuffer.getDataType).
-        // And since DataBufferUShort is final, it can't be subclassed to get around
-        // the check either.  So copy the data into a short[] instead to work around the problem.
-        short shortData[] = new short[rawImage.size / 2];
-        for (int x = 0; x < shortData.length; x++) {
-            int rawImageOffset = x * 2;
-            int a = 0xff & rawImage.data[rawImageOffset];
-            int b = 0xff & rawImage.data[rawImageOffset + 1];
-            shortData[x] = (short)((b << 8) | a);
-        }
-        DataBuffer db = new DataBufferUShort(shortData, shortData.length);
-        Raster raster = Raster.createRaster(sampleModel,
-                db, null);
-        im.setData(raster);
-        return im;
-    }
-
-    /**
-     * Interface used with visitAllFilesUnder
-     */
-    public interface FileVisitor {
-        /**
-         * Gets called on every file visited.
-         * @param f the File for the file being visited.
-         */
-        void visitFile(File f);
-    }
-
-    /**
-     * Recursively visit all files under a given path.
-     *
-     * @param root the path to start at.
-     * @param filter the file filter to match.  null means to visit all files.
-     * @param visitor the visitor to visit with.
-     */
-    public static void visitAllFilesUnder(File root, FilenameFilter filter, FileVisitor visitor) {
-        File[] files = root.listFiles(filter);
-        // A null file may indicate not having enough permissions to view that directory
-        if (files != null) {
-            for (File f : files) {
-                visitor.visitFile(f);
-
-                if (f.isDirectory()) {
-                    visitAllFilesUnder(f, filter, visitor);
-                }
-            }
-        }
-    }
-
-    /**
-     * Recursively visit all files under a given path.
-     *
-     * @param path the path to start at.
-     * @param filter the file filter to match.  null means to visit all files.
-     * @param visitor the visitor to visit with.
-     */
-    public static void visitAllFilesUnder(String path, FilenameFilter filter, FileVisitor visitor) {
-        visitAllFilesUnder(new File(path), filter, visitor);
-    }
-
-    // Private class to help zipUpDirectory
-    private static class ZipFileVisitor implements FileVisitor {
-        private final ZipOutputStream zipOutputStream;
-        private boolean ok = true;
-        private IOException caughtException;
-        private final ZipFilenameTransformer transformer;
-
-        public ZipFileVisitor(ZipOutputStream zipOutputStream,
-                ZipFilenameTransformer transformer) {
-            this.zipOutputStream = zipOutputStream;
-            this.transformer = transformer;
-        }
-
-        public void visitFile(File f) {
-            String path = f.getPath();
-            if (transformer != null) {
-                path = transformer.transform(path);
-            }
-            ZipEntry ze = new ZipEntry(path);
-            try {
-                zipOutputStream.putNextEntry(ze);
-                InputStream is = null;
-                try {
-                    is = new BufferedInputStream(new FileInputStream(f));
-                    byte[] buffer = new byte[4096];
-                    int bytesRead = is.read(buffer);
-                    while (bytesRead > 0) {
-                        zipOutputStream.write(buffer, 0, bytesRead);
-                        bytesRead = is.read(buffer);
-                    }
-                    zipOutputStream.closeEntry();
-                } finally {
-                    if (is != null) {
-                        is.close();
-                    }
-                }
-            } catch (IOException e) {
-                ok = false;
-                caughtException = e;
-            }
-        }
-
-        /**
-         * Indicates that the visitor ran without errors
-         * @return true if everything ran OK.
-         */
-        boolean isOk() {
-            return ok;
-        }
-
-        /**
-         * If an IOException was thrown while zipping, it gets kept here.
-         *
-         * @return the IOException that was caught, or null if none was.
-         */
-        IOException getCaughtException() {
-            return caughtException;
-        }
-
-    }
-
-    /**
-     * Indicates some issue with zipping up the file.
-     */
-    static class ZipFileException extends Exception {
-        ZipFileException(IOException ioException) {
-            super("Caught wrapped exception", ioException);
-        }
-    }
-
-    /**
-     * Interface provided to rename files before they get zipped.
-     */
-    public interface ZipFilenameTransformer {
-        /**
-         * Transform a local filesystem filename into a zipfile filename.
-         *
-         * @param filename the input filename
-         * @return the filename to be saved to the zipfile as.
-         */
-        String transform(String filename);
-    }
-
-    /**
-     * Recursively zip up a directory into a zip file.
-     *
-     * @param sourceDir the directory to zip up
-     * @param outputFilePath the zipfile to create.
-     * @param transformer filepath transformer.  can be null.
-     * @throws IOException if there were issues writing the zipfile.
-     */
-    public static void zipUpDirectory(String sourceDir,
-            String outputFilePath,
-            ZipFilenameTransformer transformer)
-    throws IOException, ZipFileException {
-        // I <3 abstractions
-        FileOutputStream fileOut = new FileOutputStream(outputFilePath);
-        BufferedOutputStream bufOut = new BufferedOutputStream(fileOut);
-        final ZipOutputStream zipOutputStream = new ZipOutputStream(bufOut);
-
-        ZipFileVisitor zfv = new ZipFileVisitor(zipOutputStream, transformer);
-        visitAllFilesUnder(sourceDir, null, zfv);
-        zipOutputStream.close();
-        if (!zfv.isOk()) {
-            throw new ZipFileException(zfv.getCaughtException());
-        }
-    }
-
-    /**
-     * Get the formatted time string.
-     *
-     * @param milliSec The time in milliseconds.
-     * @param separator The separator between the date information and time information.
-     * @param dateSeparator The date separator separating the date information nibbles.
-     * @param timeSeparator The time separator separating the time information nibbles.
-     * @return The formated time string.
-     */
-    public static String getFormattedTimeString(long milliSec, String separator,
-            String dateSeparator, String timeSeparator) {
-        Calendar cal = Calendar.getInstance();
-        cal.setTimeInMillis(milliSec);
-        int year  = cal.get(Calendar.YEAR);
-        int month = cal.get(Calendar.MONTH) + 1;
-        int date  = cal.get(Calendar.DATE);
-        int hour  = cal.get(Calendar.HOUR_OF_DAY);
-        int min   = cal.get(Calendar.MINUTE);
-        int sec   = cal.get(Calendar.SECOND);
-
-        Formatter fmt = new Formatter();
-        if ((separator == null) || (separator.length() == 0)) {
-            separator = "_";
-        }
-
-        if ((dateSeparator == null) || (dateSeparator.length() == 0)) {
-            dateSeparator = ".";
-        }
-
-        if ((timeSeparator == null) || (timeSeparator.length() == 0)) {
-            timeSeparator = ".";
-        }
-
-        final String formatStr = "%4d" + dateSeparator + "%02d" + dateSeparator + "%02d"
-                         + separator + "%02d" + timeSeparator + "%02d" + timeSeparator + "%02d";
-        fmt.format(formatStr, year, month, date, hour, min, sec);
-
-        return fmt.toString();
-    }
-
-    /**
-     * Convert the given byte array into a lowercase hex string.
-     *
-     * @param arr The array to convert.
-     * @return The hex encoded string.
-     */
-    public static String toHexString(byte[] arr) {
-        StringBuffer buf = new StringBuffer(arr.length * 2);
-        for (byte b : arr) {
-            buf.append(String.format("%02x", b & 0xFF));
-        }
-        return buf.toString();
-    }
-
-    /**
-     * Strip control characters from the given string.
-     */
-    public static String replaceControlChars(String s) {
-        // Replace any character < 0x20, except for tab, lf and cr
-        return s.replaceAll("[\\x00-\\x1f&&[^\t\n\r]]", "?");
-    }
-
-    public static Date dateFromString(String s) throws ParseException {
-        return dateFormat.parse(s);
-    }
-
-    public static String dateToString(Date d) {
-        return dateFormat.format(d);
-    }
-}
diff --git a/tools/host/src/com/android/cts/IllegalTestNameException.java b/tools/host/src/com/android/cts/IllegalTestNameException.java
deleted file mode 100644
index ac016fd..0000000
--- a/tools/host/src/com/android/cts/IllegalTestNameException.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Copyright (C) 2008 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
- *
- *      httprunPackage://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 com.android.cts;
-
-/**
- * Exception when user input illegal test name
- */
-public class IllegalTestNameException extends Exception {
-
-    private static final long serialVersionUID = -6128222419050301306L;
-
-    public IllegalTestNameException() {
-        super();
-    }
-
-    public IllegalTestNameException(String message) {
-        super(message);
-    }
-
-}
diff --git a/tools/host/src/com/android/cts/InvalidApkPathException.java b/tools/host/src/com/android/cts/InvalidApkPathException.java
deleted file mode 100644
index b966265..0000000
--- a/tools/host/src/com/android/cts/InvalidApkPathException.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright (C) 2009 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 com.android.cts;
-
-/**
- * Thrown to indicate that the it's invalid APK path.
- */
-@SuppressWarnings("serial")
-public class InvalidApkPathException extends Exception {
-	private String mPath;
-
-    public InvalidApkPathException(String path) {
-        super();
-
-        mPath = path;
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    public String getMessage() {
-        return "Invalid APK path: " + mPath;
-    }
-}
diff --git a/tools/host/src/com/android/cts/InvalidDeviceException.java b/tools/host/src/com/android/cts/InvalidDeviceException.java
deleted file mode 100644
index da1803c..0000000
--- a/tools/host/src/com/android/cts/InvalidDeviceException.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Copyright (C) 2008 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
- *
- *      httprunPackage://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 com.android.cts;
-
-/**
- * Exception reporting that the device is invalid.
- *
- */
-public class InvalidDeviceException extends Exception {
-
-    private static final long serialVersionUID = 0L;
-
-    public InvalidDeviceException() {
-        super();
-    }
-
-    public InvalidDeviceException(final String msg) {
-        super(msg);
-    }
-}
diff --git a/tools/host/src/com/android/cts/InvalidNameSpaceException.java b/tools/host/src/com/android/cts/InvalidNameSpaceException.java
deleted file mode 100644
index 03ea2ee..0000000
--- a/tools/host/src/com/android/cts/InvalidNameSpaceException.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright (C) 2009 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 com.android.cts;
-
-/**
- * Thrown out to indicate that the name space is invalid.
- */
-@SuppressWarnings("serial")
-public class InvalidNameSpaceException extends Exception {
-	private String mNamespace;
-
-    public InvalidNameSpaceException(String namespace) {
-        super();
-
-        mNamespace = namespace;
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    public String getMessage() {
-        return "Invalid namespace: " + mNamespace;
-    }
-}
diff --git a/tools/host/src/com/android/cts/InvalidTestResultStringException.java b/tools/host/src/com/android/cts/InvalidTestResultStringException.java
deleted file mode 100644
index 4ac667f..0000000
--- a/tools/host/src/com/android/cts/InvalidTestResultStringException.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright (C) 2009 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 com.android.cts;
-
-/**
- * Thrown to indicate that the test result string is not valid.
- */
-public class InvalidTestResultStringException extends Exception {
-    private String mTestResultString;
-
-    public InvalidTestResultStringException(String resultString) {
-        super();
-
-        mTestResultString = resultString;
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    public String getMessage() {
-        return "Invalid test result string: " + mTestResultString;
-    }
-}
diff --git a/tools/host/src/com/android/cts/Log.java b/tools/host/src/com/android/cts/Log.java
deleted file mode 100644
index 4c6e2c8..0000000
--- a/tools/host/src/com/android/cts/Log.java
+++ /dev/null
@@ -1,202 +0,0 @@
-/*
- * Copyright (C) 2008 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 com.android.cts;
-
-import java.io.BufferedWriter;
-import java.io.File;
-import java.io.FileWriter;
-import java.io.IOException;
-import java.io.PrintStream;
-
-/**
- * Utility class to help the CTS logging
- */
-public class Log {
-    private static final String INFO_PREFIX = "\nCTS_INFO >>> ";
-    private static final String ERROR_PREFIX = "\nCTS_ERROR >>> ";
-    private static final String DEBUG_PREFIX = "\nCTS_DEBUG >>> ";
-    private static final String LOG_FNAME_PREFIX = "log_";
-    private static final String LOG_FNAME_SURFIX = "_.txt";
-
-    private static PrintStream mOut = System.err;
-
-    private static boolean TRACE = true;
-    private static BufferedWriter mTraceOutput = null;
-
-    private static boolean LOG = true;
-    private static BufferedWriter mLogOutput = null;
-    private static String mLogFileName;
-
-    /**
-     * Print the message to the information stream without adding prefix.
-     *
-     * @param msg The message to be printed.
-     */
-    public static void println(final String msg) {
-        log(INFO_PREFIX + msg);
-        mOut.println(msg);
-    }
-
-    /**
-     * Add the message to the information stream.
-     *
-     * @param msg the message to be added to the information stream.
-     */
-    public static void i(final String msg) {
-        log(INFO_PREFIX + msg);
-
-        mOut.println(INFO_PREFIX + msg);
-    }
-
-    /**
-     * Add the message to the error message stream.
-     * @param msg The message to be added to the error message stream.
-     * @param e The exception.
-     */
-    public static void e(final String msg, Exception e) {
-        log(ERROR_PREFIX + msg);
-
-        if (!HostConfig.DEBUG) {
-            CUIOutputStream.println(ERROR_PREFIX + msg);
-            if (e != null) {
-                CUIOutputStream.println(e.toString());
-            }
-            return;
-        }
-
-        mOut.println(ERROR_PREFIX + msg);
-        if (e != null) {
-            e.printStackTrace();
-        }
-    }
-
-    /**
-     * Add the message to the debugging stream.
-     *
-     * @param msg The message to be added to the debugging stream.
-     */
-    public static void d(final String msg) {
-        log(DEBUG_PREFIX + System.currentTimeMillis() + " " + msg);
-
-        if (HostConfig.DEBUG) {
-            mOut.println(DEBUG_PREFIX + msg);
-        }
-    }
-
-    /**
-     * Set the output stream.
-     *
-     * @param out The output stream.
-     */
-    public static void setOutput(PrintStream out) {
-        if (out != null) {
-            mOut = out;
-        }
-    }
-
-    /**
-     * Reset the output stream.
-     */
-    public static void resetOutput() {
-        mOut = System.out;
-    }
-
-    /**
-     * Initialize the log stream.
-     *
-     * @param path The path to add the log file.
-     */
-    public static void initLog(String path) {
-        mLogFileName = path + File.separator + LOG_FNAME_PREFIX
-            + HostUtils.getFormattedTimeString(System.currentTimeMillis(), "_", ".", ".")
-            + LOG_FNAME_SURFIX;
-        try {
-            if (mLogOutput == null) {
-                mLogOutput = new BufferedWriter(new FileWriter(mLogFileName));
-            }
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
-    }
-
-    /**
-     * Close the log stream.
-     */
-    public static void closeLog() {
-        if (mLogOutput != null) {
-            try {
-                mLogOutput.close();
-                mLogOutput = null;
-            } catch (IOException e) {
-                e.printStackTrace();
-            }
-        }
-    }
-
-    /**
-     * Log the message.
-     *
-     * @param msg The message to be logged.
-     */
-    public static void log(String msg) {
-        if (LOG && (mLogOutput != null)) {
-            try {
-                if (msg != null) {
-                    mLogOutput.write(msg + "\n");
-                    mLogOutput.flush();
-                }
-            } catch (IOException e) {
-                e.printStackTrace();
-            }
-        }
-    }
-
-    /**
-     * Add the message to the trace stream.
-     *
-     * @param msg The message to be added to the trace stream.
-     */
-    public static void t(String msg) {
-        if (TRACE) {
-            try {
-                if (mTraceOutput == null) {
-                    mTraceOutput = new BufferedWriter(new FileWriter("debug.txt"));
-                }
-                if (msg != null) {
-                    mTraceOutput.write(msg + "\n");
-                    mTraceOutput.flush();
-                }
-            } catch (IOException e) {
-                e.printStackTrace();
-            }
-        }
-    }
-
-    /**
-     * Close the trace stream.
-     */
-    public static void closeTrace() {
-        if (mTraceOutput != null) {
-            try {
-                mTraceOutput.close();
-                mTraceOutput = null;
-            } catch (IOException e) {
-                e.printStackTrace();
-            }
-        }
-    }
-}
diff --git a/tools/host/src/com/android/cts/MultiplexingLogListener.java b/tools/host/src/com/android/cts/MultiplexingLogListener.java
deleted file mode 100644
index 22ce13c..0000000
--- a/tools/host/src/com/android/cts/MultiplexingLogListener.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * Copyright (C) 2009 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 com.android.cts;
-
-import com.android.ddmlib.log.LogReceiver.ILogListener;
-import com.android.ddmlib.log.LogReceiver.LogEntry;
-
-import java.util.ArrayList;
-
-/**
- * This class allows multiplexing of log listeners onto a single device.
- */
-public class MultiplexingLogListener implements ILogListener {
-    private ArrayList<ILogListener> listeners = new ArrayList<ILogListener>();
-
-    /**
-     * Add a new listener.
-     *
-     * @param listener the listener
-     */
-    public void addListener(ILogListener listener) {
-        listeners.add(listener);
-    }
-
-    /**
-     * Remove an existing listener.
-     *
-     * @param listener the listener to remove.
-     */
-    public void removeListener(ILogListener listener) {
-        listeners.remove(listener);
-    }
-
-
-    /** {@inheritDoc} */
-    public void newData(byte[] data, int offset, int length) {
-        for (ILogListener listener : listeners) {
-            listener.newData(data, offset, length);
-        }
-    }
-
-    /** {@inheritDoc} */
-    public void newEntry(LogEntry entry) {
-        for (ILogListener listener : listeners) {
-            listener.newEntry(entry);
-        }
-    }
-}
diff --git a/tools/host/src/com/android/cts/ProgressObserver.java b/tools/host/src/com/android/cts/ProgressObserver.java
deleted file mode 100644
index d7110fe..0000000
--- a/tools/host/src/com/android/cts/ProgressObserver.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * Copyright (C) 2008 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 com.android.cts;
-
-import java.util.Timer;
-import java.util.TimerTask;
-
-/**
- * Observes test progressing status.
- *
- */
-public class ProgressObserver {
-    private Timer mNotifyTimer;
-
-    /**
-     * Start a process displayer.
-     */
-    public void start() {
-        mNotifyTimer = new Timer();
-        mNotifyTimer.schedule(new ProgressPrinter(),
-                ProgressPrinter.DELAY, ProgressPrinter.TIMEOUT);
-    }
-
-    /**
-     * Stop a process displayer.
-     */
-    public void stop() {
-        if (mNotifyTimer != null) {
-            mNotifyTimer.cancel();
-        }
-        mNotifyTimer = null;
-    }
-
-    /**
-     * Display running notification when a test/package is executing, </br>
-     * especially for the ones running for a very long time.
-     */
-    class ProgressPrinter extends TimerTask {
-        public final static int DELAY = 2000;
-        public final static int TIMEOUT = 2000;
-
-        /** {@inheritDoc} */
-        @Override
-        public void run() {
-            CUIOutputStream.print(".");
-        }
-    }
-}
diff --git a/tools/host/src/com/android/cts/ReferenceAppTestPackage.java b/tools/host/src/com/android/cts/ReferenceAppTestPackage.java
deleted file mode 100644
index 3a14855..0000000
--- a/tools/host/src/com/android/cts/ReferenceAppTestPackage.java
+++ /dev/null
@@ -1,252 +0,0 @@
-/*
- * Copyright (C) 2008 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 com.android.cts;
-
-import com.android.ddmlib.AdbCommandRejectedException;
-import com.android.ddmlib.MultiLineReceiver;
-import com.android.ddmlib.RawImage;
-import com.android.ddmlib.TimeoutException;
-import com.android.ddmlib.log.LogReceiver.ILogListener;
-import com.android.ddmlib.log.LogReceiver.LogEntry;
-
-import java.awt.image.BufferedImage;
-import java.io.File;
-import java.io.IOException;
-import java.security.NoSuchAlgorithmException;
-import java.util.ArrayList;
-
-import javax.imageio.ImageIO;
-
-/**
- * TestPackage for Reference Application Testing.
- */
-public class ReferenceAppTestPackage extends TestPackage {
-
-    private static final String ACTION_REFERENCE_APP_TEST = "ReferenceAppTest";
-    private final String apkToTestName;
-    private final String packageUnderTest;
-    private ArrayList<String> testOutputLines = new ArrayList<String>();
-
-    /**
-     * Construct a ReferenceAppTest package with given necessary information.
-     *
-     * @param instrumentationRunner The instrumentation runner.
-     * @param testPkgBinaryName The binary name of the TestPackage.
-     * @param targetNameSpace The package name space of the dependent package, if available.
-     * @param targetBinaryName The binary name of the dependent package, if available.
-     * @param version The version of the CTS Host allowed.
-     * @param androidVersion The version of the Android platform allowed.
-     * @param jarPath The host controller's jar path and file.
-     * @param appNameSpace The package name space used to uninstall the TestPackage.
-     * @param appPackageName The Java package name of the test package.
-     * @param apkToTestName the apk package that contains the ReferenceApp to be tested.
-     * @param packageUnderTest the Java package name of the ReferenceApp to be tested.
-     * @throws NoSuchAlgorithmException
-     */
-    public ReferenceAppTestPackage(String instrumentationRunner,
-            String testPkgBinaryName, String targetNameSpace,
-            String targetBinaryName, String version,
-            String androidVersion, String jarPath,
-            String appNameSpace, String appPackageName,
-            String apkToTestName, String packageUnderTest) throws NoSuchAlgorithmException {
-        super(instrumentationRunner, testPkgBinaryName, targetNameSpace, targetBinaryName, version,
-                androidVersion, jarPath, appNameSpace, appPackageName, null);
-        this.apkToTestName = apkToTestName;
-        this.packageUnderTest = packageUnderTest;
-    }
-
-    /**
-     * Run the package over the device.
-     *
-     * @param device The device to run the package.
-     * @param javaPkgName The java package name.
-     * @param testSessionLog The TestSessionLog for this TestSession.
-     * @throws DeviceDisconnectedException if the device disconnects during the test
-     */
-    @Override
-    public void run(final TestDevice device, final String javaPkgName,
-            TestSessionLog testSessionLog) throws DeviceDisconnectedException,
-            InvalidApkPathException, InvalidNameSpaceException {
-        Test test = getTests().iterator().next();
-        if ((test != null) && (test.getResult().isNotExecuted())) {
-            String appToTestApkPath =
-                HostConfig.getInstance().getCaseRepository().getApkPath(apkToTestName);
-
-            // TODO: This is non-obvious and should be cleaned up
-            device.setRuntimeListener(device);
-
-            // Install the Reference App
-            device.installAPK(appToTestApkPath);
-            device.waitForCommandFinish();
-
-            // Install the Reference App Tests
-            String testApkPath = HostConfig.getInstance().getCaseRepository()
-                    .getApkPath(getAppBinaryName());
-            device.installAPK(testApkPath);
-            device.waitForCommandFinish();
-
-            runTests(device, testSessionLog);
-
-            // Uninstall the Reference App Tests
-            device.uninstallAPK(getAppPackageName());
-            device.waitForCommandFinish();
-
-            // Uninstall the Reference App
-            device.uninstallAPK(packageUnderTest);
-            device.waitForCommandFinish();
-
-            verifyTestResults(test);
-        }
-    }
-
-    private void verifyTestResults(Test test) {
-        // Now go through the results of the test and see if it ran OK
-        boolean testRanOk = false;
-        String numberOfTestsRan = "unknown";
-        for (String line : testOutputLines) {
-            if (line.startsWith("OK")) {
-                testRanOk = true;
-                int startIndex = 4; // OK (5 tests)
-                int endIndex = line.indexOf(' ', 4);
-                numberOfTestsRan = line.substring(4, endIndex);
-                break;
-            }
-        }
-        if (!testRanOk) {
-            test.setResult(new CtsTestResult(CtsTestResult.CODE_FAIL, null, null));
-        } else {
-            test.setResult(new CtsTestResult(CtsTestResult.CODE_PASS,
-                            numberOfTestsRan + " tests passed", null));
-        }
-    }
-
-    private static final String REF_APP_COMMAND_COMPONENT = "ReferenceAppTestCase";
-    private static final String TAKE_SNAPSHOT_CMD = "takeSnapshot";
-
-    /**
-     * Run the tests for this test package.
-     *
-     * @param device the device under test.
-     * @param testSessionLog the TestSessionLog for this test
-     * @throws DeviceDisconnectedException if the device disconnects.
-     */
-    private void runTests(final TestDevice device,
-            final TestSessionLog testSessionLog) throws DeviceDisconnectedException {
-        Log.i("Running reference tests for " + apkToTestName);
-
-        device.addMainLogListener(new ILogListener() {
-            public void newData(byte[] data, int offset, int length) {
-                // use newEntry instead
-            }
-
-            public void newEntry(LogEntry entry) {
-                // skip first bytes, its the log level
-                String component = "";
-                String msg = "";
-                for (int i = 1; i < entry.len; i++) {
-                    if (entry.data[i] == 0) {
-                        component = new String(entry.data, 1, i - 1);
-                        msg = new String(entry.data, i + 1, entry.len - i - 2);
-                        // clean up any trailing newlines
-                        if (msg.endsWith("\n")) {
-                            msg = msg.substring(0, msg.length() - 1);
-                        }
-                        break;
-                    }
-                }
-                if (REF_APP_COMMAND_COMPONENT.equals(component)) {
-                    String[] parts = msg.split(":", 2);
-                    if (parts == null ||
-                        parts.length != 2) {
-                        Log.e("Got reference app command component with invalid cmd: " + msg,
-                                null);
-                        return;
-                    }
-
-                    String cmd = parts[0];
-                    String cmdArgs = parts[1];
-                    if (TAKE_SNAPSHOT_CMD.equals(cmd)) {
-                        takeSnapshot(device, testSessionLog, cmdArgs);
-                    }
-                }
-            }
-
-            private void takeSnapshot(TestDevice device,
-                                      TestSessionLog testSessionLog,
-                                      String cmdArgs) {
-                try {
-                    RawImage rawImage = device.getScreenshot();
-                    if (rawImage != null) {
-                    String outputFilename = testSessionLog.getResultDir() +
-                        File.separator + cmdArgs + ".png";
-                    File output = new File(outputFilename);
-                    BufferedImage im = HostUtils.convertRawImageToBufferedImage(rawImage);
-                    ImageIO.write(im, "png", output);
-                    } else {
-                        Log.e("getScreenshot returned a null image", null);
-                    }
-                } catch (IOException e) {
-                    Log.e("Error taking snapshot! " + cmdArgs, e);
-                } catch (TimeoutException e) {
-                    Log.e("Error taking snapshot! " + cmdArgs, e);
-                } catch (AdbCommandRejectedException e) {
-                    Log.e("Error taking snapshot! " + cmdArgs, e);
-                }
-            }
-        });
-
-        final String commandStr = "am instrument -w -e package "+ getAppPackageName() + " "
-        + getAppPackageName() + "/" + getInstrumentationRunner();
-        Log.d(commandStr);
-
-        device.startActionTimer(ACTION_REFERENCE_APP_TEST);
-        device.executeShellCommand(commandStr, new ReferenceAppResultsObserver(device));
-        device.waitForCommandFinish();
-    }
-
-    /**
-     * Reference app result observer.
-     */
-    class ReferenceAppResultsObserver extends MultiLineReceiver {
-
-        private final TestDevice device;
-
-        public ReferenceAppResultsObserver(TestDevice td) {
-            this.device = td;
-        }
-
-        /** {@inheritDoc} */
-        @Override
-        public void processNewLines(String[] lines) {
-            for (String line : lines) {
-                testOutputLines.add(line);
-            }
-        }
-
-        /** {@inheritDoc} */
-        public boolean isCancelled() {
-            return false;
-        }
-
-        /** {@inheritDoc} */
-        @Override
-        public void done() {
-            device.stopActionTimer();
-            device.notifyExternalTestComplete();
-        }
-    }
-}
diff --git a/tools/host/src/com/android/cts/Selector.java b/tools/host/src/com/android/cts/Selector.java
deleted file mode 100644
index ce80e1d..0000000
--- a/tools/host/src/com/android/cts/Selector.java
+++ /dev/null
@@ -1,359 +0,0 @@
-/*
- * Copyright (C) 2008 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 com.android.cts;
-
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-
-/**
- * Interact with user to select from optional items.
- *
- */
-abstract public class Selector {
-    public static final String PACKAGE_SELECTOR = "packageSelector";
-    public static final String SUITE_SELECTOR   = "suiteSelector";
-    public static final String CASE_SELECTOR    = "caseSelector";
-    public static final String TEST_SELECTOR    = "testSelector";
-
-    public static final String PACKAGE_HDR  = "[Choose package] ";
-    public static final String PACKAGE_TAIL =
-        ": select[Y], reject[n], or choose suite in it[m]?  [Y/n/m] ";
-
-    public static final String SUITE_HDR    = "[Choose suite]   ";
-    public static final String SUITE_TAIL   =
-        ": select[Y], reject[n], or choose case in it[m]?  [Y/n/m] ";
-
-    public static final String CASE_HDR  = "[Choose case]    ";
-    public static final String CASE_TAIL =
-        ": select[Y], reject[n], or choose method in it[m]?  [Y/n/m] ";
-
-    public static final String TEST_HDR     = "[Choose test]    ";
-    public static final String TEST_TAIL    = "?: [Y/n] ";
-
-    /**
-     * Define user's possible selections.
-     *
-     */
-    public enum Selection {
-        ACCEPT, REJECT, MORE
-    }
-
-    public List<String> mRecords;
-
-    public String mHdr;
-    public String mTail;
-    public String mType;
-
-    public BufferedReader mBufferedReader;
-
-    public Selector(String type, List<String> records) {
-        mRecords = records;
-        Collections.sort(mRecords);
-        mBufferedReader = null;
-        mType = type;
-
-        if (type.equals(PACKAGE_SELECTOR)) {
-            mHdr  = PACKAGE_HDR;
-            mTail = PACKAGE_TAIL;
-        } else if (type.equals(SUITE_SELECTOR)) {
-            mHdr  = SUITE_HDR;
-            mTail = SUITE_TAIL;
-        } else if (type.equals(CASE_SELECTOR)) {
-            mHdr  = CASE_HDR;
-            mTail = CASE_TAIL;
-        } else if (type.equals(TEST_SELECTOR)) {
-            mHdr  = TEST_HDR;
-            mTail = TEST_TAIL;
-        }
-    }
-
-    /**
-     * Set the input stream of BufferedReader type.
-     *
-     * @param in The input stream.
-     */
-    public void setInputStream(BufferedReader in) {
-        mBufferedReader = in;
-    }
-
-    /**
-     * Read a specific line from the input stream.
-     *
-     * @param prompt The prompt displayed on the console to notify the user.
-     * @return The string the user typed in over the console.
-     */
-    public String readLine(String prompt) throws IOException {
-        String str = null;
-        if (mBufferedReader != null) {
-            CUIOutputStream.print(prompt);
-            str = mBufferedReader.readLine().trim();
-        }
-
-        return str;
-    }
-
-    /**
-     * Interact with the user to decide what are included and what
-     * others are not.
-     *
-     * @param name The specific name.
-     * @return The selection by the user.
-     */
-    public Selection doAccept(final String name) throws IOException {
-        Selection selection = Selection.REJECT;
-
-        if (mType.equals(TEST_SELECTOR)) {
-            String prompt = mHdr + "Include " + name + mTail;
-            String answer = readLine(prompt);
-            while (!answer.matches("[yn]?")) {
-                CUIOutputStream.println(
-                           "Invalid input. Please chose 'y' or 'n' (default is 'y')");
-                answer = readLine(prompt);
-            }
-
-            if (ConsoleUi.isConfirmation(answer, true)) {
-                selection = Selection.ACCEPT;
-            }
-        } else {
-            String prompt = mHdr + name + mTail;
-            String answer = readLine(prompt);
-            while (!answer.matches("[ynm]?")) {
-                CUIOutputStream.println(
-                           "Invalid input. Please chose 'y', 'n', or 'm' (default is 'y')");
-                answer = readLine(prompt);
-            }
-
-            if (ConsoleUi.isConfirmation(answer, true)) {
-                selection = Selection.ACCEPT;
-            } else if (0 == "m".compareToIgnoreCase(answer)) {
-                selection = Selection.MORE;
-            }
-        }
-
-        return selection;
-    }
-
-    /**
-     * Check if the specified name has been selected against the selected list.
-     *
-     * @param selectedList The selected list.
-     * @param name The specified name to be checked.
-     * @return If selected, return true; else, return false.
-     */
-    public boolean isSelected(ArrayList<String> selectedList, String name) {
-        for (String str : selectedList) {
-            if (name.equals(str) || isSubName(str, name)) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    /**
-     * Check whether a package name is a sub-package name of parent name.
-     *
-     * @param parent The parent package name.
-     * @param name The package name.
-     * @return True if it's a sub-package name of parent.
-     */
-     private boolean isSubName(String parent, String name) {
-        return name.startsWith(parent + ".");
-    }
-}
-
-/**
- * Building the specific plan by following user's selection.
- */
-class PlanBuilder extends Selector{
-    private SuiteSelector mSuiteSelector;
-
-    public PlanBuilder(List<String> records) {
-        super(PACKAGE_SELECTOR, records);
-    }
-
-    /**
-     * Interact with user to select over packages.
-     *
-     * @return The selected result with excluded lists.
-     */
-    public HashMap<String, ArrayList<String>> doSelect() throws IOException {
-        HashMap<String, ArrayList<String>> packages = new HashMap<String, ArrayList<String>>();
-        for (String javaPkgName : mRecords) {
-            Selection select = doAccept(javaPkgName);
-            TestPackage testPackage =
-                HostConfig.getInstance().getTestPackage(javaPkgName);
-            if (select == Selection.ACCEPT) {
-                packages.put(javaPkgName, null);
-            } else if (select == Selection.MORE) {
-                List<String> suiteNames = testPackage.getAllTestSuiteNames();
-                mSuiteSelector = new SuiteSelector(suiteNames, testPackage);
-
-                if (mBufferedReader != null) {
-                    mSuiteSelector.setInputStream(mBufferedReader);
-                }
-
-                ArrayList<String> excludedSuites = new ArrayList<String>();
-                ArrayList<String> excludedCases = new ArrayList<String>();
-                mSuiteSelector.doSelect(excludedSuites, excludedCases);
-                if (suiteNames.size() == excludedSuites.size()) {
-                    Log.i("package=" + javaPkgName + " has been removed all.");
-                } else {
-                    excludedSuites.addAll(excludedCases);
-                    packages.put(javaPkgName, excludedSuites);
-                }
-            }
-        }
-
-        if (packages.size() == 0) {
-            return null;
-        } else {
-            return packages;
-        }
-    }
-
-    /**
-     * Suite selector.
-     *
-     */
-    class SuiteSelector extends Selector {
-        private TestCaseSelector mCaseSelector;
-        private TestPackage mTestPackage;
-
-        public SuiteSelector(List<String> suites, TestPackage testPackage) {
-            super(SUITE_SELECTOR, suites);
-            mTestPackage = testPackage;
-        }
-
-        /**
-         * Interact with user to select over suites.
-         *
-         * @param excludedTestSuites The fully excluded test suite list.
-         * @param excludedTestCases The excluded test case list.
-         */
-        public void doSelect(ArrayList<String> excludedTestSuites,
-                ArrayList<String> excludedTestCases) throws IOException {
-            ArrayList<String> selectedList = new ArrayList<String>();
-            for (String suiteName : mRecords) {
-                if (!isSelected(selectedList, suiteName)) {
-                    Selection select = doAccept(suiteName);
-                    if (select == Selection.REJECT) {
-                        excludedTestSuites.add(suiteName);
-                    } else if (select == Selection.MORE) {
-                        List<String> testCaseNames =
-                            mTestPackage.getAllTestCaseNames(suiteName);
-                        mCaseSelector = new TestCaseSelector(testCaseNames, mTestPackage);
-
-                        if (mBufferedReader != null) {
-                            mCaseSelector.setInputStream(mBufferedReader);
-                        }
-
-                        ArrayList<String> notIncludedTestCases = new ArrayList<String>();
-                        ArrayList<String> notIncludedTests = new ArrayList<String>();
-                        mCaseSelector.doSelect(notIncludedTestCases, notIncludedTests);
-                        if (testCaseNames.size() == notIncludedTestCases.size()) {
-                            Log.i("suite=" + suiteName + " has been removed all");
-                            excludedTestSuites.add(suiteName);
-                        } else {
-                            excludedTestCases.addAll(notIncludedTestCases);
-                            excludedTestCases.addAll(notIncludedTests);
-                        }
-                    }
-                    selectedList.add(suiteName);
-                }
-            }
-        }
-    }
-
-    /**
-     * TestCase selector.
-     */
-    class TestCaseSelector extends Selector {
-        private TestSelector mTestSelector;
-        private TestPackage mTestPackage;
-
-        public TestCaseSelector(List<String> testCases, TestPackage testPackage) {
-            super(CASE_SELECTOR, testCases);
-            mTestPackage = testPackage;
-        }
-
-        /**
-         * Interact with user to select over test cases.
-         *
-         * @param excludedTestCases The fully excluded test case list.
-         * @param excludedTests The excluded test list.
-         */
-        public void doSelect(ArrayList<String> excludedTestCases,
-                ArrayList<String> excludedTests) throws IOException {
-            ArrayList<String> selectedList = new ArrayList<String>();
-            for (String testCaseName : mRecords) {
-                if (!isSelected(selectedList, testCaseName)) {
-                    Selection select = doAccept(testCaseName);
-                    if (select == Selection.REJECT) {
-                        excludedTestCases.add(testCaseName);
-                    } else if (select == Selection.MORE) {
-                        List<String> testNames = mTestPackage.getAllTestNames(testCaseName);
-                        mTestSelector = new TestSelector(testNames);
-
-                        if (mBufferedReader != null) {
-                            mTestSelector.setInputStream(mBufferedReader);
-                        }
-
-                        ArrayList<String> notIncludedTests = mTestSelector.doSelect();
-                        if (notIncludedTests.size() == testNames.size()) {
-                            Log.i("testCase=" + testCaseName + " has been removed all");
-                            excludedTestCases.add(testCaseName);
-                        } else {
-                            excludedTests.addAll(notIncludedTests);
-                        }
-                    }
-                    selectedList.add(testCaseName);
-                }
-            }
-        }
-    }
-
-    /**
-     * Test selector.
-     *
-     */
-    class TestSelector extends Selector {
-        public TestSelector(List<String> records) {
-            super(TEST_SELECTOR, records);
-        }
-
-        /**
-         * Interact with user to select over tests.
-         *
-         * @return The selected result with excluded lists.
-         */
-        public ArrayList<String> doSelect() throws IOException {
-            ArrayList<String> records = new ArrayList<String>();
-            for (String test : mRecords) {
-                Selection select = doAccept(test);
-                if (select == Selection.REJECT) {
-                    records.add(test);
-                }
-            }
-
-            return records;
-        }
-    }
-}
diff --git a/tools/host/src/com/android/cts/SessionObserver.java b/tools/host/src/com/android/cts/SessionObserver.java
deleted file mode 100644
index 788483f..0000000
--- a/tools/host/src/com/android/cts/SessionObserver.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * Copyright (C) 2008 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 com.android.cts;
-
-public interface SessionObserver {
-    public void notifyFinished(TestSession ts);
-}
diff --git a/tools/host/src/com/android/cts/SignatureCheckPackage.java b/tools/host/src/com/android/cts/SignatureCheckPackage.java
deleted file mode 100644
index 485530e..0000000
--- a/tools/host/src/com/android/cts/SignatureCheckPackage.java
+++ /dev/null
@@ -1,254 +0,0 @@
-/*
- * Copyright (C) 2008 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 com.android.cts;
-
-import com.android.ddmlib.MultiLineReceiver;
-
-import java.security.NoSuchAlgorithmException;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.regex.Matcher;
-
-/**
- * Class which holds signature check package content.
- */
-public class SignatureCheckPackage extends TestPackage {
-
-    private static final String CHECK_API_APP_PACKAGE_NAME = "android.tests.sigtest";
-    private static final String MISMATCH_CLASS_SIGNATURE = "mismatch_class_signature";
-    private static final String MISSING_INTERFACE = "missing_interface";
-    private static final String MISSING_FIELD = "missing_field";
-    private static final String MISMATCH_INTERFACE_SIGNATURE = "mismatch_interface_signature";
-    private static final String MISMATCH_FIELD_SIGNATURE = "mismatch_field_signature";
-    private static final String MISSING_METHOD = "missing_method";
-    private static final String MISMATCH_METHOD_SIGNATURE = "mismatch_method_signature";
-    private static final String MISSING_CLASS = "missing_class";
-    private static final String CAUGHT_EXCEPTION = "caught_exception";
-    private static final String ACTION_CHECKAPI = "checkapi";
-
-    private ArrayList<String> mAPICheckResult;
-
-    /**
-     * Construct a Signature check package with given necessary information.
-     *
-     * @param instrumentationRunner The instrumentation runner.
-     * @param testPkgBinaryName The binary name of the TestPackage.
-     * @param targetNameSpace The package name space of the dependent package, if available.
-     * @param targetBinaryName The binary name of the dependent package, if available.
-     * @param version The version of the CTS Host allowed.
-     * @param androidVersion The version of the Android platform allowed.
-     * @param jarPath The host controller's jar path and file.
-     * @param appNameSpace The package name space used to uninstall the TestPackage.
-     * @param appPackageName The Java package name of the test package.
-     */
-    public SignatureCheckPackage(final String instrumentationRunner,
-            final String testPkgBinaryName, final String targetNameSpace,
-            final String targetBinaryName, final String version,
-            final String androidVersion, final String jarPath, final String appNameSpace,
-            final String appPackageName) throws NoSuchAlgorithmException {
-        super(instrumentationRunner, testPkgBinaryName, targetNameSpace, targetBinaryName, version,
-                androidVersion, jarPath, appNameSpace, appPackageName, null);
-    }
-
-    /**
-     * Run the package over the device.
-     *
-     * @param device The device to run the package.
-     * @param javaPkgName The java package name.
-     * @param testSesssionLog the TestSessionLog for this TestSession.
-     */
-    @Override
-    public void run(final TestDevice device, final String javaPkgName,
-            TestSessionLog testSesssionLog) throws DeviceDisconnectedException,
-            InvalidNameSpaceException, InvalidApkPathException {
-        Test test = getTests().iterator().next();
-        if ((test != null) && (test.getResult().isNotExecuted())) {
-
-            ArrayList<String> result = startSignatureTest(device);
-            if (result != null) {
-                StringBuffer formattedResult = new StringBuffer();
-                int resultCode = processSignatureResult(result, formattedResult);
-
-                String resultStr = formattedResult.toString();
-                if (resultCode == CtsTestResult.CODE_PASS) {
-                    resultStr = null;
-                }
-
-                test.setResult(new CtsTestResult(resultCode, resultStr, null));
-            }
-        }
-    }
-
-
-    /**
-     * Start signature test.
-     *
-     * @param device the device under test.
-     * @return test result
-     */
-    public ArrayList<String> startSignatureTest(TestDevice device)
-                throws DeviceDisconnectedException, InvalidNameSpaceException,
-                InvalidApkPathException {
-        Log.d("installing APICheck apk");
-        mAPICheckResult = new ArrayList<String>();
-        // TODO: This is non-obvious and should be cleaned up
-        device.setRuntimeListener(device);
-
-        String apkPath =
-            HostConfig.getInstance().getCaseRepository().getApkPath(getAppBinaryName());
-        if (!HostUtils.isFileExist(apkPath)) {
-            Log.e("File doesn't exist: " + apkPath, null);
-            return null;
-        }
-
-        device.installAPK(apkPath);
-        device.waitForCommandFinish();
-
-        runSignatureTestCommand(device);
-        device.waitForCommandFinish();
-
-        device.uninstallAPK(CHECK_API_APP_PACKAGE_NAME);
-        device.waitForCommandFinish();
-
-        device.removeRuntimeListener();
-
-        return mAPICheckResult;
-    }
-
-    /**
-     * Run signature test command.
-     *
-     * @param device the device to run against.
-     */
-    private void runSignatureTestCommand(TestDevice device)
-                throws DeviceDisconnectedException {
-        Log.i("Checking API... ");
-        Log.i("This might take several minutes, please be patient...");
-
-        final String commandStr = "am instrument -w -e bundle true "
-            + getAppPackageName() + "/" + getInstrumentationRunner();
-        Log.d(commandStr);
-
-        device.startActionTimer(ACTION_CHECKAPI,
-                HostConfig.Ints.signatureTestTimeoutMs.value());
-        device.executeShellCommand(commandStr, new SignatureTestResultObserver(device));
-    }
-
-    /**
-     * Signature result observer.
-     */
-    class SignatureTestResultObserver extends MultiLineReceiver {
-
-        private final TestDevice device;
-
-        public SignatureTestResultObserver(TestDevice td) {
-            this.device = td;
-        }
-
-        /** {@inheritDoc} */
-        @Override
-        public void processNewLines(String[] lines) {
-            for (int i = 0; i < lines.length; i++) {
-                mAPICheckResult.add(lines[i]);
-            }
-        }
-
-        /** {@inheritDoc} */
-        public boolean isCancelled() {
-            return false;
-        }
-
-        /** {@inheritDoc} */
-        @Override
-        public void done() {
-            device.stopActionTimer();
-            device.notifyExternalTestComplete();
-        }
-    }
-
-    /**
-     * Process signature result.
-     *
-     * @param apiCheckResult The result of API checking.
-     * @param formattedResult The formated result of API checking.
-     * @return  PASS or FAIL according to the check result.
-     */
-    public int processSignatureResult(ArrayList<String> apiCheckResult,
-                StringBuffer formattedResult) {
-
-        HashMap<String, String> resMap = new HashMap<String, String>();
-        for (String res : apiCheckResult) {
-            Matcher matcher = TestDevice.INSTRUMENT_RESULT_PATTERN.matcher(res);
-            if (matcher.matches()) {
-                resMap.put(matcher.group(1), matcher.group(2));
-            }
-        }
-
-        String result = resMap.get("result");
-        if (result == null) {
-            CUIOutputStream.println("API Check TIMEOUT.");
-            return CtsTestResult.CODE_TIMEOUT;
-        }
-
-        if (result.equals("true")) {
-            CUIOutputStream.println("API Check PASS.");
-            return CtsTestResult.CODE_PASS;
-        }
-
-        CUIOutputStream.println("API Check FAIL!");
-        final String leadingSpace = "      ";
-        for (String key : resMap.keySet()) {
-            if (key.equals("result")) {
-                // ignore the result string
-                continue;
-            }
-
-            String resStr = resMap.get(key);
-            if ((resStr != null) && (resStr.length() > 2)) {
-                formattedResult.append(key +":\n");
-                if (MISMATCH_CLASS_SIGNATURE.equals(key)
-                        || MISMATCH_INTERFACE_SIGNATURE.equals(key)
-                        || MISMATCH_FIELD_SIGNATURE.equals(key)
-                        || MISSING_FIELD.equals(key)
-                        || MISSING_METHOD.equals(key)
-                        || MISMATCH_METHOD_SIGNATURE.equals(key)) {
-                    resStr = resStr.substring(1, resStr.length() - 1);
-                    String[] details = resStr.split("\\), ");
-                    for (String detail : details) {
-                        formattedResult.append(leadingSpace + detail + ")\n");
-                    }
-                    formattedResult.append("\n");
-                } else if (MISSING_INTERFACE.equals(key)
-                        || MISSING_CLASS.equals(key)) {
-                    resStr = resStr.substring(1, resStr.length() - 1);
-                    String[] details = resStr.split(", ");
-                    for (String detail : details) {
-                        formattedResult.append(leadingSpace + detail + "\n");
-                    }
-                    formattedResult.append("\n");
-                } else if (CAUGHT_EXCEPTION.equals(key)) {
-                    resStr = resStr.substring(1, resStr.length() - 1);
-                    formattedResult.append(resStr);
-                    formattedResult.append("\n");
-                }
-            }
-        }
-
-        return CtsTestResult.CODE_FAIL;
-    }
-}
-
diff --git a/tools/host/src/com/android/cts/Test.java b/tools/host/src/com/android/cts/Test.java
deleted file mode 100644
index 2cd119b..0000000
--- a/tools/host/src/com/android/cts/Test.java
+++ /dev/null
@@ -1,428 +0,0 @@
-/*
- * Copyright (C) 2008 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 com.android.cts;
-
-import com.android.cts.TestSession.ResultObserver;
-
-import java.util.TimerTask;
-
-/**
- * Correspond to junit's test method, provide functions on storing
- * and executing a test from CTS test harness.
- */
-public class Test implements DeviceObserver {
-    public static final String METHOD_SEPARATOR = "#";
-
-    private TestController mTestController;
-    private TestCase mParentCase;
-    private String mName;
-    private String mType;
-    private String mKnownFailure;
-    private long mStartTime;
-    private long mEndTime;
-
-    protected boolean mTestStop;
-    protected TestDevice mDevice;
-    protected HostTimer mTimeOutTimer;
-    protected ProgressObserver mProgressObserver;
-    protected CtsTestResult mResult;
-
-    public Test(final TestCase parentCase, final String name,
-            final String type, final String knownFailure, final int resCode) {
-        mParentCase = parentCase;
-        mName = name;
-        mType = type;
-        mKnownFailure = knownFailure;
-        mResult = new CtsTestResult(resCode);
-
-        mTestController = null;
-        mProgressObserver = null;
-        mTestStop = false;
-    }
-
-    /**
-     * Check if it's known failure test.
-     *
-     * @return If known failure test, return true; else, return false.
-     */
-    public boolean isKnownFailure() {
-        return (mKnownFailure != null);
-    }
-
-    /**
-     * Get the known failure description.
-     *
-     * @return The known failure description.
-     */
-    public String getKnownFailure() {
-        return mKnownFailure;
-    }
-
-    /**
-     * Set the test controller.
-     *
-     * @param testController The test controller.
-     */
-    public void setTestController(final TestController testController) {
-        mTestController = testController;
-    }
-
-    /**
-     * Get the test controller.
-     *
-     * @return The test controller.
-     */
-    public TestController getTestController() {
-        return mTestController;
-    }
-
-    /**
-     * Get the instrumentation runner.
-     *
-     * @return The instrumentation runner.
-     */
-    public String getInstrumentationRunner() {
-        TestPackage pkg = mParentCase.getParent().getParent();
-        return pkg.getInstrumentationRunner();
-    }
-
-    /**
-     * Get the test name of this test.
-     *
-     * @return The test name of this test.
-     */
-    public String getName() {
-        return mName;
-    }
-
-    /**
-     * Get the test type of this test.
-     *
-     * @return The test type of this test.
-     */
-    public String getType() {
-        return mType;
-    }
-
-    /**
-     * Get the parent TestCase containing the test.
-     *
-     * @return The parent TestCase.
-     */
-    public TestCase getTestCase() {
-        return mParentCase;
-    }
-
-    /**
-     * Get the parent TestSuite containing the test.
-     *
-     * @return The parent TestSuite.
-     */
-    public TestSuite getTestSuite() {
-        return mParentCase.getParent();
-    }
-
-    /**
-     * Get the parent TestPackage containing the test.
-     *
-     * @return The parent TestPackage.
-     */
-    public TestPackage getTestPackage() {
-        return mParentCase.getParent().getParent();
-    }
-
-    /**
-     * Get the app package name space of this test.
-     *
-     * @return The app package name space of this test.
-     */
-    public String getAppNameSpace() {
-        TestPackage pkg = mParentCase.getParent().getParent();
-        return pkg.getAppNameSpace();
-    }
-
-    /**
-     * Get the full name of this test.
-     *
-     * @return The full name of this test.
-     */
-    public String getFullName() {
-        TestSuite suite = mParentCase.getParent();
-        return suite.getFullName() + "." + mParentCase.getName()
-                + METHOD_SEPARATOR + mName;
-    }
-
-    /**
-     * Set test result.
-     *
-     * @param result The result.
-     */
-    public void setResult(CtsTestResult result) {
-        if (isKnownFailure()) {
-            result.reverse();
-        }
-        mResult = result;
-        CUIOutputStream.println("(" + mResult.getResultString() + ")");
-        if (!mResult.isPass()) {
-            String failedMessage = result.getFailedMessage();
-            String stackTrace = result.getStackTrace();
-            if (failedMessage != null) {
-                CUIOutputStream.println(failedMessage);
-            }
-            if (stackTrace != null) {
-                CUIOutputStream.println(stackTrace);
-            }
-        }
-        setEndTime(System.currentTimeMillis());
-
-        ResultObserver.getInstance().notifyUpdate();
-    }
-
-    /**
-     * Add test result.
-     *
-     * @param result The result.
-     */
-    public void addResult(CtsTestResult result) {
-        if (isKnownFailure()) {
-            result.reverse();
-        }
-        mResult = result;
-    }
-
-    /**
-     * Get the result.
-     *
-     * @return the result.
-     */
-    public CtsTestResult getResult() {
-        return mResult;
-    }
-
-    /**
-     * Set start Test time.
-     *
-     * @param time The start time.
-     */
-    public void setStartTime(final long time) {
-        mStartTime = time;
-    }
-
-    /**
-     * Set end Test time.
-     *
-     * @param time The end time.
-     */
-    public void setEndTime(final long time) {
-        mEndTime = time;
-    }
-
-    /**
-     * Get Test start time.
-     *
-     * @return The start time.
-     */
-    public long getStartTime() {
-        return mStartTime;
-    }
-
-    /**
-     * Get Test end time.
-     *
-     * @return The end time.
-     */
-    public long getEndTime() {
-        return mEndTime;
-    }
-
-    /**
-     * Print the message without appending the new line mark.
-     *
-     * @param msg the message to be print.
-     */
-    protected void print(final String msg) {
-        if (!mTestStop) {
-            CUIOutputStream.print(msg);
-        }
-    }
-
-    /**
-     * The timer task which aids in guarding the running test
-     * with the guarding timer. If the executing of the test
-     * is not finished, and the guarding timer is expired,
-     * this task will be executed to force the finish of the
-     * running test.
-     */
-    class TimeOutTask extends TimerTask {
-        private Test mTest;
-
-        public TimeOutTask(final Test testResult) {
-            mTest = testResult;
-        }
-
-        /** {@inheritDoc} */
-        @Override
-        public void run() {
-            mProgressObserver.stop();
-            synchronized (mTimeOutTimer) {
-                mTimeOutTimer.cancel(true);
-                mTimeOutTimer.sendNotify();
-            }
-
-            Log.d("mTimeOutTimer timed out");
-
-            if (!mTestStop) {
-                mTest.setResult(
-                        new CtsTestResult(CtsTestResult.CODE_TIMEOUT, null, null));
-            }
-
-            killDeviceProcess(mTest.getAppNameSpace());
-        }
-    }
-
-    /**
-     * Kill the device process.
-     *
-     * @param packageName The package name.
-     */
-    private void killDeviceProcess(final String packageName) {
-        mDevice.killProcess(packageName);
-    }
-
-    /**
-     * Set test stopped.
-     *
-     * @param testStopped If true, it's stopped. Else, still running.
-     */
-    public void setTestStopped(final boolean testStopped) {
-        mTestStop = testStopped;
-    }
-
-    /**
-     * Run the test over device given.
-     *
-     * @param device the device to run the test.
-     */
-    public void run(final TestDevice device) throws DeviceDisconnectedException,
-            ADBServerNeedRestartException {
-
-        if ((getName() == null) || (getName().length() == 0)) {
-            return;
-        }
-
-        if (TestSession.exceedsMaxCount()) {
-            throw new ADBServerNeedRestartException("Test count reached overflow point");
-        } else {
-            TestSession.incTestCount();
-        }
-
-        mTestStop = false;
-        mDevice = device;
-        mTimeOutTimer = new HostTimer(new TimeOutTask(this),
-                HostConfig.Ints.individualStartTimeoutMs.value());
-        mTimeOutTimer.start();
-        mProgressObserver = new ProgressObserver();
-        mProgressObserver.start();
-
-        setStartTime(System.currentTimeMillis());
-        String testFullName = getFullName();
-        print(testFullName + "...");
-
-        runImpl();
-
-        synchronized (mTimeOutTimer) {
-            if (!mTestStop) {
-                try {
-                    mTimeOutTimer.waitOn();
-                } catch (InterruptedException e) {
-                    Log.d("time out object interrupted");
-                }
-            }
-
-            mProgressObserver.stop();
-            if (mTimeOutTimer.isTimeOut()) {
-                return;
-            } else {
-                //not caused by timer timing out
-                //need to cancel timer
-                mTimeOutTimer.cancel(false);
-            }
-        }
-
-        setResult(mResult);
-    }
-
-    /**
-     * Implementation of running test.
-     */
-    protected void runImpl() throws DeviceDisconnectedException {
-        mDevice.runTest(this);
-    }
-
-    /**
-     * Notify the result.
-     *
-     * @param result The result.
-     */
-    public void notifyResult(CtsTestResult result) {
-
-        Log.d("Test.notifyResult() is called. (Test.getFullName()=" + getFullName());
-        mResult = result;
-        if (mTimeOutTimer != null) {
-            synchronized (mTimeOutTimer) {
-                // set result again in case timeout just happened
-                mResult = result;
-                Log.d("notifyUpdateResult() detects that it needs to cancel mTimeOutTimer");
-                if (mTimeOutTimer != null) {
-                    mTimeOutTimer.sendNotify();
-                }
-            }
-        }
-    }
-
-    /** {@inheritDoc} */
-    public void notifyInstallingComplete(final int resultCode) {
-    }
-
-    /** {@inheritDoc} */
-    public void notifyUninstallingComplete(final int resultCode) {
-    }
-
-    /** {@inheritDoc} */
-    public void notifyInstallingTimeout(final TestDevice testDevice) {
-    }
-
-    /** {@inheritDoc} */
-    public void notifyUninstallingTimeout(final TestDevice testDevice) {
-    }
-
-    /** {@inheritDoc} */
-    public void notifyTestingDeviceDisconnected() {
-        Log.d("Test.notifyTestingDeviceDisconnected() is called");
-        if (mProgressObserver != null) {
-            mProgressObserver.stop();
-        }
-
-        if (mTimeOutTimer != null) {
-            synchronized (mTimeOutTimer) {
-                mTimeOutTimer.cancel(false);
-                mTimeOutTimer.sendNotify();
-            }
-        }
-    }
-}
-
diff --git a/tools/host/src/com/android/cts/TestCase.java b/tools/host/src/com/android/cts/TestCase.java
deleted file mode 100644
index 799dc15..0000000
--- a/tools/host/src/com/android/cts/TestCase.java
+++ /dev/null
@@ -1,253 +0,0 @@
-/*
- * Copyright (C) 2008 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 com.android.cts;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Iterator;
-
-/**
- * Correspond to junit's test case, provide functions on
- * storing and executing a test case from CTS test harness.
- */
-public class TestCase implements DeviceObserver {
-    private TestSuite mParentSuite;
-    private Collection<Test> mTests;
-    private String mName;
-    private String mPriority;
-
-    private Test mCurrentTest;
-    private boolean mTestStop;
-
-    public TestCase(final TestSuite suite, final String name, final String priority) {
-        mParentSuite = suite;
-        mName = name;
-        mPriority = priority;
-        mTests = new ArrayList<Test>();
-
-        mTestStop = false;
-        mCurrentTest = null;
-    }
-
-    /**
-     * Get parent suite;
-     *
-     * @return Parent suite.
-     */
-    public TestSuite getParent() {
-        return mParentSuite;
-    }
-
-    /**
-     * Get the case name of this case.
-     *
-     * @return The case name of this test case.
-     */
-    public String getName() {
-        return mName;
-    }
-
-    /**
-     * Get the full name of this test case.
-     *
-     * @return The full name of this test case.
-     */
-    public String getFullName() {
-        TestSuite suite = getParent();
-        return suite.getFullName() + "." + getName();
-    }
-
-    /**
-     * Get the priority of this test case.
-     *
-     * @return The priority of this test case.
-     */
-    public String getPriority() {
-        return mPriority;
-    }
-
-    /**
-     * Add a specific test.
-     *
-     * @param test The test to be added.
-     */
-    public void addTest(Test test) {
-        mTests.add(test);
-    }
-
-    /**
-     * Get the tests under this test case.
-     *
-     * @return The tests under this test case.
-     */
-    public Collection<Test> getTests() {
-        return mTests;
-    }
-
-    /**
-     * Get the excluded list according to the execution status of each test.
-     *
-     * @param resultType The result type to filter the tests.
-     * @return All excluded list.
-     */
-    public ArrayList<String> getExcludedList(final String resultType) {
-        ArrayList<String> excludedList = new ArrayList<String>();
-
-        for (Test test : getTests()) {
-            if (resultType == null) {
-                //all result type except PASS will be excluded
-                if (test.getResult().isPass()) {
-                    excludedList.add(test.getFullName());
-                }
-            } else {
-                //the result type given by resultType will be excluded
-                if (!test.getResult().getResultString().equals(resultType)) {
-                    excludedList.add(test.getFullName());
-                }
-            }
-        }
-
-        if (excludedList.size() == getTests().size()) {
-            //the whole case is excluded, just need to add the full case name
-            excludedList.removeAll(excludedList);
-            excludedList.add(getFullName());
-        }
-        return excludedList;
-    }
-
-    /**
-     * Get all test names contained in the test case.
-     *
-     * @return All test names.
-     */
-    public ArrayList<String> getAllTestNames() {
-        ArrayList<String> testNameList = new ArrayList<String>();
-        for (Test test : getTests()) {
-            testNameList.add(test.getFullName());
-        }
-        return testNameList;
-    }
-
-    /**
-     * Search test in this test case.
-     *
-     * @param testName The test name to be searched against.
-     * @return null if not found, or return founded test
-     */
-    public Test searchTest(final String testName) {
-        String sName = mParentSuite.getFullName();
-        String caseFullName = sName + "." + mName;
-        int index = 0;
-        int testNameStartIndex = testName.lastIndexOf('#') + 1;
-
-        Log.d("searchTest(): testName=" + testName + ",caseFullName=" + caseFullName);
-
-        if (testName.substring(index).startsWith(caseFullName + Test.METHOD_SEPARATOR)) {
-            index += caseFullName.length() + 1;
-        } else {
-            return null;
-        }
-
-        if (index == testNameStartIndex) {
-            String name = testName.substring(testNameStartIndex);
-            for (Test test : mTests) {
-                if (test.getName().equals(name)) {
-                    return test;
-                }
-            }
-        }
-
-        return null;
-    }
-
-    /**
-     * Set test stopped.
-     *
-     * @param testStopped If true, it's stopped. Else, still running.
-     */
-    public void setTestStopped(final boolean testStopped) {
-        mTestStop = testStopped;
-        if (mCurrentTest != null) {
-            mCurrentTest.setTestStopped(mTestStop);
-        }
-    }
-
-    /**
-     * Run the test case over device given.
-     *
-     * @param device The device to run the test case over.
-     */
-    public void run(final TestDevice device) throws DeviceDisconnectedException,
-            ADBServerNeedRestartException {
-        mTestStop = false;
-        Iterator<Test> tests = getTests().iterator();
-        while (tests.hasNext() && (!mTestStop)) {
-            mCurrentTest = tests.next();
-            if (mCurrentTest.getResult().isNotExecuted()) {
-                mCurrentTest.run(device);
-            }
-        }
-    }
-
-    /**
-     * Run the the specific test contained in the test case over device given.
-     *
-     * @param device The device to run the test over.
-     * @param test The specific test to be run.
-     */
-    public void run(final TestDevice device, final Test test)
-            throws DeviceDisconnectedException, ADBServerNeedRestartException {
-        mTestStop = false;
-        mCurrentTest = test;
-        mCurrentTest.run(device);
-    }
-
-    /** {@inheritDoc} */
-    public void notifyInstallingComplete(final int resultCode) {
-        if (mCurrentTest != null) {
-            mCurrentTest.notifyInstallingComplete(resultCode);
-        }
-    }
-
-    /** {@inheritDoc} */
-    public void notifyUninstallingComplete(final int resultCode) {
-        if (mCurrentTest != null) {
-            mCurrentTest.notifyUninstallingComplete(resultCode);
-        }
-    }
-
-    /** {@inheritDoc} */
-    public void notifyInstallingTimeout(final TestDevice testDevice) {
-        if (mCurrentTest != null) {
-            mCurrentTest.notifyInstallingTimeout(testDevice);
-        }
-    }
-
-    /** {@inheritDoc} */
-    public void notifyUninstallingTimeout(final TestDevice testDevice) {
-        if (mCurrentTest != null) {
-            mCurrentTest.notifyUninstallingTimeout(testDevice);
-        }
-    }
-
-    /** {@inheritDoc} */
-    public void notifyTestingDeviceDisconnected() {
-        if (mCurrentTest != null) {
-            mCurrentTest.notifyTestingDeviceDisconnected();
-        }
-    }
-}
diff --git a/tools/host/src/com/android/cts/TestController.java b/tools/host/src/com/android/cts/TestController.java
deleted file mode 100644
index d2943b0..0000000
--- a/tools/host/src/com/android/cts/TestController.java
+++ /dev/null
@@ -1,97 +0,0 @@
-/*
- * Copyright (C) 2008 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 com.android.cts;
-
-/**
- * Store the information of a test controller.
- *
- */
-public class TestController {
-    private String mJarPath;
-    private String mPackageName;
-    private String mClassName;
-    private String mMethodName;
-
-    public TestController(final String jarPath, final String packageName,
-            final String className, final String methodName) {
-        mJarPath = jarPath;
-        mPackageName = packageName;
-        mClassName = className;
-        mMethodName = methodName;
-    }
-
-    /**
-     * Get the jar file path of the controller.
-     *
-     * @return The jar file path of the controller.
-     */
-    public String getJarPath() {
-        return mJarPath;
-    }
-
-    /**
-     * Get the package name.
-     *
-     * @return The package name.
-     */
-    public String getPackageName() {
-        return mPackageName;
-    }
-
-    /**
-     * Get the class name.
-     *
-     * @return The class name.
-     */
-    public String getClassName() {
-        return mClassName;
-    }
-
-    /**
-     * Get the method name.
-     *
-     * @return The method name.
-     */
-    public String getMethodName() {
-        return mMethodName;
-    }
-
-    /**
-     * Get the full name of this test controller.
-     *
-     * @return The case name of this test.
-     */
-    public String getFullName() {
-        return mPackageName + "." + mClassName + Test.METHOD_SEPARATOR + mMethodName;
-    }
-
-    /**
-     * Check if it's a valid test controller.
-     *
-     * @return true if it's valid, else return false.
-     */
-    public boolean isValid() {
-        if ((mJarPath == null) || (mJarPath.length() == 0)
-                || (mPackageName == null) || (mPackageName.length() == 0)
-                || (mClassName == null) || (mClassName.length() == 0)
-                || (mMethodName == null) || (mMethodName.length() == 0)) {
-            return false;
-        } else {
-            return true;
-        }
-    }
-}
diff --git a/tools/host/src/com/android/cts/TestDevice.java b/tools/host/src/com/android/cts/TestDevice.java
deleted file mode 100644
index dcedc02..0000000
--- a/tools/host/src/com/android/cts/TestDevice.java
+++ /dev/null
@@ -1,1937 +0,0 @@
-/*
-* Copyright (C) 2008 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 com.android.cts;
-
-import com.android.ddmlib.AdbCommandRejectedException;
-import com.android.ddmlib.Client;
-import com.android.ddmlib.ClientData;
-import com.android.ddmlib.IDevice;
-import com.android.ddmlib.IShellOutputReceiver;
-import com.android.ddmlib.MultiLineReceiver;
-import com.android.ddmlib.NullOutputReceiver;
-import com.android.ddmlib.RawImage;
-import com.android.ddmlib.ShellCommandUnresponsiveException;
-import com.android.ddmlib.SyncException;
-import com.android.ddmlib.SyncService;
-import com.android.ddmlib.TimeoutException;
-import com.android.ddmlib.SyncService.ISyncProgressMonitor;
-import com.android.ddmlib.log.LogReceiver;
-import com.android.ddmlib.log.LogReceiver.ILogListener;
-
-import android.tests.getinfo.DeviceInfoConstants;
-
-import java.io.BufferedReader;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Timer;
-import java.util.TimerTask;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-/**
- * Manage the testing target device for<br>
- * <ul>
- *    <li> install/uninstall test package, and
- *    <li> execute command on device
- *    <li> get command feedback from standard output
- * </ul>
- */
-public class TestDevice implements DeviceObserver {
-    private static final String DEVICE_SETUP_APK = "TestDeviceSetup";
-    private static final String DEVICE_SETUP_APP_PACKAGE_NAME = "android.tests.devicesetup";
-    private static final String DEFAULT_TEST_RUNNER_NAME =
-                                  "android.test.InstrumentationTestRunner";
-    private static final String ACTION_INSTALL = "install";
-    private static final String ACTION_UNINSTALL = "uninstall";
-    private static final String ACTION_GET_DEV_INFO = "getDeviceInfo";
-    private static final String sInstrumentResultExpr = "INSTRUMENTATION_RESULT: (\\S+)=(.+)";
-
-    public static final int STATUS_IDLE = 0;
-    public static final int STATUS_BUSY = STATUS_IDLE + 1;
-    public static final int STATUS_OFFLINE = STATUS_IDLE + 2;
-    private static final String STATUS_STR_IDLE = "idle";
-    private static final String STATUS_STR_IN_USE = "in use";
-    private static final String STATUS_STR_OFFLINE = "offline";
-
-    /** Interval [ms] for polling a device until boot is completed. */
-    private static final int REBOOT_POLL_INTERVAL = 5000;
-    /** Number of times a booting device should be polled before we give up. */
-    private static final int REBOOT_POLL_COUNT = 10 * 60 * 1000 / REBOOT_POLL_INTERVAL;
-    /** Max time [ms] to wait for <code>adb shell getprop</code> to return a result. */
-    private static final int GETPROP_TIMEOUT = 5000;
-
-    public static final Pattern INSTRUMENT_RESULT_PATTERN;
-
-    private BatchModeResultParser mBatchModeResultParser;
-
-    private DeviceObserver mDeviceObserver;
-    private IDevice mDevice;
-    private DeviceParameterCollector mDeviceInfo;
-
-    private SyncService mSyncService;
-
-    private PackageActionObserver mUninstallObserver;
-
-    private int mStatus;
-    private static HashMap<Integer, String> mStatusMap;
-    private PackageActionTimer mPackageActionTimer;
-
-    private ObjectSync mObjectSync;
-
-    private MultiplexingLogListener logListener = new MultiplexingLogListener();
-    private LogReceiver logReceiver = new LogReceiver(logListener);
-
-    private class LogServiceThread extends Thread {
-        @Override
-        public void run() {
-            try {
-                mDevice.runLogService("main", logReceiver);
-            } catch (IOException e) {
-            } catch (TimeoutException e) {
-            } catch (AdbCommandRejectedException e) {
-            }
-        }
-
-        /**
-         * Cancel logging and exit this thread.
-         */
-        public void cancelLogService() {
-            // this will cause the loop in our run method to
-            // exit, terminating this thread.
-            logReceiver.cancel();
-        }
-    }
-
-    private LogServiceThread logServiceThread;
-
-    static {
-        INSTRUMENT_RESULT_PATTERN = Pattern.compile(sInstrumentResultExpr);
-        mStatusMap = new HashMap<Integer, String>();
-        mStatusMap.put(STATUS_IDLE, STATUS_STR_IDLE);
-        mStatusMap.put(STATUS_BUSY, STATUS_STR_IN_USE);
-        mStatusMap.put(STATUS_OFFLINE, STATUS_STR_OFFLINE);
-    }
-
-    // This constructor just for unit test
-    TestDevice(final String serialNumber) {
-        mDeviceInfo = new DeviceParameterCollector();
-        mDeviceInfo.setSerialNumber(serialNumber);
-    }
-
-    public TestDevice(IDevice device) {
-        mDevice = device;
-        try {
-            mSyncService = mDevice.getSyncService();
-        } catch (IOException e) {
-            // FIXME: handle failed connection.
-        } catch (TimeoutException e) {
-            // FIXME: handle failed connection.
-        } catch (AdbCommandRejectedException e) {
-            // FIXME: handle failed connection.
-        }
-        mBatchModeResultParser = null;
-        mUninstallObserver = new PackageActionObserver(ACTION_UNINSTALL);
-        mStatus = STATUS_IDLE;
-        mDeviceInfo = new DeviceParameterCollector();
-        mPackageActionTimer = new PackageActionTimer();
-        mObjectSync = new ObjectSync();
-    }
-
-    /**
-     * Gets this device's information.
-     *
-     * Assumes that the test device setup apk is already installed.
-     * See {@link #installDeviceSetupApp()}.
-     *
-     * @return information of this device.
-     */
-    public DeviceParameterCollector getDeviceInfo()
-                throws DeviceDisconnectedException, InvalidNameSpaceException,
-                InvalidApkPathException {
-        if (mDeviceInfo.size() == 0) {
-            logServiceThread = new LogServiceThread();
-            logServiceThread.start();
-            genDeviceInfo();
-        }
-        return mDeviceInfo;
-    }
-
-    /**
-     * Attempt to disable the screen guard on device.
-     *
-     * Assumes the test device setup apk is already installed.
-     * See {@link #installDeviceSetupApp()}.
-     *
-     * Note: uninstalling the device setup app {@link #uninstallDeviceSetupApp()} will re-enable
-     * keyguard.
-     *
-     * @throws DeviceDisconnectedException
-     */
-    public void disableKeyguard () throws DeviceDisconnectedException {
-        final String commandStr = "am broadcast -a android.tests.util.disablekeyguard";
-        Log.d(commandStr);
-
-        executeShellCommand(commandStr, new NullOutputReceiver());
-    }
-
-    /**
-     * Return the Device instance associated with this TestDevice.
-     */
-    public IDevice getDevice() {
-        return mDevice;
-    }
-
-    class RestartPropReceiver extends MultiLineReceiver {
-        private boolean mRestarted;
-        private boolean mCancelled;
-        private boolean mDone;
-
-        @Override
-        public void processNewLines(String[] lines) {
-            for (String line : lines) {
-                if (line.trim().equals("1")) {
-                    mRestarted = true;
-                }
-            }
-        }
-        @Override
-        public void done() {
-            synchronized(this) {
-                mDone = true;
-                this.notifyAll();
-            }
-        }
-
-        public boolean isCancelled() {
-            return mCancelled;
-        }
-
-        boolean hasRestarted(long timeout) {
-            try {
-                synchronized (this) {
-                    if (!mDone) {
-                        this.wait(timeout);
-                    }
-                }
-            } catch (InterruptedException e) {
-                // ignore
-            }
-            mCancelled = true;
-            return mRestarted;
-        }
-    }
-
-    /**
-     * Wait until device indicates that boot is complete.
-     *
-     * @return true if the device has completed the boot process, false if it does not, or the
-     * device does not respond.
-     */
-    public boolean waitForBootComplete() throws DeviceDisconnectedException {
-        Log.d("probe device status...");
-
-        mDeviceInfo.set(DeviceParameterCollector.SERIAL_NUMBER, getSerialNumber());
-        mObjectSync = new ObjectSync();
-
-        // reset device observer
-        DeviceObserver tmpDeviceObserver = mDeviceObserver;
-        mDeviceObserver = this;
-
-        int retries = 0;
-        boolean success = false;
-        while (!success && (retries < REBOOT_POLL_COUNT)) {
-            Log.d("Waiting for device to complete boot");
-            RestartPropReceiver rpr = new RestartPropReceiver();
-            this.executeShellCommand("getprop dev.bootcomplete", rpr);
-            success = rpr.hasRestarted(GETPROP_TIMEOUT);
-            if (!success) {
-                try {
-                    Thread.sleep(REBOOT_POLL_INTERVAL);
-                } catch (InterruptedException e) {
-                    // ignore and retry
-                }
-                retries += 1;
-            }
-        }
-        mDeviceObserver = tmpDeviceObserver;
-        if (success) {
-            Log.d("Device boot complete");
-        }
-        return success;
-    }
-
-    /**
-     * Run device information collector command to got the device info.
-     */
-    private void genDeviceInfo() throws DeviceDisconnectedException,
-                InvalidNameSpaceException, InvalidApkPathException {
-        mDeviceInfo.set(DeviceParameterCollector.SERIAL_NUMBER, getSerialNumber());
-        // run shell command to run device information collector
-        Log.d("run device information collector");
-        runDeviceInfoCollectorCommand();
-        waitForCommandFinish();
-    }
-
-    /**
-     * Uninstall the device setup apk from device.
-     *
-     * See {@link #installDeviceSetupApp}
-     *
-     * @throws DeviceDisconnectedException
-     * @throws InvalidNameSpaceException
-     */
-    public void uninstallDeviceSetupApp() throws DeviceDisconnectedException,
-            InvalidNameSpaceException {
-        // reset device observer
-        DeviceObserver tmpDeviceObserver = mDeviceObserver;
-        mDeviceObserver = this;
-        Log.d("uninstall get info ...");
-        uninstallAPK(DEVICE_SETUP_APP_PACKAGE_NAME);
-        waitForCommandFinish();
-        Log.d("uninstall device information collector successfully");
-        mDeviceObserver = tmpDeviceObserver;
-    }
-
-    /**
-     * Install the device setup apk on the device.
-     *
-     * @throws DeviceDisconnectedException
-     * @throws InvalidApkPathException
-     */
-    public void installDeviceSetupApp() throws DeviceDisconnectedException, InvalidApkPathException {
-        String apkPath = HostConfig.getInstance().getCaseRepository().getApkPath(DEVICE_SETUP_APK);
-        if (!HostUtils.isFileExist(apkPath)) {
-            Log.e("File doesn't exist: " + apkPath, null);
-            return;
-        }
-
-        Log.d("installing " + DEVICE_SETUP_APK + " apk");
-        mObjectSync = new ObjectSync();
-
-        // reset device observer
-        DeviceObserver tmpDeviceObserver = mDeviceObserver;
-        mDeviceObserver = this;
-
-        Log.d("install get info ...");
-        installAPK(apkPath);
-        waitForCommandFinish();
-        mDeviceObserver = tmpDeviceObserver;
-    }
-
-    /**
-     * Run command to collect device info.
-     */
-    private void runDeviceInfoCollectorCommand() throws DeviceDisconnectedException {
-        final String commandStr = "am instrument -w -e bundle true "
-            + String.format("%s/android.tests.getinfo.DeviceInfoInstrument",
-                    DEVICE_SETUP_APP_PACKAGE_NAME);
-        Log.d(commandStr);
-
-        mPackageActionTimer.start(ACTION_GET_DEV_INFO, this);
-        executeShellCommand(commandStr, new DeviceInfoReceiver(mDeviceInfo));
-    }
-
-    /**
-     * Receiver which receives and parses the device information.
-     */
-    final class DeviceInfoReceiver extends MultiLineReceiver {
-
-        private ArrayList<String> mResultLines = new ArrayList<String>();
-        private DeviceParameterCollector mDeviceParamCollector;
-
-        public DeviceInfoReceiver(DeviceParameterCollector paramCollector) {
-            super();
-            mDeviceParamCollector = paramCollector;
-            setTrimLine(false);
-        }
-
-        /** {@inheritDoc} */
-        @Override
-        public void processNewLines(String[] lines) {
-            for (String line : lines) {
-                mResultLines.add(line);
-            }
-        }
-
-        /** {@inheritDoc} */
-        public boolean isCancelled() {
-            return false;
-        }
-
-        /** {@inheritDoc} */
-        @Override
-        public void done() {
-            super.done();
-            String key, value;
-            for (String line : mResultLines) {
-                Matcher matcher = INSTRUMENT_RESULT_PATTERN.matcher(line);
-                if (matcher.matches()) {
-                    key = matcher.group(1);
-                    value = matcher.group(2);
-                    mDeviceParamCollector.set(key, value);
-                }
-            }
-
-            synchronized(mObjectSync) {
-                mObjectSync.sendNotify();
-            }
-        }
-
-    }
-
-    /**
-     * Store the build information of a device
-     */
-    public static final class DeviceParameterCollector implements DeviceInfoConstants {
-
-        private HashMap<String, String> mInfoMap;
-
-        public DeviceParameterCollector() {
-            mInfoMap = new HashMap<String, String>();
-        }
-
-        /**
-         * Set the pair of key and value of device information.
-         *
-         * @param key The key of the pair.
-         * @param value The value of the pair.
-         */
-        public void set(final String key, final String value) {
-            mInfoMap.put(key, value);
-        }
-
-        /**
-         * Return the number of device info items which stored in.
-         *
-         * @return the number of device info items which stored in.
-         */
-        public int size() {
-            return mInfoMap.size();
-        }
-
-        /**
-         * Set the build finger print.
-         *
-         * @param buildFingerPrint The build finger print.
-         */
-        public void setBuildFingerPrint(final String buildFingerPrint) {
-            mInfoMap.put(BUILD_FINGERPRINT, buildFingerPrint);
-        }
-
-        /**
-         * Set the build tags.
-         *
-         * @param buildTags The build tags.
-         */
-        public void setBuildTags(final String buildTags) {
-            mInfoMap.put(BUILD_TAGS, buildTags);
-        }
-
-        /**
-         * Set build type.
-         *
-         * @param buildType The build type.
-         */
-        public void setBuildType(final String buildType) {
-            mInfoMap.put(BUILD_TYPE, buildType);
-        }
-
-        /**
-         * Set the build model.
-         *
-         * @param buildModel The build model.
-         */
-        public void setBuildModel(final String buildModel) {
-            mInfoMap.put(BUILD_MODEL, buildModel);
-        }
-
-        /**
-         * Set the build brand.
-         *
-         * @param buildBrand The build brand.
-         */
-        public void setBuildBrand(final String buildBrand) {
-            mInfoMap.put(BUILD_BRAND, buildBrand);
-        }
-
-        /**
-         * Set the build board.
-         *
-         * @param buildBoard The build board.
-         */
-        public void setBuildBoard(final String buildBoard) {
-            mInfoMap.put(BUILD_BOARD, buildBoard);
-        }
-
-        /**
-         * Set the build device.
-         *
-         * @param buildDevice The build device.
-         */
-        public void setBuildDevice(final String buildDevice) {
-            mInfoMap.put(BUILD_DEVICE, buildDevice);
-        }
-
-        /**
-         * Set the build abi
-         *
-         * @param buildAbi The build ABI
-         */
-        public void setBuildAbi(final String buildAbi) {
-            mInfoMap.put(BUILD_ABI, buildAbi);
-        }
-
-        /**
-         * Set the build abi2
-         *
-         * @param buildAbi The build ABI2
-         */
-        public void setBuildAbi2(final String buildAbi2) {
-            mInfoMap.put(BUILD_ABI2, buildAbi2);
-        }
-
-        /**
-         * set the serialNumber of this device
-         *
-         * @param serialNumber The serial number.
-         */
-        public void setSerialNumber(final String serialNumber) {
-            mInfoMap.put(SERIAL_NUMBER, serialNumber);
-        }
-
-        /**
-         * set the build id
-         *
-         * @param bldId The build ID.
-         */
-        public void setBuildId(final String bldId) {
-            mInfoMap.put(BUILD_ID, bldId);
-        }
-
-        /**
-         * set the build version
-         *
-         * @param bldVer The build version.
-         */
-        public void setBuildVersion(final String bldVer) {
-            mInfoMap.put(BUILD_VERSION, bldVer);
-        }
-
-        /**
-         * set the product name
-         **
-         * @param productName The product name.
-         */
-        public void setProductName(final String productName) {
-            mInfoMap.put(PRODUCT_NAME, productName);
-        }
-
-        /**
-         * Get the build finger print.
-         *
-         * @return The build finger print.
-         */
-        public String getBuildFingerPrint() {
-            return mInfoMap.get(BUILD_FINGERPRINT);
-        }
-
-        /**
-         * Get the build tags.
-         *
-         * @return The build tags.
-         */
-        public String getBuildTags() {
-            return mInfoMap.get(BUILD_TAGS);
-        }
-
-        /**
-         * Get build type.
-         *
-         * @return The build type.
-         */
-        public String getBuildType() {
-            return mInfoMap.get(BUILD_TYPE);
-        }
-
-        /**
-         * Get the build model.
-         *
-         * @return The build model.
-         */
-        public String getBuildModel() {
-            return mInfoMap.get(BUILD_MODEL);
-        }
-
-        /**
-         * Get the build manufacturer.
-         *
-         * @return The build manufacturer.
-         */
-        public String getBuildManufacturer() {
-            return mInfoMap.get(BUILD_MANUFACTURER);
-        }
-
-        /**
-         * Get the build brand.
-         *
-         * @return The build brand.
-         */
-        public String getBuildBrand() {
-            return mInfoMap.get(BUILD_BRAND);
-        }
-
-        /**
-         * Get the build board.
-         *
-         * @return The build board.
-         */
-        public String getBuildBoard() {
-            return mInfoMap.get(BUILD_BOARD);
-        }
-
-        /**
-         * Get the build device.
-         *
-         * @return The build device.
-         */
-        public String getBuildDevice() {
-            return mInfoMap.get(BUILD_DEVICE);
-        }
-
-        /**
-         * Get the build ABI.
-         *
-         * @return The build ABI.
-         */
-        public String getBuildAbi() {
-            return mInfoMap.get(BUILD_ABI);
-        }
-
-        /**
-         * Get the build ABI2.
-         *
-         * @return The build ABI2.
-         */
-        public String getBuildAbi2() {
-            return mInfoMap.get(BUILD_ABI2);
-        }
-
-        /**
-         * get the build id
-         **
-         * @return The build ID.
-         */
-        public String getBuildId() {
-            return mInfoMap.get(BUILD_ID);
-        }
-
-        /**
-         * get the build version
-         **
-         * @return The build version.
-         */
-        public String getBuildVersion() {
-            return mInfoMap.get(BUILD_VERSION);
-        }
-
-        /**
-         * get the product name
-         *
-         * @return The product name.
-         */
-        public String getProductName() {
-            return mInfoMap.get(PRODUCT_NAME);
-        }
-
-        /**
-         * get the serial number
-         *
-         * @return The serial number.
-         */
-        public String getSerialNumber() {
-            return mInfoMap.get(SERIAL_NUMBER);
-        }
-
-        public String getScreenSize() {
-            return mInfoMap.get(SCREEN_SIZE);
-        }
-
-        /**
-         * Return screen resolution(width x height)
-         *
-         * @return The screen resolution.
-         */
-        public String getScreenResolution() {
-            return mInfoMap.get(RESOLUTION);
-        }
-
-        /**
-         * Return logical screen density
-         *
-         * @return The logical screen density.
-         */
-        public String getScreenDensity() {
-            return mInfoMap.get(SCREEN_DENSITY);
-        }
-
-        /**
-         * Return the probable screen density bucket
-         *
-         * @return The probable screen density bucket.
-         */
-        public String getScreenDensityBucket() {
-            return mInfoMap.get(SCREEN_DENSITY_BUCKET);
-        }
-
-        /**
-         * Get Android platform version.
-         *
-         * @return The Android platform version.
-         */
-        public String getAndroidPlatformVersion() {
-            return mInfoMap.get(VERSION_SDK);
-        }
-
-        /**
-         * Get supported locales.
-         *
-         * @return The supported locales.
-         */
-        public String getLocales() {
-            return mInfoMap.get(LOCALES);
-        }
-
-        /**
-         * Get x dip
-         *
-         * @return The X dip.
-         */
-        public String getXdpi() {
-            return mInfoMap.get(SCREEN_X_DENSITY);
-        }
-
-        /**
-         * Get y dip
-         *
-         * @return The y dip.
-         */
-        public String getYdpi() {
-            return mInfoMap.get(SCREEN_Y_DENSITY);
-        }
-
-        /**
-         * Get touch information
-         *
-         * @return The touch screen information.
-         */
-        public String getTouchInfo() {
-            return mInfoMap.get(TOUCH_SCREEN);
-        }
-
-        /**
-         * Get navigation information
-         *
-         * @return The navigation information.
-         */
-        public String getNavigation() {
-            return mInfoMap.get(NAVIGATION);
-        }
-
-        /**
-         * Get keypad information
-         *
-         * @return The keypad information.
-         */
-        public String getKeypad() {
-            return mInfoMap.get(KEYPAD);
-        }
-
-        /**
-         * Get network information
-         *
-         * @return The network information.
-         */
-        public String getNetwork() {
-            return mInfoMap.get(NETWORK);
-        }
-
-        /**
-         * Get IMEI
-         *
-         * @return IMEI.
-         */
-        public String getIMEI() {
-            return mInfoMap.get(IMEI);
-        }
-
-        /**
-         * Get IMSI
-         *
-         * @return IMSI.
-         */
-        public String getIMSI() {
-            return mInfoMap.get(IMSI);
-        }
-
-        /**
-         * Get phone number
-         *
-         * @return Phone number.
-         */
-        public String getPhoneNumber() {
-            return mInfoMap.get(PHONE_NUMBER);
-        }
-
-        /**
-         * Get features.
-         *
-         * @return Features.
-         */
-        public String getFeatures() {
-            return mInfoMap.get(FEATURES);
-        }
-
-        /**
-         * Get processes.
-         *
-         * @return Processes.
-         */
-        public String getProcesses() {
-            return mInfoMap.get(PROCESSES);
-        }
-
-        /**
-         * Get Open GL ES version.
-         *
-         * @return version or error message.
-         */
-        public String getOpenGlEsVersion() {
-            return mInfoMap.get(OPEN_GL_ES_VERSION);
-        }
-
-        /**
-         * Get partitions.
-         *
-         * @return partitions or error message.
-         */
-        public String getPartitions() {
-            return mInfoMap.get(PARTITIONS);
-        }
-    }
-
-    /**
-     * Get the serial number of the  {@link TestDevice}.
-     *
-     * @return the serial number of the {@link TestDevice}
-     */
-    public String getSerialNumber() {
-        if (mDevice == null) {
-            return mDeviceInfo.getSerialNumber();
-        }
-        return mDevice.getSerialNumber();
-    }
-
-    /**
-     * Run a specified test.
-     *
-     * @param test The test to be run.
-     */
-    public void runTest(Test test) throws DeviceDisconnectedException {
-
-        final String appNameSpace = test.getAppNameSpace();
-        String runner = test.getInstrumentationRunner();
-        if (runner == null) {
-            runner = DEFAULT_TEST_RUNNER_NAME;
-        }
-
-        // need to doubly escape any '$' chars in the name since this string is
-        // passed through two shells \\\$ -> \$ -> $
-        final String testName = test.getFullName().replaceAll("\\$", "\\\\\\$");
-
-        final String commandStr = "am instrument -w -r -e class " + testName
-                + " " + appNameSpace + "/" + runner;
-        Log.d(commandStr);
-        executeShellCommand(commandStr, new IndividualModeResultParser(test));
-    }
-
-    /**
-     * Run a test package in batch mode.
-     *
-     * @param testPackage The testPackage to be run.
-     * @param javaPkgName The java package name. If null, run the whole test package;
-     *              else, run the specified java package contained in the test package
-     */
-    public void runInBatchMode(TestPackage testPackage, final String javaPkgName)
-                throws DeviceDisconnectedException {
-        String appNameSpace = testPackage.getAppNameSpace();
-        String runner = testPackage.getInstrumentationRunner();
-        if (runner == null) {
-            runner = DEFAULT_TEST_RUNNER_NAME;
-        }
-
-        String name = testPackage.getAppPackageName();
-        if ((javaPkgName != null) && !javaPkgName.isEmpty()) {
-            name = javaPkgName;
-        }
-
-        String cmdHeader = "am instrument -w -r -e package " + name + " ";
-        final String commandStr = cmdHeader + appNameSpace + "/" + runner;
-        Log.d(commandStr);
-
-        mBatchModeResultParser = new BatchModeResultParser(testPackage);
-        executeShellCommand(commandStr, mBatchModeResultParser);
-    }
-
-    /**
-     * Run a in batch mode of a TestPackage.
-     *
-     * @param testPackage The testPackage to be run.
-     * @param javaClassName The java class name.
-     */
-    public void runTestCaseInBatchMode(TestPackage testPackage, final String javaClassName,
-            String profile) throws DeviceDisconnectedException {
-        if (javaClassName == null) {
-            return;
-        }
-
-        String appNameSpace = testPackage.getAppNameSpace();
-        String runner = testPackage.getInstrumentationRunner();
-        if (runner == null) {
-            runner = DEFAULT_TEST_RUNNER_NAME;
-        }
-
-        String cmdHeader = "am instrument -w -r -e class " + javaClassName
-                + " -e profile " + profile + " ";
-        final String commandStr = cmdHeader + appNameSpace + "/" + runner;
-        Log.d(commandStr);
-
-        mBatchModeResultParser = new BatchModeResultParser(testPackage);
-        executeShellCommand(commandStr, mBatchModeResultParser);
-    }
-
-    /**
-     * Get clients.
-     *
-     * @return The clients.
-     */
-    public Client[] getClients() {
-        return mDevice.getClients();
-    }
-
-    /**
-     * Push a file to a given path.
-     *
-     * @param localPath The local path.
-     * @param remotePath The remote path.
-     */
-    public void pushFile(String localPath, String remotePath) {
-        try {
-            mSyncService.pushFile(localPath, remotePath, new PushMonitor());
-        } catch (TimeoutException e) {
-            Log.e("Uploading file failed: timeout", null);
-        } catch (SyncException e) {
-            Log.e("Uploading file failed: " + e.getMessage(), null);
-        } catch (FileNotFoundException e) {
-            Log.e("Uploading file failed: " + e.getMessage(), null);
-        } catch (IOException e) {
-            Log.e("Uploading file failed: " + e.getMessage(), null);
-        }
-    }
-
-    /**
-     * Install a specified APK using adb command install.
-     *
-     * @param apkPath Name of the package to be installed.
-     */
-    public void installAPK(final String apkPath) throws DeviceDisconnectedException,
-                InvalidApkPathException {
-        if ((apkPath == null) || (apkPath.length() == 0) || (!HostUtils.isFileExist(apkPath))) {
-            throw new InvalidApkPathException(apkPath);
-        }
-
-        // Use re-install directly
-        final String cmd = DeviceManager.getAdbLocation() + " -s "
-                + getSerialNumber() + " install -r " + apkPath;
-        Log.d(cmd);
-
-        mPackageActionTimer.start(ACTION_INSTALL, this);
-        executeCommand(cmd, new PackageActionObserver(ACTION_INSTALL));
-    }
-
-    /**
-     * Execute the given command.
-     *
-     * @param command The command to be executed.
-     * @param stdOutReceiver The receiver for handling the output from the device.
-     */
-    private void executeCommand(String command, StdOutObserver stdOutReceiver)
-                    throws DeviceDisconnectedException {
-        if (mStatus != STATUS_OFFLINE) {
-            try {
-                Process proc = Runtime.getRuntime().exec(command);
-
-                if (stdOutReceiver != null) {
-                    stdOutReceiver.setInputStream(proc.getInputStream());
-                }
-            } catch (IOException e) {
-                e.printStackTrace();
-            }
-        } else {
-            throw new DeviceDisconnectedException(getSerialNumber());
-        }
-    }
-
-    /**
-     * Standard output observer.
-     *
-     */
-    interface StdOutObserver {
-        /**
-         * set the input Stream.
-         */
-        public void setInputStream(InputStream is);
-
-        /**
-         * Process lines.
-         */
-        public void processLines() throws IOException;
-    }
-
-    /**
-     * Un-install APK.
-     *
-     * @param packageName The package to be un-installed.
-     */
-    public void uninstallAPK(String packageName) throws DeviceDisconnectedException,
-                InvalidNameSpaceException {
-        if ((packageName == null) || (packageName.length() == 0)) {
-            throw new InvalidNameSpaceException(packageName);
-        }
-
-        uninstallAPKImpl(packageName, mUninstallObserver);
-    }
-
-    /**
-     * The implementation of uninstalling APK.
-     *
-     * @param packageName The package to be uninstalled.
-     * @param observer The uninstall observer
-     */
-    private void uninstallAPKImpl(final String packageName, final PackageActionObserver observer)
-                throws DeviceDisconnectedException {
-        final String cmdStr = DeviceManager.getAdbLocation() + " -s "
-                      + getSerialNumber() + " uninstall " + packageName;
-        Log.d(cmdStr);
-        mPackageActionTimer.start(ACTION_UNINSTALL, this);
-        executeCommand(cmdStr, observer);
-    }
-
-    /**
-     * Package action(install/uninstall) timeout task
-     */
-    class PackageActionTimeoutTask extends TimerTask {
-
-        private String mAction;
-        private TestDevice mTargetDevice;
-
-        /**
-         * Task of package action timeout.
-         *
-         * @param action string of action
-         * @param testDevice the {@TestDevice} which got the timeout.
-         */
-        public PackageActionTimeoutTask(final String action,
-                TestDevice testDevice) {
-            mAction = action;
-            mTargetDevice = testDevice;
-        }
-
-        /** {@inheritDoc}*/
-        @Override
-        public void run() {
-            Log.d("PackageActionTimeoutTask.run(): mAction=" + mAction);
-            synchronized (mObjectSync) {
-                mObjectSync.sendNotify();
-            }
-
-            if (mAction.toLowerCase().equals(ACTION_INSTALL)) {
-                mDeviceObserver.notifyInstallingTimeout(mTargetDevice);
-            } else if (mAction.toLowerCase().equals(ACTION_UNINSTALL)) {
-                mDeviceObserver.notifyUninstallingTimeout(mTargetDevice);
-            } else if (mAction.toLowerCase().equals(ACTION_GET_DEV_INFO)) {
-                Log.e("Get device information timeout", null);
-            } else {
-                Log.e("Timeout: " + mAction, null);
-            }
-        }
-    }
-
-    /**
-     * Package action timer monitors the package action.
-     *
-     */
-    class PackageActionTimer {
-        private Timer mTimer;
-
-        /**
-         * Start the timer while package install/uninstall/getDeviceInfo/checkAPI.
-         *
-         * @param action The action of package.
-         * @param device The TestDevice the action is taken over.
-         */
-        private void start(final String action, final TestDevice device) {
-            start(action, HostConfig.Ints.packageInstallTimeoutMs.value(), device);
-        }
-
-        /**
-         * Start the timer while package install/uninstall/getDeviceInfo/checkAPI with specific
-         * timeout.
-         *
-         * @param action The action of package
-         * @param timeout The specific timeout
-         * @param device The TestDevice under operation
-         */
-        private void start(final String action, final int timeout, final TestDevice device) {
-            Log.d("start(), action=" + action + ",mTimer=" + mTimer + ",timeout=" + timeout);
-            synchronized (this) {
-                if (mTimer != null) {
-                    mTimer.cancel();
-                }
-
-                mTimer = new Timer();
-                mTimer.schedule(new PackageActionTimeoutTask(action, device), timeout);
-            }
-        }
-
-        /**
-         * Stop the action timer.
-         */
-        private void stop() {
-            synchronized (this) {
-                Log.d("stop() , mTimer=" + mTimer);
-                if (mTimer != null) {
-                    mTimer.cancel();
-                    mTimer = null;
-                }
-            }
-        }
-    }
-
-    /**
-     * The observer of package action, currently including installing and uninstalling.
-     */
-    final class PackageActionObserver implements StdOutObserver, Runnable {
-
-        private BufferedReader mReader;
-        private String mAction;
-
-        public PackageActionObserver(final String action) {
-            mAction = action;
-        }
-
-        /** {@inheritDoc} */
-        public void run() {
-            try {
-                processLines();
-            } catch (IOException e) {
-                e.printStackTrace();
-            } finally {
-                try {
-                    mReader.close();
-                } catch (IOException e) {
-                    e.printStackTrace();
-                }
-            }
-        }
-
-        /**
-         * Parse the standard out to judge where the installation is complete.
-         */
-        public void processLines() throws IOException {
-            String line = mReader.readLine();
-            int statusCode = DeviceObserver.FAIL;
-            boolean gotResult = false;
-
-            while (line != null) {
-                line = line.toLowerCase();
-                if (line.indexOf("success") != -1) {
-                    statusCode = DeviceObserver.SUCCESS;
-                    gotResult = true;
-                } else if (line.indexOf("failure") != -1) {
-                    statusCode = DeviceObserver.FAIL;
-                    CUIOutputStream.println(mAction.toLowerCase() + " met " + line);
-                    gotResult = true;
-                } else if (line.indexOf("error") != -1) {
-                    CUIOutputStream.println(mAction.toLowerCase() + " met " + line);
-                    statusCode = DeviceObserver.FAIL;
-                    gotResult = true;
-                }
-
-                if (gotResult) {
-                    Log.d(mAction + " calls stopPackageActionTimer()");
-                    mPackageActionTimer.stop();
-
-                    if (mDeviceObserver != null) {
-                        mDeviceObserver.notifyInstallingComplete(statusCode);
-                    }
-                    break;
-                }
-                line = mReader.readLine();
-            }
-        }
-
-        /** {@inheritDoc} */
-        public void setInputStream(InputStream is) {
-            mReader = new BufferedReader(new InputStreamReader(is));
-            new Thread(this).start();
-        }
-    }
-
-    /**
-     * Raw mode result parser.
-     */
-    abstract class RawModeResultParser extends MultiLineReceiver {
-        public final static String EQ_MARK = "=";
-        public final static String COMMA_MARK = ":";
-        public final static String AT_MARK = "at ";
-
-        public final static String STATUS_STREAM = "INSTRUMENTATION_STATUS: stream=";
-        public final static String STATUS_TEST = "INSTRUMENTATION_STATUS: test=";
-        public final static String STATUS_CLASS = "INSTRUMENTATION_STATUS: class=";
-        public final static String STATUS_CODE = "INSTRUMENTATION_STATUS_CODE:";
-        public final static String STATUS_STACK = "INSTRUMENTATION_STATUS: stack=";
-        public final static String STATUS_CURRENT = "INSTRUMENTATION_STATUS: current=";
-        public final static String STATUS_NUM = "INSTRUMENTATION_STATUS: numtests=";
-        public final static String STATUS_ERROR_STR = "INSTRUMENTATION_STATUS: Error=";
-
-        public final static String FAILURE = "Failure in ";
-        public final static String ASSERTION = "junit.framework.Assertion";
-
-        public final static String RESULT_STREAM = "INSTRUMENTATION_RESULT: stream=";
-        public final static String RESULT_CODE = "INSTRUMENTATION_CODE:";
-        public final static String RESULT = "Test results";
-        public final static String RESULT_TIME = "Time:";
-        public final static String RESULT_SUMMARY = "Tests run:";
-
-        public final static int STATUS_STARTING = 1;
-        public final static int STATUS_PASS = 0;
-        public final static int STATUS_FAIL = -1;
-        public final static int STATUS_ERROR = -2;
-        public final static int STATUS_OMITTED = -3;
-
-        private ArrayList<String> mResultLines;
-
-        public String mStackTrace;
-        public String mFailedMsg;
-        public int mResultCode;
-
-        public Test mTest;
-
-        public RawModeResultParser(Test test) {
-            super();
-
-            setTrimLine(false);
-
-            mTest = test;
-            mResultLines = new ArrayList<String>();
-            mStackTrace = null;
-            mFailedMsg = null;
-            mResultCode = CtsTestResult.CODE_FAIL;
-        }
-
-        /** {@inheritDoc} */
-        @Override
-        public void processNewLines(String[] lines) {
-            for (String line : lines) {
-                processNewLine(line.trim());
-            }
-        }
-
-        /**
-         * Process the new line.
-         *
-         * @param line The new line.
-         */
-        abstract public void processNewLine(final String line);
-
-        /**
-         * Get the result lines.
-         *
-         * @return The result lines.
-         */
-        public ArrayList<String> getResultLines() {
-            return mResultLines;
-        }
-
-        /**
-         * Get the named string from the string containing the mark.
-         *
-         * @param mark The mark to search against the results.
-         * @return The test name.
-         */
-        public String getNamedString(String mark) {
-            for (String line : mResultLines) {
-                if (line.startsWith(mark)) {
-                    String name = line.substring(line.indexOf(EQ_MARK) + 1);
-                    return name.trim();
-                }
-            }
-
-            return null;
-        }
-
-        /**
-         * Parse the int from the string containing the mark.
-         *
-         * @param mark The mark to search against the results.
-         * @return The number.
-         */
-        public int parseIntWithMark(String mark) {
-            for (String line : mResultLines) {
-                if (line.startsWith(mark)) {
-                    String code = line.substring(line.indexOf(EQ_MARK) + 1);
-                    return Integer.parseInt(code.trim());
-                }
-            }
-
-            return 0;
-        }
-
-        /**
-         * Get failed message.
-         *
-         * @return The failed message.
-         */
-        public String getFailedMessage() {
-            Iterator<String> iterator = mResultLines.iterator();
-            while (iterator.hasNext()) {
-                String line = iterator.next();
-                if (line.startsWith(STATUS_STACK)) {
-                    String failedMsg = line.substring(STATUS_STACK.length());
-                    if (iterator.hasNext()) {
-                        failedMsg += " " + iterator.next();
-                    }
-                    return failedMsg;
-                }
-            }
-            return null;
-        }
-
-        /**
-         * Get stack trace from output result.
-         *
-         * @return The stack trace message.
-         */
-        public String getStackTrace() {
-            StringBuilder sb = new StringBuilder();
-            for (String line : mResultLines) {
-                line = line.trim();
-                if (line.startsWith(AT_MARK) && line.endsWith(")")) {
-                    sb.append(line + "\n");
-                }
-            }
-            return sb.toString();
-        }
-
-        /**
-         * Get the status code of the test result.
-         *
-         * @param line The string contains the status code of the test result.
-         * @return The status code of the test result.
-         */
-        public int getStatusCode(String line) {
-            String codeStr = line.substring(line.indexOf(COMMA_MARK) + 1);
-            return Integer.parseInt(codeStr.trim());
-        }
-
-        /** {@inheritDoc} */
-        public boolean isCancelled() {
-            return false;
-        }
-
-        /** {@inheritDoc} */
-        @Override
-        public void done() {
-            super.done();
-        }
-    }
-
-    /**
-     * Individual mode result parser. <br>
-     * Individual mode means that the host sends request
-     * to the device method by method. And the device
-     * reactions and outputs the result to each request.
-     */
-    final class IndividualModeResultParser extends RawModeResultParser {
-
-        public IndividualModeResultParser(Test test) {
-            super(test);
-        }
-
-        /**
-         * Process a new line.
-         *
-         * @param line The new line.
-         */
-        @Override
-        public void processNewLine(final String line) {
-            if ((line == null) || (line.trim().length() == 0)) {
-                return;
-            }
-
-            ArrayList<String> resultLines = getResultLines();
-            resultLines.add(line);
-
-            if (line.startsWith(STATUS_CODE)) {
-                int statusCode = getStatusCode(line);
-                processTestResult(statusCode);
-                resultLines.removeAll(resultLines);
-            }
-        }
-
-        /**
-         * Process the test result of a single test.
-         *
-         * @param statusCode The status code of a single test's test result.
-         */
-        public void processTestResult(int statusCode) {
-            String testName = getNamedString(STATUS_TEST);
-            String className = getNamedString(STATUS_CLASS);
-            String testFullName = className + Test.METHOD_SEPARATOR + testName;
-            String errorMessage = getNamedString(STATUS_ERROR_STR);
-
-            mFailedMsg = null;
-            mStackTrace = null;
-            if ((statusCode == STATUS_FAIL) || (statusCode == STATUS_ERROR)) {
-                mFailedMsg = getFailedMessage();
-                mStackTrace = getStackTrace();
-            }
-
-            if ((errorMessage != null) && (errorMessage.length() != 0)) {
-                if (mFailedMsg == null) {
-                    mFailedMsg = errorMessage;
-                } else {
-                    mFailedMsg += " : " + errorMessage;
-                }
-            }
-
-            Log.d(testFullName + "...(" + statusCode + ")");
-            Log.d("errorMessage= " + errorMessage);
-            Log.d("mFailedMsg=" + mFailedMsg);
-            Log.d("mStackTrace=" + mStackTrace);
-
-            switch (statusCode) {
-            case STATUS_STARTING:
-                break;
-
-            case STATUS_PASS:
-                mResultCode = CtsTestResult.CODE_PASS;
-                break;
-
-            case STATUS_FAIL:
-            case STATUS_ERROR:
-                mResultCode = CtsTestResult.CODE_FAIL;
-                break;
-            }
-        }
-
-        /** {@inheritDoc} */
-        @Override
-        public void done() {
-            mTest.notifyResult(new CtsTestResult(mResultCode, mFailedMsg, mStackTrace));
-            super.done();
-        }
-    }
-
-    /**
-     * Batch mode result parser.
-     * Batch mode means that the host sends only one request
-     * for all of the methods contained in the package to the
-     * device. And then, the device runs the method one by one
-     * and outputs the result method by method.
-     */
-    final class BatchModeResultParser extends RawModeResultParser {
-        private TestPackage mTestPackage;
-        private Collection<Test> mTests;
-        public int mCurrentTestNum;
-        public int mTotalNum;
-
-        public BatchModeResultParser(TestPackage testPackage) {
-            super(null);
-
-            mTestPackage = testPackage;
-            if (mTestPackage != null) {
-                mTests = mTestPackage.getTests();
-            }
-        }
-
-        /**
-         * Process a new line.
-         *
-         * @param line The new line.
-         */
-        @Override
-        public void processNewLine(final String line) {
-            if ((line == null) || (line.trim().length() == 0)) {
-                return;
-            }
-
-            ArrayList<String> resultLines = getResultLines();
-            resultLines.add(line);
-
-            if (line.startsWith(STATUS_CODE)) {
-                int statusCode = getStatusCode(line);
-                processTestResult(statusCode);
-                resultLines.removeAll(resultLines);
-            } else if (line.startsWith(RESULT_CODE)) {
-                int resultCode = getStatusCode(line);
-                switch(resultCode) {
-                case STATUS_STARTING:
-                    break;
-
-                case STATUS_FAIL:
-                case STATUS_ERROR:
-                    mResultCode = CtsTestResult.CODE_FAIL;
-                    break;
-
-                case STATUS_PASS:
-                    mResultCode = CtsTestResult.CODE_PASS;
-                    break;
-                }
-                resultLines.removeAll(resultLines);
-            }
-        }
-
-        /**
-         * Process the test result of a single test.
-         *
-         * @param statusCode The status code of a single test's test result.
-         */
-        public void processTestResult(int statusCode) {
-            String testName = getNamedString(STATUS_TEST);
-            String className = getNamedString(STATUS_CLASS);
-            String testFullName = className + Test.METHOD_SEPARATOR + testName;
-            mCurrentTestNum = parseIntWithMark(STATUS_CURRENT);
-            mTotalNum = parseIntWithMark(STATUS_NUM);
-
-            mFailedMsg = null;
-            mStackTrace = null;
-            if ((statusCode == STATUS_FAIL) || ((statusCode == STATUS_ERROR))) {
-                mFailedMsg = getFailedMessage();
-                mStackTrace = getStackTrace();
-            }
-
-            Log.d(testFullName + "...(" + statusCode + ")");
-            Log.d("mFailedMsg=" + mFailedMsg);
-            Log.d("mStackTrace=" + mStackTrace);
-
-            String status = TestPackage.FINISH;
-
-            if (statusCode == STATUS_STARTING) {
-                status = TestPackage.START;
-            }
-
-            mTest = searchTest(testFullName);
-            if (mTest != null) {
-                switch(statusCode) {
-                case STATUS_STARTING:
-                    status = TestPackage.START;
-                    break;
-
-                case STATUS_PASS:
-                    mTest.setResult(new CtsTestResult(
-                            CtsTestResult.CODE_PASS, null, null));
-                    break;
-
-                case STATUS_ERROR:
-                case STATUS_FAIL:
-                    mTest.setResult(new CtsTestResult(
-                            CtsTestResult.CODE_FAIL, mFailedMsg, mStackTrace));
-                    break;
-                }
-            }
-            // report status even if no matching test was found
-            mTestPackage.notifyTestStatus(mTest, status);
-        }
-
-        /**
-         * Search Test with given test full name.
-         *
-         * @param testFullName The test full name.
-         * @return The Test matches the test full name given.
-         */
-        private Test searchTest(String testFullName) {
-            for (Test test : mTests) {
-                if (testFullName.equals(test.getFullName())) {
-                    return test;
-                }
-            }
-            return null;
-        }
-
-        /** {@inheritDoc} */
-        @Override
-        public void done() {
-            mTestPackage.notifyBatchModeFinish();
-            super.done();
-        }
-    }
-
-    /**
-     * Remove the run time listener.
-     */
-    public void removeRuntimeListener() {
-        mDeviceObserver = null;
-    }
-
-    /**
-     * Set the run time listener.
-     *
-     * @param listener The run time listener.
-     */
-    public void setRuntimeListener(DeviceObserver listener) {
-        mDeviceObserver = listener;
-    }
-
-    /**
-     * Push monitor monitoring the status of pushing a file.
-     */
-    class PushMonitor implements ISyncProgressMonitor {
-
-        public PushMonitor() {
-        }
-
-        /** {@inheritDoc} */
-        public void advance(int arg0) {
-        }
-
-        /** {@inheritDoc} */
-        public boolean isCanceled() {
-            return false;
-        }
-
-        /** {@inheritDoc} */
-        public void start(int arg0) {
-        }
-
-        /** {@inheritDoc} */
-        public void startSubTask(String arg0) {
-        }
-
-        /** {@inheritDoc} */
-        public void stop() {
-        }
-    }
-
-    /**
-     * Add a new log listener.
-     *
-     * @param listener the listener
-     */
-    public void addMainLogListener(ILogListener listener) {
-        logListener.addListener(listener);
-    }
-
-    /**
-     * Remove an existing log listener.
-     *
-     * @param listener the listener to remove.
-     */
-    public void removeMainLogListener(ILogListener listener) {
-        logListener.removeListener(listener);
-    }
-
-    /**
-     * Execute Adb shell command on {@link IDevice}
-     *
-     * @param cmd the string of command.
-     * @param receiver {@link IShellOutputReceiver}
-     * @throws DeviceDisconnectedException if the device disconnects during the command
-     */
-    public void executeShellCommand(final String cmd,
-            final IShellOutputReceiver receiver) throws DeviceDisconnectedException {
-        executeShellCommand(cmd, receiver, null);
-    }
-
-    /**
-     * Execute Adb shell command on {@link IDevice}
-     *
-     * Note that the receivers run in a different thread than the caller.
-     *
-     * @param cmd the string of command.
-     * @param receiver {@link IShellOutputReceiver}
-     * @param logReceiver {@link LogReceiver}
-     * @throws DeviceDisconnectedException if the device disconnects during the command
-     */
-    public void executeShellCommand(final String cmd,
-            final IShellOutputReceiver receiver,
-            final LogReceiver logReceiver)
-            throws DeviceDisconnectedException {
-        if (mStatus == STATUS_OFFLINE) {
-            Log.d(String.format("device %s is offline when attempting to execute %s",
-                    getSerialNumber(), cmd));
-            throw new DeviceDisconnectedException(getSerialNumber());
-        }
-
-        new Thread() {
-            @Override
-            public void run() {
-                try {
-                    mDevice.executeShellCommand(cmd, receiver, 0);
-                } catch (IOException e) {
-                    Log.e(String.format("Failed to execute shell command %s on device %s", cmd,
-                            mDevice.getSerialNumber()), e);
-                } catch (TimeoutException e) {
-                    Log.e(String.format("Failed to execute shell command %s on device %s", cmd,
-                            mDevice.getSerialNumber()), e);
-                } catch (AdbCommandRejectedException e) {
-                    Log.e(String.format("Failed to execute shell command %s on device %s", cmd,
-                            mDevice.getSerialNumber()), e);
-                } catch (ShellCommandUnresponsiveException e) {
-                    Log.e(String.format("Failed to execute shell command %s on device %s", cmd,
-                            mDevice.getSerialNumber()), e);
-                }
-            }
-        }.start();
-    }
-
-    /**
-     * Kill {@link Client} which running the test on the {@link IDevice}
-     *
-     * @param packageName the test package name
-     */
-    public void killProcess(String packageName) {
-        if (mStatus == STATUS_OFFLINE) {
-            return;
-        }
-        Client[] clients = mDevice.getClients();
-
-        for (Client c : clients) {
-            ClientData cd = c.getClientData();
-            if (cd.getClientDescription() == null) {
-                continue;
-            }
-            if (cd.getClientDescription().equals(packageName)) {
-                c.kill();
-                break;
-            }
-        }
-    }
-
-    /**
-     * Called when the {@link TestDevice} disconnected.
-     */
-    public void disconnected() {
-        CUIOutputStream.println("Device(" + getSerialNumber() + ") disconnected");
-        mDevice = null;
-        mSyncService = null;
-
-        synchronized (mObjectSync) {
-            mObjectSync.sendNotify();
-            mPackageActionTimer.stop();
-        }
-
-        if (mStatus == STATUS_BUSY) {
-            Log.d("TestDevice.disconnected calls notifyTestingDeviceDisconnected");
-            mDeviceObserver.notifyTestingDeviceDisconnected();
-        } else {
-            if (!TestSession.isADBServerRestartedMode()) {
-                CUIOutputStream.printPrompt();
-            }
-        }
-        setStatus(STATUS_OFFLINE);
-        if (logServiceThread != null) {
-            logServiceThread.cancelLogService();
-        }
-    }
-
-    /**
-     * Set the status of the {@link TestDevice}
-     *
-     * @param statusCode the status code of {@link TestDevice}
-     */
-    public void setStatus(final int statusCode) {
-        if (statusCode != STATUS_IDLE && statusCode != STATUS_BUSY
-                && statusCode != STATUS_OFFLINE) {
-            throw new IllegalArgumentException("Invalid status code");
-        }
-        mStatus = statusCode;
-    }
-
-    /**
-     * Get the status code of the {@link TestDevice}.
-     *
-     * @return get the status code of the {@link TestDevice}
-     */
-    public int getStatus() {
-        return mStatus;
-    }
-
-    /**
-     * Get the status of the {@link TestDevice} as string.
-     *
-     * @return the status of the {@link TestDevice} as string.
-     */
-    public String getStatusAsString() {
-        return mStatusMap.get(mStatus);
-    }
-
-    /**
-     * Wait for command finish.
-     */
-    public void waitForCommandFinish() {
-        synchronized (mObjectSync) {
-            try {
-                mObjectSync.waitOn();
-            } catch (InterruptedException e) {
-            }
-        }
-    }
-
-    /**
-     * Start the action timer with specific timeout
-     *
-     * @param action the action to start the timer
-     * @param timeout the specific timeout
-     */
-    void startActionTimer(final String action, final int timeout) {
-        mPackageActionTimer.start(action, timeout, this);
-    }
-
-    /**
-     * Start the action timer.
-     *
-     * @param action the action to start the timer.
-     */
-    void startActionTimer(String action) {
-       mPackageActionTimer.start(action, this);
-    }
-
-    /**
-     * Stop the action timer.
-     */
-    void stopActionTimer() {
-        mPackageActionTimer.stop();
-    }
-
-    /**
-     * Allows an external test to signal that it's command is complete.
-     */
-    void notifyExternalTestComplete() {
-        synchronized (mObjectSync) {
-            mObjectSync.sendNotify();
-        }
-    }
-
-    /**
-     * Notify install complete.
-     */
-    public void notifyInstallingComplete(int resultCode) {
-        synchronized (mObjectSync) {
-            mObjectSync.sendNotify();
-            mPackageActionTimer.stop();
-        }
-    }
-
-    /** {@inheritDoc} */
-    public void notifyInstallingTimeout(TestDevice testDevice) {
-        synchronized (mObjectSync) {
-            mObjectSync.sendNotify();
-        }
-    }
-
-    /** {@inheritDoc} */
-    public void notifyTestingDeviceDisconnected() {
-        synchronized (mObjectSync) {
-            mObjectSync.sendNotify();
-            if (mPackageActionTimer != null) {
-                mPackageActionTimer.stop();
-            }
-        }
-    }
-
-    /** {@inheritDoc} */
-    public void notifyUninstallingComplete(int resultCode) {
-        synchronized (mObjectSync) {
-            mObjectSync.sendNotify();
-            mPackageActionTimer.stop();
-        }
-    }
-
-    /** {@inheritDoc} */
-    public void notifyUninstallingTimeout(TestDevice testDevice) {
-        synchronized (mObjectSync) {
-            mObjectSync.sendNotify();
-        }
-    }
-
-    /**
-     * Synchronization object for communication between threads.
-     */
-    class ObjectSync {
-        private boolean mNotifySent = false;
-
-        /**
-         * Send notify to the waiting thread.
-         */
-        public void sendNotify() {
-            Log.d("ObjectSync.sendNotify() is called, mNotifySent=" + mNotifySent);
-            mNotifySent = true;
-            notify();
-        }
-
-        /**
-         * Wait on.
-         */
-        public void waitOn() throws InterruptedException {
-            Log.d("ObjectSync.waitOn() is called, mNotifySent=" + mNotifySent);
-            if (!mNotifySent) {
-                wait();
-            }
-
-            mNotifySent = false;
-        }
-
-        /**
-         * Check if notify has been sent to the waiting thread.
-         *
-         * @return If sent, return true; else, return false.
-         */
-        public boolean isNotified() {
-            return mNotifySent;
-        }
-    }
-
-    /**
-     * Take a screenshot of the device under test.
-     *
-     * @return the screenshot
-     * @throws IOException
-     * @throws AdbCommandRejectedException
-     * @throws TimeoutException
-     */
-    public RawImage getScreenshot() throws IOException, TimeoutException,
-            AdbCommandRejectedException {
-        return mDevice.getScreenshot();
-    }
-}
diff --git a/tools/host/src/com/android/cts/TestHost.java b/tools/host/src/com/android/cts/TestHost.java
deleted file mode 100644
index f0857a5..0000000
--- a/tools/host/src/com/android/cts/TestHost.java
+++ /dev/null
@@ -1,715 +0,0 @@
-/*
- * Copyright (C) 2008 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
- *
- *      httprunPackage://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 com.android.cts;
-
-import com.android.cts.HostConfig.CaseRepository;
-import com.android.cts.HostConfig.PlanRepository;
-import com.android.ddmlib.AndroidDebugBridge;
-
-import org.xml.sax.SAXException;
-
-import java.io.BufferedWriter;
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.FileReader;
-import java.io.FileWriter;
-import java.io.IOException;
-import java.security.NoSuchAlgorithmException;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-
-import javax.xml.parsers.ParserConfigurationException;
-import javax.xml.transform.TransformerException;
-import javax.xml.transform.TransformerFactoryConfigurationError;
-
-/**
- * Act as the host for the device connections, also provides management of
- * sessions.
- */
-public class TestHost extends XMLResourceHandler implements SessionObserver {
-    public static final String TEMP_PLAN_NAME = "tempPlan";
-
-    enum ActionType {
-        RUN_SINGLE_TEST, RUN_SINGLE_JAVA_PACKAGE, START_NEW_SESSION, RESUME_SESSION
-    }
-    /**
-     * Definition of the modes the TestHost will run with.
-     * <ul>
-     *    <li> RUN: For this mode, the TestHost will run the plan or
-     *              package directly without starting the UI.
-     *    <li> CONSOLE: For this mode, the TestHost will start the UI
-     *                  and wait for input from user.
-     * </ul>
-     */
-    enum MODE {
-        UNINITIALIZED, RUN, CONSOLE
-    }
-
-    static private ArrayList<TestSession> sSessions = new ArrayList<TestSession>();
-    static private DeviceManager sDeviceManager = new DeviceManager();
-    static private Object sTestSessionSync = new Object();
-
-    static private ConsoleUi sConsoleUi;
-
-    static private HostConfig sConfig;
-
-    private static TestHost sInstance;
-    static MODE sMode = MODE.UNINITIALIZED;
-    private static boolean sQuick = false;
-
-    public static void main(final String[] mainArgs) {
-        CUIOutputStream.println("Android CTS version " + Version.asString());
-
-        if (HostLock.lock() == false) {
-            Log.e("Error: CTS is being used at the moment."
-                    + " No more than one CTS instance is allowed simultaneously", null);
-            exit();
-        }
-
-        sDeviceManager.initAdb();
-
-        sConsoleUi = new ConsoleUi(getInstance());
-        CommandParser cp = init(sConsoleUi, mainArgs);
-
-        if (sMode == MODE.RUN) {
-            try {
-                /* After booting up, the connection between
-                 * CTS host and device isn't ready. It's needed
-                 * to wait for 3 seconds for device ready to
-                 * start the the mode of no console UI.
-                 */
-                Thread.sleep(3000);
-                cp.removeKey(CTSCommand.OPTION_CFG);
-                sConsoleUi.processCommand(cp);
-            } catch (InterruptedException e) {
-                Log.e("Met InterruptedException", e);
-            } catch (Exception e) {
-                Log.e("Met exception when processing command", e);
-            }
-        } else if (sMode == MODE.CONSOLE) {
-            sConsoleUi.startUi();
-        }
-
-        exit();
-    }
-
-    /**
-     * Release host lock and then exit.
-     */
-    private static void exit() {
-        Log.closeLog();
-        HostLock.release();
-        System.exit(-1);
-    }
-
-    /**
-     * Extract mode from the options used to activating CTS.
-     *
-     * @param cp Command container.
-     * @return The mode.
-     */
-    static private MODE getMode(final CommandParser cp) {
-        String action = cp.getAction();
-        if ((action != null) && (action.equals(CTSCommand.START))) {
-            return MODE.RUN;
-        } else {
-            return MODE.CONSOLE;
-        }
-    }
-
-    /**
-     * Start zipped package.
-     *
-     * @param pathName  The path name of the zipped package.
-     */
-    public void startZippedPackage(final String pathName)
-                throws FileNotFoundException,
-                       IOException,
-                       ParserConfigurationException,
-                       TransformerFactoryConfigurationError,
-                       TransformerException,
-                       DeviceNotAvailableException,
-                       TestNotFoundException,
-                       SAXException,
-                       TestPlanNotFoundException,
-                       IllegalTestNameException,
-                       InterruptedException, DeviceDisconnectedException,
-                       NoSuchAlgorithmException, InvalidNameSpaceException,
-                       InvalidApkPathException {
-
-        // step 1: add package
-        if (!addPackage(pathName)) {
-            return;
-        }
-
-        // step 2: create plan
-        ArrayList<String> packages = new ArrayList<String>();
-        String pkgName = pathName.substring(pathName
-                .lastIndexOf(File.separator) + 1, pathName.lastIndexOf("."));
-        packages.add(pkgName);
-        HashMap<String, ArrayList<String>> selectedResult =
-                       new HashMap<String, ArrayList<String>>();
-        selectedResult.put(pkgName, null);
-        TestSessionBuilder.getInstance().serialize(TEMP_PLAN_NAME, packages, selectedResult);
-
-        // step 3: start the plan
-        TestSession ts = startSession(TEMP_PLAN_NAME, getFirstAvailableDevice().getSerialNumber(),
-                null);
-
-        // step 4: copy the resulting zip file
-        String resultName = pathName.substring(0, pathName.lastIndexOf("."))
-                + ".zip";
-        TestSessionLog log = ts.getSessionLog();
-        copyFile(log.getResultPath() + ".zip", resultName);
-
-        // step 5: clear the temporary working environment
-        removePlans(TEMP_PLAN_NAME);
-        //give the system some time to avoid asserting
-        Thread.sleep(1000);
-
-        removePackages(pkgName);
-        //give the system some time to avoid asserting
-        Thread.sleep(1000);
-    }
-
-    /**
-     * Copy the source file to the destination file.
-     *
-     * @param srcFileName The name of the source file.
-     * @param dstFileName The name of the destination file.
-     */
-    private void copyFile(final String srcFileName, final String dstFileName) throws IOException {
-        FileReader input = new FileReader(new File(srcFileName));
-        BufferedWriter output = new BufferedWriter(new FileWriter(dstFileName));
-
-        int c;
-        while ((c = input.read()) != -1) {
-            output.write(c);
-        }
-
-        input.close();
-        output.flush();
-        output.close();
-    }
-
-    /**
-     * Add a package by the path and package name.
-     *
-     * @param pathName The path name.
-     * @return If succeed in adding package, return true; else, return false.
-     */
-    public boolean addPackage(final String pathName) throws FileNotFoundException,
-            IOException, NoSuchAlgorithmException {
-
-        CaseRepository caseRepo = sConfig.getCaseRepository();
-        if (!HostUtils.isFileExist(pathName)) {
-            Log.e("Package error: package file " + pathName + " doesn't exist.", null);
-            return false;
-        }
-
-        if (!caseRepo.isValidPackageName(pathName)) {
-            return false;
-        }
-
-        caseRepo.addPackage(pathName);
-        return true;
-    }
-
-    /**
-     * Remove plans from the plan repository according to the specific plan name.
-     *
-     * @param name The plan name.
-     */
-    public void removePlans(final String name) {
-        if ((name == null) || (name.length() == 0)) {
-            CUIOutputStream.println("Please add plan name or all as parameter.");
-            return;
-        }
-
-        PlanRepository planRepo = sConfig.getPlanRepository();
-        if (name.equals(HostConfig.ALL)) {
-            ArrayList<String> plans = planRepo.getAllPlanNames();
-            for (String plan : plans) {
-                removePlan(plan, planRepo);
-            }
-        } else {
-            if (!planRepo.getAllPlanNames().contains(name)) {
-                Log.e("No plan named " + name + " in repository!", null);
-                return;
-            }
-            removePlan(name, planRepo);
-        }
-    }
-
-    /**
-     * Remove a specified plan from the plan repository.
-     *
-     * @param planName The plan name.
-     * @param planRepo The plan repository.
-     */
-    private void removePlan(final String planName, final PlanRepository planRepo) {
-        File planFile = new File(planRepo.getPlanPath(planName));
-        if (!planFile.isFile() || !planFile.exists()) {
-            Log.e("Can't locate the file of the plan, please check your repository!", null);
-            return;
-        }
-
-        if (!planFile.canWrite()) {
-            Log.e("Can't delete this plan, permission denied!", null);
-            return;
-        }
-
-        if (!planFile.delete()) {
-            Log.e(planName + " plan file delete failed", null);
-        }
-    }
-
-    /**
-     * Remove packages from the case repository..
-     *
-     * @param packageName The java package name to be removed from the case repository.
-     */
-    public void removePackages(final String packageName)
-            throws IndexOutOfBoundsException {
-        CaseRepository caseRepo = sConfig.getCaseRepository();
-
-        if ((packageName == null) || (packageName.length() == 0)) {
-            CUIOutputStream.println("Please add package name or all as parameter.");
-            return;
-        }
-
-        caseRepo.removePackages(packageName);
-    }
-
-    /**
-     * Initialize TestHost with the arguments passed in.
-     *
-     * @param mainArgs The arguments.
-     * @return CommandParser which contains the command and options.
-     */
-    static CommandParser init(final ConsoleUi cui, final String[] mainArgs) {
-        CommandParser cp = null;
-        String cfgPath= null;
-
-        if (mainArgs.length == 0) {
-            sMode = MODE.CONSOLE;
-            cfgPath = System.getProperty("HOST_CONFIG");
-            if ((cfgPath == null) || (cfgPath.length() == 0)) {
-                Log.e("Please make sure environment variable CTS_HOST_CFG is "
-                       + "set as {cts install path}[/host_config.xml].", null);
-                exit();
-            }
-        } else if (mainArgs.length == 1) {
-            sMode = MODE.CONSOLE;
-            cfgPath = mainArgs[0];
-        } else {
-            String cmdLine = "";
-            for (int i = 0; i < mainArgs.length; i ++) {
-                cmdLine += mainArgs[i] + " ";
-            }
-
-            try {
-                cp = CommandParser.parse(cmdLine);
-                if (!cui.validateCommandParams(cp)) {
-                    Log.e("Please type in arguments correctly to activate CTS.", null);
-                    exit();
-                }
-            } catch (UnknownCommandException e1) {
-                Log.e("Please type in arguments correctly to activate CTS.", null);
-                exit();
-            } catch (CommandNotFoundException e1) {
-                Log.e("Please type in arguments correctly to activate CTS.", null);
-                exit();
-            }
-
-            sMode = getMode(cp);
-            if (sMode == MODE.RUN) {
-                if (cp.containsKey(CTSCommand.OPTION_CFG)) {
-                    cfgPath = cp.getValue(CTSCommand.OPTION_CFG);
-                } else {
-                    cfgPath = System.getProperty("HOST_CONFIG");
-                    if ((cfgPath == null) || (cfgPath.length() == 0)) {
-                        Log.e("Please make sure environment variable CTS_HOST_CFG "
-                               + "is set as {cts install path}[/host_config.xml].", null);
-                        exit();
-                    }
-                }
-            }
-
-            if (cp.containsKey(CTSCommand.OPTION_QUICK)) {
-                sQuick = true;
-            }
-        }
-
-        if ((cfgPath == null) || (cfgPath.length() == 0)) {
-            Log.e("Please type in arguments correctly to activate CTS.", null);
-            exit();
-        }
-
-        String filePath = getConfigFilePath(cfgPath);
-        try {
-            if (loadConfig(filePath) == false) {
-                exit();
-            }
-            if (sQuick) {
-                HostConfig.Ints.valueOf("postInstallWaitMs").setValue(1);
-            }
-
-            Log.initLog(sConfig.getLogRoot());
-            sConfig.loadRepositories(sQuick);
-        } catch (Exception e) {
-            Log.e("Error while parsing cts config file", e);
-            exit();
-        }
-        return cp;
-    }
-
-    /**
-     * Singleton generator.
-     *
-     * @return The TestHost.
-     */
-    public static TestHost getInstance() {
-        if (sInstance == null) {
-            sInstance = new TestHost();
-        }
-
-        return sInstance;
-    }
-
-    /**
-     * Get configuration file from the arguments given.
-     *
-     * @param filePath The file path.
-     * @return The the path of the configuration file.
-     */
-    static private String getConfigFilePath(final String filePath) {
-        if (filePath != null) {
-            if (!HostUtils.isFileExist(filePath)) {
-                Log.e("Configuration file \"" + filePath + "\" doesn't exist.", null);
-                exit();
-            }
-        } else {
-            Log.e("Configuration file doesn't exist.", null);
-            exit();
-        }
-
-        return filePath;
-    }
-
-    /**
-     * Load configuration from the given file.
-     *
-     * @param configPath The configuration path.
-     * @return If succeed, return true; else, return false.
-     */
-    static boolean loadConfig(final String configPath) throws SAXException,
-            IOException, ParserConfigurationException {
-        sConfig = HostConfig.getInstance();
-
-        return sConfig.load(configPath);
-    }
-
-    /**
-     * Get case repository.
-     *
-     * @return The case repository.
-     */
-    public HostConfig.CaseRepository getCaseRepository() {
-        return sConfig.getCaseRepository();
-    }
-
-    /**
-     * Get plan repository.
-     *
-     * @return The plan repository.
-     */
-    public HostConfig.PlanRepository getPlanRepository() {
-        return sConfig.getPlanRepository();
-    }
-
-    /**
-     * Run the specified {@link TestSession} on the specified {@link TestDevice}(s)
-     *
-     * @param ts the specified {@link TestSession}
-     * @param deviceId the ID of the specified {@link TestDevice}
-     * @param testFullName The full name of the test to be run.
-     * @param javaPkgName The specific java package name to be run.
-     * @param type The action type to activate the test session.
-     */
-    static private void runTest(final TestSession ts, final String deviceId,
-            final String testFullName, final String javaPkgName, ActionType type)
-            throws DeviceNotAvailableException, TestNotFoundException, IllegalTestNameException,
-            DeviceDisconnectedException, InvalidNameSpaceException,
-            InvalidApkPathException {
-
-        if (ts == null) {
-            return;
-        }
-
-        ts.setObserver(getInstance());
-        TestDevice device = sDeviceManager.allocateFreeDeviceById(deviceId);
-        TestSessionLog sessionLog = ts.getSessionLog();
-        ts.setTestDevice(device);
-        ts.getDevice().installDeviceSetupApp();
-        if (!sQuick) {
-            sessionLog.setDeviceInfo(ts.getDevice().getDeviceInfo());
-        }
-
-        boolean finish = false;
-        while (!finish) {
-            ts.getDevice().disableKeyguard();
-            try {
-                switch (type) {
-                case RUN_SINGLE_TEST:
-                    ts.start(testFullName);
-                    break;
-
-                case RUN_SINGLE_JAVA_PACKAGE:
-                    ts.start(javaPkgName);
-                    break;
-
-                case START_NEW_SESSION:
-                    ts.start();
-                    break;
-
-                case RESUME_SESSION:
-                    ts.resume();
-                    break;
-                }
-
-                finish = true;
-            } catch (ADBServerNeedRestartException e) {
-                Log.d(e.getMessage());
-                Log.i("Max ADB operations reached. Restarting ADB...");
-
-                TestSession.setADBServerRestartedMode();
-                sDeviceManager.restartADBServer(ts);
-
-                type = ActionType.RESUME_SESSION;
-            }
-        }
-
-        TestSession.resetADBServerRestartedMode();
-        if (HostConfig.getMaxTestCount() > 0) {
-            sDeviceManager.resetTestDevice(ts.getDevice());
-        }
-
-        ts.getDevice().uninstallDeviceSetupApp();
-    }
-
-    /**
-     * Create {@link TestSession} according to the specified test plan.
-     *
-     * @param testPlanName the name of the specified test plan
-     * @return a {@link TestSession}
-     */
-    static public TestSession createSession(final String testPlanName)
-            throws IOException, TestNotFoundException, SAXException,
-            ParserConfigurationException, TestPlanNotFoundException, NoSuchAlgorithmException {
-
-        String testPlanPath = sConfig.getPlanRepository().getPlanPath(testPlanName);
-        TestSession ts = TestSessionBuilder.getInstance().build(testPlanPath);
-        sSessions.add(ts);
-
-        return ts;
-    }
-
-    /** {@inheritDoc} */
-    public void notifyFinished(final TestSession ts) {
-        // As test run on a session, so just keep session info in debug level
-        Log.d("Session " + ts.getId() + " finished.");
-
-        synchronized (sTestSessionSync) {
-            sTestSessionSync.notify();
-        }
-        ts.getSessionLog().sessionComplete();
-    }
-
-    /**
-     * Tear down ADB connection.
-     */
-    public void tearDown() {
-        AndroidDebugBridge.disconnectBridge();
-        AndroidDebugBridge.terminate();
-    }
-
-    /**
-     * Get the sessions connected with devices.
-     *
-     * @return The sessions.
-     */
-    public Collection<TestSession> getSessions() {
-        return sSessions;
-    }
-
-    /**
-     * Get session by session ID.
-     *
-     * @param sessionId The session ID.
-     * @return The session.
-     */
-    public TestSession getSession(final int sessionId) {
-        for (TestSession session : sSessions) {
-            if (session.getId() == sessionId) {
-                return session;
-            }
-        }
-        return null;
-    }
-
-    /**
-     * Get session by test plan name.
-     *
-     * @param testPlanName Test plan name.
-     * @return The session corresponding to the test plan name.
-     */
-    public ArrayList<TestSession> getSessionList(final String testPlanName) {
-        ArrayList<TestSession> list = new ArrayList<TestSession>();
-        for (TestSession session : sSessions) {
-            if (testPlanName.equals(session.getSessionLog().getTestPlanName())) {
-                list.add(session);
-            }
-        }
-        return list;
-    }
-
-    /**
-     * List the ID, name and status of all {@link TestDevice} which connected to
-     * the {@link TestHost}.
-     *
-     * @return a string list of {@link TestDevice}'s id, name and status.
-     */
-    public String[] listDevices() {
-        ArrayList<String> deviceList = new ArrayList<String>();
-        TestDevice[] devices = sDeviceManager.getDeviceList();
-
-        for (TestDevice device : devices) {
-            deviceList.add(device.getSerialNumber() + "\t" + device.getStatusAsString());
-        }
-        return deviceList.toArray(new String[deviceList.size()]);
-    }
-
-    /**
-     * Get device list connected with the host.
-     *
-     * @return The device list connected with the host.
-     */
-    public TestDevice[] getDeviceList() {
-        return sDeviceManager.getDeviceList();
-    }
-
-    /**
-     * Get the first available device.
-     *
-     * @return the first available device or null if none are available.
-     */
-    public TestDevice getFirstAvailableDevice() {
-        for (TestDevice td : sDeviceManager.getDeviceList()) {
-            if (td.getStatus() == TestDevice.STATUS_IDLE) {
-                return td;
-            }
-        }
-        return null;
-    }
-
-    /**
-     * Get session logs.
-     *
-     * @return Session logs.
-     */
-    public Collection<TestSessionLog> getSessionLogs() {
-        ArrayList<TestSessionLog> sessionLogs = new ArrayList<TestSessionLog>();
-        for (TestSession session : sSessions) {
-            sessionLogs.add(session.getSessionLog());
-        }
-        return sessionLogs;
-    }
-    /**
-     * Start a test session.
-     *
-     * @param testPlanName TestPlan config file name
-     * @param deviceId Target device ID
-     * @param profile The profile of the device being tested.
-     * @param javaPkgName The specific java package name to be run.
-     */
-    public TestSession startSession(final String testPlanName,
-            String deviceId, final String javaPkgName)
-            throws IOException, DeviceNotAvailableException,
-            TestNotFoundException, SAXException, ParserConfigurationException,
-            TestPlanNotFoundException, IllegalTestNameException,
-            DeviceDisconnectedException, NoSuchAlgorithmException,
-            InvalidNameSpaceException, InvalidApkPathException {
-
-        TestSession ts = createSession(testPlanName);
-        if ((javaPkgName != null) && (javaPkgName.length() != 0)) {
-            runTest(ts, deviceId, null, javaPkgName, ActionType.RUN_SINGLE_JAVA_PACKAGE);
-        } else {
-            runTest(ts, deviceId, null, javaPkgName, ActionType.START_NEW_SESSION);
-        }
-
-        ts.getSessionLog().sessionComplete();
-        return ts;
-    }
-
-    /**
-     * Start a test session.
-     *
-     * @param ts The test session.
-     * @param deviceId Target device ID.
-     * @param testFullName Specific test full name.
-     * @param javaPkgName The specific java package name to be run.
-     * @param type The action type to activate the test session.
-     */
-    public TestSession startSession(final TestSession ts, String deviceId,
-            final String testFullName, final String javaPkgName, ActionType type)
-            throws DeviceNotAvailableException,
-            TestNotFoundException, IllegalTestNameException,
-            DeviceDisconnectedException, InvalidNameSpaceException,
-            InvalidApkPathException {
-
-        runTest(ts, deviceId, testFullName, javaPkgName, type);
-        ts.getSessionLog().sessionComplete();
-        return ts;
-    }
-
-    /**
-     * Get plan name from what is typed in by the user.
-     *
-     * @param rawPlanName The raw plan name.
-     * @return The plan name.
-     */
-    public String getPlanName(final String rawPlanName) {
-        if (rawPlanName.indexOf("\\") != -1) {
-            return rawPlanName.replaceAll("\\\\", "");
-        }
-        if (rawPlanName.indexOf("\"") != -1) {
-            return rawPlanName.replaceAll("\"", "");
-        }
-        return rawPlanName;
-    }
-
-    /**
-     * Add test session.
-     *
-     * @param ts The test session.
-     */
-    public void addSession(TestSession ts) {
-        sSessions.add(ts);
-    }
-}
diff --git a/tools/host/src/com/android/cts/TestNotFoundException.java b/tools/host/src/com/android/cts/TestNotFoundException.java
deleted file mode 100644
index 1990743..0000000
--- a/tools/host/src/com/android/cts/TestNotFoundException.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Copyright (C) 2008 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 com.android.cts;
-
-/**
- * Exception on test not found.
- *
- */
-public class TestNotFoundException extends Exception {
-
-    private static final long serialVersionUID = 167003945777574277L;
-
-    public TestNotFoundException() {
-        super();
-    }
-
-    public TestNotFoundException(final String msg) {
-        super(msg);
-    }
-}
diff --git a/tools/host/src/com/android/cts/TestPackage.java b/tools/host/src/com/android/cts/TestPackage.java
deleted file mode 100644
index a332297..0000000
--- a/tools/host/src/com/android/cts/TestPackage.java
+++ /dev/null
@@ -1,1154 +0,0 @@
-/*
- * Copyright (C) 2008 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 com.android.cts;
-
-import com.android.cts.TestSession.TestSessionThread;
-
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.security.MessageDigest;
-import java.security.NoSuchAlgorithmException;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.List;
-import java.util.TimerTask;
-
-/**
- * Correspond to an APK, provide functions on
- * representing and executing an APK from CTS test harness.
- */
-public class TestPackage implements DeviceObserver {
-    protected static final String PKG_LOG_SEPARATOR =
-              "==============================================================";
-
-    /**
-     * For batch mode, there is just one command sent to the device
-     * for the whole package, and the device will feed back the result
-     * test by test. To guard the command, a timeout timer is started
-     * to prevent it from running forever. And to make the timeout time
-     * not too long, it's better choice to restart the timer each time
-     * received the feedback from device. The following two variables
-     * are used to restart/stop the timer, START for restarting and
-     * FINISH for stopping.
-     */
-    public static final String FINISH = "finish";
-    public static final String START = "start";
-
-    private final String mName;
-    private final String mVersion;
-    private final String mAndroidVersion;
-    private final String mTargetNameSpace;
-    private final String mTargetBinaryName;
-    private final String mInstrumentationRunner;
-    private final Collection<TestSuite> mSuites;
-    private String mDigest;
-    private final String mJarPath;
-    private final String mAppNameSpace;
-    private final String mAppPackageName;
-    private final String mJavaPackageFilter;
-
-    protected TestSuite mCurrentTestSuite;
-
-    protected TestDevice mDevice;
-
-    protected boolean mTestStop;
-    private TestSessionThread mTestThread;
-
-    private HostTimer mTimeOutTimer;
-    private ProgressObserver mProgressObserver;
-    private boolean mIsInBatchMode;
-    private Test mCurrentTest;
-
-    /**
-     * Construct a test package with given necessary information.
-     *
-     * @param instrumentationRunner The instrumentation runner.
-     * @param testPkgBinaryName The binary name of the TestPackage.
-     * @param targetNameSpace The target name space of the dependent package, if available.
-     * @param version The version of the CTS Host allowed.
-     * @param androidVersion The version of the Anroid platform allowed.
-     * @param jarPath The host controller's jar path and file.
-     * @param appNameSpace The package name space.
-     * @param appPackageName The package name of the test package.
-     * @param javaPackageFilter The prefix used to select which Java packages to run
-     */
-    public TestPackage(final String instrumentationRunner,
-            final String testPkgBinaryName, final String targetNameSpace,
-            final String targetBinaryName, final String version,
-            final String androidVersion, final String jarPath, final String appNameSpace,
-            final String appPackageName, final String javaPackageFilter) {
-        mInstrumentationRunner = instrumentationRunner;
-        mName = testPkgBinaryName;
-        mTargetNameSpace = targetNameSpace;
-        mTargetBinaryName = targetBinaryName;
-        mVersion = version;
-        mAndroidVersion = androidVersion;
-        mSuites = new ArrayList<TestSuite>();
-        mJarPath = jarPath;
-        mAppNameSpace = appNameSpace;
-        mAppPackageName = appPackageName;
-        mJavaPackageFilter = javaPackageFilter;
-
-        mDevice = null;
-        mTestStop = false;
-        mTestThread = null;
-        mIsInBatchMode = false;
-        mCurrentTest = null;
-    }
-
-    /**
-     * Get the app package name space.
-     *
-     * @return The app package name space.
-     */
-    public String getAppNameSpace() {
-        return mAppNameSpace;
-    }
-
-    /**
-     * Get the app package name.
-     *
-     * @return The app package name.
-     */
-    public String getAppPackageName() {
-        return mAppPackageName;
-    }
-
-    /**
-     * Returns whether this is a host side test package.
-     */
-    public boolean isHostSideOnly() {
-        return false;
-    }
-
-    /**
-     * Add a TestSuite.
-     *
-     * @param suite The TestSuite to be added.
-     */
-    public void addTestSuite(final TestSuite suite) {
-        mSuites.add(suite);
-    }
-
-    /**
-     * Get test suites under this package.
-     *
-     * @return The test suites under this package.
-     */
-    public Collection<TestSuite> getTestSuites() {
-        return mSuites;
-    }
-
-    /**
-     * Get the specific test suite by the full suite name.
-     *
-     * @param suiteFullName The full suite name.
-     * @return The test suite.
-     */
-    public TestSuite getTestSuiteByName(final String suiteFullName) {
-        for (TestSuite suite : getAllTestSuites()) {
-            if (suite.getFullName().equals(suiteFullName)) {
-                return suite;
-            }
-        }
-        return null;
-    }
-
-    /**
-     * Get the specific test case by the full test case name.
-     *
-     * @param testCaseFullName The full test case name.
-     * @return The test case.
-     */
-    public TestCase getTestCaseByName(final String testCaseFullName) {
-        for (TestCase testCase : getAllTestCases()) {
-            if (testCase.getFullName().equals(testCaseFullName)) {
-                return testCase;
-            }
-        }
-        return null;
-    }
-
-    /**
-     * Get all of test suites under this package.
-     *
-     * @return All of the test suites under this package.
-     */
-    public Collection<TestSuite> getAllTestSuites() {
-        Collection<TestSuite> suites = new ArrayList<TestSuite>();
-        for (TestSuite suite : mSuites) {
-            suites.addAll(suite.getAllSuites());
-        }
-        return suites;
-    }
-
-    /**
-     * Get suite/case names contained in this test package, searched against the expected name.
-     *
-     * @param expectName The expected name.
-     * @param suiteNameList The suite names list.
-     * @param caseNameList The case names list.
-     */
-    public void getTestSuiteNames(final String expectName,
-            List<String> suiteNameList, List<String> caseNameList) {
-
-        for (TestCase testCase : getAllTestCases()) {
-            String testCaseName = testCase.getFullName();
-            if (testCaseName.startsWith(expectName)) {
-                String suiteName = testCaseName.substring(0, testCaseName.lastIndexOf("."));
-                if (suiteName.equals(expectName)) {
-                    if (!caseNameList.contains(testCaseName)) {
-                        caseNameList.add(testCaseName);
-                    }
-                } else {
-                    if (!suiteNameList.contains(suiteName)) {
-                        suiteNameList.add(suiteName);
-                    }
-                }
-            }
-        }
-    }
-
-    /**
-     * Get all test suite names contained in this test package.
-     *
-     * @return The test suite name list.
-     */
-    public List<String> getAllTestSuiteNames() {
-        List<String> suiteNameList = new ArrayList<String>();
-        for (TestCase testCase : getAllTestCases()) {
-            String testCaseName = testCase.getFullName();
-            String suiteName = testCaseName.substring(0, testCaseName.lastIndexOf("."));
-            if (!suiteNameList.contains(suiteName)) {
-                suiteNameList.add(suiteName);
-            }
-        }
-        return suiteNameList;
-    }
-
-    /**
-     * Get all test case names contained in the suite in this test package.
-     *
-     * @param suiteFullName The full suite name.
-     * @return All test case names.
-     */
-    public List<String> getAllTestCaseNames(final String suiteFullName) {
-        List<String> caseNameList = new ArrayList<String>();
-        TestSuite suite = getTestSuiteByName(suiteFullName);
-        if (suite != null) {
-            caseNameList.addAll(suite.getAllTestCaseNames());
-        }
-        return caseNameList;
-    }
-
-    /**
-     * Get all test names contained in the test case in this test package.
-     *
-     * @param testCaseFullName The full test case name.
-     * @return All test names.
-     */
-    public List<String> getAllTestNames(final String testCaseFullName) {
-        List<String> testNameList = new ArrayList<String>();
-        TestCase testCase = getTestCaseByName(testCaseFullName);
-        if (testCase != null) {
-            testNameList.addAll(testCase.getAllTestNames());
-        }
-        return testNameList;
-    }
-
-    /**
-     * Get test case names list.
-     *
-     * @param expectPackage The expected package name.
-     * @param caseList The searched test case result.
-     * @param testList The searched test result.
-     */
-    public void getTestCaseNames(final String expectPackage, List<String> caseList,
-            List<String> testList) {
-
-        for (TestCase testCase : getAllTestCases()) {
-            String testCaseName = testCase.getFullName();
-            if (testCaseName.equals(expectPackage)) {
-                for (Test test : testCase.getTests()) {
-                    testList.add(test.getFullName());
-                }
-                return;
-            } else if (testCaseName.startsWith(expectPackage)) {
-                caseList.add(testCaseName);
-            }
-        }
-    }
-
-    /**
-     * Get test names list.
-     *
-     * @param expectPackage The expected package name.
-     * @param testList The searched test result.
-     */
-    public void getTestNames(final String expectPackage, List<String> testList) {
-
-        for (Test test : getTests()) {
-            String testName = test.getFullName();
-            if (testName.startsWith(expectPackage)) {
-                testList.add(testName);
-            }
-        }
-    }
-
-    /**
-     * Get the binary name of this package.
-     *
-     * @return The binary name of this package.
-     */
-    public String getAppBinaryName() {
-        return mName;
-    }
-
-    /**
-     * Get the version string of this package.
-     *
-     * @return The version string of this package.
-     */
-    public String getVersion() {
-        return mVersion;
-    }
-
-    /**
-     * Get the version information of Android.
-     *
-     * @return The version information of Android.
-     */
-    public String getAndroidVersion() {
-        return mAndroidVersion;
-    }
-
-    /**
-     * Get the target name space of this package.
-     *
-     * @return The target name space of the package.
-     */
-    public String getTargetNameSpace() {
-        return mTargetNameSpace;
-    }
-
-    /**
-     * Get the target binary name.
-     *
-     * @return The target binary name.
-     */
-    public String getTargetBinaryName() {
-        return mTargetBinaryName;
-    }
-
-    /**
-     * Get the instrumentation runner.
-     *
-     * @return The instrumentation runner.
-     */
-    public String getInstrumentationRunner() {
-        return mInstrumentationRunner;
-    }
-
-    /**
-     * Search a specific Test within this package.
-     *
-     * @param testName The test name to be searched against.
-     * @return The Test matches the given name.
-     */
-    public Test searchTest(final String testName) {
-        Test test = null;
-        for (TestSuite suite : mSuites) {
-            test = suite.searchTest(testName);
-            if (test != null) {
-                break;
-            }
-        }
-
-        return test;
-    }
-
-    /**
-     * Get all tests of this test package.
-     *
-     * @return The tests of this test package.
-     */
-    public Collection<Test> getTests() {
-        List<Test> tests = new ArrayList<Test>();
-        for (TestSuite s : mSuites) {
-            tests.addAll(s.getTests());
-        }
-
-        return tests;
-    }
-
-    /**
-     * Get all test cases of this test package.
-     *
-     * @return The test cases of this test package.
-     */
-    public Collection<TestCase> getAllTestCases() {
-        List<TestCase> testCases = new ArrayList<TestCase>();
-        for (TestSuite s : mSuites) {
-            testCases.addAll(s.getAllTestCases());
-        }
-
-        return testCases;
-    }
-
-    /**
-     * Set the message digest of the test package.
-     *
-     * @param digest the string of the package's message digest.
-     */
-    private void setMessageDigest(final String digest) {
-        mDigest = digest;
-    }
-
-    /**
-     * Get the string of package's message digest.
-     *
-     * @return message digest string.
-     */
-    public String getMessageDigest() {
-        return mDigest;
-    }
-
-    /**
-     * Get the the path of the controller jar file.
-     *
-     * @return message digest string.
-     */
-    public String getJarPath() {
-        return mJarPath;
-    }
-
-    /**
-     * Get the excluded list according to the execution status of each test.
-     *
-     * @param resultType The result type to filter the tests.
-     * @return All excluded list. There are three scenarios to interpret the return value:
-     *      <ul>
-     *          <li> null: nothing should be added to plan;
-     *          <li> list size equals 0: the whole package should be added to plan;
-     *          <li> list size greater than 0: the given excluded list should be added to plan.
-     *      </ul>
-     */
-    public ArrayList<String> getExcludedList(final String resultType) {
-        ArrayList<String> excludedList = new ArrayList<String>();
-        ArrayList<String> fullNameList = new ArrayList<String>();
-        for (TestSuite suite : getTestSuites()) {
-            fullNameList.add(suite.getFullName());
-            ArrayList<String> list = suite.getExcludedList(resultType);
-            if ((list != null) && (list.size() > 0)) {
-                excludedList.addAll(list);
-            }
-        }
-
-        int count = 0;
-        for (String fullName : fullNameList) {
-            if (excludedList.contains(fullName)) {
-                count ++;
-            }
-        }
-        if (count == fullNameList.size()) {
-            //all suites contained have been excluded,
-            //return null to tell the caller nothing to add to the plan
-            return null;
-        }
-        return excludedList;
-    }
-
-    /**
-     * Print the message by appending the new line mark.
-     *
-     * @param msg The message to be print.
-     */
-    protected void println(final String msg) {
-        if (!mTestStop) {
-            CUIOutputStream.println(msg);
-        }
-    }
-
-    /**
-     * Print the message without appending the new line mark.
-     *
-     * @param msg The message to be print.
-     */
-    protected void print(final String msg) {
-        if (!mTestStop) {
-            CUIOutputStream.print(msg);
-        }
-    }
-
-    /**
-     * Notify that the batch mode finished.
-     */
-    public void notifyBatchModeFinish() {
-        Log.d("TestPackage.notifyBatchModeFinish() is called, mTestStop=" + mTestStop);
-        if (mTestStop) {
-            return;
-        }
-
-        if (mIsInBatchMode) {
-            if (mCurrentTest != null) {
-                handleMissingFinishEvent();
-            }
-            synchronized (mTimeOutTimer) {
-                mTimeOutTimer.sendNotify();
-            }
-        }
-    }
-
-    /**
-     * Handle the missing FINISH event.
-     */
-    private void handleMissingFinishEvent() {
-        mProgressObserver.stop();
-        synchronized (mTimeOutTimer) {
-            mTimeOutTimer.cancel(false);
-        }
-        // The currently running test did not report a result. Mark it as not executed, so that it
-        // will be run again in individual mode.
-        mCurrentTest.setResult(new CtsTestResult(CtsTestResult.CODE_NOT_EXECUTED, null, null));
-        mCurrentTest = null;
-    }
-
-    /**
-     * Update Test running status when running in batch mode.
-     *
-     * @param test The Test to update. May be null if a status gets reported on a test that is not
-     * in the test plan.
-     * @param status The status to be updated.
-     */
-    public void notifyTestStatus(final Test test, final String status) {
-        if (mTestStop) {
-            return;
-        }
-
-        if (mIsInBatchMode) {
-            if (status.equals(START)) {
-                if ((mCurrentTest != null) && (mCurrentTest.getResult().isNotExecuted())) {
-                    Log.d("Err: Missing FINISH msg for test " + mCurrentTest.getFullName());
-                    handleMissingFinishEvent();
-                }
-                mCurrentTest = test;
-                if (test != null) {
-                    print(mCurrentTest.getFullName() + "...");
-                    mProgressObserver.start();
-                }
-            } else {
-                mProgressObserver.stop();
-                mCurrentTest = null;
-            }
-            // restart the timer even for unexpected tests
-            mTimeOutTimer.restart(new TimeOutTask(this),
-                    HostConfig.Ints.testStatusTimeoutMs.value());
-        }
-    }
-
-    /** {@inheritDoc} */
-    public void notifyInstallingComplete(final int resultCode) {
-        Log.d("notifyInstallingComplete() is called with resultCode=" + resultCode);
-        sendNotify();
-
-        if (resultCode == FAIL) {
-            Log.d("install failed");
-        }
-    }
-
-    /** {@inheritDoc} */
-    public void notifyUninstallingComplete(final int resultCode) {
-        Log.d("notifyUninstallingComplete() is called with resultCode=" + resultCode);
-        sendNotify();
-
-        if (resultCode == FAIL) {
-            Log.d("uninstall failed");
-        }
-    }
-
-    /**
-     * Send notify to wake up the thread waiting on the object.
-     */
-    private void sendNotify() {
-        synchronized (this) {
-            notify();
-        }
-    }
-
-    /** {@inheritDoc} */
-    public void notifyInstallingTimeout(final TestDevice testDevice) {
-        Log.d("TestPackage.notifyInstallingTimeout() is called");
-        mTestStop = true;
-        synchronized (this) {
-            notify();
-        }
-
-        genPackageActionTimeoutCause(testDevice, "Installing");
-    }
-
-    /** {@inheritDoc} */
-    public void notifyUninstallingTimeout(final TestDevice testDevice) {
-        Log.d("TestPackage.notifyUninstallingTimeout() is called");
-        mTestStop = true;
-        synchronized (this) {
-            notify();
-        }
-
-        genPackageActionTimeoutCause(testDevice, "Uninstalling");
-    }
-
-    /**
-     * Generate the cause of package action timeout.
-     *
-     * @param testDevice The {@link TestDevice} which got timeout.
-     * @param type Install or Uninstall.
-     */
-    private void genPackageActionTimeoutCause(final TestDevice testDevice, String type) {
-        String cause;
-        if (testDevice.getStatus() == TestDevice.STATUS_OFFLINE) {
-            cause = testDevice.getSerialNumber() + " is offline.";
-        } else {
-            cause = "Unknown reason.";
-        }
-
-        if (type == null) {
-            type = "Unknown timer";
-        }
-        Log.e(type + " met timeout due to " + cause, null);
-    }
-
-    /** {@inheritDoc} */
-    public void notifyTestingDeviceDisconnected() {
-        Log.d("busyDeviceDisconnected invoked");
-        mTestStop = true;
-        synchronized (this) {
-            notify();
-        }
-
-        cleanUp();
-
-        try {
-            CUIOutputStream.println("Test stopped.");
-            mTestThread.join();
-        } catch (InterruptedException e) {
-            Log.d("test thread interrupted");
-        }
-    }
-
-    /**
-     * Set the {@link TestDevice} which will run the test.
-     *
-     * @param device The {@link TestDevice} will run the test.
-     */
-    public void setTestDevice(final TestDevice device) {
-        mDevice = device;
-        device.setRuntimeListener(this);
-        device.setStatus(TestDevice.STATUS_BUSY);
-    }
-
-    /**
-     * Get the full path information.
-     *
-     * @param binaryFileName The binary file name.
-     * @return The full path information.
-     */
-    private String getFullPath(String binaryFileName) {
-        String packagePath = null;
-        if ((binaryFileName != null) && (binaryFileName.length() != 0)) {
-            packagePath = HostConfig.getInstance().getCaseRepository()
-                .getApkPath(binaryFileName);
-        }
-        return packagePath;
-    }
-    /**
-     * Load(install) test package and target package(if it exists).
-     *
-     * @return If succeed in installing, return true; else, return false.
-     */
-    private boolean install() throws DeviceDisconnectedException, InvalidApkPathException {
-        String packageBinaryName = getAppBinaryName();
-        String targetBinaryName = getTargetBinaryName();
-        String packagePath = getFullPath(packageBinaryName);
-        String targetApkPath = getFullPath(targetBinaryName);
-
-        boolean success = true;
-        if (packagePath != null) {
-            installAPK(packagePath);
-            if ((!mTestStop) && (targetApkPath != null)) {
-                installAPK(targetApkPath);
-            }
-        } else {
-            success = false;
-            Log.e("The package binary name contains nothing!", null);
-        }
-
-        if (mTestStop) {
-            success = false;
-            println("Install package " + packageBinaryName + "failed");
-        }
-
-        return success;
-    }
-
-    /**
-     * Uninstall test package and target package(if it exists)
-     */
-    private void uninstall() throws DeviceDisconnectedException, InvalidNameSpaceException {
-
-        String testPkgBinaryName = getAppBinaryName();
-        String appNameSpace = getAppNameSpace();
-        String targetNameSpace = getTargetNameSpace();
-        String packagePath = getFullPath(testPkgBinaryName);
-        String targetApkPath = getFullPath(targetNameSpace);
-
-        if ((packagePath != null) && HostUtils.isFileExist(packagePath)) {
-            uninstallAPK(appNameSpace);
-            if ((!mTestStop) && (targetNameSpace != null)
-                    && ((targetApkPath != null) && (HostUtils.isFileExist(targetApkPath)))) {
-                uninstallAPK(targetNameSpace);
-            }
-        }
-    }
-
-    /**
-     * Uninstall the specified package(.apk)
-     */
-    private void uninstallAPK(final String packageName) throws DeviceDisconnectedException,
-                InvalidNameSpaceException {
-        Log.d("Uninstall: " + packageName);
-        mDevice.uninstallAPK(packageName);
-        waitPackageActionComplete();
-    }
-
-    /**
-     * Install the test package on the devices attached to this session.
-     *
-     * @param apkPath The test package to be installed.
-     */
-    private void installAPK(final String apkPath) throws DeviceDisconnectedException,
-            InvalidApkPathException {
-        Log.d("installAPK " + apkPath + " ...");
-        mDevice.installAPK(apkPath);
-        waitPackageActionComplete();
-        Log.d("installAPK " + apkPath + " finish");
-    }
-
-    /**
-     * Wait for package action to complete.
-     */
-    private void waitPackageActionComplete() {
-        Log.d("Enter waitPackageActionComplete()");
-        synchronized (this) {
-            if (!mTestStop) {
-                try {
-                    wait();
-                } catch (InterruptedException e) {
-                    Log.d("interrupted while waiting for package action complete");
-                }
-            }
-        }
-        try {
-            Thread.sleep(HostConfig.Ints.postInstallWaitMs.value());
-        } catch (InterruptedException e) {
-            Log.d("sleeping after package action complete interrupted");
-        }
-        Log.d("Leave waitPackageActionComplete()");
-    }
-
-    /**
-     * Generate the message digest of the specified package
-     *
-     * @param packagePath path to the package.
-     * @return message digest string(base64 encoded).
-     */
-    private String genMessageDigest(final String packagePath) throws IOException {
-        final String algorithm = "SHA-1";
-        FileInputStream fin = new FileInputStream(packagePath);
-        try {
-            MessageDigest md = MessageDigest.getInstance(algorithm);
-            byte[] buffer = new byte[1024];
-            int len;
-            while ((len = fin.read(buffer)) != -1) {
-                md.update(buffer, 0, len);
-            }
-            fin.close();
-            return HostUtils.toHexString(md.digest());
-        } catch (NoSuchAlgorithmException e) {
-            return algorithm + " not found";
-        }
-    }
-
-    /**
-     * Set the test session thread.
-     *
-     * @param thread
-     */
-    public void setSessionThread(TestSessionThread thread) {
-        mTestThread = thread;
-    }
-
-    /**
-     * Check if it's valid to use batch mode.
-     *
-     * @return If each test under this package doesn't depend on any host controller, return true;
-     *         else, return false;
-     */
-    private boolean supportsBatchMode() {
-        Collection<Test> tests = getTests();
-
-        // check whether the package is small enough for batch mode
-        if (tests.size() > HostConfig.Ints.maxTestsInBatchMode.value()) {
-            return false;
-        }
-
-        for (Test test : tests) {
-            if (!test.getResult().isNotExecuted()) {
-                // if any test has been run, use individual mode
-                return false;
-            }
-
-            if ((test.getTestController() != null)
-                && (test.getTestController().getFullName() != null)) {
-                return false;
-            }
-        }
-
-        return true;
-    }
-
-    /**
-     * Get the first segment list of all of the test packages.
-     *
-     * @return the first segment list of all of the test packages contained in this test package;
-     */
-     List<String> getPackageNames() {
-        List<String> pkgNames = new ArrayList<String>();
-        List<String> suiteNames = getAllTestSuiteNames();
-        for (String suiteName : suiteNames) {
-            String pkgSeg = suiteName;
-            if (suiteName.contains(".")) {
-                pkgSeg = suiteName.split("\\.")[0];
-            }
-            if (!pkgNames.contains(pkgSeg)) {
-                pkgNames.add(pkgSeg);
-            }
-        }
-
-        return pkgNames;
-    }
-
-    /**
-     * Run this package or the java package contained in this package in batch mode.
-     *
-     * @param javaPkgName The java package name. If null, run the whole package;
-     *              else, run the specified java package contained in this package
-     */
-    private void runInBatchMode(final String javaPkgName)
-            throws DeviceDisconnectedException {
-        mTimeOutTimer = new HostTimer(new TimeOutTask(this),
-                HostConfig.Ints.batchStartTimeoutMs.value());
-        mTimeOutTimer.start();
-        mProgressObserver = new ProgressObserver();
-
-        if ((javaPkgName != null) && !javaPkgName.isEmpty()) {
-            runInBatchModeImpl(javaPkgName);
-        } else {
-            for (String pkgName : getPackageNames()) {
-                runInBatchModeImpl(pkgName);
-            }
-        }
-    }
-
-    /**
-     * Implementation of running in batch mode.
-     *
-     * @param javaPkgName The java package name.
-     */
-    private void runInBatchModeImpl(String javaPkgName)
-            throws DeviceDisconnectedException {
-        mDevice.runInBatchMode(this, javaPkgName);
-
-        synchronized (mTimeOutTimer) {
-            if (!mTestStop) {
-                try {
-                    mTimeOutTimer.waitOn();
-                } catch (InterruptedException e) {
-                    Log.d("time out object interrupted");
-                }
-            }
-
-            mProgressObserver.stop();
-            if (mTimeOutTimer.isTimeOut()) {
-                return;
-            } else {
-                // not caused by watch dog timer timing out,
-                // need to cancel timer
-                mTimeOutTimer.cancel(false);
-            }
-        }
-    }
-
-    /**
-     * Run this package in individual mode.
-     *
-     * @param javaPkgName The java package name.
-     * @param profile The profile of the device being tested.
-     */
-    protected void runInIndividualMode(final String javaPkgName) throws IOException,
-                    DeviceDisconnectedException, ADBServerNeedRestartException {
-        Iterator<TestSuite> suites = getTestSuites().iterator();
-        while (suites.hasNext() && (!mTestStop)) {
-            mCurrentTestSuite = suites.next();
-            mCurrentTestSuite.run(mDevice, javaPkgName);
-        }
-    }
-
-    /**
-     * The timer task which aids in guarding the running package with the
-     * guarding timer. If the executing of the package is not finished, and the
-     * guarding timer is expired, this task will be executed to force the finish
-     * of the running package.
-     */
-    class TimeOutTask extends TimerTask {
-        private TestPackage mTestPackage;
-
-        public TimeOutTask(final TestPackage testPackage) {
-            mTestPackage = testPackage;
-        }
-
-        @Override
-        public void run() {
-            mProgressObserver.stop();
-            synchronized (mTimeOutTimer) {
-                mTimeOutTimer.cancel(true);
-                mTimeOutTimer.sendNotify();
-            }
-
-            if ((mIsInBatchMode) && (mCurrentTest != null)) {
-                mCurrentTest.setResult(
-                        new CtsTestResult(CtsTestResult.CODE_TIMEOUT, null, null));
-                mCurrentTest = null;
-            }
-
-            Log.d("mTimeOutTimer timed out");
-            killDeviceProcess(mTestPackage.getAppPackageName());
-        }
-    }
-
-    /**
-     * Kill the device process.
-     *
-     * @param packageName
-     */
-    private void killDeviceProcess(final String packageName) {
-        mDevice.killProcess(packageName);
-    }
-
-    /**
-     * Check if all of the tests contained in this package have been run.
-     *
-     * @return If all tests have been run, return true; else, return false.
-     */
-    protected boolean isAllTestsRun(){
-        for (Test test : getTests()) {
-            if (test.getResult().isNotExecuted()) {
-                return false;
-            }
-        }
-        return true;
-    }
-
-    /**
-     * Check if any of the tests contained in this package have been executed.
-     *
-     * @return If no tests have been executed, return true, otherwise return false.
-     */
-    protected boolean noTestsExecuted() {
-        for (Test test : getTests()) {
-            if (!test.getResult().isNotExecuted()) {
-                return false;
-            }
-        }
-        return true;
-    }
-
-    /**
-     * Run the java package contained within this package over device.
-     *
-     * @param device The device to run this package.getName
-     * @param sessionLog the TestSession log for this TestSession.
-     */
-    public void run(final TestDevice device, final String javaPkgName,
-                    TestSessionLog sessionLog)
-            throws IOException, DeviceDisconnectedException,
-            ADBServerNeedRestartException, InvalidApkPathException,
-            InvalidNameSpaceException {
-        if (isAllTestsRun()) {
-            return;
-        }
-
-        String javaPackage = (javaPkgName != null) ? javaPkgName : mJavaPackageFilter;
-        setup(device, javaPackage);
-        runImpl(javaPackage);
-    }
-
-    /**
-     * Implementation of running the test package.
-     *
-     * @param javaPkgName The Java package name.
-     * @param profile The profile of the device being tested.
-     */
-    protected void runImpl(final String javaPkgName) throws IOException,
-            DeviceDisconnectedException, ADBServerNeedRestartException, InvalidApkPathException,
-            InvalidNameSpaceException {
-        try {
-            if (!install()) {
-                return;
-            }
-
-            if (!mTestStop) {
-                Log.d("install " + getAppBinaryName() + " succeed!");
-
-                setMessageDigest(genMessageDigest(HostConfig.getInstance()
-                        .getCaseRepository().getApkPath(getAppBinaryName())));
-
-                if (supportsBatchMode()) {
-                    mIsInBatchMode = true;
-                    Log.d("run in batch mode...");
-                    runInBatchMode(javaPkgName);
-                    if (!isAllTestsRun()) {
-                        mIsInBatchMode = false;
-                        Log.d("run in individual mode");
-                        runInIndividualMode(javaPkgName);
-                    }
-                } else {
-                    Log.d("run in individual mode...");
-                    runInIndividualMode(javaPkgName);
-                }
-            }
-
-            if (!mTestStop) {
-                uninstall();
-                if (!TestSession.isADBServerRestartedMode()) {
-                    println(PKG_LOG_SEPARATOR);
-                }
-            }
-        } catch (DeviceDisconnectedException e) {
-            cleanUp();
-            throw e;
-        }
-    }
-
-    /**
-     * Set up before running.
-     *
-     * @param device The device to run this package.getName
-     * @param javaPkgName The Java package name.
-     */
-    protected void setup(final TestDevice device, final String javaPkgName) {
-        if (!TestSession.isADBServerRestartedMode() || noTestsExecuted()) {
-            println(PKG_LOG_SEPARATOR);
-            if ((javaPkgName == null) || (javaPkgName.length() == 0)) {
-                println("Test package: " + getAppPackageName());
-            } else {
-                println("Test java package contained in test package "
-                        + getAppPackageName() + ": " + javaPkgName);
-            }
-        }
-
-        mTestStop = false;
-        mIsInBatchMode = false;
-        mCurrentTest = null;
-        mCurrentTestSuite = null;
-
-        setTestDevice(device);
-    }
-
-    /**
-     * Clean up.
-     */
-    public void cleanUp() {
-        if (mCurrentTestSuite != null) {
-            mCurrentTestSuite.setTestStopped(mTestStop);
-            mCurrentTestSuite.notifyTestingDeviceDisconnected();
-        }
-
-        if (mProgressObserver != null) {
-            mProgressObserver.stop();
-        }
-
-        if (mTimeOutTimer != null) {
-            mTimeOutTimer.cancel(false);
-        }
-    }
-
-    /**
-     * Run the specific test contained in the package over device.
-     *
-     * @param device The device to run the specific test.
-     * @param test The specific test to be run.
-     * @param profile The profile of the device being tested.
-     */
-    public void runTest(final TestDevice device, final Test test)
-            throws DeviceDisconnectedException, ADBServerNeedRestartException,
-            InvalidApkPathException, InvalidNameSpaceException {
-
-        if (test == null) {
-            return;
-        }
-
-        mTestStop = false;
-        mIsInBatchMode = false;
-
-        println(PKG_LOG_SEPARATOR);
-        println("Test package: " + getAppPackageName());
-        setTestDevice(device);
-
-        runTestImpl(test);
-    }
-
-    /**
-     * Implementation of running test.
-     *
-     * @param test The test to be run.
-     * @param profile The profile of the device being tested.
-     */
-    protected void runTestImpl(final Test test) throws DeviceDisconnectedException,
-            ADBServerNeedRestartException, InvalidApkPathException,
-            InvalidNameSpaceException {
-        try {
-            if (!install()) {
-                return;
-            }
-
-            if (!mTestStop) {
-                Log.d("install " + getAppPackageName() + " succeed!");
-                mCurrentTestSuite = test.getTestSuite();
-                mCurrentTestSuite.run(mDevice, test);
-            }
-
-            if (!mTestStop) {
-                uninstall();
-                println(PKG_LOG_SEPARATOR);
-            }
-        } catch (DeviceDisconnectedException e) {
-            cleanUp();
-            throw e;
-        }
-    }
-}
diff --git a/tools/host/src/com/android/cts/TestPlan.java b/tools/host/src/com/android/cts/TestPlan.java
deleted file mode 100644
index 9eb4d5b..0000000
--- a/tools/host/src/com/android/cts/TestPlan.java
+++ /dev/null
@@ -1,106 +0,0 @@
-/*
- * Copyright (C) 2008 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 com.android.cts;
-
-import java.io.File;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Collection;
-
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.ParserConfigurationException;
-
-import org.w3c.dom.Document;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-import org.xml.sax.SAXException;
-
-/**
- * Define TestPlan tags and attributes.
- */
-public class TestPlan extends XMLResourceHandler{
-    public static final String EXCLUDE_SEPARATOR = ";";
-
-    public interface Tag {
-        public static final String TEST_SUITE = "TestSuite";
-        public static final String ENTRY = "Entry";
-        public static final String TEST_PLAN = "TestPlan";
-        public static final String PLAN_SETTING = "PlanSettings";
-        public static final String REQUIRED_DEVICE = "RequiredDevice";
-        public static final String TEST_CASE = "TestCase";
-    }
-
-    public interface Attribute {
-        public static final String NAME = "name";
-        public static final String URI = "uri";
-        public static final String EXCLUDE = "exclude";
-        public static final String AMOUNT = "amount";
-    }
-
-    /**
-     * Get test package names via test plan file path.
-     *
-     * @param planPath TestPlan configuration file path
-     * @param removedPkgList The removed package list.
-     * @return The package names.
-     */
-    public static Collection<String> getEntries(String planPath,
-            ArrayList<String> removedPkgList)
-            throws SAXException, IOException, ParserConfigurationException {
-        ArrayList<String> entries = new ArrayList<String>();
-
-        DocumentBuilder builder = DocumentBuilderFactory.newInstance().newDocumentBuilder();
-        File planFile = new File(planPath);
-        Document doc = builder.parse(planFile);
-
-        NodeList pkgEntries = doc.getElementsByTagName(TestPlan.Tag.ENTRY);
-        for (int i = 0; i < pkgEntries.getLength(); i++) {
-            Node pkgEntry = pkgEntries.item(i);
-            String uri = getStringAttributeValue(pkgEntry, TestPlan.Attribute.URI);
-
-            String packageBinaryName = HostConfig.getInstance().getPackageBinaryName(uri);
-            if (packageBinaryName != null) {
-                entries.add(getStringAttributeValue(pkgEntry, TestPlan.Attribute.URI));
-            } else {
-                removedPkgList.add(uri);
-            }
-        }
-
-        return entries;
-    }
-
-    /**
-     * Check if the given package name is valid in the case repository.
-     *
-     * @param pkgName
-     * @return if both the apk file and xml file exist, return true;
-     *         else, return false.
-     */
-    public static boolean isValidPackageName(String pkgName) {
-        String xmlPath = HostConfig.getInstance().getCaseRepository().getXmlPath(pkgName);
-        String apkPath = HostConfig.getInstance().getCaseRepository().getApkPath(pkgName);
-        File xmlFile = new File(xmlPath);
-        File apkFile = new File(apkPath);
-
-        if (xmlFile.exists() && apkFile.exists()) {
-            return true;
-        } else {
-            return false;
-        }
-    }
-}
diff --git a/tools/host/src/com/android/cts/TestPlanNotFoundException.java b/tools/host/src/com/android/cts/TestPlanNotFoundException.java
deleted file mode 100644
index bbe1132..0000000
--- a/tools/host/src/com/android/cts/TestPlanNotFoundException.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Copyright (C) 2008 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 com.android.cts;
-
-/**
- * Exception if input a nonexistent test plan.
- */
-public class TestPlanNotFoundException extends Exception {
-
-    private static final long serialVersionUID = -2311532206911427651L;
-
-    public TestPlanNotFoundException() {
-        super();
-    }
-
-    public TestPlanNotFoundException(String message) {
-        super(message);
-    }
-}
diff --git a/tools/host/src/com/android/cts/TestSession.java b/tools/host/src/com/android/cts/TestSession.java
deleted file mode 100644
index e3693d8..0000000
--- a/tools/host/src/com/android/cts/TestSession.java
+++ /dev/null
@@ -1,617 +0,0 @@
-/*
- * Copyright (C) 2008 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 com.android.cts;
-
-import java.io.IOException;
-import java.util.Collection;
-
-/**
- * Represents a runtime session for a test plan, takes charge in running a
- * plan and the setup&tear-downs.
- */
-public class TestSession {
-    private SessionObserver mSessionObserver;
-    private TestSessionLog mSessionLog;
-    private TestDevice mDevice;
-
-    private int mId;
-    private STATUS mStatus;
-
-    private static int sIdCounter = 0;
-
-    enum STATUS {
-        INIT, STARTED, INSTALLING, RUNNING, PAUSED, RESUMED, STOPPED, FINISHED
-    }
-
-    private int mRequiredDeviceNumber;
-    private boolean mTestStop;
-    private TestSessionThread mTestThread;
-    private boolean mNeedRestartAdbServer;
-    private static boolean mADBServerRestartedMode;
-
-    /** Running count of tests executed since last reboot. */
-    private static long mTestCount;
-
-    public TestSession(final TestSessionLog sessionLog,
-            final int requiredDeviceNum) {
-        mStatus = STATUS.INIT;
-
-        mNeedRestartAdbServer = false;
-        mADBServerRestartedMode = false;
-        mTestCount = 0;
-        mSessionLog = sessionLog;
-        mDevice = null;
-        mRequiredDeviceNumber = requiredDeviceNum;
-        mTestStop = false;
-        mId = sIdCounter++;
-    }
-
-    /**
-     * Get the last session ID.
-     *
-     * @return The last session ID.
-     */
-    public static int getLastSessionId() {
-        return sIdCounter-1;
-    }
-
-    /**
-     * Set ADB server restarted mode.
-     */
-    public static void setADBServerRestartedMode() {
-        mADBServerRestartedMode = true;
-    }
-
-    /**
-     * Reset ADB server restarted mode.
-     */
-    public static void resetADBServerRestartedMode() {
-        mADBServerRestartedMode = false;
-    }
-
-    /**
-     * Check if it's in ADB server restarted mode.
-     *
-     * @return If in ADB server restarted mode, return true; else, return false.
-     */
-    public static boolean isADBServerRestartedMode() {
-        return mADBServerRestartedMode;
-    }
-
-    /**
-     * Increase the test count.
-     */
-    public static void incTestCount() {
-        mTestCount++;
-    }
-
-    /**
-     * Reset the test count.
-     */
-    public static void resetTestCount() {
-        mTestCount = 0;
-    }
-
-    /**
-     * Get the test count recently has been run.
-     *
-     * @return The test count recently has been run.
-     */
-    public static long getTestCount() {
-        return mTestCount;
-    }
-
-    /**
-     * Check if the test count exceeds the max test count. If the max test count is disabled
-     * (HostConfig.getMaxTestCount() <= 0), this method always returns false.
-     *
-     * @return true, if the max count is enabled and exceeded.
-     */
-    public static boolean exceedsMaxCount() {
-        final long maxTestCount = HostConfig.getMaxTestCount();
-        return (maxTestCount > 0) && (mTestCount >= maxTestCount);
-    }
-
-    /**
-     * Get status.
-     *
-     * @return The status.
-     */
-    public STATUS getStatus() {
-        return mStatus;
-    }
-
-    /**
-     * Get device ID.
-     *
-     * @return device ID.
-     */
-    public String getDeviceId() {
-        if (mDevice == null) {
-            return null;
-        }
-        return mDevice.getSerialNumber();
-    }
-
-    /**
-     * Get the test device.
-     *
-     * @return the test device.
-     */
-    public TestDevice getDevice() {
-        return mDevice;
-    }
-
-    /**
-     * Get the number of required devices.
-     *
-     * @return The number of required devices.
-     */
-    public int getNumOfRequiredDevices() {
-        return mRequiredDeviceNumber;
-    }
-
-    /**
-     * Get ID.
-     *
-     * @return ID.
-     */
-    public int getId() {
-        return mId;
-    }
-
-    /**
-     * Start the single test with full name.
-     *
-     * @param testFullName The test full name.
-     */
-    public void start(final String testFullName) throws TestNotFoundException,
-            IllegalTestNameException, ADBServerNeedRestartException {
-
-        if ((testFullName == null) || (testFullName.length() == 0)) {
-            throw new IllegalArgumentException();
-        }
-
-        // The test full name follows the following rule:
-        //     java_package_name.class_name#method_name.
-        // Other forms will be treated as illegal.
-        if (!testFullName.matches("(\\w+.)+\\w+")) {
-            throw new IllegalTestNameException(testFullName);
-        }
-
-        Test test = null;
-        TestPackage pkg = null;
-        if (-1 != testFullName.indexOf(Test.METHOD_SEPARATOR)) {
-            test = searchTest(testFullName);
-            if (test == null) {
-                throw new TestNotFoundException(
-                        "The specific test does not exist: " + testFullName);
-            }
-
-            mTestThread = new TestSessionThread(this, test);
-            CUIOutputStream.println("start test " + testFullName);
-        } else {
-            pkg = searchTestPackage(testFullName);
-            if (pkg == null) {
-                throw new TestNotFoundException(
-                        "The specific test package does not exist: " + testFullName);
-            }
-
-            mTestThread = new TestSessionThread(this, pkg, testFullName);
-            CUIOutputStream.println("start java package " + testFullName);
-        }
-
-        mStatus = STATUS.STARTED;
-        startImpl();
-    }
-
-    /**
-     * Implement starting/resuming session.
-     */
-    private void startImpl() throws ADBServerNeedRestartException {
-        String resultPath = mSessionLog.getResultPath();
-        if ((resultPath == null) || (resultPath.length() == 0)) {
-            mSessionLog.setStartTime(System.currentTimeMillis());
-        }
-        resetTestCount();
-        mTestThread.start();
-        try {
-            mTestThread.join();
-        } catch (InterruptedException e) {
-            e.printStackTrace();
-        }
-        if (mNeedRestartAdbServer && HostConfig.getMaxTestCount() > 0) {
-            throw new ADBServerNeedRestartException("Need restart ADB server");
-        }
-    }
-
-    /**
-     * Resume the test session.
-     */
-    public void resume() throws ADBServerNeedRestartException {
-        mStatus = STATUS.RESUMED;
-        mTestThread = new TestSessionThread(this);
-        if (!isADBServerRestartedMode()) {
-            CUIOutputStream.println("resume test plan " + getSessionLog().getTestPlanName()
-                + " (session id = " + mId + ")");
-        }
-        startImpl();
-    }
-
-    /**
-     * Search the test with the test full name given among the test
-     * packages contained within this session.
-     *
-     * @param testFullName The full name of the test.
-     * @return The test with the full name given.
-     */
-    private Test searchTest(final String testFullName) {
-        Test test = null;
-        for (TestPackage pkg : mSessionLog.getTestPackages()) {
-            test = pkg.searchTest(testFullName);
-            if (test != null) {
-                break;
-            }
-        }
-
-        return test;
-    }
-
-    /**
-     * Search the test package with the specified java package name.
-     *
-     * @param javaPkgName The java package name.
-     * @return The test package with the specified java package name.
-     */
-    private TestPackage searchTestPackage(String javaPkgName) {
-        for (TestPackage pkg : mSessionLog.getTestPackages()) {
-            Collection<Test> tests = pkg.getTests();
-            for (Test test : tests) {
-                String testFullName = test.getFullName();
-                if (testFullName.startsWith(javaPkgName)) {
-                    //adjust the java package name to make it equal to some java package name
-                    if (testFullName.charAt(javaPkgName.length()) != '.') {
-                        javaPkgName = javaPkgName.substring(0, javaPkgName.lastIndexOf("."));
-                    }
-                    return pkg;
-                }
-            }
-        }
-
-        return null;
-    }
-    /**
-     * Start a new test session thread to execute the specific test plan.
-     */
-    public void start() throws ADBServerNeedRestartException {
-        mStatus = STATUS.STARTED;
-        mSessionLog.setStartTime(System.currentTimeMillis());
-        mTestThread = new TestSessionThread(this);
-
-        CUIOutputStream.println("start test plan " + getSessionLog().getTestPlanName());
-        startImpl();
-    }
-
-    /**
-     * Set observer.
-     *
-     * @param so Session observer.
-     */
-    public void setObserver(final SessionObserver so) {
-        mSessionObserver = so;
-    }
-
-    /**
-     * Print the message by appending the new line mark.
-     *
-     * @param msg The message to be print.
-     */
-    private void println(final String msg) {
-        if (!mTestStop) {
-            CUIOutputStream.println(msg);
-        }
-    }
-
-    /**
-     * Set the {@link TestDevice} which will run the test.
-     *
-     * @param device The {@link TestDevice} will run the test.
-     */
-    public void setTestDevice(final TestDevice device) {
-        mDevice = device;
-    }
-
-    /**
-     * Get the session log of this session.
-     *
-     * @return The session log of this session.
-     */
-    public TestSessionLog getSessionLog() {
-        return mSessionLog;
-    }
-
-    /**
-     * Get the test packages contained within this session.
-     *
-     * @return The test packages contained within this session.
-     */
-    public Collection<TestPackage> getTestPackages() {
-        return mSessionLog.getTestPackages();
-    }
-
-    /**
-     * The Thread to be run the {@link TestSession}
-     */
-    class TestSessionThread extends Thread {
-        private final int MSEC_PER_SECOND = 1000;
-
-        private TestSession mTestSession;
-        private Test mTest;
-        private TestPackage mTestPackage;
-        private String mJavaPackageName;
-        private ResultObserver mResultObserver;
-
-        public TestSessionThread(final TestSession ts) {
-            mTestSession = ts;
-            mResultObserver = ResultObserver.getInstance();
-        }
-
-        public TestSessionThread(final TestSession ts, final Test test) {
-            mTestSession = ts;
-            mResultObserver = ResultObserver.getInstance();
-            mTest = test;
-        }
-
-        public TestSessionThread(final TestSession ts,
-                final TestPackage pkg, final String javaPkgName) {
-            mTestSession = ts;
-            mResultObserver = ResultObserver.getInstance();
-            mTestPackage = pkg;
-            mJavaPackageName = javaPkgName;
-        }
-
-        /** {@inheritDoc} */
-        @Override
-        public void run() {
-            Log.d("Start a test session.");
-            mNeedRestartAdbServer = false;
-            mResultObserver.setTestSessionLog(getSessionLog());
-            mResultObserver.start();
-
-            try {
-                if (mTest != null) {
-                    TestPackage pkg = mTest.getTestPackage();
-                    pkg.setSessionThread(this);
-                    pkg.runTest(mDevice, mTest);
-                } else if (mTestPackage != null) {
-                    mTestPackage.setSessionThread(this);
-                    mTestPackage.run(mDevice, mJavaPackageName, mSessionLog);
-                } else {
-                    for (TestPackage pkg : mSessionLog.getTestPackages()) {
-                        if (!pkg.isAllTestsRun()) {
-                            pkg.setSessionThread(this);
-                            pkg.run(mDevice, null, mSessionLog);
-                            if (!isAllTestsRun()) {
-                                if (HostConfig.getMaxTestCount() > 0) {
-                                    // ADB server restart enabled
-                                    markNeedRestartADBServer();
-                                    return;
-                                }
-                            } else {
-                                Log.d("All tests have been run.");
-                                break;
-                            }
-                        }
-                    }
-                    mNeedRestartAdbServer = false;
-                    displayTestResultSummary();
-                }
-            } catch (IOException e) {
-                Log.e("Got exception when running the package", e);
-            } catch (DeviceDisconnectedException e) {
-                Log.e("Device " + e.getMessage() + " disconnected ", null);
-            } catch (ADBServerNeedRestartException e) {
-                Log.d(e.getMessage());
-                if (mTest == null) {
-                    markNeedRestartADBServer();
-                    return;
-                }
-            } catch (InvalidApkPathException e) {
-                Log.e(e.getMessage(), null);
-            } catch (InvalidNameSpaceException e) {
-                Log.e(e.getMessage(), null);
-            }
-
-            long startTime = getSessionLog().getStartTime().getTime();
-            displayTimeInfo(startTime, System.currentTimeMillis());
-
-            mStatus = STATUS.FINISHED;
-            mTestSession.getSessionLog().setEndTime(System.currentTimeMillis());
-            mSessionObserver.notifyFinished(mTestSession);
-            notifyResultObserver();
-        }
-
-        /**
-         * Mark need restarting ADB server.
-         */
-        private void markNeedRestartADBServer() {
-            Log.d("mark mNeedRestartAdbServer to true");
-            mNeedRestartAdbServer = true;
-            mStatus = STATUS.FINISHED;
-            notifyResultObserver();
-            return;
-        }
-
-        /**
-         * Notify result observer.
-         */
-        private void notifyResultObserver() {
-            mResultObserver.notifyUpdate();
-            mResultObserver.finish();
-        }
-
-        /**
-         * Check if all tests contained in all of the test packages has been run.
-         *
-         * @return If all tests have been run, return true; else, return false.
-         */
-        private boolean isAllTestsRun() {
-            Collection<TestPackage> pkgs = getTestPackages();
-            for (TestPackage pkg : pkgs) {
-                if (!pkg.isAllTestsRun()) {
-                    return false;
-                }
-            }
-            return true;
-        }
-
-        /**
-         * Display the summary of test result.
-         */
-        private void displayTestResultSummary() {
-            int passNum = mSessionLog.getTestList(CtsTestResult.CODE_PASS).size();
-            int failNum = mSessionLog.getTestList(CtsTestResult.CODE_FAIL).size();
-            int notExecutedNum = mSessionLog.getTestList(CtsTestResult.CODE_NOT_EXECUTED).size();
-            int timeOutNum = mSessionLog.getTestList(CtsTestResult.CODE_TIMEOUT).size();
-            int total = passNum + failNum + notExecutedNum + timeOutNum;
-
-            println("Test summary:   pass=" + passNum
-                    + "   fail=" + failNum
-                    + "   timeOut=" + timeOutNum
-                    + "   notExecuted=" + notExecutedNum
-                    + "   Total=" + total);
-        }
-
-        /**
-         * Display the time information of running a test plan.
-         *
-         * @param startTime start time in milliseconds.
-         * @param endTime end time in milliseconds.
-         */
-        private void displayTimeInfo(final long startTime, final long endTime) {
-            long diff = endTime - startTime;
-            long seconds = diff / MSEC_PER_SECOND;
-            long millisec = diff % MSEC_PER_SECOND;
-            println("Time: " + seconds + "." + millisec + "s\n");
-        }
-    }
-
-    /**
-     * Update test result after executing each test.
-     * During running test, the process may be interrupted. To avoid
-     * test result losing, it's needed to update the test result into
-     * xml file after executing each test, which is done by this observer.
-     * The possible reasons causing interruption to the process include:
-     * <ul>
-     *    <li> Device disconnected
-     *    <li> Run time exception
-     *    <li> System crash
-     *    <li> User action to cause the system exit
-     * </ul>
-     *
-     */
-   static class ResultObserver {
-        static private boolean mFinished = false;
-        static private boolean mNotified = false; //used for avoiding race condition
-        static private boolean mNeedUpdate = true;
-        static private TestSessionLog mSessionLog;
-        static final ResultObserver sInstance = new ResultObserver();
-
-        private Observer mObserver;
-        /**
-         * Get the static instance.
-         *
-         * @return The static instance.
-         */
-        public static final ResultObserver getInstance() {
-            return sInstance;
-        }
-
-        /**
-         * Set TestSessionLog.
-         *
-         * @param log The TestSessionLog.
-         */
-        public void setTestSessionLog(TestSessionLog log) {
-            mSessionLog = log;
-        }
-
-        /**
-         * Notify this updating thread to update the test result to xml file.
-         */
-        public void notifyUpdate() {
-            if (mObserver != null) {
-                synchronized (mObserver) {
-                    mNotified = true;
-                    mObserver.notify();
-                }
-            }
-        }
-
-        /**
-         * Start the observer.
-         */
-        public void start() {
-            mFinished = false;
-            mNeedUpdate = true;
-            mObserver = new Observer();
-            mObserver.start();
-        }
-
-        /**
-         * Finish updating.
-         */
-        public void finish() {
-            mFinished = true;
-            mNeedUpdate = false;
-            notifyUpdate();
-            try {
-                mObserver.join();
-                mObserver = null;
-            } catch (InterruptedException e) {
-            }
-        }
-
-        /**
-         * Observer which updates the test result to result XML file.
-         *
-         */
-        class Observer extends Thread {
-
-            /** {@inheritDoc} */
-            @Override
-            public void run() {
-                while (!mFinished) {
-                    try {
-                        synchronized (this) {
-                            if ((!mNotified) && (!mFinished)) {
-                                wait();
-                            }
-
-                            mNotified = false;
-                        }
-
-                        if (mNeedUpdate && (mSessionLog != null)) {
-                            mSessionLog.sessionComplete();
-                        }
-                    } catch (InterruptedException e) {
-                    }
-                }
-            }
-        }
-    }
-}
diff --git a/tools/host/src/com/android/cts/TestSessionBuilder.java b/tools/host/src/com/android/cts/TestSessionBuilder.java
deleted file mode 100644
index fd520a7..0000000
--- a/tools/host/src/com/android/cts/TestSessionBuilder.java
+++ /dev/null
@@ -1,589 +0,0 @@
-/*
- * Copyright (C) 2008 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 com.android.cts;
-
-import org.w3c.dom.Document;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-import org.xml.sax.SAXException;
-
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.security.NoSuchAlgorithmException;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.ParserConfigurationException;
-import javax.xml.transform.TransformerException;
-import javax.xml.transform.TransformerFactoryConfigurationError;
-
-/**
- * Builder of test plan and also provides serialization for a test plan.
- */
-public class TestSessionBuilder extends XMLResourceHandler {
-    // defined for external document, which is from the configuration files
-    // this should keep synchronized with the format of the configuration files
-
-    private static final String TAG_TEST_SUITE = "TestSuite";
-    private static final String TAG_TEST_CASE = "TestCase";
-    public static final String TAG_TEST = "Test";
-
-    // attribute name define
-    public static final String ATTRIBUTE_SIGNATURE_CHECK = "signatureCheck";
-    public static final String ATTRIBUTE_REFERENCE_APP_TEST = "referenceAppTest";
-    public static final String ATTRIBUTE_PRIORITY = "priority";
-
-    private static final String ATTRIBUTE_NAME = "name";
-    private static final String ATTRIBUTE_RUNNER = "runner";
-    private static final String ATTRIBUTE_JAR_PATH = "jarPath";
-    private static final String ATTRIBUTE_APP_NAME_SPACE = "appNameSpace";
-    public static final String ATTRIBUTE_APP_PACKAGE_NAME = "appPackageName";
-    private static final String ATTRIBUTE_TARGET_NAME_SPACE = "targetNameSpace";
-    private static final String ATTRIBUTE_TARGET_BINARY_NAME = "targetBinaryName";
-    private static final String ATTRIBUTE_TYPE = "type";
-    private static final String ATTRIBUTE_CONTROLLER = "HostController";
-    private static final String ATTRIBUTE_KNOWN_FAILURE = "KnownFailure";
-    private static final String ATTRIBUTE_HOST_SIDE_ONLY = "hostSideOnly";
-    private static final String ATTRIBUTE_VERSION = "version";
-    private static final String ATTRIBUTE_FRAMEWORK_VERSION = "AndroidFramework";
-    private static final String ATTRIBUTE_APK_TO_TEST_NAME = "apkToTestName";
-    private static final String ATTRIBUTE_PACKAGE_TO_TEST = "packageToTest";
-    private static final String ATTRIBUTE_JAVA_PACKAGE_FILTER = "javaPackageFilter";
-    private static TestSessionBuilder sInstance;
-
-    private DocumentBuilder mDocBuilder;
-
-    public static TestSessionBuilder getInstance()
-            throws ParserConfigurationException {
-        if (sInstance == null) {
-            sInstance = new TestSessionBuilder();
-        }
-
-        return sInstance;
-    }
-
-    private TestSessionBuilder() throws ParserConfigurationException {
-        mDocBuilder = DocumentBuilderFactory.newInstance().newDocumentBuilder();
-    }
-
-    /**
-     * Create TestSession via TestSessionLog.
-     *
-     * @param log The test session log.
-     * @return The test session.
-     */
-    public TestSession build(TestSessionLog log) {
-        if (log == null) {
-            return null;
-        }
-        return new TestSession(log, 1);
-    }
-
-    /**
-     * Create TestSession via TestPlan XML configuration file.
-     *
-     * @param config TestPlan XML configuration file.
-     * @return TestSession.
-     */
-    public TestSession build(final String config) throws SAXException, IOException,
-            TestPlanNotFoundException, TestNotFoundException, NoSuchAlgorithmException {
-        File file = new File(config);
-        if (!file.exists()) {
-            throw new TestPlanNotFoundException();
-        }
-        Document doc = mDocBuilder.parse(file);
-
-        // parse device configuration
-        int numOfRequiredDevices = 1; // default is 1
-        try {
-            Node deviceConfigNode = doc.getElementsByTagName(
-                    TestPlan.Tag.REQUIRED_DEVICE).item(0);
-            numOfRequiredDevices = getAttributeValue(deviceConfigNode,
-                    TestPlan.Attribute.AMOUNT);
-        } catch (Exception e) {
-        }
-
-        Collection<TestPackage> packages = loadPackages(doc);
-        if (packages.size() == 0) {
-            throw new TestNotFoundException("No valid package in test plan.");
-        }
-
-        String planFileName = file.getName();
-        int index = planFileName.indexOf(".");
-        String planName;
-        if (index != -1) {
-            planName = planFileName.substring(0, planFileName.indexOf("."));
-        } else{
-            planName = planFileName;
-        }
-
-        TestSessionLog sessionLog = new TestSessionLog(packages, planName);
-        TestSession ts = new TestSession(sessionLog, numOfRequiredDevices);
-        return ts;
-    }
-
-    /**
-     * Load TestPackages from a TestPlan DOM doc.
-     *
-     * @param doc TestPlan DOM Document
-     * @return loaded test package from TestPlan DOM Document
-     */
-    private Collection<TestPackage> loadPackages(Document doc)
-                throws SAXException, IOException, NoSuchAlgorithmException {
-
-        ArrayList<TestPackage> packages = new ArrayList<TestPackage>();
-        NodeList packageList = doc.getElementsByTagName(TestPlan.Tag.ENTRY);
-        ArrayList<String> removedPkgList = new ArrayList<String>();
-        for (int i = 0; i < packageList.getLength(); i++) {
-            Node pNode = packageList.item(i);
-            String uri = getStringAttributeValue(pNode, TestPlan.Attribute.URI);
-            String list = getStringAttributeValue(pNode, TestPlan.Attribute.EXCLUDE);
-            ArrayList<String> excludedList = null;
-            if ((list != null) && (list.length() != 0)) {
-                excludedList = getStrArrayList(list);
-            }
-
-            String packageBinaryName = HostConfig.getInstance().getPackageBinaryName(uri);
-            if (packageBinaryName != null) {
-                String xmlConfigFilePath =
-                       HostConfig.getInstance().getCaseRepository().getXmlPath(packageBinaryName);
-                File xmlFile = new File(xmlConfigFilePath);
-                TestPackage pkg = loadPackage(xmlFile, excludedList);
-                if (pkg instanceof SignatureCheckPackage) {
-                    // insert the signature check package
-                    // to the head of the list
-                    packages.add(0, pkg);
-                } else {
-                    packages.add(pkg);
-                }
-            } else{
-                removedPkgList.add(uri);
-            }
-        }
-        if (removedPkgList.size() != 0) {
-            CUIOutputStream.println("The following package(s) doesn't exist:");
-            for (String pkgName : removedPkgList) {
-                CUIOutputStream.println("    " + pkgName);
-            }
-        }
-        return packages;
-    }
-
-    /**
-     * Load TestPackage via Package XML configuration file.
-     *
-     * @param packageConfigFile test package XML file
-     * @param excludedList The list containing the excluded suites and sub types.
-     * @return loaded TestPackage from test package XML configuration file
-     */
-    public TestPackage loadPackage(final File packageConfigFile, ArrayList<String> excludedList)
-                                throws SAXException, IOException, NoSuchAlgorithmException {
-        Node pNode = mDocBuilder.parse(packageConfigFile).getDocumentElement();
-        return loadPackage(pNode, excludedList);
-    }
-
-    /**
-     * Load TestPackage via Package XML configuration file.
-     *
-     * @param pkgNode the test package node in the XML file
-     * @param excludedList The list containing the excluded suites and sub types.
-     * @return loaded TestPackage from test package XML configuration file
-     */
-    public TestPackage loadPackage(final Node pkgNode, ArrayList<String> excludedList)
-                                throws NoSuchAlgorithmException {
-
-        NodeList suiteList = pkgNode.getChildNodes();
-
-        String appBinaryName = getStringAttributeValue(pkgNode, ATTRIBUTE_NAME);
-        String targetNameSpace = getStringAttributeValue(pkgNode, ATTRIBUTE_TARGET_NAME_SPACE);
-        String targetBinaryName = getStringAttributeValue(pkgNode, ATTRIBUTE_TARGET_BINARY_NAME);
-        String version = getStringAttributeValue(pkgNode, ATTRIBUTE_VERSION);
-        String frameworkVersion = getStringAttributeValue(pkgNode, ATTRIBUTE_FRAMEWORK_VERSION);
-        String runner = getStringAttributeValue(pkgNode, ATTRIBUTE_RUNNER);
-        String jarPath = getStringAttributeValue(pkgNode, ATTRIBUTE_JAR_PATH);
-        String appNameSpace = getStringAttributeValue(pkgNode, ATTRIBUTE_APP_NAME_SPACE);
-        String appPackageName = getStringAttributeValue(pkgNode, ATTRIBUTE_APP_PACKAGE_NAME);
-        String hostSideOnly = getStringAttributeValue(pkgNode, ATTRIBUTE_HOST_SIDE_ONLY);
-        String signature = getStringAttributeValue(pkgNode, ATTRIBUTE_SIGNATURE_CHECK);
-        String referenceAppTest = getStringAttributeValue(pkgNode, ATTRIBUTE_REFERENCE_APP_TEST);
-        String javaPackageFilter = getStringAttributeValue(pkgNode, ATTRIBUTE_JAVA_PACKAGE_FILTER);
-        TestPackage pkg = null;
-
-        if ("true".equals(referenceAppTest)) {
-            String apkToTestName = getStringAttributeValue(pkgNode, ATTRIBUTE_APK_TO_TEST_NAME);
-            String packageUnderTest = getStringAttributeValue(pkgNode, ATTRIBUTE_PACKAGE_TO_TEST);
-            pkg = new ReferenceAppTestPackage(runner, appBinaryName, targetNameSpace,
-                    targetBinaryName, version, frameworkVersion, jarPath,
-                    appNameSpace, appPackageName,
-                    apkToTestName, packageUnderTest);
-        } else if ("true".equals(signature)) {
-            pkg = new SignatureCheckPackage(runner, appBinaryName, targetNameSpace,
-                    targetBinaryName, version, frameworkVersion, jarPath,
-                    appNameSpace, appPackageName);
-        } else if ("true".equals(hostSideOnly)) {
-            pkg = new HostSideOnlyPackage(appBinaryName, version, frameworkVersion,
-                    jarPath, appPackageName);
-        } else {
-            pkg = new TestPackage(runner, appBinaryName, targetNameSpace, targetBinaryName, version,
-                    frameworkVersion, jarPath, appNameSpace, appPackageName, javaPackageFilter);
-        }
-
-        for (int i = 0; i < suiteList.getLength(); i++) {
-            Node sNode = suiteList.item(i);
-            if (sNode.getNodeType() == Document.ELEMENT_NODE
-                    && TAG_TEST_SUITE.equals(sNode.getNodeName())) {
-                String fullSuiteName = getFullSuiteName(sNode);
-                if (checkFullMatch(excludedList, fullSuiteName) == false) {
-                    ArrayList<String> excludedCaseList =
-                                          getExcludedList(excludedList, fullSuiteName);
-                    TestSuite suite = loadSuite(pkg, sNode, excludedCaseList);
-                    if ((suite.getTestCases().size() != 0) || (suite.getSubSuites().size() != 0)) {
-                        pkg.addTestSuite(suite);
-                    }
-                } else {
-                    Log.d("suite=" + fullSuiteName + " is fully excluded");
-                }
-            }
-        }
-
-        return pkg;
-    }
-
-    /**
-     * Get string ArrayList from string.
-     *
-     * @param str The given string.
-     * @return The list.
-     */
-    private ArrayList<String> getStrArrayList(String str) {
-        if ((str == null) || (str.length() == 0)) {
-            return null;
-        }
-
-        String[] list = str.split(TestPlan.EXCLUDE_SEPARATOR);
-        if ((list == null) || (list.length == 0)) {
-            return null;
-        }
-
-        ArrayList<String> result = new ArrayList<String>();
-        for (String s : list) {
-            result.add(s);
-        }
-
-        return result;
-    }
-
-    /**
-     * Get excluded list from a list by offered expectation.
-     *
-     * @param excludedList The list containing excluded items.
-     * @param expectation The expectations.
-     * @return The excluded list.
-     */
-    private ArrayList<String> getExcludedList(ArrayList<String> excludedList, String expectation) {
-        if ((excludedList == null) || (excludedList.size() == 0)) {
-            return null;
-        }
-
-        ArrayList<String> list = new ArrayList<String>();
-        for (String str : excludedList) {
-            if (str.startsWith(expectation)) {
-                list.add(str);
-            }
-        }
-
-        if (list.size() == 0) {
-            return null;
-        } else {
-            return list;
-        }
-    }
-
-    /**
-     * Check if the expectation is fully matched among a list.
-     *
-     * @param list The array list.
-     * @param expectation The expectation.
-     * @return If there is full match of expectation among the list, return true;
-     *         else, return false.
-     */
-    private boolean checkFullMatch(ArrayList<String> list, String expectation) {
-        if ((list == null) || (list.size() == 0)) {
-            return false;
-        }
-
-        for (String str : list) {
-            if (str.equals(expectation)) {
-                return true;
-            }
-        }
-
-        return false;
-    }
-
-    /**
-     * Load TestSuite via suite node. Package Name is used to output test result.
-     *
-     * @param pkg TestPackage
-     * @param sNode suite node
-     * @param excludedCaseList The list containing the excluded cases and sub types.
-     * @return TestSuite
-     */
-    private TestSuite loadSuite(final TestPackage pkg, Node sNode,
-                                ArrayList<String> excludedCaseList) {
-        NodeList cNodes = sNode.getChildNodes();
-        String fullSuiteName = getFullSuiteName(sNode);
-        String suiteName = getStringAttributeValue(sNode, TestPlan.Attribute.NAME);
-        TestSuite suite = new TestSuite(pkg, suiteName, fullSuiteName);
-
-        for (int i = 0; i < cNodes.getLength(); i++) {
-            Node cNode = cNodes.item(i);
-            if (cNode.getNodeType() == Document.ELEMENT_NODE) {
-                if (cNode.getNodeName().equals(TAG_TEST_SUITE)) {
-                    String subSuiteName = getFullSuiteName(cNode);
-                    if (checkFullMatch(excludedCaseList, subSuiteName) == false) {
-                        ArrayList<String> excludedList = getExcludedList(excludedCaseList,
-                                                             subSuiteName);
-                        TestSuite subSuite = loadSuite(pkg, cNode, excludedList);
-                        if ((subSuite.getTestCases().size() != 0)
-                            || (subSuite.getSubSuites().size() != 0)) {
-                            suite.addSubSuite(subSuite);
-                        }
-                    } else {
-                        Log.d("suite=" + subSuiteName + " is fully excluded");
-                    }
-                } else if (cNode.getNodeName().equals(TAG_TEST_CASE)) {
-                    String cName = getStringAttributeValue(cNode, ATTRIBUTE_NAME);
-                    String priority = getStringAttributeValue(cNode, ATTRIBUTE_PRIORITY);
-
-                    TestCase testCase = new TestCase(suite, cName, priority);
-                    String fullCaseName = fullSuiteName + "." + testCase.getName();
-                    if (checkFullMatch(excludedCaseList, fullCaseName) == false) {
-                        NodeList mNodes = cNode.getChildNodes();
-                        for (int t = 0; t < mNodes.getLength(); t ++) {
-                            Node testNode = mNodes.item(t);
-                            if ((testNode.getNodeType() == Document.ELEMENT_NODE)
-                                    && (testNode.getNodeName().equals(TAG_TEST))) {
-                                Test test = loadTest(pkg, testCase, testNode);
-                                if (!checkFullMatch(excludedCaseList, test.getFullName())) {
-                                    testCase.addTest(test);
-                                } else {
-                                    Log.d("Test=" + test.getFullName() + " is excluded");
-                                }
-                            }
-                        }
-                        if (testCase.getTests().size() != 0) {
-                            suite.addTestCase(testCase);
-                        }
-                    } else {
-                        Log.d("case=" + fullCaseName + " is fully excluded");
-                    }
-                }
-            }
-        }
-
-        return suite;
-    }
-
-    /**
-     * Load test via test node.
-     *
-     * @param pkg The test package.
-     * @param testCase The test case.
-     * @param testNode The test node.
-     * @return The test loaded.
-     */
-    private Test loadTest(final TestPackage pkg, TestCase testCase,
-            Node testNode) {
-        String cType = getStringAttributeValue(testNode, ATTRIBUTE_TYPE);
-        String name = getStringAttributeValue(testNode, ATTRIBUTE_NAME);
-        String description = getStringAttributeValue(testNode,
-                ATTRIBUTE_CONTROLLER);
-        String knownFailure = getStringAttributeValue(testNode,
-                ATTRIBUTE_KNOWN_FAILURE);
-        String fullJarPath =
-            HostConfig.getInstance().getCaseRepository().getRoot()
-            + File.separator + pkg.getJarPath();
-        CtsTestResult testResult = loadTestResult(testNode);
-        Test test = null;
-        if (pkg.isHostSideOnly()) {
-            test = new HostSideOnlyTest(testCase, name, cType,
-                    knownFailure,
-                    CtsTestResult.CODE_NOT_EXECUTED);
-            description = test.getFullName();
-        } else {
-            test = new Test(testCase, name, cType,
-                    knownFailure,
-                    CtsTestResult.CODE_NOT_EXECUTED);
-        }
-
-        TestController controller =
-            genTestControler(fullJarPath, description);
-        test.setTestController(controller);
-        if (testResult != null) {
-            test.addResult(testResult);
-        }
-        return test;
-    }
-
-    /**
-     * Load the CTS test result from the test node.
-     *
-     * @param testNode The test node.
-     * @return The CTS test result.
-     */
-    private CtsTestResult loadTestResult(Node testNode) {
-        String result = getStringAttributeValue(testNode,
-                TestSessionLog.ATTRIBUTE_RESULT);
-
-        String failedMessage = null;
-        String stackTrace = null;
-        NodeList nodes = testNode.getChildNodes();
-        for (int i = 0; i < nodes.getLength(); i ++) {
-            Node rNode = nodes.item(i);
-            if ((rNode.getNodeType() == Document.ELEMENT_NODE)
-                    && (rNode.getNodeName().equals(TestSessionLog.TAG_FAILED_SCENE))) {
-                failedMessage = getStringAttributeValue(rNode, TestSessionLog.TAG_FAILED_MESSAGE);
-                stackTrace = getStringAttributeValue(rNode, TestSessionLog.TAG_STACK_TRACE);
-                if (stackTrace == null) {
-                    NodeList sNodeList = rNode.getChildNodes();
-                    for (int j = 0; j < sNodeList.getLength(); j ++) {
-                        Node sNode = sNodeList.item(i);
-                        if ((sNode.getNodeType() == Document.ELEMENT_NODE)
-                                && (sNode.getNodeName().equals(TestSessionLog.TAG_STACK_TRACE))) {
-                            stackTrace = sNode.getTextContent();
-                        }
-                    }
-                }
-                break;
-            }
-        }
-
-        CtsTestResult testResult = null;
-        if (result != null) {
-            try {
-                testResult = new CtsTestResult(result, failedMessage, stackTrace);
-            } catch (InvalidTestResultStringException e) {
-            }
-        }
-
-        return testResult;
-    }
-
-    /**
-     * Generate controller according to the description string.
-     *
-     * @return The test controller.
-     */
-    public TestController genTestControler(String jarPath, String description) {
-        if ((jarPath == null) || (jarPath.length() == 0)
-                || (description == null) || (description.length() == 0)) {
-            return null;
-        }
-
-        String packageName = description.substring(0, description.lastIndexOf("."));
-        String className   = description.substring(packageName.length() + 1,
-                             description.lastIndexOf(Test.METHOD_SEPARATOR));
-        String methodName  = description.substring(
-                             description.lastIndexOf(Test.METHOD_SEPARATOR) + 1,
-                             description.length());
-
-        return new TestController(jarPath, packageName, className, methodName);
-    }
-
-    /**
-     * Get the full suite name of the specified suite node. Since the test
-     * suite can be nested, so the full name of a tests suite is combined
-     * with his name and his ancestor suite's names.
-     *
-     * @param node The specified suite node.
-     * @return The full name of the given suite node.
-     */
-    private String getFullSuiteName(Node node) {
-        StringBuilder buf = new StringBuilder();
-        buf.append(getStringAttributeValue(node, TestPlan.Attribute.NAME));
-
-        Node parent = node.getParentNode();
-        while (parent != null) {
-            if (parent.getNodeType() == Document.ELEMENT_NODE
-                    && parent.getNodeName() == TAG_TEST_SUITE) {
-                buf.insert(0, ".");
-                buf.insert(0, getStringAttributeValue(parent, TestPlan.Attribute.NAME));
-            }
-
-            parent = parent.getParentNode();
-        }
-
-        return buf.toString();
-    }
-
-    /**
-     * Create TestPlan which contain a series TestPackages.
-     *
-     * @param planName test plan name
-     * @param packageNames Package names to be added
-     * @param selectedResult The selected result mapping selected
-     *                       package with selected removal result.
-     */
-    public void serialize(String planName,
-            ArrayList<String> packageNames, HashMap<String, ArrayList<String>> selectedResult)
-            throws ParserConfigurationException, FileNotFoundException, IOException,
-            TransformerFactoryConfigurationError, TransformerException {
-        File plan = new File(HostConfig.getInstance().getPlanRepository()
-                .getPlanPath(planName));
-        if (plan.exists()) {
-            Log.e("Plan " + planName + " already exist, please use another name!",
-                    null);
-            return;
-        }
-
-        Document doc = DocumentBuilderFactory.newInstance()
-                .newDocumentBuilder().newDocument();
-        Node root = doc.createElement(TestPlan.Tag.TEST_PLAN);
-        setAttribute(doc, root, ATTRIBUTE_VERSION, "1.0");
-        doc.appendChild(root);
-
-        // append device configure node
-        Node deviceConfigNode = doc.createElement(TestPlan.Tag.PLAN_SETTING);
-
-        root.appendChild(deviceConfigNode);
-
-        // append test packages
-        for (String pName : packageNames) {
-            if (selectedResult.containsKey(pName)) {
-                Node entryNode = doc.createElement(TestPlan.Tag.ENTRY);
-
-                setAttribute(doc, entryNode, TestPlan.Attribute.URI, pName);
-                ArrayList<String> excluded = selectedResult.get(pName);
-                if ((excluded != null) && (excluded.size() != 0)) {
-                    String excludedList = "";
-                    for (String str : excluded) {
-                        excludedList += str + TestPlan.EXCLUDE_SEPARATOR;
-                    }
-                    setAttribute(doc, entryNode, TestPlan.Attribute.EXCLUDE, excludedList);
-                }
-                root.appendChild(entryNode);
-            }
-        }
-
-        writeToFile(plan, doc);
-    }
-
-}
diff --git a/tools/host/src/com/android/cts/TestSessionLog.java b/tools/host/src/com/android/cts/TestSessionLog.java
deleted file mode 100644
index 7eb9ffd..0000000
--- a/tools/host/src/com/android/cts/TestSessionLog.java
+++ /dev/null
@@ -1,613 +0,0 @@
-/*
- * Copyright (C) 2008 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 com.android.cts;
-
-import com.android.cts.TestDevice.DeviceParameterCollector;
-
-import org.w3c.dom.Document;
-import org.w3c.dom.Node;
-import org.w3c.dom.ProcessingInstruction;
-
-import java.io.File;
-import java.net.InetAddress;
-import java.net.UnknownHostException;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Date;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-import javax.xml.parsers.DocumentBuilderFactory;
-
-/**
- * Store the information of a test plan.
- */
-public class TestSessionLog extends XMLResourceHandler {
-    private static final String EXPR_TEST_FAILED = ".+\\((\\S+):(\\d+)\\)";
-    private static Pattern mTestFailedPattern = Pattern.compile(EXPR_TEST_FAILED);
-    private static final String ATTRIBUTE_NAME = "name";
-    static final String ATTRIBUTE_RESULT = "result";
-    private static final String ATTRIBUTE_VERSION = "version";
-    private static final String ATTRIBUTE_DIGEST = "digest";
-    private static final String ATTRIBUTE_KNOWN_FAILURE = "KnownFailure";
-
-    public static final String CTS_RESULT_FILE_NAME = "testResult.xml";
-    private static final String CTS_RESULT_FILE_VERSION = "1.11";
-
-    static final String ATTRIBUTE_STARTTIME = "starttime";
-    static final String ATTRIBUTE_ENDTIME = "endtime";
-    static final String ATTRIBUTE_TESTPLAN = "testPlan";
-    static final String ATTRIBUTE_RESOLUTION = "resolution";
-    static final String ATTRIBUTE_SUBSCRIBER_ID = "subscriberId";
-    static final String ATTRIBUTE_DEVICE_ID = "deviceID";
-    static final String ATTRIBUTE_BUILD_ID = "buildID";
-    static final String ATTRIBUTE_BUILD_VERSION = "buildVersion";
-    static final String ATTRIBUTE_ANDROID_PLATFORM_VERSION = "androidPlatformVersion";
-    static final String ATTRIBUTE_LOCALES = "locales";
-    static final String ATTRIBUTE_XDPI = "Xdpi";
-    static final String ATTRIBUTE_YDPI = "Ydpi";
-    static final String ATTRIBUTE_TOUCH = "touch";
-    static final String ATTRIBUTE_NAVIGATION = "navigation";
-    static final String ATTRIBUTE_KEYPAD = "keypad";
-    static final String ATTRIBUTE_NETWORK = "network";
-    static final String ATTRIBUTE_IMEI = "imei";
-    static final String ATTRIBUTE_IMSI = "imsi";
-    static final String ATTRIBUTE_BUILD_NAME = "buildName";
-    static final String ATTRIBUTE_ARCH = "arch";
-    static final String ATTRIBUTE_VALUE = "value";
-    static final String ATTRIBUTE_AVAILABLE = "available";
-    static final String ATTRIBUTE_TYPE = "type";
-    static final String ATTRIBUTE_UID = "uid";
-    static final String ATTRIBUTE_OPEN_GL_ES_VERSION = "openGlEsVersion";
-    static final String ATTRIBUTE_PARTITIONS = "partitions";
-
-    static final String ATTRIBUTE_PASS = "pass";
-    static final String ATTRIBUTE_FAILED = "failed";
-    static final String ATTRIBUTE_TIMEOUT = "timeout";
-    static final String ATTRIBUTE_NOT_EXECUTED = "notExecuted";
-
-    static final String TAG_DEVICEINFO = "DeviceInfo";
-    static final String TAG_HOSTINFO = "HostInfo";
-    static final String TAG_OSINFO = "Os";
-    static final String TAG_JAVA = "Java";
-    static final String TAG_CTS = "Cts";
-    static final String TAG_INTVALUE = "IntValue";
-    static final String TAG_SUMMARY = "Summary";
-    static final String TAG_SCREEN = "Screen";
-    static final String TAG_BUILD_INFO = "BuildInfo";
-    static final String TAG_FEATURE_INFO = "FeatureInfo";
-    static final String TAG_FEATURE = "Feature";
-    static final String TAG_PROCESS_INFO = "ProcessInfo";
-    static final String TAG_PROCESS = "Process";
-    static final String TAG_PHONE_SUB_INFO = "PhoneSubInfo";
-    static final String TAG_TEST_RESULT = "TestResult";
-    static final String TAG_TESTPACKAGE = "TestPackage";
-    static final String TAG_TESTSUITE = "TestSuite";
-    static final String TAG_TESTCASE = "TestCase";
-    static final String TAG_FAILED_SCENE = "FailedScene";
-    static final String TAG_STACK_TRACE = "StackTrace";
-    static final String TAG_FAILED_MESSAGE = "message";
-
-    private Collection<TestPackage> mTestPackages;
-    private Date mSessionStartTime;
-    private Date mSessionEndTime;
-    private String mResultPath;
-    private String mResultDir;
-    private String mTestPlanName;
-
-    private ArrayList<DeviceParameterCollector> mDeviceParameterBase;
-
-    public TestSessionLog(final Collection<TestPackage> packages, final String testPlanName) {
-        mTestPackages = packages;
-
-        mDeviceParameterBase = new ArrayList<TestDevice.DeviceParameterCollector>();
-        mTestPlanName = testPlanName;
-
-        mSessionStartTime = new Date();
-        mSessionEndTime = new Date();
-    }
-
-    /**
-     * Get the test plan name.
-     *
-     * @return The test plan name.
-     */
-    public String getTestPlanName() {
-        return mTestPlanName;
-    }
-
-    /**
-     * Get all result of this session.
-     *
-     * @return All the tests with a result code of this session.
-     */
-    public Collection<Test> getAllResults() {
-        if (mTestPackages == null || mTestPackages.size() == 0) {
-            return null;
-        }
-
-        ArrayList<Test> results = new ArrayList<Test>();
-        for (TestPackage p : mTestPackages) {
-            results.addAll(p.getTests());
-        }
-
-        return results;
-    }
-
-    /**
-     * Get test list according to the result type code.
-     *
-     * @param resCode The result code.
-     * @return The list of {@link Test}.
-     */
-    public Collection<Test> getTestList(int resCode) {
-        if ((resCode < CtsTestResult.CODE_FIRST)
-                || (resCode > CtsTestResult.CODE_LAST)) {
-            return null;
-        }
-
-        ArrayList<Test> tests = new ArrayList<Test>();
-        for (Test test : getAllResults()) {
-            if (resCode == test.getResult().getResultCode()) {
-                tests.add(test);
-            }
-        }
-
-        return tests;
-    }
-
-    /**
-     * Get TestSession start time
-     *
-     * @return The start time.
-     */
-    public Date getStartTime() {
-        return mSessionStartTime;
-    }
-
-    /**
-     * Get TestSession end time
-     *
-     * @return The end time.
-     */
-    public Date getEndTime() {
-        return mSessionEndTime;
-    }
-
-    /**
-     * Get test packages.
-     *
-     * @return The test packages.
-     */
-    public Collection<TestPackage> getTestPackages() {
-        return mTestPackages;
-    }
-
-    /**
-     * Get the path to the XML result file.
-     *
-     * @return The result path.
-     */
-    public String getResultPath() {
-        return mResultPath;
-    }
-
-    /**
-     * Get the result directory.  This is the directory that all result files
-     * should go into.
-     */
-    public String getResultDir() {
-        return mResultDir;
-    }
-
-    /**
-     * set TestSession start time
-     *
-     * @param time The start time.
-     */
-    public void setStartTime(final long time) {
-        mSessionStartTime.setTime(time);
-
-        String startTimeStr = HostUtils.getFormattedTimeString(time, "_", ".", ".");
-        mResultDir = HostConfig.getInstance().getResultRepository().getRoot()
-            + File.separator + startTimeStr;
-        mResultPath =  mResultDir + File.separator + CTS_RESULT_FILE_NAME;
-        // Make sure the result directory exists
-        new File(mResultDir).mkdirs();
-    }
-
-    /**
-     * set TestSession end time
-     *
-     * @param time The end time.
-     */
-    public void setEndTime(final long time) {
-        mSessionEndTime.setTime(time);
-    }
-
-    /**
-     * Calling this functions indicates that the TestSession is complete.  This
-     * indicates to the TestSessionLog that it is time to store the results
-     * to the filesystem.
-     */
-    public void sessionComplete() {
-        try {
-            writeToFile(new File(mResultPath), createResultDoc());
-            // Now zip up the results directory so we have something nice
-            // that people can upload.
-            HostUtils.zipUpDirectory(mResultDir,
-                    mResultDir + ".zip",
-                    new HostUtils.ZipFilenameTransformer() {
-                        public String transform(String filename) {
-                            if (filename.startsWith(mResultDir)) {
-                                return filename.substring(mResultDir.length() + 1);
-                            }
-                            return filename;
-                        }
-            });
-        } catch (Exception e) {
-            Log.e("Got exception when trying to write to result file", e);
-        }
-        HostConfig.getInstance().extractResultResources(mResultDir);
-    }
-
-    /**
-     * Create result Doc in XML format.
-     *
-     * @return Result document.
-     */
-    protected Document createResultDoc() {
-        try {
-
-            Document doc = DocumentBuilderFactory.newInstance()
-                    .newDocumentBuilder().newDocument();
-            ProcessingInstruction pr = doc.createProcessingInstruction(
-                    "xml-stylesheet", "type=\"text/xsl\"  href=\"cts_result.xsl\"");
-            doc.appendChild(pr);
-            Node root = doc.createElement(TAG_TEST_RESULT);
-            doc.appendChild(root);
-
-            setAttribute(doc, root, ATTRIBUTE_VERSION, CTS_RESULT_FILE_VERSION);
-            setAttribute(doc, root, ATTRIBUTE_STARTTIME, HostUtils.dateToString(mSessionStartTime));
-            setAttribute(doc, root, ATTRIBUTE_ENDTIME, HostUtils.dateToString(mSessionEndTime));
-            setAttribute(doc, root, ATTRIBUTE_TESTPLAN, mTestPlanName);
-
-            // set device information
-            for (int i = 0; i < mDeviceParameterBase.size(); i ++) {
-                DeviceParameterCollector bldInfo = mDeviceParameterBase.get(i);
-                // set device setting
-                Node deviceSettingNode = doc.createElement(TAG_DEVICEINFO);
-
-                Node screenNode = doc.createElement(TAG_SCREEN);
-                setAttribute(doc, screenNode, ATTRIBUTE_RESOLUTION, bldInfo.getScreenResolution());
-
-                setAttribute(doc, screenNode, DeviceParameterCollector.SCREEN_SIZE,
-                        bldInfo.getScreenSize());
-                setAttribute(doc, screenNode, DeviceParameterCollector.SCREEN_DENSITY,
-                        bldInfo.getScreenDensity());
-                setAttribute(doc, screenNode, DeviceParameterCollector.SCREEN_DENSITY_BUCKET,
-                        bldInfo.getScreenDensityBucket());
-
-                deviceSettingNode.appendChild(screenNode);
-                Node simCardNode = doc.createElement(TAG_PHONE_SUB_INFO);
-                setAttribute(doc, simCardNode, ATTRIBUTE_SUBSCRIBER_ID, bldInfo.getPhoneNumber());
-                deviceSettingNode.appendChild(simCardNode);
-                root.appendChild(deviceSettingNode);
-
-                Node devInfoNode = doc.createElement(TAG_BUILD_INFO);
-                setAttribute(doc, devInfoNode, ATTRIBUTE_DEVICE_ID, bldInfo.getSerialNumber());
-                setAttribute(doc, devInfoNode, ATTRIBUTE_BUILD_ID, bldInfo.getBuildId());
-                setAttribute(doc, devInfoNode, ATTRIBUTE_BUILD_NAME, bldInfo.getProductName());
-                setAttribute(doc, devInfoNode, ATTRIBUTE_BUILD_VERSION,
-                             bldInfo.getBuildVersion());
-                setAttribute(doc, devInfoNode, ATTRIBUTE_ANDROID_PLATFORM_VERSION,
-                             bldInfo.getAndroidPlatformVersion());
-                setAttribute(doc, devInfoNode, ATTRIBUTE_LOCALES, bldInfo.getLocales());
-                setAttribute(doc, devInfoNode, ATTRIBUTE_XDPI, bldInfo.getXdpi());
-                setAttribute(doc, devInfoNode, ATTRIBUTE_YDPI, bldInfo.getYdpi());
-                setAttribute(doc, devInfoNode, ATTRIBUTE_TOUCH, bldInfo.getTouchInfo());
-                setAttribute(doc, devInfoNode, ATTRIBUTE_NAVIGATION, bldInfo.getNavigation());
-                setAttribute(doc, devInfoNode, ATTRIBUTE_KEYPAD, bldInfo.getKeypad());
-                setAttribute(doc, devInfoNode, ATTRIBUTE_NETWORK, bldInfo.getNetwork());
-                setAttribute(doc, devInfoNode, ATTRIBUTE_IMEI, bldInfo.getIMEI());
-                setAttribute(doc, devInfoNode, ATTRIBUTE_IMSI, bldInfo.getIMSI());
-                setAttribute(doc, devInfoNode, ATTRIBUTE_OPEN_GL_ES_VERSION,
-                        bldInfo.getOpenGlEsVersion());
-                setAttribute(doc, devInfoNode, ATTRIBUTE_PARTITIONS,
-                        bldInfo.getPartitions());
-
-                setAttribute(doc, devInfoNode,
-                        DeviceParameterCollector.BUILD_FINGERPRINT, bldInfo.getBuildFingerPrint());
-                setAttribute(doc, devInfoNode,
-                        DeviceParameterCollector.BUILD_TYPE, bldInfo.getBuildType());
-                setAttribute(doc, devInfoNode,
-                        DeviceParameterCollector.BUILD_MODEL, bldInfo.getBuildModel());
-                setAttribute(doc, devInfoNode,
-                        DeviceParameterCollector.BUILD_MANUFACTURER,
-                                bldInfo.getBuildManufacturer());
-                setAttribute(doc, devInfoNode,
-                        DeviceParameterCollector.BUILD_BRAND, bldInfo.getBuildBrand());
-                setAttribute(doc, devInfoNode,
-                        DeviceParameterCollector.BUILD_BOARD, bldInfo.getBuildBoard());
-                setAttribute(doc, devInfoNode,
-                        DeviceParameterCollector.BUILD_DEVICE, bldInfo.getBuildDevice());
-                setAttribute(doc, devInfoNode,
-                        DeviceParameterCollector.BUILD_ABI, bldInfo.getBuildAbi());
-                setAttribute(doc, devInfoNode,
-                        DeviceParameterCollector.BUILD_ABI2, bldInfo.getBuildAbi2());
-
-                deviceSettingNode.appendChild(devInfoNode);
-
-                addFeatureInfo(doc, deviceSettingNode, bldInfo);
-                addProcessInfo(doc, deviceSettingNode, bldInfo);
-            }
-
-            Node hostInfo = doc.createElement(TAG_HOSTINFO);
-            root.appendChild(hostInfo);
-            String hostName = "";
-            try {
-                hostName = InetAddress.getLocalHost().getHostName();
-            } catch (UnknownHostException ignored) {}
-            setAttribute(doc, hostInfo, ATTRIBUTE_NAME, hostName);
-            Node osInfo = doc.createElement(TAG_OSINFO);
-            hostInfo.appendChild(osInfo);
-            setAttribute(doc, osInfo, ATTRIBUTE_NAME, System.getProperty("os.name"));
-            setAttribute(doc, osInfo, ATTRIBUTE_VERSION, System.getProperty("os.version"));
-            setAttribute(doc, osInfo, ATTRIBUTE_ARCH, System.getProperty("os.arch"));
-            Node javaInfo = doc.createElement(TAG_JAVA);
-            hostInfo.appendChild(javaInfo);
-            setAttribute(doc, javaInfo, ATTRIBUTE_NAME, System.getProperty("java.vendor"));
-            setAttribute(doc, javaInfo, ATTRIBUTE_VERSION, System.getProperty("java.version"));
-            Node ctsInfo = doc.createElement(TAG_CTS);
-            hostInfo.appendChild(ctsInfo);
-            setAttribute(doc, ctsInfo, ATTRIBUTE_VERSION, Version.asString());
-            for (HostConfig.Ints i : HostConfig.Ints.values()) {
-                Node intValue = doc.createElement(TAG_INTVALUE);
-                ctsInfo.appendChild(intValue);
-                setAttribute(doc, intValue, ATTRIBUTE_NAME, i.name());
-                setAttribute(doc, intValue, ATTRIBUTE_VALUE, i.value());
-            }
-
-            int passNum = getTestList(CtsTestResult.CODE_PASS).size();
-            int failNum = getTestList(CtsTestResult.CODE_FAIL).size();
-            int notExecutedNum = getTestList(CtsTestResult.CODE_NOT_EXECUTED).size();
-            int timeOutNum = getTestList(CtsTestResult.CODE_TIMEOUT).size();
-            Node summaryNode = doc.createElement(TAG_SUMMARY);
-            root.appendChild(summaryNode);
-            setAttribute(doc, summaryNode, ATTRIBUTE_PASS, passNum);
-            setAttribute(doc, summaryNode, ATTRIBUTE_FAILED, failNum);
-            setAttribute(doc, summaryNode, ATTRIBUTE_NOT_EXECUTED, notExecutedNum);
-            setAttribute(doc, summaryNode, ATTRIBUTE_TIMEOUT, timeOutNum);
-
-            for (TestPackage testPackage : mTestPackages) {
-                Node testPackageNode = doc.createElement(TAG_TESTPACKAGE);
-                setAttribute(doc, testPackageNode, ATTRIBUTE_NAME, testPackage.getAppBinaryName());
-                setAttribute(doc, testPackageNode, TestSessionBuilder.ATTRIBUTE_APP_PACKAGE_NAME,
-                        testPackage.getAppPackageName());
-                setAttribute(doc, testPackageNode, ATTRIBUTE_DIGEST,
-                             testPackage.getMessageDigest());
-
-                if (testPackage instanceof SignatureCheckPackage) {
-                    setAttribute(doc, testPackageNode,
-                              TestSessionBuilder.ATTRIBUTE_SIGNATURE_CHECK, "true");
-                }
-
-                for (TestSuite testSuite : testPackage.getTestSuites()) {
-                    outputTestSuite(doc, testPackage, testPackageNode, testSuite);
-                }
-                root.appendChild(testPackageNode);
-            }
-
-            return doc;
-        } catch (Exception e) {
-            Log.e("create result doc failed", e);
-        }
-        return null;
-    }
-
-    /**
-     * Creates a {@link #TAG_FEATURE_INFO} tag with {@link #TAG_FEATURE} elements indicating
-     * what features are supported by the device. It parses a string from the deviceInfo argument
-     * that is in the form of "feature1:true;feature2:false;featuer3;true;" with a trailing
-     * semi-colon.
-     *
-     * <pre>
-     *  <FeatureInfo>
-     *     <Feature name="android.name.of.feature" available="true" />
-     *     ...
-     *   </FeatureInfo>
-     * </pre>
-     * @param document used to create elements
-     * @param parentNode to attach the FeatureInfo element to
-     * @param deviceInfo to get the feature data from
-     */
-    private void addFeatureInfo(Document document, Node parentNode,
-            DeviceParameterCollector deviceInfo) {
-        Node featureInfo = document.createElement(TAG_FEATURE_INFO);
-        parentNode.appendChild(featureInfo);
-
-        String features = deviceInfo.getFeatures();
-        if (features == null) {
-            features = "";
-        }
-
-        String[] featurePairs = features.split(";");
-        for (String featurePair : featurePairs) {
-            String[] nameTypeAvailability = featurePair.split(":");
-            if (nameTypeAvailability.length >= 3) {
-                Node feature = document.createElement(TAG_FEATURE);
-                featureInfo.appendChild(feature);
-
-                setAttribute(document, feature, ATTRIBUTE_NAME, nameTypeAvailability[0]);
-                setAttribute(document, feature, ATTRIBUTE_TYPE, nameTypeAvailability[1]);
-                setAttribute(document, feature, ATTRIBUTE_AVAILABLE, nameTypeAvailability[2]);
-            }
-        }
-    }
-
-    /**
-     * Creates a {@link #TAG_PROCESS_INFO} tag with {@link #TAG_PROCESS} elements indicating
-     * what particular processes of interest were running on the device. It parses a string from
-     * the deviceInfo argument that is in the form of "processName1;processName2;..." with a
-     * trailing semi-colon.
-     *
-     * <pre>
-     *   <ProcessInfo>
-     *     <Process name="long_cat_viewer" uid="0" />
-     *     ...
-     *   </ProcessInfo>
-     * </pre>
-     *
-     * @param document
-     * @param parentNode
-     * @param deviceInfo
-     */
-    private void addProcessInfo(Document document, Node parentNode,
-            DeviceParameterCollector deviceInfo) {
-        Node processInfo = document.createElement(TAG_PROCESS_INFO);
-        parentNode.appendChild(processInfo);
-
-        String rootProcesses = deviceInfo.getProcesses();
-        if (rootProcesses == null) {
-            rootProcesses = "";
-        }
-
-        String[] processNames = rootProcesses.split(";");
-        for (String processName : processNames) {
-            processName = processName.trim();
-            if (!processName.isEmpty()) {
-                Node process = document.createElement(TAG_PROCESS);
-                processInfo.appendChild(process);
-
-                setAttribute(document, process, ATTRIBUTE_NAME, processName);
-                setAttribute(document, process, ATTRIBUTE_UID, "0");
-            }
-        }
-    }
-
-    /**
-     * Output TestSuite and result to XML DOM Document.
-     *
-     * @param doc The document.
-     * @param parentNode The parent node.
-     * @param testSuite The test suite.
-     */
-    private void outputTestSuite(final Document doc,
-            final TestPackage testPackage, final Node parentNode,
-            TestSuite testSuite) {
-
-        Collection<TestSuite> subSuites = testSuite.getSubSuites();
-        Collection<TestCase> testCases = testSuite.getTestCases();
-
-        Node testSuiteNode = doc.createElement(TAG_TESTSUITE);
-        setAttribute(doc, testSuiteNode, ATTRIBUTE_NAME, testSuite.getName());
-
-        for (TestCase testCase : testCases) {
-            Node testCaseNode = doc.createElement(TAG_TESTCASE);
-            testSuiteNode.appendChild(testCaseNode);
-            setAttribute(doc, testCaseNode, ATTRIBUTE_NAME, testCase.getName());
-            setAttribute(doc, testCaseNode, TestSessionBuilder.ATTRIBUTE_PRIORITY,
-                    testCase.getPriority());
-
-            Collection<Test> tests = testCase.getTests();
-            for (Test test : tests) {
-                Node testNode = doc.createElement(TestSessionBuilder.TAG_TEST);
-                testCaseNode.appendChild(testNode);
-
-                if (test.isKnownFailure()) {
-                    setAttribute(doc, testNode, ATTRIBUTE_KNOWN_FAILURE, test.getKnownFailure());
-                }
-
-                CtsTestResult result = test.getResult();
-                setAttribute(doc, testNode, ATTRIBUTE_NAME, test.getName());
-                setAttribute(doc, testNode, ATTRIBUTE_RESULT, result.getResultString());
-                setAttribute(doc, testNode, ATTRIBUTE_STARTTIME,
-                             new Date(test.getStartTime()).toString());
-                setAttribute(doc, testNode, ATTRIBUTE_ENDTIME,
-                             new Date(test.getEndTime()).toString());
-
-                String failedMessage = result.getFailedMessage();
-
-                if (failedMessage != null) {
-                    // failure message may contain control characters < 0x20 that get translated
-                    // into illegal XML character entities. Replace them first.
-                    failedMessage = HostUtils.replaceControlChars(failedMessage);
-                    Node failedMessageNode = doc.createElement(TAG_FAILED_SCENE);
-                    testNode.appendChild(failedMessageNode);
-                    setAttribute(doc, failedMessageNode,TAG_FAILED_MESSAGE, failedMessage);
-
-                    String stackTrace = sanitizeStackTrace(result.getStackTrace());
-                    if (stackTrace != null) {
-                        Node stackTraceNode = doc.createElement(TAG_STACK_TRACE);
-                        failedMessageNode.appendChild(stackTraceNode);
-                        Node stackTraceTextNode = doc.createTextNode(stackTrace);
-                        stackTraceNode.appendChild(stackTraceTextNode);
-                    }
-                }
-            }
-        }
-
-        for (TestSuite subSuite : subSuites) {
-            outputTestSuite(doc, testPackage, testSuiteNode, subSuite);
-            parentNode.appendChild(testSuiteNode);
-        }
-        parentNode.appendChild(testSuiteNode);
-    }
-
-    /**
-     * Strip out any invalid XML characters that might cause the report to be unviewable.
-     * http://www.w3.org/TR/REC-xml/#dt-character
-     */
-    private static String sanitizeStackTrace(String trace) {
-        if (trace != null) {
-            return trace.replaceAll("[^\\u0009\\u000A\\u000D\\u0020-\\uD7FF\\uE000-\\uFFFD]", "");
-        } else {
-            return null;
-        }
-    }
-
-    /**
-     * Fetch failed file name and line number
-     *
-     * @param failedResult failed message
-     * @return failed file name and line number
-     */
-    public final static String[] getFailedLineNumber(final String failedResult) {
-        Matcher m = mTestFailedPattern.matcher(failedResult);
-        if (m.matches()) {
-            return new String[]{m.group(1), m.group(2)};
-        }
-        return null;
-    }
-
-    /**
-     * set the device information of a specific device
-     *
-     * @param dInfo The device information.
-     */
-    public void setDeviceInfo(final TestDevice.DeviceParameterCollector dInfo) {
-        for (DeviceParameterCollector collector : mDeviceParameterBase) {
-            if (collector.getSerialNumber().equals(dInfo.getSerialNumber())) {
-                //if there has information for the device with given serial number,
-                //replace it with the new information.
-                mDeviceParameterBase.remove(collector);
-                break;
-            }
-        }
-        mDeviceParameterBase.add(dInfo);
-    }
-}
diff --git a/tools/host/src/com/android/cts/TestSessionLogBuilder.java b/tools/host/src/com/android/cts/TestSessionLogBuilder.java
deleted file mode 100644
index 4f0be8d..0000000
--- a/tools/host/src/com/android/cts/TestSessionLogBuilder.java
+++ /dev/null
@@ -1,139 +0,0 @@
-/*
- * Copyright (C) 2008 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 com.android.cts;
-
-import org.w3c.dom.Document;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-import org.xml.sax.SAXException;
-
-import java.io.File;
-import java.io.IOException;
-import java.security.NoSuchAlgorithmException;
-import java.text.ParseException;
-import java.util.ArrayList;
-import java.util.Collection;
-
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.ParserConfigurationException;
-
-/**
- * Builder of test session from the test result XML file.
- */
-public class TestSessionLogBuilder extends XMLResourceHandler {
-    private static TestSessionLogBuilder sInstance;
-
-    private DocumentBuilder mDocBuilder;
-
-    public static TestSessionLogBuilder getInstance()
-            throws ParserConfigurationException {
-        if (sInstance == null) {
-            sInstance = new TestSessionLogBuilder();
-        }
-
-        return sInstance;
-    }
-
-    private TestSessionLogBuilder() throws ParserConfigurationException {
-        mDocBuilder = DocumentBuilderFactory.newInstance().newDocumentBuilder();
-    }
-
-    /**
-     * Create TestSessionLog from the result XML file.
-     *
-     * @param resultFilePath The result file path.
-     * @return TestSessionLog.
-     */
-    public TestSessionLog build(final String resultFilePath) throws SAXException, IOException,
-            TestPlanNotFoundException, TestNotFoundException,
-            NoSuchAlgorithmException, ParserConfigurationException {
-
-        File file = new File(resultFilePath);
-        if (!file.exists()) {
-            throw new TestPlanNotFoundException();
-        }
-
-        Document doc = mDocBuilder.parse(file);
-        return loadSessionLog(doc);
-    }
-
-    /**
-     * Load TestSessionLog from a Test result DOM doc.
-     *
-     * @param doc Test result DOM Document.
-     * @return loaded test session log from Test result DOM Document.
-     */
-    private TestSessionLog loadSessionLog(Document doc)
-                throws NoSuchAlgorithmException, ParserConfigurationException,
-                SAXException, IOException, TestPlanNotFoundException,
-                TestNotFoundException {
-
-        ArrayList<TestPackage> pkgsFromResult = new ArrayList<TestPackage>();
-        NodeList resultList = doc.getElementsByTagName(TestSessionLog.TAG_TEST_RESULT);
-
-        // currently, there should be just one test result tag in the result file
-        Node resultNode = resultList.item(0);
-        String planName = getStringAttributeValue(resultNode, TestSessionLog.ATTRIBUTE_TESTPLAN);
-        String start = getStringAttributeValue(resultNode, TestSessionLog.ATTRIBUTE_STARTTIME);
-        String end = getStringAttributeValue(resultNode, TestSessionLog.ATTRIBUTE_ENDTIME);
-        String planFilePath = HostConfig.getInstance().getPlanRepository().getPlanPath(planName);
-        TestSession sessionFromPlan = TestSessionBuilder.getInstance().build(planFilePath);
-
-        NodeList pkgList = resultNode.getChildNodes();
-        for (int i = 0; i < pkgList.getLength(); i++) {
-            Node pkgNode = pkgList.item(i);
-            if (pkgNode.getNodeType() == Document.ELEMENT_NODE
-                    && TestSessionLog.TAG_TESTPACKAGE.equals(pkgNode.getNodeName())) {
-                TestPackage pkg = TestSessionBuilder.getInstance().loadPackage(pkgNode, null);
-                if (pkg != null) {
-                    pkgsFromResult.add(pkg);
-                }
-            }
-        }
-
-        Collection<TestPackage> pkgsFromPlan = sessionFromPlan.getSessionLog().getTestPackages();
-        for (TestPackage pkgFromPlan : pkgsFromPlan) {
-            for (TestPackage pkgFromResult : pkgsFromResult) {
-                if (pkgFromPlan.getAppPackageName().equals(pkgFromResult.getAppPackageName())) {
-                    Collection<Test> testsFromPlan = pkgFromPlan.getTests();
-                    Collection<Test> testsFromResult = pkgFromResult.getTests();
-                    for (Test testFromPlan : testsFromPlan) {
-                        for (Test testFromResult : testsFromResult) {
-                            if (testFromPlan.getFullName().equals(testFromResult.getFullName())) {
-                                CtsTestResult result = testFromResult.getResult();
-                                testFromPlan.addResult(testFromResult.getResult());
-                                break;
-                            }
-                        }
-                    }
-                    break;
-                }
-            }
-        }
-
-        TestSessionLog log = new TestSessionLog(pkgsFromPlan, planName);
-        try {
-            log.setStartTime(HostUtils.dateFromString(start).getTime());
-            log.setEndTime(HostUtils.dateFromString(end).getTime());
-        } catch (NullPointerException ignored) {
-            // use default time
-        } catch (ParseException ignored) {
-            // use default time
-        }
-        return log;
-    }
-}
diff --git a/tools/host/src/com/android/cts/TestSuite.java b/tools/host/src/com/android/cts/TestSuite.java
deleted file mode 100644
index 136fc3f..0000000
--- a/tools/host/src/com/android/cts/TestSuite.java
+++ /dev/null
@@ -1,365 +0,0 @@
-/*
- * Copyright (C) 2008 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 com.android.cts;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Iterator;
-
-/**
- * Hold information for a suite of test case, provide functions
- * on storing and executing a test suite from CTS test harness.
- *
- */
-public class TestSuite implements DeviceObserver {
-    private TestPackage mParentPackage;
-    private Collection<TestCase> mTestCases;
-    private String mName;
-    private String mFullName;
-    private Collection<TestSuite> mSubSuites;
-
-    private TestCase mCurrentTestCase;
-    private TestSuite mCurrentSubSuite;
-    private boolean mTestStop;
-
-    /**
-     * Construct a test suite.
-     *
-     * @param pkg TestPakcage as the reference to the parent package.
-     * @param suiteName The current suite name, not the full name.
-     * @param fullName The full suite name along the nested suite path.
-     */
-    public TestSuite(final TestPackage pkg, final String suiteName, final String fullName) {
-        mParentPackage = pkg;
-        mName = suiteName;
-        mFullName = fullName;
-        mTestCases = new ArrayList<TestCase>();
-        mSubSuites = new ArrayList<TestSuite>();
-
-        mTestStop = false;
-        mCurrentTestCase = null;
-        mCurrentSubSuite = null;
-    }
-
-    /**
-     * Get parent package.
-     *
-     * @return Parent package.
-     */
-    public TestPackage getParent() {
-        return mParentPackage;
-    }
-
-    /**
-     * Add a specific test case.
-     *
-     * @param tc The test case to be added.
-     */
-    public void addTestCase(final TestCase tc) {
-        mTestCases.add(tc);
-    }
-
-    /**
-     * Add a specific test suite.
-     *
-     * @param suite The test suite to be added.
-     */
-    public void addSubSuite(final TestSuite suite) {
-        mSubSuites.add(suite);
-    }
-
-    /**
-     * Get TestCases.
-     *
-     * @return TestCases
-     */
-    public Collection<TestCase> getTestCases() {
-        return mTestCases;
-    }
-
-    /**
-     * Get the suite name of this TestSuite.
-     *
-     * @return The suite name of this TestCase.
-     */
-    public String getName() {
-        return mName;
-    }
-
-    /**
-     * Get the full suite name of this TestSuite.
-     *
-     * @return The full suite name of this TestCase.
-     */
-    public String getFullName() {
-        return mFullName;
-    }
-
-    /**
-     * Get the nested test suites of this test suite.
-     *
-     * @return The nested test suites.
-     */
-    public Collection<TestSuite> getSubSuites() {
-        return mSubSuites;
-    }
-
-    /**
-     * Get all of the test suites contained in this test suite.
-     *
-     * @return All of the test suites.
-     */
-    public Collection<TestSuite> getAllSuites() {
-        Collection<TestSuite> testSuites = new ArrayList<TestSuite>();
-        testSuites.add(this);
-        for (TestSuite suite : mSubSuites) {
-            testSuites.addAll(suite.getAllSuites());
-        }
-        return testSuites;
-    }
-
-    /**
-     * Search test in this test suite.
-     *
-     * @param testName The test name to be searched against.
-     * @return null if not found, or return founded test
-     */
-    public Test searchTest(final String testName) {
-        Test test = null;
-        for (TestCase testCase : mTestCases) {
-            test = testCase.searchTest(testName);
-            if (test != null) {
-                return test;
-            }
-        }
-
-        if (mSubSuites.size() != 0) {
-            for (TestSuite subSuite : mSubSuites) {
-                test = subSuite.searchTest(testName);
-                if (test != null) {
-                    return test;
-                }
-            }
-        }
-
-        return null;
-    }
-
-    /**
-     * Get the excluded list according to the execution status of each test.
-     *
-     * @param resultType The result type to filter the tests.
-     * @return All excluded list.
-     */
-    public ArrayList<String> getExcludedList(final String resultType) {
-        ArrayList<String> excludedList = new ArrayList<String>();
-        ArrayList<String> fullNameList = new ArrayList<String>();
-        for (TestSuite suite : mSubSuites) {
-            fullNameList.add(suite.getFullName());
-            ArrayList<String> list = suite.getExcludedList(resultType);
-            if ((list != null) && (list.size() > 0)) {
-                excludedList.addAll(list);
-            }
-        }
-
-        for (TestCase tc : mTestCases) {
-            fullNameList.add(tc.getFullName());
-            ArrayList<String> list = tc.getExcludedList(resultType);
-            if ((list != null) && (list.size() > 0)) {
-                excludedList.addAll(list);
-            }
-        }
-
-        int count = 0;
-        for (String fullName : fullNameList) {
-            if (excludedList.contains(fullName)) {
-                count ++;
-            }
-        }
-        if (count == fullNameList.size()) {
-            //the whole suite is excluded, just need to add the full suite name
-            excludedList.removeAll(excludedList);
-            excludedList.add(getFullName());
-        }
-        return excludedList;
-    }
-
-    /**
-     * Get all tests of this test suite.
-     *
-     * @return The tests of this suite.
-     */
-    public Collection<Test> getTests() {
-        ArrayList<Test> tests = new ArrayList<Test>();
-        for (TestSuite subSuite : mSubSuites) {
-            tests.addAll(subSuite.getTests());
-        }
-
-        for (TestCase testCase : mTestCases) {
-            tests.addAll(testCase.getTests());
-        }
-
-        return tests;
-    }
-
-    /**
-     * Get all test cases of this test suite.
-     *
-     * @return The test cases of this suite.
-     */
-    public Collection<TestCase> getAllTestCases() {
-        ArrayList<TestCase> testCases = new ArrayList<TestCase>();
-        testCases.addAll(mTestCases);
-        for (TestSuite subSuite : mSubSuites) {
-            testCases.addAll(subSuite.getAllTestCases());
-        }
-
-        return testCases;
-    }
-
-    /**
-     * Get all test case names contained in the suite.
-     *
-     * @return All test case names.
-     */
-    public ArrayList<String> getAllTestCaseNames() {
-        ArrayList<String> caseNameList = new ArrayList<String>();
-        for (TestCase testCase : getAllTestCases()) {
-            caseNameList.add(testCase.getFullName());
-        }
-        return caseNameList;
-    }
-
-    /**
-     * Set test stopped;
-     *
-     * @param testStopped If true, it's stopped. Else, still running.
-     */
-    public void setTestStopped(final boolean testStopped) {
-        mTestStop = testStopped;
-        if (mCurrentTestCase != null) {
-            mCurrentTestCase.setTestStopped(mTestStop);
-        }
-
-        if (mCurrentSubSuite != null) {
-            mCurrentSubSuite.setTestStopped(mTestStop);
-        }
-    }
-
-    /**
-     * Run the this test suite or the specific java package contained
-     * in the test suite over device given.
-     *
-     * @param device The device to run the test over.
-     * @param javaPkgName The java package name.
-     */
-    public void run(final TestDevice device, final String javaPkgName)
-            throws IOException, DeviceDisconnectedException, ADBServerNeedRestartException {
-        Iterator<TestSuite> subSuites = getSubSuites().iterator();
-        Iterator<TestCase> testCases = getTestCases().iterator();
-
-        mTestStop = false;
-        mCurrentTestCase = null;
-        mCurrentSubSuite = null;
-
-        while (subSuites.hasNext() && (!mTestStop)) {
-            mCurrentSubSuite = subSuites.next();
-            mCurrentSubSuite.run(device, javaPkgName);
-        }
-
-        while (testCases.hasNext() && (!mTestStop)) {
-            mCurrentTestCase = testCases.next();
-            String fullName = mFullName + "." + mCurrentTestCase.getName();
-            if ((javaPkgName == null) || (javaPkgName.length() == 0)
-                    || fullName.startsWith(javaPkgName)) {
-                mCurrentTestCase.run(device);
-            }
-        }
-    }
-
-    /**
-     * Run the specific test contained in the test suite over device given.
-     *
-     * @param device The device to run the test over.
-     * @param test The specific test to be run.
-     */
-    public void run(final TestDevice device, final Test test)
-            throws DeviceDisconnectedException, ADBServerNeedRestartException {
-        mTestStop = false;
-        mCurrentTestCase = null;
-        mCurrentSubSuite = null;
-
-        mCurrentTestCase = test.getTestCase();
-        mCurrentTestCase.run(device, test);
-    }
-
-    /** {@inheritDoc} */
-    public void notifyInstallingComplete(final int resultCode) {
-        if (mCurrentTestCase != null) {
-            mCurrentTestCase.notifyInstallingComplete(resultCode);
-        }
-
-        if (mCurrentSubSuite != null) {
-            mCurrentSubSuite.notifyInstallingComplete(resultCode);
-        }
-    }
-
-    /** {@inheritDoc} */
-    public void notifyUninstallingComplete(final int resultCode) {
-        if (mCurrentTestCase != null) {
-            mCurrentTestCase.notifyUninstallingComplete(resultCode);
-        }
-
-        if (mCurrentSubSuite != null) {
-            mCurrentSubSuite.notifyUninstallingComplete(resultCode);
-        }
-    }
-
-    /** {@inheritDoc} */
-    public void notifyInstallingTimeout(final TestDevice testDevice) {
-        if (mCurrentTestCase != null) {
-            mCurrentTestCase.notifyInstallingTimeout(testDevice);
-        }
-
-        if (mCurrentSubSuite != null) {
-            mCurrentSubSuite.notifyInstallingTimeout(testDevice);
-        }
-    }
-
-    /** {@inheritDoc} */
-    public void notifyUninstallingTimeout(final TestDevice testDevice) {
-        if (mCurrentTestCase != null) {
-            mCurrentTestCase.notifyUninstallingTimeout(testDevice);
-        }
-
-        if (mCurrentSubSuite != null) {
-            mCurrentSubSuite.notifyUninstallingTimeout(testDevice);
-        }
-    }
-
-    /** {@inheritDoc} */
-    public void notifyTestingDeviceDisconnected() {
-        if (mCurrentTestCase != null) {
-            mCurrentTestCase.notifyTestingDeviceDisconnected();
-        }
-
-        if (mCurrentSubSuite != null) {
-            mCurrentSubSuite.notifyTestingDeviceDisconnected();
-        }
-    }
-}
diff --git a/tools/host/src/com/android/cts/UnknownCommandException.java b/tools/host/src/com/android/cts/UnknownCommandException.java
deleted file mode 100644
index 585d532..0000000
--- a/tools/host/src/com/android/cts/UnknownCommandException.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Copyright (C) 2008 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 com.android.cts;
-
-/**
- * Exception threw out if CommandParser encounter unknown command.
- */
-public class UnknownCommandException extends Exception{
-
-    private static final long serialVersionUID = -23012571004369516L;
-
-    public UnknownCommandException() {
-        super();
-    }
-    public UnknownCommandException(String message) {
-        super(message);
-    }
-}
diff --git a/tools/host/src/com/android/cts/Version.java b/tools/host/src/com/android/cts/Version.java
deleted file mode 100644
index 92dc255..0000000
--- a/tools/host/src/com/android/cts/Version.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Copyright (C) 2009 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 com.android.cts;
-
-public class Version {
-    // The CTS version string
-    private static final String version = "1337";
-
-    private Version() {
-        // no instances allowed
-    }
-
-    public static String asString() {
-        return version;
-    }
-}
diff --git a/tools/host/src/com/android/cts/XMLResourceHandler.java b/tools/host/src/com/android/cts/XMLResourceHandler.java
deleted file mode 100644
index f44a574..0000000
--- a/tools/host/src/com/android/cts/XMLResourceHandler.java
+++ /dev/null
@@ -1,141 +0,0 @@
-/*
- * Copyright (C) 2008 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 com.android.cts;
-
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.IOException;
-
-import javax.xml.transform.Transformer;
-import javax.xml.transform.TransformerException;
-import javax.xml.transform.TransformerFactory;
-import javax.xml.transform.TransformerFactoryConfigurationError;
-import javax.xml.transform.dom.DOMSource;
-import javax.xml.transform.stream.StreamResult;
-
-import org.w3c.dom.Attr;
-import org.w3c.dom.Document;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-
-/**
- * An abstract class to deal with the XML information using DOM.
- */
-public abstract class XMLResourceHandler {
-
-    protected String getElementContent(Node elem) {
-        return elem.getChildNodes().item(0).getNodeValue().trim();
-    }
-
-    /**
-     * Get string from DOM node by attribute name.
-     *
-     * @param elem a node from DOM tree.
-     * @param attrName the attribute name.
-     * @return string value of the attribute name from the DOM node.
-     */
-    static public String getStringAttributeValue(Node elem, String attrName) {
-        Node node = elem.getAttributes().getNamedItem(attrName);
-        if (node == null) {
-            return null;
-        }
-        return node.getNodeValue().trim();
-    }
-
-    /**
-     * Get integer attribute value.
-     *
-     * @param elem The element node.
-     * @param attrName The attribute name.
-     * @return The attribute value in integer.
-     */
-    protected int getAttributeValue(Node elem, String attrName) {
-        return Integer.parseInt(getStringAttributeValue(elem, attrName));
-    }
-
-    /**
-     * Get child by attribute.
-     *
-     * @param parent The parent node.
-     * @param attrName The attribute name.
-     * @param attrValue The attribute value.
-     * @return The child node.
-     */
-    protected Node getChildByAttribute(Node parent, String attrName, String attrValue) {
-        if (parent == null || attrName == null || attrValue == null) {
-            return null;
-        }
-        NodeList children = parent.getChildNodes();
-        for (int i = 0; i < children.getLength(); i++) {
-            Node child = children.item(i);
-            if (child.getNodeType() == Node.ELEMENT_NODE) {
-                if (attrValue.equals(getStringAttributeValue(child, attrName))) {
-                    return child;
-                }
-            }
-        }
-
-        return null;
-    }
-
-    /**
-     * Set the attribute value.
-     *
-     * @param doc The document.
-     * @param elem The element node.
-     * @param name The attribute name.
-     * @param value The attribute value in integer.
-     */
-    protected void setAttribute(Document doc, Node elem, String name, int value) {
-        setAttribute(doc, elem, name, Integer.toString(value));
-    }
-
-    /**
-     * Set the attribute value.
-     *
-     * @param doc The document.
-     * @param elem The element node.
-     * @param name The attribute name.
-     * @param value The attribute value in string.
-     */
-    protected void setAttribute(Document doc, Node elem, String name, String value) {
-        Attr attrNode = doc.createAttribute(name);
-        attrNode.setNodeValue(value);
-
-        elem.getAttributes().setNamedItem(attrNode);
-    }
-
-    /**
-     * Write a DOM Document object into a file.
-     *
-     * @param file XML file to be written
-     * @param doc DOM Document
-     */
-    protected static void writeToFile(File file, Document doc) throws FileNotFoundException,
-            IOException, TransformerFactoryConfigurationError, TransformerException {
-        Transformer t = TransformerFactory.newInstance().newTransformer();
-        // enable indent in result file
-        t.setOutputProperty("indent", "yes");
-        FileOutputStream fos = new FileOutputStream(file);
-        try {
-            StreamResult sr = new StreamResult(fos);
-            t.transform(new DOMSource(doc), sr);
-        } finally {
-            fos.close();
-        }
-    }
-}
diff --git a/tools/host/src/res/cts_result.xsd b/tools/host/src/res/cts_result.xsd
deleted file mode 100644
index 665795f..0000000
--- a/tools/host/src/res/cts_result.xsd
+++ /dev/null
@@ -1,202 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Copyright (C) 2009 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.
- -->
-
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
-           targetNamespace="http://compatibility.android.com/cts_result/1.10"
-           xmlns="http://compatibility.android.com/cts_result/1.10"
-           elementFormDefault="qualified">
-
-<xs:element name="TestResult">
-  <xs:complexType>
-    <xs:sequence>
-      <xs:element name="DeviceInfo" type="deviceInfoType"/>
-      <xs:element name="HostInfo" type="hostInfoType"/>
-      <xs:element name="Summary" type="summaryType"/>
-      <xs:element name="TestPackage" type="testPackageType" maxOccurs="unbounded" minOccurs="1"/>
-    </xs:sequence>
-    <xs:attribute name="starttime" type="xs:string"/>
-    <xs:attribute name="endtime" type="xs:string"/>
-    <xs:attribute name="testPlan" type="xs:string"/>
-    <xs:attribute name="version" type="xs:string"/>
-  </xs:complexType>
-</xs:element>
-
-<xs:complexType name="deviceInfoType">
-  <xs:sequence>
-    <xs:element name="Screen">
-      <xs:complexType>
-        <xs:attribute name="screen_size" type="xs:string"/>
-        <xs:attribute name="resolution" type="xs:string"/>
-        <xs:attribute name="screen_density" type="xs:decimal"/>
-        <xs:attribute name="screen_density_bucket" type="xs:string"/>
-      </xs:complexType>
-    </xs:element>
-    <xs:element name="PhoneSubInfo">
-      <xs:complexType>
-        <xs:attribute name="subscriberId" type="xs:string"/>
-      </xs:complexType>
-    </xs:element>
-    <xs:element name="BuildInfo">
-      <xs:complexType>
-        <xs:attribute name="Xdpi" type="xs:decimal"/>
-        <xs:attribute name="Ydpi" type="xs:decimal"/>
-        <xs:attribute name="androidPlatformVersion" type="xs:integer"/>
-        <xs:attribute name="buildID" type="xs:string"/>
-        <xs:attribute name="buildName" type="xs:string"/>
-        <xs:attribute name="buildVersion" type="xs:string"/>
-        <xs:attribute name="build_board" type="xs:string"/>
-        <xs:attribute name="build_manufacturer" type="xs:string"/>
-        <xs:attribute name="build_brand" type="xs:string"/>
-        <xs:attribute name="build_device" type="xs:string"/>
-        <xs:attribute name="build_fingerprint" type="xs:string"/>
-        <xs:attribute name="build_model" type="xs:string"/>
-        <xs:attribute name="build_type" type="xs:string"/>
-        <xs:attribute name="deviceID" type="xs:string"/>
-        <xs:attribute name="imei" type="xs:integer"/>
-        <xs:attribute name="imsi" type="xs:integer"/>
-        <xs:attribute name="keypad" type="xs:string"/>
-        <xs:attribute name="locales" type="xs:string"/>
-        <xs:attribute name="navigation" type="xs:string"/>
-        <xs:attribute name="network" type="xs:string"/>
-        <xs:attribute name="touch" type="xs:string"/>
-        <xs:attribute name="openGlEsVersion" type="xs:string"/>
-        <xs:attribute name="partitions" type="xs:string"/>
-        <xs:attribute name="build_abi" type="xs:string"/>
-        <xs:attribute name="build_abi2" type="xs:string"/>
-      </xs:complexType>
-    </xs:element>
-    <xs:element name="FeatureInfo" type="featureInfoType"/>
-    <xs:element name="ProcessInfo" type="processInfoType"/>
-  </xs:sequence>
-</xs:complexType>
-
-<xs:complexType name="hostInfoType">
-  <xs:sequence>
-    <xs:element name="Os">
-      <xs:complexType>
-        <xs:attribute name="arch" type="xs:string"/>
-        <xs:attribute name="name" type="xs:string"/>
-        <xs:attribute name="version" type="xs:string"/>
-      </xs:complexType>
-    </xs:element>
-    <xs:element name="Java">
-      <xs:complexType>
-        <xs:attribute name="name" type="xs:string"/>
-        <xs:attribute name="version" type="xs:string"/>
-      </xs:complexType>
-    </xs:element>
-    <xs:element name="Cts">
-      <xs:complexType>
-        <xs:sequence>
-          <xs:element name="IntValue" minOccurs="0" maxOccurs="unbounded">
-            <xs:complexType>
-              <xs:attribute name="name" type="xs:string"/>
-              <xs:attribute name="value" type="xs:integer"/>
-            </xs:complexType>
-          </xs:element>
-        </xs:sequence>
-        <xs:attribute name="version" type="xs:string"/>
-      </xs:complexType>
-    </xs:element>
-  </xs:sequence>
-  <xs:attribute name="name" type="xs:string"/>
-</xs:complexType>
-
-<xs:complexType name="featureInfoType">
-    <xs:sequence>
-        <xs:element name="Feature" minOccurs="0" maxOccurs="unbounded">
-            <xs:complexType>
-                <xs:attribute name="name" type="xs:string" />
-                <xs:attribute name="type" type="xs:string" />
-                <xs:attribute name="available" type="xs:string" />
-            </xs:complexType>
-        </xs:element>
-    </xs:sequence>
-</xs:complexType>
-
-<xs:complexType name="processInfoType">
-    <xs:sequence>
-        <xs:element name="Process" minOccurs="0" maxOccurs="unbounded">
-            <xs:complexType>
-                <xs:attribute name="name" type="xs:string" />
-                <xs:attribute name="uid" type="xs:integer" />
-            </xs:complexType>
-        </xs:element>
-    </xs:sequence>
-</xs:complexType>
-
-<xs:complexType name="summaryType">
-  <xs:attribute name="failed" type="xs:integer"/>
-  <xs:attribute name="notExecuted" type="xs:integer"/>
-  <xs:attribute name="pass" type="xs:integer"/>
-  <xs:attribute name="timeout" type="xs:integer"/>
-  <xs:attribute name="omitted" type="xs:integer"/>
-</xs:complexType>
-
-<xs:complexType name="testPackageType">
-  <xs:sequence>
-    <xs:element name="TestSuite" type="testSuiteType" minOccurs="0" maxOccurs="unbounded" />
-  </xs:sequence>
-  <xs:attribute name="appPackageName" type="xs:string"/>
-  <xs:attribute name="digest" type="xs:hexBinary"/>
-  <xs:attribute name="name" type="xs:string" use="required"/>
-  <xs:attribute name="signatureCheck" type="xs:boolean" />
-</xs:complexType>
-
-<xs:complexType name="testSuiteType">
-  <xs:sequence>
-    <xs:element name="TestCase" type="testCaseType" minOccurs="0" maxOccurs="unbounded"/>
-    <xs:element name="TestSuite" type="testSuiteType" minOccurs="0" maxOccurs="unbounded"/>
-  </xs:sequence>
-  <xs:attribute name="name" type="xs:string" use="required"/>
-</xs:complexType>
-
-<xs:complexType name="testCaseType">
-  <xs:sequence>
-    <xs:element name="Test" type="testType" minOccurs="0" maxOccurs="unbounded"/>
-  </xs:sequence>
-  <xs:attribute name="name" type="xs:string" use="required"/>
-  <xs:attribute name="priority" type="xs:string"/>
-</xs:complexType>
-
-<xs:complexType name="testType">
-  <xs:sequence>
-    <xs:element name="FailedScene" minOccurs="0" maxOccurs="1">
-      <xs:complexType>
-        <xs:sequence>
-          <xs:element name="StackTrace" type="xs:string" minOccurs="0" maxOccurs="1"/>
-        </xs:sequence>
-        <xs:attribute name="message" type="xs:string"/>
-      </xs:complexType>
-    </xs:element>
-  </xs:sequence>
-  <xs:attribute name="name" type="xs:string" use="required"/>
-  <xs:attribute name="result" type="resultType" use="required"/>
-  <xs:attribute name="starttime" type="xs:string"/>
-  <xs:attribute name="endtime" type="xs:string"/>
-</xs:complexType>
-
-<xs:simpleType name="resultType">
-  <xs:restriction base="xs:string">
-    <xs:enumeration value="pass"/>
-    <xs:enumeration value="fail"/>
-    <xs:enumeration value="timeout"/>
-    <xs:enumeration value="notExecuted"/>
-    <xs:enumeration value="omitted"/>
-  </xs:restriction>
-</xs:simpleType>
-</xs:schema>
diff --git a/tools/host/src/res/cts_result.xsl b/tools/host/src/res/cts_result.xsl
deleted file mode 100644
index a542c8a..0000000
--- a/tools/host/src/res/cts_result.xsl
+++ /dev/null
@@ -1,570 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 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.
--->
-
-<!DOCTYPE xsl:stylesheet [ <!ENTITY nbsp "&#160;"> ]>
-<xsl:stylesheet version="2.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-    <xsl:output method="html" version="1.0" encoding="UTF-8" indent="yes"/>
-
-    <xsl:template match="/">
-
-        <html>
-            <STYLE type="text/css">
-                @import "cts_result.css";
-            </STYLE>
-
-            <body>
-                <!-- Title of the Report -->
-                <DIV id="title">
-                    <TABLE>
-                        <TR>
-                            <TD width="40%" align="left"><img src="logo.gif"></img></TD>
-                            <TD width="60%" align="left">
-                                <h1>Test Report for <xsl:value-of select="TestResult/DeviceInfo/BuildInfo/@build_model"/> -
-                                    <xsl:value-of select="TestResult/DeviceInfo/BuildInfo/@deviceID"/>
-                                </h1>
-                            </TD>
-                        </TR>
-                    </TABLE>
-                </DIV>
-                <img src="newrule-green.png" align="left"></img>
-
-                <br></br>
-                <br></br>
-
-                <!-- Header with phone and plan information -->
-                <DIV id="summary">
-                    <TABLE width="90%" frame="none">
-                        <TR>
-                            <TH>Device Information</TH>
-                            <TH>Test Summary</TH>
-                        </TR>
-
-                        <TR>
-                            <TD>
-                                <!-- Device information -->
-                                <div id="summaryinfo">
-                                    <TABLE width="75%">
-                                        <TR>
-                                            <TD class="rowtitle">Build Model</TD>
-                                            <TD>
-                                                <xsl:value-of select="TestResult/DeviceInfo/BuildInfo/@build_model"/>
-                                            </TD>
-                                        </TR>
-                                        <TR>
-                                            <TD class="rowtitle">Build Name</TD>
-                                            <TD>
-                                                <xsl:value-of select="TestResult/DeviceInfo/BuildInfo/@buildName"/>
-                                            </TD>
-                                        </TR>
-                                        <TR>
-                                            <TD class="rowtitle">Build Brand</TD>
-                                            <TD>
-                                                <xsl:value-of select="TestResult/DeviceInfo/BuildInfo/@build_brand"/>
-                                            </TD>
-                                        </TR>
-                                        <TR>
-                                            <TD class="rowtitle">Build Manufacturer</TD>
-                                            <TD>
-                                                <xsl:value-of select="TestResult/DeviceInfo/BuildInfo/@build_manufacturer"/>
-                                            </TD>
-                                        </TR>
-                                        <TR>
-                                            <TD class="rowtitle">Device ID</TD>
-                                            <TD>
-                                                <xsl:value-of select="TestResult/DeviceInfo/BuildInfo/@deviceID"/>
-                                            </TD>
-                                        </TR>
-                                        <TR>
-                                            <TD class="rowtitle">Firmware Version</TD>
-                                            <TD>
-                                                <xsl:value-of select="TestResult/DeviceInfo/BuildInfo/@buildVersion"/>
-                                            </TD>
-                                        </TR>
-                                        <TR>
-                                            <TD class="rowtitle">Firmware Build Number</TD>
-                                            <TD>
-                                                <xsl:value-of select="TestResult/DeviceInfo/BuildInfo/@buildID"/>
-                                            </TD>
-                                        </TR>
-                                        <TR>
-                                            <TD class="rowtitle">Build Fingerprint</TD>
-                                            <TD>
-                                                <xsl:value-of select="TestResult/DeviceInfo/BuildInfo/@build_fingerprint"/>
-                                            </TD>
-                                        </TR>
-                                        <TR>
-                                            <TD class="rowtitle">Build ABI</TD>
-                                            <TD>
-                                                <xsl:value-of
-                                                  select="TestResult/DeviceInfo/BuildInfo/@build_abi"/>
-                                            </TD>
-                                        </TR>
-                                        <TR>
-                                            <TD class="rowtitle">Build ABI2</TD>
-                                            <TD>
-                                                <xsl:value-of
-                                                  select="TestResult/DeviceInfo/BuildInfo/@build_abi2"/>
-                                            </TD>
-                                        </TR>
-                                        <TR>
-                                            <TD class="rowtitle">Android Platform Version</TD>
-                                            <TD>
-                                                <xsl:value-of select="TestResult/DeviceInfo/BuildInfo/@androidPlatformVersion"/>
-                                            </TD>
-                                        </TR>
-                                        <TR>
-                                            <TD class="rowtitle">Supported Locales</TD>
-                                            <TD>
-                                                <xsl:call-template name="formatDelimitedString">
-                                                    <xsl:with-param name="string" select="TestResult/DeviceInfo/BuildInfo/@locales"/>
-                                                </xsl:call-template>
-                                            </TD>
-                                        </TR>
-                                        <TR>
-                                            <TD class="rowtitle">Screen Size</TD>
-                                            <TD>
-                                                <xsl:value-of select="TestResult/DeviceInfo/Screen/@screen_size"/>
-                                            </TD>
-                                        </TR>
-                                        <TR>
-                                            <TD class="rowtitle">Resolution</TD>
-                                            <TD>
-                                                <xsl:value-of select="TestResult/DeviceInfo/Screen/@resolution"/>
-                                            </TD>
-                                        </TR>
-                                        <TR>
-                                            <TD class="rowtitle">Density</TD>
-                                            <TD>
-                                                <xsl:value-of select="TestResult/DeviceInfo/Screen/@screen_density"/>
-                                                (<xsl:value-of select="TestResult/DeviceInfo/Screen/@screen_density_bucket"/>)
-                                            </TD>
-                                        </TR>
-                                        <TR>
-                                            <TD class="rowtitle">Phone number</TD>
-                                            <TD>
-                                                <xsl:value-of select="TestResult/DeviceInfo/PhoneSubInfo/@subscriberId"/>
-                                            </TD>
-                                        </TR>
-                                        <TR>
-                                            <TD class="rowtitle">X dpi</TD>
-                                            <TD>
-                                                <xsl:value-of select="TestResult/DeviceInfo/BuildInfo/@Xdpi"/>
-                                            </TD>
-                                        </TR>
-                                        <TR>
-                                            <TD class="rowtitle">Y dpi</TD>
-                                            <TD>
-                                                <xsl:value-of select="TestResult/DeviceInfo/BuildInfo/@Ydpi"/>
-                                            </TD>
-                                        </TR>
-                                        <TR>
-                                            <TD class="rowtitle">Touch</TD>
-                                            <TD>
-                                                <xsl:value-of select="TestResult/DeviceInfo/BuildInfo/@touch"/>
-                                            </TD>
-                                        </TR>
-                                        <TR>
-                                            <TD class="rowtitle">Navigation</TD>
-                                            <TD>
-                                                <xsl:value-of select="TestResult/DeviceInfo/BuildInfo/@navigation"/>
-                                            </TD>
-                                        </TR>
-                                        <TR>
-                                            <TD class="rowtitle">Keypad</TD>
-                                            <TD>
-                                                <xsl:value-of select="TestResult/DeviceInfo/BuildInfo/@keypad"/>
-                                            </TD>
-                                        </TR>
-                                        <TR>
-                                            <TD class="rowtitle">Network</TD>
-                                            <TD>
-                                                <xsl:value-of select="TestResult/DeviceInfo/BuildInfo/@network"/>
-                                            </TD>
-                                        </TR>
-                                        <TR>
-                                            <TD class="rowtitle">IMEI</TD>
-                                            <TD>
-                                                <xsl:value-of select="TestResult/DeviceInfo/BuildInfo/@imei"/>
-                                            </TD>
-                                        </TR>
-                                        <TR>
-                                            <TD class="rowtitle">IMSI</TD>
-                                            <TD>
-                                                <xsl:value-of select="TestResult/DeviceInfo/BuildInfo/@imsi"/>
-                                            </TD>
-                                        </TR>
-                                        <TR>
-                                            <TD class="rowtitle">Open GL ES Version</TD>
-                                            <TD>
-                                                <xsl:value-of select="TestResult/DeviceInfo/BuildInfo/@openGlEsVersion"/>
-                                            </TD>
-                                        </TR>
-                                        <TR>
-                                            <TD class="rowtitle">Features</TD>
-                                            <TD>
-                                                <xsl:for-each select="TestResult/DeviceInfo/FeatureInfo/Feature[@type='sdk']">
-                                                    <xsl:text>[</xsl:text>
-                                                    <xsl:choose>
-                                                        <xsl:when test="@available = 'true'">
-                                                            <xsl:text>X</xsl:text>
-                                                        </xsl:when>
-                                                        <xsl:otherwise>
-                                                            <xsl:text>_</xsl:text>
-                                                        </xsl:otherwise>
-                                                    </xsl:choose>
-                                                    <xsl:text>] </xsl:text>
-
-                                                    <xsl:value-of select="@name" />
-                                                    <br />
-                                                </xsl:for-each>
-                                            </TD>
-                                        </TR>
-                                        <TR>
-                                            <TD class="rowtitle">Other Features</TD>
-                                            <TD>
-                                                <UL>
-                                                    <xsl:for-each select="TestResult/DeviceInfo/FeatureInfo/Feature[@type='other']">
-                                                        <LI><xsl:value-of select="@name" /></LI>
-                                                    </xsl:for-each>
-                                                </UL>
-                                            </TD>
-                                        </TR>
-                                        <TR>
-                                            <TD class="rowtitle">Root Processes</TD>
-                                            <TD>
-                                                <UL>
-                                                    <xsl:for-each select="TestResult/DeviceInfo/ProcessInfo/Process[@uid='0']">
-                                                        <LI><xsl:value-of select="@name" /></LI>
-                                                    </xsl:for-each>
-                                                </UL>
-                                            </TD>
-                                        </TR>
-                                        <TR>
-                                            <TD class="rowtitle">Partitions</TD>
-                                            <TD>
-                                                <UL>
-                                                    <pre>
-                                                        <xsl:call-template name="formatDelimitedString">
-                                                            <xsl:with-param name="string" select="TestResult/DeviceInfo/BuildInfo/@partitions" />
-                                                            <xsl:with-param name="numTokensPerRow" select="1" />
-                                                        </xsl:call-template>
-                                                    </pre>
-                                                </UL>
-                                            </TD>
-                                        </TR>
-                                    </TABLE>
-                                </div>
-                            </TD>
-
-                            <!-- plan information -->
-                            <TD>
-                                <div id="summaryinfo">
-                                    <TABLE width="75%">
-                                        <TR>
-                                            <TD class="rowtitle">CTS version</TD>
-                                            <TD>
-                                                <xsl:value-of select="TestResult/HostInfo/Cts/@version"/>
-                                            </TD>
-                                        </TR>
-                                        <TR>
-                                            <TD class="rowtitle">Test timeout</TD>
-                                            <TD>
-                                                <xsl:value-of select="TestResult/HostInfo/Cts/IntValue[@name='testStatusTimeoutMs']/@value" /> ms
-                                            </TD>
-                                        </TR>
-                                        <TR>
-                                            <TD class="rowtitle">Host Info</TD>
-                                            <TD>
-                                                <xsl:value-of select="TestResult/HostInfo/@name"/>
-                                                (<xsl:value-of select="TestResult/HostInfo/Os/@name"/> - 
-                                                  <xsl:value-of select="TestResult/HostInfo/Os/@version"/>)
-                                            </TD>
-                                        </TR>
-                                        <TR><TD><BR></BR></TD><TD></TD></TR>
-                                        <TR>
-                                            <TD class="rowtitle">Plan name</TD>
-                                            <TD>
-                                                <xsl:value-of select="TestResult/@testPlan"/>
-                                            </TD>
-                                        </TR>
-                                        <TR>
-                                            <TD class="rowtitle">Start time</TD>
-                                            <TD>
-                                                <xsl:value-of select="TestResult/@starttime"/>
-                                            </TD>
-                                        </TR>
-                                        <TR>
-                                            <TD class="rowtitle">End time</TD>
-                                            <TD>
-                                                <xsl:value-of select="TestResult/@endtime"/>
-                                            </TD>
-                                        </TR>
-
-                                        <!-- Test Summary -->
-                                        <TR><TD><BR></BR></TD><TD></TD></TR>
-                                        <TR>
-                                            <TD class="rowtitle">Tests Passed</TD>
-                                            <TD>
-                                                <xsl:value-of select="TestResult/Summary/@pass"/>
-                                            </TD>
-                                        </TR>
-                                        <TR>
-                                            <TD class="rowtitle">Tests Failed</TD>
-                                            <TD>
-                                                <xsl:value-of select="TestResult/Summary/@failed"/>
-                                            </TD>
-                                        </TR>
-                                        <TR>
-                                            <TD class="rowtitle">Tests Timed out</TD>
-                                            <TD>
-                                                <xsl:value-of select="TestResult/Summary/@timeout"/>
-                                            </TD>
-                                        </TR>
-                                        <TR>
-                                            <TD class="rowtitle">Tests Not Executed</TD>
-                                            <TD>
-                                                <xsl:value-of select="TestResult/Summary/@notExecuted"/>
-                                            </TD>
-                                        </TR>
-                                    </TABLE>
-                                </div>
-                            </TD>
-                        </TR>
-                    </TABLE>
-                </DIV>
-
-                <!-- High level summary of test execution -->
-                <h2 align="center">Test Summary by Package</h2>
-                <DIV id="testsummary">
-                    <TABLE>
-                        <TR>
-                            <TH>Test Package</TH>
-                            <TH>Passed</TH>
-                            <TH>Failed</TH>
-                            <TH>Timed Out</TH>
-                            <TH>Not Executed</TH>
-                            <TH>Total Tests</TH>
-                        </TR>
-                        <xsl:for-each select="TestResult/TestPackage">
-                            <TR>
-                                <TD>
-                                    <xsl:variable name="href"><xsl:value-of select="@appPackageName"/></xsl:variable>
-                                    <a href="#{$href}"><xsl:value-of select="@appPackageName"/></a>
-                                </TD>
-                                <TD>
-                                    <xsl:value-of select="count(TestSuite//Test[@result = 'pass'])"/>
-                                </TD>
-                                <TD>
-                                    <xsl:value-of select="count(TestSuite//Test[@result = 'fail'])"/>
-                                </TD>
-                                <TD>
-                                    <xsl:value-of select="count(TestSuite//Test[@result = 'timeout'])"/>
-                                </TD>
-                                <TD>
-                                    <xsl:value-of select="count(TestSuite//Test[@result = 'notExecuted'])"/>
-                                </TD>
-                                <TD>
-                                    <xsl:value-of select="count(TestSuite//Test)"/>
-                                </TD>
-                            </TR>
-                        </xsl:for-each> <!-- end package -->
-                    </TABLE>
-                </DIV>
-
-                <xsl:call-template name="filteredResultTestReport">
-                    <xsl:with-param name="header" select="'Test Failures'" />
-                    <xsl:with-param name="resultFilter" select="'fail'" />
-                </xsl:call-template>
-
-                <xsl:call-template name="filteredResultTestReport">
-                    <xsl:with-param name="header" select="'Test Timeouts'" />
-                    <xsl:with-param name="resultFilter" select="'timeout'" />
-                </xsl:call-template>
-
-                <h2 align="center">Detailed Test Report</h2>
-                <xsl:call-template name="detailedTestReport" />
-
-            </body>
-        </html>
-    </xsl:template>
-
-    <xsl:template name="filteredResultTestReport">
-        <xsl:param name="header" />
-        <xsl:param name="resultFilter" />
-        <xsl:variable name="numMatching" select="count(TestResult/TestPackage/TestSuite//TestCase/Test[@result=$resultFilter])" />
-        <xsl:if test="$numMatching &gt; 0">
-            <h2 align="center"><xsl:value-of select="$header" /> (<xsl:value-of select="$numMatching"/>)</h2>
-            <xsl:call-template name="detailedTestReport">
-                <xsl:with-param name="resultFilter" select="$resultFilter"/>
-            </xsl:call-template>
-        </xsl:if>
-    </xsl:template>
-
-    <xsl:template name="detailedTestReport">
-        <xsl:param name="resultFilter" />
-        <DIV id="testdetail">
-            <xsl:for-each select="TestResult/TestPackage">
-                <xsl:if test="$resultFilter=''
-                        or count(TestSuite//TestCase/Test[@result=$resultFilter]) &gt; 0">
-                    <DIV id="none">
-                        <TABLE>
-                            <TR>
-                                <TD class="none" align="left">
-                                    <xsl:variable name="href"><xsl:value-of select="@appPackageName"/></xsl:variable>
-                                    <a name="{$href}">Compatibility Test Package: <xsl:value-of select="@appPackageName"/></a>
-                                </TD>
-                            </TR>
-                        </TABLE>
-                    </DIV>
-
-                    <TABLE>
-                        <TR>
-                            <TH width="25%">Test</TH>
-                            <TH width="7%">Result</TH>
-                            <TH width="68%">Failure Details</TH>
-                        </TR>
-
-                        <!-- test case -->
-                        <xsl:for-each select="TestSuite//TestCase">
-
-                            <xsl:if test="$resultFilter='' or count(Test[@result=$resultFilter]) &gt; 0">
-                                <!-- emit a blank row before every test suite name -->
-                                <xsl:if test="position()!=1">
-                                    <TR><TD class="testcasespacer" colspan="3"></TD></TR>
-                                </xsl:if>
-
-                                <TR>
-                                    <TD class="testcase" colspan="3">
-                                        <xsl:for-each select="ancestor::TestSuite">
-                                            <xsl:if test="position()!=1">.</xsl:if>
-                                            <xsl:value-of select="@name"/>
-                                        </xsl:for-each>
-                                        <xsl:text>.</xsl:text>
-                                        <xsl:value-of select="@name"/>
-                                    </TD>
-                                </TR>
-                            </xsl:if>
-
-                            <!-- test -->
-                            <xsl:for-each select="Test">
-                                <xsl:if test="$resultFilter='' or $resultFilter=@result">
-                                    <TR>
-                                        <TD class="testname"> -- <xsl:value-of select="@name"/></TD>
-
-                                        <!-- test results -->
-                                        <xsl:choose>
-                                            <xsl:when test="string(@KnownFailure)">
-                                                <!-- "pass" indicates the that test actually passed (results have been inverted already) -->
-                                                <xsl:if test="@result='pass'">
-                                                    <TD class="pass">
-                                                        <div style="text-align: center; margin-left:auto; margin-right:auto;">
-                                                            known problem
-                                                        </div>
-                                                    </TD>
-                                                    <TD class="failuredetails"></TD>
-                                                </xsl:if>
-
-                                                <!-- "fail" indicates that a known failure actually passed (results have been inverted already) -->
-                                                <xsl:if test="@result='fail'">
-                                                    <TD class="failed">
-                                                        <div style="text-align: center; margin-left:auto; margin-right:auto;">
-                                                            <xsl:value-of select="@result"/>
-                                                        </div>
-                                                    </TD>
-                                                   <TD class="failuredetails">
-                                                        <div id="details">
-                                                            A test that was a known failure actually passed. Please check.
-                                                        </div>
-                                                   </TD>
-                                                </xsl:if>
-                                            </xsl:when>
-
-                                            <xsl:otherwise>
-                                                <xsl:if test="@result='pass'">
-                                                    <TD class="pass">
-                                                        <div style="text-align: center; margin-left:auto; margin-right:auto;">
-                                                            <xsl:value-of select="@result"/>
-                                                        </div>
-                                                    </TD>
-                                                    <TD class="failuredetails"></TD>
-                                                </xsl:if>
-
-                                                <xsl:if test="@result='fail'">
-                                                    <TD class="failed">
-                                                        <div style="text-align: center; margin-left:auto; margin-right:auto;">
-                                                            <xsl:value-of select="@result"/>
-                                                        </div>
-                                                    </TD>
-                                                    <TD class="failuredetails">
-                                                        <div id="details">
-                                                            <xsl:value-of select="FailedScene/@message"/>
-                                                        </div>
-                                                    </TD>
-                                                </xsl:if>
-
-                                                <xsl:if test="@result='timeout'">
-                                                    <TD class="timeout">
-                                                        <div style="text-align: center; margin-left:auto; margin-right:auto;">
-                                                            <xsl:value-of select="@result"/>
-                                                        </div>
-                                                    <TD class="failuredetails"></TD>
-                                                    </TD>
-                                                </xsl:if>
-
-                                                <xsl:if test="@result='notExecuted'">
-                                                    <TD class="notExecuted">
-                                                        <div style="text-align: center; margin-left:auto; margin-right:auto;">
-                                                            <xsl:value-of select="@result"/>
-                                                        </div>
-                                                    </TD>
-                                                    <TD class="failuredetails"></TD>
-                                                </xsl:if>
-                                            </xsl:otherwise>
-                                        </xsl:choose>
-                                    </TR> <!-- finished with a row -->
-                                </xsl:if>
-                            </xsl:for-each> <!-- end test -->
-                        </xsl:for-each> <!-- end test case -->
-                    </TABLE>
-                </xsl:if>
-            </xsl:for-each> <!-- end test package -->
-        </DIV>
-    </xsl:template>
-
-    <!-- Take a delimited string and insert line breaks after a some number of elements. --> 
-    <xsl:template name="formatDelimitedString">
-        <xsl:param name="string" />
-        <xsl:param name="numTokensPerRow" select="10" />
-        <xsl:param name="tokenIndex" select="1" />
-        <xsl:if test="$string">
-            <!-- Requires the last element to also have a delimiter after it. -->
-            <xsl:variable name="token" select="substring-before($string, ';')" />
-            <xsl:value-of select="$token" />
-            <xsl:text>&#160;</xsl:text>
-          
-            <xsl:if test="$tokenIndex mod $numTokensPerRow = 0">
-                <br />
-            </xsl:if>
-
-            <xsl:call-template name="formatDelimitedString">
-                <xsl:with-param name="string" select="substring-after($string, ';')" />
-                <xsl:with-param name="numTokensPerRow" select="$numTokensPerRow" />
-                <xsl:with-param name="tokenIndex" select="$tokenIndex + 1" />
-            </xsl:call-template>
-        </xsl:if>
-    </xsl:template>
-
-</xsl:stylesheet>
diff --git a/tools/host/test/com/android/cts/CommandParserTest.java b/tools/host/test/com/android/cts/CommandParserTest.java
deleted file mode 100644
index 95a0fc0..0000000
--- a/tools/host/test/com/android/cts/CommandParserTest.java
+++ /dev/null
@@ -1,282 +0,0 @@
-/*
- * Copyright (C) 2008 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 com.android.cts;
-
-import java.util.ArrayList;
-import java.util.Set;
-
-/**
- * Test the logic of parsing the command, option, and parameters.
- */
-public class CommandParserTest extends CtsTestBase {
-
-    /**
-     * Test parsing the simple normal command.
-     */
-    public void testParseSimpleCommand()
-                throws UnknownCommandException, CommandNotFoundException {
-        final String action = "start";
-        final String option = "--plan";
-        final String value = "test_plan";
-        CommandParser cp;
-        cp = CommandParser.parse(action + " " + option + " " + value);
-        assertEquals(1, cp.getOptionSize());
-        assertEquals(action, cp.getAction());
-        assertTrue(cp.containsKey(CTSCommand.OPTION_PLAN));
-        assertEquals(value, cp.getValue(CTSCommand.OPTION_PLAN));
-    }
-
-    /**
-     * Test parsing command with multiple options.
-     */
-    public void testParseMultiOptionsCommand()
-                throws UnknownCommandException, CommandNotFoundException {
-        final String action = "start";
-        final String option1 = "--plan";
-        final String value1 = "test_plan";
-        final String option2 = "-d";
-        final String value2 = "0";
-        final String unexistOption = "unexist";
-        CommandParser cp;
-        cp = CommandParser.parse(action + " " + option1 + " " + value1
-                + " " + option2 + " " + value2);
-        assertEquals(2, cp.getOptionSize());
-        assertEquals(action, cp.getAction());
-        assertTrue(cp.containsKey(CTSCommand.OPTION_PLAN));
-        assertEquals(value1, cp.getValue(CTSCommand.OPTION_PLAN));
-        assertTrue(cp.containsKey(CTSCommand.OPTION_DEVICE));
-        assertEquals(value2, cp.getValue(CTSCommand.OPTION_DEVICE));
-        assertFalse(cp.containsKey(unexistOption));
-    }
-
-    /**
-     * Test parsing command with multiple same options.
-     */
-    public void testParseSameOptionCommand() throws CommandNotFoundException{
-        final String action = "ls";
-        final String option1 = "-d";
-        final String value1 = "test_plan";
-        final String option2 = "-d";
-        final String value2 = "0";
-        try {
-            CommandParser.parse(action + " " + option1 + " "
-                    + value1 + " " + option2 + " " + value2);
-            fail("no exception");
-        } catch (UnknownCommandException e) {
-        }
-    }
-
-    /**
-     * Test parsing command with option without value.
-     */
-    public void testParseNoValueForOptionCommand()
-                throws UnknownCommandException, CommandNotFoundException {
-        final String action = "ls";
-        final String option1 = "-d";
-
-        CommandParser cp;
-        cp = CommandParser.parse(action + " " + option1);
-        assertEquals(1, cp.getOptionSize());
-        assertEquals(action, cp.getAction());
-        assertTrue(cp.containsKey(CTSCommand.OPTION_DEVICE));
-        assertEquals("", cp.getValue(CTSCommand.OPTION_DEVICE));
-    }
-
-    /**
-     * Test parsing command with single illegal option.
-     */
-    public void testParseIllOptionCommand()
-                throws UnknownCommandException, CommandNotFoundException {
-        final String action = "ls";
-        final String actionValue = "devices";
-        CommandParser cp = CommandParser.parse(action + " " + actionValue);
-        assertEquals(action, cp.getAction());
-        ArrayList<String> actionValues = cp.getActionValues();
-        assertEquals(1, actionValues.size());
-        assertTrue(actionValues.contains(actionValue));
-    }
-
-    /**
-     * Test parsing command with multiple illegal options.
-     */
-    public void testParseMultiIllOptionCommand() throws CommandNotFoundException {
-        final String action = "ls";
-        final String option1 = "-devices";
-        final String value1 = "v1";
-        final String option2 = "op2";
-        final String value2 = "v2";
-        try {
-            CommandParser.parse(action + " " + option1 + " " + value1 + " "
-                    + option2 + " " + value2);
-            fail("no exception");
-        } catch (UnknownCommandException e) {
-        }
-    }
-
-    /**
-     * Test parsing command and then get the options.
-     */
-    public void testGetOptions()
-                throws UnknownCommandException, CommandNotFoundException {
-        final String action = "ls";
-        final String option1 = "-d";
-        final String value1 = "v1";
-        final String option2 = "--plan";
-        final String value2 = "v2";
-        CommandParser cp;
-        cp = CommandParser.parse(action + " " + option1 + " " + value1
-                + " " + option2 + " " + value2);
-        assertEquals(2, cp.getOptionSize());
-        Set<String> set = cp.getOptionKeys();
-        assertEquals(2, set.size());
-        assertTrue(set.contains(CTSCommand.OPTION_DEVICE));
-        assertTrue(set.contains(CTSCommand.OPTION_PLAN));
-    }
-
-    /**
-     * Test parsing empty command.
-     */
-    public void testParseEmptyCommand() throws UnknownCommandException {
-        try {
-            CommandParser.parse("");
-            CommandParser.parse("             ");
-            fail("should throw out exception");
-        } catch (CommandNotFoundException e) {
-        }
-    }
-
-    /**
-     * Test parsing command without option.
-     */
-    public void testParseSingleCommand()
-                throws UnknownCommandException, CommandNotFoundException {
-        final String action = "exit";
-        CommandParser cp;
-        cp = CommandParser.parse(action);
-        assertEquals(action, cp.getAction());
-        assertEquals(0, cp.getOptionSize());
-        assertEquals(0, cp.getOptionKeys().size());
-    }
-
-    /**
-     * Test parsing command with number.
-     */
-    public void testParseNumberOption()
-                throws UnknownCommandException, CommandNotFoundException {
-        final String action = "h";
-        final String actionValue = "1234";
-        CommandParser cp;
-        cp = CommandParser.parse(action + " " + actionValue);
-        assertEquals(action, cp.getAction());
-        ArrayList<String> actionValues = cp.getActionValues();
-        assertEquals(1, actionValues.size());
-        assertTrue(actionValues.contains(actionValue));
-        assertEquals(0, cp.getOptionSize());
-        Set<String> set = cp.getOptionKeys();
-        assertEquals(0, set.size());
-    }
-
-    /**
-     * Test parsing command with negative number.
-     */
-    public void testParseValueNegative()
-                throws UnknownCommandException, CommandNotFoundException {
-        final String action = "ls";
-        final String resultOption = "-r";
-        final String resultValue = "-13";
-        CommandParser cp;
-        cp = CommandParser.parse(action + " " + resultOption + " "
-                + resultValue);
-        assertEquals(action, cp.getAction());
-        assertEquals(1, cp.getOptionSize());
-        assertTrue(cp.containsKey(CTSCommand.OPTION_RESULT));
-        assertEquals(resultValue, cp.getValue(CTSCommand.OPTION_RESULT));
-    }
-
-    /**
-     * Test parsing command with capital letter.
-     */
-    public void testParseCapitalLetter()
-                throws UnknownCommandException, CommandNotFoundException {
-        final String action = "LS";
-        final String resultOption = "-R";
-        final String resultValue = "-13";
-        CommandParser cp;
-        cp = CommandParser.parse(action + " " + resultOption + " "
-                + resultValue);
-        assertEquals(action.toLowerCase(), cp.getAction());
-        assertEquals(1, cp.getOptionSize());
-        assertTrue(cp.containsKey(CTSCommand.OPTION_RESULT));
-        assertEquals(resultValue, cp.getValue(CTSCommand.OPTION_RESULT));
-    }
-
-    /**
-     * Test parsing command with multiple action values.
-     */
-    public void testParseActionValue()
-                throws UnknownCommandException, CommandNotFoundException {
-        final String action = "h";
-        final String actionValue1 = "192";
-        final String actionValue2 = "e";
-        CommandParser cp = CommandParser.parse(action + " " + actionValue1 + " "
-                + actionValue2);
-        assertEquals(action, cp.getAction());
-        assertEquals(0, cp.getOptionKeys().size());
-        ArrayList<String> actionValues = cp.getActionValues();
-        assertEquals(2, actionValues.size());
-        assertTrue(actionValues.contains(actionValue1));
-        assertTrue(actionValues.contains(actionValue2));
-    }
-
-    /**
-     * Test parsing command of list result.
-     */
-    public void testParseListResultCmd() throws UnknownCommandException,
-            CommandNotFoundException {
-        final String action = "ls";
-        final String resultOpt = "-r";
-        final String resultValue = "pass";
-        final String sessionOpt = "-s";
-        final String sessionOptComplete = "--session";
-        final String sessionId = "1";
-        String cmdStr;
-        CommandParser cp;
-
-        cmdStr = action + " " + resultOpt + " " + sessionOpt + " " + sessionId;
-        cp = CommandParser.parse(cmdStr);
-        assertEquals(action, cp.getAction());
-        assertEquals(2, cp.getOptionSize());
-        assertEquals("", cp.getValue(CTSCommand.OPTION_RESULT));
-        assertEquals(sessionId, cp.getValue(CTSCommand.OPTION_SESSION));
-
-        cmdStr = action + " " + resultOpt + " " + sessionOptComplete + " "
-                + sessionId;
-        cp = CommandParser.parse(cmdStr);
-        assertEquals(action, cp.getAction());
-        assertEquals(2, cp.getOptionSize());
-        assertEquals("", cp.getValue(CTSCommand.OPTION_RESULT));
-        assertEquals(sessionId, cp.getValue(CTSCommand.OPTION_SESSION));
-
-        cmdStr = action + " " + resultOpt + " " + resultValue + " " + sessionOptComplete + " "
-                + sessionId;
-        cp = CommandParser.parse(cmdStr);
-        assertEquals(action, cp.getAction());
-        assertEquals(2, cp.getOptionSize());
-        assertEquals(resultValue, cp.getValue(CTSCommand.OPTION_RESULT));
-        assertEquals(sessionId, cp.getValue(CTSCommand.OPTION_SESSION));
-    }
-}
diff --git a/tools/host/test/com/android/cts/ConsoleTests.java b/tools/host/test/com/android/cts/ConsoleTests.java
deleted file mode 100644
index 81f4958..0000000
--- a/tools/host/test/com/android/cts/ConsoleTests.java
+++ /dev/null
@@ -1,523 +0,0 @@
-/*
- * Copyright (C) 2008 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 com.android.cts;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.security.NoSuchAlgorithmException;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.zip.ZipEntry;
-import java.util.zip.ZipOutputStream;
-
-import com.android.cts.HostConfig.CaseRepository;
-
-/**
- * Test the console commands.
- */
-public class ConsoleTests extends CtsTestBase {
-
-    private String mPath1;
-    private String mPath2;
-    private String mPath3;
-
-    /** {@inheritDoc} */
-    @Override
-    public void tearDown() {
-        HostConfig.getInstance().removeTestPacakges();
-        deleteTestPackage(mPath1);
-        deleteTestPackage(mPath2);
-        deleteTestPackage(mPath3);
-
-        super.tearDown();
-    }
-
-    /**
-     * Test adding package to test case repository and then getting the package names.
-     */
-    public void testAddPackage() throws Exception {
-        ConsoleUi cui = new ConsoleUi(TestHost.getInstance());
-
-        mPath1 = ROOT + File.separator + "com.google.android.cts.p1.zip";
-        mPath2 = ROOT + File.separator + "com.google.android.cts.p2.zip";
-        mPath3 = ROOT + File.separator + "net.sf.jlee.cts.p3.zip";
-
-        final String expPackageName1 = "com.google.android.cts.p1";
-        final String expPackageName2 = "com.google.android.cts.p2";
-        final String expPackageName3 = "net.sf.jlee.cts.p3";
-
-        HostConfig.getInstance().removeTestPacakges();
-
-        ArrayList<String> pNames = HostConfig.getInstance().getCaseRepository()
-                .getPackageBinaryNames();
-
-        assertEquals(0, pNames.size());
-        createTestPackageZip(mPath1, expPackageName1);
-        createTestPackageZip(mPath2, expPackageName2);
-        createTestPackageZip(mPath3, expPackageName3);
-
-        // add package 1
-        String cmdline = CTSCommand.ADD + " " + "-p" + " "
-                + mPath1;
-        cui.processCommand(CommandParser.parse(cmdline));
-
-        pNames = HostConfig.getInstance().getCaseRepository().getPackageBinaryNames();
-        assertEquals(1, pNames.size());
-        assertTrue(pNames.contains(expPackageName1));
-
-        // add package 2
-        cmdline = CTSCommand.ADD + " " + "-p" + " " + mPath2;
-        cui.processCommand(CommandParser.parse(cmdline));
-
-        pNames = HostConfig.getInstance().getCaseRepository().getPackageBinaryNames();
-        assertEquals(2, pNames.size());
-        assertTrue(pNames.contains(expPackageName1));
-        assertTrue(pNames.contains(expPackageName2));
-
-        // add package 2
-        cmdline = CTSCommand.ADD + " " + "-p" + " " + mPath3;
-        cui.processCommand(CommandParser.parse(cmdline));
-
-        pNames = HostConfig.getInstance().getCaseRepository().getPackageBinaryNames();
-        assertEquals(3, pNames.size());
-        assertTrue(pNames.contains(expPackageName1));
-        assertTrue(pNames.contains(expPackageName2));
-        assertTrue(pNames.contains(expPackageName3));
-
-        deleteTestPackage(expPackageName1);
-        deleteTestPackage(expPackageName2);
-        deleteTestPackage(expPackageName3);
-    }
-
-    /**
-     * Test removing package after adding the packages into the test case repository.
-     */
-    public void testRemovePackage() throws Exception {
-        ConsoleUi cui = new ConsoleUi(TestHost.getInstance());
-        mPath1 = ROOT + File.separator + "com.google.android.cts.p1.zip";
-        mPath2 = ROOT + File.separator + "com.google.android.cts.p2.zip";
-        mPath3 = ROOT + File.separator + "net.sf.jlee.cts.p3.zip";
-
-        final String expPackageName1 = "com.google.android.cts.p1";
-        final String expPackageName2 = "com.google.android.cts.p2";
-        final String expPackageName3 = "net.sf.jlee.cts.p3";
-
-        HostConfig.getInstance().removeTestPacakges();
-        createTestPackageZip(mPath1, expPackageName1);
-        createTestPackageZip(mPath2, expPackageName2);
-        createTestPackageZip(mPath3, expPackageName3);
-
-        // add package 1
-        String cmdLine = CTSCommand.ADD + " -p " + mPath1;
-        cui.processCommand(CommandParser.parse(cmdLine));
-        cmdLine = CTSCommand.ADD + " -p " + mPath2;
-        cui.processCommand(CommandParser.parse(cmdLine));
-        cmdLine = CTSCommand.ADD + " -p " + mPath3;
-        cui.processCommand(CommandParser.parse(cmdLine));
-
-        ArrayList<String> pNames = HostConfig.getInstance().getCaseRepository()
-                .getPackageBinaryNames();
-        assertEquals(3, pNames.size());
-        assertTrue(pNames.contains(expPackageName1));
-        assertTrue(pNames.contains(expPackageName2));
-        assertTrue(pNames.contains(expPackageName3));
-
-        cmdLine = CTSCommand.REMOVE + " " + "-p" + " "
-                + expPackageName1;
-        cui.processCommand(CommandParser.parse(cmdLine));
-        pNames = HostConfig.getInstance().getCaseRepository().getPackageBinaryNames();
-        assertEquals(2, pNames.size());
-        assertTrue(pNames.contains(expPackageName2));
-        assertTrue(pNames.contains(expPackageName3));
-
-        cmdLine = CTSCommand.REMOVE + " " + "-p" + " "
-                + expPackageName2;
-        cui.processCommand(CommandParser.parse(cmdLine));
-        pNames = HostConfig.getInstance().getCaseRepository().getPackageBinaryNames();
-        assertEquals(1, pNames.size());
-        assertTrue(pNames.contains(expPackageName3));
-
-        cmdLine = CTSCommand.REMOVE + " " + "-p" + " "
-                + expPackageName3;
-        cui.processCommand(CommandParser.parse(cmdLine));
-        pNames = HostConfig.getInstance().getCaseRepository().getPackageBinaryNames();
-        assertEquals(0, pNames.size());
-
-        deleteTestPackage(expPackageName1);
-        deleteTestPackage(expPackageName2);
-        deleteTestPackage(expPackageName3);
-    }
-
-    /**
-     * Test validating partial zipped package when adding package..
-     */
-    public void testValidatePartialZipPackageName() throws Exception {
-        final String pkgName1 = "com.google.android.cts.apkPartial.zip";
-        final String pkgName2 = "com.google.android.cts.xmlPartial.zip";
-        mPath1 = ROOT + File.separator + pkgName1;
-        mPath2 = ROOT + File.separator + pkgName2;
-
-        HostConfig config = HostConfig.getInstance();
-        HostConfig.CaseRepository caseRepos = config.getCaseRepository();
-
-        createPartialTestPackageZip(mPath1, HostConfig.FILE_SUFFIX_APK);
-        assertFalse(caseRepos.addPackage(mPath1));
-
-        createPartialTestPackageZip(mPath2, HostConfig.FILE_SUFFIX_XML);
-        assertFalse(caseRepos.addPackage(mPath2));
-    }
-
-    /**
-     * Test validating package file suffix when adding package.
-     */
-    public void testValidatePackageSuffix() throws Exception {
-        final String content = "test test test";
-        final String pkgName1 = "com.google.android.cts.invalidSuffix.txt";
-        mPath1 = ROOT + File.separator + pkgName1;
-
-        createFile(content, mPath1);
-
-        HostConfig config = HostConfig.getInstance();
-        HostConfig.CaseRepository caseRepos = config.getCaseRepository();
-
-        assertFalse(caseRepos.isValidPackageName(mPath1));
-    }
-
-    /**
-     * Test validate duplicate package name by adding the same package twice.
-     */
-    public void testValidateDuplicatePackageName() throws Exception {
-        final String name = "com.google.android.cts.mypackage";
-        mPath1 = ROOT + File.separator + name + HostConfig.FILE_SUFFIX_ZIP;
-
-        HostConfig config = HostConfig.getInstance();
-        HostConfig.CaseRepository caseRepos = config.getCaseRepository();
-        createTestPackageZip(mPath1, name);
-
-        caseRepos.removePackages(name);
-        assertTrue(caseRepos.addPackage(mPath1));
-        assertFalse(caseRepos.isValidPackageName(mPath1));
-        caseRepos.removePackages(name);
-
-        deleteTestPackage(name);
-    }
-
-    /**
-     * Create zipped test package.
-     *
-     * @param zipFilePath The file name with path.
-     * @param packageName The package name.
-     */
-    private void createTestPackageZip(String zipFilePath, final String packageName)
-            throws IOException {
-        final String descriptionConfigStr = "<TestPackage name=\""
-            + packageName + "\" " + "appPackageName=\"" + packageName
-            + "\""
-            + " version=\"1.0\" AndroidFramework=\"Android 1.0\""
-            + " runner=\"android.test.InstrumentationTestRunner\" jarPath=\"\">\n"
-            + "  <Description>something extracted from java doc</Description>\n"
-            + "  <TestSuite name=\"com.google\">\n"
-            + "     <TestCase name=\"TestCaseName\" priority=\"mandatory\">\n"
-            + "         <Description>" + "something extracted from java doc"
-            + "         </Description>\n"
-            + "         <!-- Test Methods -->\n"
-            + "         <Test method=\"testName1\" type=\"automatic\"/>\n"
-            + "     </TestCase>\n"
-            + "  </TestSuite>\n" + "</TestPackage>\n";
-
-        createTestPackage(descriptionConfigStr, packageName);
-        String apkFile = ROOT + File.separator + packageName + HostConfig.FILE_SUFFIX_APK;
-        String xmlFile = ROOT + File.separator + packageName + HostConfig.FILE_SUFFIX_XML;
-        String zipFile = ROOT + File.separator + packageName + ".zip";
-        ZipOutputStream out = new ZipOutputStream(new FileOutputStream(zipFile));
-        addEntry(out, apkFile);
-        addEntry(out, xmlFile);
-        out.close();
-
-        deleteTestPackage(packageName);
-    }
-
-    /**
-     * Add entry into the zip ouput stream.
-     *
-     * @param out The zip output stream.
-     * @param filePath The entry to be added into the zip output stream.
-     */
-    private void addEntry(ZipOutputStream out, String filePath) throws IOException {
-        byte[] buf = new byte[1024];
-        FileInputStream in = new FileInputStream(filePath);
-        out.putNextEntry(new ZipEntry(filePath));
-        int len;
-        while ((len = in.read(buf)) > 0) {
-            out.write(buf, 0, len);
-        }
-        out.closeEntry();
-        in.close();
-    }
-
-    /**
-     * Create test package with the package name and the xml message as the content.
-     *
-     * @param xmlMsg The message as the content of the package.
-     * @param packageName The package name.
-     */
-    @Override
-    protected void createTestPackage(String xmlMsg, String packageName) throws IOException {
-        String caseRoot = ROOT;
-
-        String apkPath = caseRoot + File.separator + packageName + APK_SUFFIX;
-        String xmlPath = caseRoot + File.separator + packageName + DESCRITION_SUFFIX;
-
-        createFile(null, apkPath);
-        createFile(xmlMsg, xmlPath);
-    }
-    /**
-     * Create partial test package.
-     *
-     * @param zipFilePath The file name with path.
-     * @param suffix The file suffix.
-     */
-    private void createPartialTestPackageZip(String zipFilePath, String suffix)
-                 throws IOException {
-        ZipOutputStream out = new ZipOutputStream(new FileOutputStream(
-                zipFilePath));
-
-        String packageName = zipFilePath.substring(zipFilePath
-                .lastIndexOf(File.separator), zipFilePath.lastIndexOf("."));
-        String file = packageName + suffix;
-
-        addFileToZip(file, out);
-
-        out.close();
-    }
-
-    /**
-     * Add file to zip output stream.
-     *
-     * @param filename The file to be added to the zip output stream.
-     * @param out The zip output stream.
-     */
-    private void addFileToZip(String filename, ZipOutputStream out)
-            throws IOException {
-        out.putNextEntry(new ZipEntry(filename));
-
-        out.closeEntry();
-    }
-
-    /**
-     * Test listing package contents with different levels of expectation.
-     */
-    public void testListPackage() throws IOException, NoSuchAlgorithmException {
-
-        List<ArrayList<String>> list = null;
-        ArrayList<String> packageList = null;
-        ArrayList<String> suiteList = null;
-        ArrayList<String> caseList = null;
-        ArrayList<String> testList = null;
-
-        final String packageName = "com.google";
-        final String suiteName   = "com.google.cts";
-        final String caseName    = "CtsTest";
-        final String testName    = "testHello";
-
-        final String expect1 = "com";
-        final String expect2 = "com.google";
-        final String expect3 = "com.google.cts";
-        final String expect4 = "com.google.cts.CtsTest";
-        final String expect5 = "com.google.cts.CtsTest#testHello";
-        final String expect6 = "com.google.cts.CtsTest#test";
-        final CaseRepository caseRepository = HostConfig.getInstance()
-                .getCaseRepository();
-
-        final String descriptionConfigStr = "<TestPackage name=\""
-                + packageName + "\" appPackageName=\"" + packageName
-                + "\""
-                + " version=\"1.0\" AndroidFramework=\"Android 1.0\""
-                + " runner=\"android.test.InstrumentationTestRunner\">\n"
-                + "  <Description>something extracted from java doc</Description>\n"
-                + "      <TestSuite name=\"" + suiteName + "\">\n"
-                + "         <TestCase name=\"" + caseName + "\" priority=\"mandatory\">\n"
-                + "             <Description>" + "something extracted from java doc"
-                + "             </Description>\n"
-                + "             <!-- Test Cases -->\n"
-                + "             <Test name=\"" + testName + "\"" + " type=\"automatic\"" + ">\n"
-                + "                 <Description>Simple deadloop test</Description>"
-                + "             </Test>"
-                + "        </TestCase>"
-                + "     </TestSuite>\n"
-                + "</TestPackage>\n";
-
-        final String caseDescPath = caseRepository.getXmlPath(packageName);
-        final String caseAPK = caseRepository.getApkPath(packageName);
-
-        try {
-            createFile(descriptionConfigStr, caseDescPath);
-            createFile("", caseAPK);
-
-            HostConfig.getInstance().loadTestPackages();
-
-            list = caseRepository.listAvailablePackage(expect1);
-            packageList = list.get(0);
-            suiteList = list.get(1);
-            caseList = list.get(2);
-            testList = list.get(3);
-            assertEquals(1, packageList.size());
-            assertEquals(expect2, packageList.get(0));
-            assertEquals(0, suiteList.size());
-            assertEquals(0, caseList.size());
-            assertEquals(0, testList.size());
-
-            list = caseRepository.listAvailablePackage(expect2);
-            packageList = list.get(0);
-            suiteList = list.get(1);
-            caseList = list.get(2);
-            testList = list.get(3);
-            assertEquals(0, packageList.size());
-            assertEquals(1, suiteList.size());
-            assertEquals(expect3, suiteList.get(0));
-            assertEquals(0, caseList.size());
-            assertEquals(0, testList.size());
-
-            list = caseRepository.listAvailablePackage(expect3);
-            packageList = list.get(0);
-            suiteList = list.get(1);
-            caseList = list.get(2);
-            testList = list.get(3);
-            assertEquals(0, packageList.size());
-            assertEquals(0, suiteList.size());
-            assertEquals(1, caseList.size());
-            assertEquals(expect4, caseList.get(0));
-            assertEquals(0, testList.size());
-
-            list = caseRepository.listAvailablePackage(expect4);
-            packageList = list.get(0);
-            suiteList = list.get(1);
-            caseList = list.get(2);
-            testList = list.get(3);
-            assertEquals(0, packageList.size());
-            assertEquals(0, suiteList.size());
-            assertEquals(0, caseList.size());
-            assertEquals(1, testList.size());
-            assertEquals(expect5, testList.get(0));
-
-            list = caseRepository.listAvailablePackage(expect6);
-            packageList = list.get(0);
-            suiteList = list.get(1);
-            caseList = list.get(2);
-            testList = list.get(3);
-            assertEquals(0, packageList.size());
-            assertEquals(0, suiteList.size());
-            assertEquals(0, caseList.size());
-            assertEquals(1, testList.size());
-            assertEquals(expect5, testList.get(0));
-        } finally {
-            deleteFile(caseDescPath);
-            deleteFile(caseAPK);
-        }
-    }
-
-    /**
-     * Test starting console UI.
-     */
-    public void testStartUi() throws Exception {
-        String cmdLine = CONFIG_PATH;
-        ConsoleUi cui = new ConsoleUi(TestHost.getInstance());
-        CommandParser cp = TestHost.init(cui, cmdLine.split(" "));
-        assertEquals(null, cp);
-        assertEquals(TestHost.MODE.CONSOLE, TestHost.sMode);
-
-        cmdLine = ROOT;
-        cp = TestHost.init(cui, cmdLine.split(" "));
-        assertEquals(null, cp);
-        assertEquals(TestHost.MODE.CONSOLE, TestHost.sMode);
-    }
-
-    /**
-     * Test starting test plan directly when activating CTS from console.
-     */
-    public void testStartPlanDirectly() throws Exception {
-        String cmdLine = "start --plan demo --config " + CONFIG_PATH;
-        ConsoleUi cui = new ConsoleUi(TestHost.getInstance());
-        CommandParser cp = TestHost.init(cui, cmdLine.split(" "));
-        assertEquals(CTSCommand.START, cp.getAction());
-        assertTrue(cp.containsKey(CTSCommand.OPTION_CFG));
-        assertTrue(cp.getValue(CTSCommand.OPTION_CFG) != null);
-        assertTrue(cp.containsKey(CTSCommand.OPTION_PLAN));
-        assertTrue(cp.getValue(CTSCommand.OPTION_PLAN) != null);
-        cp.removeKey(CTSCommand.OPTION_CFG);
-        assertFalse(cp.containsKey(CTSCommand.OPTION_CFG));
-        assertEquals(null, cp.getValue(CTSCommand.OPTION_CFG));
-
-        cmdLine = "start --plan demo --config " + ROOT;
-        cp = TestHost.init(cui, cmdLine.split(" "));
-        assertTrue(cp.containsKey(CTSCommand.OPTION_CFG));
-        assertTrue(cp.getValue(CTSCommand.OPTION_CFG) != null);
-        assertTrue(cp.containsKey(CTSCommand.OPTION_PLAN));
-        assertTrue(cp.getValue(CTSCommand.OPTION_PLAN) != null);
-        cp.removeKey(CTSCommand.OPTION_CFG);
-        assertFalse(cp.containsKey(CTSCommand.OPTION_CFG));
-        assertEquals(null, cp.getValue(CTSCommand.OPTION_CFG));
-    }
-
-    /**
-     * Test starting package directly when activating CTS from console.
-     */
-    public void testStartPackageDirectly() throws Exception {
-        String cmdLine = "start -p demo.zip --config " + CONFIG_PATH;
-        ConsoleUi cui = new ConsoleUi(TestHost.getInstance());
-        CommandParser cp = TestHost.init(cui, cmdLine.split(" "));
-        assertEquals(CTSCommand.START, cp.getAction());
-        assertTrue(cp.containsKey(CTSCommand.OPTION_CFG));
-        assertTrue(cp.getValue(CTSCommand.OPTION_CFG) != null);
-        assertTrue(cp.containsKey(
-                CTSCommand.OPTION_PACKAGE) || cp.containsKey(CTSCommand.OPTION_P));
-        assertEquals("demo.zip", cp.getValue(CTSCommand.OPTION_PACKAGE));
-        cp.removeKey(CTSCommand.OPTION_CFG);
-        assertFalse(cp.containsKey(CTSCommand.OPTION_CFG));
-        assertEquals(null, cp.getValue(CTSCommand.OPTION_CFG));
-
-        cmdLine = "start --package demo.zip --config " + ROOT;
-        cp = TestHost.init(cui, cmdLine.split(" "));
-        assertTrue(cp.containsKey(CTSCommand.OPTION_CFG));
-        assertTrue(cp.getValue(CTSCommand.OPTION_CFG) != null);
-        assertTrue(cp.containsKey(
-                CTSCommand.OPTION_PACKAGE) || cp.containsKey(CTSCommand.OPTION_P));
-        assertEquals("demo.zip", cp.getValue(CTSCommand.OPTION_PACKAGE));
-        cp.removeKey(CTSCommand.OPTION_CFG);
-        assertFalse(cp.containsKey(CTSCommand.OPTION_CFG));
-        assertEquals(null, cp.getValue(CTSCommand.OPTION_CFG));
-    }
-
-    /**
-     * Test getting device ID from the device ID string list.
-     */
-    public void testGetDeviceId() {
-        ConsoleUi cui = new ConsoleUi(TestHost.getInstance());
-        ArrayList<TestDevice> devList = new ArrayList<TestDevice>();
-        devList.add(new TestDevice("dev-100"));
-        devList.add(new TestDevice("dev-101"));
-        TestDevice[] devices = devList.toArray(new TestDevice[4]);
-
-        int deviceId = cui.getDeviceId(devices, "dev-100");
-        assertEquals(0, deviceId);
-
-        deviceId = cui.getDeviceId(devices, "dev-101");
-        assertEquals(1, deviceId);
-    }
-}
diff --git a/tools/host/test/com/android/cts/CtsTestBase.java b/tools/host/test/com/android/cts/CtsTestBase.java
deleted file mode 100644
index 1df40a7..0000000
--- a/tools/host/test/com/android/cts/CtsTestBase.java
+++ /dev/null
@@ -1,182 +0,0 @@
-/*
- * Copyright (C) 2008 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 com.android.cts;
-
-import java.io.BufferedWriter;
-import java.io.File;
-import java.io.FileWriter;
-import java.io.IOException;
-
-import junit.framework.TestCase;
-
-/**
- * Set up the test environment and offer the utility APIs.
- */
-public abstract class CtsTestBase extends TestCase {
-    public static final String APK_SUFFIX = ".apk";
-    public static final String DESCRITION_SUFFIX = ".xml";
-
-    protected static final String ROOT = "tmp";
-    protected static final String CONFIG_PATH = ROOT + File.separator + "host_config.xml";
-
-    private static final String CASE_REPOSITORY = "case_rep_demo";
-    private static final String RESULT_REPOSITORY = "result_rep_demo";
-    private static final String PLAN_REPOSITORY = "plan_rep_demo";
-
-    /** {@inheritDoc} */
-    @Override
-    public void setUp() {
-        // create root direcoty for the test
-        new File(ROOT).mkdirs();
-
-        initConfig();
-        Log.initLog(ROOT);
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    public void tearDown() {
-        Log.closeLog();
-        clearDirectory(ROOT);
-    }
-
-    /**
-     * Initialize the configuration for tests.
-     */
-    private void initConfig() {
-        StringBuilder buf = new StringBuilder();
-
-        buf.append("<HostConfiguration>");
-        buf.append("\t<Repository root=\"" + ROOT + "\" >");
-        buf.append("\t\t<TestPlan path=\"" + PLAN_REPOSITORY + "\" />");
-        buf.append("\t\t<TestCase path=\"" + CASE_REPOSITORY + "\" />");
-        buf.append("\t\t<TestResult path=\"" + RESULT_REPOSITORY + "\" />");
-        buf.append("\t</Repository>");
-        buf.append("</HostConfiguration>");
-        try {
-            new File(ROOT + File.separator + PLAN_REPOSITORY).mkdirs();
-            new File(ROOT + File.separator + CASE_REPOSITORY).mkdirs();
-            new File(ROOT + File.separator + RESULT_REPOSITORY).mkdirs();
-            createFile(buf.toString(), CONFIG_PATH);
-
-        } catch (IOException e1) {
-            fail("Can't create config file");
-        }
-
-        try {
-            TestHost.loadConfig(CONFIG_PATH);
-        } catch (Exception e) {
-            e.printStackTrace();
-            fail("Can't initiate config");
-        }
-    }
-
-    /**
-     * Create test package with the package name and the xml message as the content.
-     * 
-     * @param xmlMsg The message as the content of the package.
-     * @param packageName The package name.
-     */
-    protected void createTestPackage(String xmlMsg, String packageName) throws IOException {
-        String caseRoot = HostConfig.getInstance().getCaseRepository()
-                .getRoot();
-
-        String apkPath = caseRoot + File.separator + packageName + APK_SUFFIX;
-        String xmlPath = caseRoot + File.separator + packageName
-                + DESCRITION_SUFFIX;
-
-        createFile(null, apkPath);
-        createFile(xmlMsg, xmlPath);
-    }
-
-    /**
-     * Delete the test package.
-     */
-    protected void deleteTestPackage(String path) {
-        String apkPath = path + File.separator + APK_SUFFIX;
-        String desPath = path + File.separator + DESCRITION_SUFFIX;
-
-        deleteFile(apkPath);
-        deleteFile(desPath);
-    }
-
-    /**
-     * Create the specified file with the specified content.
-     * 
-     * @param content The content written into the file.
-     * @param filePath The file to be created.
-     */
-    protected void createFile(String content, String filePath)
-            throws IOException {
-        BufferedWriter out = new BufferedWriter(new FileWriter(filePath));
-        if (content != null) {
-            out.write(content);
-        }
-
-        out.close();
-    }
-
-    /**
-     * Delete the specified file.
-     * 
-     * @param path The file to be deleted.
-     */
-    protected void deleteFile(String path) {
-        File f = new File(path);
-
-        if (f.exists() && f.canWrite()) {
-            f.delete();
-        }
-    }
-
-    /**
-     * Clear the directory by deleting the files and directories under it.
-     * 
-     * @param path The directory to be cleared.
-     */
-    private void clearDirectory(String path) {
-        File root = new File(path);
-        for (File f : root.listFiles()) {
-            if (f.isFile()) {
-                f.delete();
-            } else {
-                deleteDirectory(f);
-            }
-        }
-
-        root.delete();
-    }
-
-    /**
-     * Deleted the directory, including the files and sub-directories under it.
-     * 
-     * @param path The directory to be deleted.
-     */
-    private void deleteDirectory(File path) {
-        if (path.exists()) {
-            File[] files = path.listFiles();
-            for (int i = 0; i < files.length; i++) {
-                if (files[i].isDirectory()) {
-                    deleteDirectory(files[i]);
-                } else {
-                    files[i].delete();
-                }
-            }
-
-            path.delete();
-        }
-    }
-}
diff --git a/tools/host/test/com/android/cts/DeviceManagerTests.java b/tools/host/test/com/android/cts/DeviceManagerTests.java
deleted file mode 100644
index 6fed9ec..0000000
--- a/tools/host/test/com/android/cts/DeviceManagerTests.java
+++ /dev/null
@@ -1,175 +0,0 @@
-/*
- * Copyright (C) 2008 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 com.android.cts;
-
-/**
- * Test the device manager.
- */
-public class DeviceManagerTests extends CtsTestBase {
-
-    private TestDevice d1, d2, d3;
-    private static String d1SerialNumber = "mock_device1";
-    private static String d2SerialNumber = "mock_device2";
-    private static String d3SerialNumber = "mock_device3";
-
-    /** {@inheritDoc} */
-    @Override
-    public void setUp() {
-        d1 = new TestDevice(d1SerialNumber);
-        d2 = new TestDevice(d2SerialNumber);
-        d3 = new TestDevice(d3SerialNumber);
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    public void tearDown() {
-        d1 = d2 = d3 = null;
-    }
-
-    /**
-     * Test allocating devices.
-     */
-    public void testAllocateDevices() throws DeviceNotAvailableException {
-        DeviceManager dm = new DeviceManager();
-        TestDevice[] devices;
-
-        try {
-            devices = dm.allocateDevices(1);
-            fail();
-        } catch (DeviceNotAvailableException e) {
-            // pass
-        }
-        dm.mDevices.add(d1);
-        dm.mDevices.add(d2);
-        dm.mDevices.add(d3);
-
-        try {
-            devices = dm.allocateDevices(-1);
-            fail();
-        } catch (IllegalArgumentException e) {
-            // pass
-        }
-
-        devices = dm.allocateDevices(0);
-        assertEquals(0, devices.length);
-
-        try {
-            devices = dm.allocateDevices(4);
-            fail();
-        } catch (DeviceNotAvailableException e) {
-            // pass
-        }
-
-        devices = dm.allocateDevices(2);
-        assertEquals(2, devices.length);
-        assertEquals(d1SerialNumber, devices[0].getSerialNumber());
-        assertEquals(d2SerialNumber, devices[1].getSerialNumber());
-
-        d1.setStatus(TestDevice.STATUS_BUSY);
-        d3.setStatus(TestDevice.STATUS_OFFLINE);
-        try {
-            devices = dm.allocateDevices(2);
-            fail();
-        } catch (DeviceNotAvailableException e) {
-            // pass
-        }
-        devices = dm.allocateDevices(1);
-        assertEquals(1, devices.length);
-        assertEquals(d2SerialNumber, devices[0].getSerialNumber());
-    }
-
-    /**
-     * Test getting device list.
-     */
-    public void testGetDeviceList() {
-        DeviceManager dm = new DeviceManager();
-        TestDevice[] devices;
-
-        dm.mDevices.add(d1);
-        dm.mDevices.add(d2);
-        dm.mDevices.add(d3);
-        devices = dm.getDeviceList();
-        assertEquals(3, devices.length);
-        assertEquals(d1SerialNumber, devices[0].getSerialNumber());
-        assertEquals(d2SerialNumber, devices[1].getSerialNumber());
-        assertEquals(d3SerialNumber, devices[2].getSerialNumber());
-    }
-
-    /**
-     * Test getting the number of all available devices.
-     */
-    public void testGetNumOfAllAvailableDevices() {
-        DeviceManager dm = new DeviceManager();
-        assertEquals(0, dm.getCountOfFreeDevices());
-
-        d1.setStatus(TestDevice.STATUS_BUSY);
-        d2.setStatus(TestDevice.STATUS_OFFLINE);
-        dm.mDevices.add(d1);
-        dm.mDevices.add(d2);
-        dm.mDevices.add(d3);
-        assertEquals(1, dm.getCountOfFreeDevices());
-    }
-
-    /**
-     * Test the default status of test device.
-     */
-    public void testDeviceDefaultStatus() {
-        assertEquals(TestDevice.STATUS_IDLE, d1.getStatus());
-        assertEquals(TestDevice.STATUS_IDLE, d2.getStatus());
-        assertEquals(TestDevice.STATUS_IDLE, d3.getStatus());
-    }
-
-    /**
-     * Test allocating device by the specified ID.
-     */
-    public void testAllocateDeviceById() throws DeviceNotAvailableException {
-        DeviceManager dm = new DeviceManager();
-        TestDevice device;
-
-        d1.setStatus(TestDevice.STATUS_BUSY);
-        d2.setStatus(TestDevice.STATUS_OFFLINE);
-        dm.mDevices.add(d1);
-        dm.mDevices.add(d2);
-        dm.mDevices.add(d3);
-
-        try {
-            device = dm.allocateFreeDeviceById("fake device");
-            fail();
-        } catch (DeviceNotAvailableException e) {
-            // pass
-        }
-
-        device = dm.allocateFreeDeviceById(d3SerialNumber);
-        assertEquals(d3SerialNumber, device.getSerialNumber());
-    }
-
-    /**
-     * Test resetting test devices.
-     */
-    public void testResetTestDevices() {
-        DeviceManager dm = new DeviceManager();
-
-        d1.setStatus(TestDevice.STATUS_BUSY);
-        d2.setStatus(TestDevice.STATUS_OFFLINE);
-        dm.resetTestDevice(d1);
-        dm.resetTestDevice(d2);
-        dm.resetTestDevice(d3);
-        assertEquals(d1.getStatus(), TestDevice.STATUS_IDLE);
-        assertEquals(d2.getStatus(), TestDevice.STATUS_OFFLINE);
-        assertEquals(d3.getStatus(), TestDevice.STATUS_IDLE);
-    }
-}
diff --git a/tools/host/test/com/android/cts/TestPlanBuilderTests.java b/tools/host/test/com/android/cts/TestPlanBuilderTests.java
deleted file mode 100644
index 7f2f74e..0000000
--- a/tools/host/test/com/android/cts/TestPlanBuilderTests.java
+++ /dev/null
@@ -1,300 +0,0 @@
-/*
- * Copyright (C) 2008 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 com.android.cts;
-
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.security.NoSuchAlgorithmException;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-
-import javax.xml.parsers.ParserConfigurationException;
-import javax.xml.transform.TransformerException;
-import javax.xml.transform.TransformerFactoryConfigurationError;
-
-/**
- * Test the test plan builder.
- *
- */
-public class TestPlanBuilderTests extends CtsTestBase {
-    public static boolean DEBUG = false;
-
-    private String mTestPackageBinaryName = "CtsTestPackage";
-
-    /** {@inheritDoc} */
-    @Override
-    public void tearDown() {
-        HostConfig.getInstance().removeTestPacakges();
-        deleteTestPackage(mTestPackageBinaryName);
-
-        super.tearDown();
-    }
-
-    /**
-     * Test getting test suite name list contained within a test package.
-     */
-    public void testGetTestSuiteNames() throws IOException, NoSuchAlgorithmException {
-        final String appPackageName = "com.google.android.cts";
-        final String fullName = mTestPackageBinaryName + ".CtsTest";
-        final String caseName = "CtsTestHello";
-        final String testName = "testHello";
-
-        final String descriptionConfigStr = "<TestPackage name=\"" + mTestPackageBinaryName + "\""
-                + " appPackageName=\"" + appPackageName + "\""
-                + " version=\"1.0\" AndroidFramework=\"Android 1.0\""
-                + " runner=\"android.test.InstrumentationTestRunner\" >\n"
-                + "  <Description>something extracted from java doc</Description>\n"
-                + "  <TestSuite name=\"com.google\">\n"
-                + "     <TestCase name=\"CtsTestHello\" priority=\"mandatory\">\n"
-                + "         <Description>" + "something extracted from java doc"
-                + "         </Description>\n"
-                + "         <!-- Test Methods -->\n"
-                + "         <Test name=\"testHello\"" + " type=\"automatic\"" + "/>\n"
-                + "     </TestCase>\n"
-                + "     <TestSuite name=\"TestSuiteName\">\n"
-                + "         <TestCase name=\"TestCaseName\" priority=\"mandatory\">\n"
-                + "             <Description>" + "something extracted from java doc"
-                + "             </Description>\n"
-                + "             <!-- Test Methods -->\n"
-                + "             <Test name=\"testName1\"" + " type=\"automatic\"" + "/>\n"
-                + "         </TestCase>\n"
-                + "     </TestSuite>\n"
-                + "  </TestSuite>\n"
-                + "</TestPackage>\n";
-
-        HostConfig.getInstance().removeTestPacakges();
-        createTestPackage(descriptionConfigStr, mTestPackageBinaryName);
-
-        HostConfig.getInstance().loadTestPackages();
-        Collection<TestPackage> testPackages = HostConfig.getInstance().getTestPackages();
-        assertEquals(1, testPackages.size());
-        TestPackage testPackage = testPackages.iterator().next();
-
-        String suiteFullName = "com.google";
-        TestSuite suite = testPackage.getTestSuiteByName(suiteFullName);
-        assertEquals(suiteFullName, suite.getFullName());
-
-        String caseFullName = "com.google.CtsTestHello";
-        TestCase cazz = testPackage.getTestCaseByName(caseFullName);
-        assertEquals(caseFullName, cazz.getFullName());
-
-        List<String> testNames = testPackage.getAllTestNames(caseFullName);
-        String testFullName = "com.google.CtsTestHello#testHello";
-        assertEquals(1, testNames.size());
-        assertEquals(testFullName, testNames.get(0));
-
-        suiteFullName = "com.google.TestSuiteName";
-        suite = testPackage.getTestSuiteByName(suiteFullName);
-        assertEquals(suiteFullName, suite.getFullName());
-
-        caseFullName = "com.google.TestSuiteName.TestCaseName";
-        cazz = testPackage.getTestCaseByName(caseFullName);
-        assertEquals(caseFullName, cazz.getFullName());
-
-        testNames = testPackage.getAllTestNames(caseFullName);
-        testFullName = "com.google.TestSuiteName.TestCaseName#testName1";
-        assertEquals(1, testNames.size());
-        assertEquals(testFullName, testNames.get(0));
-    }
-
-    /**
-     * Test building test plan.
-     */
-    public void testPlanBuilder() throws IOException,
-            ParserConfigurationException,
-            TransformerFactoryConfigurationError, TransformerException, NoSuchAlgorithmException {
-
-        if (DEBUG) {
-            final String appPackageName = "com.google";
-            final String suiteName1 = "com.google.SuiteName1";
-            final String caseName1 = "CtsTestHello";
-            final String testName1 = "testHello";
-
-            final String cName2 = "CtsTestHello2";
-            final String testName2 = "testHello2";
-            final String testName3 = "testHello3";
-            final String testName4 = "testHello4";
-            final String testName5 = "testHello5";
-            final String nestedSuiteName1 = "com.google";
-            final String nestedSuiteName2 = "CtsTest.SuiteName2";
-
-            final String descriptionConfigStr =
-                    "<TestPackage name=\"" + mTestPackageBinaryName + "\""
-                    + " appPackageName=\"" + appPackageName + "\""
-                    + " version=\"1.0\" AndroidFramework=\"Android 1.0\""
-                    + " runner=\"android.test.InstrumentationTestRunner\" >\n"
-                    + " <Description>something extracted from java doc</Description>\n"
-                    + " <TestSuite name=\"" + suiteName1 + "\"" + ">\n"
-                    + "     <TestCase name=\"" + caseName1 + "\"" + " category=\"mandatory\">\n"
-                    + "         <Description>" + "something extracted from java doc"
-                    + "         </Description>\n"
-                    + "         <!-- Test Methods -->\n"
-                    + "         <Test name=\"" + testName1 + "\" type=\"automatic\"" + "/>\n"
-                    + "     </TestCase>\n"
-                    + " </TestSuite>\n"
-                    + " <TestSuite name=\"" + nestedSuiteName1+ "\"" + ">\n"
-                    + "     <TestSuite name=\"" + nestedSuiteName2+ "\"" + ">\n"
-                    + "         <TestCase name=\"" + cName2 + "\"" + " priority=\"mandatory\">\n"
-                    + "             <Test name=\"" + testName2 +"\" type=\"automatic\" />\n"
-                    + "             <Test name=\"" + testName3 +"\" type=\"automatic\" />\n"
-                    + "             <Test name=\"" + testName4 +"\" type=\"automatic\" />\n"
-                    + "             <Test name=\"" + testName5 +"\" type=\"automatic\" />\n"
-                    + "         </TestCase>\n"
-                    + "     </TestSuite>\n"
-                    + " </TestSuite>\n"
-                    + "</TestPackage>\n";
-
-            createTestPackage(descriptionConfigStr, mTestPackageBinaryName);
-            HostConfig.getInstance().loadTestPackages();
-            ArrayList<String> packageNames = new ArrayList<String>();
-            packageNames.add(appPackageName);
-            PlanBuilder planBuilder = new PlanBuilder(packageNames);
-            BufferedReader in = new BufferedReader(new InputStreamReader(System.in));
-            planBuilder.setInputStream(in);
-            HashMap<String, ArrayList<String>> results = planBuilder.doSelect();
-            String planName = "plan_test";
-            if (results != null) {
-                Log.i("result=" + results.toString());
-                ArrayList<String> excludedList = results.get(appPackageName);
-                if (excludedList != null) {
-                    for(String str : excludedList) {
-                        Log.i(str);
-                    }
-                } else {
-                    Log.i("Nothing is excluded at all!");
-                }
-
-                String planPath =
-                              HostConfig.getInstance().getPlanRepository().getPlanPath(planName);
-                TestSessionBuilder.getInstance().serialize(planName, packageNames, results);
-                Log.i("planPath=" + planPath);
-            } else {
-                Log.i("Selected nothing for the plan of "
-                        + planName + ". The plan is not created!");
-            }
-        }
-    }
-
-    /**
-     * Test get excluded list.
-     */
-    public void testGetExcludedList() throws IOException,
-            TransformerFactoryConfigurationError, NoSuchAlgorithmException {
-
-        final String appPackageName = "com.google";
-        final String suiteName1 = "com.google.SuiteName1";
-        final String caseName1 = "CtsTestHello";
-        final String testName1 = "testHello";
-
-        final String cName2 = "CtsTestHello2";
-        final String testName2 = "testHello2";
-        final String testName3 = "testHello3";
-        final String testName4 = "testHello4";
-        final String testName5 = "testHello5";
-        final String nestedSuiteName1 = "com.google";
-        final String nestedSuiteName2 = "CtsTest.SuiteName2";
-
-        final String descriptionConfigStr =
-                    "<TestPackage name=\"" + mTestPackageBinaryName + "\""
-                    + " appPackageName=\"" + appPackageName + "\""
-                    + " version=\"1.0\" AndroidFramework=\"Android 1.0\""
-                    + " runner=\"android.test.InstrumentationTestRunner\" >\n"
-                    + " <Description>something extracted from java doc</Description>\n"
-                    + " <TestSuite name=\"" + suiteName1 + "\"" + ">\n"
-                    + "     <TestCase name=\"" + caseName1 + "\"" + " category=\"mandatory\">\n"
-                    + "         <Description>" + "something extracted from java doc"
-                    + "         </Description>\n"
-                    + "         <!-- Test Methods -->\n"
-                    + "         <Test name=\"" + testName1 + "\" type=\"automatic\"" + "/>\n"
-                    + "     </TestCase>\n"
-                    + " </TestSuite>\n"
-                    + " <TestSuite name=\"" + nestedSuiteName1+ "\"" + ">\n"
-                    + "     <TestSuite name=\"" + nestedSuiteName2+ "\"" + ">\n"
-                    + "         <TestCase name=\"" + cName2 + "\"" + " priority=\"mandatory\">\n"
-                    + "             <Test name=\"" + testName2 +"\" type=\"automatic\" />\n"
-                    + "             <Test name=\"" + testName3 +"\" type=\"automatic\" />\n"
-                    + "         </TestCase>\n"
-                    + "     </TestSuite>\n"
-                    + "     <TestCase name=\"" + caseName1 + "\"" + " category=\"mandatory\">\n"
-                    + "         <Description>" + "something extracted from java doc"
-                    + "         </Description>\n"
-                    + "         <!-- Test Methods -->\n"
-                    + "         <Test name=\"" + testName1 + "\" type=\"automatic\"" + "/>\n"
-                    + "     </TestCase>\n"
-                    + " </TestSuite>\n"
-                    + "</TestPackage>\n";
-
-        createTestPackage(descriptionConfigStr, mTestPackageBinaryName);
-        HostConfig hf = HostConfig.getInstance();
-        hf.loadTestPackages();
-        TestPackage pkg = hf.getTestPackage(appPackageName);
-        assertNotNull(pkg);
-        String caseOneName = suiteName1 + "." + caseName1;
-        String caseTwoName = nestedSuiteName1 + "." + nestedSuiteName2 + "." + cName2;
-        Collection<Test> tests = pkg.getTests();
-        assertEquals(4, tests.size());
-        Iterator<Test> iterator = tests.iterator();
-        Test test1 = iterator.next();
-        Test test2 = iterator.next();
-        Test test3 = iterator.next();
-        Test test4 = iterator.next();
-        ArrayList<String> excludedList = null;
-
-        //scenario 1: all tests are not executed and get excluded list with notExecuted
-        excludedList = pkg.getExcludedList(CtsTestResult.STR_NOT_EXECUTED);
-        assertNotNull(excludedList);
-        assertEquals(0, excludedList.size());
-
-        //scenario 2: all tests are not executed and get excluded list with timeout
-        excludedList = pkg.getExcludedList(CtsTestResult.STR_TIMEOUT);
-        assertNull(excludedList);
-
-        //scenario 3: all tests are not executed and get excluded list with nothing
-        excludedList = pkg.getExcludedList(null);
-        assertNotNull(excludedList);
-        assertEquals(0, excludedList.size());
-
-        //scenario 4: not all all tests are executed and get excluded list with notExecuted
-        test2.setResult(new CtsTestResult(CtsTestResult.CODE_PASS, null, null));
-        excludedList = pkg.getExcludedList(CtsTestResult.STR_NOT_EXECUTED);
-        assertNotNull(excludedList);
-        assertEquals(1, excludedList.size());
-        assertEquals(test2.getFullName(), excludedList.get(0));
-        test2.setResult(new CtsTestResult(CtsTestResult.CODE_NOT_EXECUTED, null, null));
-
-        //scenario 5: excluded a whole suite
-        test1.setResult(new CtsTestResult(CtsTestResult.CODE_PASS, null, null));
-        excludedList = pkg.getExcludedList(CtsTestResult.STR_NOT_EXECUTED);
-        assertNotNull(excludedList);
-        assertEquals(1, excludedList.size());
-        assertEquals(suiteName1, excludedList.get(0));
-        test1.setResult(new CtsTestResult(CtsTestResult.CODE_NOT_EXECUTED, null, null));
-
-        //scenario 6: excluded the test case directly under the embedded test suite
-        String caseName = nestedSuiteName1 + "." + caseName1;
-        test4.setResult(new CtsTestResult(CtsTestResult.CODE_PASS, null, null));
-        excludedList = pkg.getExcludedList(CtsTestResult.STR_NOT_EXECUTED);
-        assertNotNull(excludedList);
-        assertEquals(1, excludedList.size());
-        assertEquals(caseName, excludedList.get(0));
-        test4.setResult(new CtsTestResult(CtsTestResult.CODE_NOT_EXECUTED, null, null));
-    }
-}
diff --git a/tools/host/test/com/android/cts/TestSessionBuilderTests.java b/tools/host/test/com/android/cts/TestSessionBuilderTests.java
deleted file mode 100644
index d0f5230..0000000
--- a/tools/host/test/com/android/cts/TestSessionBuilderTests.java
+++ /dev/null
@@ -1,1445 +0,0 @@
-/*
- * Copyright (C) 2008 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 com.android.cts;
-
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.FileReader;
-import java.io.IOException;
-import java.security.NoSuchAlgorithmException;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.Iterator;
-
-import javax.xml.parsers.ParserConfigurationException;
-import javax.xml.transform.TransformerException;
-import javax.xml.transform.TransformerFactoryConfigurationError;
-
-import org.w3c.dom.Document;
-import org.w3c.dom.Node;
-import org.xml.sax.SAXException;
-
-import android.annotation.cts.Profile;
-
-import com.android.cts.TestDevice.DeviceParameterCollector;
-
-/**
- * Test the session builder.
- */
-public class TestSessionBuilderTests extends CtsTestBase {
-    private static final String mTmpPlanFileName = "plan";
-
-    private static final String ATTRIBUTE_DEVICE_ID = "deviceID";
-    private static final String ATTRIBUTE_BUILD_ID = "buildID";
-    private static final String ATTRIBUTE_BUILD_VERSION = "buildVersion";
-    private static final String ATTRIBUTE_BUILD_NAME = "buildName";
-
-    private String mTestPackageBinaryName = "CtsTestPackage";
-
-    /** {@inheritDoc} */
-    @Override
-    public void tearDown() {
-        HostConfig.getInstance().removeTestPacakges();
-        deleteTestPackage(mTestPackageBinaryName);
-
-        super.tearDown();
-    }
-
-    /**
-     * Test building simple test session.
-     */
-    public void testBuildSimpleSession() throws IOException,
-            ParserConfigurationException, SAXException, TestPlanNotFoundException,
-            TestNotFoundException, NoSuchAlgorithmException {
-        final String appPackageName = "com.google.android.cts" + ".CtsTest";
-        final String suiteName = appPackageName;
-        final String caseName = "CtsTestHello";
-        final String runner = "android.test.InstrumentationTestRunner";
-
-        final String serialNum = "serialNum";
-        final String buildID = "buildid";
-        final String buildName = "buildname";
-        final String buildVersion = "buildVersion";
-        final String testPlanConfigStr = "<TestPlan version=\"1.0\">\n"
-                + "\t<Description>Demo test plan</Description>\n"
-                + "\t\t<PlanSettings>\n"
-                + "\t\t\t<RequiredDevice amount=\"" + 1 + "\"" + "/>\n"
-                + "\t\t</PlanSettings>\n"
-                + "\t<Entry uri=\""
-                + appPackageName
-                + "\"/>\n"
-                + "</TestPlan>";
-
-        final String descriptionConfigStr = "<TestPackage name=\""
-                + mTestPackageBinaryName+ "\" "
-                + "appPackageName=\"" + appPackageName
-                + "\" version=\"1.0\" AndroidFramework=\"Android 1.0\""
-                + " runner=\"" + runner + "\">\n"
-                + " <Description>something extracted from java doc</Description>\n"
-                + " <TestSuite name=\"" + suiteName + "\"" + ">\n"
-                + "     <TestCase name=\"" + caseName + "\"" + " priority=\"mandatory\">\n"
-                + "         <Description>" + "something extracted from java doc"
-                + "         </Description>\n"
-                + "         <!-- Test Methods -->\n"
-                + "         <Test name=\"testHello\"" + " type=\"automatic\"" + "/>\n"
-                + "     </TestCase>\n"
-                + " </TestSuite>\n"
-                + "</TestPackage>\n";
-
-        HostConfig.getInstance().removeTestPacakges();
-        String planPath =
-            HostConfig.getInstance().getPlanRepository().getPlanPath(mTmpPlanFileName);
-        createFile(testPlanConfigStr, planPath);
-
-        createTestPackage(descriptionConfigStr, mTestPackageBinaryName);
-        HostConfig.getInstance().loadTestPackages();
-
-        TestSession ts = TestSessionBuilder.getInstance().build(planPath, Profile.ALL);
-        assertEquals(1, ts.getNumOfRequiredDevices());
-
-        TestSessionLog tsl = ts.getSessionLog();
-        assertEquals(1, tsl.getTestPackages().size());
-
-        TestPackage testPackage = tsl.getTestPackages().iterator().next();
-        assertEquals(1, testPackage.getTestSuites().size());
-        assertEquals(mTestPackageBinaryName, testPackage.getAppBinaryName());
-        assertEquals(appPackageName, testPackage.getAppPackageName());
-        assertEquals("1.0", testPackage.getVersion());
-        assertEquals("Android 1.0", testPackage.getAndroidVersion());
-        assertEquals(runner, testPackage.getInstrumentationRunner());
-
-        TestSuite testSuite = testPackage.getTestSuites().iterator().next();
-        assertEquals(1, testSuite.getTestCases().size());
-        assertEquals(suiteName, testSuite.getFullName());
-
-        TestCase testCase = testSuite.getTestCases().iterator().next();
-        assertEquals(caseName, testCase.getName());
-        assertEquals("mandatory", testCase.getPriority());
-
-        Test test = testCase.getTests().iterator().next();
-        assertEquals("automatic", test.getType());
-        assertEquals(CtsTestResult.CODE_NOT_EXECUTED, test.getResult().getResultCode());
-        assertEquals(runner, test.getInstrumentationRunner());
-
-        // test build information
-        DeviceParameterCollector deviceParam = new DeviceParameterCollector();
-        deviceParam.setSerialNumber(serialNum);
-        deviceParam.setBuildId(buildID);
-        deviceParam.setBuildVersion(buildVersion);
-        deviceParam.setProductName(buildName);
-        tsl.setDeviceInfo(deviceParam);
-        Document doc = tsl.createResultDoc();
-
-        Node buildInfoNode = doc.getElementsByTagName("BuildInfo").item(0);
-        assertEquals(serialNum, buildInfoNode.getAttributes().getNamedItem(
-                ATTRIBUTE_DEVICE_ID).getNodeValue().trim());
-        assertEquals(buildID, buildInfoNode.getAttributes().getNamedItem(
-                ATTRIBUTE_BUILD_ID).getNodeValue().trim());
-        assertEquals(buildVersion, buildInfoNode.getAttributes().getNamedItem(
-                ATTRIBUTE_BUILD_VERSION).getNodeValue().trim());
-        assertEquals(buildName, buildInfoNode.getAttributes().getNamedItem(
-                ATTRIBUTE_BUILD_NAME).getNodeValue().trim());
-
-        deleteTestPackage(mTestPackageBinaryName);
-    }
-
-    /**
-     * Test getting and removing entries from plan file.
-     */
-    public void testGetAndRemoveEntriesFromPlanFile() throws UnknownCommandException,
-                    CommandNotFoundException, Exception {
-
-        final String appPackageName = "com.google.android.cts";
-        final String suiteName = appPackageName;
-        final String caseName = "CtsTestHello";
-        final String runner = "android.test.InstrumentationTestRunner";
-
-        final String testPlanConfigStr = "<TestPlan version=\"1.0\">\n"
-                + "\t<Description>Demo test plan</Description>\n"
-                + "\t\t<PlanSettings>\n"
-                + "\t\t\t<RequiredDevice amount=\"" + 1 + "\"" + "/>\n"
-                + "\t\t</PlanSettings>\n"
-                + "\t<Entry uri=\""
-                + appPackageName
-                + "\"/>\n"
-                + "</TestPlan>";
-
-        final String descriptionConfigStr = "<TestPackage name=\""
-                + mTestPackageBinaryName+ "\" "
-                + "appPackageName=\"" + appPackageName
-                + "\" version=\"1.0\" AndroidFramework=\"Android 1.0\""
-                + " runner=\"" + runner + "\">\n"
-                + " <Description>something extracted from java doc</Description>\n"
-                + " <TestSuite name=\"" + suiteName + "\"" + ">\n"
-                + "     <TestCase name=\"" + caseName + "\"" + " priority=\"mandatory\">\n"
-                + "         <Description>" + "something extracted from java doc"
-                + "         </Description>\n"
-                + "         <!-- Test Methods -->\n"
-                + "         <Test name=\"testHello\"" + " type=\"automatic\"" + "/>\n"
-                + "     </TestCase>\n"
-                + " </TestSuite>\n"
-                + "</TestPackage>\n";
-
-        HostConfig.getInstance().removeTestPacakges();
-        createTestPackage(descriptionConfigStr, mTestPackageBinaryName);
-        HostConfig.getInstance().loadTestPackages();
-
-        String planPath = HostConfig.getInstance().getPlanRepository()
-                .getPlanPath(mTmpPlanFileName);
-        createFile(testPlanConfigStr, planPath);
-
-        ArrayList<String> removedPkgList = new ArrayList<String>();
-        Collection<String> entries = TestPlan.getEntries(planPath, removedPkgList);
-        Iterator<String> it = entries.iterator();
-
-        assertEquals(1, entries.size());
-        assertEquals(appPackageName, it.next());
-        ConsoleUi cui = new ConsoleUi(TestHost.getInstance());
-        String cmdLine = CTSCommand.REMOVE + " " + "-p" + " "
-                + appPackageName;
-        cui.processCommand(CommandParser.parse(cmdLine));
-        entries = TestPlan.getEntries(planPath, removedPkgList);
-        assertEquals(1, removedPkgList.size());
-
-        deleteTestPackage(mTestPackageBinaryName);
-    }
-
-    /**
-     * Test validating package name.
-     */
-    public void testValidatePackageName() throws IOException {
-        final String packageName = "com.google.android.testname";
-        String testPackageXmlFilePath =
-            HostConfig.getInstance().getCaseRepository().getXmlPath(packageName);
-        String testpackageAPKFilePath =
-            HostConfig.getInstance().getCaseRepository().getApkPath(packageName);
-
-        HostConfig.getInstance().removeTestPacakges();
-        createTestPackage("", packageName);
-
-        assertEquals(true, TestPlan.isValidPackageName(packageName));
-
-        deleteFile(testPackageXmlFilePath);
-        assertEquals(false, TestPlan.isValidPackageName(packageName));
-
-        deleteFile(testpackageAPKFilePath);
-        assertEquals(false, TestPlan.isValidPackageName(packageName));
-    }
-
-    /**
-     * Test building test session with dependency.
-     */
-    public void testBuildSessionWithDependency() throws IOException,
-            ParserConfigurationException, SAXException, TestPlanNotFoundException,
-            TestNotFoundException, NoSuchAlgorithmException {
-
-        final String targetNameSpace = "i don't want to be the target!";
-        final String appPackageName = "com.google.android.cts";
-        final String suiteName = appPackageName + ".CtsTest";
-        final String caseName = "CtsTestHello";
-        final String runner = "android.test.InstrumentationTestRunner";
-
-        final String testPlanConfigStr = "<TestPlan version=\"1.0\">\n"
-                + "\t<Description>Demo test plan</Description>\n"
-                + "\t\t<PlanSettings>\n"
-                + "\t\t\t<RequiredDevice amount=\"" + 1 + "\"" + "/>\n"
-                + "\t\t</PlanSettings>\n"
-                + "\t<Entry uri=\""
-                + appPackageName
-                + "\"/>\n"
-                + "</TestPlan>";
-
-        final String descriptionConfigStr = "<TestPackage name=\""
-                + mTestPackageBinaryName + "\" "
-                + "appPackageName=\"" + appPackageName
-                + "\" targetNameSpace=\"" + targetNameSpace
-                + "\" version=\"1.0\" AndroidFramework=\"Android 1.0\""
-                + " runner=\"" +runner + "\">\n"
-                + " <Description>something extracted from java doc</Description>\n"
-                + " <TestSuite name=\"" + suiteName + "\"" + ">\n"
-                + "     <TestCase name=\"" + caseName + "\"" + " priority=\"mandatory\">\n"
-                + "         <Description>" + "something extracted from java doc"
-                + "         </Description>\n"
-                + "         <!-- Test Methods -->\n"
-                + "         <Test name=\"testHello\"" + " type=\"automatic\"" + "/>\n"
-                + "     </TestCase>\n"
-                + " </TestSuite>\n"
-                + "</TestPackage>\n";
-
-        HostConfig.getInstance().removeTestPacakges();
-
-        String planPath =
-            HostConfig.getInstance().getPlanRepository().getPlanPath(mTmpPlanFileName);
-        createFile(testPlanConfigStr, planPath);
-
-        createTestPackage(descriptionConfigStr, mTestPackageBinaryName);
-        HostConfig.getInstance().loadTestPackages();
-
-        TestSession ts = TestSessionBuilder.getInstance().build(planPath, Profile.ALL);
-        assertEquals(1, ts.getNumOfRequiredDevices());
-
-        TestSessionLog tsl = ts.getSessionLog();
-        assertEquals(1, tsl.getTestPackages().size());
-
-        TestPackage testPackage = tsl.getTestPackages().iterator().next();
-        assertEquals(1, testPackage.getTestSuites().size());
-        assertEquals(mTestPackageBinaryName, testPackage.getAppBinaryName());
-        assertEquals(targetNameSpace, testPackage.getTargetNameSpace());
-        assertEquals("1.0", testPackage.getVersion());
-        assertEquals("Android 1.0", testPackage.getAndroidVersion());
-        assertEquals(runner, testPackage.getInstrumentationRunner());
-
-        TestSuite testSuite = testPackage.getTestSuites().iterator().next();
-        assertEquals(1, testSuite.getTestCases().size());
-        assertEquals(suiteName, testSuite.getFullName());
-
-        TestCase testCase = testSuite.getTestCases().iterator().next();
-        assertEquals(caseName, testCase.getName());
-        assertEquals("mandatory", testCase.getPriority());
-
-        Test test = testCase.getTests().iterator().next();
-        assertEquals("automatic", test.getType());
-        assertEquals(CtsTestResult.CODE_NOT_EXECUTED, test.getResult().getResultCode());
-        assertEquals(runner, test.getInstrumentationRunner());
-
-        deleteTestPackage(mTestPackageBinaryName);
-    }
-
-    /**
-     * Test building test session from embedded suites.
-     */
-    public void testBuildSessionFromEmbeddedSuites() throws IOException,
-            ParserConfigurationException, SAXException, TestPlanNotFoundException,
-            TestNotFoundException, NoSuchAlgorithmException {
-
-        final String appPackageName = "com.google.android.cts";
-        final String caseName = "CtsTestHello";
-        final String testName = "testHello";
-
-        final String testPlanConfigStr = "<TestPlan version=\"1.0\">\n"
-                + "<Description>Demo test plan</Description>\n"
-                + "<PlanSettings>\n"
-                + "    <RequiredDevice amount=\"" + 1 + "\"" + "/>\n"
-                + "</PlanSettings>\n"
-                + "<Entry uri=\"" + appPackageName + "\"/>\n"
-                + "</TestPlan>";
-
-        final String descriptionConfigStr = "<TestPackage name=\"" + mTestPackageBinaryName + "\""
-                + " appPackageName=\"" + appPackageName + "\""
-                + " version=\"1.0\" AndroidFramework=\"Android 1.0\""
-                + " runner=\"android.test.InstrumentationTestRunner\" >\n"
-                + "  <Description>something extracted from java doc</Description>\n"
-                + "  <TestSuite name=\"com.google\">\n"
-                + "     <TestCase name=\"CtsTestHello\" priority=\"mandatory\">\n"
-                + "         <Description>" + "something extracted from java doc"
-                + "         </Description>\n"
-                + "         <!-- Test Methods -->\n"
-                + "         <Test name=\"testHello\"" + " type=\"automatic\"" + "/>\n"
-                + "     </TestCase>\n"
-                + "     <TestSuite name=\"TestSuiteName\">\n"
-                + "         <TestCase name=\"TestCaseName\" priority=\"mandatory\">\n"
-                + "             <Description>" + "something extracted from java doc"
-                + "             </Description>\n"
-                + "             <!-- Test Methods -->\n"
-                + "             <Test name=\"testName\"" + " type=\"automatic\"" + "/>\n"
-                + "         </TestCase>\n"
-                + "     </TestSuite>\n"
-                + "  </TestSuite>\n"
-                + "</TestPackage>\n";
-
-        HostConfig.getInstance().removeTestPacakges();
-
-        String planPath =
-            HostConfig.getInstance().getPlanRepository().getPlanPath(mTmpPlanFileName);
-        createFile(testPlanConfigStr, planPath);
-
-        createTestPackage(descriptionConfigStr, mTestPackageBinaryName);
-        HostConfig.getInstance().loadTestPackages();
-
-        TestSession ts = TestSessionBuilder.getInstance().build(planPath, Profile.ALL);
-        assertEquals(1, ts.getNumOfRequiredDevices());
-
-        TestSessionLog tsl = ts.getSessionLog();
-        assertEquals(1, tsl.getTestPackages().size());
-
-        TestPackage testPackage = tsl.getTestPackages().iterator().next();
-        assertEquals(1, testPackage.getTestSuites().size());
-        assertEquals(mTestPackageBinaryName, testPackage.getAppBinaryName());
-        assertEquals("1.0", testPackage.getVersion());
-        assertEquals("Android 1.0", testPackage.getAndroidVersion());
-
-        TestSuite testSuite;
-        testSuite = testPackage.getTestSuites().iterator().next();
-        assertEquals(1, testSuite.getSubSuites().size());
-        assertEquals(1, testSuite.getTestCases().size());
-        assertEquals("com.google", testSuite.getFullName());
-        assertEquals("com.google", testSuite.getName());
-
-        TestCase testCase = testSuite.getTestCases().iterator().next();
-        assertEquals(caseName, testCase.getName());
-        assertEquals("mandatory", testCase.getPriority());
-
-        Test test = testCase.getTests().iterator().next();
-        assertEquals("com.google.CtsTestHello#testHello", test.getFullName());
-        assertEquals("automatic", test.getType());
-        assertEquals(testName, test.getName());
-        assertEquals(CtsTestResult.CODE_NOT_EXECUTED, test.getResult().getResultCode());
-
-        testSuite = testSuite.getSubSuites().iterator().next();
-        assertEquals(0, testSuite.getSubSuites().size());
-        assertEquals(1, testSuite.getTestCases().size());
-        assertEquals("com.google.TestSuiteName", testSuite.getFullName());
-        assertEquals("TestSuiteName", testSuite.getName());
-
-        testCase = testSuite.getTestCases().iterator().next();
-        assertEquals("TestCaseName", testCase.getName());
-        assertEquals("mandatory", testCase.getPriority());
-
-        test = testCase.getTests().iterator().next();
-        assertEquals("com.google.TestSuiteName.TestCaseName#testName", test.getFullName());
-        assertEquals("automatic", test.getType());
-        assertEquals("testName", test.getName());
-        assertEquals(CtsTestResult.CODE_NOT_EXECUTED, test.getResult().getResultCode());
-
-        deleteTestPackage(mTestPackageBinaryName);
-    }
-
-    /**
-     * Test loading plan with excluded list from the xml file.
-     */
-    public void testExcludingFromXmlFile() throws IOException,
-                ParserConfigurationException,
-                SAXException,
-                TestPlanNotFoundException,
-                TestNotFoundException, NoSuchAlgorithmException {
-
-        final String appPackageName = "com.google.android.cts";
-        final String caseName = "CtsTestHello";
-        final String testName = "testHello";
-        final String excludedList = "com.google.TestSuiteName";
-
-        final String testPlanConfigStr = "<TestPlan version=\"1.0\">\n"
-                + "<Description>Demo test plan</Description>\n"
-                + "<PlanSettings>\n"
-                + "    <RequiredDevice amount=\"" + 1 + "\"" + "/>\n"
-                + "</PlanSettings>\n"
-                + "     <Entry uri=\"" + appPackageName
-                + "\" " + "exclude=\"" + excludedList + "\"/>\n"
-                + "</TestPlan>";
-
-        final String descriptionConfigStr = "<TestPackage name=\"" + mTestPackageBinaryName + "\""
-                + " appPackageName=\"" + appPackageName + "\""
-                + " version=\"1.0\" AndroidFramework=\"Android 1.0\""
-                + " runner=\"android.test.InstrumentationTestRunner\" >\n"
-                + "  <Description>something extracted from java doc</Description>\n"
-                + "  <TestSuite name=\"com.google\">\n"
-                + "     <TestCase name=\"CtsTestHello\" priority=\"mandatory\">\n"
-                + "         <Description>" + "something extracted from java doc"
-                + "         </Description>\n"
-                + "         <!-- Test Methods -->\n"
-                + "         <Test name=\"testHello\"" + " type=\"automatic\"" + "/>\n"
-                + "         <Test name=\"testHello2\"" + " type=\"automatic\"" + "/>\n"
-                + "     </TestCase>\n"
-                + "     <TestSuite name=\"TestSuiteName\">\n"
-                + "         <TestCase name=\"TestCaseName\" priority=\"mandatory\">\n"
-                + "             <Description>" + "something extracted from java doc"
-                + "             </Description>\n"
-                + "             <!-- Test Methods -->\n"
-                + "             <Test name=\"testName1\"" + " type=\"automatic\"" + "/>\n"
-                + "             <Test name=\"testName2\"" + " type=\"automatic\"" + "/>\n"
-                + "         </TestCase>\n"
-                + "     </TestSuite>\n"
-                + "  </TestSuite>\n"
-                + "</TestPackage>\n";
-
-        HostConfig.getInstance().removeTestPacakges();
-
-        String planPath =
-            HostConfig.getInstance().getPlanRepository().getPlanPath(mTmpPlanFileName);
-        createFile(testPlanConfigStr, planPath);
-
-        createTestPackage(descriptionConfigStr, mTestPackageBinaryName);
-        HostConfig.getInstance().loadTestPackages();
-
-        TestSession ts = TestSessionBuilder.getInstance().build(planPath, Profile.ALL);
-        assertEquals(1, ts.getNumOfRequiredDevices());
-
-        TestSessionLog tsl = ts.getSessionLog();
-        assertEquals(1, tsl.getTestPackages().size());
-
-        TestPackage testPackage = tsl.getTestPackages().iterator().next();
-        assertEquals(1, testPackage.getTestSuites().size());
-        assertEquals(mTestPackageBinaryName, testPackage.getAppBinaryName());
-        assertEquals("1.0", testPackage.getVersion());
-        assertEquals("Android 1.0", testPackage.getAndroidVersion());
-
-        TestSuite testSuite;
-        testSuite = testPackage.getTestSuites().iterator().next();
-        assertEquals(0, testSuite.getSubSuites().size());
-        assertEquals(1, testSuite.getTestCases().size());
-        assertEquals("com.google", testSuite.getFullName());
-
-        TestCase testCase = testSuite.getTestCases().iterator().next();
-        assertEquals(caseName, testCase.getName());
-        assertEquals("mandatory", testCase.getPriority());
-
-        Test test = testCase.getTests().iterator().next();
-        assertEquals("com.google.CtsTestHello#testHello", test.getFullName());
-        assertEquals("automatic", test.getType());
-        assertEquals(testName, test.getName());
-        assertEquals(CtsTestResult.CODE_NOT_EXECUTED, test.getResult().getResultCode());
-
-        deleteTestPackage(mTestPackageBinaryName);
-    }
-
-    /**
-     * Test building and loading plan with excluding list of embedded suite.
-     */
-    public void testExcludingEmbeddedSuite() throws IOException,
-            ParserConfigurationException, SAXException, TestPlanNotFoundException,
-            TestNotFoundException,
-            TransformerFactoryConfigurationError, TransformerException, NoSuchAlgorithmException {
-
-        final String appPackageName = "com.google.android.cts";
-        final String caseName = "CtsTestHello";
-        final String testName = "testHello";
-        final String excludedList = "com.google.TestSuiteName";
-
-        final String descriptionConfigStr = "<TestPackage name=\"" + mTestPackageBinaryName + "\""
-                + " appPackageName=\"" + appPackageName + "\""
-                + " version=\"1.0\" AndroidFramework=\"Android 1.0\""
-                + " runner=\"android.test.InstrumentationTestRunner\" >\n"
-                + "  <Description>something extracted from java doc</Description>\n"
-                + "  <TestSuite name=\"com.google\">\n"
-                + "     <TestCase name=\"CtsTestHello\" priority=\"mandatory\">\n"
-                + "         <Description>" + "something extracted from java doc"
-                + "         </Description>\n"
-                + "         <!-- Test Methods -->\n"
-                + "         <Test name=\"testHello\"" + " type=\"automatic\"" + "/>\n"
-                + "         <Test name=\"testHello2\"" + " type=\"automatic\"" + "/>\n"
-                + "     </TestCase>\n"
-                + "     <TestSuite name=\"TestSuiteName\">\n"
-                + "         <TestCase name=\"TestCaseName\" priority=\"mandatory\">\n"
-                + "             <Description>" + "something extracted from java doc"
-                + "             </Description>\n"
-                + "             <!-- Test Methods -->\n"
-                + "             <Test name=\"testName1\"" + " type=\"automatic\"" + "/>\n"
-                + "             <Test name=\"testName2\"" + " type=\"automatic\"" + "/>\n"
-                + "         </TestCase>\n"
-                + "     </TestSuite>\n"
-                + "  </TestSuite>\n"
-                + "</TestPackage>\n";
-
-        HostConfig.getInstance().removeTestPacakges();
-        createTestPackage(descriptionConfigStr, mTestPackageBinaryName);
-        HostConfig.getInstance().loadTestPackages();
-
-        ArrayList<String> packageNames = new ArrayList<String>();
-        packageNames.add(appPackageName);
-
-        HashMap<String, ArrayList<String>> results = new HashMap<String, ArrayList<String>>();
-        ArrayList<String> list = new ArrayList<String>();
-        list.add(excludedList);
-        results.put(appPackageName, list);
-        String planName = "plan_test_excluding";
-        String planPath = HostConfig.getInstance().getPlanRepository().getPlanPath(planName);
-        TestSessionBuilder.getInstance().serialize(planName, packageNames, results);
-
-        TestSession ts = TestSessionBuilder.getInstance().build(planPath, Profile.ALL);
-        assertEquals(1, ts.getNumOfRequiredDevices());
-
-        TestSessionLog tsl = ts.getSessionLog();
-        assertEquals(1, tsl.getTestPackages().size());
-
-        TestPackage testPackage = tsl.getTestPackages().iterator().next();
-        assertEquals(1, testPackage.getTestSuites().size());
-        assertEquals(mTestPackageBinaryName, testPackage.getAppBinaryName());
-        assertEquals("1.0", testPackage.getVersion());
-        assertEquals("Android 1.0", testPackage.getAndroidVersion());
-
-        TestSuite testSuite;
-        testSuite = testPackage.getTestSuites().iterator().next();
-        assertEquals(0, testSuite.getSubSuites().size());
-        assertEquals(1, testSuite.getTestCases().size());
-        assertEquals("com.google", testSuite.getFullName());
-
-        TestCase testCase = testSuite.getTestCases().iterator().next();
-        assertEquals(caseName, testCase.getName());
-        assertEquals("mandatory", testCase.getPriority());
-
-        Test test = testCase.getTests().iterator().next();
-        assertEquals("com.google.CtsTestHello#testHello", test.getFullName());
-        assertEquals("automatic", test.getType());
-        assertEquals(testName, test.getName());
-        assertEquals(CtsTestResult.CODE_NOT_EXECUTED, test.getResult().getResultCode());
-
-        deleteTestPackage(mTestPackageBinaryName);
-    }
-
-    /**
-     * Test building and loading plan with excluding list of the top suite.
-     */
-    public void testExcludingTopSuite() throws IOException,
-            ParserConfigurationException, SAXException, TestPlanNotFoundException,
-            TestNotFoundException,
-            TransformerFactoryConfigurationError, TransformerException, NoSuchAlgorithmException {
-
-        final String appPackageName = "com.google.android.cts";
-        final String excludedList = "com.google";
-
-        final String descriptionConfigStr = "<TestPackage name=\"" + mTestPackageBinaryName + "\""
-                + " appPackageName=\"" + appPackageName + "\""
-                + " version=\"1.0\" AndroidFramework=\"Android 1.0\""
-                + " runner=\"android.test.InstrumentationTestRunner\" >\n"
-                + "  <Description>something extracted from java doc</Description>\n"
-                + "  <TestSuite name=\"com.google\">\n"
-                + "     <TestCase name=\"CtsTestHello\" priority=\"mandatory\">\n"
-                + "         <Description>" + "something extracted from java doc"
-                + "         </Description>\n"
-                + "         <!-- Test Methods -->\n"
-                + "         <Test name=\"testHello\"" + " type=\"automatic\"" + "/>\n"
-                + "         <Test name=\"testHello2\"" + " type=\"automatic\"" + "/>\n"
-                + "     </TestCase>\n"
-                + "     <TestSuite name=\"TestSuiteName\">\n"
-                + "         <TestCase name=\"TestCaseName\" priority=\"mandatory\">\n"
-                + "             <Description>" + "something extracted from java doc"
-                + "             </Description>\n"
-                + "             <!-- Test Methods -->\n"
-                + "             <Test name=\"testName1\"" + " type=\"automatic\"" + "/>\n"
-                + "             <Test name=\"testName2\"" + " type=\"automatic\"" + "/>\n"
-                + "         </TestCase>\n"
-                + "     </TestSuite>\n"
-                + "  </TestSuite>\n"
-                + "</TestPackage>\n";
-
-        HostConfig.getInstance().removeTestPacakges();
-        createTestPackage(descriptionConfigStr, mTestPackageBinaryName);
-        HostConfig.getInstance().loadTestPackages();
-
-        ArrayList<String> packageNames = new ArrayList<String>();
-        packageNames.add(appPackageName);
-
-        HashMap<String, ArrayList<String>> results = new HashMap<String, ArrayList<String>>();
-        ArrayList<String> list = new ArrayList<String>();
-        list.add(excludedList);
-        results.put(appPackageName, list);
-        String planName = "plan_test_excluding";
-        String planPath = HostConfig.getInstance().getPlanRepository().getPlanPath(planName);
-        TestSessionBuilder.getInstance().serialize(planName, packageNames, results);
-
-        TestSession ts = TestSessionBuilder.getInstance().build(planPath, Profile.ALL);
-        assertEquals(1, ts.getNumOfRequiredDevices());
-
-        TestSessionLog tsl = ts.getSessionLog();
-        assertEquals(1, tsl.getTestPackages().size());
-
-        TestPackage testPackage = tsl.getTestPackages().iterator().next();
-        assertEquals(0, testPackage.getTestSuites().size());
-        assertEquals(mTestPackageBinaryName, testPackage.getAppBinaryName());
-        assertEquals("1.0", testPackage.getVersion());
-        assertEquals("Android 1.0", testPackage.getAndroidVersion());
-
-        deleteTestPackage(mTestPackageBinaryName);
-    }
-
-    /**
-     * Test building and loading plan with excluded list of test case.
-     */
-    public void testExcludingTestCase() throws IOException,
-            ParserConfigurationException, SAXException, TestPlanNotFoundException,
-            TestNotFoundException,
-            TransformerFactoryConfigurationError, TransformerException, NoSuchAlgorithmException {
-
-        final String appPackageName = "com.google.android.cts";
-        final String caseName = "CtsTestHello";
-        final String testName = "testHello";
-        final String excludedList = "com.google.TestCaseName";
-
-        final String descriptionConfigStr = "<TestPackage name=\"" + mTestPackageBinaryName + "\""
-                + " appPackageName=\"" + appPackageName + "\""
-                + " version=\"1.0\" AndroidFramework=\"Android 1.0\""
-                + " runner=\"android.test.InstrumentationTestRunner\" >\n"
-                + "  <Description>something extracted from java doc</Description>\n"
-                + "  <TestSuite name=\"com.google\">\n"
-                + "     <TestCase name=\"CtsTestHello\" priority=\"mandatory\">\n"
-                + "         <Description>" + "something extracted from java doc"
-                + "         </Description>\n"
-                + "         <!-- Test Methods -->\n"
-                + "         <Test name=\"testHello\"" + " type=\"automatic\"" + "/>\n"
-                + "         <Test name=\"testHello2\"" + " type=\"automatic\"" + "/>\n"
-                + "     </TestCase>\n"
-                + "     <TestCase name=\"TestCaseName\" priority=\"mandatory\">\n"
-                + "         <Description>" + "something extracted from java doc"
-                + "         </Description>\n"
-                + "         <!-- Test Methods -->\n"
-                + "         <Test name=\"testName1\"" + " type=\"automatic\"" + "/>\n"
-                + "         <Test name=\"testName2\"" + " type=\"automatic\"" + "/>\n"
-                + "     </TestCase>\n"
-                + "  </TestSuite>\n"
-                + "</TestPackage>\n";
-
-        HostConfig.getInstance().removeTestPacakges();
-        createTestPackage(descriptionConfigStr, mTestPackageBinaryName);
-        HostConfig.getInstance().loadTestPackages();
-
-        ArrayList<String> packageNames = new ArrayList<String>();
-        packageNames.add(appPackageName);
-
-        HashMap<String, ArrayList<String>> results = new HashMap<String, ArrayList<String>>();
-        ArrayList<String> list = new ArrayList<String>();
-        list.add(excludedList);
-        results.put(appPackageName, list);
-        String planName = "plan_test_excluding";
-        String planPath = HostConfig.getInstance().getPlanRepository().getPlanPath(planName);
-        TestSessionBuilder.getInstance().serialize(planName, packageNames, results);
-
-        TestSession ts = TestSessionBuilder.getInstance().build(planPath, Profile.ALL);
-        assertEquals(1, ts.getNumOfRequiredDevices());
-
-        TestSessionLog tsl = ts.getSessionLog();
-        assertEquals(1, tsl.getTestPackages().size());
-
-        TestPackage testPackage = tsl.getTestPackages().iterator().next();
-        assertEquals(1, testPackage.getTestSuites().size());
-        assertEquals(mTestPackageBinaryName, testPackage.getAppBinaryName());
-        assertEquals("1.0", testPackage.getVersion());
-        assertEquals("Android 1.0", testPackage.getAndroidVersion());
-
-        TestSuite testSuite;
-        testSuite = testPackage.getTestSuites().iterator().next();
-        assertEquals(1, testSuite.getTestCases().size());
-        assertEquals("com.google", testSuite.getFullName());
-
-        assertEquals(1, testSuite.getTestCases().size());
-
-        TestCase testCase = testSuite.getTestCases().iterator().next();
-        assertEquals(caseName, testCase.getName());
-        assertEquals("mandatory", testCase.getPriority());
-
-        Test test = testCase.getTests().iterator().next();
-        assertEquals("com.google.CtsTestHello#testHello", test.getFullName());
-        assertEquals("automatic", test.getType());
-        assertEquals(testName, test.getName());
-        assertEquals(CtsTestResult.CODE_NOT_EXECUTED, test.getResult().getResultCode());
-
-        deleteTestPackage(mTestPackageBinaryName);
-    }
-
-    /**
-     * Test building and loading plan with excluded list of all of the test cases.
-     */
-    public void testExcludingAllTestCases() throws IOException,
-            ParserConfigurationException, SAXException, TestPlanNotFoundException,
-            TestNotFoundException,
-            TransformerFactoryConfigurationError, TransformerException, NoSuchAlgorithmException {
-
-        final String appPackageName = "com.google.android.cts";
-        final String excludedList = "com.google.TestCaseName;com.google.CtsTestHello";
-
-        final String descriptionConfigStr = "<TestPackage name=\"" + mTestPackageBinaryName + "\""
-                + " appPackageName=\"" + appPackageName + "\""
-                + " version=\"1.0\" AndroidFramework=\"Android 1.0\""
-                + " runner=\"android.test.InstrumentationTestRunner\" >\n"
-                + "  <Description>something extracted from java doc</Description>\n"
-                + "  <TestSuite name=\"com.google\">\n"
-                + "     <TestCase name=\"CtsTestHello\" priority=\"mandatory\">\n"
-                + "         <Description>" + "something extracted from java doc"
-                + "         </Description>\n"
-                + "         <!-- Test Methods -->\n"
-                + "         <Test name=\"testHello\"" + " type=\"automatic\"" + "/>\n"
-                + "         <Test name=\"testHello2\"" + " type=\"automatic\"" + "/>\n"
-                + "     </TestCase>\n"
-                + "     <TestCase name=\"TestCaseName\" priority=\"mandatory\">\n"
-                + "         <Description>" + "something extracted from java doc"
-                + "         </Description>\n"
-                + "         <!-- Test Methods -->\n"
-                + "         <Test name=\"testName1\"" + " type=\"automatic\"" + "/>\n"
-                + "         <Test name=\"testName2\"" + " type=\"automatic\"" + "/>\n"
-                + "     </TestCase>\n"
-                + "  </TestSuite>\n"
-                + "</TestPackage>\n";
-
-        HostConfig.getInstance().removeTestPacakges();
-        createTestPackage(descriptionConfigStr, mTestPackageBinaryName);
-        HostConfig.getInstance().loadTestPackages();
-
-        ArrayList<String> packageNames = new ArrayList<String>();
-        packageNames.add(appPackageName);
-
-        HashMap<String, ArrayList<String>> results = new HashMap<String, ArrayList<String>>();
-        ArrayList<String> list = new ArrayList<String>();
-        list.add(excludedList);
-        results.put(appPackageName, list);
-        String planName = "plan_test_excluding";
-        String planPath = HostConfig.getInstance().getPlanRepository().getPlanPath(planName);
-        TestSessionBuilder.getInstance().serialize(planName, packageNames, results);
-
-        TestSession ts = TestSessionBuilder.getInstance().build(planPath, Profile.ALL);
-        assertEquals(1, ts.getNumOfRequiredDevices());
-
-        TestSessionLog tsl = ts.getSessionLog();
-        assertEquals(1, tsl.getTestPackages().size());
-
-        TestPackage testPackage = tsl.getTestPackages().iterator().next();
-        assertEquals(0, testPackage.getTestSuites().size());
-        assertEquals(mTestPackageBinaryName, testPackage.getAppBinaryName());
-        assertEquals("1.0", testPackage.getVersion());
-        assertEquals("Android 1.0", testPackage.getAndroidVersion());
-
-        assertEquals(0, testPackage.getTestSuites().size());
-
-        deleteTestPackage(mTestPackageBinaryName);
-    }
-
-    /**
-     * Test building and loading plan with excluded list of test.
-     */
-    public void testExcludingTest() throws IOException,
-            ParserConfigurationException, SAXException, TestPlanNotFoundException,
-            TestNotFoundException,
-            TransformerFactoryConfigurationError, TransformerException, NoSuchAlgorithmException {
-
-        final String appPackageName = "com.google.android.cts";
-        final String caseName = "CtsTestHello";
-        final String testName = "testHello";
-        final String excludedList = "com.google.CtsTestHello#testHello2";
-
-        final String descriptionConfigStr = "<TestPackage name=\"" + mTestPackageBinaryName + "\""
-                + " appPackageName=\"" + appPackageName + "\""
-                + " version=\"1.0\" AndroidFramework=\"Android 1.0\""
-                + " runner=\"android.test.InstrumentationTestRunner\" >\n"
-                + "  <Description>something extracted from java doc</Description>\n"
-                + "  <TestSuite name=\"com.google\">\n"
-                + "     <TestCase name=\"CtsTestHello\" priority=\"mandatory\">\n"
-                + "         <Description>" + "something extracted from java doc"
-                + "         </Description>\n"
-                + "         <!-- Test Methods -->\n"
-                + "         <Test name=\"testHello\"" + " type=\"automatic\"" + "/>\n"
-                + "         <Test name=\"testHello2\"" + " type=\"automatic\"" + "/>\n"
-                + "     </TestCase>\n"
-                + "  </TestSuite>\n"
-                + "</TestPackage>\n";
-
-        HostConfig.getInstance().removeTestPacakges();
-        createTestPackage(descriptionConfigStr, mTestPackageBinaryName);
-        HostConfig.getInstance().loadTestPackages();
-
-        ArrayList<String> packageNames = new ArrayList<String>();
-        packageNames.add(appPackageName);
-
-        HashMap<String, ArrayList<String>> results = new HashMap<String, ArrayList<String>>();
-        ArrayList<String> list = new ArrayList<String>();
-        list.add(excludedList);
-        results.put(appPackageName, list);
-        String planName = "plan_test_excluding";
-        String planPath = HostConfig.getInstance().getPlanRepository().getPlanPath(planName);
-        TestSessionBuilder.getInstance().serialize(planName, packageNames, results);
-
-        TestSession ts = TestSessionBuilder.getInstance().build(planPath, Profile.ALL);
-        assertEquals(1, ts.getNumOfRequiredDevices());
-
-        TestSessionLog tsl = ts.getSessionLog();
-        assertEquals(1, tsl.getTestPackages().size());
-
-        TestPackage testPackage = tsl.getTestPackages().iterator().next();
-        assertEquals(1, testPackage.getTestSuites().size());
-        assertEquals(mTestPackageBinaryName, testPackage.getAppBinaryName());
-        assertEquals("1.0", testPackage.getVersion());
-        assertEquals("Android 1.0", testPackage.getAndroidVersion());
-
-        TestSuite testSuite;
-        testSuite = testPackage.getTestSuites().iterator().next();
-        assertEquals(1, testSuite.getTestCases().size());
-        assertEquals("com.google", testSuite.getFullName());
-
-        assertEquals(1, testSuite.getTestCases().size());
-
-        TestCase testCase = testSuite.getTestCases().iterator().next();
-        assertEquals(caseName, testCase.getName());
-        assertEquals("mandatory", testCase.getPriority());
-
-        Test test = testCase.getTests().iterator().next();
-        assertEquals("com.google.CtsTestHello#testHello", test.getFullName());
-        assertEquals("automatic", test.getType());
-        assertEquals(testName, test.getName());
-        assertEquals(CtsTestResult.CODE_NOT_EXECUTED, test.getResult().getResultCode());
-
-        deleteTestPackage(mTestPackageBinaryName);
-    }
-
-    /**
-     * Test building and loading plan with excluded list of all of the tests.
-     */
-    public void testExcludingAllTests() throws IOException,
-            ParserConfigurationException, SAXException, TestPlanNotFoundException,
-            TestNotFoundException,
-            TransformerFactoryConfigurationError, TransformerException, NoSuchAlgorithmException {
-
-        final String appPackageName = "com.google.android.cts";
-        final String excludedList =
-            "com.google.CtsTestHello#testHello;com.google.CtsTestHello#testHello2;";
-
-        final String descriptionConfigStr = "<TestPackage name=\"" + mTestPackageBinaryName + "\""
-                + " appPackageName=\"" + appPackageName + "\""
-                + " version=\"1.0\" AndroidFramework=\"Android 1.0\""
-                + " runner=\"android.test.InstrumentationTestRunner\" >\n"
-                + "  <Description>something extracted from java doc</Description>\n"
-                + "  <TestSuite name=\"com.google\">\n"
-                + "     <TestCase name=\"CtsTestHello\" priority=\"mandatory\">\n"
-                + "         <Description>" + "something extracted from java doc"
-                + "         </Description>\n"
-                + "         <!-- Test Methods -->\n"
-                + "         <Test name=\"testHello\"" + " type=\"automatic\"" + "/>\n"
-                + "         <Test name=\"testHello2\"" + " type=\"automatic\"" + "/>\n"
-                + "     </TestCase>\n"
-                + "  </TestSuite>\n"
-                + "</TestPackage>\n";
-
-        HostConfig.getInstance().removeTestPacakges();
-        createTestPackage(descriptionConfigStr, mTestPackageBinaryName);
-        HostConfig.getInstance().loadTestPackages();
-
-        ArrayList<String> packageNames = new ArrayList<String>();
-        packageNames.add(appPackageName);
-
-        HashMap<String, ArrayList<String>> results = new HashMap<String, ArrayList<String>>();
-        ArrayList<String> list = new ArrayList<String>();
-        list.add(excludedList);
-        results.put(appPackageName, list);
-        String planName = "plan_test_excluding";
-        String planPath = HostConfig.getInstance().getPlanRepository().getPlanPath(planName);
-        TestSessionBuilder.getInstance().serialize(planName, packageNames, results);
-
-        TestSession ts = TestSessionBuilder.getInstance().build(planPath, Profile.ALL);
-        assertEquals(1, ts.getNumOfRequiredDevices());
-
-        TestSessionLog tsl = ts.getSessionLog();
-        assertEquals(1, tsl.getTestPackages().size());
-
-        TestPackage testPackage = tsl.getTestPackages().iterator().next();
-        assertEquals(0, testPackage.getTestSuites().size());
-        assertEquals(mTestPackageBinaryName, testPackage.getAppBinaryName());
-        assertEquals("1.0", testPackage.getVersion());
-        assertEquals("Android 1.0", testPackage.getAndroidVersion());
-
-        deleteTestPackage(mTestPackageBinaryName);
-    }
-
-    /**
-     * Test creating plan with excluded list.
-     */
-    public void testCreatePlanWithExcludedList() throws IOException,
-          ParserConfigurationException, SAXException,
-          TestPlanNotFoundException, TestNotFoundException,
-          TransformerFactoryConfigurationError, TransformerException, NoSuchAlgorithmException{
-
-        final String appPackageName = "com.google.android.cts";
-        final String suiteName1 = appPackageName + "." + "SuiteName1";
-        final String caseName1 = "CtsTestHello";
-        final String testName1 = "testHello";
-
-        final String caseName2 = "CtsTestHello2";
-        final String testName2 = "testHello2";
-        final String testName3 = "testHello3";
-        final String suiteName2 = "com.google.android.cts.CtsTest.SuiteName2";
-
-        final String descriptionConfigStr = "<TestPackage name=\""
-              + mTestPackageBinaryName + "\""
-              + " appPackageName=\"" + appPackageName + "\""
-              + " version=\"1.0\" AndroidFramework=\"Android 1.0\""
-              + " runner=\"android.test.InstrumentationTestRunner\" >\n"
-              + " <Description>something extracted from java doc</Description>\n"
-              + " <TestSuite name=\"" + suiteName1 + "\"" + ">\n"
-              + "     <TestCase name=\"" + caseName1 + "\"" + " category=\"mandatory\">\n"
-              + "         <Description>" + "something extracted from java doc"
-              + "         </Description>\n"
-              + "         <!-- Test Methods -->\n"
-              + "         <Test name=\"" + testName1 + "\" type=\"automatic\"" + "/>\n"
-              + "     </TestCase>\n"
-              + " </TestSuite>\n"
-              + " <TestSuite name=\"" + suiteName2 + "\"" + ">\n"
-              + "     <TestCase name=\"" + caseName2 + "\"" + " priority=\"mandatory\">\n"
-              + "         <Test name=\"" + testName2 +"\" type=\"automatic\" />\n"
-              + "         <Test name=\"" + testName3 +"\" type=\"automatic\" />\n"
-              + "     </TestCase>\n"
-              + " </TestSuite>\n"
-              + "</TestPackage>\n";
-
-        HostConfig.getInstance().removeTestPacakges();
-        createTestPackage(descriptionConfigStr, mTestPackageBinaryName);
-        HostConfig.getInstance().loadTestPackages();
-
-        ArrayList<String> packageNames = new ArrayList<String>();
-        packageNames.add(appPackageName);
-
-        HashMap<String, ArrayList<String>> results = new HashMap<String, ArrayList<String>>();
-        ArrayList<String> list = new ArrayList<String>();
-        String excludedList = suiteName1 + "." + caseName1 + TestPlan.EXCLUDE_SEPARATOR;
-        excludedList += suiteName2 + "." + caseName2 + Test.METHOD_SEPARATOR + testName2;
-        list.add(excludedList);
-        results.put(appPackageName, list);
-
-        String planName = "plan_test_excluding";
-        String planPath = HostConfig.getInstance().getPlanRepository().getPlanPath(planName);
-        TestSessionBuilder.getInstance().serialize(planName, packageNames, results);
-
-        TestSession ts = TestSessionBuilder.getInstance().build(planPath, Profile.ALL);
-        assertEquals(1, ts.getNumOfRequiredDevices());
-
-        TestSessionLog tsl = ts.getSessionLog();
-        assertEquals(1, tsl.getTestPackages().size());
-
-        TestPackage testPackage = tsl.getTestPackages().iterator().next();
-        assertEquals(1, testPackage.getTestSuites().size());
-        assertEquals(mTestPackageBinaryName, testPackage.getAppBinaryName());
-        assertEquals("1.0", testPackage.getVersion());
-        assertEquals("Android 1.0", testPackage.getAndroidVersion());
-
-        TestSuite testSuite;
-        testSuite = testPackage.getTestSuites().iterator().next();
-        assertEquals(1, testSuite.getTestCases().size());
-        assertEquals(suiteName2, testSuite.getFullName());
-
-        assertEquals(1, testSuite.getTestCases().size());
-
-        TestCase testCase = testSuite.getTestCases().iterator().next();
-        assertEquals(caseName2, testCase.getName());
-        assertEquals("mandatory", testCase.getPriority());
-        assertEquals(1, testCase.getTests().size());
-
-        Test test = testCase.getTests().iterator().next();
-        String testName = suiteName2 + "." + caseName2 + Test.METHOD_SEPARATOR + testName3;
-        assertEquals(testName, test.getFullName());
-        assertEquals("automatic", test.getType());
-        assertEquals(CtsTestResult.CODE_NOT_EXECUTED, test.getResult().getResultCode());
-
-        deleteTestPackage(mTestPackageBinaryName);
-    }
-
-    /**
-     * Test creating plan with excluded list of nested suites.
-     */
-    public void testCreatePlanWithExcludedListForNestedSuite() throws IOException,
-          ParserConfigurationException, SAXException,
-          TestPlanNotFoundException, TestNotFoundException,
-          TransformerFactoryConfigurationError, TransformerException, NoSuchAlgorithmException{
-
-        final String appPackageName = "com.google.android.cts";
-        final String fullName = mTestPackageBinaryName + ".CtsTest";
-        final String suiteName1 = fullName + "." + "SuiteName1";
-        final String caseName1 = "CtsTestHello";
-        final String testName1 = "testHello";
-
-        final String caseName2 = "CtsTestHello2";
-        final String testName2 = "testHello2";
-        final String testName3 = "testHello3";
-        final String nestedSuiteName1 = "com.google";
-        final String nestedSuiteName2 = "android.cts.CtsTest.SuiteName2";
-
-        final String descriptionConfigStr = "<TestPackage name=\""
-            + mTestPackageBinaryName + "\""
-            + " appPackageName=\"" + appPackageName + "\""
-            + " version=\"1.0\" AndroidFramework=\"Android 1.0\""
-              + " runner=\"android.test.InstrumentationTestRunner\" >\n"
-              + " <Description>something extracted from java doc</Description>\n"
-              + " <TestSuite name=\"" + suiteName1 + "\"" + ">\n"
-              + "     <TestCase name=\"" + caseName1 + "\"" + " category=\"mandatory\">\n"
-              + "         <Description>" + "something extracted from java doc" + "</Description>\n"
-              + "         <!-- Test Methods -->\n"
-              + "         <Test name=\"" + testName1 + "\" type=\"automatic\"" + "/>\n"
-              + "     </TestCase>\n"
-              + " </TestSuite>\n"
-              + " <TestSuite name=\"" + nestedSuiteName1 + "\"" + ">\n"
-              + "     <TestSuite name=\"" + nestedSuiteName2 + "\"" + ">\n"
-              + "         <TestCase name=\"" + caseName2 + "\"" + " priority=\"mandatory\">\n"
-              + "             <Test name=\"" + testName2 +"\" type=\"automatic\" />\n"
-              + "             <Test name=\"" + testName3 +"\" type=\"automatic\" />\n"
-              + "         </TestCase>\n"
-              + "     </TestSuite>\n"
-              + " </TestSuite>\n"
-              + "</TestPackage>\n";
-
-        HostConfig.getInstance().removeTestPacakges();
-        createTestPackage(descriptionConfigStr, mTestPackageBinaryName);
-        HostConfig.getInstance().loadTestPackages();
-
-        ArrayList<String> packageNames = new ArrayList<String>();
-        packageNames.add(appPackageName);
-
-        HashMap<String, ArrayList<String>> results = new HashMap<String, ArrayList<String>>();
-        ArrayList<String> list = new ArrayList<String>();
-        String excludedList = suiteName1 + "." + caseName1 + TestPlan.EXCLUDE_SEPARATOR;
-        excludedList += nestedSuiteName1 + "." + nestedSuiteName2
-                        + "." + caseName2 + Test.METHOD_SEPARATOR + testName2;
-        list.add(excludedList);
-        results.put(appPackageName, list);
-
-        String planName = "plan_test_excluding";
-        String planPath = HostConfig.getInstance().getPlanRepository().getPlanPath(planName);
-        TestSessionBuilder.getInstance().serialize(planName, packageNames, results);
-
-        TestSession ts = TestSessionBuilder.getInstance().build(planPath, Profile.ALL);
-        assertEquals(1, ts.getNumOfRequiredDevices());
-
-        TestSessionLog tsl = ts.getSessionLog();
-        assertEquals(1, tsl.getTestPackages().size());
-
-        TestPackage testPackage = tsl.getTestPackages().iterator().next();
-        assertEquals(1, testPackage.getTestSuites().size());
-        assertEquals(mTestPackageBinaryName, testPackage.getAppBinaryName());
-        assertEquals("1.0", testPackage.getVersion());
-        assertEquals("Android 1.0", testPackage.getAndroidVersion());
-
-        TestSuite testSuite;
-        testSuite = testPackage.getTestSuites().iterator().next();
-        assertEquals(0, testSuite.getTestCases().size());
-        assertEquals(nestedSuiteName1, testSuite.getFullName());
-
-        assertEquals(1, testSuite.getSubSuites().size());
-        TestSuite testSubSuite = testSuite.getSubSuites().iterator().next();
-        assertEquals(1, testSubSuite.getTestCases().size());
-        String suiteName = nestedSuiteName1 + "." + nestedSuiteName2;
-        assertEquals(suiteName, testSubSuite.getFullName());
-
-        assertEquals(1, testSubSuite.getTestCases().size());
-
-        TestCase testCase = testSubSuite.getTestCases().iterator().next();
-        assertEquals(caseName2, testCase.getName());
-        assertEquals("mandatory", testCase.getPriority());
-        assertEquals(1, testCase.getTests().size());
-
-        Test test = testCase.getTests().iterator().next();
-        String testName = nestedSuiteName1 + "." + nestedSuiteName2 + "." +caseName2
-                          + Test.METHOD_SEPARATOR + testName3;
-        assertEquals(testName, test.getFullName());
-        assertEquals("automatic", test.getType());
-        assertEquals(CtsTestResult.CODE_NOT_EXECUTED, test.getResult().getResultCode());
-
-        deleteTestPackage(mTestPackageBinaryName);
-    }
-
-    /**
-     * Test building plan of protocol type.
-     */
-    public void testBuildProtocolPlan() throws IOException,
-            ParserConfigurationException, SAXException, TestPlanNotFoundException,
-            TestNotFoundException, NoSuchAlgorithmException {
-
-        final String appPackageName = "com.google.android.cts";
-
-        final String testPlanConfigStr = "<TestPlan version=\"1.0\">\n"
-                + "\t<Description>Demo test plan</Description>\n"
-                + "\t\t<PlanSettings>\n"
-                + "\t\t\t<RequiredDevice amount=\"" + 2 + "\"" + "/>\n"
-                + "\t\t</PlanSettings>\n"
-                + "\t<Entry uri=\""
-                + appPackageName
-                + "\"/>\n"
-                + "</TestPlan>";
-
-        final String descriptionConfigStr = "<TestPackage name=\"" + mTestPackageBinaryName +"\" "
-                + " appPackageName=\"" + appPackageName + "\""
-                + " version=\"1.0\" AndroidFramework=\"Android 1.0\""
-                + " runner=\"android.test.InstrumentationTestRunner\" >\n"
-                + " <Description>something extracted from java doc</Description>\n"
-                + " <TestSuite name=\"com.google.android.cts\"" + ">\n"
-                + "     <TestCase name=\"CtsTestHello\"" + " priority=\"mandatory\">\n"
-                + "         <Description>" + "something extracted from java doc"
-                + "         </Description>\n"
-                + "         <Test name=\"testHello\"" + " type=\"automatic\"" + "/>\n"
-                + "     </TestCase>\n"
-                + " </TestSuite>\n"
-                + "</TestPackage>\n";
-
-        HostConfig.getInstance().removeTestPacakges();
-        String planPath = HostConfig.getInstance().getPlanRepository()
-                .getPlanPath(mTmpPlanFileName);
-        createFile(testPlanConfigStr, planPath);
-
-        createTestPackage(descriptionConfigStr, mTestPackageBinaryName);
-        HostConfig.getInstance().loadTestPackages();
-
-        TestSession ts = TestSessionBuilder.getInstance().build(planPath, Profile.ALL);
-        assertEquals(2, ts.getNumOfRequiredDevices());
-
-        TestSessionLog tsl = ts.getSessionLog();
-        assertEquals(1, tsl.getTestPackages().size());
-
-        TestPackage testPackage = tsl.getTestPackages().iterator().next();
-        assertEquals(1, testPackage.getTestSuites().size());
-        assertEquals(mTestPackageBinaryName, testPackage.getAppBinaryName());
-        assertEquals("1.0", testPackage.getVersion());
-        assertEquals("Android 1.0", testPackage.getAndroidVersion());
-
-        TestSuite testSuite = testPackage.getTestSuites().iterator().next();
-        assertEquals(1, testSuite.getTestCases().size());
-        assertEquals("com.google.android.cts", testSuite.getFullName());
-
-        TestCase testCase = testSuite.getTestCases().iterator().next();
-        Test test = testCase.getTests().iterator().next();
-        assertEquals("testHello", test.getName());
-        assertEquals("automatic", test.getType());
-        assertEquals(CtsTestResult.CODE_NOT_EXECUTED, test.getResult().getResultCode());
-
-        deleteTestPackage(mTestPackageBinaryName);
-    }
-
-    /**
-     * Test serializing the test plan.
-     */
-    public void testSerialize() throws Exception {
-        final String srcStr = "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"no\"?>\n"
-            + "<TestPlan version=\"1.0\">\n"
-            + "<PlanSettings/>\n"
-            + "<Entry uri=\"com.google.android.cts.CtsTest\"/>\n"
-            + "</TestPlan>";
-
-        final String package1 = "com.google.android.cts.CtsTest";
-        ArrayList<String> packageNames = new ArrayList<String>();
-        packageNames.add(package1);
-        HashMap<String, ArrayList<String>> selectedResult =
-                      new HashMap<String, ArrayList<String>>();
-        selectedResult.put(package1, null);
-
-        HostConfig.getInstance().removeTestPacakges();
-        String planName = "plan_test";
-        String planPath = HostConfig.getInstance().getPlanRepository().getPlanPath(planName);
-        TestSessionBuilder.getInstance().serialize(planName, packageNames, selectedResult);
-
-        File file = new File(planPath);
-        assertTrue(file.exists());
-        assertTrue(file.isFile());
-
-        FileReader dstInput = new FileReader(file);
-        BufferedReader dstBufReader = new BufferedReader(dstInput);
-
-        char[] resChars = new char[1024];
-        dstBufReader.read(resChars);
-        assertEquals(srcStr, new String(resChars).trim());
-
-        dstBufReader.close();
-        deleteFile(planPath);
-
-    }
-
-    /**
-     * Test loading plan with sub suites.
-     */
-    public void testLoadPlanWithSubSuite() throws IOException,
-            ParserConfigurationException, SAXException, TestPlanNotFoundException,
-            TestNotFoundException,
-            TransformerFactoryConfigurationError, TransformerException, NoSuchAlgorithmException {
-
-        final String appPackageName = "com.google.android.cts";
-        final String fullName = mTestPackageBinaryName + ".CtsTest";
-        final String caseName = "CtsTestHello";
-        final String testName = "testHello";
-
-        final String descriptionConfigStr = "<TestPackage name=\"" + mTestPackageBinaryName + "\""
-                + " appPackageName=\"" + appPackageName + "\""
-                + " version=\"1.0\" AndroidFramework=\"Android 1.0\""
-                + " runner=\"android.test.InstrumentationTestRunner\" >\n"
-                + "  <Description>something extracted from java doc</Description>\n"
-                + "  <TestSuite name=\"com.google\">\n"
-                + "     <TestCase name=\"CtsTestHello\" priority=\"mandatory\">\n"
-                + "         <Description>" + "something extracted from java doc"
-                + "         </Description>\n"
-                + "         <!-- Test Methods -->\n"
-                + "         <Test name=\"testHello\"" + " type=\"automatic\"" + "/>\n"
-                + "     </TestCase>\n"
-                + "     <TestSuite name=\"TestSuiteName\">\n"
-                + "         <TestCase name=\"TestCaseName\" priority=\"mandatory\">\n"
-                + "             <Description>" + "something extracted from java doc"
-                + "             </Description>\n"
-                + "             <!-- Test Methods -->\n"
-                + "             <Test name=\"testName1\"" + " type=\"automatic\"" + "/>\n"
-                + "         </TestCase>\n"
-                + "     </TestSuite>\n"
-                + "  </TestSuite>\n"
-                + "</TestPackage>\n";
-
-        HostConfig.getInstance().removeTestPacakges();
-        createTestPackage(descriptionConfigStr, mTestPackageBinaryName);
-        HostConfig.getInstance().loadTestPackages();
-
-        ArrayList<String> packageNames = new ArrayList<String>();
-        packageNames.add(appPackageName);
-
-        HashMap<String, ArrayList<String>> results = new HashMap<String, ArrayList<String>>();
-        results.put(appPackageName, null);
-        String planName = "plan_test_excluding";
-        String planPath = HostConfig.getInstance().getPlanRepository().getPlanPath(planName);
-        TestSessionBuilder.getInstance().serialize(planName, packageNames, results);
-
-        TestSession ts = TestSessionBuilder.getInstance().build(planPath, Profile.ALL);
-        assertEquals(1, ts.getNumOfRequiredDevices());
-
-        ts.getSessionLog().setStartTime(System.currentTimeMillis());
-        TestSessionLog tsl = ts.getSessionLog();
-        tsl.createResultDoc();
-        assertEquals(1, tsl.getTestPackages().size());
-
-        TestPackage testPackage = tsl.getTestPackages().iterator().next();
-        assertEquals(1, testPackage.getTestSuites().size());
-        assertEquals(mTestPackageBinaryName, testPackage.getAppBinaryName());
-        assertEquals("1.0", testPackage.getVersion());
-        assertEquals("Android 1.0", testPackage.getAndroidVersion());
-
-        TestSuite testSuite;
-        testSuite = testPackage.getTestSuites().iterator().next();
-        assertEquals(1, testSuite.getSubSuites().size());
-        assertEquals(1, testSuite.getTestCases().size());
-        assertEquals("com.google", testSuite.getFullName());
-
-        TestCase testCase = testSuite.getTestCases().iterator().next();
-        assertEquals(caseName, testCase.getName());
-        assertEquals("mandatory", testCase.getPriority());
-
-        Test test = testCase.getTests().iterator().next();
-        assertEquals("com.google.CtsTestHello#testHello", test.getFullName());
-        assertEquals("automatic", test.getType());
-        assertEquals(testName, test.getName());
-        assertEquals(CtsTestResult.CODE_NOT_EXECUTED, test.getResult().getResultCode());
-
-        TestSuite subTestSuite;
-        subTestSuite = testSuite.getSubSuites().iterator().next();
-        assertEquals(1, subTestSuite.getTestCases().size());
-        assertEquals("com.google.TestSuiteName", subTestSuite.getFullName());
-        assertEquals("TestSuiteName", subTestSuite.getName());
-
-        testCase = subTestSuite.getTestCases().iterator().next();
-        assertEquals("TestCaseName", testCase.getName());
-        assertEquals("mandatory", testCase.getPriority());
-
-        test = testCase.getTests().iterator().next();
-        assertEquals("com.google.TestSuiteName.TestCaseName#testName1", test.getFullName());
-        assertEquals("automatic", test.getType());
-        assertEquals("testName1", test.getName());
-        assertEquals(CtsTestResult.CODE_NOT_EXECUTED, test.getResult().getResultCode());
-
-        deleteTestPackage(mTestPackageBinaryName);
-    }
-
-    /**
-     * Test validating test controller.
-     */
-    public void testValidateTestController() {
-        String jarPath = "test.jar";
-        String packageName = "com.android.tests";
-        String className = "ConsoleTests";
-        String methodName = "testMethod";
-
-        TestController controller = new TestController(null, null, null, null);
-        assertFalse(controller.isValid());
-
-        controller = new TestController(jarPath, null, null, null);
-        assertFalse(controller.isValid());
-
-        controller = new TestController(null, packageName, null, null);
-        assertFalse(controller.isValid());
-
-        controller = new TestController(null, null, className, null);
-        assertFalse(controller.isValid());
-
-        controller = new TestController(null, null, null, methodName);
-        assertFalse(controller.isValid());
-
-        controller = new TestController("", "", "", "");
-        assertFalse(controller.isValid());
-
-        controller = new TestController("", packageName, className, methodName);
-        assertFalse(controller.isValid());
-
-        controller = new TestController(jarPath, "", className, methodName);
-        assertFalse(controller.isValid());
-
-        controller = new TestController(jarPath, packageName, "", methodName);
-        assertFalse(controller.isValid());
-
-        controller = new TestController(jarPath, packageName, className, "");
-        assertFalse(controller.isValid());
-
-        controller = new TestController(jarPath, packageName, className, methodName);
-        assertTrue(controller.isValid());
-    }
-
-    /**
-     * Test loading plan with test controller.
-     */
-    public void testLoadPlanWithTestController() throws IOException,
-            ParserConfigurationException, SAXException,
-            TestPlanNotFoundException, TestNotFoundException,
-            TransformerFactoryConfigurationError,
-            TransformerException, NoSuchAlgorithmException {
-
-        final String appPackageName = "com.google.android.cts";
-        final String jarPath = "test.jar";
-        final String controllerPackageName = "com.android.tests";
-        final String className = "ConsoleTests";
-        final String methodName = "testMethod";
-        final String description = controllerPackageName + "." + className
-                + Test.METHOD_SEPARATOR + methodName;
-
-        final String descriptionConfigStr = "<TestPackage name=\""
-                + mTestPackageBinaryName + "\" "
-                + " appPackageName=\"" + appPackageName + "\""
-                + " version=\"1.0\" AndroidFramework=\"Android 1.0\""
-                + " runner=\"android.test.InstrumentationTestRunner\" jarPath=\"" + jarPath
-                + "\">\n"
-                + "  <Description>something extracted from java doc</Description>\n"
-                + "  <TestSuite name=\"com.google\">\n"
-                + "     <TestCase name=\"TestCaseName\" priority=\"mandatory\">\n"
-                + "         <Description>"
-                + "something extracted from java doc" + "</Description>\n"
-                + "         <!-- Test Methods -->\n"
-                + "         <Test name=\"testName1\""
-                + " type=\"automatic\"" + " HostController=\""
-                + description + "\"" + "/>\n" + "     </TestCase>\n"
-                + "  </TestSuite>\n" + "</TestPackage>\n";
-
-        createTestPackage(descriptionConfigStr, mTestPackageBinaryName);
-        HostConfig.getInstance().loadTestPackages();
-
-        ArrayList<String> packageNames = new ArrayList<String>();
-        packageNames.add(appPackageName);
-
-        HashMap<String, ArrayList<String>> results = new HashMap<String, ArrayList<String>>();
-        results.put(appPackageName, null);
-
-        String planName = "plan_test";
-        String planPath = HostConfig.getInstance().getPlanRepository().getPlanPath(planName);
-        TestSessionBuilder.getInstance().serialize(planName, packageNames, results);
-
-        TestSession ts = TestSessionBuilder.getInstance().build(planPath, Profile.ALL);
-        ts.getSessionLog().setStartTime(System.currentTimeMillis());
-        TestSessionLog tsl = ts.getSessionLog();
-        TestPackage testPackage = tsl.getTestPackages().iterator().next();
-
-        assertEquals(jarPath, testPackage.getJarPath());
-
-        TestSuite testSuite;
-        testSuite = testPackage.getTestSuites().iterator().next();
-        TestCase testCase = testSuite.getTestCases().iterator().next();
-        Test test = testCase.getTests().iterator().next();
-        assertEquals(controllerPackageName, test.getTestController().getPackageName());
-        assertEquals(className, test.getTestController().getClassName());
-        assertEquals(methodName, test.getTestController().getMethodName());
-
-        deleteTestPackage(mTestPackageBinaryName);
-    }
-}
diff --git a/tools/host/test/com/android/cts/TestSessionLogBuilderTests.java b/tools/host/test/com/android/cts/TestSessionLogBuilderTests.java
deleted file mode 100644
index a2b5274..0000000
--- a/tools/host/test/com/android/cts/TestSessionLogBuilderTests.java
+++ /dev/null
@@ -1,173 +0,0 @@
-/*
- * Copyright (C) 2009 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 com.android.cts;
-
-import org.xml.sax.SAXException;
-
-import java.io.IOException;
-import java.security.NoSuchAlgorithmException;
-import java.util.Collection;
-import java.util.Iterator;
-
-import javax.xml.parsers.ParserConfigurationException;
-
-/**
- * Test the logic of TestSessionLogBuilder.
- *
- */
-public class TestSessionLogBuilderTests extends CtsTestBase {
-
-    public void testLoadTestSessionLogBuilder() throws IOException, NoSuchAlgorithmException,
-            SAXException, TestPlanNotFoundException, TestNotFoundException,
-            ParserConfigurationException {
-
-        final String resultFile =
-            "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" +
-            "<?xml-stylesheet type=\"text/xsl\"  href=\"cts_result.xsl\"?>\n" +
-            "\n" +
-            "<TestResult endtime=\"Wed Apr 29 10:36:47 CST 2009\" " +
-            "starttime=\"Wed Apr 29 10:36:30 CST 2009\" testPlan=\"location\" version=\"1.0\" profile=\"ALL\">\n" +
-            "  <DeviceInfo>\n" +
-            "    <Screen resolution=\"480x320\"/>\n" +
-            "    <PhoneSubInfo subscriberId=\"15555218135\"/>\n" +
-            "    <BuildInfo Xdpi=\"164.75456\" Ydpi=\"165.87724\" androidPlatformVersion=\"3\" " +
-            "    buildID=\"CUPCAKE\" buildName=\"generic\" buildVersion=\"1.5\" " +
-            "    build_board=\"unknown\" build_brand=\"generic\" build_device=\"generic\" " +
-            "    build_fingerprint=\"test-keys\" build_model=\"generic\" build_type=\"eng\" " +
-            "    deviceID=\"emulator-5554\" imei=\"000000000000000\" imsi=\"310260000000000\" " +
-            "    keypad=\"qwty\" locales=\"en_US;\" navigation=\"trkball\" network=\"Android\" " +
-            "    touch=\"finger\"/>\n" +
-            "  </DeviceInfo>\n" +
-            "  <Summary failed=\"22\" notExecuted=\"0\" pass=\"22\" timeout=\"0\"/>\n" +
-            "  <TestPackage digest=\"7GDPKCxBGKuVyEkH1PGWJc=&#10;\" name=\"android.location\" " +
-            "  appPackageName=\"android.location\">\n" +
-            "    <TestSuite name=\"android\">\n" +
-            "      <TestSuite name=\"location\">\n" +
-            "        <TestSuite name=\"cts\">\n" +
-            "          <TestCase name=\"LocationManagerTest\" priority=\"\">\n" +
-            "           <Test endtime=\"Wed Apr 29 10:36:44 CST 2009\" name=\"testOne\"" +
-            "            result=\"fail\" starttime=\"Thu Jan 01 07:00:00 CST 1970\">\n" +
-            "             <FailedScene message=\"java.SecurityException: (Parcel.java:1234)\">\n" +
-            "               <StackTrace>at android.os.Parcel.readException(Parcel.java:1234)\n" +
-            "                  at android.os.Parcel.readException(Parcel.java:1222)\n" +
-            "                  at android.location.addTestProvider(ILocationManager.java:821)\n" +
-            "                  at android.location.addTestProvider(LocationManager.java:987)\n" +
-            "               </StackTrace>\n" +
-            "             </FailedScene>\n" +
-            "           </Test>\n" +
-            "           <Test endtime=\"Wed Apr 29 10:36:44 CST 2009\" name=\"testTwo\"" +
-            "             result=\"fail\" starttime=\"Thu Jan 01 07:00:00 CST 1970\">\n" +
-            "             <FailedScene message=\"java.SecurityException: (Parcel.java:1234)\">\n" +
-            "               <StackTrace>at android.os.Parcel.readException(Parcel.java:1234)\n" +
-            "                  at android.os.Parcel.readException(Parcel.java:1222)\n" +
-            "                  at android.location.(ILocationManager.java:821)\n" +
-            "               </StackTrace>\n" +
-            "             </FailedScene>\n" +
-            "           </Test>\n" +
-            "          </TestCase>\n" +
-            "          <TestCase name=\"AddressTest\" priority=\"\">\n" +
-            "           <Test endtime=\"Wed Apr 29 10:36:43 CST 2009\" name=\"testThree\" " +
-            "            result=\"pass\" starttime=\"Thu Jan 01 07:00:00 CST 1970\"/>\n" +
-            "           <Test endtime=\"Wed Apr 29 10:36:43 CST 2009\" name=\"testFour\" " +
-            "            result=\"pass\" starttime=\"Thu Jan 01 07:00:00 CST 1970\"/>\n" +
-            "          </TestCase>\n" +
-            "        </TestSuite>\n" +
-            "      </TestSuite>\n" +
-            "    </TestSuite>\n" +
-            "  </TestPackage>\n" +
-            "</TestResult>";
-
-        final String pkgDescription =
-            "<TestPackage name=\"android.location\" " +
-            "appPackageName=\"android.location\" targetNameSpace=\"targetNameSpace\" " +
-            " version=\"1.0\" AndroidFramework=\"Android 1.0\"" +
-            " runner=\"runner\">\n" +
-            "    <Description>something extracted from java doc</Description>\n" +
-            "    <TestSuite name=\"android\">\n" +
-            "      <TestSuite name=\"location\">\n" +
-            "        <TestSuite name=\"cts\">\n" +
-            "          <TestCase name=\"LocationManagerTest\" priority=\"\">\n" +
-            "           <Test name=\"testOne\" />\n" +
-            "           <Test name=\"testTwo\" />\n" +
-            "          </TestCase>\n" +
-            "          <TestCase name=\"AddressTest\" priority=\"\">\n" +
-            "           <Test name=\"testThree\" />\n" +
-            "           <Test name=\"testFour\" />\n" +
-            "          </TestCase>\n" +
-            "        </TestSuite>\n" +
-            "      </TestSuite>\n" +
-            "    </TestSuite>\n" +
-            "</TestPackage>\n";
-
-        final String testPlanConfigStr = "<TestPlan version=\"1.0\">\n" +
-            "\t<Description>Demo test plan</Description>\n" +
-            "\t\t<PlanSettings>\n" +
-            "\t\t\t<RequiredDevice amount=\"" + 1 + "\"" + "/>\n" +
-            "\t\t</PlanSettings>\n" +
-            "\t<Entry uri=\"android.location\"/>\n" +
-            "</TestPlan>";
-
-        final String resultFileName = "testResult.xml";
-        final String descriptionFileName = "CtsLocation.xml";
-
-        HostConfig.getInstance().removeTestPacakges();
-
-        String planPath =
-            HostConfig.getInstance().getPlanRepository().getPlanPath("location");
-        createFile(testPlanConfigStr, planPath);
-
-        String resultPath =
-            HostConfig.getInstance().getResultRepository().getRoot() + resultFileName;
-        createFile(resultFile, resultPath);
-
-        createTestPackage(pkgDescription, "android.location");
-        HostConfig.getInstance().loadTestPackages();
-        TestSession ts = TestSessionBuilder.getInstance().build(
-                TestSessionLogBuilder.getInstance().build(resultPath));
-        assertNotNull(ts);
-        TestSessionLog log = ts.getSessionLog();
-        assertNotNull(log);
-        assertEquals("location", log.getTestPlanName());
-
-        Collection<TestPackage> packages = log.getTestPackages();
-        assertEquals(1, packages.size());
-        TestPackage pkg = packages.iterator().next();
-
-        Collection<Test> tests = pkg.getTests();
-        assertNotNull(tests);
-        assertEquals(4, tests.size());
-        Iterator<Test> iterator = tests.iterator();
-        Test test1 = iterator.next();
-        assertEquals("android.location.cts.LocationManagerTest#testOne", test1.getFullName());
-
-        CtsTestResult result = test1.getResult();
-        assertNotNull(result);
-        assertEquals("fail", result.getResultString());
-        assertNotNull(result.getFailedMessage());
-        assertNotNull(result.getStackTrace());
-
-        Test test2 = iterator.next();
-        Test test3 = iterator.next();
-        assertEquals("android.location.cts.AddressTest#testThree", test3.getFullName());
-
-        result = test3.getResult();
-        assertNotNull(result);
-        assertEquals("pass", result.getResultString());
-        assertNull(result.getFailedMessage());
-        assertNull(result.getStackTrace());
-    }
-}
diff --git a/tools/theme-test-tools/README.txt b/tools/theme-test-tools/README.txt
deleted file mode 100644
index aef42b7..0000000
--- a/tools/theme-test-tools/README.txt
+++ /dev/null
@@ -1,28 +0,0 @@
-Copyright (C) 2011 The Android Open Source Project
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-
-
-README for the Theme Tests
-
-Located in themetestscripts.sh are a series of scripts that allow
-one to generate the "masters" for the theme tests. The tests require
-known-good versions (masters) of widgets, etc to compare against.
-The scripts will allow you to generate these masters for mdpi, hdpi
-and xhdpi devices.
-
-To properly generate these masters, a device of the needed density is
-required. Ie, an mdpi device for mdpi masters, etc.
-
-Additionally, to deal with large form-factors, mdpi will also do tests
-in a larger size. A large form-factor device is required.
diff --git a/tools/theme-test-tools/themetestscripts.sh b/tools/theme-test-tools/themetestscripts.sh
deleted file mode 100755
index bab63ff..0000000
--- a/tools/theme-test-tools/themetestscripts.sh
+++ /dev/null
@@ -1,130 +0,0 @@
-# Copyright (C) 2011 The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-#!/bin/bash
-# some simple scripts to automate theme test compiling and running
-
-# Allows a person developing the tests to very quickly run just the theme tests.
-# If you are doing this more than once, it is recommended that you open
-# cts/tests/Android.mk and comment out the line after the comment
-# "Build the test APK using its own makefile, and any other CTS-related packages".
-# Commenting out that line makes it so that you only build the necessary
-# theme tests, not all of CTS. Make sure that you do not check that modification
-# in, however.
-function rtt () {
-	if [ ! "$ANDROID_PRODUCT_OUT" ]; then
-	    echo "did you remember to lunch or tapas?" 1>&2;
-	    return;
-	fi;
-
-    croot && \
-	mmm cts/tests/ && \
-	mmm cts/tests/tests/theme/ && \
-	adb install -r $ANDROID_PRODUCT_OUT/data/app/CtsTestStubs.apk && \
-	adb install -r $ANDROID_PRODUCT_OUT/data/app/CtsThemeTestCases.apk && \
-	runtest -b --path cts/tests/tests/theme/src
-}
-
-# Builds the Theme Tests and installs them to the device.
-# Does not run the tests or generate the good versions.
-function tt () {
-	if [ ! "$ANDROID_PRODUCT_OUT" ]; then
-	    echo "did you remember to lunch or tapas?" 1>&2;
-	    return;
-	fi;
-
-	croot && \
-    adb root && \
-	mmm cts/tests/ && \
-	mmm cts/tests/tests/theme/ && \
-	adb install -r $ANDROID_PRODUCT_OUT/data/app/CtsTestStubs.apk && \
-	adb install -r $ANDROID_PRODUCT_OUT/data/app/CtsThemeTestCases.apk && \
-	adb shell rm -r data/data/com.android.cts.stub/files/
-}
-
-# Builds the theme tests and generates the masters for an xhdpi device.
-# Does not generate for large form factors (phones-only).
-function gttxhdpi () {
-	if [ ! "$ANDROID_PRODUCT_OUT" ]; then
-	    echo "did you remember to lunch or tapas?" 1>&2;
-	    return;
-	fi;
-
-    croot && \
-    adb root && \
-    make CtsTestStubs CtsThemeTestCases && \
-    adb install -r $ANDROID_PRODUCT_OUT/data/app/CtsTestStubs.apk && \
-    adb install -r $ANDROID_PRODUCT_OUT/data/app/CtsThemeTestCases.apk && \
-    adb shell rm -r data/data/com.android.cts.stub/files/ && \
-    adb shell am instrument -w -e class android.theme.cts.ThemeGenerator#generateThemeBitmaps com.android.cts.theme/android.test.InstrumentationCtsTestRunner && \
-    adb shell am instrument -w -e class android.theme.cts.ActivitySnapshotTests#generateActivityBitmaps com.android.cts.theme/android.test.InstrumentationCtsTestRunner && \
-    adb shell am instrument -w -e class android.theme.cts.SplitActivitySnapshotTests#generateActivityBitmaps com.android.cts.theme/android.test.InstrumentationCtsTestRunner && \
-    mkdir -p $ANDROID_HOST_OUT/cts/theme-assets-xhdpi && \
-    adb pull data/data/com.android.cts.stub/files/ $ANDROID_HOST_OUT/cts/theme-assets-xhdpi/
-}
-
-# Builds the theme tests and generates the masters for an hdpi device.
-# Does not generate for large form factors (phones-only).
-function gtthdpi () {
-	if [ ! "$ANDROID_PRODUCT_OUT" ]; then
-	    echo "did you remember to lunch or tapas?" 1>&2;
-	    return;
-	fi;
-
-    croot && \
-    adb root && \
-    mmm cts/tests/ && \
-    mmm cts/tests/tests/theme/ && \
-    adb install -r $ANDROID_PRODUCT_OUT/data/app/CtsTestStubs.apk && \
-    adb install -r $ANDROID_PRODUCT_OUT/data/app/CtsThemeTestCases.apk && \
-    adb shell rm -r data/data/com.android.cts.stub/files/ && \
-    adb shell am instrument -w -e class android.theme.cts.ThemeGenerator#generateThemeBitmaps com.android.cts.theme/android.test.InstrumentationCtsTestRunner && \
-    adb shell am instrument -w -e class android.theme.cts.ActivitySnapshotTests#generateActivityBitmaps com.android.cts.theme/android.test.InstrumentationCtsTestRunner && \
-    adb shell am instrument -w -e class android.theme.cts.SplitActivitySnapshotTests#generateActivityBitmaps com.android.cts.theme/android.test.InstrumentationCtsTestRunner && \
-    mkdir -p $ANDROID_HOST_OUT/cts/theme-assets-hdpi && \
-    adb pull data/data/com.android.cts.stub/files/ $ANDROID_HOST_OUT/cts/theme-assets-hdpi/
-}
-
-# Builds the theme tests and generates the masters for an mdpi device.
-# Generate for large and small form factors (phones and tablets).
-# This assumes that the device that will be used to generate the tests
-# is a large form factor mdpi device (stingray or wingray).
-function gttmdpi () {
-	if [ ! "$ANDROID_PRODUCT_OUT" ]; then
-	    echo "did you remember to lunch or tapas?" 1>&2;
-	    return;
-	fi;
-
-    croot && \
-    adb root && \
-    mmm cts/tests/ && \
-    mmm cts/tests/tests/theme/ && \
-    adb install -r $ANDROID_PRODUCT_OUT/data/app/CtsTestStubs.apk && \
-    adb install -r $ANDROID_PRODUCT_OUT/data/app/CtsThemeTestCases.apk && \
-    adb shell rm -r data/data/com.android.cts.stub/files/ && \
-    adb shell am instrument -w -e class android.theme.cts.ThemeGenerator#generateThemeBitmaps com.android.cts.theme/android.test.InstrumentationCtsTestRunner && \
-    adb shell am instrument -w -e class android.theme.cts.ActivitySnapshotTests#generateActivityBitmaps com.android.cts.theme/android.test.InstrumentationCtsTestRunner && \
-    adb shell am instrument -w -e class android.theme.cts.SplitActivitySnapshotTests#generateActivityBitmaps com.android.cts.theme/android.test.InstrumentationCtsTestRunner && \
-    mkdir -p $ANDROID_HOST_OUT/cts/theme-assets-large-mdpi && \
-    adb pull data/data/com.android.cts.stub/files/ $ANDROID_HOST_OUT/cts/theme-assets-large-mdpi/ && \
-    adb shell am display-size 800x480  && \
-    adb shell rm -r data/data/com.android.cts.stub/files/ && \
-    adb shell am instrument -w -e class android.theme.cts.ThemeGenerator#generateThemeBitmaps com.android.cts.theme/android.test.InstrumentationCtsTestRunner && \
-    adb shell am instrument -w -e class android.theme.cts.ActivitySnapshotTests#generateActivityBitmaps com.android.cts.theme/android.test.InstrumentationCtsTestRunner && \
-    adb shell am instrument -w -e class android.theme.cts.SplitActivitySnapshotTests#generateActivityBitmaps com.android.cts.theme/android.test.InstrumentationCtsTestRunner && \
-    mkdir -p $ANDROID_HOST_OUT/cts/theme-assets-hdpi && \
-    adb pull data/data/com.android.cts.stub/files/ $ANDROID_HOST_OUT/cts/theme-assets-mdpi/ && \
-    adb shell am display-size reset
-
-}
diff --git a/tools/tradefed-host/Android.mk b/tools/tradefed-host/Android.mk
index 86fba8d..7af7993 100644
--- a/tools/tradefed-host/Android.mk
+++ b/tools/tradefed-host/Android.mk
@@ -18,7 +18,7 @@
 
 # Only compile source java files in this lib.
 LOCAL_SRC_FILES := $(call all-java-files-under, src)
-LOCAL_JAVA_RESOURCE_DIRS := res ../host/src/res
+LOCAL_JAVA_RESOURCE_DIRS := res
 
 LOCAL_MODULE := cts-tradefed
 LOCAL_MODULE_TAGS := optional
@@ -29,4 +29,3 @@
 
 # Build all sub-directories
 include $(call all-makefiles-under,$(LOCAL_PATH))
-
diff --git a/tools/tradefed-host/res/config/cts.xml b/tools/tradefed-host/res/config/cts.xml
index 3a35a7f..0c7fe58 100644
--- a/tools/tradefed-host/res/config/cts.xml
+++ b/tools/tradefed-host/res/config/cts.xml
@@ -23,5 +23,6 @@
     <test class="com.android.cts.tradefed.testtype.CtsTest" />
     <logger class="com.android.tradefed.log.FileLogger" />
     <result_reporter class="com.android.cts.tradefed.result.CtsXmlResultReporter" />
+    <result_reporter class="com.android.cts.tradefed.result.IssueReporter" />
 
 </configuration>
diff --git a/tools/host/src/res/cts_result.css b/tools/tradefed-host/res/report/cts_result.css
similarity index 100%
rename from tools/host/src/res/cts_result.css
rename to tools/tradefed-host/res/report/cts_result.css
diff --git a/tools/tradefed-host/res/report/cts_result.xsd b/tools/tradefed-host/res/report/cts_result.xsd
new file mode 100644
index 0000000..5e471d5
--- /dev/null
+++ b/tools/tradefed-host/res/report/cts_result.xsd
@@ -0,0 +1,224 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Copyright (C) 2009 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.
+ -->
+
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
+           targetNamespace="http://compatibility.android.com/cts_result/1.13"
+           xmlns="http://compatibility.android.com/cts_result/1.13"
+           elementFormDefault="qualified">
+
+<xs:element name="TestResult">
+  <xs:complexType>
+    <xs:sequence>
+      <xs:element name="DeviceInfo" type="deviceInfoType"/>
+      <xs:element name="HostInfo" type="hostInfoType"/>
+      <xs:element name="Summary" type="summaryType"/>
+      <xs:element name="TestPackage" type="testPackageType" maxOccurs="unbounded" minOccurs="1"/>
+    </xs:sequence>
+    <xs:attribute name="starttime" type="xs:string"/>
+    <xs:attribute name="endtime" type="xs:string"/>
+    <xs:attribute name="testPlan" type="xs:string"/>
+    <xs:attribute name="version" type="xs:string"/>
+  </xs:complexType>
+</xs:element>
+
+<xs:complexType name="deviceInfoType">
+  <xs:sequence>
+    <xs:element name="Screen">
+      <xs:complexType>
+        <xs:attribute name="screen_size" type="xs:string"/>
+        <xs:attribute name="resolution" type="xs:string"/>
+        <xs:attribute name="screen_density" type="xs:decimal"/>
+        <xs:attribute name="screen_density_bucket" type="xs:string"/>
+      </xs:complexType>
+    </xs:element>
+    <xs:element name="PhoneSubInfo">
+      <xs:complexType>
+        <xs:attribute name="subscriberId" type="xs:string"/>
+      </xs:complexType>
+    </xs:element>
+    <xs:element name="BuildInfo">
+      <xs:complexType>
+        <xs:attribute name="Xdpi" type="xs:decimal"/>
+        <xs:attribute name="Ydpi" type="xs:decimal"/>
+        <xs:attribute name="androidPlatformVersion" type="xs:integer"/>
+        <xs:attribute name="buildID" type="xs:string"/>
+        <xs:attribute name="buildName" type="xs:string"/>
+        <xs:attribute name="buildVersion" type="xs:string"/>
+        <xs:attribute name="build_board" type="xs:string"/>
+        <xs:attribute name="build_manufacturer" type="xs:string"/>
+        <xs:attribute name="build_brand" type="xs:string"/>
+        <xs:attribute name="build_device" type="xs:string"/>
+        <xs:attribute name="build_fingerprint" type="xs:string"/>
+        <xs:attribute name="build_model" type="xs:string"/>
+        <xs:attribute name="build_type" type="xs:string"/>
+        <xs:attribute name="deviceID" type="xs:string"/>
+        <xs:attribute name="imei" type="xs:integer"/>
+        <xs:attribute name="imsi" type="xs:integer"/>
+        <xs:attribute name="keypad" type="xs:string"/>
+        <xs:attribute name="locales" type="xs:string"/>
+        <xs:attribute name="navigation" type="xs:string"/>
+        <xs:attribute name="network" type="xs:string"/>
+        <xs:attribute name="touch" type="xs:string"/>
+        <xs:attribute name="openGlEsVersion" type="xs:string"/>
+        <xs:attribute name="partitions" type="xs:string"/>
+        <xs:attribute name="build_abi" type="xs:string"/>
+        <xs:attribute name="build_abi2" type="xs:string"/>
+      </xs:complexType>
+    </xs:element>
+    <xs:element name="FeatureInfo" type="featureInfoType"/>
+    <xs:element name="ProcessInfo" type="processInfoType"/>
+    <xs:element name="SystemLibrariesInfo" type="systemLibrariesInfoType"/>
+    <xs:element name="OpenGLCompressedTextureFormatsInfo" type="openGLCompressedTextureFormatsInfoType"/>
+  </xs:sequence>
+</xs:complexType>
+
+<xs:complexType name="hostInfoType">
+  <xs:sequence>
+    <xs:element name="Os">
+      <xs:complexType>
+        <xs:attribute name="arch" type="xs:string"/>
+        <xs:attribute name="name" type="xs:string"/>
+        <xs:attribute name="version" type="xs:string"/>
+      </xs:complexType>
+    </xs:element>
+    <xs:element name="Java">
+      <xs:complexType>
+        <xs:attribute name="name" type="xs:string"/>
+        <xs:attribute name="version" type="xs:string"/>
+      </xs:complexType>
+    </xs:element>
+    <xs:element name="Cts">
+      <xs:complexType>
+        <xs:sequence>
+          <xs:element name="IntValue" minOccurs="0" maxOccurs="unbounded">
+            <xs:complexType>
+              <xs:attribute name="name" type="xs:string"/>
+              <xs:attribute name="value" type="xs:integer"/>
+            </xs:complexType>
+          </xs:element>
+        </xs:sequence>
+        <xs:attribute name="version" type="xs:string"/>
+      </xs:complexType>
+    </xs:element>
+  </xs:sequence>
+  <xs:attribute name="name" type="xs:string"/>
+</xs:complexType>
+
+<xs:complexType name="featureInfoType">
+    <xs:sequence>
+        <xs:element name="Feature" minOccurs="0" maxOccurs="unbounded">
+            <xs:complexType>
+                <xs:attribute name="name" type="xs:string" />
+                <xs:attribute name="type" type="xs:string" />
+                <xs:attribute name="available" type="xs:string" />
+            </xs:complexType>
+        </xs:element>
+    </xs:sequence>
+</xs:complexType>
+
+<xs:complexType name="processInfoType">
+    <xs:sequence>
+        <xs:element name="Process" minOccurs="0" maxOccurs="unbounded">
+            <xs:complexType>
+                <xs:attribute name="name" type="xs:string" />
+                <xs:attribute name="uid" type="xs:integer" />
+            </xs:complexType>
+        </xs:element>
+    </xs:sequence>
+</xs:complexType>
+
+<xs:complexType name="systemLibrariesInfoType">
+    <xs:sequence>
+        <xs:element name="Library" minOccurs="0" maxOccurs="unbounded">
+            <xs:complexType>
+                <xs:attribute name="name" type="xs:string" />
+            </xs:complexType>
+        </xs:element>
+    </xs:sequence>
+</xs:complexType>
+
+<xs:complexType name="openGLCompressedTextureFormatsInfoType">
+    <xs:sequence>
+        <xs:element name="TextureFormat" minOccurs="0" maxOccurs="unbounded">
+            <xs:complexType>
+                <xs:attribute name="name" type="xs:string" />
+            </xs:complexType>
+        </xs:element>
+    </xs:sequence>
+</xs:complexType>
+
+<xs:complexType name="summaryType">
+  <xs:attribute name="failed" type="xs:integer"/>
+  <xs:attribute name="notExecuted" type="xs:integer"/>
+  <xs:attribute name="pass" type="xs:integer"/>
+  <xs:attribute name="timeout" type="xs:integer"/>
+  <xs:attribute name="omitted" type="xs:integer"/>
+</xs:complexType>
+
+<xs:complexType name="testPackageType">
+  <xs:sequence>
+    <xs:element name="TestSuite" type="testSuiteType" minOccurs="0" maxOccurs="unbounded" />
+  </xs:sequence>
+  <xs:attribute name="appPackageName" type="xs:string"/>
+  <xs:attribute name="digest" type="xs:hexBinary"/>
+  <xs:attribute name="name" type="xs:string" use="required"/>
+  <xs:attribute name="signatureCheck" type="xs:boolean" />
+</xs:complexType>
+
+<xs:complexType name="testSuiteType">
+  <xs:sequence>
+    <xs:element name="TestCase" type="testCaseType" minOccurs="0" maxOccurs="unbounded"/>
+    <xs:element name="TestSuite" type="testSuiteType" minOccurs="0" maxOccurs="unbounded"/>
+  </xs:sequence>
+  <xs:attribute name="name" type="xs:string" use="required"/>
+</xs:complexType>
+
+<xs:complexType name="testCaseType">
+  <xs:sequence>
+    <xs:element name="Test" type="testType" minOccurs="0" maxOccurs="unbounded"/>
+  </xs:sequence>
+  <xs:attribute name="name" type="xs:string" use="required"/>
+  <xs:attribute name="priority" type="xs:string"/>
+</xs:complexType>
+
+<xs:complexType name="testType">
+  <xs:sequence>
+    <xs:element name="FailedScene" minOccurs="0" maxOccurs="1">
+      <xs:complexType>
+        <xs:sequence>
+          <xs:element name="StackTrace" type="xs:string" minOccurs="0" maxOccurs="1"/>
+        </xs:sequence>
+        <xs:attribute name="message" type="xs:string"/>
+      </xs:complexType>
+    </xs:element>
+  </xs:sequence>
+  <xs:attribute name="name" type="xs:string" use="required"/>
+  <xs:attribute name="result" type="resultType" use="required"/>
+  <xs:attribute name="starttime" type="xs:string"/>
+  <xs:attribute name="endtime" type="xs:string"/>
+</xs:complexType>
+
+<xs:simpleType name="resultType">
+  <xs:restriction base="xs:string">
+    <xs:enumeration value="pass"/>
+    <xs:enumeration value="fail"/>
+    <xs:enumeration value="timeout"/>
+    <xs:enumeration value="notExecuted"/>
+    <xs:enumeration value="omitted"/>
+  </xs:restriction>
+</xs:simpleType>
+</xs:schema>
diff --git a/tools/tradefed-host/res/report/cts_result.xsl b/tools/tradefed-host/res/report/cts_result.xsl
new file mode 100644
index 0000000..6fe7cec
--- /dev/null
+++ b/tools/tradefed-host/res/report/cts_result.xsl
@@ -0,0 +1,590 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2008 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.
+-->
+
+<!DOCTYPE xsl:stylesheet [ <!ENTITY nbsp "&#160;"> ]>
+<xsl:stylesheet version="2.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+    <xsl:output method="html" version="1.0" encoding="UTF-8" indent="yes"/>
+
+    <xsl:template match="/">
+
+        <html>
+            <STYLE type="text/css">
+                @import "cts_result.css";
+            </STYLE>
+
+            <body>
+                <!-- Title of the Report -->
+                <DIV id="title">
+                    <TABLE>
+                        <TR>
+                            <TD width="40%" align="left"><img src="logo.gif"></img></TD>
+                            <TD width="60%" align="left">
+                                <h1>Test Report for <xsl:value-of select="TestResult/DeviceInfo/BuildInfo/@build_model"/> -
+                                    <xsl:value-of select="TestResult/DeviceInfo/BuildInfo/@deviceID"/>
+                                </h1>
+                            </TD>
+                        </TR>
+                    </TABLE>
+                </DIV>
+                <img src="newrule-green.png" align="left"></img>
+
+                <br></br>
+                <br></br>
+
+                <!-- Header with phone and plan information -->
+                <DIV id="summary">
+                    <TABLE width="90%" frame="none">
+                        <TR>
+                            <TH>Device Information</TH>
+                            <TH>Test Summary</TH>
+                        </TR>
+
+                        <TR>
+                            <TD>
+                                <!-- Device information -->
+                                <div id="summaryinfo">
+                                    <TABLE width="75%">
+                                        <TR>
+                                            <TD class="rowtitle">Build Model</TD>
+                                            <TD>
+                                                <xsl:value-of select="TestResult/DeviceInfo/BuildInfo/@build_model"/>
+                                            </TD>
+                                        </TR>
+                                        <TR>
+                                            <TD class="rowtitle">Build Name</TD>
+                                            <TD>
+                                                <xsl:value-of select="TestResult/DeviceInfo/BuildInfo/@buildName"/>
+                                            </TD>
+                                        </TR>
+                                        <TR>
+                                            <TD class="rowtitle">Build Brand</TD>
+                                            <TD>
+                                                <xsl:value-of select="TestResult/DeviceInfo/BuildInfo/@build_brand"/>
+                                            </TD>
+                                        </TR>
+                                        <TR>
+                                            <TD class="rowtitle">Build Manufacturer</TD>
+                                            <TD>
+                                                <xsl:value-of select="TestResult/DeviceInfo/BuildInfo/@build_manufacturer"/>
+                                            </TD>
+                                        </TR>
+                                        <TR>
+                                            <TD class="rowtitle">Device ID</TD>
+                                            <TD>
+                                                <xsl:value-of select="TestResult/DeviceInfo/BuildInfo/@deviceID"/>
+                                            </TD>
+                                        </TR>
+                                        <TR>
+                                            <TD class="rowtitle">Firmware Version</TD>
+                                            <TD>
+                                                <xsl:value-of select="TestResult/DeviceInfo/BuildInfo/@buildVersion"/>
+                                            </TD>
+                                        </TR>
+                                        <TR>
+                                            <TD class="rowtitle">Firmware Build Number</TD>
+                                            <TD>
+                                                <xsl:value-of select="TestResult/DeviceInfo/BuildInfo/@buildID"/>
+                                            </TD>
+                                        </TR>
+                                        <TR>
+                                            <TD class="rowtitle">Build Fingerprint</TD>
+                                            <TD>
+                                                <xsl:value-of select="TestResult/DeviceInfo/BuildInfo/@build_fingerprint"/>
+                                            </TD>
+                                        </TR>
+                                        <TR>
+                                            <TD class="rowtitle">Build ABI</TD>
+                                            <TD>
+                                                <xsl:value-of
+                                                  select="TestResult/DeviceInfo/BuildInfo/@build_abi"/>
+                                            </TD>
+                                        </TR>
+                                        <TR>
+                                            <TD class="rowtitle">Build ABI2</TD>
+                                            <TD>
+                                                <xsl:value-of
+                                                  select="TestResult/DeviceInfo/BuildInfo/@build_abi2"/>
+                                            </TD>
+                                        </TR>
+                                        <TR>
+                                            <TD class="rowtitle">Android Platform Version</TD>
+                                            <TD>
+                                                <xsl:value-of select="TestResult/DeviceInfo/BuildInfo/@androidPlatformVersion"/>
+                                            </TD>
+                                        </TR>
+                                        <TR>
+                                            <TD class="rowtitle">Supported Locales</TD>
+                                            <TD>
+                                                <xsl:call-template name="formatDelimitedString">
+                                                    <xsl:with-param name="string" select="TestResult/DeviceInfo/BuildInfo/@locales"/>
+                                                </xsl:call-template>
+                                            </TD>
+                                        </TR>
+                                        <TR>
+                                            <TD class="rowtitle">Screen Size</TD>
+                                            <TD>
+                                                <xsl:value-of select="TestResult/DeviceInfo/Screen/@screen_size"/>
+                                            </TD>
+                                        </TR>
+                                        <TR>
+                                            <TD class="rowtitle">Resolution</TD>
+                                            <TD>
+                                                <xsl:value-of select="TestResult/DeviceInfo/Screen/@resolution"/>
+                                            </TD>
+                                        </TR>
+                                        <TR>
+                                            <TD class="rowtitle">Density</TD>
+                                            <TD>
+                                                <xsl:value-of select="TestResult/DeviceInfo/Screen/@screen_density"/>
+                                                (<xsl:value-of select="TestResult/DeviceInfo/Screen/@screen_density_bucket"/>)
+                                            </TD>
+                                        </TR>
+                                        <TR>
+                                            <TD class="rowtitle">Phone number</TD>
+                                            <TD>
+                                                <xsl:value-of select="TestResult/DeviceInfo/PhoneSubInfo/@subscriberId"/>
+                                            </TD>
+                                        </TR>
+                                        <TR>
+                                            <TD class="rowtitle">X dpi</TD>
+                                            <TD>
+                                                <xsl:value-of select="TestResult/DeviceInfo/BuildInfo/@Xdpi"/>
+                                            </TD>
+                                        </TR>
+                                        <TR>
+                                            <TD class="rowtitle">Y dpi</TD>
+                                            <TD>
+                                                <xsl:value-of select="TestResult/DeviceInfo/BuildInfo/@Ydpi"/>
+                                            </TD>
+                                        </TR>
+                                        <TR>
+                                            <TD class="rowtitle">Touch</TD>
+                                            <TD>
+                                                <xsl:value-of select="TestResult/DeviceInfo/BuildInfo/@touch"/>
+                                            </TD>
+                                        </TR>
+                                        <TR>
+                                            <TD class="rowtitle">Navigation</TD>
+                                            <TD>
+                                                <xsl:value-of select="TestResult/DeviceInfo/BuildInfo/@navigation"/>
+                                            </TD>
+                                        </TR>
+                                        <TR>
+                                            <TD class="rowtitle">Keypad</TD>
+                                            <TD>
+                                                <xsl:value-of select="TestResult/DeviceInfo/BuildInfo/@keypad"/>
+                                            </TD>
+                                        </TR>
+                                        <TR>
+                                            <TD class="rowtitle">Network</TD>
+                                            <TD>
+                                                <xsl:value-of select="TestResult/DeviceInfo/BuildInfo/@network"/>
+                                            </TD>
+                                        </TR>
+                                        <TR>
+                                            <TD class="rowtitle">IMEI</TD>
+                                            <TD>
+                                                <xsl:value-of select="TestResult/DeviceInfo/BuildInfo/@imei"/>
+                                            </TD>
+                                        </TR>
+                                        <TR>
+                                            <TD class="rowtitle">IMSI</TD>
+                                            <TD>
+                                                <xsl:value-of select="TestResult/DeviceInfo/BuildInfo/@imsi"/>
+                                            </TD>
+                                        </TR>
+                                        <TR>
+                                            <TD class="rowtitle">Open GL ES Version</TD>
+                                            <TD>
+                                                <xsl:value-of select="TestResult/DeviceInfo/BuildInfo/@openGlEsVersion"/>
+                                            </TD>
+                                        </TR>
+                                        <TR>
+                                            <TD class="rowtitle">Open GL Compressed Texture Formats</TD>
+                                            <TD>
+                                                <UL>
+                                                    <xsl:for-each select="TestResult/DeviceInfo/OpenGLCompressedTextureFormatsInfo/TextureFormat">
+                                                        <LI><xsl:value-of select="@name" /></LI>
+                                                    </xsl:for-each>
+                                                </UL>
+                                            </TD>
+                                        </TR>
+                                        <TR>
+                                            <TD class="rowtitle">Features</TD>
+                                            <TD>
+                                                <xsl:for-each select="TestResult/DeviceInfo/FeatureInfo/Feature[@type='sdk']">
+                                                    <xsl:text>[</xsl:text>
+                                                    <xsl:choose>
+                                                        <xsl:when test="@available = 'true'">
+                                                            <xsl:text>X</xsl:text>
+                                                        </xsl:when>
+                                                        <xsl:otherwise>
+                                                            <xsl:text>_</xsl:text>
+                                                        </xsl:otherwise>
+                                                    </xsl:choose>
+                                                    <xsl:text>] </xsl:text>
+
+                                                    <xsl:value-of select="@name" />
+                                                    <br />
+                                                </xsl:for-each>
+                                            </TD>
+                                        </TR>
+                                        <TR>
+                                            <TD class="rowtitle">Other Features</TD>
+                                            <TD>
+                                                <UL>
+                                                    <xsl:for-each select="TestResult/DeviceInfo/FeatureInfo/Feature[@type='other']">
+                                                        <LI><xsl:value-of select="@name" /></LI>
+                                                    </xsl:for-each>
+                                                </UL>
+                                            </TD>
+                                        </TR>
+                                        <TR>
+                                            <TD class="rowtitle">Root Processes</TD>
+                                            <TD>
+                                                <UL>
+                                                    <xsl:for-each select="TestResult/DeviceInfo/ProcessInfo/Process[@uid='0']">
+                                                        <LI><xsl:value-of select="@name" /></LI>
+                                                    </xsl:for-each>
+                                                </UL>
+                                            </TD>
+                                        </TR>
+                                        <TR>
+                                            <TD class="rowtitle">Partitions</TD>
+                                            <TD>
+                                                <UL>
+                                                    <pre>
+                                                        <xsl:call-template name="formatDelimitedString">
+                                                            <xsl:with-param name="string" select="TestResult/DeviceInfo/BuildInfo/@partitions" />
+                                                            <xsl:with-param name="numTokensPerRow" select="1" />
+                                                        </xsl:call-template>
+                                                    </pre>
+                                                </UL>
+                                            </TD>
+                                        </TR>
+                                        <TR>
+                                            <TD class="rowtitle">System Libraries</TD>
+                                            <TD>
+                                                <UL>
+                                                    <xsl:for-each select="TestResult/DeviceInfo/SystemLibrariesInfo/Library">
+                                                        <LI><xsl:value-of select="@name" /></LI>
+                                                    </xsl:for-each>
+                                                </UL>
+                                            </TD>
+                                        </TR>
+                                    </TABLE>
+                                </div>
+                            </TD>
+
+                            <!-- plan information -->
+                            <TD>
+                                <div id="summaryinfo">
+                                    <TABLE width="75%">
+                                        <TR>
+                                            <TD class="rowtitle">CTS version</TD>
+                                            <TD>
+                                                <xsl:value-of select="TestResult/HostInfo/Cts/@version"/>
+                                            </TD>
+                                        </TR>
+                                        <TR>
+                                            <TD class="rowtitle">Test timeout</TD>
+                                            <TD>
+                                                <xsl:value-of select="TestResult/HostInfo/Cts/IntValue[@name='testStatusTimeoutMs']/@value" /> ms
+                                            </TD>
+                                        </TR>
+                                        <TR>
+                                            <TD class="rowtitle">Host Info</TD>
+                                            <TD>
+                                                <xsl:value-of select="TestResult/HostInfo/@name"/>
+                                                (<xsl:value-of select="TestResult/HostInfo/Os/@name"/> - 
+                                                  <xsl:value-of select="TestResult/HostInfo/Os/@version"/>)
+                                            </TD>
+                                        </TR>
+                                        <TR><TD><BR></BR></TD><TD></TD></TR>
+                                        <TR>
+                                            <TD class="rowtitle">Plan name</TD>
+                                            <TD>
+                                                <xsl:value-of select="TestResult/@testPlan"/>
+                                            </TD>
+                                        </TR>
+                                        <TR>
+                                            <TD class="rowtitle">Start time</TD>
+                                            <TD>
+                                                <xsl:value-of select="TestResult/@starttime"/>
+                                            </TD>
+                                        </TR>
+                                        <TR>
+                                            <TD class="rowtitle">End time</TD>
+                                            <TD>
+                                                <xsl:value-of select="TestResult/@endtime"/>
+                                            </TD>
+                                        </TR>
+
+                                        <!-- Test Summary -->
+                                        <TR><TD><BR></BR></TD><TD></TD></TR>
+                                        <TR>
+                                            <TD class="rowtitle">Tests Passed</TD>
+                                            <TD>
+                                                <xsl:value-of select="TestResult/Summary/@pass"/>
+                                            </TD>
+                                        </TR>
+                                        <TR>
+                                            <TD class="rowtitle">Tests Failed</TD>
+                                            <TD>
+                                                <xsl:value-of select="TestResult/Summary/@failed"/>
+                                            </TD>
+                                        </TR>
+                                        <TR>
+                                            <TD class="rowtitle">Tests Timed out</TD>
+                                            <TD>
+                                                <xsl:value-of select="TestResult/Summary/@timeout"/>
+                                            </TD>
+                                        </TR>
+                                        <TR>
+                                            <TD class="rowtitle">Tests Not Executed</TD>
+                                            <TD>
+                                                <xsl:value-of select="TestResult/Summary/@notExecuted"/>
+                                            </TD>
+                                        </TR>
+                                    </TABLE>
+                                </div>
+                            </TD>
+                        </TR>
+                    </TABLE>
+                </DIV>
+
+                <!-- High level summary of test execution -->
+                <h2 align="center">Test Summary by Package</h2>
+                <DIV id="testsummary">
+                    <TABLE>
+                        <TR>
+                            <TH>Test Package</TH>
+                            <TH>Passed</TH>
+                            <TH>Failed</TH>
+                            <TH>Timed Out</TH>
+                            <TH>Not Executed</TH>
+                            <TH>Total Tests</TH>
+                        </TR>
+                        <xsl:for-each select="TestResult/TestPackage">
+                            <TR>
+                                <TD>
+                                    <xsl:variable name="href"><xsl:value-of select="@appPackageName"/></xsl:variable>
+                                    <a href="#{$href}"><xsl:value-of select="@appPackageName"/></a>
+                                </TD>
+                                <TD>
+                                    <xsl:value-of select="count(TestSuite//Test[@result = 'pass'])"/>
+                                </TD>
+                                <TD>
+                                    <xsl:value-of select="count(TestSuite//Test[@result = 'fail'])"/>
+                                </TD>
+                                <TD>
+                                    <xsl:value-of select="count(TestSuite//Test[@result = 'timeout'])"/>
+                                </TD>
+                                <TD>
+                                    <xsl:value-of select="count(TestSuite//Test[@result = 'notExecuted'])"/>
+                                </TD>
+                                <TD>
+                                    <xsl:value-of select="count(TestSuite//Test)"/>
+                                </TD>
+                            </TR>
+                        </xsl:for-each> <!-- end package -->
+                    </TABLE>
+                </DIV>
+
+                <xsl:call-template name="filteredResultTestReport">
+                    <xsl:with-param name="header" select="'Test Failures'" />
+                    <xsl:with-param name="resultFilter" select="'fail'" />
+                </xsl:call-template>
+
+                <xsl:call-template name="filteredResultTestReport">
+                    <xsl:with-param name="header" select="'Test Timeouts'" />
+                    <xsl:with-param name="resultFilter" select="'timeout'" />
+                </xsl:call-template>
+
+                <h2 align="center">Detailed Test Report</h2>
+                <xsl:call-template name="detailedTestReport" />
+
+            </body>
+        </html>
+    </xsl:template>
+
+    <xsl:template name="filteredResultTestReport">
+        <xsl:param name="header" />
+        <xsl:param name="resultFilter" />
+        <xsl:variable name="numMatching" select="count(TestResult/TestPackage/TestSuite//TestCase/Test[@result=$resultFilter])" />
+        <xsl:if test="$numMatching &gt; 0">
+            <h2 align="center"><xsl:value-of select="$header" /> (<xsl:value-of select="$numMatching"/>)</h2>
+            <xsl:call-template name="detailedTestReport">
+                <xsl:with-param name="resultFilter" select="$resultFilter"/>
+            </xsl:call-template>
+        </xsl:if>
+    </xsl:template>
+
+    <xsl:template name="detailedTestReport">
+        <xsl:param name="resultFilter" />
+        <DIV id="testdetail">
+            <xsl:for-each select="TestResult/TestPackage">
+                <xsl:if test="$resultFilter=''
+                        or count(TestSuite//TestCase/Test[@result=$resultFilter]) &gt; 0">
+                    <DIV id="none">
+                        <TABLE>
+                            <TR>
+                                <TD class="none" align="left">
+                                    <xsl:variable name="href"><xsl:value-of select="@appPackageName"/></xsl:variable>
+                                    <a name="{$href}">Compatibility Test Package: <xsl:value-of select="@appPackageName"/></a>
+                                </TD>
+                            </TR>
+                        </TABLE>
+                    </DIV>
+
+                    <TABLE>
+                        <TR>
+                            <TH width="25%">Test</TH>
+                            <TH width="7%">Result</TH>
+                            <TH width="68%">Failure Details</TH>
+                        </TR>
+
+                        <!-- test case -->
+                        <xsl:for-each select="TestSuite//TestCase">
+
+                            <xsl:if test="$resultFilter='' or count(Test[@result=$resultFilter]) &gt; 0">
+                                <!-- emit a blank row before every test suite name -->
+                                <xsl:if test="position()!=1">
+                                    <TR><TD class="testcasespacer" colspan="3"></TD></TR>
+                                </xsl:if>
+
+                                <TR>
+                                    <TD class="testcase" colspan="3">
+                                        <xsl:for-each select="ancestor::TestSuite">
+                                            <xsl:if test="position()!=1">.</xsl:if>
+                                            <xsl:value-of select="@name"/>
+                                        </xsl:for-each>
+                                        <xsl:text>.</xsl:text>
+                                        <xsl:value-of select="@name"/>
+                                    </TD>
+                                </TR>
+                            </xsl:if>
+
+                            <!-- test -->
+                            <xsl:for-each select="Test">
+                                <xsl:if test="$resultFilter='' or $resultFilter=@result">
+                                    <TR>
+                                        <TD class="testname"> -- <xsl:value-of select="@name"/></TD>
+
+                                        <!-- test results -->
+                                        <xsl:choose>
+                                            <xsl:when test="string(@KnownFailure)">
+                                                <!-- "pass" indicates the that test actually passed (results have been inverted already) -->
+                                                <xsl:if test="@result='pass'">
+                                                    <TD class="pass">
+                                                        <div style="text-align: center; margin-left:auto; margin-right:auto;">
+                                                            known problem
+                                                        </div>
+                                                    </TD>
+                                                    <TD class="failuredetails"></TD>
+                                                </xsl:if>
+
+                                                <!-- "fail" indicates that a known failure actually passed (results have been inverted already) -->
+                                                <xsl:if test="@result='fail'">
+                                                    <TD class="failed">
+                                                        <div style="text-align: center; margin-left:auto; margin-right:auto;">
+                                                            <xsl:value-of select="@result"/>
+                                                        </div>
+                                                    </TD>
+                                                   <TD class="failuredetails">
+                                                        <div id="details">
+                                                            A test that was a known failure actually passed. Please check.
+                                                        </div>
+                                                   </TD>
+                                                </xsl:if>
+                                            </xsl:when>
+
+                                            <xsl:otherwise>
+                                                <xsl:if test="@result='pass'">
+                                                    <TD class="pass">
+                                                        <div style="text-align: center; margin-left:auto; margin-right:auto;">
+                                                            <xsl:value-of select="@result"/>
+                                                        </div>
+                                                    </TD>
+                                                    <TD class="failuredetails"></TD>
+                                                </xsl:if>
+
+                                                <xsl:if test="@result='fail'">
+                                                    <TD class="failed">
+                                                        <div style="text-align: center; margin-left:auto; margin-right:auto;">
+                                                            <xsl:value-of select="@result"/>
+                                                        </div>
+                                                    </TD>
+                                                    <TD class="failuredetails">
+                                                        <div id="details">
+                                                            <xsl:value-of select="FailedScene/@message"/>
+                                                        </div>
+                                                    </TD>
+                                                </xsl:if>
+
+                                                <xsl:if test="@result='timeout'">
+                                                    <TD class="timeout">
+                                                        <div style="text-align: center; margin-left:auto; margin-right:auto;">
+                                                            <xsl:value-of select="@result"/>
+                                                        </div>
+                                                    <TD class="failuredetails"></TD>
+                                                    </TD>
+                                                </xsl:if>
+
+                                                <xsl:if test="@result='notExecuted'">
+                                                    <TD class="notExecuted">
+                                                        <div style="text-align: center; margin-left:auto; margin-right:auto;">
+                                                            <xsl:value-of select="@result"/>
+                                                        </div>
+                                                    </TD>
+                                                    <TD class="failuredetails"></TD>
+                                                </xsl:if>
+                                            </xsl:otherwise>
+                                        </xsl:choose>
+                                    </TR> <!-- finished with a row -->
+                                </xsl:if>
+                            </xsl:for-each> <!-- end test -->
+                        </xsl:for-each> <!-- end test case -->
+                    </TABLE>
+                </xsl:if>
+            </xsl:for-each> <!-- end test package -->
+        </DIV>
+    </xsl:template>
+
+    <!-- Take a delimited string and insert line breaks after a some number of elements. --> 
+    <xsl:template name="formatDelimitedString">
+        <xsl:param name="string" />
+        <xsl:param name="numTokensPerRow" select="10" />
+        <xsl:param name="tokenIndex" select="1" />
+        <xsl:if test="$string">
+            <!-- Requires the last element to also have a delimiter after it. -->
+            <xsl:variable name="token" select="substring-before($string, ';')" />
+            <xsl:value-of select="$token" />
+            <xsl:text>&#160;</xsl:text>
+          
+            <xsl:if test="$tokenIndex mod $numTokensPerRow = 0">
+                <br />
+            </xsl:if>
+
+            <xsl:call-template name="formatDelimitedString">
+                <xsl:with-param name="string" select="substring-after($string, ';')" />
+                <xsl:with-param name="numTokensPerRow" select="$numTokensPerRow" />
+                <xsl:with-param name="tokenIndex" select="$tokenIndex + 1" />
+            </xsl:call-template>
+        </xsl:if>
+    </xsl:template>
+
+</xsl:stylesheet>
diff --git a/tools/host/src/res/logo.gif b/tools/tradefed-host/res/report/logo.gif
similarity index 100%
rename from tools/host/src/res/logo.gif
rename to tools/tradefed-host/res/report/logo.gif
Binary files differ
diff --git a/tools/host/src/res/newrule-green.png b/tools/tradefed-host/res/report/newrule-green.png
similarity index 100%
rename from tools/host/src/res/newrule-green.png
rename to tools/tradefed-host/res/report/newrule-green.png
Binary files differ
diff --git a/tools/tradefed-host/src/com/android/cts/tradefed/build/CtsBuildProvider.java b/tools/tradefed-host/src/com/android/cts/tradefed/build/CtsBuildProvider.java
index f53507d..c28631b 100644
--- a/tools/tradefed-host/src/com/android/cts/tradefed/build/CtsBuildProvider.java
+++ b/tools/tradefed-host/src/com/android/cts/tradefed/build/CtsBuildProvider.java
@@ -31,7 +31,7 @@
     @Option(name="cts-install-path", description="the path to the cts installation to use")
     private String mCtsRootDirPath = System.getProperty("CTS_ROOT");
 
-    public static final String CTS_BUILD_VERSION = "4.0_r1";
+    public static final String CTS_BUILD_VERSION = "4.0.3_r1";
 
     /**
      * {@inheritDoc}
diff --git a/tools/tradefed-host/src/com/android/cts/tradefed/command/CtsConsole.java b/tools/tradefed-host/src/com/android/cts/tradefed/command/CtsConsole.java
index 9c87e68..bd7a983 100644
--- a/tools/tradefed-host/src/com/android/cts/tradefed/command/CtsConsole.java
+++ b/tools/tradefed-host/src/com/android/cts/tradefed/command/CtsConsole.java
@@ -28,10 +28,13 @@
 import com.android.tradefed.config.ConfigurationException;
 import com.android.tradefed.util.FileUtil;
 import com.android.tradefed.util.RegexTrie;
+import com.android.tradefed.util.TableFormatter;
 
 import java.io.File;
 import java.io.FileNotFoundException;
 import java.io.FilenameFilter;
+import java.io.PrintWriter;
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
@@ -156,8 +159,8 @@
         helpBuilder.append("  run cts --help/--help-all: get more help on running CTS\n");
         helpBuilder.append("List:\n");
         helpBuilder.append("  l/list d/devices: list connected devices and their state\n");
-        helpBuilder.append("  l/list p/packages: list CTS test packages\n");
-        helpBuilder.append("  l/list plans: list CTS test plans\n");
+        helpBuilder.append("  l/list packages: list CTS test packages\n");
+        helpBuilder.append("  l/list p/plans: list CTS test plans\n");
         helpBuilder.append("  l/list i/invocations: list invocations aka CTS test runs currently");
         helpBuilder.append("in progress\n");
         helpBuilder.append("  l/list c/commands: list commands: aka CTS test run commands ");
@@ -198,13 +201,21 @@
     }
 
     private void listResults(CtsBuildHelper ctsBuild) {
-        printLine("Session\t\tPass\tFail\tNot Executed\tStart time\t\tPlan name");
+        TableFormatter tableFormatter = new TableFormatter();
+        List<List<String>> table = new ArrayList<List<String>>();
+        table.add(Arrays.asList("Session","Pass", "Fail","Not Executed","Start time","Plan name",
+                "Device serial(s)"));
         ITestResultRepo testResultRepo = new TestResultRepo(ctsBuild.getResultsDir());
         for (ITestSummary result : testResultRepo.getSummaries()) {
-            printLine(String.format("%d\t\t%d\t%d\t%d\t\t%s\t%s", result.getId(),
-                    result.getNumPassed(), result.getNumFailed(),
-                    result.getNumIncomplete(), result.getTimestamp(), result.getTestPlan()));
+            table.add(Arrays.asList(Integer.toString(result.getId()),
+                    Integer.toString(result.getNumPassed()),
+                    Integer.toString(result.getNumFailed()),
+                    Integer.toString(result.getNumIncomplete()),
+                    result.getTimestamp(),
+                    result.getTestPlan(),
+                    result.getDeviceSerials()));
         }
+        tableFormatter.displayTable(table, new PrintWriter(System.out, true));
     }
 
     private void addDerivedPlan(CtsBuildHelper ctsBuild, String[] flatArgs) {
diff --git a/tools/tradefed-host/src/com/android/cts/tradefed/result/CtsXmlResultReporter.java b/tools/tradefed-host/src/com/android/cts/tradefed/result/CtsXmlResultReporter.java
index 1335365..686c90a 100644
--- a/tools/tradefed-host/src/com/android/cts/tradefed/result/CtsXmlResultReporter.java
+++ b/tools/tradefed-host/src/com/android/cts/tradefed/result/CtsXmlResultReporter.java
@@ -56,7 +56,7 @@
     private static final String LOG_TAG = "CtsXmlResultReporter";
 
     static final String TEST_RESULT_FILE_NAME = "testResult.xml";
-    private static final String CTS_RESULT_FILE_VERSION = "1.11";
+    private static final String CTS_RESULT_FILE_VERSION = "1.13";
     private static final String[] CTS_RESULT_RESOURCES = {"cts_result.xsl", "cts_result.css",
         "logo.gif", "newrule-green.png"};
 
@@ -84,6 +84,9 @@
     @Option(name = "quiet-output", description = "Mute display of test results.")
     private boolean mQuietOutput = false;
 
+    @Option(name = "result-server", description = "Server to publish test results.")
+    private String mResultServer;
+
     protected IBuildInfo mBuildInfo;
     private String mStartTime;
     private String mDeviceSerial;
@@ -148,7 +151,8 @@
         try {
             buildHelper.validateStructure();
         } catch (FileNotFoundException e) {
-            throw new IllegalArgumentException("Invalid CTS build", e);
+            // just log an error - it might be expected if we failed to retrieve a build
+            CLog.e("Invalid CTS build %s", ctsBuild.getRootDir());
         }
         return buildHelper;
     }
@@ -248,9 +252,23 @@
         if (mCurrentPkgResult != null) {
             logCompleteRun(mCurrentPkgResult);
         }
-        createXmlResult(mReportDir, mStartTime, elapsedTime);
+        if (mReportDir == null || mStartTime == null) {
+            // invocationStarted must have failed, abort
+            CLog.w("Unable to create XML report");
+            return;
+        }
+
+        File reportFile = getResultFile(mReportDir);
+        createXmlResult(reportFile, mStartTime, elapsedTime);
         copyFormattingFiles(mReportDir);
         zipResults(mReportDir);
+
+        try {
+            ResultReporter reporter = new ResultReporter(mResultServer, reportFile);
+            reporter.reportResult();
+        } catch (IOException e) {
+            CLog.e(e);
+        }
     }
 
     private void logResult(String format, Object... args) {
@@ -275,12 +293,11 @@
     /**
      * Creates a report file and populates it with the report data from the completed tests.
      */
-    private void createXmlResult(File reportDir, String startTimestamp, long elapsedTime) {
+    private void createXmlResult(File reportFile, String startTimestamp, long elapsedTime) {
         String endTime = getTimestamp();
-
         OutputStream stream = null;
         try {
-            stream = createOutputResultStream(reportDir);
+            stream = createOutputResultStream(reportFile);
             KXmlSerializer serializer = new KXmlSerializer();
             serializer.setOutput(stream, "UTF-8");
             serializer.startDocument("UTF-8", false);
@@ -325,11 +342,14 @@
         //serializer.endTag(ns, RESULT_TAG);
     }
 
+    private File getResultFile(File reportDir) {
+        return new File(reportDir, TEST_RESULT_FILE_NAME);
+    }
+
     /**
      * Creates the output stream to use for test results. Exposed for mocking.
      */
-    OutputStream createOutputResultStream(File reportDir) throws IOException {
-        File reportFile = new File(reportDir, TEST_RESULT_FILE_NAME);
+    OutputStream createOutputResultStream(File reportFile) throws IOException {
         logResult("Created xml report file at file://%s", reportFile.getAbsolutePath());
         return new FileOutputStream(reportFile);
     }
@@ -341,7 +361,7 @@
      */
     private void copyFormattingFiles(File resultsDir) {
         for (String resultFileName : CTS_RESULT_RESOURCES) {
-            InputStream configStream = getClass().getResourceAsStream(String.format("/%s",
+            InputStream configStream = getClass().getResourceAsStream(String.format("/report/%s",
                     resultFileName));
             if (configStream != null) {
                 File resultFile = new File(resultsDir, resultFileName);
diff --git a/tools/tradefed-host/src/com/android/cts/tradefed/result/DeviceInfoResult.java b/tools/tradefed-host/src/com/android/cts/tradefed/result/DeviceInfoResult.java
index 102e998..17b62ca 100644
--- a/tools/tradefed-host/src/com/android/cts/tradefed/result/DeviceInfoResult.java
+++ b/tools/tradefed-host/src/com/android/cts/tradefed/result/DeviceInfoResult.java
@@ -39,13 +39,20 @@
 class DeviceInfoResult extends AbstractXmlPullParser {
     static final String TAG = "DeviceInfo";
     private static final String ns = CtsXmlResultReporter.ns;
-    private static final String BUILD_TAG = "BuildInfo";
+    static final String BUILD_TAG = "BuildInfo";
     private static final String PHONE_TAG = "PhoneSubInfo";
     private static final String SCREEN_TAG = "Screen";
     private static final String FEATURE_INFO_TAG = "FeatureInfo";
     private static final String FEATURE_TAG = "Feature";
     private static final String FEATURE_ATTR_DELIM = ":";
     private static final String FEATURE_DELIM = ";";
+    private static final String OPENGL_TEXTURE_FORMATS_INFO_TAG =
+            "OpenGLCompressedTextureFormatsInfo";
+    private static final String OPENGL_TEXTURE_FORMAT_TAG = "TextureFormat";
+    private static final String OPENGL_TEXTURE_FORMAT_DELIM = ";";
+    private static final String SYSLIB_INFO_TAG = "SystemLibrariesInfo";
+    private static final String SYSLIB_TAG = "Library";
+    private static final String SYSLIB_DELIM = ";";
     private static final String PROCESS_INFO_TAG = "ProcessInfo";
     private static final String PROCESS_TAG = "Process";
     private static final String PROCESS_DELIM = ";";
@@ -83,6 +90,9 @@
 
             String featureData = getMetric(metricsCopy, DeviceInfoConstants.FEATURES);
             String processData = getMetric(metricsCopy, DeviceInfoConstants.PROCESSES);
+            String sysLibData = getMetric(metricsCopy, DeviceInfoConstants.SYS_LIBRARIES);
+            String textureData = getMetric(metricsCopy,
+                    DeviceInfoConstants.OPEN_GL_COMPRESSED_TEXTURE_FORMATS);
 
             // dump the remaining metrics without translation
             serializer.startTag(ns, BUILD_TAG);
@@ -93,6 +103,8 @@
 
             serializeFeatureInfo(serializer, featureData);
             serializeProcessInfo(serializer, processData);
+            serializeSystemLibrariesInfo(serializer, sysLibData);
+            serializeOpenGLCompressedTextureFormatsInfo(serializer, textureData);
         } else {
             // this might be expected, if device info collection was turned off
             CLog.d("Could not find device info");
@@ -184,6 +196,73 @@
     }
 
     /**
+     * Prints XML data in two level hierarchy.
+     * It parses a string from the root argument that is in the form of
+     * "element1-delimiter-element2-delimiter..." with a trailing delimiter
+     *
+     * <pre>
+     *   <infoTag>
+     *     <elementTag name="element1" />
+     *     ...
+     *   </infoTag>
+     * </pre>
+     */
+    private void serializeSimpleInfo(KXmlSerializer serializer, String root,
+            String infoTag, String elementTag, String delimiter)
+            throws IOException {
+        serializer.startTag(ns, infoTag);
+
+        if (root == null) {
+            root = "";
+        }
+
+        String[] elemNames = root.split(delimiter);
+        for (String elemName : elemNames) {
+            elemName = elemName.trim();
+            if (elemName.length() > 0) {
+                serializer.startTag(ns, elementTag);
+                serializer.attribute(ns, "name", elemName);
+                serializer.endTag(ns, elementTag);
+            }
+        }
+        serializer.endTag(ns, infoTag);
+    }
+
+    /**
+     * Prints XML data listing available OpenGL Compressed Texture Formats.
+     *
+     * <pre>
+     *   <OpenGLCompressedTextureFormatsInfo>
+     *     <TextureFormat name="abc" />
+     *     ...
+     *   </OpenGLCompressedTextureFormatsInfo>
+     * </pre>
+     */
+    private void serializeOpenGLCompressedTextureFormatsInfo(KXmlSerializer serializer,
+            String root) throws IOException {
+        serializeSimpleInfo(serializer, root, OPENGL_TEXTURE_FORMATS_INFO_TAG,
+                OPENGL_TEXTURE_FORMAT_TAG,
+                OPENGL_TEXTURE_FORMAT_DELIM);
+    }
+
+    /**
+     * Prints XML data listing available system libraries.
+     * It parses a string from the rootLibraries argument that is in the form of
+     * "libName1;libName2;..." with a trailing semi-colon.
+     *
+     * <pre>
+     *   <SystemLibrariesInfo>
+     *     <Library name="a.b.c" />
+     *     ...
+     *   </SystemLibrariesInfo>
+     * </pre>
+     */
+    private void serializeSystemLibrariesInfo(KXmlSerializer serializer, String rootLibraries)
+            throws IOException {
+        serializeSimpleInfo(serializer, rootLibraries, SYSLIB_INFO_TAG, SYSLIB_TAG, SYSLIB_DELIM);
+    }
+
+    /**
      * Populates this class with package result data parsed from XML.
      *
      * @param parser the {@link XmlPullParser}. Expected to be pointing at start
@@ -210,6 +289,15 @@
                     // store processes into metrics map, in the same format as when collected from
                     // device
                     mMetrics.put(DeviceInfoConstants.PROCESSES, parseProcess(parser));
+                } else if (parser.getName().equals(SYSLIB_INFO_TAG)) {
+                    // store system libs into metrics map, in the same format as when collected from
+                    // device
+                    mMetrics.put(DeviceInfoConstants.SYS_LIBRARIES, parseSystemLibraries(parser));
+                } else if (parser.getName().equals(OPENGL_TEXTURE_FORMATS_INFO_TAG)) {
+                    // store OpenGL texture formats into metrics map, in the same format as when
+                    // collected from device
+                    mMetrics.put(DeviceInfoConstants.OPEN_GL_COMPRESSED_TEXTURE_FORMATS,
+                            parseOpenGLCompressedTextureFormats(parser));
                 }
             } else if (eventType == XmlPullParser.END_TAG && parser.getName().equals(TAG)) {
                 return;
@@ -272,6 +360,48 @@
     }
 
     /**
+     * Parse two-level hierarchy XML, and return its contents as a delimited String
+     */
+    private String parseSimpleInfo(XmlPullParser parser, String infoTag, String elementTag,
+            String delimiter) throws XmlPullParserException, IOException {
+        if (!parser.getName().equals(infoTag)) {
+            throw new XmlPullParserException(String.format(
+                    "invalid XML: Expected %s tag but received %s", infoTag,
+                    parser.getName()));
+        }
+        StringBuilder result = new StringBuilder();
+        int eventType = parser.getEventType();
+        while (eventType != XmlPullParser.END_DOCUMENT) {
+            if (eventType == XmlPullParser.START_TAG && parser.getName().equals(elementTag)) {
+                result.append(getAttribute(parser, "name"));
+                result.append(delimiter);
+            } else if (eventType == XmlPullParser.END_TAG && parser.getName().equals(
+                    infoTag)) {
+                return result.toString();
+            }
+            eventType = parser.next();
+        }
+        return result.toString();
+    }
+
+    /**
+     * Parse JavaLibrariesInfo XML, and return its contents as a delimited String
+     */
+    private String parseOpenGLCompressedTextureFormats(XmlPullParser parser)
+            throws XmlPullParserException, IOException {
+        return parseSimpleInfo(parser, OPENGL_TEXTURE_FORMATS_INFO_TAG, OPENGL_TEXTURE_FORMAT_TAG,
+                OPENGL_TEXTURE_FORMAT_DELIM);
+    }
+
+    /**
+     * Parse JavaLibrariesInfo XML, and return its contents as a delimited String
+     */
+    private String parseSystemLibraries(XmlPullParser parser)
+            throws XmlPullParserException, IOException {
+        return parseSimpleInfo(parser, SYSLIB_INFO_TAG, SYSLIB_TAG, SYSLIB_DELIM);
+    }
+
+    /**
      * Adds all attributes from the current XML tag to metrics as name-value pairs
      */
     private void addMetricsFromAttributes(XmlPullParser parser) {
diff --git a/tools/tradefed-host/src/com/android/cts/tradefed/result/ITestSummary.java b/tools/tradefed-host/src/com/android/cts/tradefed/result/ITestSummary.java
index 509e564..98494ee 100644
--- a/tools/tradefed-host/src/com/android/cts/tradefed/result/ITestSummary.java
+++ b/tools/tradefed-host/src/com/android/cts/tradefed/result/ITestSummary.java
@@ -57,4 +57,9 @@
      */
     String getStartTime();
 
+    /**
+     * @return a comma separated list of device serials associated with result
+     */
+    String getDeviceSerials();
+
 }
diff --git a/tools/tradefed-host/src/com/android/cts/tradefed/result/IssueReporter.java b/tools/tradefed-host/src/com/android/cts/tradefed/result/IssueReporter.java
new file mode 100644
index 0000000..9d903dd
--- /dev/null
+++ b/tools/tradefed-host/src/com/android/cts/tradefed/result/IssueReporter.java
@@ -0,0 +1,220 @@
+/*
+ * Copyright (C) 2011 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.cts.tradefed.result;
+
+import com.android.ddmlib.testrunner.TestIdentifier;
+import com.android.tradefed.build.IBuildInfo;
+import com.android.tradefed.config.Option;
+import com.android.tradefed.log.LogUtil.CLog;
+import com.android.tradefed.result.ITestInvocationListener;
+import com.android.tradefed.result.InputStreamSource;
+import com.android.tradefed.result.LogDataType;
+import com.android.tradefed.result.TestSummary;
+
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.Map;
+import java.util.concurrent.Callable;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.TimeUnit;
+import java.util.zip.GZIPOutputStream;
+
+/**
+ * Class that sends a HTTP POST multipart/form-data request containing details
+ * about a test failure.
+ */
+public class IssueReporter implements ITestInvocationListener {
+
+    private static final int BUGREPORT_SIZE = 500 * 1024;
+
+    private static final String PRODUCT_NAME_KEY = "buildName";
+    private static final String BUILD_TYPE_KEY = "build_type";
+    private static final String BUILD_ID_KEY = "buildID";
+
+    @Option(name = "issue-server", description = "Server url to post test failures to.")
+    private String mServerUrl;
+
+    private final ExecutorService mReporterService = Executors.newCachedThreadPool();
+
+    private Issue mCurrentIssue;
+    private String mBuildId;
+    private String mBuildType;
+    private String mProductName;
+
+    @Override
+    public void testFailed(TestFailure status, TestIdentifier test, String trace) {
+        mCurrentIssue = new Issue();
+        mCurrentIssue.mTestName = test.toString();
+        mCurrentIssue.mStackTrace = trace;
+    }
+
+    @Override
+    public void testLog(String dataName, LogDataType dataType, InputStreamSource dataStream) {
+        if (dataName.startsWith("bug-")) {
+            try {
+                setBugReport(dataStream);
+            } catch (IOException e) {
+                CLog.e(e);
+            }
+        }
+    }
+
+    /**
+     * Set the bug report for the current test failure. GZip it to save space.
+     * This is only called when the --bugreport option is enabled.
+     */
+    private void setBugReport(InputStreamSource dataStream) throws IOException {
+        if (mCurrentIssue != null) {
+            // Only one bug report can be stored at a time and they are gzipped to
+            // about 0.5 MB so there shoudn't be any memory leak bringing down CTS.
+            InputStream input = null;
+            try {
+                input = dataStream.createInputStream();
+                mCurrentIssue.mBugReport = getBytes(input, BUGREPORT_SIZE);
+            } finally {
+                if (input != null) {
+                    input.close();
+                }
+            }
+        } else {
+            CLog.e("setBugReport is getting called on an empty issue...");
+        }
+    }
+
+    /**
+     * @param input that will be gzipped and returne as a byte array
+     * @param size of the output expected
+     * @return the byte array with the input's data
+     * @throws IOException
+     */
+    static byte[] getBytes(InputStream input, int size) throws IOException {
+        ByteArrayOutputStream byteOutput = new ByteArrayOutputStream(size);
+        GZIPOutputStream gzipOutput = new GZIPOutputStream(byteOutput);
+        for (byte[] buffer = new byte[1024]; ; ) {
+            int numRead = input.read(buffer);
+            if (numRead < 0) {
+                break;
+            }
+            gzipOutput.write(buffer, 0, numRead);
+        }
+        gzipOutput.close();
+        return byteOutput.toByteArray();
+    }
+
+    @Override
+    public void testEnded(TestIdentifier test, Map<String, String> testMetrics) {
+        if (mCurrentIssue != null) {
+            mReporterService.submit(mCurrentIssue);
+            mCurrentIssue = null;
+        }
+    }
+
+    @Override
+    public void testRunEnded(long elapsedTime, Map<String, String> runMetrics) {
+        setDeviceMetrics(runMetrics);
+    }
+
+    /** Set device information. Populated once when the device info app runs. */
+    private void setDeviceMetrics(Map<String, String> metrics) {
+        if (metrics.containsKey(BUILD_ID_KEY)) {
+            mBuildId = metrics.get(BUILD_ID_KEY);
+        }
+        if (metrics.containsKey(BUILD_TYPE_KEY)) {
+            mBuildType = metrics.get(BUILD_TYPE_KEY);
+        }
+        if (metrics.containsKey(PRODUCT_NAME_KEY)) {
+            mProductName = metrics.get(PRODUCT_NAME_KEY);
+        }
+    }
+
+    @Override
+    public void invocationEnded(long elapsedTime) {
+        try {
+            mReporterService.shutdown();
+            if (!mReporterService.awaitTermination(1, TimeUnit.MINUTES)) {
+                CLog.i("Some issues could not be reported...");
+            }
+        } catch (InterruptedException e) {
+            CLog.e(e);
+        }
+    }
+
+    class Issue implements Callable<Void> {
+
+        private String mTestName;
+        private String mStackTrace;
+        private byte[] mBugReport;
+
+        @Override
+        public Void call() throws Exception {
+            if (isEmpty(mServerUrl)
+                    || isEmpty(mBuildId)
+                    || isEmpty(mBuildType)
+                    || isEmpty(mProductName)
+                    || isEmpty(mTestName)
+                    || isEmpty(mStackTrace)) {
+                return null;
+            }
+
+            new MultipartForm(mServerUrl)
+                    .addFormValue("productName", mProductName)
+                    .addFormValue("buildType", mBuildType)
+                    .addFormValue("buildId", mBuildId)
+                    .addFormValue("testName", mTestName)
+                    .addFormValue("stackTrace", mStackTrace)
+                    .addFormFile("bugReport", "bugreport.txt.gz", mBugReport)
+                    .submit();
+
+            return null;
+        }
+
+        private boolean isEmpty(String value) {
+            return value == null || value.trim().isEmpty();
+        }
+    }
+
+    @Override
+    public void invocationStarted(IBuildInfo buildInfo) {
+    }
+
+    @Override
+    public void testRunStarted(String name, int numTests) {
+    }
+
+    @Override
+    public void testStarted(TestIdentifier test) {
+    }
+
+    @Override
+    public void testRunFailed(String arg0) {
+    }
+
+    @Override
+    public void testRunStopped(long elapsedTime) {
+    }
+
+    @Override
+    public void invocationFailed(Throwable cause) {
+    }
+
+    @Override
+    public TestSummary getSummary() {
+        return null;
+    }
+}
diff --git a/tools/tradefed-host/src/com/android/cts/tradefed/result/MultipartForm.java b/tools/tradefed-host/src/com/android/cts/tradefed/result/MultipartForm.java
new file mode 100644
index 0000000..f3ef0bb
--- /dev/null
+++ b/tools/tradefed-host/src/com/android/cts/tradefed/result/MultipartForm.java
@@ -0,0 +1,144 @@
+/*
+ * Copyright (C) 2011 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.cts.tradefed.result;
+
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.io.OutputStreamWriter;
+import java.io.PrintWriter;
+import java.net.HttpURLConnection;
+import java.net.URL;
+import java.util.HashMap;
+import java.util.Map;
+
+/** MultipartForm builds a multipart form and submits it. */
+class MultipartForm {
+
+    private static final String FORM_DATA_BOUNDARY = "C75I55u3R3p0r73r";
+
+    private final String mServerUrl;
+
+    private final Map<String, String> mFormValues = new HashMap<String, String>();
+
+    private String mName;
+    private String mFileName;
+    private byte[] mData;
+
+    public MultipartForm(String serverUrl) {
+        mServerUrl = serverUrl;
+    }
+
+    public MultipartForm addFormValue(String name, String value) {
+        mFormValues.put(name, value);
+        return this;
+    }
+
+    public MultipartForm addFormFile(String name, String fileName, byte[] data) {
+        mName = name;
+        mFileName = fileName;
+        mData = data;
+        return this;
+    }
+
+    public void submit() throws IOException {
+        String redirectUrl = submitForm(mServerUrl);
+        if (redirectUrl != null) {
+            submitForm(redirectUrl);
+        }
+    }
+
+    /**
+     * @param serverUrl to post the data to
+     * @return a url if the server redirected to another url
+     * @throws IOException
+     */
+    private String submitForm(String serverUrl) throws IOException {
+        HttpURLConnection connection = null;
+        try {
+            URL url = new URL(serverUrl);
+            connection = (HttpURLConnection) url.openConnection();
+            connection.setInstanceFollowRedirects(false);
+            connection.setRequestMethod("POST");
+            connection.setDoOutput(true);
+            connection.setRequestProperty("Content-Type",
+                    "multipart/form-data; boundary=" + FORM_DATA_BOUNDARY);
+
+            byte[] body = getContentBody();
+            connection.setRequestProperty("Content-Length", Integer.toString(body.length));
+
+            OutputStream output = connection.getOutputStream();
+            try {
+                output.write(body);
+            } finally {
+                output.close();
+            }
+
+            // Open the stream to get a response. Otherwise request will be cancelled.
+            InputStream input = connection.getInputStream();
+            input.close();
+
+            if (connection.getResponseCode() == 302) {
+                return connection.getHeaderField("Location");
+            }
+        } finally {
+            if (connection != null) {
+                connection.disconnect();
+            }
+        }
+
+        return null;
+    }
+
+    private byte[] getContentBody() throws IOException {
+        ByteArrayOutputStream byteOutput = new ByteArrayOutputStream();
+        PrintWriter writer = new PrintWriter(new OutputStreamWriter(byteOutput));
+        writer.println();
+
+        for (Map.Entry<String, String> formValue : mFormValues.entrySet()) {
+            writeFormField(writer, formValue.getKey(), formValue.getValue());
+        }
+
+        if (mData != null) {
+            writeFormFileHeader(writer, mName, mFileName);
+            writer.flush(); // Must flush here before writing to the byte stream!
+            byteOutput.write(mData);
+            writer.println();
+        }
+        writer.append("--").append(FORM_DATA_BOUNDARY).println("--");
+        writer.flush();
+        writer.close();
+        return byteOutput.toByteArray();
+    }
+
+    private void writeFormField(PrintWriter writer, String name, String value) {
+        writer.append("--").println(FORM_DATA_BOUNDARY);
+        writer.append("Content-Disposition: form-data; name=\"").append(name).println("\"");
+        writer.println();
+        writer.println(value);
+    }
+
+    private void writeFormFileHeader(PrintWriter writer, String name, String fileName) {
+        writer.append("--").println(FORM_DATA_BOUNDARY);
+        writer.append("Content-Disposition: form-data; name=\"").append(name);
+        writer.append("\"; filename=\"").append(fileName).println("\"");
+        writer.println("Content-Type: application/x-gzip");
+        writer.println("Content-Transfer-Encoding: binary");
+        writer.println();
+    }
+}
diff --git a/tools/tradefed-host/src/com/android/cts/tradefed/result/ResultReporter.java b/tools/tradefed-host/src/com/android/cts/tradefed/result/ResultReporter.java
new file mode 100644
index 0000000..05192c9
--- /dev/null
+++ b/tools/tradefed-host/src/com/android/cts/tradefed/result/ResultReporter.java
@@ -0,0 +1,60 @@
+/*
+ * Copyright (C) 2011 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.cts.tradefed.result;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+
+/**
+ * Class that sends a HTTP POST multipart/form-data request containing
+ * the test result XML.
+ */
+class ResultReporter {
+
+    private static final int RESULT_XML_BYTES = 500 * 1024;
+
+    private final String mServerUrl;
+
+    private final File mReportFile;
+
+    ResultReporter(String serverUrl, File reportFile) {
+        mServerUrl = serverUrl;
+        mReportFile = reportFile;
+    }
+
+    public void reportResult() throws IOException {
+        if (isEmpty(mServerUrl)) {
+            return;
+        }
+
+        InputStream input = new FileInputStream(mReportFile);
+        try {
+            byte[] data = IssueReporter.getBytes(input, RESULT_XML_BYTES);
+            new MultipartForm(mServerUrl)
+                    .addFormFile("resultXml", "testResult.xml.gz", data)
+                    .submit();
+        } finally {
+            input.close();
+        }
+    }
+
+    private boolean isEmpty(String value) {
+        return value == null || value.trim().isEmpty();
+    }
+}
diff --git a/tools/tradefed-host/src/com/android/cts/tradefed/result/Test.java b/tools/tradefed-host/src/com/android/cts/tradefed/result/Test.java
index 917ccbe..3c78df7 100644
--- a/tools/tradefed-host/src/com/android/cts/tradefed/result/Test.java
+++ b/tools/tradefed-host/src/com/android/cts/tradefed/result/Test.java
@@ -149,12 +149,22 @@
         }
     }
 
-    private static String getFailureMessageFromStackTrace(String stack) {
-        // This is probably too simplistic to work in all cases, but for now, just return first
-        // line of stack as failure message
-        int firstNewLine = stack.indexOf('\n');
-        if (firstNewLine != -1) {
-            return stack.substring(0, firstNewLine);
+    /**
+     * Gets the failure message to show from the stack trace.
+     * <p/>
+     * Exposed for unit testing
+     *
+     * @param stack the full stack trace
+     * @return the failure message
+     */
+    static String getFailureMessageFromStackTrace(String stack) {
+        // return the first two lines of stack as failure message
+        int endPoint = stack.indexOf('\n');
+        if (endPoint != -1) {
+            int nextLine = stack.indexOf('\n', endPoint + 1);
+            if (nextLine != -1) {
+                return stack.substring(0, nextLine);
+            }
         }
         return stack;
     }
diff --git a/tools/tradefed-host/src/com/android/cts/tradefed/result/TestSummaryXml.java b/tools/tradefed-host/src/com/android/cts/tradefed/result/TestSummaryXml.java
index af37184..36f3297 100644
--- a/tools/tradefed-host/src/com/android/cts/tradefed/result/TestSummaryXml.java
+++ b/tools/tradefed-host/src/com/android/cts/tradefed/result/TestSummaryXml.java
@@ -20,6 +20,8 @@
 import org.xmlpull.v1.XmlPullParser;
 import org.xmlpull.v1.XmlPullParserException;
 
+import android.tests.getinfo.DeviceInfoConstants;
+
 import java.io.FileNotFoundException;
 import java.io.IOException;
 
@@ -35,6 +37,7 @@
     private int mNumPassed = 0;
     private String mPlan = "NA";
     private String mStartTime = "unknown";
+    private String mDeviceSerials = "unknown";
 
     /**
      * @param id
@@ -105,13 +108,17 @@
                 mPlan = getAttribute(parser, CtsXmlResultReporter.PLAN_ATTR);
                 mStartTime = getAttribute(parser, CtsXmlResultReporter.STARTTIME_ATTR);
             } else if (eventType == XmlPullParser.START_TAG && parser.getName().equals(
+                    DeviceInfoResult.BUILD_TAG)) {
+                mDeviceSerials = getAttribute(parser, DeviceInfoConstants.SERIAL_NUMBER);
+            } else if (eventType == XmlPullParser.START_TAG && parser.getName().equals(
                     TestResults.SUMMARY_TAG)) {
                 mNumFailed = parseIntAttr(parser, TestResults.FAILED_ATTR) +
                     parseIntAttr(parser, TestResults.TIMEOUT_ATTR);
                 mNumNotExecuted = parseIntAttr(parser, TestResults.NOT_EXECUTED_ATTR);
                 mNumPassed = parseIntAttr(parser, TestResults.PASS_ATTR);
+                // abort after parsing Summary, which should be the last tag
                 return;
-              }
+             }
             eventType = parser.next();
         }
         throw new XmlPullParserException("Could not find Summary tag");
@@ -124,5 +131,12 @@
     public String getStartTime() {
         return mStartTime;
     }
-}
 
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public String getDeviceSerials() {
+        return mDeviceSerials;
+    }
+}
diff --git a/tools/tradefed-host/src/com/android/cts/tradefed/testtype/CtsTest.java b/tools/tradefed-host/src/com/android/cts/tradefed/testtype/CtsTest.java
index 1360820..c78b71b 100644
--- a/tools/tradefed-host/src/com/android/cts/tradefed/testtype/CtsTest.java
+++ b/tools/tradefed-host/src/com/android/cts/tradefed/testtype/CtsTest.java
@@ -154,7 +154,6 @@
 
         /**
          * Return the test run name that should be used for the TestPackage
-         * @return
          */
         String getTestRunName() {
             return mPackageDef.getUri();
@@ -191,6 +190,7 @@
     /**
      * {@inheritDoc}
      */
+    @Override
     public ITestDevice getDevice() {
         return mDevice;
     }
@@ -198,6 +198,7 @@
     /**
      * {@inheritDoc}
      */
+    @Override
     public void setDevice(ITestDevice device) {
         mDevice = device;
     }
@@ -359,8 +360,6 @@
 
     /**
      * Build the list of test packages to run
-     *
-     * @return
      */
     private List<TestPackage> buildTestsToRun() {
         List<TestPackage> testPkgList = new LinkedList<TestPackage>();
@@ -471,7 +470,6 @@
     /**
      * Return the list of unique prerequisite Android package names
      * @param testPackages
-     * @return
      */
     private Collection<String> getPrerequisitePackageNames(List<TestPackage> testPackages) {
         Set<String> pkgNames = new HashSet<String>();
@@ -487,7 +485,6 @@
     /**
      * Return the list of unique prerequisite apks to install
      * @param testPackages
-     * @return
      */
     private Collection<String> getPrerequisiteApks(List<TestPackage> testPackages) {
         Set<String> apkNames = new HashSet<String>();
@@ -572,9 +569,7 @@
      * <p/>
      * Exposed so unit tests can mock.
      *
-     * @param listeners
      * @throws DeviceNotAvailableException
-     * @throws FileNotFoundException
      */
     void collectDeviceInfo(ITestDevice device, CtsBuildHelper ctsBuild,
             ITestInvocationListener listener) throws DeviceNotAvailableException {
diff --git a/tools/tradefed-host/src/com/android/cts/tradefed/testtype/GeeTest.java b/tools/tradefed-host/src/com/android/cts/tradefed/testtype/GeeTest.java
new file mode 100644
index 0000000..5cfafc6
--- /dev/null
+++ b/tools/tradefed-host/src/com/android/cts/tradefed/testtype/GeeTest.java
@@ -0,0 +1,139 @@
+/*
+ * Copyright (C) 2011 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.cts.tradefed.testtype;
+
+import com.android.cts.tradefed.build.CtsBuildHelper;
+import com.android.ddmlib.testrunner.ITestRunListener;
+import com.android.tradefed.build.IBuildInfo;
+import com.android.tradefed.device.DeviceNotAvailableException;
+import com.android.tradefed.device.ITestDevice;
+import com.android.tradefed.log.LogUtil.CLog;
+import com.android.tradefed.result.ITestInvocationListener;
+import com.android.tradefed.testtype.IBuildReceiver;
+import com.android.tradefed.testtype.IDeviceTest;
+import com.android.tradefed.testtype.IRemoteTest;
+
+import java.io.File;
+
+/**
+ * Test runner for native gTests.
+ *
+ * TODO: This is similar to Tradefed's existing GTest, but it doesn't confirm
+ *       each directory segment exists using ddmlib's file service. This was
+ *       a problem since /data is not visible on a user build, but it is
+ *       executable. It's also a lot more verbose when it comes to errors.
+ */
+public class GeeTest implements IBuildReceiver, IDeviceTest, IRemoteTest {
+
+    private static final String NATIVE_TESTS_DIRECTORY = "/data/local/tmp/cts-native-tests";
+
+    private int mMaxTestTimeMs = 1 * 60 * 1000;
+
+    private CtsBuildHelper mCtsBuild;
+    private ITestDevice mDevice;
+
+    private final String mPackageName;
+    private final String mExeName;
+
+    public GeeTest(String packageName, String exeName) {
+        mPackageName = packageName;
+        mExeName = exeName;
+    }
+
+    @Override
+    public void run(ITestInvocationListener listener) throws DeviceNotAvailableException {
+        if (installTest()) {
+            runTest(listener);
+        } else {
+            CLog.e("Failed to install native tests");
+        }
+    }
+
+    private boolean installTest() throws DeviceNotAvailableException {
+        if (!createRemoteDir(NATIVE_TESTS_DIRECTORY)) {
+            CLog.e("Could not create directory for native tests: " + NATIVE_TESTS_DIRECTORY);
+            return false;
+        }
+
+        File nativeExe = new File(mCtsBuild.getTestCasesDir(), mExeName);
+        if (!nativeExe.exists()) {
+            CLog.e("Native test not found: " + nativeExe);
+            return false;
+        }
+
+        File devicePath = new File(NATIVE_TESTS_DIRECTORY, mExeName);
+        if (!mDevice.pushFile(nativeExe, devicePath.toString())) {
+            CLog.e("Failed to push native test to device");
+            return false;
+        }
+        return true;
+    }
+
+    private boolean createRemoteDir(String remoteFilePath) throws DeviceNotAvailableException {
+        if (mDevice.doesFileExist(remoteFilePath)) {
+            return true;
+        }
+        File remoteFile = new File(remoteFilePath);
+        String parentPath = remoteFile.getParent();
+        if (parentPath != null) {
+            if (!createRemoteDir(parentPath)) {
+                return false;
+            }
+        }
+        mDevice.executeShellCommand(String.format("mkdir %s", remoteFilePath));
+        return mDevice.doesFileExist(remoteFilePath);
+    }
+
+    void runTest(ITestRunListener listener) throws DeviceNotAvailableException {
+        GeeTestResultParser resultParser = new GeeTestResultParser(mPackageName, listener);
+        resultParser.setFakePackagePrefix(mPackageName + ".");
+
+        String fullPath = NATIVE_TESTS_DIRECTORY + File.separator + mExeName;
+        String flags = "";
+        CLog.v("Running gtest %s %s on %s", fullPath, flags, mDevice.getSerialNumber());
+        // force file to be executable
+        CLog.v("%s", mDevice.executeShellCommand(String.format("chmod 755 %s", fullPath)));
+
+        try {
+            mDevice.executeShellCommand(String.format("%s %s", fullPath, flags), resultParser,
+                    mMaxTestTimeMs /* maxTimeToShellOutputResponse */,
+                    0 /* retryAttempts */);
+        } catch (DeviceNotAvailableException e) {
+            resultParser.flush();
+            throw e;
+        } catch (RuntimeException e) {
+            resultParser.flush();
+            throw e;
+        }
+    }
+
+
+    @Override
+    public void setBuild(IBuildInfo buildInfo) {
+        mCtsBuild = CtsBuildHelper.createBuildHelper(buildInfo);
+    }
+
+    @Override
+    public void setDevice(ITestDevice device) {
+        mDevice = device;
+    }
+
+    @Override
+    public ITestDevice getDevice() {
+        return mDevice;
+    }
+}
diff --git a/tools/tradefed-host/src/com/android/cts/tradefed/testtype/GeeTestResultParser.java b/tools/tradefed-host/src/com/android/cts/tradefed/testtype/GeeTestResultParser.java
new file mode 100644
index 0000000..c01da20
--- /dev/null
+++ b/tools/tradefed-host/src/com/android/cts/tradefed/testtype/GeeTestResultParser.java
@@ -0,0 +1,670 @@
+/*
+ * Copyright (C) 2011 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.cts.tradefed.testtype;
+
+import com.android.ddmlib.IShellOutputReceiver;
+import com.android.ddmlib.Log;
+import com.android.ddmlib.MultiLineReceiver;
+import com.android.ddmlib.testrunner.ITestRunListener;
+import com.android.ddmlib.testrunner.TestIdentifier;
+import com.android.tradefed.testtype.testdefs.XmlDefsTest;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+/**
+ * TODO: Merge change to add package prefix to tradefed's GTestResultParser.
+ *       Otherwise this file should be the same as TradeFed's version.
+ *
+ * Parses the 'raw output mode' results of native tests using GTest that run from shell, and informs
+ * a ITestRunListener of the results.
+ * <p>Sample format of output expected:
+ *
+ * <pre>
+ * [==========] Running 15 tests from 1 test case.
+ * [----------] Global test environment set-up.
+ * [----------] 15 tests from MessageTest
+ * [ RUN      ] MessageTest.DefaultConstructor
+ * [       OK ] MessageTest.DefaultConstructor (1 ms)
+ * [ RUN      ] MessageTest.CopyConstructor
+ * external/gtest/test/gtest-message_test.cc:67: Failure
+ * Value of: 5
+ * Expected: 2
+ * external/gtest/test/gtest-message_test.cc:68: Failure
+ * Value of: 1 == 1
+ * Actual: true
+ * Expected: false
+ * [  FAILED  ] MessageTest.CopyConstructor (2 ms)
+ *  ...
+ * [ RUN      ] MessageTest.DoesNotTakeUpMuchStackSpace
+ * [       OK ] MessageTest.DoesNotTakeUpMuchStackSpace (0 ms)
+ * [----------] 15 tests from MessageTest (26 ms total)
+ *
+ * [----------] Global test environment tear-down
+ * [==========] 15 tests from 1 test case ran. (26 ms total)
+ * [  PASSED  ] 6 tests.
+ * [  FAILED  ] 9 tests, listed below:
+ * [  FAILED  ] MessageTest.CopyConstructor
+ * [  FAILED  ] MessageTest.ConstructsFromCString
+ * [  FAILED  ] MessageTest.StreamsCString
+ * [  FAILED  ] MessageTest.StreamsNullCString
+ * [  FAILED  ] MessageTest.StreamsString
+ * [  FAILED  ] MessageTest.StreamsStringWithEmbeddedNUL
+ * [  FAILED  ] MessageTest.StreamsNULChar
+ * [  FAILED  ] MessageTest.StreamsInt
+ * [  FAILED  ] MessageTest.StreamsBasicIoManip
+ * 9 FAILED TESTS
+ * </pre>
+ *
+ * <p>where the following tags are used to signal certain events:
+ * <pre>
+ * [==========]: the first occurrence indicates a new run started, including the number of tests
+ *                  to be expected in this run
+ * [ RUN      ]: indicates a new test has started to run; a series of zero or more lines may
+ *                  follow a test start, and will be captured in case of a test failure or error
+ * [       OK ]: the preceding test has completed successfully, optionally including the time it
+ *                  took to run (in ms)
+ * [  FAILED  ]: the preceding test has failed, optionally including the time it took to run (in ms)
+ * [==========]: the preceding test run has completed, optionally including the time it took to run
+ *                  (in ms)
+ * </pre>
+ *
+ * All other lines are ignored.
+ */
+public class GeeTestResultParser extends MultiLineReceiver {
+    private static final String LOG_TAG = "GTestResultParser";
+
+    // Variables to keep track of state
+    private TestResult mCurrentTestResult = null;
+    private int mNumTestsRun = 0;
+    private int mNumTestsExpected = 0;
+    private long mTotalRunTime = 0;
+    private boolean mTestInProgress = false;
+    private boolean mTestRunInProgress = false;
+    private final String mTestRunName;
+    private final Collection<ITestRunListener> mTestListeners;
+
+    /** Fake adding a package prefix if the test listener needs it. */
+    private String mFakePackagePrefix = "";
+
+    /** True if start of test has already been reported to listener. */
+    private boolean mTestRunStartReported = false;
+
+    /** True if current test run has been canceled by user. */
+    private boolean mIsCancelled = false;
+
+    private String mCoverageTarget = null;
+
+    /**
+     * Test result data
+     */
+    private static class TestResult {
+        private String mTestName = null;
+        private String mTestClass = null;
+        private StringBuilder mStackTrace = null;
+        @SuppressWarnings("unused")
+        private Long mRunTime = null;
+
+        /** Returns whether expected values have been parsed
+         *
+         * @return true if all expected values have been parsed
+         */
+        boolean isComplete() {
+            return mTestName != null && mTestClass != null;
+        }
+
+        /** Returns whether there is currently a stack trace
+         *
+         * @return true if there is currently a stack trace, false otherwise
+         */
+        boolean hasStackTrace() {
+            return mStackTrace != null;
+        }
+
+        /**
+         * Returns the stack trace of the current test.
+         *
+         * @return a String representation of the current test's stack trace; if there is not
+         * a current stack trace, it returns an error string. Use {@link TestResult#hasStackTrace}
+         * if you need to know whether there is a stack trace.
+         */
+        String getTrace() {
+            if (hasStackTrace()) {
+                return mStackTrace.toString();
+            } else {
+                Log.e(LOG_TAG, "Could not find stack trace for failed test");
+                return new Throwable("Unknown failure").toString();
+            }
+        }
+
+        /** Provides a more user readable string for TestResult, if possible */
+        @Override
+        public String toString() {
+            StringBuilder output = new StringBuilder();
+            if (mTestClass != null ) {
+                output.append(mTestClass);
+                output.append('#');
+            }
+            if (mTestName != null) {
+                output.append(mTestName);
+            }
+            if (output.length() > 0) {
+                return output.toString();
+            }
+            return "unknown result";
+        }
+    }
+
+    /** Internal helper struct to store parsed test info. */
+    private static class ParsedTestInfo {
+        String mTestName = null;
+        String mTestClassName = null;
+        String mTestRunTime = null;
+
+        public ParsedTestInfo(String testName, String testClassName, String testRunTime) {
+            mTestName = testName;
+            mTestClassName = testClassName;
+            mTestRunTime = testRunTime;
+        }
+    }
+
+    /** Prefixes used to demarcate and identify output. */
+    private static class Prefixes {
+        @SuppressWarnings("unused")
+        private static final String INFORMATIONAL_MARKER = "[----------]";
+        private static final String START_TEST_RUN_MARKER = "[==========] Running";
+        private static final String TEST_RUN_MARKER = "[==========]";
+        private static final String START_TEST_MARKER = "[ RUN      ]";
+        private static final String OK_TEST_MARKER = "[       OK ]";
+        private static final String FAILED_TEST_MARKER = "[  FAILED  ]";
+    }
+
+    /**
+     * Creates the GTestResultParser.
+     *
+     * @param testRunName the test run name to provide to
+     *            {@link ITestRunListener#testRunStarted(String, int)}
+     * @param listeners informed of test results as the tests are executing
+     */
+    public GeeTestResultParser(String testRunName, Collection<ITestRunListener> listeners) {
+        mTestRunName = testRunName;
+        mTestListeners = new ArrayList<ITestRunListener>(listeners);
+    }
+
+    /**
+     * Creates the GTestResultParser for a single listener.
+     *
+     * @param testRunName the test run name to provide to
+     *            {@link ITestRunListener#testRunStarted(String, int)}
+     * @param listener informed of test results as the tests are executing
+     */
+    public GeeTestResultParser(String testRunName, ITestRunListener listener) {
+        mTestRunName = testRunName;
+        mTestListeners = new ArrayList<ITestRunListener>(1);
+        mTestListeners.add(listener);
+    }
+
+    /**
+     * Package prefix to be added to test names when they are reported like
+     * "android.nativemedia." You may need to add the dot if you need it.
+     */
+    public void setFakePackagePrefix(String prefix) {
+        mFakePackagePrefix = prefix;
+    }
+
+    /**
+     * Returns the current TestResult for test in progress, or a new default one.
+     *
+     * @return The TestResult for the current test run
+     */
+    private TestResult getCurrentTestResult() {
+        if (mCurrentTestResult == null) {
+            mCurrentTestResult = new TestResult();
+        }
+        return mCurrentTestResult;
+    }
+
+
+    /**
+     * Clears out the current TestResult.
+     */
+    private void clearCurrentTestResult() {
+        mCurrentTestResult = null;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public void processNewLines(String[] lines) {
+        for (String line : lines) {
+            parse(line);
+        }
+    }
+
+    /**
+     * Parse an individual output line.
+     *
+     * @param line  Text output line
+     */
+    private void parse(String line) {
+        String message = null;
+
+        if (mTestRunInProgress || line.startsWith(Prefixes.TEST_RUN_MARKER)) {
+            if (line.startsWith(Prefixes.START_TEST_MARKER)) {
+                // Individual test started
+                message = line.substring(Prefixes.START_TEST_MARKER.length()).trim();
+                processTestStartedTag(message);
+            }
+            else if (line.startsWith(Prefixes.OK_TEST_MARKER)) {
+                // Individual test completed successfully
+                message = line.substring(Prefixes.OK_TEST_MARKER.length()).trim();
+                processOKTag(message);
+                clearCurrentTestResult();
+            }
+            else if (line.startsWith(Prefixes.FAILED_TEST_MARKER)) {
+                // Individual test completed with failure
+                message = line.substring(Prefixes.FAILED_TEST_MARKER.length()).trim();
+                processFailedTag(message);
+                clearCurrentTestResult();
+            }
+            else if (line.startsWith(Prefixes.START_TEST_RUN_MARKER)) {
+                // Test run started
+                // Make sure to leave the "Running" in the string
+                message = line.substring(Prefixes.TEST_RUN_MARKER.length()).trim();
+                processRunStartedTag(message);
+            }
+            else if (line.startsWith(Prefixes.TEST_RUN_MARKER)) {
+                // Test run ended
+                // This is for the end of the test suite run, so make sure this else-if is after the
+                // check for START_TEST_SUITE_MARKER
+                message = line.substring(Prefixes.TEST_RUN_MARKER.length()).trim();
+                processRunCompletedTag(message);
+            }
+            else if (testInProgress()) {
+                // Note this does not handle the case of an error outside an actual test run
+                appendTestOutputLine(line);
+            }
+        }
+    }
+
+    /**
+     * Returns true if test run canceled.
+     *
+     * @see IShellOutputReceiver#isCancelled()
+     */
+    public boolean isCancelled() {
+        return mIsCancelled;
+    }
+
+    /**
+     * Requests cancellation of test run.
+     */
+    public void cancel() {
+        mIsCancelled = true;
+    }
+
+    /**
+     * Returns whether we're in the middle of running a test.
+     *
+     * @return True if a test was started, false otherwise
+     */
+    private boolean testInProgress() {
+        return mTestInProgress;
+    }
+
+    /**
+     * Set state to indicate we've started running a test.
+     *
+     */
+    private void setTestStarted() {
+        mTestInProgress = true;
+    }
+
+    /**
+     * Set state to indicate we've started running a test.
+     *
+     */
+    private void setTestEnded() {
+        mTestInProgress = false;
+    }
+
+    /**
+     * Reports the start of a test run, and the total test count, if it has not been previously
+     * reported.
+     */
+    private void reportTestRunStarted() {
+        // if start test run not reported yet
+        if (!mTestRunStartReported) {
+            for (ITestRunListener listener : mTestListeners) {
+                listener.testRunStarted(mTestRunName, mNumTestsExpected);
+            }
+            mTestRunStartReported = true;
+        }
+    }
+
+    /**
+     * Reports the end of a test run, and resets that test
+     */
+    private void reportTestRunEnded() {
+        for (ITestRunListener listener : mTestListeners) {
+            listener.testRunEnded(mTotalRunTime, getRunMetrics());
+        }
+        mTestRunStartReported = false;
+    }
+
+    /**
+     * Create the run metrics {@link Map} to report.
+     *
+     * @return a {@link Map} of run metrics data
+     */
+    private Map<String, String> getRunMetrics() {
+        Map<String, String> metricsMap = new HashMap<String, String>();
+        if (mCoverageTarget != null) {
+            metricsMap.put(XmlDefsTest.COVERAGE_TARGET_KEY, mCoverageTarget);
+        }
+        return metricsMap;
+    }
+
+    /**
+     * Parse the test identifier (class and test name), and optional time info.
+     *
+     * @param identifier Raw identifier of the form classname.testname, with an optional time
+     *          element in the format of (XX ms) at the end
+     * @return A ParsedTestInfo representing the parsed info from the identifier string.
+     *
+     *          If no time tag was detected, then the third element in the array (time_in_ms) will
+     *          be null. If the line failed to parse properly (eg: could not determine name of
+     *          test/class) then an "UNKNOWN" string value will be returned for the classname and
+     *          testname. This method guarantees a string will always be returned for the class and
+     *          test names (but not for the time value).
+     */
+    private ParsedTestInfo parseTestIdentifier(String identifier) {
+        ParsedTestInfo returnInfo = new ParsedTestInfo("UNKNOWN_CLASS", "UNKNOWN_TEST", null);
+
+        Pattern timePattern = Pattern.compile(".*(\\((\\d+) ms\\))");  // eg: (XX ms)
+        Matcher time = timePattern.matcher(identifier);
+
+        // Try to find a time
+        if (time.find()) {
+            String timeString = time.group(2);  // the "XX" in "(XX ms)"
+            String discardPortion = time.group(1);  // everything after the test class/name
+            identifier = identifier.substring(0, identifier.lastIndexOf(discardPortion)).trim();
+            returnInfo.mTestRunTime = timeString;
+        }
+
+        String[] testId = identifier.split("\\.");
+        if (testId.length < 2) {
+            Log.e(LOG_TAG, "Could not detect the test class and test name, received: " +
+                    identifier);
+        }
+        else {
+            returnInfo.mTestClassName = testId[0];
+            returnInfo.mTestName = testId[1];
+        }
+        return returnInfo;
+    }
+
+    /**
+     * Parses and stores the test identifier (class and test name).
+     *
+     * @param identifier Raw identifier
+     */
+    private void processRunStartedTag(String identifier) {
+        // eg: (Running XX tests from 1 test case.)
+        Pattern numTestsPattern = Pattern.compile("Running (\\d+) test[s]? from .*");
+        Matcher numTests = numTestsPattern.matcher(identifier);
+
+        // Try to find number of tests
+        if (numTests.find()) {
+            try {
+                mNumTestsExpected = Integer.parseInt(numTests.group(1));
+            }
+            catch (NumberFormatException e) {
+                Log.e(LOG_TAG, "Unable to determine number of tests expected, received: " +
+                        numTests.group(1));
+            }
+        }
+        if (mNumTestsExpected > 0) {
+          reportTestRunStarted();
+          mNumTestsRun = 0;
+          mTestRunInProgress = true;
+        }
+    }
+
+    /**
+     * Processes and informs listener when we encounter a tag indicating that a test suite is done.
+     *
+     * @param identifier Raw log output from the suite ended tag
+     */
+    private void processRunCompletedTag(String identifier) {
+        Pattern timePattern = Pattern.compile(".*\\((\\d+) ms total\\)");  // eg: (XX ms total)
+        Matcher time = timePattern.matcher(identifier);
+
+        // Try to find the total run time
+        if (time.find()) {
+            try {
+                mTotalRunTime = Long.parseLong(time.group(1));
+            }
+            catch (NumberFormatException e) {
+                Log.e(LOG_TAG, "Unable to determine the total running time, received: " +
+                        time.group(1));
+            }
+        }
+        reportTestRunEnded();
+        mTestRunInProgress = false;
+    }
+
+    /**
+     * Processes and informs listener when we encounter a tag indicating that a test has started.
+     *
+     * @param identifier Raw log output of the form classname.testname, with an optional time (x ms)
+     */
+    private void processTestStartedTag(String identifier) {
+        ParsedTestInfo parsedResults = parseTestIdentifier(identifier);
+        TestResult testResult = getCurrentTestResult();
+        testResult.mTestClass = parsedResults.mTestClassName;
+        testResult.mTestName = parsedResults.mTestName;
+
+        TestIdentifier testId = new TestIdentifier(mFakePackagePrefix + testResult.mTestClass,
+                testResult.mTestName);
+
+        for (ITestRunListener listener : mTestListeners) {
+            listener.testStarted(testId);
+        }
+        setTestStarted();
+    }
+
+    /**
+     * Helper method to do the work necessary when a test has ended.
+     *
+     * @param identifier Raw log output of the form "classname.testname" with an optional (XX ms)
+     *          at the end indicating the running time.
+     * @param testPassed Indicates whether the test passed or failed (set to true if passed, false
+     *          if failed)
+     */
+    private void doTestEnded(String identifier, boolean testPassed) {
+        ParsedTestInfo parsedResults = parseTestIdentifier(identifier);
+        TestResult testResult = getCurrentTestResult();
+        TestIdentifier testId = new TestIdentifier(mFakePackagePrefix + testResult.mTestClass,
+                testResult.mTestName);
+
+        // Error - trying to end a test when one isn't in progress
+        if (!testInProgress()) {
+            Log.e(LOG_TAG, "Test currently not in progress when trying to end test: " + identifier);
+            return;
+        }
+
+        // Save the run time for this test if one exists
+        if (parsedResults.mTestRunTime != null) {
+            try {
+                testResult.mRunTime = new Long(parsedResults.mTestRunTime);
+            }
+            catch (NumberFormatException e) {
+                Log.e(LOG_TAG, "Test run time value is invalid, received: " +
+                        parsedResults.mTestRunTime);
+            }
+        }
+
+        // Check that the test result is for the same test/class we're expecting it to be for
+        boolean encounteredUnexpectedTest = false;
+        if (!testResult.isComplete()) {
+            Log.e(LOG_TAG, "No test/class name is currently recorded as running!");
+        }
+        else {
+            if (testResult.mTestClass.compareTo(parsedResults.mTestClassName) != 0) {
+                Log.e(LOG_TAG, "Name for current test class does not match class we started " +
+                        "with, expected: " + testResult.mTestClass + " but got: " +
+                        parsedResults.mTestClassName);
+                encounteredUnexpectedTest = true;
+            }
+            if (testResult.mTestName.compareTo(parsedResults.mTestName) != 0) {
+                Log.e(LOG_TAG, "Name for current test does not match test we started with," +
+                        "expected: " + testResult.mTestName + " bug got: " +
+                        parsedResults.mTestName);
+                encounteredUnexpectedTest = true;
+            }
+        }
+
+        if (encounteredUnexpectedTest) {
+            // If the test name of the result changed from what we started with, report that
+            // the last known test failed, regardless of whether we received a pass or fail tag.
+            for (ITestRunListener listener : mTestListeners) {
+                listener.testFailed(ITestRunListener.TestFailure.ERROR, testId,
+                                mCurrentTestResult.getTrace());
+            }
+        }
+        else if (!testPassed) {  // test failed
+            for (ITestRunListener listener : mTestListeners) {
+                listener.testFailed(ITestRunListener.TestFailure.FAILURE, testId,
+                                mCurrentTestResult.getTrace());
+            }
+        }
+        // For all cases (pass or fail), we ultimately need to report test has ended
+        Map <String, String> emptyMap = Collections.emptyMap();
+        for (ITestRunListener listener : mTestListeners) {
+            // @TODO: Add reporting of test run time to ITestRunListener
+            listener.testEnded(testId, emptyMap);
+        }
+
+        setTestEnded();
+        ++mNumTestsRun;
+    }
+
+    /**
+     * Processes and informs listener when we encounter the OK tag.
+     *
+     * @param identifier Raw log output of the form "classname.testname" with an optional (XX ms)
+     *          at the end indicating the running time.
+     */
+    private void processOKTag(String identifier) {
+        doTestEnded(identifier, true);
+    }
+
+    /**
+     * Processes and informs listener when we encounter the FAILED tag.
+     *
+     * @param identifier Raw log output of the form "classname.testname" with an optional (XX ms)
+     *          at the end indicating the running time.
+     */
+    private void processFailedTag(String identifier) {
+        doTestEnded(identifier, false);
+    }
+
+    /**
+     * Appends the test output to the current TestResult.
+     *
+     * @param line Raw test result line of output.
+     */
+    private void appendTestOutputLine(String line) {
+        TestResult testResult = getCurrentTestResult();
+        if (testResult.mStackTrace == null) {
+            testResult.mStackTrace = new StringBuilder();
+        }
+        else {
+            testResult.mStackTrace.append("\r\n");
+        }
+        testResult.mStackTrace.append(line);
+    }
+
+    /**
+     * Process an instrumentation run failure
+     *
+     * @param errorMsg The message to output about the nature of the error
+     */
+    private void handleTestRunFailed(String errorMsg) {
+        errorMsg = (errorMsg == null ? "Unknown error" : errorMsg);
+        Log.i(LOG_TAG, String.format("Test run failed: %s", errorMsg));
+        String testRunStackTrace = "";
+
+        // Report that the last known test failed
+        if ((mCurrentTestResult != null) && (mCurrentTestResult.isComplete())) {
+            // current test results are cleared out after every complete test run,
+            // if it's not null, assume the last test caused this and report as a test failure
+            TestIdentifier testId = new TestIdentifier(mCurrentTestResult.mTestClass,
+                    mCurrentTestResult.mTestName);
+
+            // If there was any stack trace during the test run, append it to the "test failed"
+            // error message so we have an idea of what caused the crash/failure.
+            Map<String, String> emptyMap = Collections.emptyMap();
+            if (mCurrentTestResult.hasStackTrace()) {
+                testRunStackTrace = mCurrentTestResult.getTrace();
+            }
+            for (ITestRunListener listener : mTestListeners) {
+                listener.testFailed(ITestRunListener.TestFailure.ERROR, testId,
+                        "No test results.\r\n" + testRunStackTrace);
+                listener.testEnded(testId, emptyMap);
+            }
+            clearCurrentTestResult();
+        }
+        // Report the test run failed
+        for (ITestRunListener listener : mTestListeners) {
+            listener.testRunFailed(errorMsg);
+            listener.testRunEnded(mTotalRunTime, getRunMetrics());
+        }
+    }
+
+    /**
+     * Called by parent when adb session is complete.
+     */
+    @Override
+    public void done() {
+        super.done();
+        if (mNumTestsExpected > mNumTestsRun) {
+            handleTestRunFailed(String.format("Test run incomplete. Expected %d tests, received %d",
+                    mNumTestsExpected, mNumTestsRun));
+        }
+        else if (mTestRunInProgress) {
+            handleTestRunFailed("No test results");
+        }
+    }
+
+    /**
+     * Sets the coverage target for this test.
+     * <p/>
+     * Will be sent as a metric to test listeners.
+     *
+     * @param coverageTarget the coverage target
+     */
+    public void setCoverageTarget(String coverageTarget) {
+        mCoverageTarget = coverageTarget;
+    }
+}
diff --git a/tools/tradefed-host/src/com/android/cts/tradefed/testtype/JarHostTest.java b/tools/tradefed-host/src/com/android/cts/tradefed/testtype/JarHostTest.java
index 110bc98..d322724 100644
--- a/tools/tradefed-host/src/com/android/cts/tradefed/testtype/JarHostTest.java
+++ b/tools/tradefed-host/src/com/android/cts/tradefed/testtype/JarHostTest.java
@@ -55,12 +55,14 @@
     private long mTimeoutMs = 10 * 60 * 1000;
     private String mRunName;
     private CtsBuildHelper mCtsBuild = null;
+    private IBuildInfo mBuildInfo = null;
 
     /**
      * {@inheritDoc}
      */
     @Override
     public void setBuild(IBuildInfo buildInfo) {
+        mBuildInfo = buildInfo;
         mCtsBuild = CtsBuildHelper.createBuildHelper(buildInfo);
     }
 
@@ -195,6 +197,9 @@
             deviceTest.setDevice(getDevice().getIDevice());
             deviceTest.setTestAppPath(mCtsBuild.getTestCasesDir().getAbsolutePath());
         }
+        if (junitTest instanceof IBuildReceiver) {
+            ((IBuildReceiver)junitTest).setBuild(mBuildInfo);
+        }
         TestRunnable testRunnable = new TestRunnable(junitTest, junitResult);
 
         CommandStatus status = RunUtil.getDefault().runTimed(mTimeoutMs, testRunnable, true);
diff --git a/tools/tradefed-host/src/com/android/cts/tradefed/testtype/TestPackageDef.java b/tools/tradefed-host/src/com/android/cts/tradefed/testtype/TestPackageDef.java
index 8844667..8cccab0 100644
--- a/tools/tradefed-host/src/com/android/cts/tradefed/testtype/TestPackageDef.java
+++ b/tools/tradefed-host/src/com/android/cts/tradefed/testtype/TestPackageDef.java
@@ -50,6 +50,7 @@
     private String mRunner = null;
     private boolean mIsHostSideTest = false;
     private boolean mIsVMHostTest = false;
+    private String mTestType = null;
     private String mJarPath = null;
     private boolean mIsSignatureTest = false;
     private boolean mIsReferenceAppTest = false;
@@ -78,6 +79,7 @@
     /**
      * {@inheritDoc}
      */
+    @Override
     public String getUri() {
         return mUri;
     }
@@ -128,6 +130,10 @@
         return mIsVMHostTest;
     }
 
+    void setTestType(String testType) {
+        mTestType = testType;
+    }
+
     void setJarPath(String jarPath) {
         mJarPath = jarPath;
     }
@@ -229,6 +235,8 @@
             vmHostTest.setTests(mTests);
             mDigest = generateDigest(testCaseDir, mJarPath);
             return vmHostTest;
+        } else if ("native".equals(mTestType)) {
+            return new GeeTest(mUri, mName);
         } else if (mIsSignatureTest) {
             // TODO: hardcode the runner/class/method for now, since current package xml points to
             // specialized instrumentation. Eventually this special case for signatureTest can be
@@ -302,6 +310,7 @@
     /**
      * {@inheritDoc}
      */
+    @Override
     public boolean isKnownTest(TestIdentifier testDef) {
         return mTests.contains(testDef);
     }
@@ -309,6 +318,7 @@
     /**
      * {@inheritDoc}
      */
+    @Override
     public boolean isKnownTestClass(String className) {
         return mTestClasses.contains(className);
     }
diff --git a/tools/tradefed-host/src/com/android/cts/tradefed/testtype/TestPackageXmlParser.java b/tools/tradefed-host/src/com/android/cts/tradefed/testtype/TestPackageXmlParser.java
index 64706a2..f1b6ed0 100644
--- a/tools/tradefed-host/src/com/android/cts/tradefed/testtype/TestPackageXmlParser.java
+++ b/tools/tradefed-host/src/com/android/cts/tradefed/testtype/TestPackageXmlParser.java
@@ -68,6 +68,7 @@
                 final String runnerName = attributes.getValue("runner");
                 final String hostSideTest = attributes.getValue("hostSideOnly");
                 final String vmHostTest = attributes.getValue("vmHostTest");
+                final String testType = attributes.getValue("testType");
                 final String jarPath = attributes.getValue("jarPath");
                 final String signatureCheck = attributes.getValue("signatureCheck");
                 final String referenceApp = attributes.getValue("referenceAppTest");
@@ -84,6 +85,7 @@
                 mPackageDef.setRunner(runnerName);
                 mPackageDef.setIsHostSideTest(parseBoolean(hostSideTest));
                 mPackageDef.setIsVMHostTest(parseBoolean(vmHostTest));
+                mPackageDef.setTestType(testType);
                 mPackageDef.setJarPath(jarPath);
                 mPackageDef.setIsSignatureCheck(parseBoolean(signatureCheck));
                 mPackageDef.setIsReferenceApp(parseBoolean(referenceApp));
diff --git a/tools/tradefed-host/tests/src/com/android/cts/tradefed/UnitTests.java b/tools/tradefed-host/tests/src/com/android/cts/tradefed/UnitTests.java
index 9a62af3..0dc7257 100644
--- a/tools/tradefed-host/tests/src/com/android/cts/tradefed/UnitTests.java
+++ b/tools/tradefed-host/tests/src/com/android/cts/tradefed/UnitTests.java
@@ -16,6 +16,7 @@
 package com.android.cts.tradefed;
 
 import com.android.cts.tradefed.result.CtsXmlResultReporterTest;
+import com.android.cts.tradefed.result.TestTest;
 import com.android.cts.tradefed.testtype.CtsTestTest;
 import com.android.cts.tradefed.testtype.JarHostTestTest;
 import com.android.cts.tradefed.testtype.TestPackageDefTest;
@@ -41,6 +42,7 @@
         addTestSuite(TestPlanTest.class);
         addTestSuite(TestPackageXmlParserTest.class);
         addTestSuite(TestPackageDefTest.class);
+        addTestSuite(TestTest.class);
     }
 
     public static Test suite() {
diff --git a/tools/tradefed-host/tests/src/com/android/cts/tradefed/result/CtsXmlResultReporterTest.java b/tools/tradefed-host/tests/src/com/android/cts/tradefed/result/CtsXmlResultReporterTest.java
index dcf013c..94b7344 100644
--- a/tools/tradefed-host/tests/src/com/android/cts/tradefed/result/CtsXmlResultReporterTest.java
+++ b/tools/tradefed-host/tests/src/com/android/cts/tradefed/result/CtsXmlResultReporterTest.java
@@ -83,7 +83,7 @@
         final String expectedHeaderOutput = "<?xml version='1.0' encoding='UTF-8' standalone='no' ?>" +
             "<?xml-stylesheet type=\"text/xsl\" href=\"cts_result.xsl\"?>";
         final String expectedTestOutput =
-            "<TestResult testPlan=\"NA\" starttime=\"ignore\" endtime=\"ignore\" version=\"1.11\"> ";
+            "<TestResult testPlan=\"NA\" starttime=\"ignore\" endtime=\"ignore\" version=\"1.13\"> ";
         final String expectedSummaryOutput =
             "<Summary failed=\"0\" notExecuted=\"0\" timeout=\"0\" pass=\"0\" />";
         final String expectedEndTag = "</TestResult>";
@@ -131,7 +131,7 @@
     public void testSingleFail() {
         Map<String, String> emptyMap = Collections.emptyMap();
         final TestIdentifier testId = new TestIdentifier("FooTest", "testFoo");
-        final String trace = "this is a trace\nmore trace";
+        final String trace = "this is a trace\nmore trace\nyet more trace";
         mResultReporter.invocationStarted(mMockBuild);
         mResultReporter.testRunStarted("run", 1);
         mResultReporter.testStarted(testId);
@@ -145,7 +145,8 @@
         assertTrue(output.contains(
                 "<Summary failed=\"1\" notExecuted=\"0\" timeout=\"0\" pass=\"0\" />"));
         final String failureTag =
-                "<FailedScene message=\"this is a trace\">     <StackTrace>this is a tracemore trace";
+            "<FailedScene message=\"this is a trace&#10;more trace\">     " +
+            "<StackTrace>this is a tracemore traceyet more trace</StackTrace>";
         assertTrue(output.contains(failureTag));
     }
 
diff --git a/tools/tradefed-host/tests/src/com/android/cts/tradefed/result/TestTest.java b/tools/tradefed-host/tests/src/com/android/cts/tradefed/result/TestTest.java
new file mode 100644
index 0000000..6494171
--- /dev/null
+++ b/tools/tradefed-host/tests/src/com/android/cts/tradefed/result/TestTest.java
@@ -0,0 +1,68 @@
+/*
+ * Copyright (C) 2011 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.cts.tradefed.result;
+
+import junit.framework.TestCase;
+
+/**
+ * Unit tests for {@link Test}.
+ * <p/>
+ * Lets hope a TestTestTest is not needed...
+ */
+public class TestTest extends TestCase {
+
+    /**
+     * Test {@link Test#getFailureMessageFromStackTrace(String)} for an empty stack
+     */
+    public void testGetFailureMessageFromStackTrace_empty() {
+        final String stack = "";
+        assertEquals(stack, Test.getFailureMessageFromStackTrace(stack));
+    }
+
+    /**
+     * Test {@link Test#getFailureMessageFromStackTrace(String)} for a one line stack
+     */
+    public void testGetFailureMessageFromStackTrace_oneLine() {
+        final String stack = "this is a line";
+        assertEquals(stack, Test.getFailureMessageFromStackTrace(stack));
+    }
+
+    /**
+     * Test {@link Test#getFailureMessageFromStackTrace(String)} for a one line stack with a newline
+     * char
+     */
+    public void testGetFailureMessageFromStackTrace_oneNewLine() {
+        final String stack = "this is a line\n";
+        assertEquals(stack, Test.getFailureMessageFromStackTrace(stack));
+    }
+
+    /**
+     * Test {@link Test#getFailureMessageFromStackTrace(String)} for a two line stack
+     */
+    public void testGetFailureMessageFromStackTrace_twoLines() {
+        final String stack = "this is a line\nthis is also a line";
+        assertEquals(stack, Test.getFailureMessageFromStackTrace(stack));
+    }
+
+    /**
+     * Test {@link Test#getFailureMessageFromStackTrace(String)} for a multi line stack
+     */
+    public void testGetFailureMessageFromStackTrace_multiLines() {
+        final String stack = "this is a line\nthis is also a line\n oh look another line";
+        assertEquals("this is a line\nthis is also a line",
+                Test.getFailureMessageFromStackTrace(stack));
+    }
+}
diff --git a/tools/utils/buildCts.py b/tools/utils/buildCts.py
index 972144f..98978fd 100755
--- a/tools/utils/buildCts.py
+++ b/tools/utils/buildCts.py
@@ -106,14 +106,11 @@
       packages.append(doc.GetAttr('TestPackage', 'appPackageName'))
 
     plan = tools.TestPlan(packages)
-    plan.Exclude(r'android\.core\.vm-tests-tf')
-    plan.Exclude('android\.performance.*')
-    self.__WritePlan(plan, 'CTS')
-
     plan.Exclude('android\.core\.vm-tests')
     plan.Exclude('android\.performance.*')
     plan.Include(r'android\.core\.vm-tests-tf')
     self.__WritePlan(plan, 'CTS-TF')
+    self.__WritePlan(plan, 'CTS')
 
     plan.Exclude(r'android\.tests\.sigtest')
     plan.Exclude(r'android\.core.*')
@@ -124,11 +121,6 @@
     self.__WritePlan(plan, 'Java')
 
     plan = tools.TestPlan(packages)
-    plan.Include(r'android\.core\.vm-tests')
-    plan.Exclude(r'android\.core\.vm-tests-tf')
-    self.__WritePlan(plan, 'VM')
-
-    plan = tools.TestPlan(packages)
     plan.Include(r'android\.core\.vm-tests-tf')
     self.__WritePlan(plan, 'VM-TF')
 
@@ -261,7 +253,7 @@
   # To determine whether a class is a JUnit test, the Doclet needs to have all intermediate
   # subclasses of TestCase as well as the JUnit framework itself on the source path.
   # Annotation classes are also required, since test annotations go into the description.
-  source_path = [
+  sourcepath = [
       'frameworks/base/core/java',            # android test classes
       'frameworks/base/test-runner/src',      # test runner
       'libcore/junit/src/main/java',          # junit classes
@@ -270,9 +262,14 @@
       'cts/tests/src',                        # cts test stubs
       source_root                             # the source for this package
   ]
-  source_path = [os.path.join(android_root, x) for x in source_path]
+  sourcepath = [os.path.join(android_root, x) for x in sourcepath]
+  classpath = [
+      'prebuilt/common/tradefed/tradefed-prebuilt.jar',
+  ]
+  classpath = [os.path.join(android_root, x) for x in classpath]
   cmd = ('javadoc -o %s -J-Xmx512m -quiet -doclet DescriptionGenerator -docletpath %s'
-         ' -sourcepath %s ') % (output_file, doclet_path, ':'.join(source_path))
+         ' -sourcepath %s -classpath %s ') % (output_file, doclet_path, ':'.join(sourcepath),
+         ':'.join(classpath))
   sources = []
 
   def AddFile(sources, folder, names):