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

Commit a9d91a8e authored by Aaron Liu's avatar Aaron Liu
Browse files

Look for the correct lock icon view. 

It seems that the lock icon view controller is instantiated before the
view configurator removes the view.

If the migrate lock icon flag is off, findViewById in notification panel
view intead.

Fixes: 289133156
Test: view lock screen with MIGRATE_LOCK_ICON flag on and off.
Change-Id: I0a79ac21228c7e954606cf5e2820d070d80271d0
parent ab1f8f0f

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

+8 −2
Original line number Diff line number Diff line
@@ -215,9 +215,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.