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

Commit f31bd18f authored by Josh Hou's avatar Josh Hou Committed by Android (Google) Code Review
Browse files

Merge "Rename API fromResources to fromContextIgnoringOverride"

parents dec4353b a424cdc3

core/api/current.txt

+1 −1
Original line number Diff line number Diff line
@@ -5905,7 +5905,7 @@ package android.app { 
    ctor public LocaleConfig(@NonNull android.content.Context);

    ctor public LocaleConfig(@NonNull android.os.LocaleList);

    method public int describeContents();

    method @NonNull public static android.app.LocaleConfig fromResources(@NonNull android.content.Context);

    method @NonNull public static android.app.LocaleConfig fromContextIgnoringOverride(@NonNull android.content.Context);

    method public int getStatus();

    method @Nullable public android.os.LocaleList getSupportedLocales();

    method public void writeToParcel(@NonNull android.os.Parcel, int);

core/java/android/app/LocaleConfig.java

+1 −1
Original line number Diff line number Diff line
@@ -110,7 +110,7 @@ public class LocaleConfig implements Parcelable { 
     * @see Context#createPackageContext(String, int).

     */

    @NonNull

    public static LocaleConfig fromResources(@NonNull Context context) {

    public static LocaleConfig fromContextIgnoringOverride(@NonNull Context context) {

        return new LocaleConfig(context, false);

    }