Remove guava dependency to speed up build.

Change-Id: I4cee4b6324e72e94c1241e10f3cdc507d65512cd

Android.mk

@@ -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
 

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;

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;

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 com.android.settings.R;
-import java.util.Collection;
+import com.google.android.collect.Lists;
+
 import java.util.Collections;
 import java.util.List;
 

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;

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

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},

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

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");
+        mHoriz = Preconditions.checkNotNull(horiz, "missing horiz");
-        mVert = checkNotNull(vert, "missing vert");
+        mVert = Preconditions.checkNotNull(vert, "missing vert");
     }
 
     public void setOptimalWidth(int optimalWidth, float optimalWidthWeight) {

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;