PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Inline TextUtils.join(Iterable<CharSequence>)."

Browse Source
This commit is contained in:
Roozbeh Pournader
2015-08-10 18:54:58 +00:00
committed by Android (Google) Code Review
parent 3e16609755 4bbf75d184
commit 280f26c9e3
1 changed files with 14 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/com/android/settings/DataUsageSummary.java
View File

@@ -68,6 +68,8 @@ import android.content.res.Resources;
import android.graphics.Color;
import android.graphics.drawable.ColorDrawable;
import android.graphics.drawable.Drawable;
import android.icu.impl.ICUResourceBundle;
import android.icu.util.UResourceBundle;
import android.net.ConnectivityManager;
import android.net.INetworkPolicyManager;
import android.net.INetworkStatsService;
@@ -2576,7 +2578,18 @@ public class DataUsageSummary extends HighlightingFragment implements Indexable
limited.add(getText(R.string.data_usage_list_none));
}
return TextUtils.join(limited);
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 TextUtils.join(delimiter, limited);
}
/**