From d403151f3df7c23f516f54566b59ef5f7697b64b Mon Sep 17 00:00:00 2001 From: Seigo Nonaka Date: Thu, 17 Mar 2016 21:18:53 +0900 Subject: [PATCH] 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 --- core/java/android/provider/Settings.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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()); } } -- 2.11.0