Merge "Fix touches in Large screen header" into tm-qpr-dev am: ea7e2c106c
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20248350 Change-Id: I841c4b6a90599ac8841f6809e47323ca638f540e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
@@ -42,12 +42,6 @@
|
|||||||
android:clipToPadding="false"
|
android:clipToPadding="false"
|
||||||
android:clipChildren="false">
|
android:clipChildren="false">
|
||||||
|
|
||||||
<ViewStub
|
|
||||||
android:id="@+id/qs_header_stub"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
/>
|
|
||||||
|
|
||||||
<include
|
<include
|
||||||
layout="@layout/keyguard_status_view"
|
layout="@layout/keyguard_status_view"
|
||||||
android:visibility="gone"/>
|
android:visibility="gone"/>
|
||||||
@@ -69,6 +63,15 @@
|
|||||||
systemui:layout_constraintBottom_toBottomOf="parent"
|
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
|
<androidx.constraintlayout.widget.Guideline
|
||||||
android:id="@+id/qs_edge_guideline"
|
android:id="@+id/qs_edge_guideline"
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
|
|||||||
Reference in New Issue
Block a user