diff options
| author | Martin Hibdon <mhibdon@google.com> | 2014-02-14 23:42:22 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-02-14 23:42:22 +0000 |
| commit | 0962a44fc4eb2836bcaa46d6d7c00e3ed48e17cb (patch) | |
| tree | 65967addbeeb331ecb60b8a288c342ec19136d4d | |
| parent | da9c2d66f6d0315f261b8af24b8496f553b5bfcb (diff) | |
| parent | 8919f5738d64014d572f7f807ad779d9c92cf107 (diff) | |
| download | android_packages_apps_Email-0962a44fc4eb2836bcaa46d6d7c00e3ed48e17cb.tar.gz android_packages_apps_Email-0962a44fc4eb2836bcaa46d6d7c00e3ed48e17cb.tar.bz2 android_packages_apps_Email-0962a44fc4eb2836bcaa46d6d7c00e3ed48e17cb.zip | |
Merge "Update layouts for setup" into ub-mail-master
| -rw-r--r-- | res/layout/account_setup_basics.xml | 6 | ||||
| -rw-r--r-- | res/layout/sign_in_fragment.xml | 7 | ||||
| -rw-r--r-- | src/com/android/email/activity/setup/AccountSetupBasics.java | 4 |
3 files changed, 11 insertions, 6 deletions
diff --git a/res/layout/account_setup_basics.xml b/res/layout/account_setup_basics.xml index f1b91f03b..94a504698 100644 --- a/res/layout/account_setup_basics.xml +++ b/res/layout/account_setup_basics.xml @@ -50,9 +50,9 @@ <RelativeLayout android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_below="@+id/common" + android:layout_alignParentBottom="true" android:paddingTop="16dip" - android:paddingBottom="@dimen/settings_buttons_padding_bottom"> + android:paddingBottom="16dip"> <TextView android:id="@+id/manual_setup" android:layout_height="wrap_content" @@ -60,6 +60,8 @@ android:clickable="true" android:layout_alignParentLeft="true" android:layout_gravity="center_vertical" + android:layout_centerInParent="true" + android:textAppearance="?android:attr/textAppearanceMedium" android:text="@string/account_setup_basics_manual_setup_action" /> <ImageButton android:id="@+id/next" diff --git a/res/layout/sign_in_fragment.xml b/res/layout/sign_in_fragment.xml index 34e48a7ff..645b64146 100644 --- a/res/layout/sign_in_fragment.xml +++ b/res/layout/sign_in_fragment.xml @@ -17,14 +17,13 @@ xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent" android:layout_height="match_parent" - android:layout_weight="1" - android:layout_centerVertical="true"> + android:layout_weight="1"> <LinearLayout android:id="@+id/oauth_group" android:layout_width="match_parent" - android:layout_height="match_parent" - android:layout_centerVertical="true" + android:layout_height="wrap_content" + android:layout_centerInParent="true" android:orientation="vertical" android:visibility="gone"> <Button diff --git a/src/com/android/email/activity/setup/AccountSetupBasics.java b/src/com/android/email/activity/setup/AccountSetupBasics.java index 3c0277ce8..89ba7a112 100644 --- a/src/com/android/email/activity/setup/AccountSetupBasics.java +++ b/src/com/android/email/activity/setup/AccountSetupBasics.java @@ -31,6 +31,7 @@ import android.content.DialogInterface; import android.content.Intent; import android.content.Loader; import android.database.Cursor; +import android.graphics.Paint; import android.os.AsyncTask; import android.os.Bundle; import android.provider.ContactsContract; @@ -223,6 +224,9 @@ public class AccountSetupBasics extends AccountSetupActivity mManualButton.setVisibility(View.VISIBLE); mManualButton.setOnClickListener(this); mNextButton.setOnClickListener(this); + + mManualButton.setPaintFlags(mManualButton.getPaintFlags() | Paint.UNDERLINE_TEXT_FLAG); + // Force disabled until validator notifies otherwise setProceedButtonsEnabled(false); // Lightweight debounce while Async tasks underway |