cd1f3d33a9
(this conflicted and the automerger situation was a disaster, so I opted to skip immediately to help clear the backlog, now I'm cherry-picking manually) Using a TableLayout and large margins to shrink the input boxes causes weird artifacts when you type past the size of the input box. Fixing the padding is also not the right way, since stretching the input the whole screen length is ugly. Just use a width. Change-Id: I3009e7c66f729a96f404263d79e77d3ab4d831ae
101 lines
4.3 KiB
XML
101 lines
4.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.
|
|
-->
|
|
|
|
<!-- Common data-entry area of initial account setup screen - email, password, default check -->
|
|
<!-- tablet version -->
|
|
<RelativeLayout
|
|
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"
|
|
>
|
|
<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" />
|
|
<TableLayout
|
|
android:id="@+id/email_password_table"
|
|
android:layout_below="@+id/instructions"
|
|
android:layout_width="wrap_content"
|
|
android:layout_height="wrap_content"
|
|
android:layout_marginTop="16dip">
|
|
|
|
<TableRow android:paddingTop="16dip" >
|
|
<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" />
|
|
<EditText
|
|
android:id="@+id/account_email"
|
|
android:layout_width="@dimen/setup_credentials_input_width"
|
|
android:layout_height="wrap_content"
|
|
android:inputType="textEmailAddress"
|
|
android:imeOptions="actionNext" />
|
|
</TableRow>
|
|
<TableRow android:paddingTop="16dip" >
|
|
<TextView
|
|
android:layout_height="wrap_content"
|
|
android:layout_width="wrap_content"
|
|
android:layout_marginRight="16dip"
|
|
android:text="@string/account_setup_basics_password_label"
|
|
android:textAppearance="@style/accountSetupLabelText" />
|
|
<EditText
|
|
android:id="@+id/account_password"
|
|
android:layout_height="wrap_content"
|
|
android:layout_width="@dimen/setup_credentials_input_width"
|
|
android:inputType="textPassword"
|
|
android:imeOptions="actionDone"
|
|
android:nextFocusDown="@+id/next" />
|
|
</TableRow>
|
|
</TableLayout>
|
|
|
|
<!-- Note, the next three items should be shown/hidden as a group -->
|
|
<View
|
|
android:id="@+id/account_default_divider_1"
|
|
android:layout_below="@+id/email_password_table"
|
|
android:layout_marginTop="48dip"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="1px"
|
|
android:background="@color/account_setup_divider_color"
|
|
android:visibility="gone" />
|
|
<CheckBox
|
|
android:id="@+id/account_default"
|
|
android:layout_below="@+id/account_default_divider_1"
|
|
android:layout_marginTop="16dip"
|
|
android:layout_marginBottom="16dip"
|
|
android:layout_marginLeft="32dip"
|
|
android:layout_height="wrap_content"
|
|
android:layout_width="wrap_content"
|
|
android:text="@string/account_setup_basics_default_label"
|
|
android:textAppearance="@style/accountSetupInfoText"
|
|
android:visibility="gone" />
|
|
<View
|
|
android:id="@+id/account_default_divider_2"
|
|
android:layout_below="@+id/account_default"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="1px"
|
|
android:background="@color/account_setup_divider_color"
|
|
android:visibility="gone" />
|
|
</RelativeLayout>
|