diff options
| author | 2022-04-04 03:59:51 +0000 | |
|---|---|---|
| committer | 2022-04-04 03:59:51 +0000 | |
| commit | 00c67a256959303411a6dae2838e039a544ec3af (patch) | |
| tree | dc80332f7681cff2ed40c41626782c28f7d72a16 | |
| parent | c921168aa3948b91df023bd98246937cf3ab7f09 (diff) | |
| parent | 0c0ed6f1c1cf074c1eb451a8ca1a7a26b9f2674e (diff) | |
Merge "Provide gesture and tappable element insets for caption" am: 268eff33ec am: 3cd3a85988 am: 0c0ed6f1c1
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2052567
Change-Id: I5507131ce08964e99dca2bfa4b416ff7010481a6
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 5500fb8c26a0..b1b630ed7353 100644 --- a/core/java/android/view/InsetsState.java +++ b/core/java/android/view/InsetsState.java @@ -432,6 +432,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, |