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

Merge changes I01be5d15,I5976d1a7 into udc-qpr-dev

Browse Source 
* changes:
  Enable migrate_indication_area For Teamfood
  Move keyguard root view in z-order
This commit is contained in:
Matt Pietal
2023-06-20 13:48:45 +00:00
committed by Android (Google) Code Review
parent 225465e0b2 ff78df0c23
commit 4b3863dfe7
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
packages/SystemUI/res/layout/super_notification_shade.xml
View File

@@ -65,17 +65,17 @@
android:layout_width="match_parent"
android:layout_height="match_parent" />
<include layout="@layout/status_bar_expanded"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:visibility="invisible" />
<!-- Root for all keyguard content. It was previously located within the shade. -->
<com.android.systemui.keyguard.ui.view.KeyguardRootView
android:id="@id/keyguard_root_view"
android:layout_width="match_parent"
android:layout_height="match_parent" />
<include layout="@layout/status_bar_expanded"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:visibility="invisible" />
<include layout="@layout/brightness_mirror_container" />
<com.android.systemui.scrim.ScrimView

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

@@ -252,7 +252,7 @@ object Flags {
/** Migrate the indication area to the new keyguard root view. */
// TODO(b/280067944): Tracking bug.
@JvmField
val MIGRATE_INDICATION_AREA = unreleasedFlag(236, "migrate_indication_area")
val MIGRATE_INDICATION_AREA = unreleasedFlag(236, "migrate_indication_area", teamfood = true)
/** Whether to listen for fingerprint authentication over keyguard occluding activities. */
// TODO(b/283260512): Tracking bug.