diff options
5 files changed, 18 insertions, 16 deletions
diff --git a/src/com/android/contacts/NonPhoneActivity.java b/src/com/android/contacts/NonPhoneActivity.java index 4f0696f91..bab39775a 100644 --- a/src/com/android/contacts/NonPhoneActivity.java +++ b/src/com/android/contacts/NonPhoneActivity.java @@ -27,10 +27,9 @@ import android.net.Uri; import android.os.Bundle; import android.provider.ContactsContract.Contacts; import android.provider.ContactsContract.Intents.Insert; +import android.telecomm.PhoneAccount; import android.text.TextUtils; -import com.android.contacts.common.CallUtil; - /** * Activity that intercepts DIAL and VIEW intents for phone numbers for devices that can not * be used as a phone. This allows the user to see the phone number @@ -60,7 +59,7 @@ public class NonPhoneActivity extends ContactsActivity { final Uri data = getIntent().getData(); if (data == null) return null; final String scheme = data.getScheme(); - if (!CallUtil.SCHEME_TEL.equals(scheme)) return null; + if (!PhoneAccount.SCHEME_TEL.equals(scheme)) return null; return getIntent().getData().getSchemeSpecificPart(); } diff --git a/src/com/android/contacts/activities/ShowOrCreateActivity.java b/src/com/android/contacts/activities/ShowOrCreateActivity.java index a8077cb27..d8926f000 100755 --- a/src/com/android/contacts/activities/ShowOrCreateActivity.java +++ b/src/com/android/contacts/activities/ShowOrCreateActivity.java @@ -30,9 +30,10 @@ import android.provider.ContactsContract.Contacts; import android.provider.ContactsContract.Intents; import android.provider.ContactsContract.PhoneLookup; import android.provider.ContactsContract.RawContacts; +import android.telecomm.PhoneAccount; import android.util.Log; -import com.android.contacts.common.CallUtil; +import com.android.contacts.common.ContactsUtils; import com.android.contacts.ContactsActivity; import com.android.contacts.R; import com.android.contacts.util.NotifyingAsyncQueryHandler; @@ -119,13 +120,13 @@ public final class ShowOrCreateActivity extends ContactsActivity mCreateForce = intent.getBooleanExtra(Intents.EXTRA_FORCE_CREATE, false); // Handle specific query request - if (CallUtil.SCHEME_MAILTO.equals(scheme)) { + if (ContactsUtils.SCHEME_MAILTO.equals(scheme)) { mCreateExtras.putString(Intents.Insert.EMAIL, ssp); Uri uri = Uri.withAppendedPath(Email.CONTENT_FILTER_URI, Uri.encode(ssp)); mQueryHandler.startQuery(QUERY_TOKEN, null, uri, CONTACTS_PROJECTION, null, null, null); - } else if (CallUtil.SCHEME_TEL.equals(scheme)) { + } else if (PhoneAccount.SCHEME_TEL.equals(scheme)) { mCreateExtras.putString(Intents.Insert.PHONE, ssp); Uri uri = Uri.withAppendedPath(PhoneLookup.CONTENT_FILTER_URI, ssp); diff --git a/src/com/android/contacts/quickcontact/DataAction.java b/src/com/android/contacts/quickcontact/DataAction.java index b590814f4..aacfedf7e 100644 --- a/src/com/android/contacts/quickcontact/DataAction.java +++ b/src/com/android/contacts/quickcontact/DataAction.java @@ -26,6 +26,7 @@ import android.net.Uri; import android.net.WebAddress; import android.provider.ContactsContract.CommonDataKinds.Im; import android.provider.ContactsContract.Data; +import android.telecomm.PhoneAccount; import android.text.TextUtils; import android.util.Log; @@ -124,7 +125,7 @@ public class DataAction implements Action { Intent smsIntent = null; if (hasSms) { smsIntent = new Intent(Intent.ACTION_SENDTO, - Uri.fromParts(CallUtil.SCHEME_SMSTO, number, null)); + Uri.fromParts(ContactsUtils.SCHEME_SMSTO, number, null)); smsIntent.setComponent(smsComponent); } @@ -146,7 +147,7 @@ public class DataAction implements Action { final SipAddressDataItem sip = (SipAddressDataItem) item; final String address = sip.getSipAddress(); if (!TextUtils.isEmpty(address)) { - final Uri callUri = Uri.fromParts(CallUtil.SCHEME_SIP, address, null); + final Uri callUri = Uri.fromParts(PhoneAccount.SCHEME_SIP, address, null); mIntent = CallUtil.getCallIntent(callUri); // Note that this item will get a SIP-specific variant // of the "call phone" icon, rather than the standard @@ -160,7 +161,7 @@ public class DataAction implements Action { final EmailDataItem email = (EmailDataItem) item; final String address = email.getData(); if (!TextUtils.isEmpty(address)) { - final Uri mailUri = Uri.fromParts(CallUtil.SCHEME_MAILTO, address, null); + final Uri mailUri = Uri.fromParts(ContactsUtils.SCHEME_MAILTO, address, null); mIntent = new Intent(Intent.ACTION_SENDTO, mailUri); } @@ -195,7 +196,7 @@ public class DataAction implements Action { if (!TextUtils.isEmpty(host) && !TextUtils.isEmpty(data)) { final String authority = host.toLowerCase(); - final Uri imUri = new Uri.Builder().scheme(CallUtil.SCHEME_IMTO).authority( + final Uri imUri = new Uri.Builder().scheme(ContactsUtils.SCHEME_IMTO).authority( authority).appendPath(data).build(); mIntent = new Intent(Intent.ACTION_SENDTO, imUri); diff --git a/src/com/android/contacts/quickcontact/QuickContactActivity.java b/src/com/android/contacts/quickcontact/QuickContactActivity.java index f70eb0d33..293fae60b 100644 --- a/src/com/android/contacts/quickcontact/QuickContactActivity.java +++ b/src/com/android/contacts/quickcontact/QuickContactActivity.java @@ -70,6 +70,7 @@ import android.provider.ContactsContract.Intents; import android.provider.ContactsContract.QuickContact; import android.provider.ContactsContract.RawContacts; import android.support.v7.graphics.Palette; +import android.telecomm.PhoneAccount; import android.telecomm.TelecommManager; import android.text.TextUtils; import android.util.Log; @@ -324,7 +325,7 @@ public class QuickContactActivity extends ContactsActivity { final Uri intentUri = intent.getData(); if ((intentUri != null && intentUri.getScheme() != null && - intentUri.getScheme().equals(CallUtil.SCHEME_SMSTO)) || + intentUri.getScheme().equals(ContactsUtils.SCHEME_SMSTO)) || (intent.getType() != null && intent.getType().equals(MIMETYPE_SMS))) { usageType = DataUsageFeedback.USAGE_TYPE_SHORT_TEXT; } @@ -1302,7 +1303,7 @@ public class QuickContactActivity extends ContactsActivity { intent = CallUtil.getCallIntent(phone.getNumber()); } alternateIntent = new Intent(Intent.ACTION_SENDTO, - Uri.fromParts(CallUtil.SCHEME_SMSTO, phone.getNumber(), null)); + Uri.fromParts(ContactsUtils.SCHEME_SMSTO, phone.getNumber(), null)); alternateIcon = res.getDrawable(R.drawable.ic_message_24dp); alternateContentDescription.append(res.getString(R.string.sms_custom, header)); @@ -1321,7 +1322,7 @@ public class QuickContactActivity extends ContactsActivity { final String address = email.getData(); if (!TextUtils.isEmpty(address)) { primaryContentDescription.append(res.getString(R.string.email_other)).append(" "); - final Uri mailUri = Uri.fromParts(CallUtil.SCHEME_MAILTO, address, null); + final Uri mailUri = Uri.fromParts(ContactsUtils.SCHEME_MAILTO, address, null); intent = new Intent(Intent.ACTION_SENDTO, mailUri); header = email.getAddress(); entryContextMenuInfo = new EntryContextMenuInfo(header, @@ -1363,7 +1364,7 @@ public class QuickContactActivity extends ContactsActivity { if (!TextUtils.isEmpty(address)) { primaryContentDescription.append(res.getString(R.string.call_other)).append( " "); - final Uri callUri = Uri.fromParts(CallUtil.SCHEME_SIP, address, null); + final Uri callUri = Uri.fromParts(PhoneAccount.SCHEME_SIP, address, null); intent = CallUtil.getCallIntent(callUri); header = address; entryContextMenuInfo = new EntryContextMenuInfo(header, diff --git a/src/com/android/contacts/util/PhoneCapabilityTester.java b/src/com/android/contacts/util/PhoneCapabilityTester.java index eec99163e..b2d10be4a 100644 --- a/src/com/android/contacts/util/PhoneCapabilityTester.java +++ b/src/com/android/contacts/util/PhoneCapabilityTester.java @@ -27,7 +27,7 @@ import android.provider.MediaStore; import android.provider.Telephony; import android.telephony.TelephonyManager; -import com.android.contacts.common.CallUtil; +import com.android.contacts.common.ContactsUtils; import com.android.contacts.R; import java.util.List; @@ -84,7 +84,7 @@ public final class PhoneCapabilityTester { if (smsPackage != null) { final PackageManager packageManager = context.getPackageManager(); final Intent intent = new Intent(Intent.ACTION_SENDTO, - Uri.fromParts(CallUtil.SCHEME_SMSTO, "", null)); + Uri.fromParts(ContactsUtils.SCHEME_SMSTO, "", null)); final List<ResolveInfo> resolveInfos = packageManager.queryIntentActivities(intent, 0); for (ResolveInfo resolveInfo : resolveInfos) { if (smsPackage.equals(resolveInfo.activityInfo.packageName)) { |