diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2021-02-23 07:52:11 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2021-02-23 07:52:11 +0000 |
| commit | 1284ffd3f56661ee6d1b8bdcfaba2d930eb0955f (patch) | |
| tree | 0b0c2a8d697963cc7f400107572d4c107c2f87bf /core/java/android | |
| parent | acd9169191b59d68e37782e7850a227771f92a64 (diff) | |
| parent | 07981b4f3f3000aeebd3c7cc73c8f7987fb68e8e (diff) | |
Merge "Refine the condition about force layout" into sc-dev
Diffstat (limited to 'core/java/android')
| -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); } |