From ee463b32ffd9d7d5c2eccbc2ad344735841caef0 Mon Sep 17 00:00:00 2001
From: Jesse Vincent <jesse@fsck.com>
Date: Mon, 23 Nov 2009 00:23:34 +0000
Subject: [PATCH] Overhaul our setup wizard to have a more reasonable bottom
 bar and to reuse that layout code where possible; standardize the id of the
 'next' button

---
 res/layout/account_setup_basics.xml          | 37 ++++++++++++++------
 res/layout/account_setup_check_settings.xml  | 21 ++++-------
 res/layout/account_setup_incoming.xml        | 16 +--------
 res/layout/account_setup_names.xml           | 30 ++++++++++++----
 res/layout/account_setup_options.xml         | 20 ++---------
 res/layout/account_setup_outgoing.xml        | 18 ++--------
 res/layout/accounts.xml                      | 19 ++--------
 res/layout/wizard_cancel.xml                 | 20 +++++++++++
 res/layout/wizard_next.xml                   | 21 +++++++++++
 src/com/android/email/activity/Accounts.java |  4 +--
 10 files changed, 109 insertions(+), 97 deletions(-)
 create mode 100644 res/layout/wizard_cancel.xml
 create mode 100644 res/layout/wizard_next.xml

diff --git a/res/layout/account_setup_basics.xml b/res/layout/account_setup_basics.xml
index 1afa732e0..d32889a81 100644
--- a/res/layout/account_setup_basics.xml
+++ b/res/layout/account_setup_basics.xml
@@ -1,10 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical"
+    android:layout_height="fill_parent"
+    android:layout_width="fill_parent">
+
+<ScrollView
     android:layout_width="fill_parent"
     android:layout_height="fill_parent"
-    android:orientation="vertical"
+    android:layout_marginBottom="54dip" 
     android:padding="6dip"
-      >
+    android:fadingEdge="none"
+    android:scrollbarStyle="outsideInset">
+    <LinearLayout
+        android:layout_width="fill_parent"
+        android:layout_height="fill_parent"
+        android:orientation="vertical">
       <TextView
         android:text="@string/account_setup_basics_instructions"
         android:layout_height="wrap_content"
@@ -41,29 +51,36 @@
         android:layout_height="0dip"
         android:layout_weight="1"
         />
+    </LinearLayout>
+    </ScrollView>
     <RelativeLayout
-        android:layout_width="fill_parent"
-        android:layout_height="54dip"
-        
-        >
+        android:layout_marginTop="-45dip" 
+        android:padding="0dip"
+        android:layout_alignParentBottom="true"
+        android:gravity="bottom|right" 
+        android:background="@android:drawable/bottom_bar"
+        android:layout_height="fill_parent"
+        android:layout_width="fill_parent">
         <Button
             android:id="@+id/manual_setup"
             android:text="@string/account_setup_basics_manual_setup_action"
+            android:minWidth="@dimen/button_minWidth"
             android:layout_height="wrap_content"
             android:layout_width="wrap_content"
-            android:minWidth="@dimen/button_minWidth"
+            android:layout_marginBottom="-4dip" 
             android:layout_alignParentLeft="true"
-            android:layout_centerVertical="true"
+            android:layout_centerVertical="false" 
             />
         <Button
             android:id="@+id/next"
             android:text="@string/next_action"
+            android:minWidth="@dimen/button_minWidth"
             android:layout_height="wrap_content"
             android:layout_width="wrap_content"
-            android:minWidth="@dimen/button_minWidth"
             android:drawableRight="@drawable/button_indicator_next"
+            android:layout_marginBottom="-4dip" 
             android:layout_alignParentRight="true"
-            android:layout_centerVertical="true"
+            android:layout_centerVertical="false" 
             />
     </RelativeLayout>
 </LinearLayout>
diff --git a/res/layout/account_setup_check_settings.xml b/res/layout/account_setup_check_settings.xml
index 92eec2668..67fe72a4b 100644
--- a/res/layout/account_setup_check_settings.xml
+++ b/res/layout/account_setup_check_settings.xml
@@ -3,8 +3,12 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="fill_parent"
     android:layout_height="fill_parent"
-    android:padding="6dip"
     android:orientation="vertical">
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical"
+    android:layout_height="fill_parent"
+    android:padding="6dip"
+    android:layout_width="fill_parent">
     <View
         android:layout_width="fill_parent"
         android:layout_height="100sp" />
@@ -26,17 +30,6 @@
         android:layout_width="fill_parent"
         android:layout_height="0dip"
         android:layout_weight="1" />
-    <RelativeLayout
-        android:layout_width="fill_parent"
-        android:layout_height="54dip"
-        
-        >
-        <Button
-            android:id="@+id/cancel"
-            android:text="@string/cancel_action"
-            android:layout_height="wrap_content"
-            android:layout_width="wrap_content"
-            android:minWidth="@dimen/button_minWidth"
-            android:layout_centerVertical="true" />
-    </RelativeLayout>
+    </LinearLayout>
+    <include layout="@layout/wizard_cancel" />
 </LinearLayout>
diff --git a/res/layout/account_setup_incoming.xml b/res/layout/account_setup_incoming.xml
index 1a777e763..561153f25 100644
--- a/res/layout/account_setup_incoming.xml
+++ b/res/layout/account_setup_incoming.xml
@@ -169,19 +169,5 @@
             android:layout_weight="1" />
     </LinearLayout>
 </ScrollView>
-    <RelativeLayout 
-        android:layout_marginTop="-54dip" 
-        android:gravity="bottom|right" 
-        android:layout_height="wrap_content" 
-        android:layout_width="fill_parent">
-        <Button
-            android:id="@+id/next"
-            android:text="@string/next_action"
-            android:layout_width="wrap_content"
-            android:minWidth="@dimen/button_minWidth"
-            android:layout_height="wrap_content"
-            android:drawableRight="@drawable/button_indicator_next"
-            android:layout_alignParentRight="true"
-            android:layout_centerVertical="false" />
-    </RelativeLayout>
+    <include layout="@layout/wizard_next" />
 </LinearLayout>
diff --git a/res/layout/account_setup_names.xml b/res/layout/account_setup_names.xml
index 715e77123..97da28f48 100644
--- a/res/layout/account_setup_names.xml
+++ b/res/layout/account_setup_names.xml
@@ -3,8 +3,19 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="fill_parent"
     android:layout_height="fill_parent"
-    android:padding="6dip"
     android:orientation="vertical">
+
+<ScrollView
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent"
+    android:layout_marginBottom="54dip" 
+    android:padding="6dip"
+    android:fadingEdge="none"
+    android:scrollbarStyle="outsideInset">
+    <LinearLayout
+        android:layout_width="fill_parent"
+        android:layout_height="fill_parent"
+        android:orientation="vertical">
     <TextView
         android:text="@string/account_setup_names_instructions"
         android:layout_height="wrap_content"
@@ -37,18 +48,25 @@
         android:layout_height="0dip"
         android:layout_width="fill_parent"
         android:layout_weight="1" />
+</LinearLayout>
+</ScrollView>
     <RelativeLayout
-        android:layout_width="fill_parent"
+        android:layout_marginTop="-45dip" 
+        android:padding="0dip"
+        android:layout_alignParentBottom="true"
         android:gravity="bottom|right" 
-        android:layout_height="54dip"
-        >
+        android:background="@android:drawable/bottom_bar"
+        android:layout_height="fill_parent"
+        android:layout_width="fill_parent">
         <Button
             android:id="@+id/done"
             android:text="@string/done_action"
             android:layout_height="wrap_content"
             android:layout_width="wrap_content"
-            android:minWidth="@dimen/button_minWidth"
+            android:drawableRight="@drawable/button_indicator_next"
+            android:layout_marginBottom="-4dip" 
             android:layout_alignParentRight="true"
-            android:layout_centerVertical="true" />
+            android:layout_centerVertical="false" 
+            />
     </RelativeLayout>
 </LinearLayout>
diff --git a/res/layout/account_setup_options.xml b/res/layout/account_setup_options.xml
index af8cfbd0e..28b00b3e7 100644
--- a/res/layout/account_setup_options.xml
+++ b/res/layout/account_setup_options.xml
@@ -3,7 +3,6 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:orientation="vertical"
     android:layout_height="fill_parent"
-    android:padding="6dip"
     android:layout_width="fill_parent">
 
 <ScrollView
@@ -11,6 +10,7 @@
     android:layout_height="fill_parent"
     android:layout_marginBottom="54dip" 
 	android:fadingEdge="none"
+    android:padding="6dip"
     android:scrollbarStyle="outsideInset">
     <LinearLayout
         android:layout_width="fill_parent"
@@ -63,20 +63,6 @@
             android:layout_height="fill_parent"
             android:layout_weight="1" />
     </LinearLayout>
-    </ScrollView>
-    <RelativeLayout 
-        android:layout_marginTop="-54dip" 
-        android:gravity="bottom|right"
-        android:layout_height="wrap_content" 
-        android:layout_width="fill_parent">
-        <Button
-            android:id="@+id/next"
-            android:text="@string/next_action"
-            android:layout_width="wrap_content"
-            android:minWidth="@dimen/button_minWidth"
-            android:layout_height="wrap_content"
-            android:drawableRight="@drawable/button_indicator_next"
-            android:layout_alignParentRight="true"
-            android:layout_centerVertical="false" />
-    </RelativeLayout>
+</ScrollView>
+    <include layout="@layout/wizard_next" />
 </LinearLayout>
diff --git a/res/layout/account_setup_outgoing.xml b/res/layout/account_setup_outgoing.xml
index e03ffde21..7400441fc 100644
--- a/res/layout/account_setup_outgoing.xml
+++ b/res/layout/account_setup_outgoing.xml
@@ -3,12 +3,12 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:orientation="vertical"
 	android:layout_height="fill_parent"
-    android:padding="6dip"
     android:layout_width="fill_parent">
  
 <ScrollView
     android:layout_width="fill_parent"
     android:layout_height="fill_parent"
+    android:padding="6dip"
     android:layout_marginBottom="54dip" 
     android:fadingEdge="none"
     android:scrollbarStyle="outsideInset">
@@ -89,19 +89,5 @@
             android:layout_weight="1" />
     </LinearLayout>
 	</ScrollView>
-    <RelativeLayout 
-        android:layout_marginTop="-54dip" 
-        android:gravity="bottom|right" 
-        android:layout_height="wrap_content" 
-        android:layout_width="fill_parent">
-		<Button
-			android:id="@+id/next"
-			android:text="@string/next_action"
-            android:layout_width="wrap_content"
-            android:minWidth="@dimen/button_minWidth"
-            android:layout_height="wrap_content"
-            android:drawableRight="@drawable/button_indicator_next"
-            android:layout_alignParentRight="true"
-            android:layout_centerVertical="false" />
-	</RelativeLayout>
+    <include layout="@layout/wizard_next" />
 </LinearLayout>
diff --git a/res/layout/accounts.xml b/res/layout/accounts.xml
index 1160230e7..b2783959d 100644
--- a/res/layout/accounts.xml
+++ b/res/layout/accounts.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:orientation="vertical"
-    android:layout_height="wrap_content" 
+    android:layout_height="fill_parent"
     android:layout_width="fill_parent">
     <ListView
         android:id="@android:id/list"
@@ -36,21 +36,6 @@
                 android:layout_weight="1" />
         </LinearLayout>
     </ScrollView>
-    <RelativeLayout 
-        android:layout_marginTop="-54dip" 
-        android:gravity="bottom|right" 
-        android:layout_height="wrap_content" 
-        android:layout_width="fill_parent">
-        <Button
-            android:id="@+id/add_new_account"
-            android:layout_width="wrap_content"
-            android:minWidth="@dimen/button_minWidth"
-            android:layout_height="wrap_content"
-            android:text="@string/next_action"
-            android:drawableRight="@drawable/button_indicator_next"
-            android:layout_alignParentRight="true"
-            android:layout_centerVertical="false" 
-            />
-    </RelativeLayout>
+    <include layout="@layout/wizard_next" />
 </LinearLayout>
 </LinearLayout>
diff --git a/res/layout/wizard_cancel.xml b/res/layout/wizard_cancel.xml
new file mode 100644
index 000000000..7981957d5
--- /dev/null
+++ b/res/layout/wizard_cancel.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+    <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+        android:layout_marginTop="-45dip" 
+        android:padding="0dip"
+        android:layout_alignParentBottom="true"
+        android:gravity="bottom|left" 
+        android:background="@android:drawable/bottom_bar"
+        android:layout_height="fill_parent"
+        android:layout_width="fill_parent">
+        <Button
+            android:id="@+id/cancel"
+            android:text="@string/cancel_action"
+            android:minWidth="@dimen/button_minWidth"
+            android:layout_height="wrap_content"
+            android:layout_width="wrap_content"
+            android:layout_marginBottom="-4dip" 
+            android:layout_alignParentLeft="true"
+            android:layout_centerVertical="false" 
+            />
+    </RelativeLayout>
diff --git a/res/layout/wizard_next.xml b/res/layout/wizard_next.xml
new file mode 100644
index 000000000..0949cf303
--- /dev/null
+++ b/res/layout/wizard_next.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+    <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+        android:layout_marginTop="-45dip" 
+        android:padding="0dip"
+        android:layout_alignParentBottom="true"
+        android:gravity="bottom|right" 
+        android:background="@android:drawable/bottom_bar"
+        android:layout_height="fill_parent"
+        android:layout_width="fill_parent">
+        <Button
+            android:id="@+id/next"
+            android:text="@string/next_action"
+            android:minWidth="@dimen/button_minWidth"
+            android:layout_height="wrap_content"
+            android:layout_width="wrap_content"
+            android:drawableRight="@drawable/button_indicator_next"
+            android:layout_marginBottom="-4dip" 
+            android:layout_alignParentRight="true"
+            android:layout_centerVertical="false" 
+            />
+    </RelativeLayout>
diff --git a/src/com/android/email/activity/Accounts.java b/src/com/android/email/activity/Accounts.java
index f78667456..7610ff6ab 100644
--- a/src/com/android/email/activity/Accounts.java
+++ b/src/com/android/email/activity/Accounts.java
@@ -263,7 +263,7 @@ public class Accounts extends K9ListActivity implements OnItemClickListener, OnC
             listView.setOnItemClickListener(this);
             listView.setItemsCanFocus(false);
             listView.setEmptyView(findViewById(R.id.empty));
-            findViewById(R.id.add_new_account).setOnClickListener(this);
+            findViewById(R.id.next).setOnClickListener(this);
             registerForContextMenu(listView);
 
             if (icicle != null && icicle.containsKey(SELECTED_CONTEXT_ACCOUNT)) {
@@ -357,7 +357,7 @@ public class Accounts extends K9ListActivity implements OnItemClickListener, OnC
     }
 
     public void onClick(View view) {
-        if (view.getId() == R.id.add_new_account) {
+        if (view.getId() == R.id.next) {
             onAddNewAccount();
         }
     }