Merge "Finish incoming/outgoing/exchange layouts" into honeycomb

This commit is contained in:
Andy Stadler 2011-01-12 10:10:56 -08:00 committed by Android (Google) Code Review
commit ac7194b4a9
19 changed files with 133 additions and 172 deletions

View File

@ -37,7 +37,6 @@
android:layout_height="wrap_content"
android:text="@string/account_setup_basics_headline"
android:textAppearance="@style/accountSetupHeadline" />
<View
android:id="@+id/top_divider"
android:layout_below="@+id/headline"

View File

@ -22,9 +22,9 @@
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:paddingTop="16dip"
android:paddingLeft="96dip"
android:paddingRight="96dip"
android:paddingTop="@dimen/setup_padding_top"
android:paddingLeft="@dimen/setup_padding_left"
android:paddingRight="@dimen/setup_padding_right"
>
<!-- Headline and hairline divider -->
@ -37,7 +37,6 @@
android:layout_height="wrap_content"
android:text="@string/account_setup_exchange_headline"
android:textAppearance="@style/accountSetupHeadline" />
<View
android:id="@+id/top_divider"
android:layout_below="@+id/headline"
@ -51,29 +50,35 @@
android:id="@+id/previous"
android:layout_below="@+id/top_divider"
android:layout_alignParentRight="true"
android:layout_marginTop="32dip"
android:layout_marginRight="16dip"
android:layout_marginTop="@dimen/setup_buttons_padding_top"
android:layout_marginRight="@dimen/setup_buttons_padding_right"
style="@style/accountSetupButton"
android:text="@string/previous_action" />
<Button
android:id="@+id/next"
android:layout_below="@+id/previous"
android:layout_alignParentRight="true"
android:layout_marginTop="32dip"
android:layout_marginRight="16dip"
android:layout_marginTop="@dimen/setup_buttons_vertical_spacing"
android:layout_marginRight="@dimen/setup_buttons_padding_right"
style="@style/accountSetupButton"
android:text="@string/next_action" />
<!-- Fragment on the left containing the setup info -->
<fragment
android:id="@+id/setup_fragment"
class="com.android.email.activity.setup.AccountSetupExchangeFragment"
<FrameLayout
android:layout_below="@+id/top_divider"
android:layout_alignParentLeft="true"
android:layout_toLeftOf="@+id/next"
android:layout_marginRight="64dip"
android:layout_width="match_parent"
android:layout_height="wrap_content"
/>
android:paddingLeft="16dip"
android:paddingRight="64dip"
>
<fragment
android:id="@+id/setup_fragment"
class="com.android.email.activity.setup.AccountSetupExchangeFragment"
android:layout_width="match_parent"
android:layout_height="wrap_content"
/>
</FrameLayout>
</RelativeLayout>
</ScrollView>

View File

@ -22,9 +22,9 @@
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:paddingTop="16dip"
android:paddingLeft="96dip"
android:paddingRight="96dip"
android:paddingTop="@dimen/setup_padding_top"
android:paddingLeft="@dimen/setup_padding_left"
android:paddingRight="@dimen/setup_padding_right"
>
<!-- Headline and hairline divider -->
@ -37,7 +37,6 @@
android:layout_height="wrap_content"
android:text="@string/account_setup_incoming_headline"
android:textAppearance="@style/accountSetupHeadline" />
<View
android:id="@+id/top_divider"
android:layout_below="@+id/headline"
@ -51,29 +50,34 @@
android:id="@+id/previous"
android:layout_below="@+id/top_divider"
android:layout_alignParentRight="true"
android:layout_marginTop="32dip"
android:layout_marginRight="16dip"
android:layout_marginTop="@dimen/setup_buttons_padding_top"
android:layout_marginRight="@dimen/setup_buttons_padding_right"
style="@style/accountSetupButton"
android:text="@string/previous_action" />
<Button
android:id="@+id/next"
android:layout_below="@+id/previous"
android:layout_alignParentRight="true"
android:layout_marginTop="32dip"
android:layout_marginRight="16dip"
android:layout_marginTop="@dimen/setup_buttons_vertical_spacing"
android:layout_marginRight="@dimen/setup_buttons_padding_right"
style="@style/accountSetupButton"
android:text="@string/next_action" />
<!-- Fragment on the left containing the setup info -->
<fragment
android:id="@+id/setup_fragment"
class="com.android.email.activity.setup.AccountSetupIncomingFragment"
<FrameLayout
android:layout_below="@+id/top_divider"
android:layout_alignParentLeft="true"
android:layout_toLeftOf="@+id/next"
android:layout_marginRight="64dip"
android:layout_width="match_parent"
android:layout_height="wrap_content"
/>
android:paddingLeft="16dip"
android:paddingRight="64dip"
>
<fragment
android:id="@+id/setup_fragment"
class="com.android.email.activity.setup.AccountSetupIncomingFragment"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
</FrameLayout>
</RelativeLayout>
</ScrollView>

View File

@ -37,7 +37,6 @@
android:layout_height="wrap_content"
android:text="@string/account_setup_names_headline"
android:textAppearance="@style/accountSetupHeadline" />
<View
android:id="@+id/top_divider"
android:layout_below="@+id/headline"

View File

@ -22,9 +22,9 @@
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:paddingTop="16dip"
android:paddingLeft="96dip"
android:paddingRight="96dip"
android:paddingTop="@dimen/setup_padding_top"
android:paddingLeft="@dimen/setup_padding_left"
android:paddingRight="@dimen/setup_padding_right"
>
<!-- Headline and hairline divider -->
@ -37,7 +37,6 @@
android:layout_height="wrap_content"
android:text="@string/account_setup_outgoing_headline"
android:textAppearance="@style/accountSetupHeadline" />
<View
android:id="@+id/top_divider"
android:layout_below="@+id/headline"
@ -51,29 +50,35 @@
android:id="@+id/previous"
android:layout_below="@+id/top_divider"
android:layout_alignParentRight="true"
android:layout_marginTop="32dip"
android:layout_marginRight="16dip"
android:layout_marginTop="@dimen/setup_buttons_padding_top"
android:layout_marginRight="@dimen/setup_buttons_padding_right"
style="@style/accountSetupButton"
android:text="@string/previous_action" />
<Button
android:id="@+id/next"
android:layout_below="@+id/previous"
android:layout_alignParentRight="true"
android:layout_marginTop="32dip"
android:layout_marginRight="16dip"
android:layout_marginTop="@dimen/setup_buttons_vertical_spacing"
android:layout_marginRight="@dimen/setup_buttons_padding_right"
style="@style/accountSetupButton"
android:text="@string/next_action" />
<!-- Fragment on the left containing the setup info -->
<fragment
android:id="@+id/setup_fragment"
class="com.android.email.activity.setup.AccountSetupOutgoingFragment"
<FrameLayout
android:layout_below="@+id/top_divider"
android:layout_alignParentLeft="true"
android:layout_toLeftOf="@+id/next"
android:layout_marginRight="64dip"
android:layout_width="match_parent"
android:layout_height="wrap_content"
/>
android:paddingLeft="16dip"
android:paddingRight="64dip"
>
<fragment
android:id="@+id/setup_fragment"
class="com.android.email.activity.setup.AccountSetupOutgoingFragment"
android:layout_width="match_parent"
android:layout_height="wrap_content"
/>
</FrameLayout>
</RelativeLayout>
</ScrollView>

View File

@ -49,7 +49,7 @@
<View
android:id="@+id/top_divider"
android:layout_below="@+id/headline"
android:layout_marginBottom="32dip"
android:layout_marginBottom="16dip"
android:layout_width="match_parent"
android:layout_height="1px"
android:background="@color/account_setup_divider_color" />

View File

@ -25,15 +25,15 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:paddingLeft="96dip"
android:paddingRight="96dip"
android:paddingTop="@dimen/setup_padding_top"
android:paddingLeft="@dimen/setup_padding_left"
android:paddingRight="@dimen/setup_padding_right"
>
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:paddingTop="16dip"
>
<!-- Headline and hairline divider -->
@ -46,7 +46,6 @@
android:layout_height="wrap_content"
android:text="@string/account_setup_exchange_headline"
android:textAppearance="@style/accountSetupHeadline" />
<View
android:id="@+id/top_divider"
android:layout_below="@+id/headline"
@ -56,33 +55,40 @@
android:background="@color/account_setup_divider_color" />
<!-- Fragment on the top containing the setup info -->
<fragment
android:id="@+id/setup_fragment"
class="com.android.email.activity.setup.AccountSetupExchangeFragment"
<FrameLayout
android:layout_below="@+id/top_divider"
android:layout_marginLeft="16dip"
android:layout_marginRight="96dip"
android:layout_width="match_parent"
android:layout_height="wrap_content"
/>
android:paddingLeft="16dip"
android:paddingRight="96dip"
>
<fragment
android:id="@+id/setup_fragment"
class="com.android.email.activity.setup.AccountSetupExchangeFragment"
android:layout_width="match_parent"
android:layout_height="wrap_content"
/>
</FrameLayout>
</RelativeLayout>
<!-- Buttons below -->
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="48dip"
android:layout_marginBottom="@dimen/setup_buttons_padding_bottom"
>
<Button
android:id="@+id/previous"
android:layout_alignParentTop="true"
android:layout_alignParentLeft="true"
android:layout_marginLeft="@dimen/setup_buttons_padding_left"
style="@style/accountSetupButton"
android:text="@string/previous_action" />
<Button
android:id="@+id/next"
android:layout_alignParentTop="true"
android:layout_alignParentRight="true"
android:layout_marginRight="@dimen/setup_buttons_padding_right"
style="@style/accountSetupButton"
android:text="@string/next_action" />
</RelativeLayout>

View File

@ -25,15 +25,15 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:paddingLeft="96dip"
android:paddingRight="96dip"
android:paddingTop="@dimen/setup_padding_top"
android:paddingLeft="@dimen/setup_padding_left"
android:paddingRight="@dimen/setup_padding_right"
>
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:paddingTop="16dip"
>
<!-- Headline and hairline divider -->
@ -46,7 +46,6 @@
android:layout_height="wrap_content"
android:text="@string/account_setup_incoming_headline"
android:textAppearance="@style/accountSetupHeadline" />
<View
android:id="@+id/top_divider"
android:layout_below="@+id/headline"
@ -56,34 +55,40 @@
android:background="@color/account_setup_divider_color" />
<!-- Fragment on the top containing the setup info -->
<fragment
android:id="@+id/setup_fragment"
class="com.android.email.activity.setup.AccountSetupIncomingFragment"
<FrameLayout
android:layout_below="@+id/top_divider"
android:layout_marginLeft="16dip"
android:layout_marginRight="96dip"
android:layout_width="match_parent"
android:layout_height="wrap_content"
/>
android:paddingLeft="16dip"
android:paddingRight="96dip"
>
<fragment
android:id="@+id/setup_fragment"
class="com.android.email.activity.setup.AccountSetupIncomingFragment"
android:layout_width="match_parent"
android:layout_height="wrap_content"
/>
</FrameLayout>
</RelativeLayout>
<!-- Buttons below -->
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="48dip"
android:layout_marginBottom="@dimen/setup_buttons_padding_bottom"
>
<!-- Buttons below -->
<Button
android:id="@+id/previous"
android:layout_alignParentTop="true"
android:layout_alignParentLeft="true"
android:layout_marginLeft="@dimen/setup_buttons_padding_left"
style="@style/accountSetupButton"
android:text="@string/previous_action" />
<Button
android:id="@+id/next"
android:layout_alignParentTop="true"
android:layout_alignParentRight="true"
android:layout_marginRight="@dimen/setup_buttons_padding_right"
style="@style/accountSetupButton"
android:text="@string/next_action" />
</RelativeLayout>

View File

@ -49,7 +49,7 @@
<View
android:id="@+id/top_divider"
android:layout_below="@+id/headline"
android:layout_marginBottom="32dip"
android:layout_marginBottom="16dip"
android:layout_width="match_parent"
android:layout_height="1px"
android:background="@color/account_setup_divider_color" />

View File

@ -49,7 +49,7 @@
<View
android:id="@+id/top_divider"
android:layout_below="@+id/headline"
android:layout_marginBottom="32dip"
android:layout_marginBottom="16dip"
android:layout_width="match_parent"
android:layout_height="1px"
android:background="@color/account_setup_divider_color" />

View File

@ -25,15 +25,15 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:paddingLeft="96dip"
android:paddingRight="96dip"
android:paddingTop="@dimen/setup_padding_top"
android:paddingLeft="@dimen/setup_padding_left"
android:paddingRight="@dimen/setup_padding_right"
>
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:paddingTop="16dip"
>
<!-- Headline and hairline divider -->
@ -46,7 +46,6 @@
android:layout_height="wrap_content"
android:text="@string/account_setup_outgoing_headline"
android:textAppearance="@style/accountSetupHeadline" />
<View
android:id="@+id/top_divider"
android:layout_below="@+id/headline"
@ -56,33 +55,40 @@
android:background="@color/account_setup_divider_color" />
<!-- Fragment on the top containing the setup info -->
<fragment
android:id="@+id/setup_fragment"
class="com.android.email.activity.setup.AccountSetupOutgoingFragment"
<FrameLayout
android:layout_below="@+id/top_divider"
android:layout_marginLeft="16dip"
android:layout_marginRight="96dip"
android:layout_width="match_parent"
android:layout_height="wrap_content"
/>
android:paddingLeft="16dip"
android:paddingRight="96dip"
>
<fragment
android:id="@+id/setup_fragment"
class="com.android.email.activity.setup.AccountSetupOutgoingFragment"
android:layout_width="match_parent"
android:layout_height="wrap_content"
/>
</FrameLayout>
</RelativeLayout>
<!-- Buttons below -->
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="48dip"
android:layout_marginBottom="@dimen/setup_buttons_padding_bottom"
>
<Button
android:id="@+id/previous"
android:layout_alignParentTop="true"
android:layout_alignParentLeft="true"
android:layout_marginLeft="@dimen/setup_buttons_padding_left"
style="@style/accountSetupButton"
android:text="@string/previous_action" />
<Button
android:id="@+id/next"
android:layout_alignParentTop="true"
android:layout_alignParentRight="true"
android:layout_marginRight="@dimen/setup_buttons_padding_right"
style="@style/accountSetupButton"
android:text="@string/next_action" />
</RelativeLayout>

View File

@ -33,7 +33,6 @@
android:layout_height="wrap_content"
android:text="@string/account_setup_account_type_headline"
android:textAppearance="@style/accountSetupHeadline" />
<View
android:id="@+id/top_divider"
android:layout_below="@+id/headline"

View File

@ -17,13 +17,9 @@
<!-- Exchange server settings - xlarge - see layout/ for phone UX variant -->
<!-- This is used directly by the account setup activity, but during settings it is
wrapped in an outer layout (account_settings_exchange_fragment) -->
<!-- TODO add back styles for final appearance -->
<TableLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="16dip"
android:layout_marginLeft="16dip"
android:layout_marginRight="96dip"
android:stretchColumns="1" >
<TableRow

View File

@ -17,13 +17,9 @@
<!-- Incoming server settings - xlarge - see layout/ for phone UX variant -->
<!-- This is used directly by the account setup activity, but during settings it is
wrapped in an outer layout (account_settings_incoming_fragment) -->
<!-- TODO add back styles for final appearance -->
<TableLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="16dip"
android:layout_marginLeft="16dip"
android:layout_marginRight="96dip"
android:stretchColumns="1" >
<TableRow

View File

@ -17,13 +17,9 @@
<!-- Incoming server settings - xlarge - see layout/ for phone UX variant -->
<!-- This is used directly by the account setup activity, but during settings it is
wrapped in an outer layout (account_settings_outgoing_fragment) -->
<!-- TODO add back styles for final appearance -->
<TableLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="16dip"
android:layout_marginLeft="16dip"
android:layout_marginRight="96dip"
android:stretchColumns="1" >
<TableRow

View File

@ -26,37 +26,15 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:paddingTop="32dip"
android:paddingBottom="32dip"
android:paddingLeft="16dip"
android:paddingRight="16dip"
android:paddingTop="@dimen/settings_fragment_padding_top"
android:paddingLeft="@dimen/settings_fragment_padding_left"
android:paddingRight="@dimen/settings_fragment_padding_right"
>
<!-- Headline and hairline dividers -->
<View
android:layout_marginBottom="16dip"
android:layout_width="match_parent"
android:layout_height="1px"
android:background="@color/account_setup_divider_color" />
<TextView
android:layout_marginBottom="16dip"
android:layout_marginLeft="16dip"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/account_setup_exchange_headline"
android:textAppearance="@style/accountSettingsHeadline" />
<View
android:layout_marginBottom="16dip"
android:layout_width="match_parent"
android:layout_height="1px"
android:background="@color/account_setup_divider_color" />
<!-- Fields entry -->
<FrameLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingLeft="16dip"
>
<include
layout="@layout/account_setup_exchange_fragment"
@ -74,17 +52,17 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:paddingTop="@dimen/settings_buttons_padding_top"
android:paddingBottom="@dimen/settings_buttons_padding_bottom"
>
<Button
android:id="@+id/cancel"
android:layout_alignParentLeft="true"
android:layout_marginTop="48dip"
style="@style/accountSettingsButton"
android:text="@string/cancel_action" />
<Button
android:id="@+id/done"
android:layout_alignParentRight="true"
android:layout_marginTop="48dip"
style="@style/accountSettingsButton"
android:text="@string/done_action" />
</RelativeLayout>

View File

@ -26,37 +26,15 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:paddingTop="32dip"
android:paddingBottom="32dip"
android:paddingLeft="16dip"
android:paddingRight="16dip"
android:paddingTop="@dimen/settings_fragment_padding_top"
android:paddingLeft="@dimen/settings_fragment_padding_left"
android:paddingRight="@dimen/settings_fragment_padding_right"
>
<!-- Headline and hairline dividers -->
<View
android:layout_marginBottom="16dip"
android:layout_width="match_parent"
android:layout_height="1px"
android:background="@color/account_setup_divider_color" />
<TextView
android:layout_marginBottom="16dip"
android:layout_marginLeft="16dip"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/account_setup_incoming_headline"
android:textAppearance="@style/accountSettingsHeadline" />
<View
android:layout_marginBottom="16dip"
android:layout_width="match_parent"
android:layout_height="1px"
android:background="@color/account_setup_divider_color" />
<!-- Fields entry -->
<FrameLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingLeft="16dip"
>
<include
layout="@layout/account_setup_incoming_fragment"
@ -74,17 +52,17 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:paddingTop="@dimen/settings_buttons_padding_top"
android:paddingBottom="@dimen/settings_buttons_padding_bottom"
>
<Button
android:id="@+id/cancel"
android:layout_alignParentLeft="true"
android:layout_marginTop="48dip"
style="@style/accountSettingsButton"
android:text="@string/cancel_action" />
<Button
android:id="@+id/done"
android:layout_alignParentRight="true"
android:layout_marginTop="48dip"
style="@style/accountSettingsButton"
android:text="@string/done_action" />
</RelativeLayout>

View File

@ -26,37 +26,15 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:paddingTop="32dip"
android:paddingBottom="32dip"
android:paddingLeft="16dip"
android:paddingRight="16dip"
android:paddingTop="@dimen/settings_fragment_padding_top"
android:paddingLeft="@dimen/settings_fragment_padding_left"
android:paddingRight="@dimen/settings_fragment_padding_right"
>
<!-- Headline and hairline dividers -->
<View
android:layout_marginBottom="16dip"
android:layout_width="match_parent"
android:layout_height="1px"
android:background="@color/account_setup_divider_color" />
<TextView
android:layout_marginBottom="16dip"
android:layout_marginLeft="16dip"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/account_setup_outgoing_headline"
android:textAppearance="@style/accountSettingsHeadline" />
<View
android:layout_marginBottom="16dip"
android:layout_width="match_parent"
android:layout_height="1px"
android:background="@color/account_setup_divider_color" />
<!-- Fields entry -->
<FrameLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingLeft="16dip"
>
<include
layout="@layout/account_setup_outgoing_fragment"
@ -74,17 +52,17 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:paddingTop="@dimen/settings_buttons_padding_top"
android:paddingBottom="@dimen/settings_buttons_padding_bottom"
>
<Button
android:id="@+id/cancel"
android:layout_alignParentLeft="true"
android:layout_marginTop="48dip"
style="@style/accountSettingsButton"
android:text="@string/cancel_action" />
<Button
android:id="@+id/done"
android:layout_alignParentRight="true"
android:layout_marginTop="48dip"
style="@style/accountSettingsButton"
android:text="@string/done_action" />
</RelativeLayout>

View File

@ -52,4 +52,15 @@
<dimen name="message_compose_header_button_area_width">120dip</dimen>
<!-- Account settings fragments -->
<!-- In containers for settings fragments, the padding to use for all items
(this matches PreferenceActivity hairline) -->
<dimen name="settings_fragment_padding_top">32dip</dimen>
<dimen name="settings_fragment_padding_left">32dip</dimen>
<dimen name="settings_fragment_padding_right">32dip</dimen>
<!-- inset distance for settings buttons -->
<dimen name="settings_buttons_padding_top">48dip</dimen>
<dimen name="settings_buttons_padding_bottom">48dip</dimen>
</resources>