ADHOC/replicant-packages_apps_Email
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge "Update layouts for setup" into ub-mail-master

Browse Source
This commit is contained in:
Martin Hibdon 2014-02-14 23:42:22 +00:00 committed by Android (Google) Code Review
commit 0962a44fc4
3 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
res/layout/account_setup_basics.xml
View File

@ -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"

7
res/layout/sign_in_fragment.xml
View File

@ -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

4
src/com/android/email/activity/setup/AccountSetupBasics.java
View File

@ -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