Step 2 in 7" support for tablets.

This is a cherry-pick of f872876699a22d90bc39f7efaac5b21e224e7c82 :
- Use new recommended sw600dp instead of w600dp to avoid having the
"personality" change on configuration change
- remove the use of xlarge/large for specializing values since the
framework team discourages any use of the buckets (and have also changed
the ordering so that they take lower priority)

Change-Id: I645bfb7cddcda8b53569af927f6fa23180e73e1f

38 files changed, 20 insertions, 34 deletions

diff --git a/CleanSpec.mk b/CleanSpec.mk
index 133cf331d..8050442aa 100644
--- a/CleanSpec.mk
+++ b/CleanSpec.mk
@@ -55,6 +55,8 @@ $(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/com.an
 $(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/com.android.emailcommon_intermediates)
 $(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/com.android.emailcommon_intermediates)
 $(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/com.android.emailcommon_intermediates)
+$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/APPS/Email_intermediates)
+$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/APPS/EmailGoogle_intermediates)
 
 # ************************************************
 # NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST
diff --git a/res/layout-w600dp-land/account_setup_basics.xml b/res/layout-sw600dp-land/account_setup_basics.xml
index de4007a80..de4007a80 100644
--- a/res/layout-w600dp-land/account_setup_basics.xml
+++ b/res/layout-sw600dp-land/account_setup_basics.xml
diff --git a/res/layout-w600dp-land/account_setup_exchange.xml b/res/layout-sw600dp-land/account_setup_exchange.xml
index 812e9bc60..812e9bc60 100644
--- a/res/layout-w600dp-land/account_setup_exchange.xml
+++ b/res/layout-sw600dp-land/account_setup_exchange.xml
diff --git a/res/layout-w600dp-land/account_setup_incoming.xml b/res/layout-sw600dp-land/account_setup_incoming.xml
index 327b6d090..327b6d090 100644
--- a/res/layout-w600dp-land/account_setup_incoming.xml
+++ b/res/layout-sw600dp-land/account_setup_incoming.xml
diff --git a/res/layout-w600dp-land/account_setup_names.xml b/res/layout-sw600dp-land/account_setup_names.xml
index 568576423..568576423 100644
--- a/res/layout-w600dp-land/account_setup_names.xml
+++ b/res/layout-sw600dp-land/account_setup_names.xml
diff --git a/res/layout-w600dp-land/account_setup_options.xml b/res/layout-sw600dp-land/account_setup_options.xml
index cf13c581b..cf13c581b 100644
--- a/res/layout-w600dp-land/account_setup_options.xml
+++ b/res/layout-sw600dp-land/account_setup_options.xml
diff --git a/res/layout-w600dp-land/account_setup_outgoing.xml b/res/layout-sw600dp-land/account_setup_outgoing.xml
index b290ed5b8..b290ed5b8 100644
--- a/res/layout-w600dp-land/account_setup_outgoing.xml
+++ b/res/layout-sw600dp-land/account_setup_outgoing.xml
diff --git a/res/layout-w600dp-port/account_setup_basics.xml b/res/layout-sw600dp-port/account_setup_basics.xml
index 393b7735d..393b7735d 100644
--- a/res/layout-w600dp-port/account_setup_basics.xml
+++ b/res/layout-sw600dp-port/account_setup_basics.xml
diff --git a/res/layout-w600dp-port/account_setup_exchange.xml b/res/layout-sw600dp-port/account_setup_exchange.xml
index 34ba39917..34ba39917 100644
--- a/res/layout-w600dp-port/account_setup_exchange.xml
+++ b/res/layout-sw600dp-port/account_setup_exchange.xml
diff --git a/res/layout-w600dp-port/account_setup_incoming.xml b/res/layout-sw600dp-port/account_setup_incoming.xml
index 67e8becf0..67e8becf0 100644
--- a/res/layout-w600dp-port/account_setup_incoming.xml
+++ b/res/layout-sw600dp-port/account_setup_incoming.xml
diff --git a/res/layout-w600dp-port/account_setup_names.xml b/res/layout-sw600dp-port/account_setup_names.xml
index b54a30c47..b54a30c47 100644
--- a/res/layout-w600dp-port/account_setup_names.xml
+++ b/res/layout-sw600dp-port/account_setup_names.xml
diff --git a/res/layout-w600dp-port/account_setup_options.xml b/res/layout-sw600dp-port/account_setup_options.xml
index b6f136d49..b6f136d49 100644
--- a/res/layout-w600dp-port/account_setup_options.xml
+++ b/res/layout-sw600dp-port/account_setup_options.xml
diff --git a/res/layout-w600dp-port/account_setup_outgoing.xml b/res/layout-sw600dp-port/account_setup_outgoing.xml
index b7d07c292..b7d07c292 100644
--- a/res/layout-w600dp-port/account_setup_outgoing.xml
+++ b/res/layout-sw600dp-port/account_setup_outgoing.xml
diff --git a/res/layout-w600dp/account_setup_account_type.xml b/res/layout-sw600dp/account_setup_account_type.xml
index 0c2139aef..0c2139aef 100644
--- a/res/layout-w600dp/account_setup_account_type.xml
+++ b/res/layout-sw600dp/account_setup_account_type.xml
diff --git a/res/layout-w600dp/account_setup_basics_common.xml b/res/layout-sw600dp/account_setup_basics_common.xml
index 616309592..616309592 100644
--- a/res/layout-w600dp/account_setup_basics_common.xml
+++ b/res/layout-sw600dp/account_setup_basics_common.xml
diff --git a/res/layout-w600dp/account_setup_exchange_fragment.xml b/res/layout-sw600dp/account_setup_exchange_fragment.xml
index 17433ff4c..17433ff4c 100644
--- a/res/layout-w600dp/account_setup_exchange_fragment.xml
+++ b/res/layout-sw600dp/account_setup_exchange_fragment.xml
diff --git a/res/layout-w600dp/account_setup_incoming_fragment.xml b/res/layout-sw600dp/account_setup_incoming_fragment.xml
index 60c4dafd9..60c4dafd9 100644
--- a/res/layout-w600dp/account_setup_incoming_fragment.xml
+++ b/res/layout-sw600dp/account_setup_incoming_fragment.xml
diff --git a/res/layout-w600dp/account_setup_names_common.xml b/res/layout-sw600dp/account_setup_names_common.xml
index c7667dd4b..c7667dd4b 100644
--- a/res/layout-w600dp/account_setup_names_common.xml
+++ b/res/layout-sw600dp/account_setup_names_common.xml
diff --git a/res/layout-w600dp/account_setup_options_common.xml b/res/layout-sw600dp/account_setup_options_common.xml
index 0b73f50ca..0b73f50ca 100644
--- a/res/layout-w600dp/account_setup_options_common.xml
+++ b/res/layout-sw600dp/account_setup_options_common.xml
diff --git a/res/layout-w600dp/account_setup_outgoing_fragment.xml b/res/layout-sw600dp/account_setup_outgoing_fragment.xml
index e33154080..e33154080 100644
--- a/res/layout-w600dp/account_setup_outgoing_fragment.xml
+++ b/res/layout-sw600dp/account_setup_outgoing_fragment.xml
diff --git a/res/layout-w600dp/message_compose.xml b/res/layout-sw600dp/message_compose.xml
index af97cf1e2..af97cf1e2 100644
--- a/res/layout-w600dp/message_compose.xml
+++ b/res/layout-sw600dp/message_compose.xml
diff --git a/res/layout-w600dp/message_compose_attachment.xml b/res/layout-sw600dp/message_compose_attachment.xml
index 254b17bc9..254b17bc9 100644
--- a/res/layout-w600dp/message_compose_attachment.xml
+++ b/res/layout-sw600dp/message_compose_attachment.xml
diff --git a/res/layout-w600dp/message_view_attachment.xml b/res/layout-sw600dp/message_view_attachment.xml
index 4763fac3a..4763fac3a 100644
--- a/res/layout-w600dp/message_view_attachment.xml
+++ b/res/layout-sw600dp/message_view_attachment.xml
diff --git a/res/layout-w600dp/message_view_fragment.xml b/res/layout-sw600dp/message_view_fragment.xml
index 88d8ab6d5..88d8ab6d5 100644
--- a/res/layout-w600dp/message_view_fragment.xml
+++ b/res/layout-sw600dp/message_view_fragment.xml
diff --git a/res/layout-w600dp/message_view_invitation.xml b/res/layout-sw600dp/message_view_invitation.xml
index f80593f2c..f80593f2c 100644
--- a/res/layout-w600dp/message_view_invitation.xml
+++ b/res/layout-sw600dp/message_view_invitation.xml
diff --git a/res/layout-w600dp/three_pane.xml b/res/layout-sw600dp/three_pane.xml
index 450844d9a..450844d9a 100644
--- a/res/layout-w600dp/three_pane.xml
+++ b/res/layout-sw600dp/three_pane.xml
diff --git a/res/layout-xlarge-land/three_pane.xml b/res/layout-sw800dp-land/three_pane.xml
index ba0bb3166..ba0bb3166 100644
--- a/res/layout-xlarge-land/three_pane.xml
+++ b/res/layout-sw800dp-land/three_pane.xml
diff --git a/res/values-large-land/dimen.xml b/res/values-large-land/dimen.xml
deleted file mode 100644
index 6c4194c1b..000000000
--- a/res/values-large-land/dimen.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2011 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.
--->
-
-<!-- large, landscape -->
-<resources>
-    <!-- Account Setup Activities -->
-    <dimen name="setup_padding_top">16dip</dimen>
-    <dimen name="setup_padding_left">64dip</dimen>
-    <dimen name="setup_padding_right">64dip</dimen>
-</resources>
-
diff --git a/res/values-w600dp-land/dimensions.xml b/res/values-sw600dp-land/dimensions.xml
index a91f4eb3b..d9907dd11 100644
--- a/res/values-w600dp-land/dimensions.xml
+++ b/res/values-sw600dp-land/dimensions.xml
@@ -18,8 +18,6 @@
 <resources>
     <dimen name="message_compose_field_label_width">120dip</dimen>
 
-    <!-- XL activity dimensions -->
-
     <!-- width of mailbox list -->
     <dimen name="mailbox_list_width">304dip</dimen>
     <!-- width of the message list, on the message list + message view mode. -->
@@ -35,6 +33,7 @@
 
     <!-- Account Setup Activities -->
     <dimen name="setup_padding_top">16dip</dimen>
-    <dimen name="setup_padding_left">128dip</dimen>
-    <dimen name="setup_padding_right">128dip</dimen>
+    <dimen name="setup_padding_left">64dip</dimen>
+    <dimen name="setup_padding_right">64dip</dimen>
+
 </resources>
diff --git a/res/values-w600dp-land/styles.xml b/res/values-sw600dp-land/styles.xml
index f7e094e9a..f7e094e9a 100644
--- a/res/values-w600dp-land/styles.xml
+++ b/res/values-sw600dp-land/styles.xml
diff --git a/res/values-w600dp-port/dimensions.xml b/res/values-sw600dp-port/dimensions.xml
index fb405f032..fb405f032 100644
--- a/res/values-w600dp-port/dimensions.xml
+++ b/res/values-sw600dp-port/dimensions.xml
diff --git a/res/values-w600dp-port/styles.xml b/res/values-sw600dp-port/styles.xml
index 8030b0ff5..68f9ec373 100644
--- a/res/values-w600dp-port/styles.xml
+++ b/res/values-sw600dp-port/styles.xml
@@ -23,4 +23,12 @@
         <item name="android:layout_marginLeft">16dip</item>
         <item name="android:layout_marginRight">16dip</item>
     </style>
+
+    <style name="accountSetupTypePrevious" parent="@style/accountSetupButton">
+        <item name="android:layout_alignParentBottom">true</item>
+        <item name="android:layout_alignParentLeft">true</item>
+        <item name="android:layout_marginBottom">48dip</item>
+        <item name="android:layout_marginLeft">48dip</item>
+    </style>
+
 </resources>
diff --git a/res/values-w600dp/bools.xml b/res/values-sw600dp/bools.xml
index b6bbe2ea3..b6bbe2ea3 100644
--- a/res/values-w600dp/bools.xml
+++ b/res/values-sw600dp/bools.xml
diff --git a/res/values-w600dp/colors.xml b/res/values-sw600dp/colors.xml
index 9607459a4..9607459a4 100644
--- a/res/values-w600dp/colors.xml
+++ b/res/values-sw600dp/colors.xml
diff --git a/res/values-w600dp/dimensions.xml b/res/values-sw600dp/dimensions.xml
index bc92473b1..bc92473b1 100644
--- a/res/values-w600dp/dimensions.xml
+++ b/res/values-sw600dp/dimensions.xml
diff --git a/res/values-w600dp/styles.xml b/res/values-sw600dp/styles.xml
index c77174343..c77174343 100644
--- a/res/values-w600dp/styles.xml
+++ b/res/values-sw600dp/styles.xml
diff --git a/res/values-xlarge-land/dimen.xml b/res/values-sw800dp-land/dimen.xml
index 1b775848d..1b775848d 100644
--- a/res/values-xlarge-land/dimen.xml
+++ b/res/values-sw800dp-land/dimen.xml
diff --git a/res/values-large-port/styles.xml b/res/values-sw800dp-port/styles.xml
index 2c5fab4b5..8a61b9f56 100644
--- a/res/values-large-port/styles.xml
+++ b/res/values-sw800dp-port/styles.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2009 The Android Open Source Project
+<!-- Copyright (C) 2011 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.
@@ -14,13 +14,14 @@
      limitations under the License.
 -->
 
+<!-- tablet, portrait -->
+
 <resources>
+    <!-- Override previous button in really large tablets -->
     <style name="accountSetupTypePrevious" parent="@style/accountSetupButton">
-        <item name="android:layout_alignParentBottom">true</item>
-        <item name="android:layout_alignParentLeft">true</item>
-        <item name="android:layout_marginBottom">48dip</item>
-        <item name="android:layout_marginLeft">48dip</item>
+        <item name="android:layout_toRightOf">@+id/main_content"</item>
+        <item name="android:layout_alignParentRight">true</item>
     </style>
-</resources>
 
+</resources>