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

Commit f515be6f authored by Aaron Liu's avatar Aaron Liu Committed by Automerger Merge Worker
Browse files

Merge "Look for the correct lock icon view." into udc-qpr-dev am: 691167d4 

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



Change-Id: Idf3e4aff4c298b86ba336b49f7175aee8da72d44
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 70fa12a2 691167d4

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.