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

Merge "Stop layout reset by setting empty locale list." into nyc-dev

Browse Source
This commit is contained in:
Roozbeh Pournader
2016-03-17 15:46:06 +00:00
committed by Android (Google) Code Review
parent 610bcf3781 d403151f3d
commit eb62f7f3e4
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2093,7 +2093,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) { if (!inoutConfig.userSetLocale && !inoutConfig.getLocales().isEmpty()) {
inoutConfig.setLocales(LocaleList.getEmptyLocaleList()); inoutConfig.setLocales(LocaleList.getEmptyLocaleList());
} }
} }