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

Commit 727c4b56 authored by Sam Dubey's avatar Sam Dubey Committed by Automerger Merge Worker
Browse files

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

Merge changes from topic "revert-20248350-flipFlag-VHUZTJRHFU" into tm-qpr-dev am: f8879804 am: 17009848

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



Change-Id: Ifd53879e0a3709fcd324c1ad77bfce54223a2832
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 2ba9e0ff 17009848

packages/SystemUI/res/layout/status_bar_expanded.xml

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

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

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

    @Deprecated("Not needed anymore") val NEW_USER_SWITCHER = ReleasedFlag(500)





    // TODO(b/254512321): Tracking Bug

    // 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)

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

    @JvmField

    @JvmField

    val QS_USER_DETAIL_SHORTCUT =

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

    @Deprecated("Not needed anymore") val NEW_FOOTER = ReleasedFlag(504)





    // TODO(b/254512747): Tracking Bug

    // TODO(b/254512747): Tracking Bug

    val NEW_HEADER = ReleasedFlag(505, teamfood = true)

    val NEW_HEADER = UnreleasedFlag(505, teamfood = true)





    // TODO(b/254512383): Tracking Bug

    // TODO(b/254512383): Tracking Bug

    @JvmField

    @JvmField