Merge "Update the font for account setup basics" into ub-mail-algol
This commit is contained in:
commit
03d80363fa
@ -63,7 +63,7 @@
|
|||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:layout_marginRight="16dip"
|
android:layout_marginRight="16dip"
|
||||||
android:text="@string/account_setup_basics_email_label"
|
android:text="@string/account_setup_basics_email_label"
|
||||||
style="@style/account_setup_label_text" />
|
style="@style/account_setup_label_large_text" />
|
||||||
<EditText
|
<EditText
|
||||||
android:id="@+id/account_email"
|
android:id="@+id/account_email"
|
||||||
android:contentDescription="@string/account_setup_basics_email_label"
|
android:contentDescription="@string/account_setup_basics_email_label"
|
||||||
|
@ -57,6 +57,6 @@
|
|||||||
android:hint="@string/account_setup_basics_email_label"
|
android:hint="@string/account_setup_basics_email_label"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:textAppearance="?android:attr/textAppearanceSmall"
|
android:textAppearance="?android:attr/textAppearanceMedium"
|
||||||
android:inputType="textEmailAddress" />
|
android:inputType="textEmailAddress" />
|
||||||
</LinearLayout>
|
</LinearLayout>
|
||||||
|
@ -21,6 +21,7 @@
|
|||||||
<color name="account_setup_headline_color">#333333</color>
|
<color name="account_setup_headline_color">#333333</color>
|
||||||
<color name="account_setup_info_text_color">#000000</color>
|
<color name="account_setup_info_text_color">#000000</color>
|
||||||
<color name="account_setup_label_text_color">#666666</color>
|
<color name="account_setup_label_text_color">#666666</color>
|
||||||
|
<color name="account_setup_label_large_text_color">#000000</color>
|
||||||
<color name="account_setup_divider_color">#CCCCCC</color>
|
<color name="account_setup_divider_color">#CCCCCC</color>
|
||||||
<color name="account_setup_xlarge_background_color">#e5e5e5</color>
|
<color name="account_setup_xlarge_background_color">#e5e5e5</color>
|
||||||
<color name="account_setup_manual_button_color">#373737</color>
|
<color name="account_setup_manual_button_color">#373737</color>
|
||||||
|
@ -66,6 +66,9 @@
|
|||||||
<!-- Info text in any account setup screen -->
|
<!-- Info text in any account setup screen -->
|
||||||
<dimen name="setup_info_text_margin_bottom">20dp</dimen>
|
<dimen name="setup_info_text_margin_bottom">20dp</dimen>
|
||||||
|
|
||||||
|
<!-- Large label text on account setup basics -->
|
||||||
|
<dimen name="setup_label_large_text_margin_bottom">20dp</dimen>
|
||||||
|
|
||||||
<!-- inset distance for settings buttons -->
|
<!-- inset distance for settings buttons -->
|
||||||
<dimen name="settings_buttons_padding_top">48dp</dimen>
|
<dimen name="settings_buttons_padding_top">48dp</dimen>
|
||||||
<dimen name="settings_buttons_padding_bottom">48dp</dimen>
|
<dimen name="settings_buttons_padding_bottom">48dp</dimen>
|
||||||
|
@ -89,6 +89,14 @@
|
|||||||
<item name="android:paddingTop">@dimen/setup_label_text_padding_top</item>
|
<item name="android:paddingTop">@dimen/setup_label_text_padding_top</item>
|
||||||
</style>
|
</style>
|
||||||
|
|
||||||
|
<!-- Account setup row label large text -->
|
||||||
|
<style name="account_setup_label_large_text">
|
||||||
|
<item name="android:textSize">20sp</item>
|
||||||
|
<item name="android:textColor">@color/account_setup_label_large_text_color</item>
|
||||||
|
<item name="android:fontFamily">sans-serif-thin</item>
|
||||||
|
<item name="android:layout_marginBottom">@dimen/setup_label_large_text_margin_bottom</item>
|
||||||
|
</style>
|
||||||
|
|
||||||
<!-- Account setup checkboxes -->
|
<!-- Account setup checkboxes -->
|
||||||
<style name="account_setup_checkbox">
|
<style name="account_setup_checkbox">
|
||||||
<item name="android:paddingTop">@dimen/setup_checkbox_padding_top</item>
|
<item name="android:paddingTop">@dimen/setup_checkbox_padding_top</item>
|
||||||
|
Loading…
Reference in New Issue
Block a user