diff options
| author | Ta-wei Yen <twyen@google.com> | 2016-03-07 23:56:51 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2016-03-07 23:56:51 +0000 |
| commit | 5d635baea2d0510c5edc9df26681d802bc91c443 (patch) | |
| tree | a76ad9cbdee19b31494be5836065e4b080c022d7 /src/com/android/dialer/DialtactsActivity.java | |
| parent | d72b50f5d5d75309c21e7cc093222db5684aa433 (diff) | |
| parent | bcb15f99dff4e01343bb7470135f5392a65a01f4 (diff) | |
Merge "Add contact photo for missed call notifications" into nyc-dev
Diffstat (limited to 'src/com/android/dialer/DialtactsActivity.java')
| -rw-r--r-- | src/com/android/dialer/DialtactsActivity.java | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/src/com/android/dialer/DialtactsActivity.java b/src/com/android/dialer/DialtactsActivity.java index 58a0474d1..d063fef5a 100644 --- a/src/com/android/dialer/DialtactsActivity.java +++ b/src/com/android/dialer/DialtactsActivity.java @@ -16,9 +16,6 @@ package com.android.dialer; -import com.android.dialer.voicemail.VoicemailArchiveActivity; -import com.google.common.annotations.VisibleForTesting; - import android.app.Fragment; import android.app.FragmentTransaction; import android.content.ActivityNotFoundException; @@ -65,7 +62,6 @@ import com.android.contacts.common.interactions.TouchPointManager; import com.android.contacts.common.list.OnPhoneNumberPickerActionListener; import com.android.contacts.common.util.PermissionsUtil; import com.android.contacts.common.widget.FloatingActionButtonController; -import com.android.contacts.commonbind.analytics.AnalyticsUtil; import com.android.dialer.calllog.CallLogActivity; import com.android.dialer.calllog.CallLogFragment; import com.android.dialer.database.DialerDatabaseHelper; @@ -85,18 +81,19 @@ import com.android.dialer.list.SpeedDialFragment; import com.android.dialer.logging.Logger; import com.android.dialer.logging.ScreenEvent; import com.android.dialer.settings.DialerSettingsActivity; +import com.android.dialer.util.Assert; import com.android.dialer.util.DialerUtils; import com.android.dialer.util.IntentUtil; import com.android.dialer.util.IntentUtil.CallIntentBuilder; import com.android.dialer.util.TelecomUtil; +import com.android.dialer.voicemail.VoicemailArchiveActivity; import com.android.dialer.widget.ActionBarController; import com.android.dialer.widget.SearchEditTextLayout; import com.android.dialerbind.DatabaseHelperManager; import com.android.dialerbind.ObjectFactory; import com.android.phone.common.animation.AnimUtils; import com.android.phone.common.animation.AnimationListenerAdapter; - -import junit.framework.Assert; +import com.google.common.annotations.VisibleForTesting; import java.util.ArrayList; import java.util.List; |