am 56d64b7c: am 38da968a: Merge "Cleanup keyboard-heights.xml resources" into jb-dev

* commit '56d64b7c03d63a8347ed0f658307a75f2610d2a2':
  Cleanup keyboard-heights.xml resources

6 files changed, 8 insertions, 114 deletions

diff --git a/java/res/values-land/keyboard-heights.xml b/java/res/values-land/keyboard-heights.xml
index 12c3e3951..4ebeda559 100644
--- a/java/res/values-land/keyboard-heights.xml
+++ b/java/res/values-land/keyboard-heights.xml
@@ -18,10 +18,10 @@
 */
 -->
 
-<!-- Preferable keyboard height in absolute scale: 1.100in -->
 <resources>
     <!-- Build.HARDWARE,keyboard_height_in_dp -->
     <string-array name="keyboard_heights" translatable="false">
+    <!-- Preferable keyboard height in absolute scale: 1.100in -->
         <!-- Droid -->
         <item>sholes,194.3333</item>
         <!-- Nexus One -->
@@ -30,5 +30,8 @@
         <item>herring,171.9385</item>
         <!-- Galaxy Nexus -->
         <item>tuna,173.4207</item>
+    <!-- Preferable keyboard height in absolute scale: 45.0mm -->
+        <!-- Xoom -->
+        <item>stingray,265.4378</item>
     </string-array>
 </resources>
diff --git a/java/res/values-sw600dp-land/keyboard-heights.xml b/java/res/values-sw600dp-land/keyboard-heights.xml
deleted file mode 100644
index 93f9824d1..000000000
--- a/java/res/values-sw600dp-land/keyboard-heights.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2012, 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.
-*/
--->
-
-<!-- Preferable keyboard height in absolute scale: 45.0mm -->
-<resources>
-    <!-- Build.HARDWARE,keyboard_height_in_dp -->
-    <string-array name="keyboard_heights" translatable="false">
-        <!-- Xoom -->
-        <item>stingray,265.4378</item>
-    </string-array>
-</resources>
diff --git a/java/res/values-sw600dp/keyboard-heights.xml b/java/res/values-sw600dp/keyboard-heights.xml
deleted file mode 100644
index 77e52be2f..000000000
--- a/java/res/values-sw600dp/keyboard-heights.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2012, 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.
-*/
--->
-
-<!-- Preferable keyboard height in absolute scale: 48.0mm -->
-<resources>
-    <!-- Build.HARDWARE,keyboard_height_in_dp -->
-    <string-array name="keyboard_heights" translatable="false">
-        <!-- Xoom -->
-        <item>stingray,283.1337</item>
-    </string-array>
-</resources>
diff --git a/java/res/values-sw768dp-land/keyboard-heights.xml b/java/res/values-sw768dp-land/keyboard-heights.xml
deleted file mode 100644
index 692c5a0fb..000000000
--- a/java/res/values-sw768dp-land/keyboard-heights.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2012, 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.
-*/
--->
-
-<!-- Preferable keyboard height in absolute scale: 58.0mm -->
-<resources>
-    <!-- Build.HARDWARE,keyboard_height_in_dp -->
-    <string-array name="keyboard_heights" translatable="false">
-        <!-- Xoom -->
-        <item>stingray,342.1198</item>
-    </string-array>
-</resources>
diff --git a/java/res/values-sw768dp/keyboard-heights.xml b/java/res/values-sw768dp/keyboard-heights.xml
deleted file mode 100644
index 77e52be2f..000000000
--- a/java/res/values-sw768dp/keyboard-heights.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2012, 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.
-*/
--->
-
-<!-- Preferable keyboard height in absolute scale: 48.0mm -->
-<resources>
-    <!-- Build.HARDWARE,keyboard_height_in_dp -->
-    <string-array name="keyboard_heights" translatable="false">
-        <!-- Xoom -->
-        <item>stingray,283.1337</item>
-    </string-array>
-</resources>
diff --git a/java/res/values/keyboard-heights.xml b/java/res/values/keyboard-heights.xml
index 7d5b58372..7d85994be 100644
--- a/java/res/values/keyboard-heights.xml
+++ b/java/res/values/keyboard-heights.xml
@@ -18,10 +18,10 @@
 */
 -->
 
-<!-- Preferable keyboard height in absolute scale: 1.285in -->
 <resources>
     <!-- Build.HARDWARE,keyboard_height_in_dp -->
     <string-array name="keyboard_heights" translatable="false">
+    <!-- Preferable keyboard height in absolute scale: 1.285in -->
         <!-- Droid -->
         <item>sholes,227.0167</item>
         <!-- Nexus One -->
@@ -30,5 +30,8 @@
         <item>herring,200.8554</item>
         <!-- Galaxy Nexus -->
         <item>tuna,202.5869</item>
+    <!-- Preferable keyboard height in absolute scale: 48.0mm -->
+        <!-- Xoom -->
+        <item>stingray,283.1337</item>
     </string-array>
 </resources>