Merge branch 'cupcake' (cbe59e17) · Commits · e / os / android_packages_apps_Contacts

res/layout-finger/edit_contact.xml

+2 −29

Original line number	Original line	Diff line number	Diff line
	@@ -77,35 +77,8 @@
	/>		/>
	</LinearLayout>		</LinearLayout>

	<LinearLayout android:id="@+id/phonetic_name_layout"		<!-- "Phonetic name" entry widget, visible only in certain locales -->
	android:layout_width="fill_parent"		<include layout="@layout/edit_phonetic_name"/>
	android:layout_height="?android:attr/listPreferredItemHeight"
	android:orientation="horizontal"
	android:padding="0dip"
	android:gravity="center_vertical"
	android:baselineAligned="false"
	android:visibility="gone"
	>
	<TextView android:id="@+id/phonetic_name_label"
	android:layout_width="wrap_content"
	android:layout_height="fill_parent"
	android:paddingLeft="4dip"
	android:gravity="left\|center_vertical"
	android:text="@string/label_phonetic_name"
	android:textAppearance="?android:attr/textAppearanceMedium"
	/>
	<EditText android:id="@+id/phonetic_name"
	android:layout_width="0dip"
	android:layout_weight="1"
	android:layout_height="wrap_content"
	android:layout_marginLeft="8dip"
	android:layout_marginRight="4dip"
	android:gravity="center_vertical"
	android:inputType="textPersonName\|textCapWords"
	android:hint="@string/ghostData_phonetic_name"
	android:nextFocusDown="@id/data"
	/>
	</LinearLayout>

	<View		<View
	android:layout_width="fill_parent"		android:layout_width="fill_parent"

res/layout-finger/edit_phonetic_name.xml

0 → 100644

+62 −0

Original line number	Original line	Diff line number	Diff line
			<?xml version="1.0" encoding="utf-8"?>
			<!-- Copyright (C) 2009 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.
			-->

			<!-- "Phonetic name" field on the Edit contact screen.

			In locales where a "phonetic name" is meaningful, like Japanese
			(which uses a "furigana" or "yomi" field), this layout file
			should include a visible label and EditText widget.

			In the default locale, though, nothing here is visible.
			This layout file MUST still provide an EditText widget with
			id "phonetic_name" in any locale, though, since the Java code depends
			on it. (Even if the EditText is hidden we might still need to store
			a value there, so we don't lose a phonetic name from the database
			just because the user happened to edit it in a non-Japanese locale.)

			For now, at least, this layout contains a complete (but hidden)
			"phonetic name" row, so it's easy to test the phonetic_name feature
			by temporarily removing the visibility="gone" attribute below.
			-->
			<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
			android:layout_width="fill_parent"
			android:layout_height="?android:attr/listPreferredItemHeight"
			android:orientation="horizontal"
			android:padding="0dip"
			android:gravity="center_vertical"
			android:baselineAligned="false"
			android:visibility="gone"
			>
			<TextView
			android:layout_width="wrap_content"
			android:layout_height="fill_parent"
			android:paddingLeft="4dip"
			android:gravity="left\|center_vertical"
			android:text="@string/label_phonetic_name"
			android:textAppearance="?android:attr/textAppearanceMedium"
			/>
			<EditText android:id="@+id/phonetic_name"
			android:layout_width="0dip"
			android:layout_weight="1"
			android:layout_height="wrap_content"
			android:layout_marginLeft="8dip"
			android:layout_marginRight="4dip"
			android:gravity="center_vertical"
			android:inputType="textPersonName\|textCapWords"
			android:hint="@string/ghostData_phonetic_name"
			android:nextFocusDown="@id/data"
			/>
			</LinearLayout>

res/layout-finger/view_contact.xml

+2 −8

Original line number	Original line	Diff line number	Diff line
	@@ -38,14 +38,8 @@
	android:background="@drawable/border"		android:background="@drawable/border"
	/>		/>

	<TextView android:id="@+id/name"		<!-- "Name" field is locale-specific. -->
	android:layout_width="0dip"		<include layout="@layout/view_contact_name"/>
	android:layout_weight="1"
	android:layout_height="wrap_content"
	android:textAppearance="?android:attr/textAppearanceLarge"
	android:shadowColor="#BB000000"
	android:shadowRadius="2.75"
	/>

	<CheckBox android:id="@+id/star"		<CheckBox android:id="@+id/star"
	style="?android:attr/starStyle"		style="?android:attr/starStyle"

res/layout-finger/view_contact_name.xml

0 → 100644

+26 −0

Original line number	Original line	Diff line number	Diff line
			<?xml version="1.0" encoding="utf-8"?>
			<!-- Copyright (C) 2009 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.
			-->

			<!-- In the default locale, the "Name" field is a single TextView -->
			<TextView xmlns:android="http://schemas.android.com/apk/res/android"
			android:id="@+id/name"
			android:layout_width="0dip"
			android:layout_weight="1"
			android:layout_height="wrap_content"
			android:textAppearance="?android:attr/textAppearanceLarge"
			android:shadowColor="#BB000000"
			android:shadowRadius="2.75"
			/>

res/layout-ja-finger/edit_phonetic_name.xml

0 → 100644

+46 −0

Original line number	Original line	Diff line number	Diff line
			<?xml version="1.0" encoding="utf-8"?>
			<!-- Copyright (C) 2009 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.
			-->

			<!-- "Phonetic name" field on the Edit contact screen, for
			Japanese-language locales (i.e. the "furigana" or "yomi" field.) -->
			<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
			android:layout_width="fill_parent"
			android:layout_height="?android:attr/listPreferredItemHeight"
			android:orientation="horizontal"
			android:padding="0dip"
			android:gravity="center_vertical"
			android:baselineAligned="false"
			>
			<TextView
			android:layout_width="wrap_content"
			android:layout_height="fill_parent"
			android:paddingLeft="4dip"
			android:gravity="left\|center_vertical"
			android:text="@string/label_phonetic_name"
			android:textAppearance="?android:attr/textAppearanceMedium"
			/>
			<EditText android:id="@+id/phonetic_name"
			android:layout_width="0dip"
			android:layout_weight="1"
			android:layout_height="wrap_content"
			android:layout_marginLeft="8dip"
			android:layout_marginRight="4dip"
			android:gravity="center_vertical"
			android:inputType="textPersonName\|textCapWords"
			android:hint="@string/ghostData_phonetic_name"
			android:nextFocusDown="@id/data"
			/>
			</LinearLayout>