Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 24ec319f authored by Yorke Lee's avatar Yorke Lee
Browse files

Rename PhoneNumberHelper in Dialer 

Rename PhoneNumberHelper to more appropriate PhoneNumberDisplayHelper

Change-Id: I2c03f5cbb04c1e03f1fc1e0051a1cea641160dca
parent 21d991ee

src/com/android/dialer/CallDetailActivity.java

+3 −3
Original line number Diff line number Diff line
@@ -65,7 +65,7 @@ import com.android.dialer.calllog.CallDetailHistoryAdapter; 
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.PhoneNumberDisplayHelper;

import com.android.dialer.calllog.PhoneNumberUtilsWrapper;

import com.android.dialer.util.AsyncTaskExecutor;

import com.android.dialer.util.AsyncTaskExecutors;
@@ -114,7 +114,7 @@ public class CallDetailActivity extends Activity implements ProximitySensorAware 
    public static final String EXTRA_FROM_NOTIFICATION = "EXTRA_FROM_NOTIFICATION";



    private CallTypeHelper mCallTypeHelper;

    private PhoneNumberHelper mPhoneNumberHelper;

    private PhoneNumberDisplayHelper mPhoneNumberHelper;

    private PhoneCallDetailsHelper mPhoneCallDetailsHelper;

    private TextView mHeaderTextView;

    private View mHeaderOverlayView;
@@ -300,7 +300,7 @@ public class CallDetailActivity extends Activity implements ProximitySensorAware 
        mResources = getResources();



        mCallTypeHelper = new CallTypeHelper(getResources());

        mPhoneNumberHelper = new PhoneNumberHelper(mResources);

        mPhoneNumberHelper = new PhoneNumberDisplayHelper(mResources);

        mPhoneCallDetailsHelper = new PhoneCallDetailsHelper(mResources, mCallTypeHelper,

                new PhoneNumberUtilsWrapper());

        mVoicemailStatusHelper = new VoicemailStatusHelperImpl();

src/com/android/dialer/PhoneCallDetailsHelper.java

+3 −3
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ import android.widget.TextView; 
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.PhoneNumberDisplayHelper;

import com.android.dialer.calllog.PhoneNumberUtilsWrapper;



/**
@@ -48,7 +48,7 @@ public class PhoneCallDetailsHelper { 
    private Long mCurrentTimeMillisForTest;

    // Helper classes.

    private final CallTypeHelper mCallTypeHelper;

    private final PhoneNumberHelper mPhoneNumberHelper;

    private final PhoneNumberDisplayHelper mPhoneNumberHelper;

    private final PhoneNumberUtilsWrapper mPhoneNumberUtilsWrapper;



    /**
@@ -62,7 +62,7 @@ public class PhoneCallDetailsHelper { 
            PhoneNumberUtilsWrapper phoneUtils) {

        mResources = resources;

        mCallTypeHelper = callTypeHelper;

        mPhoneNumberHelper = new PhoneNumberHelper(resources);

        mPhoneNumberHelper = new PhoneNumberDisplayHelper(resources);

        mPhoneNumberUtilsWrapper = phoneUtils;

    }

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

+2 −2
Original line number Diff line number Diff line
@@ -176,7 +176,7 @@ public class CallLogAdapter extends GroupingListAdapter 
    /** Helper to set up contact photos. */

    private final ContactPhotoManager mContactPhotoManager;

    /** Helper to parse and process phone numbers. */

    private PhoneNumberHelper mPhoneNumberHelper;

    private PhoneNumberDisplayHelper mPhoneNumberHelper;

    /** Helper to group call log entries. */

    private final CallLogGroupBuilder mCallLogGroupBuilder;
@@ -263,7 +263,7 @@ public class CallLogAdapter extends GroupingListAdapter 
        CallTypeHelper callTypeHelper = new CallTypeHelper(resources);



        mContactPhotoManager = ContactPhotoManager.getInstance(mContext);

        mPhoneNumberHelper = new PhoneNumberHelper(resources);

        mPhoneNumberHelper = new PhoneNumberDisplayHelper(resources);

        PhoneCallDetailsHelper phoneCallDetailsHelper = new PhoneCallDetailsHelper(

                resources, callTypeHelper, new PhoneNumberUtilsWrapper());

        mCallLogViewsHelper =

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

+2 −2
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ import com.android.dialer.R; 
    /** Helper for populating the details of a phone call. */

    private final PhoneCallDetailsHelper mPhoneCallDetailsHelper;

    /** Helper for handling phone numbers. */

    private final PhoneNumberHelper mPhoneNumberHelper;

    private final PhoneNumberDisplayHelper mPhoneNumberHelper;

    /** Resources to look up strings. */

    private final Resources mResources;
@@ -43,7 +43,7 @@ import com.android.dialer.R; 
     * @param phoneNumberHelper used to process phone number

     */

    public CallLogListItemHelper(PhoneCallDetailsHelper phoneCallDetailsHelper,

            PhoneNumberHelper phoneNumberHelper, Resources resources) {

            PhoneNumberDisplayHelper phoneNumberHelper, Resources resources) {

        mPhoneCallDetailsHelper = phoneCallDetailsHelper;

        mPhoneNumberHelper = phoneNumberHelper;

        mResources = resources;

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

+4 −4
Original line number Diff line number Diff line
@@ -57,7 +57,7 @@ public class DefaultVoicemailNotifier implements VoicemailNotifier { 
    private final NotificationManager mNotificationManager;

    private final NewCallsQuery mNewCallsQuery;

    private final NameLookupQuery mNameLookupQuery;

    private final PhoneNumberHelper mPhoneNumberHelper;

    private final PhoneNumberDisplayHelper mPhoneNumberHelper;



    /** Returns the singleton instance of the {@link DefaultVoicemailNotifier}. */

    public static synchronized DefaultVoicemailNotifier getInstance(Context context) {
@@ -75,7 +75,7 @@ public class DefaultVoicemailNotifier implements VoicemailNotifier { 


    private DefaultVoicemailNotifier(Context context,

            NotificationManager notificationManager, NewCallsQuery newCallsQuery,

            NameLookupQuery nameLookupQuery, PhoneNumberHelper phoneNumberHelper) {

            NameLookupQuery nameLookupQuery, PhoneNumberDisplayHelper phoneNumberHelper) {

        mContext = context;

        mNotificationManager = notificationManager;

        mNewCallsQuery = newCallsQuery;
@@ -340,7 +340,7 @@ public class DefaultVoicemailNotifier implements VoicemailNotifier { 
     * This will cause some Disk I/O, at least the first time it is created, so it should not be

     * called from the main thread.

     */

    public static PhoneNumberHelper createPhoneNumberHelper(Context context) {

        return new PhoneNumberHelper(context.getResources());

    public static PhoneNumberDisplayHelper createPhoneNumberHelper(Context context) {

        return new PhoneNumberDisplayHelper(context.getResources());

    }

}