87de90282b
Now the password entry is removed from AccountSettingsBasics, and the user is taken to either SignInActivity or AccountSetupType after hitting the next button. This is a lot closer to the desired setup flow as it allows for oauth signin. Ideally this is not what we will ship for Algol, but it put us in a state where we could ship if we had to. Change-Id: I5b28bccd27c515572e4947ca877bd1772732507d
76 lines
3.2 KiB
XML
76 lines
3.2 KiB
XML
<?xml version="1.0" encoding="utf-8"?>
|
|
<!-- Copyright (C) 2008 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.
|
|
-->
|
|
|
|
<!-- Small-screen holder - see layout-xlarge for large-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">
|
|
|
|
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="wrap_content"
|
|
android:paddingTop="@dimen/setup_fragment_padding_top"
|
|
android:paddingLeft="@dimen/setup_fragment_padding_left"
|
|
android:paddingRight="@dimen/setup_fragment_padding_right"
|
|
>
|
|
|
|
<!-- Frame on the left containing the (common) setup info -->
|
|
<!-- TODO need phone-sized UX here -->
|
|
<FrameLayout
|
|
android:id="@+id/common"
|
|
android:layout_alignParentLeft="true"
|
|
android:layout_alignParentRight="true"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="wrap_content"
|
|
>
|
|
<fragment
|
|
android:id="@+id/basics_fragment"
|
|
class="com.android.email.activity.setup.AccountSetupBasicsFragment"
|
|
android:layout_width="wrap_content"
|
|
android:layout_height="wrap_content"/>
|
|
</FrameLayout>
|
|
|
|
<!-- Buttons below -->
|
|
<!-- In order to show these buttons above the IME keyboard, we need to special case the to
|
|
padding to a smaller height. -->
|
|
<RelativeLayout
|
|
android:layout_width="match_parent"
|
|
android:layout_height="wrap_content"
|
|
android:layout_below="@+id/common"
|
|
android:paddingTop="16dip"
|
|
android:paddingBottom="@dimen/settings_buttons_padding_bottom">
|
|
<TextView
|
|
android:id="@+id/manual_setup"
|
|
android:layout_height="wrap_content"
|
|
android:layout_width="wrap_content"
|
|
android:clickable="true"
|
|
android:layout_alignParentLeft="true"
|
|
android:layout_gravity="center_vertical"
|
|
android:text="@string/account_setup_basics_manual_setup_action" />
|
|
<ImageButton
|
|
android:id="@+id/next"
|
|
android:layout_height="wrap_content"
|
|
android:layout_width="wrap_content"
|
|
android:src="@drawable/ic_nav_arrow_forward"
|
|
android:layout_alignParentRight="true"
|
|
android:text="@string/next_action" />
|
|
</RelativeLayout>
|
|
|
|
</RelativeLayout>
|
|
|
|
</ScrollView>
|