Merge "Refine the condition about force layout" into sc-dev

2021-02-23 07:52:11 +00:00
parent acd9169191 07981b4f3f
commit 1284ffd3f5
1 changed files with 2 additions and 1 deletions
--- a/core/java/android/view/ViewRootImpl.java
+++ b/core/java/android/view/ViewRootImpl.java
@@ -1677,7 +1677,8 @@ public final class ViewRootImpl implements ViewParent,

        // See comment for View.sForceLayoutWhenInsetsChanged
        if (View.sForceLayoutWhenInsetsChanged && mView != null
-                && mWindowAttributes.softInputMode == SOFT_INPUT_ADJUST_RESIZE) {
+                && (mWindowAttributes.softInputMode & SOFT_INPUT_MASK_ADJUST)
+                        == SOFT_INPUT_ADJUST_RESIZE) {
            forceLayout(mView);
        }