26ff609ebf
Putting authentication in a fragment was a problem, it means that we need fragments as children of other fragments. While this works in theory, it adds a lot of complexity. Now, authentication is done with AuthenticationView, which is just an extension of LinearLayout. Currently, this does not yet handle adding certificates for exchange accounts, but I'll fix that ASAP. As it is, this is better than the current state, which crashes on account setup 100% of the time. Change-Id: I4274e7250f97012c3dc476003fd36fb960f2b728
181 lines
7.3 KiB
XML
181 lines
7.3 KiB
XML
<?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.
|
|
-->
|
|
|
|
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="wrap_content"
|
|
android:layout_weight="1"
|
|
android:orientation="vertical" >
|
|
|
|
<LinearLayout
|
|
android:id="@+id/imap_authentication"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="wrap_content"
|
|
android:layout_weight="1"
|
|
android:orientation="vertical" >
|
|
|
|
<TextView
|
|
android:id="@+id/authentication_label"
|
|
android:text="@string/authenticiation_label"
|
|
android:layout_height="wrap_content"
|
|
android:layout_width="match_parent"
|
|
android:textAppearance="?android:attr/textAppearanceSmall"
|
|
android:textColor="?android:attr/textColorPrimary" />
|
|
|
|
<RelativeLayout
|
|
android:id="@+id/authentication_selection"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="wrap_content">
|
|
|
|
<ImageView
|
|
android:id="@+id/add_authentication"
|
|
android:contentDescription="@string/clear_authentication_label"
|
|
android:layout_height="wrap_content"
|
|
android:layout_width="wrap_content"
|
|
android:layout_alignParentLeft="true"
|
|
android:clickable="true"
|
|
android:src="@drawable/ic_add_authentication"
|
|
android:layout_centerVertical="true" />
|
|
|
|
<TextView
|
|
android:id="@+id/add_authentication_label"
|
|
android:text="@string/add_authentication_label"
|
|
android:layout_height="wrap_content"
|
|
android:layout_width="match_parent"
|
|
android:layout_toRightOf="@id/add_authentication"
|
|
android:textAppearance="?android:attr/textAppearanceSmall"
|
|
android:textColor="?android:attr/textColorPrimary"
|
|
android:layout_centerVertical="true" />
|
|
|
|
</RelativeLayout>
|
|
|
|
<RelativeLayout
|
|
android:id="@+id/imap_password_selection"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="wrap_content" >
|
|
|
|
<TextView
|
|
android:id="@+id/account_setup_basics_password_label"
|
|
android:text="@string/account_setup_basics_password_label"
|
|
android:layout_height="wrap_content"
|
|
android:layout_width="wrap_content"
|
|
android:layout_alignParentLeft="true"
|
|
android:textAppearance="?android:attr/textAppearanceSmall"
|
|
android:textColor="?android:attr/textColorPrimary"
|
|
android:layout_centerVertical="true" />
|
|
|
|
<EditText
|
|
android:id="@+id/imap_account_password"
|
|
android:layout_height="wrap_content"
|
|
android:layout_width="wrap_content"
|
|
android:layout_toRightOf="@id/account_setup_basics_password_label"
|
|
android:layout_toLeftOf="@+id/clear_password"
|
|
android:hint="@string/account_setup_incoming_password_label"
|
|
android:inputType="textPassword"
|
|
android:imeOptions="actionNext"
|
|
android:layout_centerVertical="true" />
|
|
|
|
<ImageView
|
|
android:id="@+id/clear_password"
|
|
android:contentDescription="@string/clear_authentication_label"
|
|
android:layout_height="wrap_content"
|
|
android:layout_width="wrap_content"
|
|
android:layout_alignParentRight="true"
|
|
android:clickable="true"
|
|
android:src="@drawable/ic_clear_authentication"
|
|
android:layout_centerVertical="true" />
|
|
</RelativeLayout>
|
|
|
|
<RelativeLayout
|
|
android:id="@+id/oauth_selection"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="wrap_content">
|
|
|
|
<TextView
|
|
android:id="@+id/signed_in_with_service_label"
|
|
android:layout_height="wrap_content"
|
|
android:layout_width="wrap_content"
|
|
android:layout_alignParentLeft="true"
|
|
android:layout_toLeftOf="@+id/clear_oauth"
|
|
android:textAppearance="?android:attr/textAppearanceSmall"
|
|
android:textColor="?android:attr/textColorPrimary"
|
|
android:layout_centerVertical="true" />
|
|
|
|
<ImageView
|
|
android:id="@+id/clear_oauth"
|
|
android:contentDescription="@string/clear_authentication_label"
|
|
android:layout_height="wrap_content"
|
|
android:layout_width="wrap_content"
|
|
android:layout_alignParentRight="true"
|
|
android:clickable="true"
|
|
android:src="@drawable/ic_clear_authentication"
|
|
android:layout_centerVertical="true" />
|
|
</RelativeLayout>
|
|
|
|
</LinearLayout>
|
|
|
|
<LinearLayout
|
|
android:id="@+id/standard_password_selection"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="0dip"
|
|
android:layout_weight="1"
|
|
android:orientation="vertical" >
|
|
|
|
<TextView
|
|
android:text="@string/account_setup_incoming_password_label"
|
|
android:layout_height="wrap_content"
|
|
android:layout_width="match_parent"
|
|
android:textAppearance="?android:attr/textAppearanceSmall"
|
|
android:textColor="?android:attr/textColorPrimary" />
|
|
|
|
<EditText
|
|
android:id="@+id/account_password"
|
|
android:layout_height="wrap_content"
|
|
android:layout_width="match_parent"
|
|
android:hint="@string/account_setup_incoming_password_label"
|
|
android:inputType="textPassword"
|
|
android:imeOptions="actionNext" />
|
|
</LinearLayout>
|
|
|
|
<include
|
|
android:id="@+id/client_certificate_selector"
|
|
layout="@layout/client_certificate_selector"
|
|
android:visibility="visible" />
|
|
|
|
<LinearLayout
|
|
android:id="@+id/device_id_section"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="wrap_content"
|
|
android:orientation="vertical"
|
|
android:visibility="gone">
|
|
|
|
<TextView
|
|
android:text="@string/account_setup_exchange_device_id_label"
|
|
android:layout_height="wrap_content"
|
|
android:layout_width="match_parent"
|
|
android:textColor="?android:attr/textColorPrimary" />
|
|
|
|
<TextView
|
|
android:id="@+id/device_id"
|
|
android:layout_height="wrap_content"
|
|
android:layout_width="match_parent"
|
|
android:textAppearance="?android:attr/textAppearanceMedium"
|
|
android:textColor="#ffbebebe" />
|
|
|
|
</LinearLayout>
|
|
|
|
</LinearLayout>
|