commit 516ab1c9b1a79820b7a56511fc477d25687b59fd
author Yohei Yukawa <yukawa@google.com> Thu Jun 17 10:33:11 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Jun 17 10:33:11 2021 +0000
tree e4444dfce56d9b592a8c7edf3c81a4220690e537
parent a6fbccdd9ec089ce36ef1cf53878545c3b9f2518
parent 07ce283acd2cb0549053cb8fd48f496fb6a685ad

[automerger skipped] Bump targetSdkVersion to "30" am: 07ce283acd -s ours

am skip reason: Merged-In I4bf7588c62fb77bf78d4afcb665e9bfbbef53966 with SHA-1 360052f304 is already in history

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

Change-Id: Ifc9ea2e2344d5a501e9ff031410cc4f1da99c38c

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