From 9f976e29a0406a51dd7e15778625060d3e5e7031 Mon Sep 17 00:00:00 2001
From: Ben Komalo <benkomalo@google.com>
Date: Tue, 17 May 2011 19:35:08 -0700
Subject: [PATCH] DO NOT MERGE - Email support for 7" devices.

- use XLarge layout for Large as well in most cases.
- use XLarge portrait behavior for landscape and portrait for message
list collapsing
- some minor tweaks to account setup UI as the XLarge one didn't fit
on large devices with the padding it specified

Change-Id: I2a83e7239019b3feadcabe5fae61f0d13a628471
---
 .../account_setup_basics.xml                  |  0
 .../account_setup_exchange.xml                |  0
 .../account_setup_incoming.xml                |  0
 .../account_setup_names.xml                   |  0
 .../account_setup_options.xml                 |  0
 .../account_setup_outgoing.xml                |  0
 .../account_setup_basics.xml                  |  0
 .../account_setup_exchange.xml                |  0
 .../account_setup_incoming.xml                |  0
 .../account_setup_names.xml                   |  0
 .../account_setup_options.xml                 |  0
 .../account_setup_outgoing.xml                |  0
 .../account_setup_account_type.xml            | 24 ++++----
 .../account_setup_basics_common.xml           |  2 +-
 .../account_setup_exchange_fragment.xml       |  2 +-
 .../account_setup_incoming_fragment.xml       |  2 +-
 .../account_setup_names_common.xml            |  2 +-
 .../account_setup_options_common.xml          |  2 +-
 .../account_setup_outgoing_fragment.xml       |  2 +-
 .../action_bar_current_mailbox.xml            |  0
 .../message_compose.xml                       |  2 +-
 .../message_compose_attachment.xml            |  2 +-
 .../message_view_attachment.xml               |  2 +-
 .../message_view_fragment.xml                 |  4 +-
 .../message_view_invitation.xml               |  2 +-
 res/layout-w600dp/three_pane.xml              | 26 +++++++++
 res/layout-xlarge-land/three_pane.xml         | 27 +++++++++
 .../three_pane_collapsible_impl.xml}          | 10 ++--
 .../three_pane_impl.xml}                      | 10 ++--
 res/values-large-land/dimen.xml               | 24 ++++++++
 res/values-large-port/styles.xml              | 26 +++++++++
 .../dimensions.xml                            |  2 +-
 .../styles.xml                                |  2 +-
 .../dimensions.xml                            |  3 -
 .../styles.xml                                |  2 +-
 res/values-w600dp/bools.xml                   | 19 +++++++
 .../colors.xml                                |  1 -
 .../dimensions.xml                            |  2 +-
 .../styles.xml                                |  7 ++-
 res/values-xlarge-land/dimen.xml              | 24 ++++++++
 res/values/bools.xml                          | 19 +++++++
 .../email/activity/ThreePaneLayout.java       | 57 +++++++++++--------
 src/com/android/email/activity/Welcome.java   |  5 +-
 43 files changed, 243 insertions(+), 71 deletions(-)
 rename res/{layout-xlarge-land => layout-w600dp-land}/account_setup_basics.xml (100%)
 rename res/{layout-xlarge-land => layout-w600dp-land}/account_setup_exchange.xml (100%)
 rename res/{layout-xlarge-land => layout-w600dp-land}/account_setup_incoming.xml (100%)
 rename res/{layout-xlarge-land => layout-w600dp-land}/account_setup_names.xml (100%)
 rename res/{layout-xlarge-land => layout-w600dp-land}/account_setup_options.xml (100%)
 rename res/{layout-xlarge-land => layout-w600dp-land}/account_setup_outgoing.xml (100%)
 rename res/{layout-xlarge-port => layout-w600dp-port}/account_setup_basics.xml (100%)
 rename res/{layout-xlarge-port => layout-w600dp-port}/account_setup_exchange.xml (100%)
 rename res/{layout-xlarge-port => layout-w600dp-port}/account_setup_incoming.xml (100%)
 rename res/{layout-xlarge-port => layout-w600dp-port}/account_setup_names.xml (100%)
 rename res/{layout-xlarge-port => layout-w600dp-port}/account_setup_options.xml (100%)
 rename res/{layout-xlarge-port => layout-w600dp-port}/account_setup_outgoing.xml (100%)
 rename res/{layout-xlarge => layout-w600dp}/account_setup_account_type.xml (93%)
 rename res/{layout-xlarge => layout-w600dp}/account_setup_basics_common.xml (99%)
 rename res/{layout-xlarge => layout-w600dp}/account_setup_exchange_fragment.xml (98%)
 rename res/{layout-xlarge => layout-w600dp}/account_setup_incoming_fragment.xml (98%)
 rename res/{layout-xlarge => layout-w600dp}/account_setup_names_common.xml (98%)
 rename res/{layout-xlarge => layout-w600dp}/account_setup_options_common.xml (99%)
 rename res/{layout-xlarge => layout-w600dp}/account_setup_outgoing_fragment.xml (98%)
 rename res/{layout-xlarge => layout-w600dp}/action_bar_current_mailbox.xml (100%)
 rename res/{layout-xlarge => layout-w600dp}/message_compose.xml (99%)
 rename res/{layout-xlarge => layout-w600dp}/message_compose_attachment.xml (99%)
 rename res/{layout-xlarge => layout-w600dp}/message_view_attachment.xml (99%)
 rename res/{layout-xlarge => layout-w600dp}/message_view_fragment.xml (99%)
 rename res/{layout-xlarge => layout-w600dp}/message_view_invitation.xml (99%)
 create mode 100644 res/layout-w600dp/three_pane.xml
 create mode 100644 res/layout-xlarge-land/three_pane.xml
 rename res/{layout-port/three_pane.xml => layout/three_pane_collapsible_impl.xml} (91%)
 rename res/{layout-land/three_pane.xml => layout/three_pane_impl.xml} (89%)
 create mode 100644 res/values-large-land/dimen.xml
 create mode 100644 res/values-large-port/styles.xml
 rename res/{values-xlarge-land => values-w600dp-land}/dimensions.xml (98%)
 rename res/{values-xlarge-land => values-w600dp-land}/styles.xml (96%)
 rename res/{values-xlarge-port => values-w600dp-port}/dimensions.xml (96%)
 rename res/{values-xlarge-port => values-w600dp-port}/styles.xml (97%)
 create mode 100644 res/values-w600dp/bools.xml
 rename res/{values-xlarge => values-w600dp}/colors.xml (91%)
 rename res/{values-xlarge => values-w600dp}/dimensions.xml (98%)
 rename res/{values-xlarge => values-w600dp}/styles.xml (95%)
 create mode 100644 res/values-xlarge-land/dimen.xml
 create mode 100644 res/values/bools.xml

diff --git a/res/layout-xlarge-land/account_setup_basics.xml b/res/layout-w600dp-land/account_setup_basics.xml
similarity index 100%
rename from res/layout-xlarge-land/account_setup_basics.xml
rename to res/layout-w600dp-land/account_setup_basics.xml
diff --git a/res/layout-xlarge-land/account_setup_exchange.xml b/res/layout-w600dp-land/account_setup_exchange.xml
similarity index 100%
rename from res/layout-xlarge-land/account_setup_exchange.xml
rename to res/layout-w600dp-land/account_setup_exchange.xml
diff --git a/res/layout-xlarge-land/account_setup_incoming.xml b/res/layout-w600dp-land/account_setup_incoming.xml
similarity index 100%
rename from res/layout-xlarge-land/account_setup_incoming.xml
rename to res/layout-w600dp-land/account_setup_incoming.xml
diff --git a/res/layout-xlarge-land/account_setup_names.xml b/res/layout-w600dp-land/account_setup_names.xml
similarity index 100%
rename from res/layout-xlarge-land/account_setup_names.xml
rename to res/layout-w600dp-land/account_setup_names.xml
diff --git a/res/layout-xlarge-land/account_setup_options.xml b/res/layout-w600dp-land/account_setup_options.xml
similarity index 100%
rename from res/layout-xlarge-land/account_setup_options.xml
rename to res/layout-w600dp-land/account_setup_options.xml
diff --git a/res/layout-xlarge-land/account_setup_outgoing.xml b/res/layout-w600dp-land/account_setup_outgoing.xml
similarity index 100%
rename from res/layout-xlarge-land/account_setup_outgoing.xml
rename to res/layout-w600dp-land/account_setup_outgoing.xml
diff --git a/res/layout-xlarge-port/account_setup_basics.xml b/res/layout-w600dp-port/account_setup_basics.xml
similarity index 100%
rename from res/layout-xlarge-port/account_setup_basics.xml
rename to res/layout-w600dp-port/account_setup_basics.xml
diff --git a/res/layout-xlarge-port/account_setup_exchange.xml b/res/layout-w600dp-port/account_setup_exchange.xml
similarity index 100%
rename from res/layout-xlarge-port/account_setup_exchange.xml
rename to res/layout-w600dp-port/account_setup_exchange.xml
diff --git a/res/layout-xlarge-port/account_setup_incoming.xml b/res/layout-w600dp-port/account_setup_incoming.xml
similarity index 100%
rename from res/layout-xlarge-port/account_setup_incoming.xml
rename to res/layout-w600dp-port/account_setup_incoming.xml
diff --git a/res/layout-xlarge-port/account_setup_names.xml b/res/layout-w600dp-port/account_setup_names.xml
similarity index 100%
rename from res/layout-xlarge-port/account_setup_names.xml
rename to res/layout-w600dp-port/account_setup_names.xml
diff --git a/res/layout-xlarge-port/account_setup_options.xml b/res/layout-w600dp-port/account_setup_options.xml
similarity index 100%
rename from res/layout-xlarge-port/account_setup_options.xml
rename to res/layout-w600dp-port/account_setup_options.xml
diff --git a/res/layout-xlarge-port/account_setup_outgoing.xml b/res/layout-w600dp-port/account_setup_outgoing.xml
similarity index 100%
rename from res/layout-xlarge-port/account_setup_outgoing.xml
rename to res/layout-w600dp-port/account_setup_outgoing.xml
diff --git a/res/layout-xlarge/account_setup_account_type.xml b/res/layout-w600dp/account_setup_account_type.xml
similarity index 93%
rename from res/layout-xlarge/account_setup_account_type.xml
rename to res/layout-w600dp/account_setup_account_type.xml
index 8b51ee759..0c2139aef 100644
--- a/res/layout-xlarge/account_setup_account_type.xml
+++ b/res/layout-w600dp/account_setup_account_type.xml
@@ -14,7 +14,7 @@
      limitations under the License.
 -->
 
-<!-- Account-type picker - xlarge - see layout/ for small-screen version -->
+<!-- Account-type picker - tablet - see layout/ for small-screen version -->
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
@@ -41,22 +41,12 @@
         android:layout_height="1px"
         android:background="@color/account_setup_divider_color" />
 
-    <!-- Button(s) on the right -->
-    <Button
-        android:id="@+id/previous"
-        android:layout_below="@+id/top_divider"
-        android:layout_alignParentRight="true"
-        android:layout_marginTop="@dimen/setup_buttons_padding_top"
-        android:layout_marginRight="@dimen/setup_buttons_padding_right"
-        style="@style/accountSetupButton"
-        android:text="@string/previous_action" />
-
     <!-- Layout on the left containing the setup info -->
     <RelativeLayout
         xmlns:android="http://schemas.android.com/apk/res/android"
+        android:id="@+id/main_content"
         android:layout_below="@+id/top_divider"
         android:layout_alignParentLeft="true"
-        android:layout_toLeftOf="@+id/previous"
         android:layout_marginRight="64dip"
         android:layout_width="match_parent"
         android:layout_height="wrap_content" >
@@ -95,4 +85,14 @@
             style="@style/accountSetupButton"
             android:text="@string/account_setup_account_type_exchange_action" />
     </RelativeLayout>
+
+    <!-- Previous button (can be below or to the right) -->
+    <Button
+        android:id="@+id/previous"
+        android:layout_marginTop="@dimen/setup_buttons_padding_top"
+        android:layout_marginRight="@dimen/setup_buttons_padding_right"
+        style="@style/accountSetupTypePrevious"
+        android:text="@string/previous_action" />
+
+
 </RelativeLayout>
diff --git a/res/layout-xlarge/account_setup_basics_common.xml b/res/layout-w600dp/account_setup_basics_common.xml
similarity index 99%
rename from res/layout-xlarge/account_setup_basics_common.xml
rename to res/layout-w600dp/account_setup_basics_common.xml
index 9a7ecc4c3..616309592 100644
--- a/res/layout-xlarge/account_setup_basics_common.xml
+++ b/res/layout-w600dp/account_setup_basics_common.xml
@@ -15,7 +15,7 @@
 -->
 
 <!-- Common data-entry area of initial account setup screen - email, password, default check -->
-<!-- xlarge version -->
+<!-- tablet version -->
 <RelativeLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
diff --git a/res/layout-xlarge/account_setup_exchange_fragment.xml b/res/layout-w600dp/account_setup_exchange_fragment.xml
similarity index 98%
rename from res/layout-xlarge/account_setup_exchange_fragment.xml
rename to res/layout-w600dp/account_setup_exchange_fragment.xml
index 7a0968f6e..17433ff4c 100644
--- a/res/layout-xlarge/account_setup_exchange_fragment.xml
+++ b/res/layout-w600dp/account_setup_exchange_fragment.xml
@@ -14,7 +14,7 @@
      limitations under the License.
 -->
 
-<!-- Exchange server settings - xlarge - see layout/ for phone UX variant -->
+<!-- Exchange server settings - tablet - see layout/ for phone UX variant -->
 <!-- This is used directly by the account setup activity, but during settings it is
      wrapped in an outer layout (account_settings_exchange_fragment) -->
 <TableLayout  xmlns:android="http://schemas.android.com/apk/res/android"
diff --git a/res/layout-xlarge/account_setup_incoming_fragment.xml b/res/layout-w600dp/account_setup_incoming_fragment.xml
similarity index 98%
rename from res/layout-xlarge/account_setup_incoming_fragment.xml
rename to res/layout-w600dp/account_setup_incoming_fragment.xml
index 6c8b4fe56..60c4dafd9 100644
--- a/res/layout-xlarge/account_setup_incoming_fragment.xml
+++ b/res/layout-w600dp/account_setup_incoming_fragment.xml
@@ -14,7 +14,7 @@
      limitations under the License.
 -->
 
-<!-- Incoming server settings - xlarge - see layout/ for phone UX variant -->
+<!-- Incoming server settings - tablet - see layout/ for phone UX variant -->
 <!-- This is used directly by the account setup activity, but during settings it is
      wrapped in an outer layout (account_settings_incoming_fragment) -->
 <TableLayout  xmlns:android="http://schemas.android.com/apk/res/android"
diff --git a/res/layout-xlarge/account_setup_names_common.xml b/res/layout-w600dp/account_setup_names_common.xml
similarity index 98%
rename from res/layout-xlarge/account_setup_names_common.xml
rename to res/layout-w600dp/account_setup_names_common.xml
index 4122d5f5d..c7667dd4b 100644
--- a/res/layout-xlarge/account_setup_names_common.xml
+++ b/res/layout-w600dp/account_setup_names_common.xml
@@ -15,7 +15,7 @@
 -->
 
 <!-- Common data-entry area of account name setup screen - account nickname, user name. -->
-<!-- xlarge version -->
+<!-- tablet version -->
 <RelativeLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
diff --git a/res/layout-xlarge/account_setup_options_common.xml b/res/layout-w600dp/account_setup_options_common.xml
similarity index 99%
rename from res/layout-xlarge/account_setup_options_common.xml
rename to res/layout-w600dp/account_setup_options_common.xml
index eec71c346..0b73f50ca 100644
--- a/res/layout-xlarge/account_setup_options_common.xml
+++ b/res/layout-w600dp/account_setup_options_common.xml
@@ -15,7 +15,7 @@
 -->
 
 <!-- Common data-entry area of account options setup screen - check freq, options, etc. -->
-<!-- xlarge version -->
+<!-- tablet version -->
 <RelativeLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
diff --git a/res/layout-xlarge/account_setup_outgoing_fragment.xml b/res/layout-w600dp/account_setup_outgoing_fragment.xml
similarity index 98%
rename from res/layout-xlarge/account_setup_outgoing_fragment.xml
rename to res/layout-w600dp/account_setup_outgoing_fragment.xml
index 9bfa92db0..e33154080 100644
--- a/res/layout-xlarge/account_setup_outgoing_fragment.xml
+++ b/res/layout-w600dp/account_setup_outgoing_fragment.xml
@@ -14,7 +14,7 @@
      limitations under the License.
 -->
 
-<!-- Incoming server settings - xlarge - see layout/ for phone UX variant -->
+<!-- Incoming server settings - tablet - see layout/ for phone UX variant -->
 <!-- This is used directly by the account setup activity, but during settings it is
      wrapped in an outer layout (account_settings_outgoing_fragment) -->
 <TableLayout  xmlns:android="http://schemas.android.com/apk/res/android"
diff --git a/res/layout-xlarge/action_bar_current_mailbox.xml b/res/layout-w600dp/action_bar_current_mailbox.xml
similarity index 100%
rename from res/layout-xlarge/action_bar_current_mailbox.xml
rename to res/layout-w600dp/action_bar_current_mailbox.xml
diff --git a/res/layout-xlarge/message_compose.xml b/res/layout-w600dp/message_compose.xml
similarity index 99%
rename from res/layout-xlarge/message_compose.xml
rename to res/layout-w600dp/message_compose.xml
index 557f18794..af97cf1e2 100644
--- a/res/layout-xlarge/message_compose.xml
+++ b/res/layout-w600dp/message_compose.xml
@@ -14,7 +14,7 @@
      limitations under the License.
 -->
 
-<!-- xlarge -->
+<!-- tablet -->
 
 <FrameLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
diff --git a/res/layout-xlarge/message_compose_attachment.xml b/res/layout-w600dp/message_compose_attachment.xml
similarity index 99%
rename from res/layout-xlarge/message_compose_attachment.xml
rename to res/layout-w600dp/message_compose_attachment.xml
index fa811db0d..254b17bc9 100644
--- a/res/layout-xlarge/message_compose_attachment.xml
+++ b/res/layout-w600dp/message_compose_attachment.xml
@@ -14,7 +14,7 @@
      limitations under the License.
 -->
 
-<!-- xlarge -->
+<!-- tablet -->
 
 <RelativeLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
diff --git a/res/layout-xlarge/message_view_attachment.xml b/res/layout-w600dp/message_view_attachment.xml
similarity index 99%
rename from res/layout-xlarge/message_view_attachment.xml
rename to res/layout-w600dp/message_view_attachment.xml
index caf9e89fa..2b1afe703 100644
--- a/res/layout-xlarge/message_view_attachment.xml
+++ b/res/layout-w600dp/message_view_attachment.xml
@@ -14,7 +14,7 @@
      limitations under the License.
 -->
 
-<!-- xlarge -->
+<!-- tablet -->
 
 <LinearLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
diff --git a/res/layout-xlarge/message_view_fragment.xml b/res/layout-w600dp/message_view_fragment.xml
similarity index 99%
rename from res/layout-xlarge/message_view_fragment.xml
rename to res/layout-w600dp/message_view_fragment.xml
index a649918e1..bf90fd2c9 100644
--- a/res/layout-xlarge/message_view_fragment.xml
+++ b/res/layout-w600dp/message_view_fragment.xml
@@ -14,7 +14,7 @@
      limitations under the License.
 -->
 
-<!-- xlarge -->
+<!-- tablet -->
 <LinearLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
@@ -392,4 +392,4 @@
             </LinearLayout>
         </RelativeLayout>
     </FrameLayout>
-</LinearLayout>
\ No newline at end of file
+</LinearLayout>
diff --git a/res/layout-xlarge/message_view_invitation.xml b/res/layout-w600dp/message_view_invitation.xml
similarity index 99%
rename from res/layout-xlarge/message_view_invitation.xml
rename to res/layout-w600dp/message_view_invitation.xml
index 10b8e418a..f80593f2c 100644
--- a/res/layout-xlarge/message_view_invitation.xml
+++ b/res/layout-w600dp/message_view_invitation.xml
@@ -14,7 +14,7 @@
      limitations under the License.
 -->
 
-<!-- xlarge -->
+<!-- tablet -->
 
 <LinearLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
diff --git a/res/layout-w600dp/three_pane.xml b/res/layout-w600dp/three_pane.xml
new file mode 100644
index 000000000..450844d9a
--- /dev/null
+++ b/res/layout-w600dp/three_pane.xml
@@ -0,0 +1,26 @@
+<?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.
+-->
+
+<!-- Note the width of each pane is set by code at runtime.  -->
+<com.android.email.activity.ThreePaneLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:splitMotionEvents="true"
+    >
+
+    <include layout="@layout/three_pane_collapsible_impl" />
+
+</com.android.email.activity.ThreePaneLayout>
+
diff --git a/res/layout-xlarge-land/three_pane.xml b/res/layout-xlarge-land/three_pane.xml
new file mode 100644
index 000000000..ba0bb3166
--- /dev/null
+++ b/res/layout-xlarge-land/three_pane.xml
@@ -0,0 +1,27 @@
+<?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.
+-->
+
+<!-- Note the width of each pane is set by code at runtime.  -->
+<com.android.email.activity.ThreePaneLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:splitMotionEvents="true"
+    >
+
+    <include layout="@layout/three_pane_impl" />
+
+</com.android.email.activity.ThreePaneLayout>
+
+
diff --git a/res/layout-port/three_pane.xml b/res/layout/three_pane_collapsible_impl.xml
similarity index 91%
rename from res/layout-port/three_pane.xml
rename to res/layout/three_pane_collapsible_impl.xml
index b35cecaae..143f1963f 100644
--- a/res/layout-port/three_pane.xml
+++ b/res/layout/three_pane_collapsible_impl.xml
@@ -16,12 +16,10 @@
 
 <!-- ThreePaneLayout is based on LinearLayout with the orientation always horizontal -->
 
-<!-- for portrait -->
+<!-- Implementation of a three pane layout where in some modes, the left pane is
+     collapsible. -->
 <!-- Note the width of each pane is set by code at runtime.  -->
-<com.android.email.activity.ThreePaneLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:splitMotionEvents="true"
-    >
+<merge xmlns:android="http://schemas.android.com/apk/res/android">
 
     <fragment
         android:name="com.android.email.activity.MailboxListFragment"
@@ -65,4 +63,4 @@
             android:background="@color/message_view_fogged_glass_color"
             />
     </FrameLayout>
-</com.android.email.activity.ThreePaneLayout>
+</merge>
diff --git a/res/layout-land/three_pane.xml b/res/layout/three_pane_impl.xml
similarity index 89%
rename from res/layout-land/three_pane.xml
rename to res/layout/three_pane_impl.xml
index 1e663c751..02397a28d 100644
--- a/res/layout-land/three_pane.xml
+++ b/res/layout/three_pane_impl.xml
@@ -16,12 +16,10 @@
 
 <!-- ThreePaneLayout is based on LinearLayout with the orientation always horizontal -->
 
-<!-- for landscape -->
+<!-- Implementation of a three pane layout where two panes are always visible at
+     any given time. -->
 <!-- Note the width of each pane is set by code at runtime.  -->
-<com.android.email.activity.ThreePaneLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:splitMotionEvents="true"
-    >
+<merge xmlns:android="http://schemas.android.com/apk/res/android">
 
     <fragment
         android:name="com.android.email.activity.MailboxListFragment"
@@ -52,4 +50,4 @@
         android:layout_width="0dip"
         android:layout_height="match_parent"
         />
-</com.android.email.activity.ThreePaneLayout>
+</merge>
diff --git a/res/values-large-land/dimen.xml b/res/values-large-land/dimen.xml
new file mode 100644
index 000000000..6c4194c1b
--- /dev/null
+++ b/res/values-large-land/dimen.xml
@@ -0,0 +1,24 @@
+<?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-large-port/styles.xml b/res/values-large-port/styles.xml
new file mode 100644
index 000000000..2c5fab4b5
--- /dev/null
+++ b/res/values-large-port/styles.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2009 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>
+    <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-xlarge-land/dimensions.xml b/res/values-w600dp-land/dimensions.xml
similarity index 98%
rename from res/values-xlarge-land/dimensions.xml
rename to res/values-w600dp-land/dimensions.xml
index b63f3b629..a91f4eb3b 100644
--- a/res/values-xlarge-land/dimensions.xml
+++ b/res/values-w600dp-land/dimensions.xml
@@ -14,7 +14,7 @@
      limitations under the License.
 -->
 
-<!-- xlarge, landscape -->
+<!-- tablet, landscape -->
 <resources>
     <dimen name="message_compose_field_label_width">120dip</dimen>
 
diff --git a/res/values-xlarge-land/styles.xml b/res/values-w600dp-land/styles.xml
similarity index 96%
rename from res/values-xlarge-land/styles.xml
rename to res/values-w600dp-land/styles.xml
index acef1e1e7..f7e094e9a 100644
--- a/res/values-xlarge-land/styles.xml
+++ b/res/values-w600dp-land/styles.xml
@@ -14,7 +14,7 @@
      limitations under the License.
 -->
 
-<!-- xlarge, landscape -->
+<!-- tablet, landscape -->
 
 <resources>
     <!-- Use fixed width in landscape -->
diff --git a/res/values-xlarge-port/dimensions.xml b/res/values-w600dp-port/dimensions.xml
similarity index 96%
rename from res/values-xlarge-port/dimensions.xml
rename to res/values-w600dp-port/dimensions.xml
index cb0b45ff4..fb405f032 100644
--- a/res/values-xlarge-port/dimensions.xml
+++ b/res/values-w600dp-port/dimensions.xml
@@ -14,12 +14,9 @@
      limitations under the License.
 -->
 
-<!-- xlarge, portrait -->
 <resources>
     <dimen name="message_compose_field_label_width">120dip</dimen>
 
-    <!-- XL activity dimensions -->
-
     <!-- width of mailbox list -->
     <dimen name="mailbox_list_width">206dip</dimen>
     <!--
diff --git a/res/values-xlarge-port/styles.xml b/res/values-w600dp-port/styles.xml
similarity index 97%
rename from res/values-xlarge-port/styles.xml
rename to res/values-w600dp-port/styles.xml
index 61a1bb37b..8030b0ff5 100644
--- a/res/values-xlarge-port/styles.xml
+++ b/res/values-w600dp-port/styles.xml
@@ -14,7 +14,7 @@
      limitations under the License.
 -->
 
-<!-- xlarge, portrait -->
+<!-- tablet, portrait -->
 
 <resources>
     <!-- Use fixed margin in portrait -->
diff --git a/res/values-w600dp/bools.xml b/res/values-w600dp/bools.xml
new file mode 100644
index 000000000..b6bbe2ea3
--- /dev/null
+++ b/res/values-w600dp/bools.xml
@@ -0,0 +1,19 @@
+<?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.
+-->
+
+<resources>
+    <bool name="use_two_pane">true</bool>
+</resources>
diff --git a/res/values-xlarge/colors.xml b/res/values-w600dp/colors.xml
similarity index 91%
rename from res/values-xlarge/colors.xml
rename to res/values-w600dp/colors.xml
index 3a36473ad..9607459a4 100644
--- a/res/values-xlarge/colors.xml
+++ b/res/values-w600dp/colors.xml
@@ -14,7 +14,6 @@
      limitations under the License.
 -->
 
-<!-- Specializations for xlarge screens - most colors are in values/colors.xml -->
 <resources>
 
     <color name="message_view_fogged_glass_color">#00000000</color>
diff --git a/res/values-xlarge/dimensions.xml b/res/values-w600dp/dimensions.xml
similarity index 98%
rename from res/values-xlarge/dimensions.xml
rename to res/values-w600dp/dimensions.xml
index c02ad82a3..bc92473b1 100644
--- a/res/values-xlarge/dimensions.xml
+++ b/res/values-w600dp/dimensions.xml
@@ -14,7 +14,7 @@
      limitations under the License.
 -->
 
-<!-- xlarge -->
+<!-- tablet -->
 <resources>
 
     <!-- Account Setup Activities -->
diff --git a/res/values-xlarge/styles.xml b/res/values-w600dp/styles.xml
similarity index 95%
rename from res/values-xlarge/styles.xml
rename to res/values-w600dp/styles.xml
index 2324db6bc..c77174343 100644
--- a/res/values-xlarge/styles.xml
+++ b/res/values-w600dp/styles.xml
@@ -14,7 +14,7 @@
      limitations under the License.
 -->
 
-<!-- Specializations for xlarge screens - most colors are in values/colors.xml -->
+<!-- Specializations for tablet screens - most colors are in values/colors.xml -->
 <resources>
     <!-- The headline at the top of every account settings fragments (in preferences) -->
     <style name="accountSettingsHeadline">
@@ -134,4 +134,9 @@
         <item name="android:singleLine">true</item>
         <item name="android:ellipsize">end</item>
     </style>
+
+    <style name="accountSetupTypePrevious" parent="@style/accountSetupButton">
+        <item name="android:layout_toRightOf">@+id/main_content"</item>
+        <item name="android:layout_alignParentRight">true</item>
+    </style>
 </resources>
diff --git a/res/values-xlarge-land/dimen.xml b/res/values-xlarge-land/dimen.xml
new file mode 100644
index 000000000..1b775848d
--- /dev/null
+++ b/res/values-xlarge-land/dimen.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2010 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.
+-->
+
+<!-- tablet, landscape -->
+<resources>
+    <!-- Account Setup Activities -->
+    <dimen name="setup_padding_top">16dip</dimen>
+    <dimen name="setup_padding_left">128dip</dimen>
+    <dimen name="setup_padding_right">128dip</dimen>
+</resources>
+
diff --git a/res/values/bools.xml b/res/values/bools.xml
new file mode 100644
index 000000000..09c130c01
--- /dev/null
+++ b/res/values/bools.xml
@@ -0,0 +1,19 @@
+<?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.
+-->
+
+<resources>
+    <bool name="use_two_pane">false</bool>
+</resources>
diff --git a/src/com/android/email/activity/ThreePaneLayout.java b/src/com/android/email/activity/ThreePaneLayout.java
index 87952f2da..7e2e4c76d 100644
--- a/src/com/android/email/activity/ThreePaneLayout.java
+++ b/src/com/android/email/activity/ThreePaneLayout.java
@@ -37,7 +37,8 @@ import android.widget.LinearLayout;
 /**
  * The "three pane" layout used on tablet.
  *
- * It'll encapsulate the behavioral differences between portrait mode and landscape mode.
+ * This layout can show up to two panes at any given time, and operates in two different modes.
+ * See {@link #isPaneCollapsible()} for details on the two modes.
  *
  * TODO Unit tests, when UX is settled.
  */
@@ -50,14 +51,21 @@ public class ThreePaneLayout extends LinearLayout implements View.OnClickListene
     /** Uninitialized state -- {@link #changePaneState} hasn't been called yet. */
     private static final int STATE_UNINITIALIZED = -1;
 
-    /** Mailbox list + message list */
+    /** Mailbox list + message list both visible. */
     private static final int STATE_LEFT_VISIBLE = 0;
 
-    /** Message view on portrait, + message list on landscape. */
+    /**
+     * A view where the MessageView is visible. The MessageList is visible if
+     * {@link #isPaneCollapsible} is false, but is otherwise collapsed and hidden.
+     */
     private static final int STATE_RIGHT_VISIBLE = 1;
 
-    /** Portrait mode only: message view + expanded message list */
-    private static final int STATE_PORTRAIT_MIDDLE_EXPANDED = 2;
+    /**
+     * A view where the MessageView is partially visible and a collapsible MessageList on the left
+     * has been expanded to be in view. {@link #isPaneCollapsible} must return true for this
+     * state to be active.
+     */
+    private static final int STATE_MIDDLE_EXPANDED = 2;
 
     // Flags for getVisiblePanes()
     public static final int PANE_LEFT = 1 << 2;
@@ -75,7 +83,7 @@ public class ThreePaneLayout extends LinearLayout implements View.OnClickListene
     private View mRightPane;
     private MessageCommandButtonView mMessageCommandButtons;
 
-    // Views used only on portrait
+    // Views used only when the left pane is collapsible.
     private View mFoggedGlass;
 
     private boolean mFirstSizeChangedDone;
@@ -84,8 +92,8 @@ public class ThreePaneLayout extends LinearLayout implements View.OnClickListene
     private int mMailboxListWidth;
     /**
      * Message list width, on:
-     * - the message list + message view mode, on landscape.
-     * - the message view + expanded message list mode, on portrait.
+     * - the message list + message view mode, when the left pane is not collapsible
+     * - the message view + expanded message list mode, when the left pane is collapsible
      * Comes from resources.
      */
     private int mMessageListWidth;
@@ -152,14 +160,14 @@ public class ThreePaneLayout extends LinearLayout implements View.OnClickListene
                 (MessageCommandButtonView) findViewById(R.id.message_command_buttons);
 
         mFoggedGlass = findViewById(R.id.fogged_glass);
-        if (mFoggedGlass != null) { // If it's around, it's portrait.
+        if (mFoggedGlass != null) {
             mRightPane = findViewById(R.id.right_pane_with_fog);
             mFoggedGlass.setOnClickListener(this);
-        } else { // landscape
+        } else {
             mRightPane = findViewById(R.id.right_pane);
         }
 
-        if (isLandscape()) {
+        if (!isPaneCollapsible()) {
             mShowHideViews = new View[][][] {
                     // STATE_LEFT_VISIBLE
                     {
@@ -173,7 +181,7 @@ public class ThreePaneLayout extends LinearLayout implements View.OnClickListene
                         {mLeftPane}, // Invisible
                         {}, // Gone
                     },
-                    // STATE_PORTRAIT_MIDDLE_EXPANDED -- not used in landscape
+                    // STATE_MIDDLE_EXPANDED
                     {
                         {}, // Visible
                         {}, // Invisible
@@ -194,7 +202,7 @@ public class ThreePaneLayout extends LinearLayout implements View.OnClickListene
                         {mLeftPane, mMiddlePane, mFoggedGlass}, // Invisible
                         {}, // Gone
                     },
-                    // STATE_PORTRAIT_MIDDLE_EXPANDED
+                    // STATE_MIDDLE_EXPANDED
                     {
                         {mMiddlePane, mRightPane, mMessageCommandButtons, mFoggedGlass}, // Visible
                         {mLeftPane}, // Invisible
@@ -216,8 +224,11 @@ public class ThreePaneLayout extends LinearLayout implements View.OnClickListene
         mCallback = (callback == null) ? EmptyCallback.INSTANCE : callback;
     }
 
-    private boolean isLandscape() {
-        return mFoggedGlass == null;
+    /**
+     * Return whether or not the left pane should be collapsible.
+     */
+    private boolean isPaneCollapsible() {
+        return mFoggedGlass != null;
     }
 
     public MessageCommandButtonView getMessageCommandButtons() {
@@ -268,7 +279,7 @@ public class ThreePaneLayout extends LinearLayout implements View.OnClickListene
      * @return true if the event is handled.
      */
     public boolean onBackPressed(boolean isSystemBackKey) {
-        if (isLandscape()) {
+        if (!isPaneCollapsible()) {
             switch (mPaneState) {
             case STATE_RIGHT_VISIBLE:
                 changePaneState(STATE_LEFT_VISIBLE, true); // Close the right pane
@@ -280,10 +291,10 @@ public class ThreePaneLayout extends LinearLayout implements View.OnClickListene
                     if (isSystemBackKey) {
                         changePaneState(STATE_LEFT_VISIBLE, true);
                     } else {
-                        changePaneState(STATE_PORTRAIT_MIDDLE_EXPANDED, true);
+                        changePaneState(STATE_MIDDLE_EXPANDED, true);
                     }
                     return true;
-                case STATE_PORTRAIT_MIDDLE_EXPANDED:
+                case STATE_MIDDLE_EXPANDED:
                     changePaneState(STATE_LEFT_VISIBLE, true);
                     return true;
                 }
@@ -319,7 +330,7 @@ public class ThreePaneLayout extends LinearLayout implements View.OnClickListene
     }
 
     private void changePaneState(int newState, boolean animate) {
-        if (isLandscape() && (newState == STATE_PORTRAIT_MIDDLE_EXPANDED)) {
+        if (!isPaneCollapsible() && (newState == STATE_MIDDLE_EXPANDED)) {
             newState = STATE_RIGHT_VISIBLE;
         }
         if (!mFirstSizeChangedDone) {
@@ -349,7 +360,7 @@ public class ThreePaneLayout extends LinearLayout implements View.OnClickListene
 
         final String animatorLabel; // for debug purpose
 
-        if (isLandscape()) { // Landscape
+        if (!isPaneCollapsible()) {
             setViewWidth(mLeftPane, mMailboxListWidth);
             setViewWidth(mRightPane, totalWidth - mMessageListWidth);
 
@@ -370,7 +381,7 @@ public class ThreePaneLayout extends LinearLayout implements View.OnClickListene
                     throw new IllegalStateException();
             }
 
-        } else { // Portrait
+        } else {
             setViewWidth(mLeftPane, mMailboxListWidth);
             setViewWidth(mRightPane, totalWidth);
 
@@ -381,7 +392,7 @@ public class ThreePaneLayout extends LinearLayout implements View.OnClickListene
                     expectedMailboxLeft = 0;
                     expectedMessageListWidth = totalWidth - mMailboxListWidth;
                     break;
-                case STATE_PORTRAIT_MIDDLE_EXPANDED:
+                case STATE_MIDDLE_EXPANDED:
                     // mailbox + message list -> message list + message view
                     animatorLabel = "moving to [message list + message view]";
                     expectedMailboxLeft = -mMailboxListWidth;
@@ -439,7 +450,7 @@ public class ThreePaneLayout extends LinearLayout implements View.OnClickListene
     public void onClick(View v) {
         switch (v.getId()) {
             case R.id.fogged_glass:
-                if (isLandscape()) {
+                if (!isPaneCollapsible()) {
                     return; // Shouldn't happen
                 }
                 changePaneState(STATE_RIGHT_VISIBLE, true);
diff --git a/src/com/android/email/activity/Welcome.java b/src/com/android/email/activity/Welcome.java
index 22c575dc3..f48e19ef6 100644
--- a/src/com/android/email/activity/Welcome.java
+++ b/src/com/android/email/activity/Welcome.java
@@ -19,6 +19,7 @@ package com.android.email.activity;
 import com.android.email.AccountBackupRestore;
 import com.android.email.Email;
 import com.android.email.ExchangeUtils;
+import com.android.email.R;
 import com.android.email.activity.setup.AccountSetupBasics;
 import com.android.email.service.MailService;
 import com.android.emailcommon.provider.EmailContent;
@@ -29,7 +30,6 @@ import com.android.emailcommon.utility.Utility;
 import android.app.Activity;
 import android.content.Context;
 import android.content.Intent;
-import android.content.res.Configuration;
 import android.os.AsyncTask;
 import android.os.Bundle;
 import android.os.Handler;
@@ -84,8 +84,7 @@ public class Welcome extends Activity {
      * @return true if the two-pane activity should be used on the current configuration.
      */
     public static boolean useTwoPane(Context context) {
-        final int screenLayout = context.getResources().getConfiguration().screenLayout;
-        return (screenLayout & Configuration.SCREENLAYOUT_SIZE_XLARGE) != 0;
+        return context.getResources().getBoolean(R.bool.use_two_pane);
     }
 
     /**