Don't parse phonetic name just show show all the parts fully expanded. (8bca1220) · Commits · e / os / android_packages_apps_Contacts

res/layout/phonetic_name_editor_view.xml

deleted100644 → 0

+0 −48

Original line number	Diff line number	Diff line
		<?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.
		-->

		<com.android.contacts.editor.PhoneticNameEditorView
		xmlns:android="http://schemas.android.com/apk/res/android"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:minHeight="@dimen/editor_min_line_item_height"
		android:layout_marginStart="@dimen/editor_kind_icon_total_width">

		<!-- This isn't used in PhoneticNameEditorView. It is only included so that
		StructuredNameEditorView's base classes don't need extra null checks. -->
		<include
		android:id="@+id/spinner"
		layout="@layout/edit_spinner"
		android:visibility="gone" />

		<include
		android:id="@+id/editors"
		layout="@layout/edit_field_list" />

		<include
		android:id="@+id/expansion_view_container"
		layout="@layout/name_edit_expansion_view"
		android:visibility="visible" />

		<!-- This isn't used in PhoneticNameEditorView. It is only included so that
		StructuredNameEditorView's base classes don't need extra null checks. -->
		<include
		android:id="@+id/delete_button_container"
		layout="@layout/edit_delete_button"
		android:visibility="gone" />

		</com.android.contacts.editor.PhoneticNameEditorView>

src/com/android/contacts/editor/EditorUiUtils.java

+0 −3

Original line number	Diff line number	Diff line
		@@ -88,9 +88,6 @@ public class EditorUiUtils {
		// Relation.CONTENT_ITEM_TYPE
		//
		// Un-supported mime types need to mapped with -1.

		mimetypeLayoutMap.put(DataKind.PSEUDO_MIME_TYPE_PHONETIC_NAME,
		R.layout.phonetic_name_editor_view);
		mimetypeLayoutMap.put(StructuredName.CONTENT_ITEM_TYPE,
		R.layout.structured_name_editor_view);
		mimetypeLayoutMap.put(GroupMembership.CONTENT_ITEM_TYPE, -1);

src/com/android/contacts/editor/KindSectionView.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -362,8 +362,8 @@ public class KindSectionView extends LinearLayout {
		// The account type doesn't support phonetic name.
		if (phoneticNameKind == null) return;

		final PhoneticNameEditorView phoneticNameView = (PhoneticNameEditorView) mLayoutInflater
		.inflate(R.layout.phonetic_name_editor_view, mEditors, /* attachToRoot =*/ false);
		final TextFieldsEditorView phoneticNameView = (TextFieldsEditorView) mLayoutInflater
		.inflate(R.layout.text_fields_editor_view, mEditors, /* attachToRoot =*/ false);
		phoneticNameView.setEditorListener(new OtherNameKindEditorListener());
		phoneticNameView.setDeletable(false);
		phoneticNameView.setValues(

src/com/android/contacts/editor/PhoneticNameEditorView.java

deleted100644 → 0

+0 −166

Original line number	Diff line number	Diff line
		/*
		* 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.
		*/

		package com.android.contacts.editor;

		import android.content.Context;
		import android.content.res.Resources;
		import android.text.TextUtils;
		import android.util.AttributeSet;

		import com.android.contacts.R;
		import com.android.contacts.model.RawContactDelta;
		import com.android.contacts.model.ValuesDelta;
		import com.android.contacts.model.dataitem.DataKind;
		import com.android.contacts.model.dataitem.StructuredNameDataItem;
		import com.android.contacts.util.NameConverter;

		/**
		* A dedicated editor for phonetic name. It is similar to {@link StructuredNameEditorView}.
		*/
		public class PhoneticNameEditorView extends TextFieldsEditorView {

		private static class PhoneticValuesDelta extends ValuesDelta {
		private ValuesDelta mValues;
		private String mPhoneticName;

		public PhoneticValuesDelta(ValuesDelta values) {
		mValues = values;
		buildPhoneticName();
		}

		@Override
		public void put(String key, String value) {
		if (key.equals(DataKind.PSEUDO_COLUMN_PHONETIC_NAME)) {
		mPhoneticName = value;
		parsePhoneticName(value);
		} else {
		mValues.put(key, value);
		buildPhoneticName();
		}
		}

		@Override
		public String getAsString(String key) {
		if (key.equals(DataKind.PSEUDO_COLUMN_PHONETIC_NAME)) {
		return mPhoneticName;
		} else {
		return mValues.getAsString(key);
		}
		}

		private void parsePhoneticName(String value) {
		StructuredNameDataItem dataItem = NameConverter.parsePhoneticName(value, null);
		mValues.setPhoneticFamilyName(dataItem.getPhoneticFamilyName());
		mValues.setPhoneticMiddleName(dataItem.getPhoneticMiddleName());
		mValues.setPhoneticGivenName(dataItem.getPhoneticGivenName());
		}

		private void buildPhoneticName() {
		String family = mValues.getPhoneticFamilyName();
		String middle = mValues.getPhoneticMiddleName();
		String given = mValues.getPhoneticGivenName();
		mPhoneticName = NameConverter.buildPhoneticName(family, middle, given);
		}

		@Override
		public Long getId() {
		return mValues.getId();
		}

		@Override
		public boolean isVisible() {
		return mValues.isVisible();
		}
		}

		public static boolean isUnstructuredPhoneticNameColumn(String column) {
		return DataKind.PSEUDO_COLUMN_PHONETIC_NAME.equals(column);
		}

		public PhoneticNameEditorView(Context context) {
		super(context);
		}

		public PhoneticNameEditorView(Context context, AttributeSet attrs) {
		super(context, attrs);
		}

		public PhoneticNameEditorView(Context context, AttributeSet attrs, int defStyle) {
		super(context, attrs, defStyle);
		}

		@Override
		protected void onFinishInflate() {
		super.onFinishInflate();
		final Resources res = getResources();
		mCollapseButtonDescription = res
		.getString(R.string.collapse_phonetic_name_fields_description);
		mExpandButtonDescription = res
		.getString(R.string.expand_phonetic_name_fields_description);
		}

		@Override
		public void setValues(DataKind kind, ValuesDelta entry, RawContactDelta state, boolean readOnly,
		ViewIdGenerator vig) {
		if (!(entry instanceof PhoneticValuesDelta)) {
		entry = new PhoneticValuesDelta(entry);
		}
		super.setValues(kind, entry, state, readOnly, vig);
		updateEmptiness();
		}

		@Override
		public void onFieldChanged(String column, String value) {
		if (!isFieldChanged(column, value)) {
		return;
		}

		if (hasShortAndLongForms()) {
		PhoneticValuesDelta entry = (PhoneticValuesDelta) getEntry();

		// Determine whether the user is modifying the structured or unstructured phonetic
		// name field. See a similar approach in {@link StructuredNameEditor#onFieldChanged}.
		// This is because on device rotation, a hidden TextView's onRestoreInstanceState() will
		// be called and incorrectly restore a null value for the hidden field, which ultimately
		// modifies the underlying phonetic name. Hence, ignore onFieldChanged() update requests
		// from fields that aren't visible.
		boolean isEditingUnstructuredPhoneticName = !areOptionalFieldsVisible();

		if (isEditingUnstructuredPhoneticName == isUnstructuredPhoneticNameColumn(column)) {
		// Call into the superclass to update the field and rebuild the underlying
		// phonetic name.
		super.onFieldChanged(column, value);
		}
		} else {
		// All fields are always visible, so we don't have to worry about blocking updates
		// from onRestoreInstanceState() from hidden fields. Always call into the superclass
		// to update the field and rebuild the underlying phonetic name.
		super.onFieldChanged(column, value);
		}
		}

		public boolean hasData() {
		ValuesDelta entry = getEntry();

		String family = entry.getPhoneticFamilyName();
		String middle = entry.getPhoneticMiddleName();
		String given = entry.getPhoneticGivenName();

		return !TextUtils.isEmpty(family) \|\| !TextUtils.isEmpty(middle)
		\|\| !TextUtils.isEmpty(given);
		}
		}

src/com/android/contacts/model/RawContactModifier.java

+8 −50

Original line number	Diff line number	Diff line
		@@ -1038,14 +1038,10 @@ public class RawContactModifier {
		return;
		}

		boolean supportPhoneticFullName = false;
		boolean supportPhoneticFamilyName = false;
		boolean supportPhoneticMiddleName = false;
		boolean supportPhoneticGivenName = false;
		for (EditField editField : newDataKind.fieldList) {
		if (DataKind.PSEUDO_COLUMN_PHONETIC_NAME.equals(editField.column)) {
		supportPhoneticFullName = true;
		}
		if (StructuredName.PHONETIC_FAMILY_NAME.equals(editField.column)) {
		supportPhoneticFamilyName = true;
		}
		@@ -1057,43 +1053,6 @@ public class RawContactModifier {
		}
		}


		// Phonetic (full) name <-> PHONETIC_FAMILY_NAME, PHONETIC_MIDDLE_NAME, PHONETIC_GIVEN_NAME
		final String phoneticFullName = values.getAsString(DataKind.PSEUDO_COLUMN_PHONETIC_NAME);
		if (!TextUtils.isEmpty(phoneticFullName)) {
		if (!supportPhoneticFullName) {
		// Old data has a phonetic (full) name, while the new account doesn't allow it.
		final StructuredNameDataItem tmpItem =
		NameConverter.parsePhoneticName(phoneticFullName, null);
		values.remove(DataKind.PSEUDO_COLUMN_PHONETIC_NAME);
		if (supportPhoneticFamilyName) {
		values.put(StructuredName.PHONETIC_FAMILY_NAME,
		tmpItem.getPhoneticFamilyName());
		} else {
		values.remove(StructuredName.PHONETIC_FAMILY_NAME);
		}
		if (supportPhoneticMiddleName) {
		values.put(StructuredName.PHONETIC_MIDDLE_NAME,
		tmpItem.getPhoneticMiddleName());
		} else {
		values.remove(StructuredName.PHONETIC_MIDDLE_NAME);
		}
		if (supportPhoneticGivenName) {
		values.put(StructuredName.PHONETIC_GIVEN_NAME,
		tmpItem.getPhoneticGivenName());
		} else {
		values.remove(StructuredName.PHONETIC_GIVEN_NAME);
		}
		}
		} else {
		if (supportPhoneticFullName) {
		// Old data does not have a phonetic (full) name, while the new account requires it.
		values.put(DataKind.PSEUDO_COLUMN_PHONETIC_NAME,
		NameConverter.buildPhoneticName(
		values.getAsString(StructuredName.PHONETIC_FAMILY_NAME),
		values.getAsString(StructuredName.PHONETIC_MIDDLE_NAME),
		values.getAsString(StructuredName.PHONETIC_GIVEN_NAME)));
		}
		if (!supportPhoneticFamilyName) {
		values.remove(StructuredName.PHONETIC_FAMILY_NAME);
		}
		@@ -1103,7 +1062,6 @@ public class RawContactModifier {
		if (!supportPhoneticGivenName) {
		values.remove(StructuredName.PHONETIC_GIVEN_NAME);
		}
		}

		newState.addEntry(ValuesDelta.fromAfter(values));
		}