Merge "Look for the correct lock icon view." into udc-qpr-dev (691167d4) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/shade/ShadeModule.kt

+8 −2

Original line number	Diff line number	Diff line
		@@ -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.