Merge "Update more padding and layouts" into ub-mail-algol

This commit is contained in:
Martin Hibdon 2014-04-23 22:24:17 +00:00 committed by Android (Google) Code Review
commit bd7994295d
5 changed files with 26 additions and 6 deletions

View File

@ -57,7 +57,9 @@
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:clickable="true"
android:src="@drawable/ic_setup_delete" />
android:layout_gravity="center_vertical"
android:src="@drawable/ic_setup_delete"
style="@style/clear_authentication_button"/>
</LinearLayout>
<LinearLayout
@ -81,7 +83,8 @@
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:clickable="true"
android:src="@drawable/ic_setup_delete" />
android:src="@drawable/ic_setup_delete"
style="@style/clear_authentication_button"/>
</LinearLayout>

View File

@ -55,10 +55,12 @@
<TextView
android:id="@+id/password_label"
android:text="@string/account_setup_incoming_password_label"
android:text="@string/account_setup_password_subheading"
android:layout_height="wrap_content"
android:layout_width="wrap_content"
style="@style/account_setup_label_text"
android:layout_marginLeft="8dp"
android:layout_marginRight="8dp"
android:paddingTop="0dp"
android:textAppearance="?android:attr/textAppearanceSmall"
android:layout_gravity="center_vertical"
android:textColor="?android:attr/textColorPrimary" />
@ -69,6 +71,7 @@
android:layout_width="match_parent"
android:layout_weight="1"
android:hint="@string/account_setup_incoming_password_label"
android:layout_gravity="center_vertical"
android:inputType="textPassword"
android:imeOptions="actionNext" />
@ -78,7 +81,9 @@
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:clickable="true"
android:src="@drawable/ic_setup_delete" />
android:layout_gravity="center_vertical"
android:src="@drawable/ic_setup_delete"
style="@style/clear_authentication_button"/>
</LinearLayout>
<LinearLayout
@ -104,7 +109,8 @@
android:layout_height="match_parent"
android:layout_width="wrap_content"
android:clickable="true"
android:src="@drawable/ic_setup_delete" />
android:src="@drawable/ic_setup_delete"
style="@style/clear_authentication_button"/>
</LinearLayout>

View File

@ -41,5 +41,8 @@
<item name="android:paddingRight">10dp</item>
</style>
<style name="clear_authentication_button">
<item name="android:layout_marginRight">8dp</item>
</style>
</resources>

View File

@ -293,6 +293,8 @@
<string name="account_setup_incoming_username_label">USERNAME</string>
<!-- "Incoming server settings" screen, label for text field, should be uppercase where applicable -->
<string name="account_setup_incoming_password_label">PASSWORD</string>
<!-- "Incoming server settings" screen, label for text field -->
<string name="account_setup_password_subheading">Password</string>
<!-- "Incoming server settings" screen, label for text field, should be uppercase where applicable -->
<string name="account_setup_incoming_server_label">SERVER</string>
<!-- "Incoming server settings" screen, label for text field, should be uppercase where applicable -->

View File

@ -123,5 +123,11 @@
<item name="android:textSize">20sp</item>
<item name="android:textColor">@color/quick_response_text_color</item>
</style>
<style name="clear_authentication_button">
<item name="android:layout_marginLeft">8dp</item>
</style>
</resources>