diff options
| author | Seigo Nonaka <nona@google.com> | 2016-03-17 21:18:53 +0900 |
|---|---|---|
| committer | Seigo Nonaka <nona@google.com> | 2016-03-17 21:18:53 +0900 |
| commit | d403151f3df7c23f516f54566b59ef5f7697b64b (patch) | |
| tree | 270d34756427d5a0d54a8ba3c37d1a2a707f7405 /core/java/android | |
| parent | ffaf94459a5042cd0881c7764c267a34aa5b60f0 (diff) | |
Stop layout reset by setting empty locale list.
Do not call Configuration.setLocales(empty LocaleList) if the locale
list is empty since Configuration.setLocales calls setLayoutDirection
which resets the layout to LTR.
Bug: 27411138
Change-Id: I7fa9693cdb7ed90267f074812c26ea50314ad839
Diffstat (limited to 'core/java/android')
| -rwxr-xr-x | core/java/android/provider/Settings.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java index 049d585d2651..5fc2899877f4 100755 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -2093,7 +2093,7 @@ public final class Settings { */ public static void clearConfiguration(Configuration inoutConfig) { inoutConfig.fontScale = 0; - if (!inoutConfig.userSetLocale) { + if (!inoutConfig.userSetLocale && !inoutConfig.getLocales().isEmpty()) { inoutConfig.setLocales(LocaleList.getEmptyLocaleList()); } } |