| commit | be18f008ad358dfdc97a01db7a40513bf1e93fa8 | [log] [tgz] |
|---|---|---|
| author | Chenjie Luo <cjluo@google.com> | Sat Sep 20 04:10:45 2014 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Sat Sep 20 04:10:46 2014 +0000 |
| tree | 0a7c5683ba918041d02be15a1b56bd13e6473140 | |
| parent | e1978ca24d47760afe173ca79d6399b1bda23c5e [diff] | |
| parent | aec66bf969d1c66efed175e23259f09f53d97f88 [diff] |
Merge "Create assets for new density bucket DENSITY_560 for android.host.theme" into lmp-dev
diff --git a/hostsidetests/theme/app/Android.mk b/hostsidetests/theme/app/Android.mk index d7ca509..1be2983 100644 --- a/hostsidetests/theme/app/Android.mk +++ b/hostsidetests/theme/app/Android.mk
@@ -32,7 +32,7 @@ #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 + -c 640dpi -c 560dpi -c 480dpi -c 400dpi -c 320dpi -c 240dpi -c 213dpi -c 160dpi -c 120dpi LOCAL_PACKAGE_NAME := CtsThemeDeviceApp
diff --git a/hostsidetests/theme/app/res/drawable-560dpi/display_info.png b/hostsidetests/theme/app/res/drawable-560dpi/display_info.png new file mode 100644 index 0000000..babe0da --- /dev/null +++ b/hostsidetests/theme/app/res/drawable-560dpi/display_info.png Binary files differ
diff --git a/hostsidetests/theme/app/src/android/theme/app/DisplayInfoActivity.java b/hostsidetests/theme/app/src/android/theme/app/DisplayInfoActivity.java index 12504c1..f263eef 100644 --- a/hostsidetests/theme/app/src/android/theme/app/DisplayInfoActivity.java +++ b/hostsidetests/theme/app/src/android/theme/app/DisplayInfoActivity.java
@@ -68,6 +68,9 @@ case DisplayMetrics.DENSITY_XXHIGH: return "xxhdpi"; + case DisplayMetrics.DENSITY_560: + return "560dpi"; + case DisplayMetrics.DENSITY_XXXHIGH: return "xxxhdpi";
diff --git a/hostsidetests/theme/assets/21/560dpi.zip b/hostsidetests/theme/assets/21/560dpi.zip new file mode 100644 index 0000000..eff363c --- /dev/null +++ b/hostsidetests/theme/assets/21/560dpi.zip Binary files differ
diff --git a/hostsidetests/theme/src/android/theme/cts/ThemeHostTest.java b/hostsidetests/theme/src/android/theme/cts/ThemeHostTest.java index c88fb44..ac1eb0a 100644 --- a/hostsidetests/theme/src/android/theme/cts/ThemeHostTest.java +++ b/hostsidetests/theme/src/android/theme/cts/ThemeHostTest.java
@@ -349,6 +349,8 @@ return "400dpi"; case 480: return "xxhdpi"; + case 560: + return "560dpi"; case 640: return "xxxhdpi"; default:
