More layout tweaks

b/13640507

Change-Id: I0392671df101e263aba89abc8b949fe906f34ed0
This commit is contained in:
Tony Mantler 2014-04-07 11:36:50 -07:00
parent 6cbdd5bba0
commit 021fb3cd78
6 changed files with 27 additions and 23 deletions

View File

@ -61,9 +61,7 @@
<CheckBox
android:id="@+id/account_notify"
android:layout_below="@+id/spinners_table"
android:layout_marginTop="16dip"
android:layout_marginBottom="16dip"
android:layout_marginLeft="32dip"
style="@style/account_setup_checkbox"
android:layout_height="wrap_content"
android:layout_width="match_parent"
android:text="@string/account_setup_options_notify_label" />
@ -77,9 +75,7 @@
<CheckBox
android:id="@+id/account_sync_contacts"
android:layout_below="@+id/account_notify_divider"
android:layout_marginTop="16dip"
android:layout_marginBottom="16dip"
android:layout_marginLeft="32dip"
style="@style/account_setup_checkbox"
android:layout_height="wrap_content"
android:layout_width="match_parent"
android:text="@string/account_setup_options_sync_contacts_label"
@ -95,9 +91,7 @@
<CheckBox
android:id="@+id/account_sync_calendar"
android:layout_below="@+id/account_sync_contacts_divider"
android:layout_marginTop="16dip"
android:layout_marginBottom="16dip"
android:layout_marginLeft="32dip"
style="@style/account_setup_checkbox"
android:layout_height="wrap_content"
android:layout_width="match_parent"
android:text="@string/account_setup_options_sync_calendar_label"
@ -113,9 +107,7 @@
<CheckBox
android:id="@+id/account_sync_email"
android:layout_below="@+id/account_sync_calendar_divider"
android:layout_marginTop="16dip"
android:layout_marginBottom="16dip"
android:layout_marginLeft="32dip"
style="@style/account_setup_checkbox"
android:layout_height="wrap_content"
android:layout_width="match_parent"
android:text="@string/account_setup_options_sync_email_label" />
@ -129,9 +121,7 @@
<CheckBox
android:id="@+id/account_background_attachments"
android:layout_below="@+id/account_sync_email_divider"
android:layout_marginTop="16dip"
android:layout_marginBottom="16dip"
android:layout_marginLeft="32dip"
style="@style/account_setup_checkbox"
android:layout_height="wrap_content"
android:layout_width="match_parent"
android:text="@string/account_setup_options_background_attachments_label" />

View File

@ -47,29 +47,34 @@
</LinearLayout>
<CheckBox
android:id="@+id/account_notify"
style="@style/account_setup_checkbox"
android:layout_height="wrap_content"
android:layout_width="match_parent"
android:text="@string/account_setup_options_notify_label" />
<CheckBox
android:id="@+id/account_sync_contacts"
style="@style/account_setup_checkbox"
android:layout_height="wrap_content"
android:layout_width="match_parent"
android:text="@string/account_setup_options_sync_contacts_label"
android:visibility="gone" />
<CheckBox
android:id="@+id/account_sync_calendar"
style="@style/account_setup_checkbox"
android:layout_height="wrap_content"
android:layout_width="match_parent"
android:text="@string/account_setup_options_sync_calendar_label"
android:visibility="gone" />
<CheckBox
android:id="@+id/account_sync_email"
style="@style/account_setup_checkbox"
android:layout_height="wrap_content"
android:layout_width="match_parent"
android:text="@string/account_setup_options_sync_email_label" />
<CheckBox
android:id="@+id/account_background_attachments"
style="@style/account_setup_checkbox"
android:layout_height="wrap_content"
android:layout_width="match_parent"
android:text="@string/account_setup_options_background_attachments_label" />

View File

@ -31,7 +31,6 @@
<!-- Client certificate alias, see also styles-ldrtl.xml -->
<style name="client_certificate_alias">
<item name="android:layout_marginStart">@dimen/setup_item_inset_start</item>
<item name="android:layout_alignParentStart">true</item>
<item name="android:layout_toStartOf">@id/select_button</item>
</style>

View File

@ -36,9 +36,10 @@
<dimen name="setup_headline_padding_top">24dp</dimen>
<dimen name="setup_headline_padding_side">64dp</dimen>
<!-- In setup screens, the inset for all items below the headline+hairline -->
<dimen name="setup_item_inset_start">16dip</dimen>
<dimen name="setup_item_inset_end">64dip</dimen>
<!-- Account setup checkboxes padding -->
<dimen name="setup_checkbox_padding_side">8dp</dimen>
<dimen name="setup_checkbox_padding_top">16dp</dimen>
<dimen name="setup_checkbox_padding_bottom">16dp</dimen>
<!-- Account setup basics -->
<dimen name="setup_basics_logo_margin_top">28dp</dimen>

View File

@ -68,9 +68,11 @@
<dimen name="settings_buttons_padding_top">48dp</dimen>
<dimen name="settings_buttons_padding_bottom">48dp</dimen>
<!-- In setup screens, the inset for all items below the headline+hairline -->
<dimen name="setup_item_inset_start">0dp</dimen>
<dimen name="setup_item_inset_end">0dp</dimen>
<!-- Account setup checkboxes padding -->
<!-- see also w600dp -->
<dimen name="setup_checkbox_padding_side">0dp</dimen>
<dimen name="setup_checkbox_padding_top">8dp</dimen>
<dimen name="setup_checkbox_padding_bottom">8dp</dimen>
<!-- Account setup basics -->
<!-- See also w600dp -->

View File

@ -79,6 +79,14 @@
<item name="android:textAppearance">?android:attr/textAppearanceSmall</item>
</style>
<!-- Account setup checkboxes -->
<style name="account_setup_checkbox">
<item name="android:paddingTop">@dimen/setup_checkbox_padding_top</item>
<item name="android:paddingBottom">@dimen/setup_checkbox_padding_bottom</item>
<item name="android:paddingLeft">@dimen/setup_checkbox_padding_side</item>
<item name="android:paddingRight">@dimen/setup_checkbox_padding_side</item>
</style>
<!-- Client certificate UI. See also values in styles-ldrtl.xml -->
<!-- Client certificate 'select' button, see also styles-ldrtl.xml -->
<style name="client_certificate_button"
@ -94,7 +102,6 @@
<!-- Client certificate alias, see also styles-ldrtl.xml -->
<style name="client_certificate_alias">
<item name="android:layout_marginLeft">@dimen/setup_item_inset_start</item>
<item name="android:layout_alignParentLeft">true</item>
<item name="android:layout_toLeftOf">@id/select_button</item>
</style>