From cd1f3d33a9a24a28fef636549cf1f9852e28b75e Mon Sep 17 00:00:00 2001
From: Ben Komalo <benkomalo@google.com>
Date: Fri, 3 Jun 2011 18:06:46 -0700
Subject: [PATCH] Cherry-pick ff269c6d50d66d064 - Minor fixes to setup screen
 for 7"

 (this conflicted and the automerger situation was a disaster, so I
  opted to skip immediately to help clear the backlog, now I'm
  cherry-picking manually)

 Using a TableLayout and large margins to shrink the input boxes causes
 weird artifacts when you type past the size of the input box. Fixing the
 padding is also not the right way, since stretching the input the whole
 screen length is ugly. Just use a width.

Change-Id: I3009e7c66f729a96f404263d79e77d3ab4d831ae
---
 .../account_setup_basics_common.xml            | 18 +++++++-----------
 res/values/dimensions.xml                      |  3 +++
 2 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/res/layout-sw600dp/account_setup_basics_common.xml b/res/layout-sw600dp/account_setup_basics_common.xml
index 616309592..376a55783 100644
--- a/res/layout-sw600dp/account_setup_basics_common.xml
+++ b/res/layout-sw600dp/account_setup_basics_common.xml
@@ -35,12 +35,11 @@
     <TableLayout
         android:id="@+id/email_password_table"
         android:layout_below="@+id/instructions"
-        android:layout_width="match_parent"
+        android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginTop="16dip"
-        android:stretchColumns="1" >
-        <TableRow
-            android:paddingTop="16dip" >
+        android:layout_marginTop="16dip">
+
+        <TableRow android:paddingTop="16dip" >
             <TextView
                 android:layout_height="wrap_content"
                 android:layout_width="wrap_content"
@@ -49,14 +48,12 @@
                 android:textAppearance="@style/accountSetupLabelText" />
             <EditText
                 android:id="@+id/account_email"
-                android:layout_marginRight="96dip"
-                android:layout_width="wrap_content"
+                android:layout_width="@dimen/setup_credentials_input_width"
                 android:layout_height="wrap_content"
                 android:inputType="textEmailAddress"
                 android:imeOptions="actionNext" />
         </TableRow>
-        <TableRow
-            android:paddingTop="16dip" >
+        <TableRow android:paddingTop="16dip" >
             <TextView
                 android:layout_height="wrap_content"
                 android:layout_width="wrap_content"
@@ -65,9 +62,8 @@
                 android:textAppearance="@style/accountSetupLabelText" />
             <EditText
                 android:id="@+id/account_password"
-                android:layout_marginRight="96dip"
                 android:layout_height="wrap_content"
-                android:layout_width="match_parent"
+                android:layout_width="@dimen/setup_credentials_input_width"
                 android:inputType="textPassword"
                 android:imeOptions="actionDone"
                 android:nextFocusDown="@+id/next" />
diff --git a/res/values/dimensions.xml b/res/values/dimensions.xml
index 477a00ef2..3461752cb 100644
--- a/res/values/dimensions.xml
+++ b/res/values/dimensions.xml
@@ -62,4 +62,7 @@
     <dimen name="date_font_size">14sp</dimen>
     <dimen name="minimum_width_wide_mode">800dip</dimen>
     <dimen name="minimum_width_normal_mode">550dip</dimen>
+
+    <!-- Username/password entry -->
+    <dimen name="setup_credentials_input_width">340dip</dimen>
 </resources>