Merge "Use framework API to match voicemail number." (0296cb0a) · Commits · e / os / android_packages_apps_Contacts

src/com/android/contacts/CallDetailActivity.java

+1 −7

Original line number	Diff line number	Diff line
		@@ -222,7 +222,7 @@ public class CallDetailActivity extends Activity implements ProximitySensorAware
		mResources = getResources();

		mCallTypeHelper = new CallTypeHelper(getResources());
		mPhoneNumberHelper = new PhoneNumberHelper(mResources, getVoicemailNumber());
		mPhoneNumberHelper = new PhoneNumberHelper(mResources);
		mPhoneCallDetailsHelper = new PhoneCallDetailsHelper(mResources, mCallTypeHelper,
		mPhoneNumberHelper);
		mVoicemailStatusHelper = new VoicemailStatusHelperImpl();
		@@ -604,12 +604,6 @@ public class CallDetailActivity extends Activity implements ProximitySensorAware
		mContactPhotoManager.loadPhoto(mContactBackgroundView, photoUri, true, true);
		}

		private String getVoicemailNumber() {
		TelephonyManager telephonyManager =
		(TelephonyManager) getSystemService(Context.TELEPHONY_SERVICE);
		return telephonyManager.getVoiceMailNumber();
		}

		static final class ViewEntry {
		public final String text;
		public final Intent primaryIntent;

src/com/android/contacts/calllog/CallLogAdapter.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -194,7 +194,7 @@ public class CallLogAdapter extends GroupingListAdapter
		};

		public CallLogAdapter(Context context, CallFetcher callFetcher,
		ContactInfoHelper contactInfoHelper, String voicemailNumber) {
		ContactInfoHelper contactInfoHelper) {
		super(context);

		mContext = context;
		@@ -209,7 +209,7 @@ public class CallLogAdapter extends GroupingListAdapter
		CallTypeHelper callTypeHelper = new CallTypeHelper(resources);

		mContactPhotoManager = ContactPhotoManager.getInstance(mContext);
		mPhoneNumberHelper = new PhoneNumberHelper(resources, voicemailNumber);
		mPhoneNumberHelper = new PhoneNumberHelper(resources);
		PhoneCallDetailsHelper phoneCallDetailsHelper = new PhoneCallDetailsHelper(
		resources, callTypeHelper, mPhoneNumberHelper);
		mCallLogViewsHelper =

src/com/android/contacts/calllog/CallLogFragment.java

+1 −10

Original line number	Diff line number	Diff line
		@@ -39,7 +39,6 @@ import android.os.RemoteException;
		import android.os.ServiceManager;
		import android.provider.CallLog.Calls;
		import android.telephony.PhoneNumberUtils;
		import android.telephony.TelephonyManager;
		import android.text.TextUtils;
		import android.util.Log;
		import android.view.LayoutInflater;
		@@ -62,7 +61,6 @@ public class CallLogFragment extends ListFragment implements ViewPagerVisibility

		private CallLogAdapter mAdapter;
		private CallLogQueryHandler mCallLogQueryHandler;
		private String mVoiceMailNumber;
		private boolean mScrollToTop;

		private boolean mShowOptionsMenu;
		@@ -81,8 +79,6 @@ public class CallLogFragment extends ListFragment implements ViewPagerVisibility
		public void onCreate(Bundle state) {
		super.onCreate(state);

		mVoiceMailNumber = ((TelephonyManager) getActivity().getSystemService(
		Context.TELEPHONY_SERVICE)).getVoiceMailNumber();
		mCallLogQueryHandler = new CallLogQueryHandler(getActivity().getContentResolver(), this);
		mKeyguardManager =
		(KeyguardManager) getActivity().getSystemService(Context.KEYGUARD_SERVICE);
		@@ -151,7 +147,7 @@ public class CallLogFragment extends ListFragment implements ViewPagerVisibility
		super.onViewCreated(view, savedInstanceState);
		String currentCountryIso = ContactsUtils.getCurrentCountryIso(getActivity());
		mAdapter = new CallLogAdapter(getActivity(), this,
		new ContactInfoHelper(getActivity(), currentCountryIso), mVoiceMailNumber);
		new ContactInfoHelper(getActivity(), currentCountryIso));
		setListAdapter(mAdapter);
		getListView().setItemsCanFocus(true);
		}
		@@ -326,11 +322,6 @@ public class CallLogFragment extends ListFragment implements ViewPagerVisibility
		return mAdapter;
		}

		@NeededForTesting
		public String getVoiceMailNumber() {
		return mVoiceMailNumber;
		}

		@Override
		public void onVisibilityChanged(boolean visible) {
		if (mShowOptionsMenu != visible) {

src/com/android/contacts/calllog/DefaultVoicemailNotifier.java

+1 −4

Original line number	Diff line number	Diff line
		@@ -33,7 +33,6 @@ import android.database.Cursor;
		import android.net.Uri;
		import android.provider.CallLog.Calls;
		import android.provider.ContactsContract.PhoneLookup;
		import android.telephony.TelephonyManager;
		import android.text.TextUtils;
		import android.util.Log;

		@@ -319,8 +318,6 @@ public class DefaultVoicemailNotifier implements VoicemailNotifier {
		* called from the main thread.
		*/
		public static PhoneNumberHelper createPhoneNumberHelper(Context context) {
		TelephonyManager telephonyManager =
		(TelephonyManager) context.getSystemService(Context.TELEPHONY_SERVICE);
		return new PhoneNumberHelper(context.getResources(), telephonyManager.getVoiceMailNumber());
		return new PhoneNumberHelper(context.getResources());
		}
		}

src/com/android/contacts/calllog/PhoneNumberHelper.java

+3 −5

Original line number	Diff line number	Diff line
		@@ -29,11 +29,9 @@ import android.text.TextUtils;
		*/
		public class PhoneNumberHelper {
		private final Resources mResources;
		private final String mVoicemailNumber;

		public PhoneNumberHelper(Resources resources, String voicemailNumber) {
		public PhoneNumberHelper(Resources resources) {
		mResources = resources;
		mVoicemailNumber = voicemailNumber;
		}

		/** Returns true if it is possible to place a call to the given number. */
		@@ -68,7 +66,7 @@ public class PhoneNumberHelper {
		if (number.equals(CallerInfo.PAYPHONE_NUMBER)) {
		return mResources.getString(R.string.payphone);
		}
		if (PhoneNumberUtils.extractNetworkPortion(number.toString()).equals(mVoicemailNumber)) {
		if (isVoicemailNumber(number)) {
		return mResources.getString(R.string.voicemail);
		}
		if (TextUtils.isEmpty(formattedNumber)) {
		@@ -91,7 +89,7 @@ public class PhoneNumberHelper {

		/** Returns true if the given number is the number of the configured voicemail. */
		public boolean isVoicemailNumber(CharSequence number) {
		return PhoneNumberUtils.extractNetworkPortion(number.toString()).equals(mVoicemailNumber);
		return PhoneNumberUtils.isVoiceMailNumber(number.toString());
		}

		/** Returns true if the given number is a SIP address. */