From 91197049c458f07092b31501d2ed512180b13d58 Mon Sep 17 00:00:00 2001 From: Chiao Cheng Date: Fri, 24 Aug 2012 14:19:37 -0700 Subject: Moving more classes from contacts into dialer. - These classes are only used by dialer code. - Fixed import order. Bug: 6993891 Change-Id: I7941a029989c4793b766fdc77a4666f9f99b750a --- src/com/android/dialer/calllog/CallDetailHistoryAdapter.java | 2 +- src/com/android/dialer/calllog/CallLogAdapter.java | 4 ++-- src/com/android/dialer/calllog/CallLogFragment.java | 2 +- src/com/android/dialer/calllog/CallLogListItemHelper.java | 2 +- src/com/android/dialer/calllog/CallLogListItemViews.java | 2 +- src/com/android/dialer/calllog/DefaultVoicemailNotifier.java | 2 +- src/com/android/dialer/calllog/IntentProvider.java | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-) (limited to 'src/com/android/dialer/calllog') diff --git a/src/com/android/dialer/calllog/CallDetailHistoryAdapter.java b/src/com/android/dialer/calllog/CallDetailHistoryAdapter.java index 38dc72722..0763f3ccb 100644 --- a/src/com/android/dialer/calllog/CallDetailHistoryAdapter.java +++ b/src/com/android/dialer/calllog/CallDetailHistoryAdapter.java @@ -25,8 +25,8 @@ import android.view.ViewGroup; import android.widget.BaseAdapter; import android.widget.TextView; -import com.android.dialer.PhoneCallDetails; import com.android.contacts.R; +import com.android.dialer.PhoneCallDetails; /** * Adapter for a ListView containing history items from the details of a call. diff --git a/src/com/android/dialer/calllog/CallLogAdapter.java b/src/com/android/dialer/calllog/CallLogAdapter.java index 217f59765..720cc11d4 100644 --- a/src/com/android/dialer/calllog/CallLogAdapter.java +++ b/src/com/android/dialer/calllog/CallLogAdapter.java @@ -33,11 +33,11 @@ import android.view.ViewTreeObserver; import com.android.common.widget.GroupingListAdapter; import com.android.contacts.ContactPhotoManager; +import com.android.contacts.R; +import com.android.contacts.util.UriUtils; import com.android.dialer.PhoneCallDetails; import com.android.dialer.PhoneCallDetailsHelper; -import com.android.contacts.R; import com.android.dialer.util.ExpirableCache; -import com.android.contacts.util.UriUtils; import com.google.common.annotations.VisibleForTesting; import com.google.common.base.Objects; diff --git a/src/com/android/dialer/calllog/CallLogFragment.java b/src/com/android/dialer/calllog/CallLogFragment.java index 4b3113403..83ed830ad 100644 --- a/src/com/android/dialer/calllog/CallLogFragment.java +++ b/src/com/android/dialer/calllog/CallLogFragment.java @@ -49,7 +49,7 @@ import com.android.common.io.MoreCloseables; import com.android.contacts.ContactsUtils; import com.android.contacts.R; import com.android.contacts.util.Constants; -import com.android.contacts.util.EmptyLoader; +import com.android.dialer.util.EmptyLoader; import com.android.dialer.voicemail.VoicemailStatusHelper; import com.android.dialer.voicemail.VoicemailStatusHelper.StatusMessage; import com.android.dialer.voicemail.VoicemailStatusHelperImpl; diff --git a/src/com/android/dialer/calllog/CallLogListItemHelper.java b/src/com/android/dialer/calllog/CallLogListItemHelper.java index 7862a5679..101ca7de3 100644 --- a/src/com/android/dialer/calllog/CallLogListItemHelper.java +++ b/src/com/android/dialer/calllog/CallLogListItemHelper.java @@ -21,9 +21,9 @@ import android.provider.CallLog.Calls; import android.text.TextUtils; import android.view.View; +import com.android.contacts.R; import com.android.dialer.PhoneCallDetails; import com.android.dialer.PhoneCallDetailsHelper; -import com.android.contacts.R; /** * Helper class to fill in the views of a call log entry. diff --git a/src/com/android/dialer/calllog/CallLogListItemViews.java b/src/com/android/dialer/calllog/CallLogListItemViews.java index 5b860efcb..ac6ad955e 100644 --- a/src/com/android/dialer/calllog/CallLogListItemViews.java +++ b/src/com/android/dialer/calllog/CallLogListItemViews.java @@ -22,9 +22,9 @@ import android.widget.ImageView; import android.widget.QuickContactBadge; import android.widget.TextView; -import com.android.dialer.PhoneCallDetailsViews; import com.android.contacts.R; import com.android.contacts.test.NeededForTesting; +import com.android.dialer.PhoneCallDetailsViews; /** * Simple value object containing the various views within a call log entry. diff --git a/src/com/android/dialer/calllog/DefaultVoicemailNotifier.java b/src/com/android/dialer/calllog/DefaultVoicemailNotifier.java index 0f6fe3b08..ff4e5eeb5 100644 --- a/src/com/android/dialer/calllog/DefaultVoicemailNotifier.java +++ b/src/com/android/dialer/calllog/DefaultVoicemailNotifier.java @@ -32,8 +32,8 @@ import android.text.TextUtils; import android.util.Log; import com.android.common.io.MoreCloseables; -import com.android.dialer.CallDetailActivity; import com.android.contacts.R; +import com.android.dialer.CallDetailActivity; import com.google.common.collect.Maps; import java.util.Map; diff --git a/src/com/android/dialer/calllog/IntentProvider.java b/src/com/android/dialer/calllog/IntentProvider.java index f43dc5104..859487a26 100644 --- a/src/com/android/dialer/calllog/IntentProvider.java +++ b/src/com/android/dialer/calllog/IntentProvider.java @@ -23,8 +23,8 @@ import android.database.Cursor; import android.net.Uri; import android.provider.CallLog.Calls; -import com.android.dialer.CallDetailActivity; import com.android.contacts.ContactsUtils; +import com.android.dialer.CallDetailActivity; /** * Used to create an intent to attach to an action in the call log. -- cgit v1.2.3