Create a theme test in cts

1) Move android.host.holo to android.host.theme
2) Migrate other tests from android.holo to android.host.theme
3) Skip theme test for watch and tv

bug: 17160329

Change-Id: I17bddcbd3a97d5638ba77a6f6b7b0b492c63d4cb

CtsTestCaseList.mk

@@ -32,7 +32,7 @@ cts_support_packages := \
 	CtsAccelerationTestStubs \
 	CtsDelegatingAccessibilityService \
 	CtsDeviceAdmin \
-	CtsHoloDeviceApp \
+	CtsThemeDeviceApp \
 	CtsMonkeyApp \
 	CtsMonkeyApp2 \
 	CtsSomeAccessibilityServices \
@@ -109,7 +109,7 @@ CTS_COVERAGE_TEST_CASE_LIST := \
 # Host side only tests
 cts_host_libraries := \
 	CtsAppSecurityTests \
-	CtsHoloHostTestCases \
+	CtsThemeHostTestCases \
 	CtsMonkeyTestCases
 
 # Native test executables that need to have associated test XMLs.

hostsidetests/holo/Android.mk → hostsidetests/theme/Android.mk

@@ -16,18 +16,19 @@ LOCAL_PATH := $(call my-dir)
 
 include $(CLEAR_VARS)
 
-LOCAL_SRC_FILES := $(call all-java-files-under, src)
+LOCAL_SRC_FILES := $(call all-java-files-under, src) \
+                   ../../libs/util/src/android/cts/util/TimeoutReq.java
 
 LOCAL_JAVA_RESOURCE_DIRS := assets/$(PLATFORM_SDK_VERSION)/
 
 LOCAL_MODULE_TAGS := optional
 
 # Must match the package name in CtsTestCaseList.mk
-LOCAL_MODULE := CtsHoloHostTestCases
+LOCAL_MODULE := CtsThemeHostTestCases
 
 LOCAL_JAVA_LIBRARIES := cts-tradefed ddmlib-prebuilt tradefed-prebuilt
 
-LOCAL_CTS_TEST_PACKAGE := android.host.holo
+LOCAL_CTS_TEST_PACKAGE := android.host.theme
 
 include $(BUILD_CTS_HOST_JAVA_LIBRARY)
 

hostsidetests/holo/app/Android.mk → hostsidetests/theme/app/Android.mk

@@ -30,7 +30,11 @@ LOCAL_JAVA_LIBRARIES := android.test.runner
 
 LOCAL_SRC_FILES := $(call all-java-files-under, src)
 
-LOCAL_PACKAGE_NAME := CtsHoloDeviceApp
+#Flags to tell the Android Asset Packaging Tool not to strip for some densities
+LOCAL_AAPT_FLAGS = -c land -c xx_YY -c cs -c small -c normal -c large -c xlarge \
+ -c 640dpi -c 480dpi -c 400dpi -c 320dpi -c 240dpi -c 213dpi -c 160dpi -c 120dpi
+
+LOCAL_PACKAGE_NAME := CtsThemeDeviceApp
 
 LOCAL_SDK_VERSION := current
 

hostsidetests/holo/app/AndroidManifest.xml → hostsidetests/theme/app/AndroidManifest.xml

@@ -16,7 +16,9 @@
  -->
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="android.holo.app">
+    package="android.theme.app">
+
+    <uses-sdk android:minSdkVersion="17" />
 
     <uses-permission android:name="android.permission.DISABLE_KEYGUARD" />
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
@@ -29,14 +31,19 @@
             </intent-filter>
         </activity>
         <activity android:name=".DisplayInfoActivity"
-                  android:label="@string/display_info" />
+                  android:label="@string/display_info">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
         <activity android:name=".CaptureActivity" />
     </application>
 
     <!--  self-instrumenting test package. -->
     <instrumentation android:name="android.test.InstrumentationTestRunner"
-                     android:targetPackage="android.holo.app"
-                     android:label="Generates Holo reference images"/>
+                     android:targetPackage="android.theme.app"
+                     android:label="Generates Theme reference images"/>
 
 </manifest>