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

Merge "Clear locales without changing layout direction." into nyc-dev am: 6686711ba2

Browse Source 
am: 18bf0e2ad2

* commit '18bf0e2ad22a28060e9cbd1516b1c36236c5b557':
  Clear locales without changing layout direction.

Change-Id: Ia3925ac1adbf3e5cdaa45c1d88f9fc50483765cb
This commit is contained in:
Roozbeh Pournader
2016-05-20 20:00:39 +00:00
committed by android-build-merger
parent 28983b4cf2 18bf0e2ad2
commit 461e71472d
2 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
core/java/android/content/res/Configuration.java
View File

@@ -1484,6 +1484,16 @@ public final class Configuration implements Parcelable, Comparable<Configuration
setLocales(loc == null ? LocaleList.getEmptyLocaleList() : new LocaleList(loc)); 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 * Return the layout direction. Will be either {@link View#LAYOUT_DIRECTION_LTR} or
* {@link View#LAYOUT_DIRECTION_RTL}. * {@link View#LAYOUT_DIRECTION_RTL}.

2
core/java/android/provider/Settings.java
View File

@@ -2252,7 +2252,7 @@ public final class Settings {
public static void clearConfiguration(Configuration inoutConfig) { public static void clearConfiguration(Configuration inoutConfig) {
inoutConfig.fontScale = 0; inoutConfig.fontScale = 0;
if (!inoutConfig.userSetLocale && !inoutConfig.getLocales().isEmpty()) { if (!inoutConfig.userSetLocale && !inoutConfig.getLocales().isEmpty()) {
inoutConfig.setLocales(LocaleList.getEmptyLocaleList()); inoutConfig.clearLocales();
} }
} }