summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Tiger Huang <tigerhuang@google.com> 2020-09-02 12:18:58 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2020-09-02 12:18:58 +0000
commitb95d91a1babf3b30ed2f6d85c529358c90fa4123 (patch)
tree457b86ddc12da7896364f33023414dbfcb9d2dd9
parente6a08c1e4ee7f708aa822a38288fa31f9d82d42b (diff)
parent6a1829d14a3423efe3bff9efcf9c6786e92617c5 (diff)
Merge "Compare with oldSoftInputMode after restoring softInputMode" into rvc-qpr-dev am: 6a1829d14a
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12500989 Change-Id: I603f8ba6efa2b4536da8a039c06aefac63f57501
-rw-r--r--core/java/android/view/ViewRootImpl.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/view/ViewRootImpl.java b/core/java/android/view/ViewRootImpl.java
index bcf3b49c6644..5c42408dab05 100644
--- a/core/java/android/view/ViewRootImpl.java
+++ b/core/java/android/view/ViewRootImpl.java
@@ -1456,7 +1456,7 @@ public final class ViewRootImpl implements ViewParent,
| (oldSoftInputMode & WindowManager.LayoutParams.SOFT_INPUT_MASK_ADJUST);
}
- if ((changes & LayoutParams.SOFT_INPUT_MODE_CHANGED) != 0) {
+ if (mWindowAttributes.softInputMode != oldSoftInputMode) {
requestFitSystemWindows();
}