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

Commit 246354f8 authored by Alexander Martinz's avatar Alexander Martinz Committed by Michael Bestas
Browse files

Eleven: remove guava dependency 



Pulling in guava just for an annotation, which is available in the
support library as well is a bad idea.

Change-Id: I0e02943616c41077071e4ccba9125c73fb574d3b
Signed-off-by: Alexander Martinz's avatarAlexander Martinz <amartinz@shiftphones.com>
parent 79e1e3b0

Android.mk

+1 −2
Original line number Diff line number Diff line
@@ -10,8 +10,7 @@ LOCAL_RESOURCE_DIR := $(addprefix $(LOCAL_PATH)/, res) 


LOCAL_STATIC_JAVA_LIBRARIES := \

    android-support-v8-renderscript \

    android-common \

    guava

    android-common



LOCAL_STATIC_ANDROID_LIBRARIES := \

    android-support-v4 \

src/org/lineageos/eleven/locale/LocaleSet.java

+1 −1
Original line number Diff line number Diff line
@@ -16,8 +16,8 @@ 


package org.lineageos.eleven.locale;



import android.support.annotation.VisibleForTesting;

import android.text.TextUtils;

import com.google.common.annotations.VisibleForTesting;

import java.util.Locale;



public class LocaleSet {

src/org/lineageos/eleven/locale/LocaleSetManager.java

+1 −1
Original line number Diff line number Diff line
@@ -17,11 +17,11 @@ 
package org.lineageos.eleven.locale;



import android.content.Context;

import android.support.annotation.VisibleForTesting;

import android.text.TextUtils;

import android.util.Log;



import org.lineageos.eleven.provider.PropertiesStore;

import com.google.common.annotations.VisibleForTesting;



import java.util.Locale;

src/org/lineageos/eleven/locale/LocaleUtils.java

+1 −2
Original line number Diff line number Diff line
@@ -18,13 +18,12 @@ package org.lineageos.eleven.locale; 


import android.provider.ContactsContract.FullNameStyle;

import android.provider.ContactsContract.PhoneticNameStyle;

import android.support.annotation.VisibleForTesting;

import android.text.TextUtils;

import android.util.Log;



import org.lineageos.eleven.locale.HanziToPinyin.Token;



import com.google.common.annotations.VisibleForTesting;



import java.lang.Character.UnicodeBlock;

import java.util.ArrayList;

import java.util.Collections;