diff --git a/samples/ApiDemos/res/values-long/strings.xml b/samples/ApiDemos/res/values-hdpi/strings.xml
similarity index 92%
rename from samples/ApiDemos/res/values-long/strings.xml
rename to samples/ApiDemos/res/values-hdpi/strings.xml
index 5d15048e4..f2b46d419 100644
--- a/samples/ApiDemos/res/values-long/strings.xml
+++ b/samples/ApiDemos/res/values-hdpi/strings.xml
@@ -15,5 +15,5 @@
 -->
 
 <resources>
-    <string name="density_title">Density: Long</string>
+    <string name="density_title">Density: High</string>
 </resources>
diff --git a/samples/ApiDemos/res/values-large-notlong/strings.xml b/samples/ApiDemos/res/values-large-notlong/strings.xml
deleted file mode 100644
index 40328eab4..000000000
--- a/samples/ApiDemos/res/values-large-notlong/strings.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?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="density_title">Density: Large NotLong</string>
-</resources>
diff --git a/samples/ApiDemos/res/values-large/strings.xml b/samples/ApiDemos/res/values-large/strings.xml
deleted file mode 100644
index c9fb18993..000000000
--- a/samples/ApiDemos/res/values-large/strings.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?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="density_title">Density: Large</string>
-</resources>
diff --git a/samples/ApiDemos/res/values-small/strings.xml b/samples/ApiDemos/res/values-ldpi/strings.xml
similarity index 92%
rename from samples/ApiDemos/res/values-small/strings.xml
rename to samples/ApiDemos/res/values-ldpi/strings.xml
index 56db73056..ebbcc38c5 100644
--- a/samples/ApiDemos/res/values-small/strings.xml
+++ b/samples/ApiDemos/res/values-ldpi/strings.xml
@@ -15,5 +15,5 @@
 -->
 
 <resources>
-    <string name="density_title">Density: Small</string>
+    <string name="density_title">Density: Low</string>
 </resources>
diff --git a/samples/ApiDemos/res/values-normal/strings.xml b/samples/ApiDemos/res/values-mdpi/strings.xml
similarity index 92%
rename from samples/ApiDemos/res/values-normal/strings.xml
rename to samples/ApiDemos/res/values-mdpi/strings.xml
index 16ff46fc8..30341712c 100644
--- a/samples/ApiDemos/res/values-normal/strings.xml
+++ b/samples/ApiDemos/res/values-mdpi/strings.xml
@@ -15,5 +15,5 @@
 -->
 
 <resources>
-    <string name="density_title">Density: Normal</string>
+    <string name="density_title">Density: Medium</string>
 </resources>
diff --git a/samples/ApiDemos/res/values-normal-long/strings.xml b/samples/ApiDemos/res/values-normal-long/strings.xml
deleted file mode 100644
index 01a048763..000000000
--- a/samples/ApiDemos/res/values-normal-long/strings.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?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="density_title">Density: Normal Long</string>
-</resources>
diff --git a/samples/ApiDemos/res/values-normal-notlong/strings.xml b/samples/ApiDemos/res/values-normal-notlong/strings.xml
deleted file mode 100644
index bea3f8dcb..000000000
--- a/samples/ApiDemos/res/values-normal-notlong/strings.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?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="density_title">Density: Normal NotLong</string>
-</resources>
diff --git a/samples/ApiDemos/res/values-notlong/strings.xml b/samples/ApiDemos/res/values-notlong/strings.xml
deleted file mode 100644
index a3e78dbb6..000000000
--- a/samples/ApiDemos/res/values-notlong/strings.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?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="density_title">Density: NotLong</string>
-</resources>
diff --git a/samples/ApiDemos/res/values-small-long/strings.xml b/samples/ApiDemos/res/values-small-long/strings.xml
deleted file mode 100644
index 8526f61db..000000000
--- a/samples/ApiDemos/res/values-small-long/strings.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?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="density_title">Density: Small Long</string>
-</resources>
diff --git a/samples/ApiDemos/res/values-small-notlong/strings.xml b/samples/ApiDemos/res/values-small-notlong/strings.xml
deleted file mode 100644
index bc8a67687..000000000
--- a/samples/ApiDemos/res/values-small-notlong/strings.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?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="density_title">Density: Small NotLong</string>
-</resources>
diff --git a/samples/ApiDemos/res/values-large-long/strings.xml b/samples/ApiDemos/res/values-xhdpi/strings.xml
similarity index 91%
rename from samples/ApiDemos/res/values-large-long/strings.xml
rename to samples/ApiDemos/res/values-xhdpi/strings.xml
index 7c392d8b7..57570444a 100644
--- a/samples/ApiDemos/res/values-large-long/strings.xml
+++ b/samples/ApiDemos/res/values-xhdpi/strings.xml
@@ -15,5 +15,5 @@
 -->
 
 <resources>
-    <string name="density_title">Density: Large Long</string>
+    <string name="density_title">Density: Extra High</string>
 </resources>