diff options
| author | 2016-03-03 14:20:52 -0800 | |
|---|---|---|
| committer | 2016-03-03 14:20:52 -0800 | |
| commit | 5a06c663b5b13d85e740a00ddfae05e9ae4007a3 (patch) | |
| tree | 943c63f1a39de6c74f7dfda2d3beb44dd268cf23 | |
| parent | ba5c35b79731e91edc4d452d5e6b49a8b5434a55 (diff) | |
Unhide LocaleList.getAdjustedDefault()
Apps/libraries/widgets that wish to display text their own way (think
WebView/Chrome) or do some resource management themselves should be
able to use LocaleList.getAdjustedDefault(), the same way we use it
in Paint and Resources.
Bug: 26988869
Change-Id: I4b6aac7adb5da15459dca92574923f33f0702433
| -rw-r--r-- | api/current.txt | 1 | ||||
| -rw-r--r-- | api/system-current.txt | 1 | ||||
| -rw-r--r-- | api/test-current.txt | 1 | ||||
| -rw-r--r-- | core/java/android/util/LocaleList.java | 2 |
4 files changed, 3 insertions, 2 deletions
diff --git a/api/current.txt b/api/current.txt index a4f6607cd9b6..1f31e5274082 100644 --- a/api/current.txt +++ b/api/current.txt @@ -40086,6 +40086,7 @@ package android.util { method public int describeContents(); method public static android.util.LocaleList forLanguageTags(java.lang.String); method public java.util.Locale get(int); + method public static android.util.LocaleList getAdjustedDefault(); method public static android.util.LocaleList getDefault(); method public static android.util.LocaleList getEmptyLocaleList(); method public java.util.Locale getFirstMatch(java.lang.String[]); diff --git a/api/system-current.txt b/api/system-current.txt index 2d5e7f6d299c..2774deeb4cd8 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -42851,6 +42851,7 @@ package android.util { method public int describeContents(); method public static android.util.LocaleList forLanguageTags(java.lang.String); method public java.util.Locale get(int); + method public static android.util.LocaleList getAdjustedDefault(); method public static android.util.LocaleList getDefault(); method public static android.util.LocaleList getEmptyLocaleList(); method public java.util.Locale getFirstMatch(java.lang.String[]); diff --git a/api/test-current.txt b/api/test-current.txt index dcb2f3285cd8..2219674e96cc 100644 --- a/api/test-current.txt +++ b/api/test-current.txt @@ -40105,6 +40105,7 @@ package android.util { method public int describeContents(); method public static android.util.LocaleList forLanguageTags(java.lang.String); method public java.util.Locale get(int); + method public static android.util.LocaleList getAdjustedDefault(); method public static android.util.LocaleList getDefault(); method public static android.util.LocaleList getEmptyLocaleList(); method public java.util.Locale getFirstMatch(java.lang.String[]); diff --git a/core/java/android/util/LocaleList.java b/core/java/android/util/LocaleList.java index fc39004cf2cb..fa3921c9020e 100644 --- a/core/java/android/util/LocaleList.java +++ b/core/java/android/util/LocaleList.java @@ -478,8 +478,6 @@ public final class LocaleList implements Parcelable { /** * Returns the default locale list, adjusted by moving the default locale to its first * position. - * - * {@hide} */ @NonNull @Size(min=1) public static LocaleList getAdjustedDefault() { |