diff options
| author | 2022-04-04 03:45:19 +0000 | |
|---|---|---|
| committer | 2022-04-04 03:45:19 +0000 | |
| commit | 0c0ed6f1c1cf074c1eb451a8ca1a7a26b9f2674e (patch) | |
| tree | 3cc1f29032a55b0350e3168aaf658b5cbea95f77 | |
| parent | 4624b52801f01459be0ad324970b0dafddede980 (diff) | |
| parent | 3cd3a859888553ff9cd4ef4e62396af621b65dcb (diff) | |
Merge "Provide gesture and tappable element insets for caption" am: 268eff33ec am: 3cd3a85988
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2052567
Change-Id: I72029e1a0de4026cfbf17604591433683e13b2d4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | core/java/android/view/InsetsState.java | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/core/java/android/view/InsetsState.java b/core/java/android/view/InsetsState.java index 75b69cb12d32..d15d7c7045e9 100644 --- a/core/java/android/view/InsetsState.java +++ b/core/java/android/view/InsetsState.java @@ -391,6 +391,17 @@ public class InsetsState implements Parcelable { processSourceAsPublicType(source, typeInsetsMap, typeSideMap, typeVisibilityMap, insets, Type.SYSTEM_GESTURES); } + if (type == Type.CAPTION_BAR) { + // Caption should also be gesture and tappable elements. This should not be needed when + // the caption is added from the shell, as the shell can add other types at the same + // time. + processSourceAsPublicType(source, typeInsetsMap, typeSideMap, typeVisibilityMap, + insets, Type.SYSTEM_GESTURES); + processSourceAsPublicType(source, typeInsetsMap, typeSideMap, typeVisibilityMap, + insets, Type.MANDATORY_SYSTEM_GESTURES); + processSourceAsPublicType(source, typeInsetsMap, typeSideMap, typeVisibilityMap, + insets, Type.TAPPABLE_ELEMENT); + } } private void processSourceAsPublicType(InsetsSource source, Insets[] typeInsetsMap, |