Begin fixing layouts for account setup flows
Also address some RTL issues b/10784160 b/13544189 b/13585832 Change-Id: I5c86497940ce4b972e0ee9189418f120391a8833
This commit is contained in:
Tony Mantler
parent
eba80c114e
commit
20adb68b94
|
Before Width: | Height: | Size: 4.4 KiB After Width: | Height: | Size: 4.4 KiB |
|
Before Width: | Height: | Size: 3.9 KiB After Width: | Height: | Size: 3.9 KiB |
|
Before Width: | Height: | Size: 4.4 KiB After Width: | Height: | Size: 4.4 KiB |
|
Before Width: | Height: | Size: 4.6 KiB After Width: | Height: | Size: 4.6 KiB |
|
Before Width: | Height: | Size: 4.0 KiB After Width: | Height: | Size: 4.0 KiB |
|
Before Width: | Height: | Size: 4.6 KiB After Width: | Height: | Size: 4.6 KiB |
|
|
@ -1,5 +1,6 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<!-- Copyright (C) 2010 The Android Open Source Project
|
||||
<!--
|
||||
Copyright (C) 2014 The Android Open Source Project
|
||||
|
||||
Licensed under the Apache License, Version 2.0 (the "License");
|
||||
you may not use this file except in compliance with the License.
|
||||
|
|
@ -14,11 +15,10 @@
|
|||
limitations under the License.
|
||||
-->
|
||||
|
||||
<resources>
|
||||
|
||||
<!-- Account Setup Activities -->
|
||||
<dimen name="setup_padding_top">32dip</dimen>
|
||||
<dimen name="setup_padding_left">32dip</dimen>
|
||||
<dimen name="setup_padding_right">32dip</dimen>
|
||||
|
||||
</resources>
|
||||
<selector xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<item android:drawable="@drawable/ic_nav_arrow_left_disabled"
|
||||
android:state_enabled="false" />
|
||||
<item android:drawable="@drawable/ic_nav_arrow_left_pressed"
|
||||
android:state_pressed="true" />
|
||||
<item android:drawable="@drawable/ic_nav_arrow_left" />
|
||||
</selector>
|
||||
|
|
@ -1,5 +1,6 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<!-- Copyright (C) 2008 The Android Open Source Project
|
||||
<!--
|
||||
Copyright (C) 2014 The Android Open Source Project
|
||||
|
||||
Licensed under the Apache License, Version 2.0 (the "License");
|
||||
you may not use this file except in compliance with the License.
|
||||
|
|
@ -14,10 +15,10 @@
|
|||
limitations under the License.
|
||||
-->
|
||||
|
||||
<!-- small -->
|
||||
|
||||
<Button xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:layout_alignParentLeft="true"
|
||||
android:layout_marginTop="@dimen/setup_buttons_vertical_spacing"
|
||||
android:layout_marginLeft="48dip"
|
||||
style="@style/accountSetupButton" />
|
||||
<selector xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<item android:drawable="@drawable/ic_nav_arrow_right_disabled"
|
||||
android:state_enabled="false" />
|
||||
<item android:drawable="@drawable/ic_nav_arrow_right_pressed"
|
||||
android:state_pressed="true" />
|
||||
<item android:drawable="@drawable/ic_nav_arrow_right" />
|
||||
</selector>
|
||||
|
Before Width: | Height: | Size: 2.8 KiB After Width: | Height: | Size: 2.8 KiB |
|
Before Width: | Height: | Size: 2.7 KiB After Width: | Height: | Size: 2.7 KiB |
|
Before Width: | Height: | Size: 3.0 KiB After Width: | Height: | Size: 3.0 KiB |
|
Before Width: | Height: | Size: 3.1 KiB After Width: | Height: | Size: 3.1 KiB |
|
Before Width: | Height: | Size: 2.8 KiB After Width: | Height: | Size: 2.8 KiB |
|
Before Width: | Height: | Size: 3.1 KiB After Width: | Height: | Size: 3.1 KiB |
|
Before Width: | Height: | Size: 6.0 KiB After Width: | Height: | Size: 6.0 KiB |
|
Before Width: | Height: | Size: 5.5 KiB After Width: | Height: | Size: 5.5 KiB |
|
Before Width: | Height: | Size: 6.2 KiB After Width: | Height: | Size: 6.2 KiB |
|
Before Width: | Height: | Size: 5.9 KiB After Width: | Height: | Size: 5.9 KiB |
|
Before Width: | Height: | Size: 5.6 KiB After Width: | Height: | Size: 5.6 KiB |
|
Before Width: | Height: | Size: 6.2 KiB After Width: | Height: | Size: 6.2 KiB |
|
Before Width: | Height: | Size: 5.2 KiB After Width: | Height: | Size: 5.2 KiB |
|
Before Width: | Height: | Size: 5.1 KiB After Width: | Height: | Size: 5.1 KiB |
|
Before Width: | Height: | Size: 5.2 KiB After Width: | Height: | Size: 5.2 KiB |
|
Before Width: | Height: | Size: 5.3 KiB After Width: | Height: | Size: 5.3 KiB |
|
Before Width: | Height: | Size: 5.0 KiB After Width: | Height: | Size: 5.0 KiB |
|
Before Width: | Height: | Size: 5.2 KiB After Width: | Height: | Size: 5.2 KiB |
|
|
@ -1,9 +0,0 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
|
||||
<selector xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<item android:drawable="@drawable/ic_nav_arrow_back_disabled"
|
||||
android:state_enabled="false" />
|
||||
<item android:drawable="@drawable/ic_nav_arrow_back_pressed"
|
||||
android:state_pressed="true" />
|
||||
<item android:drawable="@drawable/ic_nav_arrow_back" />
|
||||
</selector>
|
||||
|
|
@ -1,9 +0,0 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
|
||||
<selector xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<item android:drawable="@drawable/ic_nav_arrow_forward_disabled"
|
||||
android:state_enabled="false" />
|
||||
<item android:drawable="@drawable/ic_nav_arrow_forward_pressed"
|
||||
android:state_pressed="true" />
|
||||
<item android:drawable="@drawable/ic_nav_arrow_forward" />
|
||||
</selector>
|
||||
|
|
@ -0,0 +1,24 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<!--
|
||||
Copyright (C) 2014 The Android Open Source Project
|
||||
|
||||
Licensed under the Apache License, Version 2.0 (the "License");
|
||||
you may not use this file except in compliance with the License.
|
||||
You may obtain a copy of the License at
|
||||
|
||||
http://www.apache.org/licenses/LICENSE-2.0
|
||||
|
||||
Unless required by applicable law or agreed to in writing, software
|
||||
distributed under the License is distributed on an "AS IS" BASIS,
|
||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
See the License for the specific language governing permissions and
|
||||
limitations under the License.
|
||||
-->
|
||||
|
||||
<selector xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<item android:drawable="@drawable/ic_nav_arrow_right_disabled"
|
||||
android:state_enabled="false" />
|
||||
<item android:drawable="@drawable/ic_nav_arrow_right_pressed"
|
||||
android:state_pressed="true" />
|
||||
<item android:drawable="@drawable/ic_nav_arrow_right" />
|
||||
</selector>
|
||||
|
|
@ -1,5 +1,6 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<!-- Copyright (C) 2010 The Android Open Source Project
|
||||
<!--
|
||||
Copyright (C) 2014 The Android Open Source Project
|
||||
|
||||
Licensed under the Apache License, Version 2.0 (the "License");
|
||||
you may not use this file except in compliance with the License.
|
||||
|
|
@ -14,11 +15,10 @@
|
|||
limitations under the License.
|
||||
-->
|
||||
|
||||
<!-- tablet, landscape -->
|
||||
<resources>
|
||||
<!-- Account Setup Activities -->
|
||||
<dimen name="setup_padding_top">16dip</dimen>
|
||||
<dimen name="setup_padding_left">128dip</dimen>
|
||||
<dimen name="setup_padding_right">128dip</dimen>
|
||||
</resources>
|
||||
|
||||
<selector xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<item android:drawable="@drawable/ic_nav_arrow_left_disabled"
|
||||
android:state_enabled="false" />
|
||||
<item android:drawable="@drawable/ic_nav_arrow_left_pressed"
|
||||
android:state_pressed="true" />
|
||||
<item android:drawable="@drawable/ic_nav_arrow_left" />
|
||||
</selector>
|
||||
|
|
@ -18,24 +18,20 @@
|
|||
android:layout_height="wrap_content">
|
||||
<!-- TODO: This file is basically pointless -->
|
||||
<ImageButton
|
||||
style="@style/accountSetupNavButton"
|
||||
style="@style/account_setup_nav_button"
|
||||
android:contentDescription="@string/previous_action"
|
||||
android:id="@+id/previous"
|
||||
android:layout_marginTop="@dimen/setup_buttons_padding_top"
|
||||
android:layout_marginRight="@dimen/setup_buttons_padding_right"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:src="@drawable/ic_nav_arrow_back_button"
|
||||
android:src="@drawable/ic_nav_arrow_previous_button"
|
||||
android:text="@string/previous_action"/>
|
||||
<ImageButton
|
||||
style="@style/accountSetupNavButton"
|
||||
style="@style/account_setup_nav_button"
|
||||
android:contentDescription="@string/next_action"
|
||||
android:id="@+id/next"
|
||||
android:layout_below="@+id/previous"
|
||||
android:layout_marginTop="@dimen/setup_buttons_vertical_spacing"
|
||||
android:layout_marginRight="@dimen/setup_buttons_padding_right"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:src="@drawable/ic_nav_arrow_forward_button"
|
||||
android:src="@drawable/ic_nav_arrow_next_button"
|
||||
android:text="@string/next_action"/>
|
||||
</RelativeLayout>
|
||||
|
|
|
|||
|
|
@ -18,39 +18,33 @@
|
|||
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:fillViewport="true"
|
||||
android:background="@drawable/account_setup_background" >
|
||||
android:fillViewport="true" >
|
||||
|
||||
<LinearLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:orientation="vertical"
|
||||
android:paddingTop="@dimen/setup_padding_top"
|
||||
android:paddingLeft="@dimen/setup_padding_left"
|
||||
android:paddingRight="@dimen/setup_padding_right"
|
||||
>
|
||||
android:orientation="vertical" >
|
||||
|
||||
<!-- Headline and hairline divider -->
|
||||
<!-- Set headline for first fragment, change in code as we progress through screens -->
|
||||
<TextView
|
||||
android:id="@+id/headline"
|
||||
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" />
|
||||
style="@style/account_setup_headline" />
|
||||
<View
|
||||
android:id="@+id/top_divider"
|
||||
android:layout_marginBottom="16dip"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="1px"
|
||||
android:background="@color/account_setup_divider_color" />
|
||||
style="@style/account_setup_top_divider" />
|
||||
|
||||
<!-- Primary Content -->
|
||||
<FrameLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:id="@+id/setup_fragment_content"/>
|
||||
android:id="@+id/setup_fragment_content"
|
||||
style="@style/account_setup_fragment_container"
|
||||
/>
|
||||
<View
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="0dp"
|
||||
|
|
|
|||
|
|
@ -16,48 +16,39 @@
|
|||
|
||||
<!-- Common data-entry area of initial account setup screen - email, password, default check -->
|
||||
<!-- tablet version -->
|
||||
<RelativeLayout
|
||||
<LinearLayout
|
||||
xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:orientation="vertical"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:paddingLeft="@dimen/setup_item_inset_left"
|
||||
android:paddingRight="@dimen/setup_item_inset_right"
|
||||
>
|
||||
<TextView
|
||||
android:id="@+id/instructions"
|
||||
android:layout_alignParentTop="true"
|
||||
android:layout_alignParentLeft="true"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginTop="16dip"
|
||||
android:text="@string/accounts_welcome"
|
||||
android:textAppearance="@style/accountSetupInfoText" />
|
||||
<LinearLayout
|
||||
android:id="@+id/email_input"
|
||||
android:paddingTop="16dip"
|
||||
android:orientation="horizontal"
|
||||
android:layout_below="@+id/instructions"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginTop="16dip">
|
||||
android:text="@string/accounts_welcome"
|
||||
android:textAppearance="@style/account_setup_info_text" />
|
||||
<LinearLayout
|
||||
android:paddingTop="16dip"
|
||||
android:orientation="horizontal"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content" >
|
||||
<TextView
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_marginRight="16dip"
|
||||
android:text="@string/account_setup_basics_email_label"
|
||||
android:textAppearance="@style/accountSetupLabelText" />
|
||||
style="@style/account_setup_label_text" />
|
||||
<EditText
|
||||
android:id="@+id/account_email"
|
||||
android:contentDescription="@string/account_setup_basics_email_label"
|
||||
android:layout_width="@dimen/setup_credentials_input_width"
|
||||
android:layout_height="wrap_content"
|
||||
android:contentDescription="@string/account_setup_basics_email_label"
|
||||
android:inputType="textEmailAddress"
|
||||
android:imeOptions="actionNext" />
|
||||
android:inputType="textEmailAddress" />
|
||||
</LinearLayout>
|
||||
<CheckBox
|
||||
android:id="@+id/manual_setup"
|
||||
android:layout_below="@+id/email_input"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_width="wrap_content"
|
||||
android:text="@string/account_setup_basics_manual_setup_action" />
|
||||
</RelativeLayout>
|
||||
</LinearLayout>
|
||||
|
|
|
|||
|
|
@ -28,7 +28,8 @@
|
|||
android:layout_height="wrap_content"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_marginRight="16dip"
|
||||
android:text="@string/account_setup_incoming_username_label" />
|
||||
android:text="@string/account_setup_incoming_username_label"
|
||||
style="@style/account_setup_label_text" />
|
||||
<EditText
|
||||
android:id="@+id/account_username"
|
||||
android:layout_width="wrap_content"
|
||||
|
|
@ -51,7 +52,8 @@
|
|||
<com.android.email.activity.setup.AuthenticationView
|
||||
android:id="@+id/authentication_view"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"/>
|
||||
android:layout_height="wrap_content"
|
||||
style="@style/account_setup_label_text" />
|
||||
</TableRow>
|
||||
|
||||
<include
|
||||
|
|
@ -67,7 +69,8 @@
|
|||
android:layout_height="wrap_content"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_marginRight="16dip"
|
||||
android:text="@string/account_setup_exchange_device_id_label" />
|
||||
android:text="@string/account_setup_exchange_device_id_label"
|
||||
style="@style/account_setup_label_text" />
|
||||
<!-- TODO - when adding back in styles, this should be slightly different (was "medium") -->
|
||||
<TextView
|
||||
android:id="@+id/device_id"
|
||||
|
|
@ -84,7 +87,8 @@
|
|||
android:layout_height="wrap_content"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_marginRight="16dip"
|
||||
android:text="@string/account_setup_incoming_server_label" />
|
||||
android:text="@string/account_setup_incoming_server_label"
|
||||
style="@style/account_setup_label_text" />
|
||||
<!-- Note: we use inputType=textUri as the closest approximation to a server name -->
|
||||
<EditText
|
||||
android:id="@+id/account_server"
|
||||
|
|
@ -100,7 +104,8 @@
|
|||
android:layout_height="wrap_content"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_marginRight="16dip"
|
||||
android:text="@string/account_setup_incoming_security_label" />
|
||||
android:text="@string/account_setup_incoming_security_label"
|
||||
style="@style/account_setup_label_text" />
|
||||
<Spinner
|
||||
android:id="@+id/account_security_type"
|
||||
android:layout_width="wrap_content"
|
||||
|
|
@ -113,7 +118,8 @@
|
|||
android:layout_height="wrap_content"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_marginRight="16dip"
|
||||
android:text="@string/account_setup_incoming_port_label" />
|
||||
android:text="@string/account_setup_incoming_port_label"
|
||||
style="@style/account_setup_label_text" />
|
||||
<EditText
|
||||
android:id="@+id/account_port"
|
||||
android:layout_width="wrap_content"
|
||||
|
|
@ -130,7 +136,8 @@
|
|||
android:layout_height="wrap_content"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_marginRight="16dip"
|
||||
android:text="@string/account_setup_incoming_delete_policy_label" />
|
||||
android:text="@string/account_setup_incoming_delete_policy_label"
|
||||
style="@style/account_setup_label_text" />
|
||||
<Spinner
|
||||
android:id="@+id/account_delete_policy"
|
||||
android:layout_width="wrap_content"
|
||||
|
|
@ -144,7 +151,8 @@
|
|||
android:layout_height="wrap_content"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_marginRight="16dip"
|
||||
android:text="@string/account_setup_incoming_imap_path_prefix_label" />
|
||||
android:text="@string/account_setup_incoming_imap_path_prefix_label"
|
||||
style="@style/account_setup_label_text" />
|
||||
<EditText
|
||||
android:id="@+id/imap_path_prefix"
|
||||
android:layout_width="wrap_content"
|
||||
|
|
|
|||
|
|
@ -20,8 +20,6 @@
|
|||
xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:paddingLeft="@dimen/setup_item_inset_left"
|
||||
android:paddingRight="@dimen/setup_item_inset_right"
|
||||
>
|
||||
<!-- Spinners in a table to line everything up nicely -->
|
||||
<TableLayout
|
||||
|
|
@ -37,7 +35,7 @@
|
|||
android:layout_width="wrap_content"
|
||||
android:layout_marginRight="16dip"
|
||||
android:text="@string/account_setup_options_mail_check_frequency_label"
|
||||
android:textColor="?android:attr/textColorPrimary" />
|
||||
style="@style/account_setup_label_text" />
|
||||
<Spinner
|
||||
android:id="@+id/account_check_frequency"
|
||||
android:layout_height="wrap_content"
|
||||
|
|
@ -53,7 +51,7 @@
|
|||
android:layout_width="wrap_content"
|
||||
android:layout_marginRight="16dip"
|
||||
android:text="@string/account_setup_options_mail_window_label"
|
||||
android:textColor="?android:attr/textColorPrimary" />
|
||||
style="@style/account_setup_label_text" />
|
||||
<Spinner
|
||||
android:id="@+id/account_sync_window"
|
||||
android:layout_height="wrap_content"
|
||||
|
|
|
|||
|
|
@ -28,7 +28,8 @@
|
|||
android:layout_height="wrap_content"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_marginRight="16dip"
|
||||
android:text="@string/account_setup_outgoing_smtp_server_label" />
|
||||
android:text="@string/account_setup_outgoing_smtp_server_label"
|
||||
style="@style/account_setup_label_text" />
|
||||
<!-- Note: we use inputType=textUri as the closest approximation to a server name -->
|
||||
<EditText
|
||||
android:id="@+id/account_server"
|
||||
|
|
@ -43,7 +44,8 @@
|
|||
android:layout_height="wrap_content"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_marginRight="16dip"
|
||||
android:text="@string/account_setup_outgoing_security_label" />
|
||||
android:text="@string/account_setup_outgoing_security_label"
|
||||
style="@style/account_setup_label_text" />
|
||||
<Spinner
|
||||
android:id="@+id/account_security_type"
|
||||
android:layout_width="wrap_content"
|
||||
|
|
@ -55,7 +57,8 @@
|
|||
android:layout_height="wrap_content"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_marginRight="16dip"
|
||||
android:text="@string/account_setup_outgoing_port_label" />
|
||||
android:text="@string/account_setup_outgoing_port_label"
|
||||
style="@style/account_setup_label_text" />
|
||||
<EditText
|
||||
android:id="@+id/account_port"
|
||||
android:layout_width="wrap_content"
|
||||
|
|
@ -94,7 +97,8 @@
|
|||
android:layout_height="wrap_content"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_marginRight="16dip"
|
||||
android:text="@string/account_setup_outgoing_username_label" />
|
||||
android:text="@string/account_setup_outgoing_username_label"
|
||||
style="@style/account_setup_label_text" />
|
||||
<EditText
|
||||
android:id="@+id/account_username"
|
||||
android:layout_width="wrap_content"
|
||||
|
|
@ -113,7 +117,8 @@
|
|||
android:layout_width="wrap_content"
|
||||
android:layout_marginRight="16dip"
|
||||
android:contentDescription="@string/authentication_label"
|
||||
android:text="@string/authentication_label" />
|
||||
android:text="@string/authentication_label"
|
||||
style="@style/account_setup_label_text" />
|
||||
<com.android.email.activity.setup.AuthenticationView
|
||||
android:id="@+id/authentication_view"
|
||||
android:layout_width="match_parent"
|
||||
|
|
|
|||
|
|
@ -18,39 +18,33 @@
|
|||
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:fillViewport="true"
|
||||
android:background="@drawable/account_setup_background" >
|
||||
android:fillViewport="true" >
|
||||
|
||||
<LinearLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:orientation="vertical"
|
||||
android:paddingTop="@dimen/setup_padding_top"
|
||||
android:paddingLeft="@dimen/setup_padding_left"
|
||||
android:paddingRight="@dimen/setup_padding_right"
|
||||
>
|
||||
android:orientation="vertical" >
|
||||
|
||||
<!-- Headline and hairline divider -->
|
||||
<!-- Set headline for first fragment, change in code as we progress through screens -->
|
||||
<TextView
|
||||
android:id="@+id/headline"
|
||||
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" />
|
||||
style="@style/account_setup_headline" />
|
||||
<View
|
||||
android:id="@+id/top_divider"
|
||||
android:layout_marginBottom="16dip"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="1px"
|
||||
android:background="@color/account_setup_divider_color" />
|
||||
style="@style/account_setup_top_divider" />
|
||||
|
||||
<!-- Primary fragment -->
|
||||
<!-- Primary Content -->
|
||||
<FrameLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:id="@+id/setup_fragment_content"/>
|
||||
android:id="@+id/setup_fragment_content"
|
||||
style="@style/account_setup_fragment_container"
|
||||
/>
|
||||
<View
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="0dp"
|
||||
|
|
|
|||
|
|
@ -1,36 +0,0 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<!-- Copyright (C) 2010 The Android Open Source Project
|
||||
|
||||
Licensed under the Apache License, Version 2.0 (the "License");
|
||||
you may not use this file except in compliance with the License.
|
||||
You may obtain a copy of the License at
|
||||
|
||||
http://www.apache.org/licenses/LICENSE-2.0
|
||||
|
||||
Unless required by applicable law or agreed to in writing, software
|
||||
distributed under the License is distributed on an "AS IS" BASIS,
|
||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
See the License for the specific language governing permissions and
|
||||
limitations under the License.
|
||||
-->
|
||||
|
||||
<!-- Account-type picker - tablet - see layout/ for small-screen version -->
|
||||
<RelativeLayout
|
||||
xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:id="@+id/accountTypes"
|
||||
android:layout_below="@+id/top_divider"
|
||||
android:layout_alignParentLeft="true"
|
||||
android:layout_marginRight="64dip"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content" >
|
||||
<TextView
|
||||
android:id="@+id/instructions"
|
||||
android:layout_alignParentTop="true"
|
||||
android:layout_alignParentLeft="true"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginTop="16dip"
|
||||
android:layout_marginLeft="16dip"
|
||||
android:text="@string/account_setup_account_type_instructions"
|
||||
android:textAppearance="@style/accountSetupInfoText" />
|
||||
</RelativeLayout>
|
||||
|
|
@ -20,8 +20,8 @@
|
|||
android:layout_height="match_parent"
|
||||
android:orientation="vertical"
|
||||
android:paddingTop="@dimen/setup_fragment_padding_top"
|
||||
android:paddingLeft="@dimen/setup_fragment_padding_left"
|
||||
android:paddingRight="@dimen/setup_fragment_padding_right" >
|
||||
android:paddingLeft="@dimen/setup_fragment_padding_side"
|
||||
android:paddingRight="@dimen/setup_fragment_padding_side" >
|
||||
|
||||
<FrameLayout
|
||||
android:id="@+id/account_credentials_fragment_container"
|
||||
|
|
|
|||
|
|
@ -23,13 +23,13 @@
|
|||
|
||||
<Button
|
||||
android:id="@+id/cancel"
|
||||
style="@style/accountSettingsButton"
|
||||
style="@style/account_settings_button"
|
||||
android:layout_width="0dip"
|
||||
android:layout_weight="1"
|
||||
android:text="@android:string/cancel" />
|
||||
<Button
|
||||
android:id="@+id/done"
|
||||
style="@style/accountSettingsButton"
|
||||
style="@style/account_settings_button"
|
||||
android:layout_width="0dip"
|
||||
android:layout_weight="1"
|
||||
android:text="@string/done_action" />
|
||||
|
|
|
|||
|
|
@ -27,8 +27,8 @@
|
|||
android:layout_height="wrap_content"
|
||||
android:orientation="vertical"
|
||||
android:paddingTop="@dimen/settings_fragment_padding_top"
|
||||
android:paddingLeft="@dimen/settings_fragment_padding_left"
|
||||
android:paddingRight="@dimen/settings_fragment_padding_right"
|
||||
android:paddingLeft="@dimen/settings_fragment_padding_side"
|
||||
android:paddingRight="@dimen/settings_fragment_padding_side"
|
||||
>
|
||||
|
||||
<!-- Fields entry -->
|
||||
|
|
|
|||
|
|
@ -27,8 +27,8 @@
|
|||
android:layout_height="wrap_content"
|
||||
android:orientation="vertical"
|
||||
android:paddingTop="@dimen/settings_fragment_padding_top"
|
||||
android:paddingLeft="@dimen/settings_fragment_padding_left"
|
||||
android:paddingRight="@dimen/settings_fragment_padding_right"
|
||||
android:paddingLeft="@dimen/settings_fragment_padding_side"
|
||||
android:paddingRight="@dimen/settings_fragment_padding_side"
|
||||
>
|
||||
|
||||
<!-- Fields entry -->
|
||||
|
|
|
|||
|
|
@ -18,6 +18,6 @@
|
|||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:fillViewport="true"
|
||||
android:background="@drawable/account_setup_background"
|
||||
style="@style/account_setup_activity"
|
||||
android:id="@+id/setup_fragment_container">
|
||||
</FrameLayout>
|
||||
|
|
|
|||
|
|
@ -16,36 +16,28 @@
|
|||
|
||||
<!-- Common data-entry area of initial account setup screen - email, password, default check -->
|
||||
<!-- small screen version -->
|
||||
<RelativeLayout
|
||||
<LinearLayout
|
||||
xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:orientation="vertical"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:paddingLeft="@dimen/setup_item_inset_left"
|
||||
android:paddingRight="@dimen/setup_item_inset_right"
|
||||
>
|
||||
<TextView
|
||||
android:id="@+id/instructions"
|
||||
android:layout_alignParentTop="true"
|
||||
android:layout_alignParentLeft="true"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginTop="10dip"
|
||||
android:textSize="20sp"
|
||||
android:text="@string/accounts_welcome"
|
||||
android:textAppearance="@style/accountSetupInfoText" />
|
||||
android:textAppearance="@style/account_setup_info_text" />
|
||||
<EditText
|
||||
android:id="@+id/account_email"
|
||||
android:hint="@string/account_setup_basics_email_label"
|
||||
android:inputType="textEmailAddress"
|
||||
android:imeOptions="actionNext"
|
||||
android:layout_below="@+id/instructions"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_width="match_parent" />
|
||||
android:inputType="textEmailAddress" />
|
||||
<CheckBox
|
||||
android:id="@+id/manual_setup"
|
||||
android:layout_below="@+id/account_email"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_width="wrap_content"
|
||||
android:text="@string/account_setup_basics_manual_setup_action" />
|
||||
|
||||
</RelativeLayout>
|
||||
</LinearLayout>
|
||||
|
|
|
|||
|
|
@ -14,26 +14,32 @@
|
|||
limitations under the License.
|
||||
-->
|
||||
|
||||
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginBottom="@dimen/setup_buttons_padding_bottom">
|
||||
android:paddingTop="@dimen/setup_nav_button_padding_top"
|
||||
android:paddingLeft="@dimen/setup_nav_button_padding_side"
|
||||
android:paddingRight="@dimen/setup_nav_button_padding_side"
|
||||
android:paddingBottom="@dimen/setup_nav_button_padding_bottom"
|
||||
android:orientation="horizontal">
|
||||
<ImageButton
|
||||
style="@style/accountSetupNavButton"
|
||||
style="@style/account_setup_nav_button"
|
||||
android:contentDescription="@string/previous_action"
|
||||
android:id="@+id/previous"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_width="wrap_content"
|
||||
android:src="@drawable/ic_nav_arrow_back_button"
|
||||
android:text="@string/next_action"
|
||||
android:layout_alignParentLeft="true"/>
|
||||
android:src="@drawable/ic_nav_arrow_previous_button"
|
||||
android:text="@string/next_action" />
|
||||
<View
|
||||
android:layout_height="match_parent"
|
||||
android:layout_width="0dp"
|
||||
android:layout_weight="1" />
|
||||
<ImageButton
|
||||
style="@style/accountSetupNavButton"
|
||||
style="@style/account_setup_nav_button"
|
||||
android:contentDescription="@string/next_action"
|
||||
android:id="@+id/next"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_width="wrap_content"
|
||||
android:src="@drawable/ic_nav_arrow_forward_button"
|
||||
android:text="@string/next_action"
|
||||
android:layout_alignParentRight="true"/>
|
||||
</RelativeLayout>
|
||||
android:src="@drawable/ic_nav_arrow_next_button"
|
||||
android:text="@string/next_action" />
|
||||
</LinearLayout>
|
||||
|
|
|
|||
|
|
@ -17,8 +17,8 @@
|
|||
xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:layout_weight="1"
|
||||
android:orientation="vertical">
|
||||
android:orientation="vertical"
|
||||
>
|
||||
|
||||
<TextView
|
||||
android:id="@+id/wrong_password_warning_label"
|
||||
|
|
|
|||
|
|
@ -25,8 +25,7 @@
|
|||
android:text="@string/account_setup_incoming_username_label"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_width="match_parent"
|
||||
android:textAppearance="?android:attr/textAppearanceSmall"
|
||||
android:textColor="?android:attr/textColorPrimary" />
|
||||
style="@style/account_setup_label_text" />
|
||||
<EditText
|
||||
android:id="@+id/account_username"
|
||||
android:layout_height="wrap_content"
|
||||
|
|
@ -73,8 +72,7 @@
|
|||
android:text="@string/account_setup_incoming_server_label"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_width="match_parent"
|
||||
android:textAppearance="?android:attr/textAppearanceSmall"
|
||||
android:textColor="?android:attr/textColorPrimary" />
|
||||
style="@style/account_setup_label_text" />
|
||||
<!-- Note: we use inputType=textUri as the closest approximation to a server name -->
|
||||
<!-- This contentDescription may be changed in code if the server is IMAP, etc. -->
|
||||
<EditText
|
||||
|
|
@ -88,8 +86,7 @@
|
|||
android:text="@string/account_setup_incoming_port_label"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_width="match_parent"
|
||||
android:textAppearance="?android:attr/textAppearanceSmall"
|
||||
android:textColor="?android:attr/textColorPrimary" />
|
||||
style="@style/account_setup_label_text" />
|
||||
<EditText
|
||||
android:id="@+id/account_port"
|
||||
android:layout_height="wrap_content"
|
||||
|
|
@ -101,8 +98,7 @@
|
|||
android:text="@string/account_setup_incoming_security_label"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_width="match_parent"
|
||||
android:textAppearance="?android:attr/textAppearanceSmall"
|
||||
android:textColor="?android:attr/textColorPrimary" />
|
||||
style="@style/account_setup_label_text" />
|
||||
<Spinner
|
||||
android:id="@+id/account_security_type"
|
||||
android:layout_height="wrap_content"
|
||||
|
|
@ -113,8 +109,7 @@
|
|||
android:text="@string/account_setup_incoming_delete_policy_label"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_width="match_parent"
|
||||
android:textAppearance="?android:attr/textAppearanceSmall"
|
||||
android:textColor="?android:attr/textColorPrimary" />
|
||||
style="@style/account_setup_label_text" />
|
||||
<Spinner
|
||||
android:id="@+id/account_delete_policy"
|
||||
android:layout_height="wrap_content"
|
||||
|
|
@ -130,8 +125,7 @@
|
|||
android:text="@string/account_setup_incoming_imap_path_prefix_label"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_width="match_parent"
|
||||
android:textAppearance="?android:attr/textAppearanceSmall"
|
||||
android:textColor="?android:attr/textColorPrimary" />
|
||||
style="@style/account_setup_label_text" />
|
||||
<EditText
|
||||
android:id="@+id/imap_path_prefix"
|
||||
android:layout_height="wrap_content"
|
||||
|
|
|
|||
|
|
@ -22,8 +22,7 @@
|
|||
android:layout_height="wrap_content"
|
||||
android:layout_width="match_parent"
|
||||
android:text="@string/account_setup_names_account_name_label"
|
||||
android:textAppearance="?android:attr/textAppearanceSmall"
|
||||
android:textColor="?android:attr/textColorPrimary" />
|
||||
style="@style/account_setup_label_text" />
|
||||
<EditText
|
||||
android:id="@+id/account_description"
|
||||
android:layout_height="wrap_content"
|
||||
|
|
@ -36,8 +35,7 @@
|
|||
android:layout_height="wrap_content"
|
||||
android:layout_width="match_parent"
|
||||
android:text="@string/account_setup_names_user_name_label"
|
||||
android:textAppearance="?android:attr/textAppearanceSmall"
|
||||
android:textColor="?android:attr/textColorPrimary" />
|
||||
style="@style/account_setup_label_text" />
|
||||
<EditText
|
||||
android:id="@+id/account_name"
|
||||
android:layout_height="wrap_content"
|
||||
|
|
|
|||
|
|
@ -18,20 +18,16 @@
|
|||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:orientation="vertical"
|
||||
android:paddingTop="@dimen/setup_fragment_padding_top"
|
||||
android:paddingLeft="@dimen/setup_fragment_padding_left"
|
||||
android:paddingRight="@dimen/setup_fragment_padding_right" >
|
||||
>
|
||||
<TextView
|
||||
android:text="@string/account_setup_options_mail_check_frequency_label"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_width="match_parent"
|
||||
android:textAppearance="?android:attr/textAppearanceSmall"
|
||||
android:textColor="?android:attr/textColorPrimary" />
|
||||
style="@style/account_setup_label_text" />
|
||||
<Spinner
|
||||
android:id="@+id/account_check_frequency"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_width="match_parent" />
|
||||
<!-- TODO quick fix - phone UX still TBD -->
|
||||
<LinearLayout
|
||||
android:id="@+id/account_sync_window_row"
|
||||
android:layout_width="match_parent"
|
||||
|
|
@ -43,8 +39,7 @@
|
|||
android:text="@string/account_setup_options_mail_window_label"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_width="match_parent"
|
||||
android:textAppearance="?android:attr/textAppearanceSmall"
|
||||
android:textColor="?android:attr/textColorPrimary" />
|
||||
style="@style/account_setup_label_text" />
|
||||
<Spinner
|
||||
android:id="@+id/account_sync_window"
|
||||
android:layout_height="wrap_content"
|
||||
|
|
|
|||
|
|
@ -24,8 +24,7 @@
|
|||
android:text="@string/account_setup_outgoing_smtp_server_label"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_width="match_parent"
|
||||
android:textAppearance="?android:attr/textAppearanceSmall"
|
||||
android:textColor="?android:attr/textColorPrimary" />
|
||||
style="@style/account_setup_label_text" />
|
||||
<!-- Note: we use inputType=textUri as the closest approximation to a server name -->
|
||||
<EditText
|
||||
android:id="@+id/account_server"
|
||||
|
|
@ -37,8 +36,7 @@
|
|||
android:text="@string/account_setup_outgoing_port_label"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_width="match_parent"
|
||||
android:textAppearance="?android:attr/textAppearanceSmall"
|
||||
android:textColor="?android:attr/textColorPrimary" />
|
||||
style="@style/account_setup_label_text" />
|
||||
<EditText
|
||||
android:id="@+id/account_port"
|
||||
android:inputType="number"
|
||||
|
|
@ -49,8 +47,7 @@
|
|||
android:text="@string/account_setup_outgoing_security_label"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_width="match_parent"
|
||||
android:textAppearance="?android:attr/textAppearanceSmall"
|
||||
android:textColor="?android:attr/textColorPrimary" />
|
||||
style="@style/account_setup_label_text" />
|
||||
<Spinner
|
||||
android:id="@+id/account_security_type"
|
||||
android:layout_height="wrap_content"
|
||||
|
|
@ -70,8 +67,7 @@
|
|||
android:text="@string/account_setup_outgoing_username_label"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_width="match_parent"
|
||||
android:textAppearance="?android:attr/textAppearanceSmall"
|
||||
android:textColor="?android:attr/textColorPrimary" />
|
||||
style="@style/account_setup_label_text" />
|
||||
<EditText
|
||||
android:id="@+id/account_username"
|
||||
android:inputType="textEmailAddress"
|
||||
|
|
|
|||
|
|
@ -18,33 +18,35 @@
|
|||
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:fillViewport="true"
|
||||
android:background="@drawable/account_setup_background" >
|
||||
android:fillViewport="true" >
|
||||
|
||||
<LinearLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:orientation="vertical"
|
||||
android:paddingTop="@dimen/setup_fragment_padding_top"
|
||||
android:paddingLeft="@dimen/setup_fragment_padding_left"
|
||||
android:paddingRight="@dimen/setup_fragment_padding_right" >
|
||||
android:orientation="vertical" >
|
||||
|
||||
<!-- Headline -->
|
||||
<!-- Set headline for first fragment, change in code as we progress through screens -->
|
||||
<TextView
|
||||
android:id="@+id/headline"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_width="wrap_content"
|
||||
android:text="@string/account_setup_options_headline"
|
||||
android:textAppearance="?android:attr/textAppearanceMedium"
|
||||
android:textColor="?android:attr/textColorPrimary" />
|
||||
style="@style/account_setup_headline" />
|
||||
|
||||
<!-- Primary Content -->
|
||||
<FrameLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:id="@+id/setup_fragment_content"/>
|
||||
android:id="@+id/setup_fragment_content"
|
||||
style="@style/account_setup_fragment_container"
|
||||
/>
|
||||
<View
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="0dp"
|
||||
android:layout_weight="1"/>
|
||||
|
||||
<!-- Buttons below that -->
|
||||
<include layout="@layout/account_setup_buttons"/>
|
||||
</LinearLayout>
|
||||
</ScrollView>
|
||||
|
|
|
|||
|
|
@ -19,14 +19,13 @@
|
|||
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:id="@+id/accountTypes"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:orientation="vertical"
|
||||
>
|
||||
<TextView
|
||||
android:text="@string/account_setup_account_type_instructions"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_width="match_parent"
|
||||
android:textAppearance="?android:attr/textAppearanceMedium"
|
||||
android:textColor="?android:attr/textColorPrimary"
|
||||
android:layout_width="wrap_content"
|
||||
style="@style/account_setup_info_text"
|
||||
/>
|
||||
</LinearLayout>
|
||||
|
|
|
|||
|
|
@ -19,9 +19,9 @@
|
|||
<Button xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:id="@+id/button"
|
||||
android:text="@string/account_setup_options_mail_window_auto"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_width="150sp"
|
||||
android:layout_marginTop="25dip"
|
||||
android:minWidth="@dimen/button_minWidth"
|
||||
android:layout_height="@dimen/setup_account_type_buttons_height"
|
||||
android:layout_width="@dimen/setup_account_type_buttons_width"
|
||||
android:layout_marginTop="@dimen/setup_account_type_buttons_vertical_spacing"
|
||||
android:minWidth="@dimen/setup_account_type_button_min_width"
|
||||
android:layout_gravity="center_horizontal"
|
||||
/>
|
||||
|
|
|
|||
|
|
@ -25,30 +25,26 @@
|
|||
|
||||
<Button
|
||||
android:id="@+id/select_button"
|
||||
style="@style/accountSetupButton"
|
||||
style="@style/client_certificate_button"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_alignParentRight="true"
|
||||
android:text="@string/account_setup_exchange_use_certificate" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/title"
|
||||
style="@style/client_certificate_title"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_alignParentTop="true"
|
||||
android:layout_alignParentLeft="true"
|
||||
android:layout_toLeftOf="@+id/select_button"
|
||||
android:textStyle="bold"
|
||||
android:text="@string/account_setup_exchange_certificate_title" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/certificate_alias"
|
||||
style="@style/client_certificate_alias"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginLeft="16dip"
|
||||
android:layout_below="@+id/title"
|
||||
android:layout_alignParentLeft="true"
|
||||
android:layout_toLeftOf="@+id/select_button"
|
||||
android:textColor="@color/text_secondary_color"
|
||||
android:singleLine="true"
|
||||
android:ellipsize="end"
|
||||
|
|
|
|||
|
|
@ -28,7 +28,7 @@
|
|||
android:id="@+id/quick_response_text"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="match_parent"
|
||||
style="@style/accountSetupInfoText"
|
||||
style="@style/account_setup_info_text"
|
||||
android:ellipsize="end"
|
||||
android:focusable="false"
|
||||
android:maxLines="2"
|
||||
|
|
|
|||
|
|
@ -0,0 +1,39 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<!--
|
||||
Copyright (C) 2014 The Android Open Source Project
|
||||
|
||||
Licensed under the Apache License, Version 2.0 (the "License");
|
||||
you may not use this file except in compliance with the License.
|
||||
You may obtain a copy of the License at
|
||||
|
||||
http://www.apache.org/licenses/LICENSE-2.0
|
||||
|
||||
Unless required by applicable law or agreed to in writing, software
|
||||
distributed under the License is distributed on an "AS IS" BASIS,
|
||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
See the License for the specific language governing permissions and
|
||||
limitations under the License.
|
||||
-->
|
||||
|
||||
<resources>
|
||||
<!-- Client certificate UI -->
|
||||
<!-- Client certificate 'select' button, see also styles.xml -->
|
||||
<style name="client_certificate_button"
|
||||
parent="account_setup_text_button">
|
||||
<item name="android:layout_alignParentEnd">true</item>
|
||||
</style>
|
||||
|
||||
<!-- Client certificate title, see also styles.xml -->
|
||||
<style name="client_certificate_title">
|
||||
<item name="android:layout_alignParentStart">true</item>
|
||||
<item name="android:layout_toStartOf">@+id/select_button</item>
|
||||
</style>
|
||||
|
||||
<!-- 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>
|
||||
|
||||
</resources>
|
||||
|
|
@ -1,49 +0,0 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<!-- Copyright (C) 2011 The Android Open Source Project
|
||||
|
||||
Licensed under the Apache License, Version 2.0 (the "License");
|
||||
you may not use this file except in compliance with the License.
|
||||
You may obtain a copy of the License at
|
||||
|
||||
http://www.apache.org/licenses/LICENSE-2.0
|
||||
|
||||
Unless required by applicable law or agreed to in writing, software
|
||||
distributed under the License is distributed on an "AS IS" BASIS,
|
||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
See the License for the specific language governing permissions and
|
||||
limitations under the License.
|
||||
-->
|
||||
|
||||
<!-- tablet -->
|
||||
<resources>
|
||||
<!-- Account Setup Activities -->
|
||||
<!-- inset distance for setup/settings buttons -->
|
||||
<dimen name="setup_buttons_padding_left">16dip</dimen>
|
||||
<dimen name="setup_buttons_padding_right">16dip</dimen>
|
||||
<!-- distance of any button below the upper hairline -->
|
||||
<dimen name="setup_buttons_padding_top">64dip</dimen>
|
||||
<!-- distance of any button below the previous button (vertical stack) -->
|
||||
<dimen name="setup_buttons_vertical_spacing">48dip</dimen>
|
||||
<!-- distance of any button above the bottom of the screen -->
|
||||
<dimen name="setup_buttons_padding_bottom">48dip</dimen>
|
||||
|
||||
<!-- Account settings fragments -->
|
||||
<dimen name="settings_fragment_padding_top">32dip</dimen>
|
||||
<dimen name="settings_fragment_padding_left">32dip</dimen>
|
||||
<dimen name="settings_fragment_padding_right">32dip</dimen>
|
||||
|
||||
<!-- On tablets, we don't need additional padding in setup mode since the
|
||||
base settings fragments that are reused already have padding. -->
|
||||
<dimen name="setup_fragment_padding_top">0dip</dimen>
|
||||
<dimen name="setup_fragment_padding_left">0dip</dimen>
|
||||
<dimen name="setup_fragment_padding_right">0dip</dimen>
|
||||
|
||||
<!-- In setup screens, the inset for all items below the headline+hairline -->
|
||||
<dimen name="setup_item_inset_left">16dip</dimen>
|
||||
<dimen name="setup_item_inset_right">64dip</dimen>
|
||||
|
||||
<!-- Account Setup Activities -->
|
||||
<dimen name="setup_padding_top">16dip</dimen>
|
||||
<dimen name="setup_padding_left">64dip</dimen>
|
||||
<dimen name="setup_padding_right">64dip</dimen>
|
||||
</resources>
|
||||
|
|
@ -1,44 +0,0 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<!-- Copyright (C) 2010 The Android Open Source Project
|
||||
|
||||
Licensed under the Apache License, Version 2.0 (the "License");
|
||||
you may not use this file except in compliance with the License.
|
||||
You may obtain a copy of the License at
|
||||
|
||||
http://www.apache.org/licenses/LICENSE-2.0
|
||||
|
||||
Unless required by applicable law or agreed to in writing, software
|
||||
distributed under the License is distributed on an "AS IS" BASIS,
|
||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
See the License for the specific language governing permissions and
|
||||
limitations under the License.
|
||||
-->
|
||||
|
||||
<!-- Specializations for tablet screens - most colors are in values/colors.xml -->
|
||||
<resources>
|
||||
<!-- The large headline at the top of every account setup screen -->
|
||||
<style name="accountSetupHeadline">
|
||||
<item name="android:textSize">30sp</item>
|
||||
<item name="android:textColor">@color/account_setup_headline_color</item>
|
||||
</style>
|
||||
|
||||
<!-- Item labels in any account setup screen -->
|
||||
<style name="accountSetupLabelText">
|
||||
<item name="android:textSize">14sp</item>
|
||||
<item name="android:textColor">@color/account_setup_label_text_color</item>
|
||||
</style>
|
||||
|
||||
<!-- Wizard buttons on the account setup screens -->
|
||||
<style name="accountSetupButton">
|
||||
<item name="android:layout_width">208sp</item>
|
||||
<item name="android:layout_height">48sp</item>
|
||||
<item name="android:textSize">18sp</item>
|
||||
</style>
|
||||
|
||||
<!-- Cancel/Done buttons on the account settings (server settings) fragments -->
|
||||
<style name="accountSettingsButton">
|
||||
<item name="android:layout_width">208sp</item>
|
||||
<item name="android:layout_height">48sp</item>
|
||||
<item name="android:textSize">18sp</item>
|
||||
</style>
|
||||
</resources>
|
||||
|
|
@ -0,0 +1,33 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<!-- Copyright (C) 2010 The Android Open Source Project
|
||||
|
||||
Licensed under the Apache License, Version 2.0 (the "License");
|
||||
you may not use this file except in compliance with the License.
|
||||
You may obtain a copy of the License at
|
||||
|
||||
http://www.apache.org/licenses/LICENSE-2.0
|
||||
|
||||
Unless required by applicable law or agreed to in writing, software
|
||||
distributed under the License is distributed on an "AS IS" BASIS,
|
||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
See the License for the specific language governing permissions and
|
||||
limitations under the License.
|
||||
-->
|
||||
|
||||
<resources>
|
||||
|
||||
<!-- Account settings fragments -->
|
||||
<dimen name="settings_fragment_padding_top">32dp</dimen>
|
||||
<dimen name="settings_fragment_padding_side">32dp</dimen>
|
||||
<dimen name="settings_fragment_padding_bottom">24dp</dimen>
|
||||
|
||||
<!-- Account setup text buttons -->
|
||||
<dimen name="setup_text_button_width">208sp</dimen>
|
||||
<dimen name="setup_text_button_height">48sp</dimen>
|
||||
<dimen name="setup_text_button_text_size">20sp</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>
|
||||
|
||||
</resources>
|
||||
|
|
@ -17,40 +17,55 @@
|
|||
<!-- non-xlarge -->
|
||||
|
||||
<resources>
|
||||
<dimen name="button_minWidth">100sp</dimen>
|
||||
|
||||
<!-- Account Setup Activities -->
|
||||
<!-- inset distance for setup/settings buttons -->
|
||||
<dimen name="setup_buttons_padding_left">16dip</dimen>
|
||||
<dimen name="setup_buttons_padding_right">16dip</dimen>
|
||||
<!-- distance of any button below the upper hairline -->
|
||||
<dimen name="setup_buttons_padding_top">64dip</dimen>
|
||||
<!-- distance of any button below the previous button (vertical stack) -->
|
||||
<dimen name="setup_buttons_vertical_spacing">48dip</dimen>
|
||||
<!-- distance of any button above the bottom of the screen -->
|
||||
<dimen name="setup_buttons_padding_bottom">48dip</dimen>
|
||||
<!-- Account setup type screen buttons -->
|
||||
<dimen name="setup_account_type_button_min_width">100sp</dimen>
|
||||
<dimen name="setup_account_type_buttons_vertical_spacing">16dp</dimen>
|
||||
<dimen name="setup_account_type_buttons_width">212sp</dimen>
|
||||
<dimen name="setup_account_type_buttons_height">54dp</dimen>
|
||||
|
||||
<!-- Account settings fragments -->
|
||||
<dimen name="settings_fragment_padding_top">16dip</dimen>
|
||||
<dimen name="settings_fragment_padding_left">16dip</dimen>
|
||||
<dimen name="settings_fragment_padding_right">16dip</dimen>
|
||||
<dimen name="settings_fragment_padding_top">16dp</dimen>
|
||||
<dimen name="settings_fragment_padding_side">16dp</dimen>
|
||||
<dimen name="settings_fragment_padding_bottom">24dp</dimen>
|
||||
|
||||
<!-- Account setup fragments -->
|
||||
<dimen name="setup_fragment_padding_top">16dip</dimen>
|
||||
<dimen name="setup_fragment_padding_left">16dip</dimen>
|
||||
<dimen name="setup_fragment_padding_right">16dip</dimen>
|
||||
<dimen name="setup_fragment_padding_top">16dp</dimen>
|
||||
<dimen name="setup_fragment_padding_side">16dp</dimen>
|
||||
<dimen name="setup_fragment_padding_bottom">16dp</dimen>
|
||||
|
||||
<!-- Account setup navigation buttons -->
|
||||
<dimen name="setup_nav_button_padding_top">24dp</dimen>
|
||||
<dimen name="setup_nav_button_padding_side">20dp</dimen>
|
||||
<dimen name="setup_nav_button_padding_bottom">24dp</dimen>
|
||||
|
||||
<!-- Account setup text buttons -->
|
||||
<dimen name="setup_text_button_width">160sp</dimen>
|
||||
<dimen name="setup_text_button_height">40sp</dimen>
|
||||
<dimen name="setup_text_button_text_size">18sp</dimen>
|
||||
|
||||
<!-- Account setup headline -->
|
||||
<dimen name="setup_headline_text_size">30sp</dimen>
|
||||
<dimen name="setup_headline_padding_top">24dp</dimen>
|
||||
<dimen name="setup_headline_padding_side">24dp</dimen>
|
||||
|
||||
<!-- Account setup hairline -->
|
||||
<dimen name="setup_top_divider_margin_top">8dp</dimen>
|
||||
<dimen name="setup_top_divider_margin_bottom">16dp</dimen>
|
||||
<dimen name="setup_top_divider_margin_side">24dp</dimen>
|
||||
|
||||
<!-- inset distance for settings buttons -->
|
||||
<dimen name="settings_buttons_padding_top">48dip</dimen>
|
||||
<dimen name="settings_buttons_padding_bottom">48dip</dimen>
|
||||
<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_left">0dip</dimen>
|
||||
<dimen name="setup_item_inset_right">0dip</dimen>
|
||||
<dimen name="setup_item_inset_start">0dp</dimen>
|
||||
<dimen name="setup_item_inset_end">0dp</dimen>
|
||||
|
||||
<!-- Username/password entry -->
|
||||
<dimen name="setup_credentials_input_width">340dip</dimen>
|
||||
<dimen name="setup_credentials_input_width">340dp</dimen>
|
||||
|
||||
<!-- TODO: probably delete these -->
|
||||
<!-- Notification dialog -->
|
||||
<dimen name="dialog_text_size">10sp</dimen>
|
||||
<dimen name="dialog_padding_left">10sp</dimen>
|
||||
|
|
|
|||
|
|
@ -14,42 +14,89 @@
|
|||
limitations under the License.
|
||||
-->
|
||||
|
||||
<!-- non-xlarge. See also values-xlarge for specializations for xlarge screens -->
|
||||
<resources>
|
||||
<!-- Account Setup Activity -->
|
||||
<style name="account_setup_activity">
|
||||
<item name="android:background">@drawable/account_setup_background</item>
|
||||
</style>
|
||||
|
||||
<!-- The large headline at the top of every account setup screen -->
|
||||
<!-- TODO these are estimates for the phone UX - final sizes TBD -->
|
||||
<style name="accountSetupHeadline">
|
||||
<item name="android:textSize">22sp</item>
|
||||
<style name="account_setup_headline">
|
||||
<item name="android:textSize">@dimen/setup_headline_text_size</item>
|
||||
<item name="android:textColor">@color/account_setup_headline_color</item>
|
||||
<item name="android:paddingTop">@dimen/setup_headline_padding_top</item>
|
||||
<item name="android:paddingLeft">@dimen/setup_headline_padding_side</item>
|
||||
<item name="android:paddingRight">@dimen/setup_headline_padding_side</item>
|
||||
</style>
|
||||
|
||||
<!-- The divider hairline below the headline in account setup screens -->
|
||||
<style name="account_setup_top_divider">
|
||||
<item name="android:layout_marginTop">@dimen/setup_top_divider_margin_top</item>
|
||||
<item name="android:layout_marginLeft">@dimen/setup_top_divider_margin_side</item>
|
||||
<item name="android:layout_marginRight">@dimen/setup_top_divider_margin_side</item>
|
||||
<item name="android:layout_marginBottom">@dimen/setup_top_divider_margin_bottom</item>
|
||||
<item name="android:background">@color/account_setup_divider_color</item>
|
||||
<item name="android:layout_height">1px</item>
|
||||
</style>
|
||||
|
||||
<style name="account_setup_fragment_container">
|
||||
<item name="android:paddingTop">@dimen/setup_fragment_padding_top</item>
|
||||
<item name="android:paddingLeft">@dimen/setup_fragment_padding_side</item>
|
||||
<item name="android:paddingRight">@dimen/setup_fragment_padding_side</item>
|
||||
<item name="android:paddingBottom">@dimen/setup_fragment_padding_bottom</item>
|
||||
</style>
|
||||
|
||||
<!-- Wizard buttons on the account setup screens -->
|
||||
<!-- TODO these are estimates for the phone UX - final sizes TBD -->
|
||||
<style name="accountSetupButton">
|
||||
<item name="android:layout_width">160sp</item>
|
||||
<item name="android:layout_height">40sp</item>
|
||||
<style name="account_setup_text_button">
|
||||
<item name="android:layout_width">@dimen/setup_text_button_width</item>
|
||||
<item name="android:layout_height">@dimen/setup_text_button_height</item>
|
||||
<item name="android:textColor">?android:attr/textColorPrimary</item>
|
||||
<item name="android:textAppearance">?android:attr/textAppearanceSmall</item>
|
||||
<item name="android:textSize">@dimen/setup_text_button_text_size</item>
|
||||
</style>
|
||||
|
||||
<!-- Navigation buttons on the account setup screens -->
|
||||
<style name="accountSetupNavButton">
|
||||
<style name="account_setup_nav_button">
|
||||
<item name="android:background">@android:color/transparent</item>
|
||||
</style>
|
||||
|
||||
<!-- Cancel/Done buttons on the account settings (server settings) fragments -->
|
||||
<style name="accountSettingsButton">
|
||||
<item name="android:layout_width">160sp</item>
|
||||
<style name="account_settings_button">
|
||||
<item name="android:layout_width">@dimen/setup_text_button_width</item>
|
||||
<item name="android:layout_height">40sp</item>
|
||||
<item name="android:textColor">?android:attr/textColorPrimary</item>
|
||||
<item name="android:textSize">@dimen/setup_text_button_text_size</item>
|
||||
</style>
|
||||
|
||||
<!-- Info text in any account setup screen -->
|
||||
<style name="account_setup_info_text">
|
||||
<item name="android:textSize">20sp</item>
|
||||
<item name="android:textColor">@color/account_setup_info_text_color</item>
|
||||
</style>
|
||||
|
||||
<!-- Account setup row label text -->
|
||||
<style name="account_setup_label_text">
|
||||
<item name="android:textColor">?android:attr/textColorPrimary</item>
|
||||
<item name="android:textAppearance">?android:attr/textAppearanceSmall</item>
|
||||
</style>
|
||||
|
||||
<!-- Info text in any account setup screen -->
|
||||
<style name="accountSetupInfoText">
|
||||
<item name="android:textSize">18sp</item>
|
||||
<item name="android:textColor">@color/account_setup_info_text_color</item>
|
||||
<!-- Client certificate UI. See also values in styles-ldrtl.xml -->
|
||||
<!-- Client certificate 'select' button, see also styles-ldrtl.xml -->
|
||||
<style name="client_certificate_button"
|
||||
parent="account_setup_text_button">
|
||||
<item name="android:layout_alignParentRight">true</item>
|
||||
</style>
|
||||
|
||||
<!-- Client certificate title, see also styles-ldrtl.xml -->
|
||||
<style name="client_certificate_title">
|
||||
<item name="android:layout_alignParentLeft">true</item>
|
||||
<item name="android:layout_toLeftOf">@id/select_button</item>
|
||||
</style>
|
||||
|
||||
<!-- 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>
|
||||
</resources>
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue