diff options
| author | 2021-02-22 18:17:42 +0800 | |
|---|---|---|
| committer | 2021-02-22 18:17:42 +0800 | |
| commit | 07981b4f3f3000aeebd3c7cc73c8f7987fb68e8e (patch) | |
| tree | 44de48e5979282cede939675d4aa1b340a8a6fd1 | |
| parent | 2441a6bb3a825c8c823ad8b75f9d4604baf93a9d (diff) | |
Refine the condition about force layout
This CL applies SOFT_INPUT_MASK_ADJUST before comparing to
SOFT_INPUT_ADJUST_RESIZE.
Bug: 161781474
Test: atest ForceRelayoutTest ForceRelayoutSdk29Test
Change-Id: I275faafd7520df06f512c638f7c5255cc460aa02
| -rw-r--r-- | core/java/android/view/ViewRootImpl.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/core/java/android/view/ViewRootImpl.java b/core/java/android/view/ViewRootImpl.java index f1f6786aa43e..144691d3eaa0 100644 --- 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); } |