Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Unhide LocaleList.getAdjustedDefault()" into nyc-dev

Browse Source
This commit is contained in:
Roozbeh Pournader
2016-03-03 23:46:56 +00:00
committed by Android (Google) Code Review
parent 950c9f2a95 5a06c663b5
commit fa207d6097
4 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
api/current.txt
View File

@@ -40090,6 +40090,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[]);

1
api/system-current.txt
View File

@@ -42857,6 +42857,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[]);

1
api/test-current.txt
View File

@@ -40109,6 +40109,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[]);

2
core/java/android/util/LocaleList.java
View File

@@ -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() {