diff options
| -rw-r--r-- | core/java/android/content/res/Configuration.java | 10 | ||||
| -rwxr-xr-x | core/java/android/provider/Settings.java | 2 |
2 files changed, 11 insertions, 1 deletions
diff --git a/core/java/android/content/res/Configuration.java b/core/java/android/content/res/Configuration.java index 29e5b5db5b69..c1aac8584acb 100644 --- a/core/java/android/content/res/Configuration.java +++ b/core/java/android/content/res/Configuration.java @@ -1485,6 +1485,16 @@ public final class Configuration implements Parcelable, Comparable<Configuration } /** + * @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}. * diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java index 8cc165d75c2b..d63fbb1fdafa 100755 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -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(); } } |