Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

Change-Id: Ie97191a9bcfa653abac162edf944e48f81e706e5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Sam Dubey
2022-10-26 07:34:17 +00:00
committed by Automerger Merge Worker
parent 4a6bc2915e f887980401
commit 17009848da
2 changed files with 8 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
packages/SystemUI/res/layout/status_bar_expanded.xml
View File

@@ -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"

4
packages/SystemUI/src/com/android/systemui/flags/Flags.kt
View File

@@ -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