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

Merge "Move nav buttons to left and right on account setup flow" into ub-mail-algol

This commit is contained in:
Tony Mantler 2014-03-28 17:29:38 +00:00 committed by Android (Google) Code Review
parent 5057d6dffb a1916415fa
commit 0f151d5fb5
8 changed files with 89 additions and 92 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
res/layout-w1000dp/account_setup_buttons.xml
View File

@ -1,37 +0,0 @@
<?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.
-->
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="wrap_content"
android:layout_height="wrap_content">
<!-- TODO: This file is basically pointless -->
<ImageButton
style="@style/account_setup_nav_button"
android:contentDescription="@string/previous_action"
android:id="@+id/previous"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/ic_nav_arrow_previous_button"
android:text="@string/previous_action"/>
<ImageButton
style="@style/account_setup_nav_button"
android:contentDescription="@string/next_action"
android:id="@+id/next"
android:layout_below="@+id/previous"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/ic_nav_arrow_next_button"
android:text="@string/next_action"/>
</RelativeLayout>

53
res/layout-w1000dp/account_setup_template.xml
View File

@ -1,53 +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 Names - XL - portrait - see layout/ for small-screen version -->
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:fillViewport="true" >
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
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_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/account_setup_options_headline"
style="@style/account_setup_headline" />
<!-- Primary Content -->
<FrameLayout
android:layout_width="match_parent"
android:layout_height="wrap_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 -->
<!-- TODO: buttons on either side -->
<include layout="@layout/account_setup_buttons" />
</LinearLayout>
</ScrollView>

84
res/layout-w800dp/account_setup_template.xml Normal file
View File

@ -0,0 +1,84 @@
<?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 Names - XL - portrait - see layout/ for small-screen version -->
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="horizontal"
android:background="@color/account_setup_xlarge_background_color" >
<!-- Spacer view -->
<View
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"/>
<ImageButton
style="@style/account_setup_nav_button"
android:contentDescription="@string/previous_action"
android:id="@+id/previous"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingLeft="@dimen/setup_nav_button_padding_side"
android:paddingRight="@dimen/setup_nav_button_padding_side"
android:src="@drawable/ic_nav_arrow_previous_button"
android:text="@string/previous_action"
android:layout_gravity="center_vertical" />
<ScrollView
style="@style/account_setup_content"
android:layout_width="@dimen/setup_template_content_width"
android:layout_height="match_parent"
android:fillViewport="true" >
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
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_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/account_setup_options_headline"
style="@style/account_setup_headline" />
<!-- Primary Content -->
<FrameLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:id="@+id/setup_fragment_content"
style="@style/account_setup_fragment_container"
/>
</LinearLayout>
</ScrollView>
<ImageButton
style="@style/account_setup_nav_button"
android:contentDescription="@string/next_action"
android:id="@+id/next"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingLeft="@dimen/setup_nav_button_padding_side"
android:paddingRight="@dimen/setup_nav_button_padding_side"
android:src="@drawable/ic_nav_arrow_next_button"
android:text="@string/next_action"
android:layout_gravity="center_vertical"/>
<!-- Spacer view -->
<View
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"/>
</LinearLayout>

1
res/layout/account_setup_activity.xml
View File

@ -18,6 +18,5 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:fillViewport="true"
style="@style/account_setup_activity"
android:id="@+id/setup_fragment_container">
</FrameLayout>

1
res/layout/account_setup_template.xml
View File

@ -18,6 +18,7 @@
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
style="@style/account_setup_content"
android:fillViewport="true" >
<LinearLayout

1
res/values/colors.xml
View File

@ -22,6 +22,7 @@
<color name="account_setup_info_text_color">#000000</color>
<color name="account_setup_label_text_color">#666666</color>
<color name="account_setup_divider_color">#CCCCCC</color>
<color name="account_setup_xlarge_background_color">#3b3b3b</color>
<!-- Standard text colors -->
<color name="text_secondary_color">#666666</color>

2
res/values/dimensions.xml
View File

@ -17,6 +17,8 @@
<!-- non-xlarge -->
<resources>
<!-- Account setup template for extra-wide layouts -->
<dimen name="setup_template_content_width">600dp</dimen>
<!-- Account setup type screen buttons -->
<dimen name="setup_account_type_button_min_width">100sp</dimen>

2
res/values/styles.xml
View File

@ -16,7 +16,7 @@
<resources>
<!-- Account Setup Activity -->
<style name="account_setup_activity">
<style name="account_setup_content">
<item name="android:background">@drawable/account_setup_background</item>
</style>