commit 524b30d70d2235638b85f6fb23a3d12cfeb0b532
author Treehugger Robot <treehugger-gerrit@google.com> Fri May 28 06:50:42 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri May 28 06:50:42 2021 +0000
tree 5d5bec9ea21687e55f45f73efc526be79e54a0ab
parent e03eca7c3a6ec3ef592d2b1c71638989dc837b1a
parent 9d1ee4ae5afa0714e225bf034efce70520f5a2f4

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

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

Change-Id: I5a0cfb63667799ba52441eac6e083a05c8d6bae4

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);