summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorDianne Hackborn <hackbod@google.com>2010-10-21 20:17:56 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-10-21 20:17:56 -0700
commit101f14b275ab2451aef50dec427376d721d17aea (patch)
treeaf8c333d1c2d519c300ab817991b74d51cee43b6 /tests
parent86f1b643d10e0b5b17ae01db3b81020db87b3295 (diff)
parentba501785c7b298198d1c6e4787fd40e98f97da67 (diff)
downloadframeworks_base-101f14b275ab2451aef50dec427376d721d17aea.zip
frameworks_base-101f14b275ab2451aef50dec427376d721d17aea.tar.gz
frameworks_base-101f14b275ab2451aef50dec427376d721d17aea.tar.bz2
am ba501785: Merge "Implement issue #3116702: New manifest tags for supported screen sizes DO NOT MERGE" into gingerbread
Merge commit 'ba501785c7b298198d1c6e4787fd40e98f97da67' into gingerbread-plus-aosp * commit 'ba501785c7b298198d1c6e4787fd40e98f97da67': Implement issue #3116702: New manifest tags for supported screen sizes DO NOT MERGE
Diffstat (limited to 'tests')
-rw-r--r--tests/DpiTest/AndroidManifest.xml6
1 files changed, 6 insertions, 0 deletions
diff --git a/tests/DpiTest/AndroidManifest.xml b/tests/DpiTest/AndroidManifest.xml
index 68ecc6e..a4d8c79 100644
--- a/tests/DpiTest/AndroidManifest.xml
+++ b/tests/DpiTest/AndroidManifest.xml
@@ -18,6 +18,12 @@
package="com.google.android.test.dpi">
<uses-sdk android:minSdkVersion="3" android:targetSdkVersion="3" />
<supports-screens android:smallScreens="true" />
+ <compatible-screens>
+ <screen android:screenSize="small" android:screenDensity="ldpi" />
+ <screen android:screenSize="small" android:screenDensity="xhdpi" />
+ <screen android:screenSize="large" android:screenDensity="hdpi" />
+ <screen android:screenSize="xlarge" android:screenDensity="mdpi" />
+ </compatible-screens>
<application android:label="DpiTest">
<activity android:name="DpiTestActivity">
<intent-filter>