Unify and Improve the Sign-In and Sync Confirmation Screens on Clank.

chrome/android/java/res/layout/fre_choose_account.xml

Index: chrome/android/java/res/layout/fre_choose_account.xml
diff --git a/chrome/android/java/res/layout/fre_choose_account.xml b/chrome/android/java/res/layout/fre_choose_account.xml
index de5e94e6cb7461777bb50c611d6e49eb88a4c7ad..d9647c525e7805a3e25443a7cc0cbc580336f17e 100644
--- a/chrome/android/java/res/layout/fre_choose_account.xml
+++ b/chrome/android/java/res/layout/fre_choose_account.xml
@@ -59,6 +59,7 @@
                     android:paddingStart="24dp" >
 
                     <Spinner
+                        style="@style/Widget.AppCompat.Spinner.Underlined"
                         android:id="@+id/google_accounts_spinner"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
@@ -66,63 +67,92 @@
                         android:padding="0dp"
                         android:textColor="@color/fre_text_color" />
 
-                    <TextView
-                        android:id="@+id/description"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:gravity="center"
-                        android:lineSpacingMultiplier="1.4"
-                        android:text="@string/fre_account_choice_description"
-                        android:textColor="@color/fre_light_text_color"
-                        android:textSize="@dimen/fre_normal_text_size" />
+
+                    <RelativeLayout

[newt (away), 2016/02/03 17:57:28]

Use a FrameLayout here. It's simpler than RelativeLayout and is preferred unless
you're using RelativeLayout-specific features.

[PEConn, 2016/02/04 19:26:09]

Done.

+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content">
+                        
+                        <org.chromium.ui.widget.TextViewWithClickableSpans
+                            android:id="@+id/description"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:gravity="center"

[newt (away), 2016/02/03 17:57:28]

center_horizontal

[PEConn, 2016/02/04 19:26:09]

Done.

+                            android:lineSpacingMultiplier="1.4"
+                            android:text="@string/fre_account_choice_description"
+                            android:textColor="@color/fre_light_text_color"
+                            android:textSize="@dimen/fre_normal_text_size"
+                            android:visibility="visible"/>
+                            
+                        <!-- We use an invisible TextView overlapping with the visible one to keep

[newt (away), 2016/02/03 17:57:29]

How does this look in landscape mode on phones? Does it feel strange to have
lots of unoccupied space at the bottom of the scroll view when the shorter
string is showing?

[PEConn, 2016/02/04 19:26:09]

There isn't that much unused space - its essentially two lines. On a Nexus 5X,
it looks like: 
https://drive.google.com/open?id=0B_ABoZqo1irYUWdlaUo4UWlCQ0k

+                        the layout constant between text changes. This TextView will have its
+                        contents programmatically set to the longest string the above TextView can
+                        contain. -->
+                        
+                        <org.chromium.ui.widget.TextViewWithClickableSpans
+                            android:id="@+id/longest_description"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:gravity="center"
+                            android:lineSpacingMultiplier="1.4"
+                            android:text=""

[newt (away), 2016/02/03 17:57:29]

omit this

[PEConn, 2016/02/04 19:26:09]

Done.

+                            android:textColor="@color/fre_light_text_color"
+                            android:textSize="@dimen/fre_normal_text_size"
+                            android:visibility="invisible"/>
+
+                    </RelativeLayout>
+
                 </LinearLayout>
             </LinearLayout>
         </LinearLayout>
     </ScrollView>
 
-    <View android:id="@+id/button_bar_separator" 
-        style="@style/ButtonBarTopDivider"
-        android:layout_gravity="bottom"
-        android:layout_marginBottom="56dp" />
-
     <LinearLayout
         android:id="@+id/button_bar"
         android:layout_width="match_parent"
-        android:layout_height="56dp"
+        android:layout_height="76dp"
         android:layout_gravity="bottom"
-        android:orientation="horizontal" >
+        android:orientation="horizontal" 
+        android:padding="@dimen/fre_button_padding" >
 
         <!--suppress ButtonStyle -->
         <Button
             android:id="@+id/negative_button"
-            android:layout_width="0dp"
-            android:layout_height="match_parent"
-            android:layout_weight="1"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
             android:background="?attr/listChoiceBackgroundIndicator"
-            android:gravity="start|center_vertical"
-            android:textDirection="locale"
             android:paddingStart="@dimen/fre_button_padding"
             android:paddingEnd="@dimen/fre_button_padding"
             android:text="@string/fre_skip_text"
             android:textAllCaps="true"
             android:textColor="@color/light_normal_color"
+            android:textDirection="locale"
             android:textSize="@dimen/fre_button_text_size" />
 
+        <View

[newt (away), 2016/02/03 17:57:29]

set the visibility to invisible, which is slightly more efficient

[PEConn, 2016/02/04 19:26:09]

Done.

+            android:layout_width="match_parent"

[newt (away), 2016/02/03 17:57:28]

layout_width should be 0dp. That makes for more efficient measuring as the view
is only measured once (at the end when extra space is ready to be distributed),
rather than twice.

[PEConn, 2016/02/04 19:26:09]

Done.

+            android:layout_height="match_parent"

[newt (away), 2016/02/03 17:57:29]

might as well be 0dp

[PEConn, 2016/02/04 19:26:09]

Done.

+            android:layout_weight="1" />
+
         <!--suppress ButtonStyle -->
         <Button
             android:id="@+id/positive_button"
-            android:layout_width="0dp"
-            android:layout_height="match_parent"
-            android:layout_weight="1"
-            android:background="?attr/listChoiceBackgroundIndicator"
-            android:gravity="end|center_vertical"
-            android:textDirection="locale"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:background="@color/light_active_color"
             android:paddingStart="@dimen/fre_button_padding"
             android:paddingEnd="@dimen/fre_button_padding"
             android:text="@string/choose_account_sign_in"
             android:textAllCaps="true"
-            android:textColor="@color/light_active_color"
+            android:textColor="@android:color/background_light"
+            android:textDirection="locale"
             android:textSize="@dimen/fre_button_text_size" />
+
+        <View
+            android:id="@+id/positive_button_right_padding"

[newt (away), 2016/02/03 17:57:28]

s/right/end/

In RTL mode, this will be the left padding after all.

Alternatively, you could remove this view altogether and center the "sign in"
button when needed by setting the other spacer View to GONE.

[PEConn, 2016/02/04 19:26:09]

Done.

+            android:layout_width="match_parent"

[newt (away), 2016/02/03 17:57:29]

0dp

[PEConn, 2016/02/04 19:26:09]

Done.

+            android:layout_height="match_parent"

[newt (away), 2016/02/03 17:57:28]

0dp

[PEConn, 2016/02/04 19:26:09]

Done.

+            android:layout_weight="1"
+            android:visibility="gone"/>
     </LinearLayout>
 
 </org.chromium.chrome.browser.firstrun.AccountFirstRunView>