ADHOC
/
replicant-packages_apps_Email
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge "Add scrollview to all setup activities"

This commit is contained in:
Andy Stadler 2010-12-13 11:05:06 -08:00 committed by Android (Google) Code Review
parent 23d6d9cf24 4f2f603bb2
commit 2164e8bc2d
12 changed files with 1019 additions and 878 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

115
res/layout-xlarge-land/account_setup_basics.xml
View File

@ -15,62 +15,67 @@
-->
<!-- Account setup - XL - landscape - see layout/ for small-screen version -->
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:paddingTop="16dip"
android:paddingLeft="96dip"
android:paddingRight="96dip"
>
android:layout_height="match_parent">
<!-- Headline and hairline divider -->
<TextView
android:id="@+id/headline"
android:layout_alignParentTop="true"
android:layout_alignParentLeft="true"
android:layout_marginLeft="16dip"
android:layout_width="wrap_content"
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"
android:layout_marginBottom="16dip"
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="1px"
android:background="@color/account_setup_divider_color" />
<!-- Buttons on the right -->
<Button
android:id="@+id/manual_setup"
android:layout_below="@+id/top_divider"
android:layout_alignParentRight="true"
android:layout_marginTop="32dip"
android:layout_marginRight="16dip"
style="@style/accountSetupButton"
android:text="@string/account_setup_basics_manual_setup_action" />
<Button
android:id="@+id/next"
android:layout_below="@+id/manual_setup"
android:layout_alignParentRight="true"
android:layout_marginTop="32dip"
android:layout_marginRight="16dip"
style="@style/accountSetupButton"
android:text="@string/next_action" />
<!-- Frame on the left containing the (common) setup info -->
<FrameLayout
android:layout_below="@+id/top_divider"
android:layout_alignParentLeft="true"
android:layout_toLeftOf="@+id/manual_setup"
android:layout_marginRight="64dip"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_height="match_parent"
android:paddingTop="16dip"
android:paddingLeft="96dip"
android:paddingRight="96dip"
>
<include
layout="@layout/account_setup_basics_common"
/>
</FrameLayout>
</RelativeLayout>
<!-- Headline and hairline divider -->
<TextView
android:id="@+id/headline"
android:layout_alignParentTop="true"
android:layout_alignParentLeft="true"
android:layout_marginLeft="16dip"
android:layout_width="wrap_content"
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"
android:layout_marginBottom="16dip"
android:layout_width="match_parent"
android:layout_height="1px"
android:background="@color/account_setup_divider_color" />
<!-- Buttons on the right -->
<Button
android:id="@+id/manual_setup"
android:layout_below="@+id/top_divider"
android:layout_alignParentRight="true"
android:layout_marginTop="32dip"
android:layout_marginRight="16dip"
style="@style/accountSetupButton"
android:text="@string/account_setup_basics_manual_setup_action" />
<Button
android:id="@+id/next"
android:layout_below="@+id/manual_setup"
android:layout_alignParentRight="true"
android:layout_marginTop="32dip"
android:layout_marginRight="16dip"
style="@style/accountSetupButton"
android:text="@string/next_action" />
<!-- Frame on the left containing the (common) setup info -->
<FrameLayout
android:layout_below="@+id/top_divider"
android:layout_alignParentLeft="true"
android:layout_toLeftOf="@+id/manual_setup"
android:layout_marginRight="64dip"
android:layout_width="match_parent"
android:layout_height="wrap_content"
>
<include
layout="@layout/account_setup_basics_common"
/>
</FrameLayout>
</RelativeLayout>
</ScrollView>

109
res/layout-xlarge-land/account_setup_exchange.xml
View File

@ -15,60 +15,65 @@
-->
<!-- Exchange Setup - XL - landscape - see layout/ for small-screen version -->
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:paddingTop="16dip"
android:paddingLeft="96dip"
android:paddingRight="96dip"
>
android:layout_height="match_parent">
<!-- Headline and hairline divider -->
<TextView
android:id="@+id/headline"
android:layout_alignParentTop="true"
android:layout_alignParentLeft="true"
android:layout_marginLeft="16dip"
android:layout_width="wrap_content"
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"
android:layout_marginBottom="16dip"
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="1px"
android:background="@color/account_setup_divider_color" />
android:layout_height="match_parent"
android:paddingTop="16dip"
android:paddingLeft="96dip"
android:paddingRight="96dip"
>
<!-- Buttons on the right -->
<Button
android:id="@+id/previous"
android:layout_below="@+id/top_divider"
android:layout_alignParentRight="true"
android:layout_marginTop="32dip"
android:layout_marginRight="16dip"
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"
style="@style/accountSetupButton"
android:text="@string/next_action" />
<!-- Headline and hairline divider -->
<TextView
android:id="@+id/headline"
android:layout_alignParentTop="true"
android:layout_alignParentLeft="true"
android:layout_marginLeft="16dip"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/account_setup_exchange_headline"
android:textAppearance="@style/accountSetupHeadline" />
<!-- Fragment on the left containing the setup info -->
<fragment
android:id="@+id/setup_fragment"
class="com.android.email.activity.setup.AccountSetupExchangeFragment"
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"
/>
</RelativeLayout>
<View
android:id="@+id/top_divider"
android:layout_below="@+id/headline"
android:layout_marginBottom="16dip"
android:layout_width="match_parent"
android:layout_height="1px"
android:background="@color/account_setup_divider_color" />
<!-- Buttons on the right -->
<Button
android:id="@+id/previous"
android:layout_below="@+id/top_divider"
android:layout_alignParentRight="true"
android:layout_marginTop="32dip"
android:layout_marginRight="16dip"
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"
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"
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"
/>
</RelativeLayout>
</ScrollView>

109
res/layout-xlarge-land/account_setup_incoming.xml
View File

@ -15,60 +15,65 @@
-->
<!-- Incoming setup - XL - landscape - see layout/ for small-screen version -->
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:paddingTop="16dip"
android:paddingLeft="96dip"
android:paddingRight="96dip"
>
android:layout_height="match_parent">
<!-- Headline and hairline divider -->
<TextView
android:id="@+id/headline"
android:layout_alignParentTop="true"
android:layout_alignParentLeft="true"
android:layout_marginLeft="16dip"
android:layout_width="wrap_content"
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"
android:layout_marginBottom="16dip"
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="1px"
android:background="@color/account_setup_divider_color" />
android:layout_height="match_parent"
android:paddingTop="16dip"
android:paddingLeft="96dip"
android:paddingRight="96dip"
>
<!-- Buttons on the right -->
<Button
android:id="@+id/previous"
android:layout_below="@+id/top_divider"
android:layout_alignParentRight="true"
android:layout_marginTop="32dip"
android:layout_marginRight="16dip"
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"
style="@style/accountSetupButton"
android:text="@string/next_action" />
<!-- Headline and hairline divider -->
<TextView
android:id="@+id/headline"
android:layout_alignParentTop="true"
android:layout_alignParentLeft="true"
android:layout_marginLeft="16dip"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/account_setup_incoming_headline"
android:textAppearance="@style/accountSetupHeadline" />
<!-- Fragment on the left containing the setup info -->
<fragment
android:id="@+id/setup_fragment"
class="com.android.email.activity.setup.AccountSetupIncomingFragment"
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"
/>
</RelativeLayout>
<View
android:id="@+id/top_divider"
android:layout_below="@+id/headline"
android:layout_marginBottom="16dip"
android:layout_width="match_parent"
android:layout_height="1px"
android:background="@color/account_setup_divider_color" />
<!-- Buttons on the right -->
<Button
android:id="@+id/previous"
android:layout_below="@+id/top_divider"
android:layout_alignParentRight="true"
android:layout_marginTop="32dip"
android:layout_marginRight="16dip"
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"
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"
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"
/>
</RelativeLayout>
</ScrollView>

139
res/layout-xlarge-land/account_setup_names.xml
View File

@ -15,81 +15,86 @@
-->
<!-- Account Names - XL - landscape - see layout/ for small-screen version -->
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:paddingTop="16dip"
android:paddingLeft="96dip"
android:paddingRight="96dip"
>
android:layout_height="match_parent">
<!-- Headline and hairline divider -->
<TextView
android:id="@+id/headline"
android:layout_alignParentTop="true"
android:layout_alignParentLeft="true"
android:layout_marginLeft="16dip"
android:layout_width="wrap_content"
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"
android:layout_marginBottom="16dip"
android:layout_width="match_parent"
android:layout_height="1px"
android:background="@color/account_setup_divider_color" />
<!-- Button on the right -->
<Button
android:id="@+id/next"
android:layout_below="@+id/top_divider"
android:layout_alignParentRight="true"
android:layout_marginTop="96dip"
android:layout_marginRight="16dip"
style="@style/accountSetupButton"
android:text="@string/next_action" />
<!-- Entry fields arrayed below divider -->
<RelativeLayout
android:layout_below="@+id/top_divider"
android:layout_alignParentLeft="true"
android:layout_toLeftOf="@+id/next"
android:layout_marginLeft="16dip"
android:layout_marginRight="64dip"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_height="match_parent"
android:paddingTop="16dip"
android:paddingLeft="96dip"
android:paddingRight="96dip"
>
<!-- Headline and hairline divider -->
<TextView
android:id="@+id/account_description_label"
android:id="@+id/headline"
android:layout_alignParentTop="true"
android:layout_alignParentLeft="true"
android:layout_marginLeft="16dip"
android:layout_width="wrap_content"
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"
android:layout_marginBottom="16dip"
android:layout_width="match_parent"
android:layout_height="1px"
android:background="@color/account_setup_divider_color" />
<!-- Button on the right -->
<Button
android:id="@+id/next"
android:layout_below="@+id/top_divider"
android:layout_alignParentRight="true"
android:layout_marginTop="96dip"
android:layout_marginRight="16dip"
style="@style/accountSetupButton"
android:text="@string/next_action" />
<!-- Entry fields arrayed below divider -->
<RelativeLayout
android:layout_below="@+id/top_divider"
android:layout_alignParentLeft="true"
android:layout_toLeftOf="@+id/next"
android:layout_marginLeft="16dip"
android:layout_marginRight="64dip"
android:layout_width="match_parent"
android:text="@string/account_setup_names_account_name_label"
android:textColor="?android:attr/textColorPrimary" />
<EditText
android:id="@+id/account_description"
android:layout_below="@+id/account_description_label"
android:layout_height="wrap_content"
android:layout_width="match_parent"
android:inputType="textCapWords"
android:imeOptions="actionDone" />
<TextView
android:id="@+id/account_name_label"
android:layout_below="@+id/account_description"
android:layout_marginTop="32dip"
android:layout_height="wrap_content"
android:layout_width="match_parent"
android:text="@string/account_setup_names_user_name_label"
android:textColor="?android:attr/textColorPrimary" />
<EditText
android:id="@+id/account_name"
android:layout_below="@+id/account_name_label"
android:layout_height="wrap_content"
android:layout_width="match_parent"
android:inputType="textPersonName"
android:imeOptions="actionDone" />
>
<TextView
android:id="@+id/account_description_label"
android:layout_alignParentTop="true"
android:layout_height="wrap_content"
android:layout_width="match_parent"
android:text="@string/account_setup_names_account_name_label"
android:textColor="?android:attr/textColorPrimary" />
<EditText
android:id="@+id/account_description"
android:layout_below="@+id/account_description_label"
android:layout_height="wrap_content"
android:layout_width="match_parent"
android:inputType="textCapWords"
android:imeOptions="actionDone" />
<TextView
android:id="@+id/account_name_label"
android:layout_below="@+id/account_description"
android:layout_marginTop="32dip"
android:layout_height="wrap_content"
android:layout_width="match_parent"
android:text="@string/account_setup_names_user_name_label"
android:textColor="?android:attr/textColorPrimary" />
<EditText
android:id="@+id/account_name"
android:layout_below="@+id/account_name_label"
android:layout_height="wrap_content"
android:layout_width="match_parent"
android:inputType="textPersonName"
android:imeOptions="actionDone" />
</RelativeLayout>
</RelativeLayout>
</RelativeLayout>
</ScrollView>

347
res/layout-xlarge-land/account_setup_options.xml
View File

@ -15,186 +15,191 @@
-->
<!-- Account Options - XL - landscape - see layout/ for small-screen version -->
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:paddingTop="16dip"
android:paddingLeft="96dip"
android:paddingRight="96dip"
>
android:layout_height="match_parent">
<!-- Headline and hairline divider -->
<TextView
android:id="@+id/headline"
android:layout_alignParentTop="true"
android:layout_alignParentLeft="true"
android:layout_marginLeft="16dip"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/account_setup_options_headline"
android:textAppearance="@style/accountSetupHeadline" />
<View
android:id="@+id/top_divider"
android:layout_below="@+id/headline"
android:layout_marginBottom="16dip"
android:layout_width="match_parent"
android:layout_height="1px"
android:background="@color/account_setup_divider_color" />
<!-- Buttons on the right -->
<Button
android:id="@+id/previous"
android:layout_below="@+id/top_divider"
android:layout_alignParentRight="true"
android:layout_marginTop="32dip"
android:layout_marginRight="16dip"
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"
style="@style/accountSetupButton"
android:text="@string/next_action" />
<!-- Layout on the left containing the setup info -->
<RelativeLayout
android:layout_below="@+id/top_divider"
android:layout_alignParentLeft="true"
android:layout_toLeftOf="@+id/next"
android:layout_marginLeft="16dip"
android:layout_marginRight="64dip"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_height="match_parent"
android:paddingTop="16dip"
android:paddingLeft="96dip"
android:paddingRight="96dip"
>
<!-- Spinners in a table to line everything up nicely -->
<TableLayout
android:id="@+id/spinners_table"
<!-- Headline and hairline divider -->
<TextView
android:id="@+id/headline"
android:layout_alignParentTop="true"
android:layout_marginRight="96dip"
android:layout_width="match_parent"
android:layout_alignParentLeft="true"
android:layout_marginLeft="16dip"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:stretchColumns="1" >
<TableRow
android:paddingTop="16dip" >
<TextView
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:layout_marginRight="16dip"
android:text="@string/account_setup_options_mail_check_frequency_label"
android:textColor="?android:attr/textColorPrimary" />
<Spinner
android:id="@+id/account_check_frequency"
android:layout_height="wrap_content"
android:layout_width="match_parent" />
</TableRow>
<!-- 2nd row is shown only for EAS accounts -->
<TableRow
android:id="@+id/account_sync_window_row"
android:paddingTop="16dip"
android:visibility="gone" >
<TextView
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:layout_marginRight="16dip"
android:text="@string/account_setup_options_mail_window_label"
android:textColor="?android:attr/textColorPrimary" />
<Spinner
android:id="@+id/account_sync_window"
android:layout_height="wrap_content"
android:layout_width="match_parent" />
</TableRow>
</TableLayout>
android:text="@string/account_setup_options_headline"
android:textAppearance="@style/accountSetupHeadline" />
<View
android:id="@+id/account_default_divider_upper"
android:layout_below="@+id/spinners_table"
android:id="@+id/top_divider"
android:layout_below="@+id/headline"
android:layout_marginBottom="16dip"
android:layout_width="match_parent"
android:layout_height="1px"
android:background="@color/account_setup_divider_color" />
<!-- Buttons on the right -->
<Button
android:id="@+id/previous"
android:layout_below="@+id/top_divider"
android:layout_alignParentRight="true"
android:layout_marginTop="32dip"
android:layout_marginRight="16dip"
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"
style="@style/accountSetupButton"
android:text="@string/next_action" />
<!-- Layout on the left containing the setup info -->
<RelativeLayout
android:layout_below="@+id/top_divider"
android:layout_alignParentLeft="true"
android:layout_toLeftOf="@+id/next"
android:layout_marginLeft="16dip"
android:layout_marginRight="64dip"
android:layout_width="match_parent"
android:layout_height="1px"
android:background="@color/account_setup_divider_color" />
<CheckBox
android:id="@+id/account_default"
android:layout_below="@+id/account_default_divider_upper"
android:layout_marginTop="16dip"
android:layout_marginBottom="16dip"
android:layout_marginLeft="32dip"
android:layout_height="wrap_content"
android:layout_width="match_parent"
android:text="@string/account_setup_options_default_label" />
<View
android:id="@+id/account_default_divider"
android:layout_below="@+id/account_default"
android:layout_width="match_parent"
android:layout_height="1px"
android:background="@color/account_setup_divider_color" />
<CheckBox
android:id="@+id/account_notify"
android:layout_below="@+id/account_default_divider"
android:layout_marginTop="16dip"
android:layout_marginBottom="16dip"
android:layout_marginLeft="32dip"
android:layout_height="wrap_content"
android:layout_width="match_parent"
android:text="@string/account_setup_options_notify_label" />
<View
android:id="@+id/account_notify_divider"
android:layout_below="@+id/account_notify"
android:layout_width="match_parent"
android:layout_height="1px"
android:background="@color/account_setup_divider_color" />
<!-- Contacts sync - hide unless EAS -->
<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"
android:layout_height="wrap_content"
android:layout_width="match_parent"
android:text="@string/account_setup_options_sync_contacts_label"
android:visibility="gone" />
<View
android:id="@+id/account_sync_contacts_divider"
android:layout_below="@+id/account_sync_contacts"
android:layout_width="match_parent"
android:layout_height="1px"
android:background="@color/account_setup_divider_color"
android:visibility="gone" />
<!-- Calendar sync - hide unless EAS -->
<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"
android:layout_height="wrap_content"
android:layout_width="match_parent"
android:text="@string/account_setup_options_sync_calendar_label"
android:visibility="gone" />
<View
android:id="@+id/account_sync_calendar_divider"
android:layout_below="@+id/account_sync_calendar"
android:layout_width="match_parent"
android:layout_height="1px"
android:background="@color/account_setup_divider_color"
android:visibility="gone" />
<!-- Email sync - always show -->
<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"
android:layout_height="wrap_content"
android:layout_width="match_parent"
android:text="@string/account_setup_options_sync_email_label" />
<View
android:id="@+id/account_sync_email_divider"
android:layout_below="@+id/account_sync_email"
android:layout_width="match_parent"
android:layout_height="1px"
android:background="@color/account_setup_divider_color" />
>
<!-- Spinners in a table to line everything up nicely -->
<TableLayout
android:id="@+id/spinners_table"
android:layout_alignParentTop="true"
android:layout_marginRight="96dip"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:stretchColumns="1" >
<TableRow
android:paddingTop="16dip" >
<TextView
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:layout_marginRight="16dip"
android:text="@string/account_setup_options_mail_check_frequency_label"
android:textColor="?android:attr/textColorPrimary" />
<Spinner
android:id="@+id/account_check_frequency"
android:layout_height="wrap_content"
android:layout_width="match_parent" />
</TableRow>
<!-- 2nd row is shown only for EAS accounts -->
<TableRow
android:id="@+id/account_sync_window_row"
android:paddingTop="16dip"
android:visibility="gone" >
<TextView
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:layout_marginRight="16dip"
android:text="@string/account_setup_options_mail_window_label"
android:textColor="?android:attr/textColorPrimary" />
<Spinner
android:id="@+id/account_sync_window"
android:layout_height="wrap_content"
android:layout_width="match_parent" />
</TableRow>
</TableLayout>
<View
android:id="@+id/account_default_divider_upper"
android:layout_below="@+id/spinners_table"
android:layout_marginTop="32dip"
android:layout_width="match_parent"
android:layout_height="1px"
android:background="@color/account_setup_divider_color" />
<CheckBox
android:id="@+id/account_default"
android:layout_below="@+id/account_default_divider_upper"
android:layout_marginTop="16dip"
android:layout_marginBottom="16dip"
android:layout_marginLeft="32dip"
android:layout_height="wrap_content"
android:layout_width="match_parent"
android:text="@string/account_setup_options_default_label" />
<View
android:id="@+id/account_default_divider"
android:layout_below="@+id/account_default"
android:layout_width="match_parent"
android:layout_height="1px"
android:background="@color/account_setup_divider_color" />
<CheckBox
android:id="@+id/account_notify"
android:layout_below="@+id/account_default_divider"
android:layout_marginTop="16dip"
android:layout_marginBottom="16dip"
android:layout_marginLeft="32dip"
android:layout_height="wrap_content"
android:layout_width="match_parent"
android:text="@string/account_setup_options_notify_label" />
<View
android:id="@+id/account_notify_divider"
android:layout_below="@+id/account_notify"
android:layout_width="match_parent"
android:layout_height="1px"
android:background="@color/account_setup_divider_color" />
<!-- Contacts sync - hide unless EAS -->
<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"
android:layout_height="wrap_content"
android:layout_width="match_parent"
android:text="@string/account_setup_options_sync_contacts_label"
android:visibility="gone" />
<View
android:id="@+id/account_sync_contacts_divider"
android:layout_below="@+id/account_sync_contacts"
android:layout_width="match_parent"
android:layout_height="1px"
android:background="@color/account_setup_divider_color"
android:visibility="gone" />
<!-- Calendar sync - hide unless EAS -->
<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"
android:layout_height="wrap_content"
android:layout_width="match_parent"
android:text="@string/account_setup_options_sync_calendar_label"
android:visibility="gone" />
<View
android:id="@+id/account_sync_calendar_divider"
android:layout_below="@+id/account_sync_calendar"
android:layout_width="match_parent"
android:layout_height="1px"
android:background="@color/account_setup_divider_color"
android:visibility="gone" />
<!-- Email sync - always show -->
<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"
android:layout_height="wrap_content"
android:layout_width="match_parent"
android:text="@string/account_setup_options_sync_email_label" />
<View
android:id="@+id/account_sync_email_divider"
android:layout_below="@+id/account_sync_email"
android:layout_width="match_parent"
android:layout_height="1px"
android:background="@color/account_setup_divider_color" />
</RelativeLayout>
</RelativeLayout>
</RelativeLayout>
</ScrollView>

109
res/layout-xlarge-land/account_setup_outgoing.xml
View File

@ -15,60 +15,65 @@
-->
<!-- Outgoing Setup - XL - landscape - see layout/ for small-screen version -->
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:paddingTop="16dip"
android:paddingLeft="96dip"
android:paddingRight="96dip"
>
android:layout_height="match_parent">
<!-- Headline and hairline divider -->
<TextView
android:id="@+id/headline"
android:layout_alignParentTop="true"
android:layout_alignParentLeft="true"
android:layout_marginLeft="16dip"
android:layout_width="wrap_content"
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"
android:layout_marginBottom="16dip"
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="1px"
android:background="@color/account_setup_divider_color" />
android:layout_height="match_parent"
android:paddingTop="16dip"
android:paddingLeft="96dip"
android:paddingRight="96dip"
>
<!-- Buttons on the right -->
<Button
android:id="@+id/previous"
android:layout_below="@+id/top_divider"
android:layout_alignParentRight="true"
android:layout_marginTop="32dip"
android:layout_marginRight="16dip"
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"
style="@style/accountSetupButton"
android:text="@string/next_action" />
<!-- Headline and hairline divider -->
<TextView
android:id="@+id/headline"
android:layout_alignParentTop="true"
android:layout_alignParentLeft="true"
android:layout_marginLeft="16dip"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/account_setup_outgoing_headline"
android:textAppearance="@style/accountSetupHeadline" />
<!-- Fragment on the left containing the setup info -->
<fragment
android:id="@+id/setup_fragment"
class="com.android.email.activity.setup.AccountSetupOutgoingFragment"
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"
/>
</RelativeLayout>
<View
android:id="@+id/top_divider"
android:layout_below="@+id/headline"
android:layout_marginBottom="16dip"
android:layout_width="match_parent"
android:layout_height="1px"
android:background="@color/account_setup_divider_color" />
<!-- Buttons on the right -->
<Button
android:id="@+id/previous"
android:layout_below="@+id/top_divider"
android:layout_alignParentRight="true"
android:layout_marginTop="32dip"
android:layout_marginRight="16dip"
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"
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"
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"
/>
</RelativeLayout>
</ScrollView>

117
res/layout-xlarge-port/account_setup_basics.xml
View File

@ -15,61 +15,80 @@
-->
<!-- Account setup - XL - portrait - see layout/ for small-screen version -->
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:paddingTop="64dip"
android:paddingLeft="96dip"
android:paddingRight="96dip"
android:fillViewport="true"
>
<!-- Headline and hairline divider -->
<TextView
android:id="@+id/headline"
android:layout_alignParentTop="true"
android:layout_alignParentLeft="true"
android:layout_marginLeft="16dip"
android:layout_width="wrap_content"
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"
android:layout_marginBottom="32dip"
android:layout_width="match_parent"
android:layout_height="1px"
android:background="@color/account_setup_divider_color" />
<!-- Frame on the left containing the (common) setup info -->
<FrameLayout
android:id="@+id/common"
android:layout_below="@+id/top_divider"
android:layout_alignParentLeft="true"
android:layout_alignParentRight="true"
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:paddingLeft="96dip"
android:paddingRight="96dip"
>
<include
layout="@layout/account_setup_basics_common"
/>
</FrameLayout>
<!-- Buttons below -->
<Button
android:id="@+id/manual_setup"
android:layout_below="@+id/common"
android:layout_marginTop="48dip"
android:layout_alignParentLeft="true"
style="@style/accountSetupButton"
android:text="@string/account_setup_basics_manual_setup_action" />
<Button
android:id="@+id/next"
android:layout_below="@+id/common"
android:layout_marginTop="48dip"
android:layout_alignParentRight="true"
style="@style/accountSetupButton"
android:text="@string/next_action" />
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:paddingTop="64dip"
>
</RelativeLayout>
<!-- Headline and hairline divider -->
<TextView
android:id="@+id/headline"
android:layout_alignParentTop="true"
android:layout_alignParentLeft="true"
android:layout_marginLeft="16dip"
android:layout_width="wrap_content"
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"
android:layout_marginBottom="32dip"
android:layout_width="match_parent"
android:layout_height="1px"
android:background="@color/account_setup_divider_color" />
<!-- Frame on the left containing the (common) setup info -->
<FrameLayout
android:id="@+id/common"
android:layout_below="@+id/top_divider"
android:layout_alignParentLeft="true"
android:layout_alignParentRight="true"
android:layout_width="match_parent"
android:layout_height="wrap_content"
>
<include
layout="@layout/account_setup_basics_common"
/>
</FrameLayout>
</RelativeLayout>
<!-- Buttons below -->
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="48dip"
>
<!-- Buttons below -->
<Button
android:id="@+id/manual_setup"
android:layout_alignParentTop="true"
android:layout_alignParentLeft="true"
style="@style/accountSetupButton"
android:text="@string/account_setup_basics_manual_setup_action" />
<Button
android:id="@+id/next"
android:layout_alignParentTop="true"
android:layout_alignParentRight="true"
style="@style/accountSetupButton"
android:text="@string/next_action" />
</RelativeLayout>
</LinearLayout>
</ScrollView>

112
res/layout-xlarge-port/account_setup_exchange.xml
View File

@ -15,58 +15,76 @@
-->
<!-- Exchange Setup - XL - portrait - see layout/ for small-screen version -->
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:paddingTop="16dip"
android:paddingLeft="96dip"
android:paddingRight="96dip"
android:fillViewport="true"
>
<!-- Headline and hairline divider -->
<TextView
android:id="@+id/headline"
android:layout_alignParentTop="true"
android:layout_alignParentLeft="true"
android:layout_marginLeft="16dip"
android:layout_width="wrap_content"
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"
android:layout_marginBottom="16dip"
android:layout_width="match_parent"
android:layout_height="1px"
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"
android:layout_below="@+id/top_divider"
android:layout_marginLeft="16dip"
android:layout_marginRight="96dip"
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
/>
android:orientation="vertical"
android:paddingLeft="96dip"
android:paddingRight="96dip"
>
<!-- Buttons below -->
<Button
android:id="@+id/previous"
android:layout_below="@+id/setup_fragment"
android:layout_marginTop="48dip"
android:layout_alignParentLeft="true"
style="@style/accountSetupButton"
android:text="@string/previous_action" />
<Button
android:id="@+id/next"
android:layout_below="@+id/setup_fragment"
android:layout_marginTop="48dip"
android:layout_alignParentRight="true"
style="@style/accountSetupButton"
android:text="@string/next_action" />
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:paddingTop="16dip"
>
</RelativeLayout>
<!-- Headline and hairline divider -->
<TextView
android:id="@+id/headline"
android:layout_alignParentTop="true"
android:layout_alignParentLeft="true"
android:layout_marginLeft="16dip"
android:layout_width="wrap_content"
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"
android:layout_marginBottom="16dip"
android:layout_width="match_parent"
android:layout_height="1px"
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"
android:layout_below="@+id/top_divider"
android:layout_marginLeft="16dip"
android:layout_marginRight="96dip"
android:layout_width="match_parent"
android:layout_height="wrap_content"
/>
</RelativeLayout>
<!-- Buttons below -->
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="48dip"
>
<Button
android:id="@+id/previous"
android:layout_alignParentTop="true"
android:layout_alignParentLeft="true"
style="@style/accountSetupButton"
android:text="@string/previous_action" />
<Button
android:id="@+id/next"
android:layout_alignParentTop="true"
android:layout_alignParentRight="true"
style="@style/accountSetupButton"
android:text="@string/next_action" />
</RelativeLayout>
</LinearLayout>
</ScrollView>

113
res/layout-xlarge-port/account_setup_incoming.xml
View File

@ -15,58 +15,77 @@
-->
<!-- Incoming setup - XL - portrait - see layout/ for small-screen version -->
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:paddingTop="16dip"
android:paddingLeft="96dip"
android:paddingRight="96dip"
android:fillViewport="true"
>
<!-- Headline and hairline divider -->
<TextView
android:id="@+id/headline"
android:layout_alignParentTop="true"
android:layout_alignParentLeft="true"
android:layout_marginLeft="16dip"
android:layout_width="wrap_content"
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"
android:layout_marginBottom="16dip"
android:layout_width="match_parent"
android:layout_height="1px"
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"
android:layout_below="@+id/top_divider"
android:layout_marginLeft="16dip"
android:layout_marginRight="96dip"
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
/>
android:orientation="vertical"
android:paddingLeft="96dip"
android:paddingRight="96dip"
>
<!-- Buttons below -->
<Button
android:id="@+id/previous"
android:layout_below="@+id/setup_fragment"
android:layout_marginTop="48dip"
android:layout_alignParentLeft="true"
style="@style/accountSetupButton"
android:text="@string/previous_action" />
<Button
android:id="@+id/next"
android:layout_below="@+id/setup_fragment"
android:layout_marginTop="48dip"
android:layout_alignParentRight="true"
style="@style/accountSetupButton"
android:text="@string/next_action" />
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:paddingTop="16dip"
>
</RelativeLayout>
<!-- Headline and hairline divider -->
<TextView
android:id="@+id/headline"
android:layout_alignParentTop="true"
android:layout_alignParentLeft="true"
android:layout_marginLeft="16dip"
android:layout_width="wrap_content"
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"
android:layout_marginBottom="16dip"
android:layout_width="match_parent"
android:layout_height="1px"
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"
android:layout_below="@+id/top_divider"
android:layout_marginLeft="16dip"
android:layout_marginRight="96dip"
android:layout_width="match_parent"
android:layout_height="wrap_content"
/>
</RelativeLayout>
<!-- Buttons below -->
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="48dip"
>
<!-- Buttons below -->
<Button
android:id="@+id/previous"
android:layout_alignParentTop="true"
android:layout_alignParentLeft="true"
style="@style/accountSetupButton"
android:text="@string/previous_action" />
<Button
android:id="@+id/next"
android:layout_alignParentTop="true"
android:layout_alignParentRight="true"
style="@style/accountSetupButton"
android:text="@string/next_action" />
</RelativeLayout>
</LinearLayout>
</ScrollView>

157
res/layout-xlarge-port/account_setup_names.xml
View File

@ -15,81 +15,100 @@
-->
<!-- Account Names - XL - portrait - see layout/ for small-screen version -->
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:paddingTop="64dip"
android:paddingLeft="96dip"
android:paddingRight="96dip"
android:fillViewport="true"
>
<!-- Headline and hairline divider -->
<TextView
android:id="@+id/headline"
android:layout_alignParentTop="true"
android:layout_alignParentLeft="true"
android:layout_marginLeft="16dip"
android:layout_width="wrap_content"
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"
android:layout_marginBottom="16dip"
android:layout_width="match_parent"
android:layout_height="1px"
android:background="@color/account_setup_divider_color" />
<!-- Entry fields arrayed below divider -->
<RelativeLayout
android:id="@+id/names_layout"
android:layout_below="@+id/top_divider"
android:layout_alignParentLeft="true"
android:layout_alignParentRight="true"
android:layout_marginLeft="16dip"
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:paddingLeft="96dip"
android:paddingRight="96dip"
>
<TextView
android:id="@+id/account_description_label"
android:layout_alignParentTop="true"
android:layout_height="wrap_content"
android:layout_width="match_parent"
android:text="@string/account_setup_names_account_name_label"
android:textColor="?android:attr/textColorPrimary" />
<EditText
android:id="@+id/account_description"
android:layout_below="@+id/account_description_label"
android:layout_height="wrap_content"
android:layout_width="match_parent"
android:inputType="textCapWords"
android:imeOptions="actionDone" />
<TextView
android:id="@+id/account_name_label"
android:layout_below="@+id/account_description"
android:layout_marginTop="32dip"
android:layout_height="wrap_content"
android:layout_width="match_parent"
android:text="@string/account_setup_names_user_name_label"
android:textColor="?android:attr/textColorPrimary" />
<EditText
android:id="@+id/account_name"
android:layout_below="@+id/account_name_label"
android:layout_height="wrap_content"
android:layout_width="match_parent"
android:inputType="textPersonName"
android:imeOptions="actionDone" />
</RelativeLayout>
<!-- Button below that -->
<Button
android:id="@+id/next"
android:layout_below="@+id/names_layout"
android:layout_marginTop="48dip"
android:layout_alignParentRight="true"
style="@style/accountSetupButton"
android:text="@string/next_action" />
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:paddingTop="16dip"
>
</RelativeLayout>
<!-- Headline and hairline divider -->
<TextView
android:id="@+id/headline"
android:layout_alignParentTop="true"
android:layout_alignParentLeft="true"
android:layout_marginLeft="16dip"
android:layout_width="wrap_content"
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"
android:layout_marginBottom="16dip"
android:layout_width="match_parent"
android:layout_height="1px"
android:background="@color/account_setup_divider_color" />
<!-- Entry fields arrayed below divider -->
<RelativeLayout
android:id="@+id/names_layout"
android:layout_below="@+id/top_divider"
android:layout_alignParentLeft="true"
android:layout_alignParentRight="true"
android:layout_marginLeft="16dip"
android:layout_width="match_parent"
android:layout_height="wrap_content"
>
<TextView
android:id="@+id/account_description_label"
android:layout_alignParentTop="true"
android:layout_height="wrap_content"
android:layout_width="match_parent"
android:text="@string/account_setup_names_account_name_label"
android:textColor="?android:attr/textColorPrimary" />
<EditText
android:id="@+id/account_description"
android:layout_below="@+id/account_description_label"
android:layout_height="wrap_content"
android:layout_width="match_parent"
android:inputType="textCapWords"
android:imeOptions="actionDone" />
<TextView
android:id="@+id/account_name_label"
android:layout_below="@+id/account_description"
android:layout_marginTop="32dip"
android:layout_height="wrap_content"
android:layout_width="match_parent"
android:text="@string/account_setup_names_user_name_label"
android:textColor="?android:attr/textColorPrimary" />
<EditText
android:id="@+id/account_name"
android:layout_below="@+id/account_name_label"
android:layout_height="wrap_content"
android:layout_width="match_parent"
android:inputType="textPersonName"
android:imeOptions="actionDone" />
</RelativeLayout>
</RelativeLayout>
<!-- Button below that -->
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="48dip"
>
<Button
android:id="@+id/next"
android:layout_alignParentTop="true"
android:layout_alignParentRight="true"
style="@style/accountSetupButton"
android:text="@string/next_action" />
</RelativeLayout>
</LinearLayout>
</ScrollView>

358
res/layout-xlarge-port/account_setup_options.xml
View File

@ -15,182 +15,200 @@
-->
<!-- Account Options - XL - portrait - see layout/ for small-screen version -->
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:paddingTop="16dip"
android:paddingLeft="96dip"
android:paddingRight="96dip"
android:fillViewport="true"
>
<!-- Headline and hairline divider -->
<TextView
android:id="@+id/headline"
android:layout_alignParentTop="true"
android:layout_alignParentLeft="true"
android:layout_marginLeft="16dip"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/account_setup_options_headline"
android:textAppearance="@style/accountSetupHeadline" />
<View
android:id="@+id/top_divider"
android:layout_below="@+id/headline"
android:layout_marginBottom="16dip"
android:layout_width="match_parent"
android:layout_height="1px"
android:background="@color/account_setup_divider_color" />
<!-- Layout on the top containing the setup info -->
<RelativeLayout
android:id="@+id/setup_options_section"
android:layout_below="@+id/top_divider"
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:paddingLeft="96dip"
android:paddingRight="96dip"
>
<!-- Spinners in a table to line everything up nicely -->
<TableLayout
android:id="@+id/spinners_table"
android:layout_alignParentTop="true"
android:layout_marginRight="96dip"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:stretchColumns="1" >
<TableRow
android:paddingTop="16dip" >
<TextView
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:layout_marginRight="16dip"
android:text="@string/account_setup_options_mail_check_frequency_label"
android:textColor="?android:attr/textColorPrimary" />
<Spinner
android:id="@+id/account_check_frequency"
android:layout_height="wrap_content"
android:layout_width="match_parent" />
</TableRow>
<!-- 2nd row is shown only for EAS accounts -->
<TableRow
android:id="@+id/account_sync_window_row"
android:paddingTop="16dip"
android:visibility="gone" >
<TextView
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:layout_marginRight="16dip"
android:text="@string/account_setup_options_mail_window_label"
android:textColor="?android:attr/textColorPrimary" />
<Spinner
android:id="@+id/account_sync_window"
android:layout_height="wrap_content"
android:layout_width="match_parent" />
</TableRow>
</TableLayout>
<View
android:id="@+id/account_default_divider_upper"
android:layout_below="@+id/spinners_table"
android:layout_marginTop="32dip"
android:layout_width="match_parent"
android:layout_height="1px"
android:background="@color/account_setup_divider_color" />
<CheckBox
android:id="@+id/account_default"
android:layout_below="@+id/account_default_divider_upper"
android:layout_marginTop="16dip"
android:layout_marginBottom="16dip"
android:layout_marginLeft="32dip"
android:layout_height="wrap_content"
android:layout_width="match_parent"
android:text="@string/account_setup_options_default_label" />
<View
android:id="@+id/account_default_divider"
android:layout_below="@+id/account_default"
android:layout_width="match_parent"
android:layout_height="1px"
android:background="@color/account_setup_divider_color" />
<CheckBox
android:id="@+id/account_notify"
android:layout_below="@+id/account_default_divider"
android:layout_marginTop="16dip"
android:layout_marginBottom="16dip"
android:layout_marginLeft="32dip"
android:layout_height="wrap_content"
android:layout_width="match_parent"
android:text="@string/account_setup_options_notify_label" />
<View
android:id="@+id/account_notify_divider"
android:layout_below="@+id/account_notify"
android:layout_width="match_parent"
android:layout_height="1px"
android:background="@color/account_setup_divider_color" />
<!-- Contacts sync - hide unless EAS -->
<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"
android:layout_height="wrap_content"
android:layout_width="match_parent"
android:text="@string/account_setup_options_sync_contacts_label"
android:visibility="gone" />
<View
android:id="@+id/account_sync_contacts_divider"
android:layout_below="@+id/account_sync_contacts"
android:layout_width="match_parent"
android:layout_height="1px"
android:background="@color/account_setup_divider_color"
android:visibility="gone" />
<!-- Calendar sync - hide unless EAS -->
<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"
android:layout_height="wrap_content"
android:layout_width="match_parent"
android:text="@string/account_setup_options_sync_calendar_label"
android:visibility="gone" />
<View
android:id="@+id/account_sync_calendar_divider"
android:layout_below="@+id/account_sync_calendar"
android:layout_width="match_parent"
android:layout_height="1px"
android:background="@color/account_setup_divider_color"
android:visibility="gone" />
<!-- Email sync - always show -->
<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"
android:layout_height="wrap_content"
android:layout_width="match_parent"
android:text="@string/account_setup_options_sync_email_label" />
<View
android:id="@+id/account_sync_email_divider"
android:layout_below="@+id/account_sync_email"
android:layout_width="match_parent"
android:layout_height="1px"
android:background="@color/account_setup_divider_color" />
</RelativeLayout>
<!-- Buttons below -->
<Button
android:id="@+id/previous"
android:layout_below="@+id/setup_options_section"
android:layout_marginTop="48dip"
android:layout_alignParentLeft="true"
style="@style/accountSetupButton"
android:text="@string/previous_action" />
<Button
android:id="@+id/next"
android:layout_below="@+id/setup_options_section"
android:layout_marginTop="48dip"
android:layout_alignParentRight="true"
style="@style/accountSetupButton"
android:text="@string/next_action" />
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:paddingTop="16dip"
>
</RelativeLayout>
<!-- Headline and hairline divider -->
<TextView
android:id="@+id/headline"
android:layout_alignParentTop="true"
android:layout_alignParentLeft="true"
android:layout_marginLeft="16dip"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/account_setup_options_headline"
android:textAppearance="@style/accountSetupHeadline" />
<View
android:id="@+id/top_divider"
android:layout_below="@+id/headline"
android:layout_marginBottom="16dip"
android:layout_width="match_parent"
android:layout_height="1px"
android:background="@color/account_setup_divider_color" />
<!-- Layout on the top containing the setup info -->
<RelativeLayout
android:id="@+id/setup_options_section"
android:layout_below="@+id/top_divider"
android:layout_width="match_parent"
android:layout_height="wrap_content"
>
<!-- Spinners in a table to line everything up nicely -->
<TableLayout
android:id="@+id/spinners_table"
android:layout_alignParentTop="true"
android:layout_marginRight="96dip"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:stretchColumns="1" >
<TableRow
android:paddingTop="16dip" >
<TextView
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:layout_marginRight="16dip"
android:text="@string/account_setup_options_mail_check_frequency_label"
android:textColor="?android:attr/textColorPrimary" />
<Spinner
android:id="@+id/account_check_frequency"
android:layout_height="wrap_content"
android:layout_width="match_parent" />
</TableRow>
<!-- 2nd row is shown only for EAS accounts -->
<TableRow
android:id="@+id/account_sync_window_row"
android:paddingTop="16dip"
android:visibility="gone" >
<TextView
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:layout_marginRight="16dip"
android:text="@string/account_setup_options_mail_window_label"
android:textColor="?android:attr/textColorPrimary" />
<Spinner
android:id="@+id/account_sync_window"
android:layout_height="wrap_content"
android:layout_width="match_parent" />
</TableRow>
</TableLayout>
<View
android:id="@+id/account_default_divider_upper"
android:layout_below="@+id/spinners_table"
android:layout_marginTop="32dip"
android:layout_width="match_parent"
android:layout_height="1px"
android:background="@color/account_setup_divider_color" />
<CheckBox
android:id="@+id/account_default"
android:layout_below="@+id/account_default_divider_upper"
android:layout_marginTop="16dip"
android:layout_marginBottom="16dip"
android:layout_marginLeft="32dip"
android:layout_height="wrap_content"
android:layout_width="match_parent"
android:text="@string/account_setup_options_default_label" />
<View
android:id="@+id/account_default_divider"
android:layout_below="@+id/account_default"
android:layout_width="match_parent"
android:layout_height="1px"
android:background="@color/account_setup_divider_color" />
<CheckBox
android:id="@+id/account_notify"
android:layout_below="@+id/account_default_divider"
android:layout_marginTop="16dip"
android:layout_marginBottom="16dip"
android:layout_marginLeft="32dip"
android:layout_height="wrap_content"
android:layout_width="match_parent"
android:text="@string/account_setup_options_notify_label" />
<View
android:id="@+id/account_notify_divider"
android:layout_below="@+id/account_notify"
android:layout_width="match_parent"
android:layout_height="1px"
android:background="@color/account_setup_divider_color" />
<!-- Contacts sync - hide unless EAS -->
<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"
android:layout_height="wrap_content"
android:layout_width="match_parent"
android:text="@string/account_setup_options_sync_contacts_label"
android:visibility="gone" />
<View
android:id="@+id/account_sync_contacts_divider"
android:layout_below="@+id/account_sync_contacts"
android:layout_width="match_parent"
android:layout_height="1px"
android:background="@color/account_setup_divider_color"
android:visibility="gone" />
<!-- Calendar sync - hide unless EAS -->
<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"
android:layout_height="wrap_content"
android:layout_width="match_parent"
android:text="@string/account_setup_options_sync_calendar_label"
android:visibility="gone" />
<View
android:id="@+id/account_sync_calendar_divider"
android:layout_below="@+id/account_sync_calendar"
android:layout_width="match_parent"
android:layout_height="1px"
android:background="@color/account_setup_divider_color"
android:visibility="gone" />
<!-- Email sync - always show -->
<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"
android:layout_height="wrap_content"
android:layout_width="match_parent"
android:text="@string/account_setup_options_sync_email_label" />
<View
android:id="@+id/account_sync_email_divider"
android:layout_below="@+id/account_sync_email"
android:layout_width="match_parent"
android:layout_height="1px"
android:background="@color/account_setup_divider_color" />
</RelativeLayout>
</RelativeLayout>
<!-- Buttons below -->
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="48dip"
>
<Button
android:id="@+id/previous"
android:layout_alignParentTop="true"
android:layout_alignParentLeft="true"
style="@style/accountSetupButton"
android:text="@string/previous_action" />
<Button
android:id="@+id/next"
android:layout_alignParentTop="true"
android:layout_alignParentRight="true"
style="@style/accountSetupButton"
android:text="@string/next_action" />
</RelativeLayout>
</LinearLayout>
</ScrollView>

112
res/layout-xlarge-port/account_setup_outgoing.xml
View File

@ -15,58 +15,76 @@
-->
<!-- Outgoing Setup - XL - portrait - see layout/ for small-screen version -->
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:paddingTop="16dip"
android:paddingLeft="96dip"
android:paddingRight="96dip"
android:fillViewport="true"
>
<!-- Headline and hairline divider -->
<TextView
android:id="@+id/headline"
android:layout_alignParentTop="true"
android:layout_alignParentLeft="true"
android:layout_marginLeft="16dip"
android:layout_width="wrap_content"
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"
android:layout_marginBottom="16dip"
android:layout_width="match_parent"
android:layout_height="1px"
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"
android:layout_below="@+id/top_divider"
android:layout_marginLeft="16dip"
android:layout_marginRight="96dip"
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
/>
android:orientation="vertical"
android:paddingLeft="96dip"
android:paddingRight="96dip"
>
<!-- Buttons below -->
<Button
android:id="@+id/previous"
android:layout_below="@+id/setup_fragment"
android:layout_marginTop="48dip"
android:layout_alignParentLeft="true"
style="@style/accountSetupButton"
android:text="@string/previous_action" />
<Button
android:id="@+id/next"
android:layout_below="@+id/setup_fragment"
android:layout_marginTop="48dip"
android:layout_alignParentRight="true"
style="@style/accountSetupButton"
android:text="@string/next_action" />
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:paddingTop="16dip"
>
</RelativeLayout>
<!-- Headline and hairline divider -->
<TextView
android:id="@+id/headline"
android:layout_alignParentTop="true"
android:layout_alignParentLeft="true"
android:layout_marginLeft="16dip"
android:layout_width="wrap_content"
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"
android:layout_marginBottom="16dip"
android:layout_width="match_parent"
android:layout_height="1px"
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"
android:layout_below="@+id/top_divider"
android:layout_marginLeft="16dip"
android:layout_marginRight="96dip"
android:layout_width="match_parent"
android:layout_height="wrap_content"
/>
</RelativeLayout>
<!-- Buttons below -->
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="48dip"
>
<Button
android:id="@+id/previous"
android:layout_alignParentTop="true"
android:layout_alignParentLeft="true"
style="@style/accountSetupButton"
android:text="@string/previous_action" />
<Button
android:id="@+id/next"
android:layout_alignParentTop="true"
android:layout_alignParentRight="true"
style="@style/accountSetupButton"
android:text="@string/next_action" />
</RelativeLayout>
</LinearLayout>
</ScrollView>