diff options
| author | Tony Mantler <nicoya@google.com> | 2014-10-10 16:36:08 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-10-10 16:36:09 +0000 |
| commit | 1927361b258b347c6afa457a4cd122f4fb131027 (patch) | |
| tree | 425e338aaa697fcd7fe559d8ba7fb4c588412580 /res/layout | |
| parent | 8c0253a1f0d2ee064b183c9055bd4b80dfcf4333 (diff) | |
| parent | f5b5fe1cb34dc93c884b1217c5e230059baeb887 (diff) | |
| download | android_packages_apps_Email-1927361b258b347c6afa457a4cd122f4fb131027.tar.gz android_packages_apps_Email-1927361b258b347c6afa457a4cd122f4fb131027.tar.bz2 android_packages_apps_Email-1927361b258b347c6afa457a4cd122f4fb131027.zip | |
Merge "Account authentication restyling" into ub-gmail-ur14-dev
Diffstat (limited to 'res/layout')
| -rw-r--r-- | res/layout/account_setup_credentials_fragment.xml | 10 | ||||
| -rw-r--r-- | res/layout/authentication_view.xml | 28 |
2 files changed, 16 insertions, 22 deletions
diff --git a/res/layout/account_setup_credentials_fragment.xml b/res/layout/account_setup_credentials_fragment.xml index e8af21007..6a02df1fb 100644 --- a/res/layout/account_setup_credentials_fragment.xml +++ b/res/layout/account_setup_credentials_fragment.xml @@ -14,11 +14,11 @@ limitations under the License. --> <LinearLayout - xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:orientation="vertical" - > + xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:orientation="vertical" + android:minWidth="254dp" > <TextView android:id="@+id/wrong_password_warning_label" diff --git a/res/layout/authentication_view.xml b/res/layout/authentication_view.xml index f055bb5e2..6b9bf8f18 100644 --- a/res/layout/authentication_view.xml +++ b/res/layout/authentication_view.xml @@ -28,24 +28,18 @@ android:textAppearance="?android:attr/textAppearanceSmall" android:textColor="?android:attr/textColorPrimary"/> - <LinearLayout - android:id="@+id/no_auth_wrapper" - android:layout_width="match_parent" + <TextView + android:id="@+id/add_authentication" + android:text="@string/add_authentication_label" android:layout_height="wrap_content" - android:orientation="horizontal"> - <TextView - android:id="@+id/add_authentication" - android:text="@string/add_authentication_label" - android:layout_height="wrap_content" - android:layout_width="match_parent" - android:layout_weight="1" - android:padding="16dip" - android:drawablePadding="16dip" - style="@style/account_setup_label_text" - android:drawableStart="@drawable/ic_settings_add" - android:textAppearance="?android:attr/textAppearanceSmall" - android:textColor="?android:attr/textColorPrimary"/> - </LinearLayout> + android:layout_width="match_parent" + android:padding="8dp" + android:drawablePadding="16dip" + style="@style/account_setup_label_text" + android:drawableStart="@drawable/ic_add_24dp" + android:drawableLeft="@drawable/ic_add_24dp" + android:textAppearance="?android:attr/textAppearanceSmall" + android:textColor="?android:attr/textColorPrimary"/> <LinearLayout android:id="@+id/password_wrapper" |