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

Commit e6c50032 authored by Jeff Sharkey's avatar Jeff Sharkey
Browse files

Remove guava dependency to speed up build. 

Change-Id: I4cee4b6324e72e94c1241e10f3cdc507d65512cd
parent b805ceda

Android.mk

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

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

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

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

src/com/android/settings/tts/TtsEngineSettingsFragment.java

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