Merge "Follow up on build break to fix unit tests." into klp-dev (02741d62) · Commits · e / os / android_packages_apps_Dialer

src/com/android/dialer/CallDetailActivity.java

+9 −8

Original line number	Diff line number	Diff line
		@@ -55,7 +55,6 @@ import com.android.contacts.common.ContactPhotoManager;
		import com.android.contacts.common.CallUtil;
		import com.android.contacts.common.ClipboardUtils;
		import com.android.contacts.common.GeoUtil;
		import com.android.contacts.common.util.Constants;
		import com.android.contacts.common.util.UriUtils;
		import com.android.dialer.BackScrollManager.ScrollableHeader;
		import com.android.dialer.calllog.CallDetailHistoryAdapter;
		@@ -63,6 +62,7 @@ import com.android.dialer.calllog.CallTypeHelper;
		import com.android.dialer.calllog.ContactInfo;
		import com.android.dialer.calllog.ContactInfoHelper;
		import com.android.dialer.calllog.PhoneNumberHelper;
		import com.android.dialer.calllog.PhoneNumberUtilsWrapper;
		import com.android.dialer.util.AsyncTaskExecutor;
		import com.android.dialer.util.AsyncTaskExecutors;
		import com.android.dialer.voicemail.VoicemailPlaybackFragment;
		@@ -266,7 +266,7 @@ public class CallDetailActivity extends Activity implements ProximitySensorAware
		mCallTypeHelper = new CallTypeHelper(getResources());
		mPhoneNumberHelper = new PhoneNumberHelper(mResources);
		mPhoneCallDetailsHelper = new PhoneCallDetailsHelper(mResources, mCallTypeHelper,
		mPhoneNumberHelper);
		new PhoneNumberUtilsWrapper());
		mVoicemailStatusHelper = new VoicemailStatusHelperImpl();
		mAsyncQueryHandler = new CallDetailActivityQueryHandler(this);
		mHeaderTextView = (TextView) findViewById(R.id.header_text);
		@@ -435,9 +435,10 @@ public class CallDetailActivity extends Activity implements ProximitySensorAware

		// Cache the details about the phone number.
		final boolean canPlaceCallsTo =
		PhoneNumberHelper.canPlaceCallsTo(mNumber, numberPresentation);
		final boolean isVoicemailNumber = PhoneNumberHelper.isVoicemailNumber(mNumber);
		final boolean isSipNumber = mPhoneNumberHelper.isSipNumber(mNumber);
		PhoneNumberUtilsWrapper.canPlaceCallsTo(mNumber, numberPresentation);
		final PhoneNumberUtilsWrapper phoneUtils = new PhoneNumberUtilsWrapper();
		final boolean isVoicemailNumber = phoneUtils.isVoicemailNumber(mNumber);
		final boolean isSipNumber = phoneUtils.isSipNumber(mNumber);

		// Let user view contact details if they exist, otherwise add option to create new
		// contact from this number.
		@@ -536,7 +537,7 @@ public class CallDetailActivity extends Activity implements ProximitySensorAware

		// The secondary action allows to send an SMS to the number that placed the
		// call.
		if (mPhoneNumberHelper.canSendSmsTo(mNumber, numberPresentation)) {
		if (phoneUtils.canSendSmsTo(mNumber, numberPresentation)) {
		entry.setSecondaryAction(
		R.drawable.ic_text_holo_light,
		new Intent(Intent.ACTION_SENDTO,
		@@ -630,8 +631,8 @@ public class CallDetailActivity extends Activity implements ProximitySensorAware
		final Uri lookupUri;
		// If this is not a regular number, there is no point in looking it up in the contacts.
		ContactInfo info =
		PhoneNumberHelper.canPlaceCallsTo(number, numberPresentation)
		&& !PhoneNumberHelper.isVoicemailNumber(number)
		PhoneNumberUtilsWrapper.canPlaceCallsTo(number, numberPresentation)
		&& new PhoneNumberUtilsWrapper().isVoicemailNumber(number)
		? mContactInfoHelper.lookupNumber(number, countryIso)
		: null;
		if (info == null) {

src/com/android/dialer/PhoneCallDetailsHelper.java

+6 −3

Original line number	Diff line number	Diff line
		@@ -34,6 +34,7 @@ import com.android.contacts.common.test.NeededForTesting;
		import com.android.dialer.calllog.CallTypeHelper;
		import com.android.dialer.calllog.ContactInfo;
		import com.android.dialer.calllog.PhoneNumberHelper;
		import com.android.dialer.calllog.PhoneNumberUtilsWrapper;

		/**
		* Helper class to fill in the views in {@link PhoneCallDetailsViews}.
		@@ -48,6 +49,7 @@ public class PhoneCallDetailsHelper {
		// Helper classes.
		private final CallTypeHelper mCallTypeHelper;
		private final PhoneNumberHelper mPhoneNumberHelper;
		private final PhoneNumberUtilsWrapper mPhoneNumberUtilsWrapper;

		/**
		* Creates a new instance of the helper.
		@@ -57,10 +59,11 @@ public class PhoneCallDetailsHelper {
		* @param resources used to look up strings
		*/
		public PhoneCallDetailsHelper(Resources resources, CallTypeHelper callTypeHelper,
		PhoneNumberHelper phoneNumberHelper) {
		PhoneNumberUtilsWrapper phoneUtils) {
		mResources = resources;
		mCallTypeHelper = callTypeHelper;
		mPhoneNumberHelper = phoneNumberHelper;
		mPhoneNumberHelper = new PhoneNumberHelper(resources);
		mPhoneNumberUtilsWrapper = phoneUtils;
		}

		/** Fills the call details views with content. */
		@@ -117,7 +120,7 @@ public class PhoneCallDetailsHelper {
		if (TextUtils.isEmpty(details.name)) {
		nameText = displayNumber;
		if (TextUtils.isEmpty(details.geocode)
		\|\| PhoneNumberHelper.isVoicemailNumber(details.number)) {
		\|\| mPhoneNumberUtilsWrapper.isVoicemailNumber(details.number)) {
		numberText = mResources.getString(R.string.call_log_empty_gecode);
		} else {
		numberText = details.geocode;

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

+3 −3

Original line number	Diff line number	Diff line
		@@ -249,7 +249,7 @@ public class CallLogAdapter extends GroupingListAdapter
		mContactPhotoManager = ContactPhotoManager.getInstance(mContext);
		mPhoneNumberHelper = new PhoneNumberHelper(resources);
		PhoneCallDetailsHelper phoneCallDetailsHelper = new PhoneCallDetailsHelper(
		resources, callTypeHelper, mPhoneNumberHelper);
		resources, callTypeHelper, new PhoneNumberUtilsWrapper());
		mCallLogViewsHelper =
		new CallLogListItemHelper(
		phoneCallDetailsHelper, mPhoneNumberHelper, resources);
		@@ -541,8 +541,8 @@ public class CallLogAdapter extends GroupingListAdapter
		ExpirableCache.CachedValue<ContactInfo> cachedInfo =
		mContactInfoCache.getCachedValue(numberCountryIso);
		ContactInfo info = cachedInfo == null ? null : cachedInfo.getValue();
		if (!PhoneNumberHelper.canPlaceCallsTo(number, numberPresentation)
		\|\| PhoneNumberHelper.isVoicemailNumber(number)) {
		if (!PhoneNumberUtilsWrapper.canPlaceCallsTo(number, numberPresentation)
		\|\| new PhoneNumberUtilsWrapper().isVoicemailNumber(number)) {
		// If this is a number that cannot be dialed, there is no point in looking up a contact
		// for it.
		info = ContactInfo.EMPTY;

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

+3 −4

Original line number	Diff line number	Diff line
		@@ -31,7 +31,6 @@ import android.provider.CallLog.Calls;
		import android.provider.ContactsContract;
		import android.telephony.PhoneNumberUtils;
		import android.telephony.TelephonyManager;
		import android.util.Log;
		import android.view.LayoutInflater;
		import android.view.View;
		import android.view.ViewGroup;
		@@ -132,8 +131,8 @@ public class CallLogFragment extends ListFragment
		this, mLogLimit);
		mKeyguardManager =
		(KeyguardManager) getActivity().getSystemService(Context.KEYGUARD_SERVICE);
		getActivity().getContentResolver().registerContentObserver(
		CallLog.CONTENT_URI, true, mCallLogObserver);
		getActivity().getContentResolver().registerContentObserver(CallLog.CONTENT_URI, true,
		mCallLogObserver);
		getActivity().getContentResolver().registerContentObserver(
		ContactsContract.Contacts.CONTENT_URI, true, mContactsObserver);
		setHasOptionsMenu(true);
		@@ -363,7 +362,7 @@ public class CallLogFragment extends ListFragment
		if (cursor != null) {
		String number = cursor.getString(CallLogQuery.NUMBER);
		int numberPresentation = cursor.getInt(CallLogQuery.NUMBER_PRESENTATION);
		if (!PhoneNumberHelper.canPlaceCallsTo(number, numberPresentation)) {
		if (!PhoneNumberUtilsWrapper.canPlaceCallsTo(number, numberPresentation)) {
		// This number can't be called, do nothing
		return;
		}

src/com/android/dialer/calllog/CallLogListItemHelper.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -60,7 +60,7 @@ import com.android.dialer.R;
		boolean isHighlighted, boolean useCallAsPrimaryAction) {
		mPhoneCallDetailsHelper.setPhoneCallDetails(views.phoneCallDetailsViews, details,
		isHighlighted);
		boolean canCall = PhoneNumberHelper.canPlaceCallsTo(details.number,
		boolean canCall = PhoneNumberUtilsWrapper.canPlaceCallsTo(details.number,
		details.numberPresentation);
		boolean canPlay = details.callTypes[0] == Calls.VOICEMAIL_TYPE;