Fix build soju-eng build error

The phone build was missing one layout and a couple dimensions.

Change-Id: I7d48599e82066c2a293f7b442eed644185848c87
This commit is contained in:
Todd Kennedy 2011-03-16 10:09:46 -07:00
parent b959d9b9b2
commit 6000d4b975
2 changed files with 64 additions and 0 deletions

View File

@ -0,0 +1,60 @@
<?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.
-->
<!-- Common data-entry area of initial account setup screen - email, password, default check -->
<!-- small screen 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="10dip"
android:textSize="20sp"
android:text="@string/accounts_welcome"
android:textAppearance="@style/accountSetupInfoText" />
<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_height="wrap_content"
android:layout_width="match_parent" />
<EditText
android:id="@+id/account_password"
android:hint="@string/account_setup_basics_password_label"
android:inputType="textPassword"
android:imeOptions="actionDone"
android:layout_below="@+id/account_email"
android:layout_height="wrap_content"
android:layout_width="match_parent"
android:nextFocusDown="@+id/next" />
<CheckBox
android:id="@+id/account_default"
android:layout_below="@+id/account_password"
android:layout_height="wrap_content"
android:layout_width="match_parent"
android:text="@string/account_setup_basics_default_label"
android:visibility="gone" />
</RelativeLayout>

View File

@ -65,6 +65,10 @@
<dimen name="settings_buttons_padding_top">48dip</dimen>
<dimen name="settings_buttons_padding_bottom">48dip</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="account_spinner_dropdown_account_name_max_width">352dip</dimen>
</resources>