diff options
| author | Jorim Jaggi <jjaggi@google.com> | 2019-05-15 10:26:02 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2019-05-15 10:26:02 +0000 |
| commit | c3371300eba6eaba1cba75294f4b37d90d973758 (patch) | |
| tree | 450fc41b951d368b3ce0335b629158805a9a35a3 /core/java | |
| parent | 4e1078e29160f0ab3a57ce44a0bc6335bd481bba (diff) | |
| parent | 7882548b92c431ec163bbf8f2d6231eced8c91be (diff) | |
Merge "Fix copying of insets" into qt-dev
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/android/view/WindowInsets.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/core/java/android/view/WindowInsets.java b/core/java/android/view/WindowInsets.java index 2d292ef7b25c..9340b71a5280 100644 --- a/core/java/android/view/WindowInsets.java +++ b/core/java/android/view/WindowInsets.java @@ -156,7 +156,9 @@ public final class WindowInsets { * @param src Source to copy insets from */ public WindowInsets(WindowInsets src) { - this(src.mTypeInsetsMap, src.mTypeMaxInsetsMap, src.mTypeVisibilityMap, src.mIsRound, + this(src.mSystemWindowInsetsConsumed ? null : src.mTypeInsetsMap, + src.mStableInsetsConsumed ? null : src.mTypeMaxInsetsMap, + src.mTypeVisibilityMap, src.mIsRound, src.mAlwaysConsumeSystemBars, displayCutoutCopyConstructorArgument(src)); } |