Merge "Move ContactLoader related code to ContactsCommon" into klp-dev (5d2be5b3) · Commits · e / os / android_packages_apps_Contacts

res/values/strings.xml

+0 −6

Original line number	Original line	Diff line number	Diff line
	@@ -451,12 +451,6 @@
	<!-- The button to add an organization field to a contact in the Raw Contact Editor [CHAR LIMIT=15] -->		<!-- The button to add an organization field to a contact in the Raw Contact Editor [CHAR LIMIT=15] -->
	<string name="group_edit_field_hint_text">Group name</string>		<string name="group_edit_field_hint_text">Group name</string>

	<!-- Attribution of a contact status update, when the time of update is unknown -->
	<string name="contact_status_update_attribution">via <xliff:g id="source" example="Google Talk">%1$s</xliff:g></string>

	<!-- Attribution of a contact status update, when the time of update is known -->
	<string name="contact_status_update_attribution_with_date"><xliff:g id="date" example="3 hours ago">%1$s</xliff:g> via <xliff:g id="source" example="Google Talk">%2$s</xliff:g></string>

	<!-- String describing the Star/Favorite checkbox		<!-- String describing the Star/Favorite checkbox

	Used by AccessibilityService to announce the purpose of the view.		Used by AccessibilityService to announce the purpose of the view.

src/com/android/contacts/ContactSaveService.java

+3 −3

Original line number	Original line	Diff line number	Diff line
	@@ -49,9 +49,9 @@ import android.widget.Toast;

	import com.android.contacts.common.database.ContactUpdateUtils;		import com.android.contacts.common.database.ContactUpdateUtils;
	import com.android.contacts.common.model.AccountTypeManager;		import com.android.contacts.common.model.AccountTypeManager;
	import com.android.contacts.model.RawContactDelta;		import com.android.contacts.common.model.RawContactDelta;
	import com.android.contacts.model.RawContactDeltaList;		import com.android.contacts.common.model.RawContactDeltaList;
	import com.android.contacts.model.RawContactModifier;		import com.android.contacts.common.model.RawContactModifier;
	import com.android.contacts.common.model.account.AccountWithDataSet;		import com.android.contacts.common.model.account.AccountWithDataSet;
	import com.android.contacts.util.CallerInfoCacheUtils;		import com.android.contacts.util.CallerInfoCacheUtils;
	import com.android.contacts.util.ContactPhotoUtils;		import com.android.contacts.util.ContactPhotoUtils;

src/com/android/contacts/ContactsActivity.java

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -26,7 +26,7 @@ import android.os.Bundle;
	import android.view.View;		import android.view.View;

	import com.android.contacts.common.activity.TransactionSafeActivity;		import com.android.contacts.common.activity.TransactionSafeActivity;
	import com.android.contacts.test.InjectedServices;		import com.android.contacts.common.test.InjectedServices;

	/**		/**
	* A common superclass for Contacts activities that handles application-wide services.		* A common superclass for Contacts activities that handles application-wide services.

src/com/android/contacts/ContactsApplication.java

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -32,7 +32,7 @@ import android.util.Log;
	import com.android.contacts.common.ContactPhotoManager;		import com.android.contacts.common.ContactPhotoManager;
	import com.android.contacts.common.list.ContactListFilterController;		import com.android.contacts.common.list.ContactListFilterController;
	import com.android.contacts.common.model.AccountTypeManager;		import com.android.contacts.common.model.AccountTypeManager;
	import com.android.contacts.test.InjectedServices;		import com.android.contacts.common.test.InjectedServices;
	import com.android.contacts.common.util.Constants;		import com.android.contacts.common.util.Constants;
	import com.google.common.annotations.VisibleForTesting;		import com.google.common.annotations.VisibleForTesting;

src/com/android/contacts/ContactsUtils.java

deleted100644 → 0

+0 −144

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

	package com.android.contacts;

	import android.content.Context;
	import android.content.Intent;
	import android.database.Cursor;
	import android.provider.ContactsContract.CommonDataKinds.Im;
	import android.provider.ContactsContract.DisplayPhoto;
	import android.telephony.PhoneNumberUtils;
	import android.text.TextUtils;

	import com.android.contacts.common.model.account.AccountWithDataSet;
	import com.android.contacts.common.test.NeededForTesting;
	import com.android.contacts.common.model.AccountTypeManager;

	import java.util.List;

	public class ContactsUtils {
	private static final String TAG = "ContactsUtils";

	private static int sThumbnailSize = -1;

	// TODO find a proper place for the canonical version of these
	public interface ProviderNames {
	String YAHOO = "Yahoo";
	String GTALK = "GTalk";
	String MSN = "MSN";
	String ICQ = "ICQ";
	String AIM = "AIM";
	String XMPP = "XMPP";
	String JABBER = "JABBER";
	String SKYPE = "SKYPE";
	String QQ = "QQ";
	}

	/**
	* This looks up the provider name defined in
	* ProviderNames from the predefined IM protocol id.
	* This is used for interacting with the IM application.
	*
	* @param protocol the protocol ID
	* @return the provider name the IM app uses for the given protocol, or null if no
	* provider is defined for the given protocol
	* @hide
	*/
	public static String lookupProviderNameFromId(int protocol) {
	switch (protocol) {
	case Im.PROTOCOL_GOOGLE_TALK:
	return ProviderNames.GTALK;
	case Im.PROTOCOL_AIM:
	return ProviderNames.AIM;
	case Im.PROTOCOL_MSN:
	return ProviderNames.MSN;
	case Im.PROTOCOL_YAHOO:
	return ProviderNames.YAHOO;
	case Im.PROTOCOL_ICQ:
	return ProviderNames.ICQ;
	case Im.PROTOCOL_JABBER:
	return ProviderNames.JABBER;
	case Im.PROTOCOL_SKYPE:
	return ProviderNames.SKYPE;
	case Im.PROTOCOL_QQ:
	return ProviderNames.QQ;
	}
	return null;
	}

	/**
	* Test if the given {@link CharSequence} contains any graphic characters,
	* first checking {@link TextUtils#isEmpty(CharSequence)} to handle null.
	*/
	public static boolean isGraphic(CharSequence str) {
	return !TextUtils.isEmpty(str) && TextUtils.isGraphic(str);
	}

	/**
	* Returns true if two objects are considered equal. Two null references are equal here.
	*/
	@NeededForTesting
	public static boolean areObjectsEqual(Object a, Object b) {
	return a == b \|\| (a != null && a.equals(b));
	}

	/**
	* Returns true if two {@link Intent}s are both null, or have the same action.
	*/
	public static final boolean areIntentActionEqual(Intent a, Intent b) {
	if (a == b) {
	return true;
	}
	if (a == null \|\| b == null) {
	return false;
	}
	return TextUtils.equals(a.getAction(), b.getAction());
	}

	public static boolean areContactWritableAccountsAvailable(Context context) {
	final List<AccountWithDataSet> accounts =
	AccountTypeManager.getInstance(context).getAccounts(true /* writeable */);
	return !accounts.isEmpty();
	}

	public static boolean areGroupWritableAccountsAvailable(Context context) {
	final List<AccountWithDataSet> accounts =
	AccountTypeManager.getInstance(context).getGroupWritableAccounts();
	return !accounts.isEmpty();
	}

	/**
	* Returns the size (width and height) of thumbnail pictures as configured in the provider. This
	* can safely be called from the UI thread, as the provider can serve this without performing
	* a database access
	*/
	public static int getThumbnailSize(Context context) {
	if (sThumbnailSize == -1) {
	final Cursor c = context.getContentResolver().query(
	DisplayPhoto.CONTENT_MAX_DIMENSIONS_URI,
	new String[] { DisplayPhoto.THUMBNAIL_MAX_DIM }, null, null, null);
	try {
	c.moveToFirst();
	sThumbnailSize = c.getInt(0);
	} finally {
	c.close();
	}
	}
	return sThumbnailSize;
	}

	}