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

Commit 535c72e7 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... 

Merge "Provide gesture and tappable element insets for caption" am: 268eff33 am: 3cd3a859 am: 0c0ed6f1 am: 00c67a25

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



Change-Id: Ifba77dd5f37821f2a15d0da26c36e1cc3ba2cbc0
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 559feab6 00c67a25

core/java/android/view/InsetsState.java

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