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

Commit f8879804 authored by Sam Dubey's avatar Sam Dubey Committed by Android (Google) Code Review
Browse files

Merge changes from topic "revert-20248350-flipFlag-VHUZTJRHFU" into tm-qpr-dev 

* changes:
  Revert "Fix touches in Large screen header"
  Revert "Make new headers flag true by default"
parents a76128c5 31596556

packages/SystemUI/res/layout/status_bar_expanded.xml

+6 −9
Original line number Diff line number Diff line
@@ -42,6 +42,12 @@ 
        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"/>
@@ -63,15 +69,6 @@ 
            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"

packages/SystemUI/src/com/android/systemui/flags/Flags.kt

+2 −2
Original line number Diff line number Diff line
@@ -138,7 +138,7 @@ object Flags { 
    @Deprecated("Not needed anymore") val NEW_USER_SWITCHER = ReleasedFlag(500)



    // TODO(b/254512321): Tracking Bug

    @JvmField val COMBINED_QS_HEADERS = ReleasedFlag(501, teamfood = true)

    @JvmField val COMBINED_QS_HEADERS = UnreleasedFlag(501, teamfood = true)

    val PEOPLE_TILE = ResourceBooleanFlag(502, R.bool.flag_conversations)

    @JvmField

    val QS_USER_DETAIL_SHORTCUT =
@@ -148,7 +148,7 @@ object Flags { 
    @Deprecated("Not needed anymore") val NEW_FOOTER = ReleasedFlag(504)



    // TODO(b/254512747): Tracking Bug

    val NEW_HEADER = ReleasedFlag(505, teamfood = true)

    val NEW_HEADER = UnreleasedFlag(505, teamfood = true)



    // TODO(b/254512383): Tracking Bug

    @JvmField