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

Commit 00c67a25 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

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



Change-Id: I5507131ce08964e99dca2bfa4b416ff7010481a6
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents c921168a 0c0ed6f1

core/java/android/view/InsetsState.java

+11 −0
Original line number Original line Diff line number Diff line
@@ -432,6 +432,17 @@ public class InsetsState implements Parcelable { 
            processSourceAsPublicType(source, typeInsetsMap, typeSideMap, typeVisibilityMap,

            processSourceAsPublicType(source, typeInsetsMap, typeSideMap, typeVisibilityMap,

                    insets, Type.SYSTEM_GESTURES);

                    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,

    private void processSourceAsPublicType(InsetsSource source, Insets[] typeInsetsMap,