diff options
10 files changed, 14 insertions, 18 deletions
@@ -2,7 +2,7 @@ LOCAL_PATH:= $(call my-dir) include $(CLEAR_VARS) LOCAL_JAVA_LIBRARIES := bouncycastle telephony-common -LOCAL_STATIC_JAVA_LIBRARIES := guava android-support-v4 android-support-v13 jsr305 +LOCAL_STATIC_JAVA_LIBRARIES := android-support-v4 android-support-v13 jsr305 LOCAL_MODULE_TAGS := optional diff --git a/src/com/android/settings/deviceinfo/Memory.java b/src/com/android/settings/deviceinfo/Memory.java index 825a7be..b669bac 100644 --- a/src/com/android/settings/deviceinfo/Memory.java +++ b/src/com/android/settings/deviceinfo/Memory.java @@ -49,7 +49,7 @@ import android.widget.Toast; import com.android.settings.R; import com.android.settings.SettingsPreferenceFragment; import com.android.settings.Utils; -import com.google.common.collect.Lists; +import com.google.android.collect.Lists; import java.util.ArrayList; import java.util.List; diff --git a/src/com/android/settings/deviceinfo/StorageMeasurement.java b/src/com/android/settings/deviceinfo/StorageMeasurement.java index e39dd20..34ef62b 100644 --- a/src/com/android/settings/deviceinfo/StorageMeasurement.java +++ b/src/com/android/settings/deviceinfo/StorageMeasurement.java @@ -41,7 +41,7 @@ import android.util.SparseLongArray; import com.android.internal.app.IMediaContainerService; import com.google.android.collect.Maps; -import com.google.common.collect.Sets; +import com.google.android.collect.Sets; import java.io.File; import java.lang.ref.WeakReference; diff --git a/src/com/android/settings/deviceinfo/UsageBarPreference.java b/src/com/android/settings/deviceinfo/UsageBarPreference.java index 2f3fd03..371c772 100644 --- a/src/com/android/settings/deviceinfo/UsageBarPreference.java +++ b/src/com/android/settings/deviceinfo/UsageBarPreference.java @@ -16,16 +16,14 @@ package com.android.settings.deviceinfo; -import com.android.settings.R; -import com.google.common.collect.Lists; - import android.content.Context; import android.preference.Preference; import android.util.AttributeSet; import android.view.View; -import java.util.ArrayList; -import java.util.Collection; +import com.android.settings.R; +import com.google.android.collect.Lists; + import java.util.Collections; import java.util.List; diff --git a/src/com/android/settings/tts/TtsEngineSettingsFragment.java b/src/com/android/settings/tts/TtsEngineSettingsFragment.java index 0c98819..e02b6ae 100644 --- a/src/com/android/settings/tts/TtsEngineSettingsFragment.java +++ b/src/com/android/settings/tts/TtsEngineSettingsFragment.java @@ -35,7 +35,6 @@ import android.util.Pair; import com.android.settings.R; import com.android.settings.SettingsPreferenceFragment; -import com.google.common.collect.Lists; import java.util.ArrayList; import java.util.Collections; @@ -202,7 +201,7 @@ public class TtsEngineSettingsFragment extends SettingsPreferenceFragment implem getEngineName()); ArrayList<Pair<String, String>> entryPairs = - Lists.newArrayListWithCapacity(availableLangs.size()); + new ArrayList<Pair<String, String>>(availableLangs.size()); for (int i = 0; i < availableLangs.size(); i++) { String[] langCountryVariant = availableLangs.get(i).split("-"); Locale loc = null; diff --git a/src/com/android/settings/widget/ChartGridView.java b/src/com/android/settings/widget/ChartGridView.java index f358ada..ec5882c 100644 --- a/src/com/android/settings/widget/ChartGridView.java +++ b/src/com/android/settings/widget/ChartGridView.java @@ -32,8 +32,8 @@ import android.util.AttributeSet; import android.util.TypedValue; import android.view.View; +import com.android.internal.util.Preconditions; import com.android.settings.R; -import com.google.common.base.Preconditions; /** * Background of {@link ChartView} that renders grid lines as requested by diff --git a/src/com/android/settings/widget/ChartNetworkSeriesView.java b/src/com/android/settings/widget/ChartNetworkSeriesView.java index 5a37bfc..6250a25 100644 --- a/src/com/android/settings/widget/ChartNetworkSeriesView.java +++ b/src/com/android/settings/widget/ChartNetworkSeriesView.java @@ -33,8 +33,8 @@ import android.util.AttributeSet; import android.util.Log; import android.view.View; +import com.android.internal.util.Preconditions; import com.android.settings.R; -import com.google.common.base.Preconditions; /** * {@link NetworkStatsHistory} series to render inside a {@link ChartView}, diff --git a/src/com/android/settings/widget/ChartSweepView.java b/src/com/android/settings/widget/ChartSweepView.java index 68676d8..774e5d8 100644 --- a/src/com/android/settings/widget/ChartSweepView.java +++ b/src/com/android/settings/widget/ChartSweepView.java @@ -35,8 +35,8 @@ import android.util.MathUtils; import android.view.MotionEvent; import android.view.View; +import com.android.internal.util.Preconditions; import com.android.settings.R; -import com.google.common.base.Preconditions; /** * Sweep across a {@link ChartView} at a specific {@link ChartAxis} value, which diff --git a/src/com/android/settings/widget/ChartView.java b/src/com/android/settings/widget/ChartView.java index 6441612..69e6e94 100644 --- a/src/com/android/settings/widget/ChartView.java +++ b/src/com/android/settings/widget/ChartView.java @@ -16,8 +16,6 @@ package com.android.settings.widget; -import static com.google.common.base.Preconditions.checkNotNull; - import android.content.Context; import android.content.res.TypedArray; import android.graphics.Rect; @@ -27,6 +25,7 @@ import android.view.View; import android.view.ViewDebug; import android.widget.FrameLayout; +import com.android.internal.util.Preconditions; import com.android.settings.R; /** @@ -71,8 +70,8 @@ public class ChartView extends FrameLayout { } void init(ChartAxis horiz, ChartAxis vert) { - mHoriz = checkNotNull(horiz, "missing horiz"); - mVert = checkNotNull(vert, "missing vert"); + mHoriz = Preconditions.checkNotNull(horiz, "missing horiz"); + mVert = Preconditions.checkNotNull(vert, "missing vert"); } public void setOptimalWidth(int optimalWidth, float optimalWidthWeight) { diff --git a/src/com/android/settings/widget/PieChartView.java b/src/com/android/settings/widget/PieChartView.java index bd77f04..6070190 100644 --- a/src/com/android/settings/widget/PieChartView.java +++ b/src/com/android/settings/widget/PieChartView.java @@ -32,7 +32,7 @@ import android.util.AttributeSet; import android.util.Log; import android.view.View; -import com.google.common.collect.Lists; +import com.google.android.collect.Lists; import java.util.ArrayList; |