Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3cd3a859 authored by Yunfan Chen's avatar Yunfan Chen Committed by Automerger Merge Worker
Browse files

Merge "Provide gesture and tappable element insets for caption" am: 268eff33 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2052567



Change-Id: I1e6bf195c6783ba547915653fb3451598cfeb972
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents be28e531 268eff33

core/java/android/view/InsetsState.java

+11 −0
Original line number Diff line number Diff line
@@ -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,