diff options
Diffstat (limited to 'src')
3 files changed, 6 insertions, 5 deletions
diff --git a/src/com/android/dialer/calllog/PhoneNumberUtilsWrapper.java b/src/com/android/dialer/calllog/PhoneNumberUtilsWrapper.java index 9913c20c6..32b49b336 100644 --- a/src/com/android/dialer/calllog/PhoneNumberUtilsWrapper.java +++ b/src/com/android/dialer/calllog/PhoneNumberUtilsWrapper.java @@ -20,7 +20,7 @@ import android.provider.CallLog; import android.telephony.PhoneNumberUtils; import android.text.TextUtils; -import com.google.android.collect.Sets; +import com.google.common.collect.Sets; import java.util.Set; diff --git a/src/com/android/dialer/list/PhoneFavoritesTileAdapter.java b/src/com/android/dialer/list/PhoneFavoritesTileAdapter.java index e28fd73f3..368075368 100644 --- a/src/com/android/dialer/list/PhoneFavoritesTileAdapter.java +++ b/src/com/android/dialer/list/PhoneFavoritesTileAdapter.java @@ -43,13 +43,12 @@ import com.android.contacts.common.list.ContactTileAdapter.DisplayType; import com.android.contacts.common.list.ContactTileView; import com.android.dialer.list.SwipeHelper.OnItemGestureListener; import com.android.dialer.list.SwipeHelper.SwipeHelperCallback; -import com.android.internal.annotations.VisibleForTesting; +import com.google.common.annotations.VisibleForTesting; import com.google.common.collect.ComparisonChain; import java.util.ArrayList; import java.util.Comparator; -import java.util.HashMap; import java.util.LinkedList; import java.util.List; import java.util.PriorityQueue; diff --git a/src/com/android/dialer/voicemail/VoicemailPlaybackPresenter.java b/src/com/android/dialer/voicemail/VoicemailPlaybackPresenter.java index ef29f1397..ebda0eb3c 100644 --- a/src/com/android/dialer/voicemail/VoicemailPlaybackPresenter.java +++ b/src/com/android/dialer/voicemail/VoicemailPlaybackPresenter.java @@ -16,8 +16,6 @@ package com.android.dialer.voicemail; -import static android.util.MathUtils.constrain; - import android.content.Context; import android.database.ContentObserver; import android.media.AudioManager; @@ -627,4 +625,8 @@ public class VoicemailPlaybackPresenter { mWakeLock.release(); } } + + private static int constrain(int amount, int low, int high) { + return amount < low ? low : (amount > high ? high : amount); + } } |