First pass at reworking screen density/size APIs.

This changes the names of the directories in aapt, to what you see
in the list of DpiTest resources.  Also adds a new "long" configuration
for wide screens, which the platform sets appropriate, and introduces
a new kind of resizeability for not large but significantly larger
than normal screens which may have compatibility issues.

14 files changed, 157 insertions, 4 deletions

diff --git a/tests/DpiTest/res/drawable-240dpi/logo240dpi.png b/tests/DpiTest/res/drawable-hdpi/logo240dpi.png
index 4d717a86143d..4d717a86143d 100644
--- a/tests/DpiTest/res/drawable-240dpi/logo240dpi.png
+++ b/tests/DpiTest/res/drawable-hdpi/logo240dpi.png
diff --git a/tests/DpiTest/res/drawable-120dpi/logo120dpi.png b/tests/DpiTest/res/drawable-ldpi/logo120dpi.png
index 46bbd5bd3d48..46bbd5bd3d48 100644
--- a/tests/DpiTest/res/drawable-120dpi/logo120dpi.png
+++ b/tests/DpiTest/res/drawable-ldpi/logo120dpi.png
diff --git a/tests/DpiTest/res/values-smallScreen/strings.xml b/tests/DpiTest/res/values-large-long/strings.xml
index cdb4ac9f60bd..be304a7ca53a 100644
--- a/tests/DpiTest/res/values-smallScreen/strings.xml
+++ b/tests/DpiTest/res/values-large-long/strings.xml
@@ -15,5 +15,5 @@
 -->
 
 <resources>
-    <string name="act_title">DpiTest: Small Screen</string>
+    <string name="act_title">DpiTest: Large Long</string>
 </resources>
diff --git a/tests/DpiTest/res/values-normalScreen/strings.xml b/tests/DpiTest/res/values-large-notlong/strings.xml
index 256d696df80e..9681f4428908 100644
--- a/tests/DpiTest/res/values-normalScreen/strings.xml
+++ b/tests/DpiTest/res/values-large-notlong/strings.xml
@@ -15,5 +15,5 @@
 -->
 
 <resources>
-    <string name="act_title">DpiTest: Normal Screen</string>
+    <string name="act_title">DpiTest: Large NotLong</string>
 </resources>
diff --git a/tests/DpiTest/res/values-largeScreen/strings.xml b/tests/DpiTest/res/values-large/strings.xml
index f4dd543dc72f..faa95f2b8fd2 100644
--- a/tests/DpiTest/res/values-largeScreen/strings.xml
+++ b/tests/DpiTest/res/values-large/strings.xml
@@ -15,5 +15,5 @@
 -->
 
 <resources>
-    <string name="act_title">DpiTest: Large Screen</string>
+    <string name="act_title">DpiTest: Large</string>
 </resources>
diff --git a/tests/DpiTest/res/values-long/strings.xml b/tests/DpiTest/res/values-long/strings.xml
new file mode 100644
index 000000000000..d6e5d93394f6
--- /dev/null
+++ b/tests/DpiTest/res/values-long/strings.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2007 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.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="act_title">DpiTest: Long</string>
+</resources>
diff --git a/tests/DpiTest/res/values-normal-long/strings.xml b/tests/DpiTest/res/values-normal-long/strings.xml
new file mode 100644
index 000000000000..640608396d75
--- /dev/null
+++ b/tests/DpiTest/res/values-normal-long/strings.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2007 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.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="act_title">DpiTest: Normal Long</string>
+</resources>
diff --git a/tests/DpiTest/res/values-normal-notlong/strings.xml b/tests/DpiTest/res/values-normal-notlong/strings.xml
new file mode 100644
index 000000000000..3265e4c5ae02
--- /dev/null
+++ b/tests/DpiTest/res/values-normal-notlong/strings.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2007 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.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="act_title">DpiTest: Normal NotLong</string>
+</resources>
diff --git a/tests/DpiTest/res/values-normal/strings.xml b/tests/DpiTest/res/values-normal/strings.xml
new file mode 100644
index 000000000000..1e27da4aa57c
--- /dev/null
+++ b/tests/DpiTest/res/values-normal/strings.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2007 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.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="act_title">DpiTest: Normal</string>
+</resources>
diff --git a/tests/DpiTest/res/values-notlong/strings.xml b/tests/DpiTest/res/values-notlong/strings.xml
new file mode 100644
index 000000000000..4b9d5da319b9
--- /dev/null
+++ b/tests/DpiTest/res/values-notlong/strings.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2007 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.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="act_title">DpiTest: NotLong</string>
+</resources>
diff --git a/tests/DpiTest/res/values-small-long/strings.xml b/tests/DpiTest/res/values-small-long/strings.xml
new file mode 100644
index 000000000000..2575b0d917b7
--- /dev/null
+++ b/tests/DpiTest/res/values-small-long/strings.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2007 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.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="act_title">DpiTest: Small Long</string>
+</resources>
diff --git a/tests/DpiTest/res/values-small-notlong/strings.xml b/tests/DpiTest/res/values-small-notlong/strings.xml
new file mode 100644
index 000000000000..2df2b29a2954
--- /dev/null
+++ b/tests/DpiTest/res/values-small-notlong/strings.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2007 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.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="act_title">DpiTest: Small NotLong</string>
+</resources>
diff --git a/tests/DpiTest/res/values-small/strings.xml b/tests/DpiTest/res/values-small/strings.xml
new file mode 100644
index 000000000000..9fd5e4014894
--- /dev/null
+++ b/tests/DpiTest/res/values-small/strings.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2007 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.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="act_title">DpiTest: Small</string>
+</resources>
diff --git a/tests/DpiTest/src/com/google/android/test/dpi/DpiTestActivity.java b/tests/DpiTest/src/com/google/android/test/dpi/DpiTestActivity.java
index 8c69305d5760..49fff57ba0fe 100644
--- a/tests/DpiTest/src/com/google/android/test/dpi/DpiTestActivity.java
+++ b/tests/DpiTest/src/com/google/android/test/dpi/DpiTestActivity.java
@@ -57,7 +57,8 @@ public class DpiTestActivity extends Activity {
             if (noCompat) {
                 ai.flags |= ApplicationInfo.FLAG_SUPPORTS_LARGE_SCREENS
                     | ApplicationInfo.FLAG_SUPPORTS_NORMAL_SCREENS
-                    | ApplicationInfo.FLAG_SUPPORTS_SMALL_SCREENS;
+                    | ApplicationInfo.FLAG_SUPPORTS_SMALL_SCREENS
+                    | ApplicationInfo.FLAG_RESIZEABLE_FOR_SCREENS;
                 ai.supportsDensities = new int[] { ApplicationInfo.ANY_DENSITY };
                 app.getResources().setCompatibilityInfo(new CompatibilityInfo(ai));
             }