Defragment AccountSetupBasics

* This was an early attempt at fragmentation
* But it turned out that no fragment was needed here - it is
  not shared or reused in any way.
* Precursor to doing final layouts for the activity.
* Tested working:
    Automatic provider lookup
    Manual
    POP/IMAP and EAS flow modes (from accounts & sync)
    Force account creation intent
    Provider note
    Duplicate account detection

Change-Id: I434edd4b152391d36e70440873932db3ec1a1c99

4 files changed, 29 insertions, 19 deletions

diff --git a/res/layout-xlarge-land/account_setup_basics.xml b/res/layout-xlarge-land/account_setup_basics.xml
index 70402bc60..e26b50356 100644
--- a/res/layout-xlarge-land/account_setup_basics.xml
+++ b/res/layout-xlarge-land/account_setup_basics.xml
@@ -60,15 +60,17 @@
         style="@style/accountSetupButton"
         android:text="@string/next_action" />
 
-    <!-- Fragment on the left containing the setup info -->
-    <fragment
-        android:id="@+id/setup_basics_fragment"
-        class="com.android.email.activity.setup.AccountSetupBasicsFragment"
+    <!-- Frame on the left containing the (common) setup info -->
+    <FrameLayout
         android:layout_below="@+id/top_divider"
         android:layout_alignParentLeft="true"
         android:layout_toLeftOf="@+id/manual_setup"
         android:layout_marginRight="64dip"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-    />
+        >
+        <include
+            layout="@layout/account_setup_basics_common"
+            />
+    </FrameLayout>
 </RelativeLayout>
diff --git a/res/layout-xlarge-port/account_setup_basics.xml b/res/layout-xlarge-port/account_setup_basics.xml
index 6e85b061f..b83bf2493 100644
--- a/res/layout-xlarge-port/account_setup_basics.xml
+++ b/res/layout-xlarge-port/account_setup_basics.xml
@@ -42,28 +42,31 @@
         android:layout_height="1px"
         android:background="@color/account_setup_divider_color" />
 
-    <!-- Fragment in the middle containing the setup info -->
-    <fragment
-        android:id="@+id/setup_basics_fragment"
-        class="com.android.email.activity.setup.AccountSetupBasicsFragment"
+    <!-- Frame on the left containing the (common) setup info -->
+    <FrameLayout
+        android:id="@+id/common"
         android:layout_below="@+id/top_divider"
         android:layout_alignParentLeft="true"
         android:layout_alignParentRight="true"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-    />
+        >
+        <include
+            layout="@layout/account_setup_basics_common"
+            />
+    </FrameLayout>
 
     <!-- Buttons below -->
     <Button
         android:id="@+id/manual_setup"
-        android:layout_below="@+id/setup_basics_fragment"
+        android:layout_below="@+id/common"
         android:layout_marginTop="48dip"
         android:layout_alignParentLeft="true"
         style="@style/accountSetupButton"
         android:text="@string/account_setup_basics_manual_setup_action" />
     <Button
         android:id="@+id/next"
-        android:layout_below="@+id/setup_basics_fragment"
+        android:layout_below="@+id/common"
         android:layout_marginTop="48dip"
         android:layout_alignParentRight="true"
         style="@style/accountSetupButton"
diff --git a/res/layout/account_setup_basics_fragment.xml b/res/layout-xlarge/account_setup_basics_common.xml
index 5a537f743..b58262eb1 100644
--- a/res/layout/account_setup_basics_fragment.xml
+++ b/res/layout-xlarge/account_setup_basics_common.xml
@@ -15,6 +15,7 @@
 -->
 
 <!-- Common data-entry area of initial account setup screen - email, password, default check -->
+<!-- xlarge version -->
 <RelativeLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
diff --git a/res/layout/account_setup_basics.xml b/res/layout/account_setup_basics.xml
index 473a78d15..dc9eb802d 100644
--- a/res/layout/account_setup_basics.xml
+++ b/res/layout/account_setup_basics.xml
@@ -25,29 +25,33 @@
         android:layout_height="match_parent"
         >
 
-        <!-- Fragment in the middle containing the setup info -->
-        <fragment
-            android:id="@+id/setup_basics_fragment"
-            class="com.android.email.activity.setup.AccountSetupBasicsFragment"
+        <!-- Frame on the left containing the (common) setup info -->
+        <!-- TODO need phone-sized UX here -->
+        <FrameLayout
+            android:id="@+id/common"
             android:layout_below="@+id/top_divider"
             android:layout_alignParentLeft="true"
             android:layout_alignParentRight="true"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_weight="1"
-        />
+            >
+            <include
+                layout="@layout/account_setup_basics_common"
+                />
+        </FrameLayout>
 
         <!-- Buttons below -->
         <Button
             android:id="@+id/manual_setup"
-            android:layout_below="@+id/setup_basics_fragment"
+            android:layout_below="@+id/common"
             android:layout_alignParentLeft="true"
             android:layout_marginTop="16dip"
             style="@style/accountSetupButton"
             android:text="@string/account_setup_basics_manual_setup_action" />
         <Button
             android:id="@+id/next"
-            android:layout_below="@+id/setup_basics_fragment"
+            android:layout_below="@+id/common"
             android:layout_alignParentRight="true"
             android:layout_marginTop="16dip"
             style="@style/accountSetupButton"