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

Commit 2c1f343c authored by Yorke Lee's avatar Yorke Lee Committed by Jay Shrauner
Browse files

Remove private references from Dialer 

Remove MathUtils.constrain
Use VisibleForTesting annotation in Guava
Use Sets class in Guava

Change-Id: Ib46e50ae2c0f278f6f588bb769b89ea37d8c5b30
(cherry picked from commit d8301f69)
parent d126f874

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

+1 −1
Original line number Diff line number Diff line
@@ -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;

src/com/android/dialer/list/PhoneFavoritesTileAdapter.java

+1 −2
Original line number Diff line number Diff line
@@ -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;

src/com/android/dialer/voicemail/VoicemailPlaybackPresenter.java

+4 −2
Original line number Diff line number Diff line
@@ -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);

    }

}