Refactor res/values resources to use -land qualifier instead of -port qualifier.

Functional changes: compose.xml layout uses the ComposeArea style which causes
all portrait tablet orientations to have no margin and 80dip padding. This is
desirable.

Bug: 7382467
Change-Id: I45af05211b57d03b51b11895a098828d60f5df7b

4 files changed, 18 insertions, 36 deletions

diff --git a/res/values-sw720dp/constants.xml b/res/values-sw720dp/constants.xml
index f778c946c..dc163e3a7 100644
--- a/res/values-sw720dp/constants.xml
+++ b/res/values-sw720dp/constants.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-     Copyright (C) 2011 Google Inc.
+     Copyright (C) 2012 Google Inc.
      Licensed to The Android Open Source Project.
 
      Licensed under the Apache License, Version 2.0 (the "License");
@@ -19,17 +19,22 @@
     <integer name="folder_list_weight">1</integer>
     <integer name="conversation_list_weight">3</integer>
     <integer name="conversation_view_weight">6</integer>
-
     <!-- Whether the list is collapsed in conversation view mode -->
-    <bool name="list_collapsed">false</bool>
+    <bool name="list_collapsed">true</bool>
+
+    <!-- Search results in portrait mode on 10" tablets should still show wide conversation
+         list items.
+         Note: this this value should be set with the same qualifiers where
+         show_two_pane_search_results is set to false -->
+    <integer name="conversation_list_search_header_mode">0</integer>
 
     <!-- Whether to show single or 2 pane search results -->
-    <bool name="show_two_pane_search_results">true</bool>
+    <bool name="show_two_pane_search_results">false</bool>
 
-    <dimen name="undo_bar_width_list">960dp</dimen>
-    <dimen name="undo_bar_width_conv">844dp</dimen>
-    <dimen name="undo_bar_width_conv_list">426dp</dimen>
-    <dimen name="undo_bar_width_search_list">400dp</dimen>
+    <dimen name="undo_bar_width_list">600dp</dimen>
+    <dimen name="undo_bar_width_conv">800dp</dimen>
+    <dimen name="undo_bar_width_conv_list">800dp</dimen>
+    <dimen name="undo_bar_width_search_list">800dp</dimen>
 
     <!-- Whether or not to use a nice transition when showing the folder list fragment; used in 2-pane layouts -->
     <integer name="use_folder_list_fragment_transition">0</integer>
diff --git a/res/values-sw720dp/dimen.xml b/res/values-sw720dp/dimen.xml
deleted file mode 100644
index cf37b91dd..000000000
--- a/res/values-sw720dp/dimen.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-     Copyright (C) 2012 Google Inc.
-     Licensed to 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>
-    <dimen name="compose_scrollview_width">900dip</dimen>
-    <dimen name="compose_area_left_padding">100dip</dimen>
-    <dimen name="compose_area_right_padding">100dip</dimen>
-    <dimen name="spinner_frame_width">260dip</dimen>
-</resources>
\ No newline at end of file
diff --git a/res/values-sw720dp/styles.xml b/res/values-sw720dp/styles.xml
index f39db51dc..65d945b40 100644
--- a/res/values-sw720dp/styles.xml
+++ b/res/values-sw720dp/styles.xml
@@ -16,13 +16,13 @@
      limitations under the License.
 -->
 <resources>
+    <style name="AccountSwitchSpinnerItem" parent="@style/PlainSpinnerDropdown">
+        <item name="android:layout_width">276dp</item>
+    </style>
     <style name="unreadCountActionBarTablet" parent="@style/UnreadCountActionBar">
-        <item name="android:layout_marginLeft">16dp</item>
+        <item name="android:layout_marginLeft">12dp</item>
         <item name="android:layout_width">wrap_content</item>
     </style>
-    <style name="AccountSwitchSpinnerItem" parent="@style/PlainSpinnerDropdown">
-        <item name="android:layout_width">368dp</item>
-    </style>
 
     <style name="MessageHeaderUpperDateStyle" parent="MessageHeaderExtraSmallStyle">
         <item name="android:layout_centerVertical">true</item>
diff --git a/res/values-sw720dp/two_pane_dimen.xml b/res/values-sw720dp/two_pane_dimen.xml
index 501d0f802..18007359b 100644
--- a/res/values-sw720dp/two_pane_dimen.xml
+++ b/res/values-sw720dp/two_pane_dimen.xml
@@ -17,5 +17,5 @@
 -->
 
 <resources>
-    <dimen name="folder_list_pane_width">320dip</dimen>
+    <dimen name="folder_list_pane_width">200dip</dimen>
 </resources>