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

Commit 27cf3b5e authored by Fabian Kozynski's avatar Fabian Kozynski Committed by Automerger Merge Worker
Browse files

Merge "Fix touches in Large screen header" into tm-qpr-dev am: 9b45e65e am: e292ad1d 

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



Change-Id: I24fc1fbc2af593ed530da8cd11871a34cc6a409f
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 8ebc9ed9 e292ad1d

packages/SystemUI/res/layout/status_bar_expanded.xml

+9 −6
Original line number Diff line number Diff line
@@ -42,12 +42,6 @@ 
        android:clipToPadding="false"

        android:clipChildren="false">



        <ViewStub

            android:id="@+id/qs_header_stub"

            android:layout_height="wrap_content"

            android:layout_width="match_parent"

        />



        <include

            layout="@layout/keyguard_status_view"

            android:visibility="gone"/>
@@ -69,6 +63,15 @@ 
            systemui:layout_constraintBottom_toBottomOf="parent"

        />



        <!-- This view should be after qs_frame so touches are dispatched first to it. That gives

             it a chance to capture clicks before the NonInterceptingScrollView disallows all

             intercepts -->

        <ViewStub

            android:id="@+id/qs_header_stub"

            android:layout_height="wrap_content"

            android:layout_width="match_parent"

        />



        <androidx.constraintlayout.widget.Guideline

            android:id="@+id/qs_edge_guideline"

            android:layout_width="wrap_content"