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

Commit 6686711b authored by Roozbeh Pournader's avatar Roozbeh Pournader Committed by Android (Google) Code Review
Browse files

Merge "Clear locales without changing layout direction." into nyc-dev

parents 73722c4b bd5cac67

core/java/android/content/res/Configuration.java

+10 −0
Original line number Diff line number Diff line
@@ -1484,6 +1484,16 @@ public final class Configuration implements Parcelable, Comparable<Configuration 
        setLocales(loc == null ? LocaleList.getEmptyLocaleList() : new LocaleList(loc));

    }



    /**

     * @hide

     *

     * Clears the locale without changing layout direction.

     */

    public void clearLocales() {

        mLocaleList = LocaleList.getEmptyLocaleList();

        locale = null;

    }



    /**

     * Return the layout direction. Will be either {@link View#LAYOUT_DIRECTION_LTR} or

     * {@link View#LAYOUT_DIRECTION_RTL}.

core/java/android/provider/Settings.java

+1 −1
Original line number Diff line number Diff line
@@ -2241,7 +2241,7 @@ public final class Settings { 
        public static void clearConfiguration(Configuration inoutConfig) {

            inoutConfig.fontScale = 0;

            if (!inoutConfig.userSetLocale && !inoutConfig.getLocales().isEmpty()) {

                inoutConfig.setLocales(LocaleList.getEmptyLocaleList());

                inoutConfig.clearLocales();

            }

        }