am 8dfe1f90: am b545cec7: am a575c52c: am c4807ef9: am e226cd6d: Merge "Updating resources for hostside holo tests" into klp-dev
* commit '8dfe1f90cb6420594b0de0fb4531775dd79b9936':
Updating resources for hostside holo tests
diff --git a/CtsTestCaseList.mk b/CtsTestCaseList.mk
index 12c1e57..0daf064 100644
--- a/CtsTestCaseList.mk
+++ b/CtsTestCaseList.mk
@@ -37,7 +37,7 @@
CtsDeviceTaskswitchingAppB \
CtsDeviceTaskswitchingControl \
CtsDeviceUi \
- CtsHoloDeviceApp \
+ CtsHoloDeviceApp \
CtsMonkeyApp \
CtsMonkeyApp2 \
CtsSomeAccessibilityServices \
@@ -129,7 +129,7 @@
cts_host_libraries := \
CtsAdbTests \
CtsAppSecurityTests \
- CtsHoloHostTestCases \
+ CtsHoloHostTestCases \
CtsHostJank \
CtsHostUi \
CtsMonkeyTestCases \
diff --git a/hostsidetests/holo/app/res/drawable-land-xxxhdpi/display_info.png b/hostsidetests/holo/app/res/drawable-land-xxxhdpi/display_info.png
new file mode 100644
index 0000000..7ad9b52
--- /dev/null
+++ b/hostsidetests/holo/app/res/drawable-land-xxxhdpi/display_info.png
Binary files differ
diff --git a/hostsidetests/holo/app/res/drawable-xxxhdpi/display_info.png b/hostsidetests/holo/app/res/drawable-xxxhdpi/display_info.png
new file mode 100644
index 0000000..095382c
--- /dev/null
+++ b/hostsidetests/holo/app/res/drawable-xxxhdpi/display_info.png
Binary files differ
diff --git a/hostsidetests/holo/app/src/android/holo/app/DisplayInfoActivity.java b/hostsidetests/holo/app/src/android/holo/app/DisplayInfoActivity.java
index 4c40d01..69c3914 100644
--- a/hostsidetests/holo/app/src/android/holo/app/DisplayInfoActivity.java
+++ b/hostsidetests/holo/app/src/android/holo/app/DisplayInfoActivity.java
@@ -62,9 +62,15 @@
case DisplayMetrics.DENSITY_XHIGH:
return "xhdpi";
+ case DisplayMetrics.DENSITY_400:
+ return "400dpi";
+
case DisplayMetrics.DENSITY_XXHIGH:
return "xxhdpi";
+ case DisplayMetrics.DENSITY_XXXHIGH:
+ return "xxxhdpi";
+
case DisplayMetrics.DENSITY_TV:
return "tvdpi";
diff --git a/hostsidetests/holo/assets/19/400dpi.zip b/hostsidetests/holo/assets/19/400dpi.zip
new file mode 100644
index 0000000..e4d6ab3
--- /dev/null
+++ b/hostsidetests/holo/assets/19/400dpi.zip
Binary files differ
diff --git a/hostsidetests/holo/assets/19/hdpi.zip b/hostsidetests/holo/assets/19/hdpi.zip
new file mode 100644
index 0000000..7c3a08c
--- /dev/null
+++ b/hostsidetests/holo/assets/19/hdpi.zip
Binary files differ
diff --git a/hostsidetests/holo/assets/19/ldpi.zip b/hostsidetests/holo/assets/19/ldpi.zip
new file mode 100644
index 0000000..166e74a
--- /dev/null
+++ b/hostsidetests/holo/assets/19/ldpi.zip
Binary files differ
diff --git a/hostsidetests/holo/assets/19/mdpi.zip b/hostsidetests/holo/assets/19/mdpi.zip
new file mode 100644
index 0000000..89d1f1e
--- /dev/null
+++ b/hostsidetests/holo/assets/19/mdpi.zip
Binary files differ
diff --git a/hostsidetests/holo/assets/19/tvdpi.zip b/hostsidetests/holo/assets/19/tvdpi.zip
new file mode 100644
index 0000000..5fc2eb8
--- /dev/null
+++ b/hostsidetests/holo/assets/19/tvdpi.zip
Binary files differ
diff --git a/hostsidetests/holo/assets/19/xhdpi.zip b/hostsidetests/holo/assets/19/xhdpi.zip
new file mode 100644
index 0000000..65df5c7
--- /dev/null
+++ b/hostsidetests/holo/assets/19/xhdpi.zip
Binary files differ
diff --git a/hostsidetests/holo/assets/19/xxhdpi.zip b/hostsidetests/holo/assets/19/xxhdpi.zip
new file mode 100644
index 0000000..fee4189
--- /dev/null
+++ b/hostsidetests/holo/assets/19/xxhdpi.zip
Binary files differ
diff --git a/hostsidetests/holo/assets/19/xxxhdpi.zip b/hostsidetests/holo/assets/19/xxxhdpi.zip
new file mode 100644
index 0000000..d88e4c2
--- /dev/null
+++ b/hostsidetests/holo/assets/19/xxxhdpi.zip
Binary files differ
diff --git a/tests/tests/holo/AndroidManifest.xml b/tests/tests/holo/AndroidManifest.xml
index 4a03ba3..1c59630 100644
--- a/tests/tests/holo/AndroidManifest.xml
+++ b/tests/tests/holo/AndroidManifest.xml
@@ -23,21 +23,21 @@
<application android:hardwareAccelerated="false">
<uses-library android:name="android.test.runner" />
- <activity android:name="android.holo.cts.HoloTestUtilitiesActivity"
+ <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"
+ <activity android:name="android.holo.cts.ThemePickerActivity"
android:label="@string/pick_theme" />
- <activity android:name="android.holo.cts.LayoutPickerActivity"
+ <activity android:name="android.holo.cts.LayoutPickerActivity"
android:label="@string/pick_layout" />
<activity android:name="android.holo.cts.ThemeTestActivity"
@@ -58,7 +58,7 @@
android:theme="@android:style/Theme.Translucent.NoTitleBar" />
</application>
-
+
<instrumentation android:name="android.test.InstrumentationCtsTestRunner"
android:targetPackage="com.android.cts.holo"
android:label="CTS tests for the Holo theme" />
