commit f8015171f8334dff60e12eb53147cdb997188c2f
author Treehugger Robot <treehugger-gerrit@google.com> Fri May 28 07:10:53 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri May 28 07:10:53 2021 +0000
tree 5d5bec9ea21687e55f45f73efc526be79e54a0ab
parent fdf368cd6aa8aa21a5d10df846ef717ca9b98c37
parent 524b30d70d2235638b85f6fb23a3d12cfeb0b532

Merge "Fix Keyboard Theme update when device orientation changed" am: 7ae00baa87 am: 16a01e7c0d am: 9d1ee4ae5a am: 524b30d70d

Original change: https://android-review.googlesource.com/c/platform/packages/inputmethods/LatinIME/+/1721930

Change-Id: I1006b19a75f665776fb01db830a885617f7dfc1d

java/src/com/android/inputmethod/latin/LatinIME.java

diff --git a/java/src/com/android/inputmethod/latin/LatinIME.java b/java/src/com/android/inputmethod/latin/LatinIME.java
index 737bd0d..a99f0b4 100644
--- a/java/src/com/android/inputmethod/latin/LatinIME.java
+++ b/java/src/com/android/inputmethod/latin/LatinIME.java
@@ -803,7 +803,8 @@
         // create new display context and re-init keyboard layout with this context.
         final WindowManager wm = getSystemService(WindowManager.class);
         final int newDisplayId = wm.getDefaultDisplay().getDisplayId();
-        if (mCurDisplayId != newDisplayId) {
+        if (mCurDisplayId != newDisplayId || !mDisplayContext.getResources().getConfiguration()
+                        .equals(getResources().getConfiguration())) {
             mCurDisplayId = newDisplayId;
             mDisplayContext = createDisplayContext(wm.getDefaultDisplay());
             mKeyboardSwitcher.updateKeyboardTheme(mDisplayContext);