Merge "Remove TextUtils.join(Iterable<CharSequence>)."
diff --git a/core/java/android/text/TextUtils.java b/core/java/android/text/TextUtils.java
index f500225..ae2c0c7 100644
--- a/core/java/android/text/TextUtils.java
+++ b/core/java/android/text/TextUtils.java
@@ -18,9 +18,7 @@
import android.annotation.Nullable;
import android.content.res.Resources;
-import android.icu.impl.ICUResourceBundle;
import android.icu.util.ULocale;
-import android.icu.util.UResourceBundle;
import android.os.Parcel;
import android.os.Parcelable;
import android.os.SystemProperties;
@@ -286,27 +284,6 @@
}
/**
- * @deprecated use {@link android.icu.text.ListFormatter} instead.
- *
- * @hide
- */
- @Deprecated
- public static CharSequence join(Iterable<CharSequence> list) {
- final ICUResourceBundle icuBundle = (ICUResourceBundle) UResourceBundle.
- getBundleInstance(ICUResourceBundle.ICU_BASE_NAME);
- final String listMiddlePattern =
- icuBundle.getStringWithFallback("listPattern/standard/middle");
- // The returned pattern is something like "{0}, {1}", from which we want
- // to extract the ", " part.
- final int firstClosingBrace = listMiddlePattern.indexOf('}');
- final int lastOpeningBrace = listMiddlePattern.lastIndexOf('{');
- final CharSequence delimiter = listMiddlePattern.substring(
- firstClosingBrace+1, lastOpeningBrace);
-
- return join(delimiter, list);
- }
-
- /**
* Returns a string containing the tokens joined by delimiters.
* @param tokens an array objects to be joined. Strings will be formed from
* the objects by calling object.toString().