Merge "Look for the correct lock icon view." into udc-qpr-dev

2023-06-29 18:55:21 +00:00
parent 777bb02593 a9d91a8e87
commit 691167d4fc
1 changed files with 8 additions and 2 deletions
--- a/packages/SystemUI/src/com/android/systemui/shade/ShadeModule.kt
+++ b/packages/SystemUI/src/com/android/systemui/shade/ShadeModule.kt
@@ -209,9 +209,15 @@ abstract class ShadeModule {
        @Provides
        @SysUISingleton
        fun providesLockIconView(
-            notificationShadeWindowView: NotificationShadeWindowView,
+            keyguardRootView: KeyguardRootView,
+            notificationPanelView: NotificationPanelView,
+            featureFlags: FeatureFlags
        ): LockIconView {
-            return notificationShadeWindowView.findViewById(R.id.lock_icon_view)
+            if (featureFlags.isEnabled(Flags.MIGRATE_LOCK_ICON)) {
+                return keyguardRootView.findViewById(R.id.lock_icon_view)
+            } else {
+                return notificationPanelView.findViewById(R.id.lock_icon_view)
+            }
        }

        // TODO(b/277762009): Only allow this view's controller to inject the view. See above.