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

Commit 2bf6eccb authored by Xiaowen Lei's avatar Xiaowen Lei Committed by Automerger Merge Worker
Browse files

Merge "Guard regionSampler registering/deregistering code behind the flag."... 

Merge "Guard regionSampler registering/deregistering code behind the flag." into tm-qpr-dev am: b46daaa7 am: 78b98552

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



Change-Id: Ic0dae16bbe9cd82ee5c7ca3c36948cfe2e1f7d98
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 0aa22095 78b98552

packages/SystemUI/src/com/android/systemui/statusbar/lockscreen/LockscreenSmartspaceController.kt

+20 −13
Original line number Diff line number Diff line
@@ -102,6 +102,8 @@ class LockscreenSmartspaceController @Inject constructor( 
    private var showSensitiveContentForManagedUser = false

    private var managedUserHandle: UserHandle? = null



    // TODO(b/202758428): refactor so that we can test color updates via region samping, similar to

    //  how we test color updates when theme changes (See testThemeChangeUpdatesTextColor).

    private val updateFun: UpdateColorCallback = { updateTextColorFromRegionSampler() }



    // TODO: Move logic into SmartspaceView
@@ -109,6 +111,7 @@ class LockscreenSmartspaceController @Inject constructor( 
        override fun onViewAttachedToWindow(v: View) {

            smartspaceViews.add(v as SmartspaceView)



            if (regionSamplingEnabled) {

                var regionSampler = RegionSampler(

                        v,

                        uiExecutor,
@@ -119,6 +122,8 @@ class LockscreenSmartspaceController @Inject constructor( 
                initializeTextColors(regionSampler)

                regionSampler.startRegionSampler()

                regionSamplers.put(v, regionSampler)

            }



            connectSession()



            updateTextColorFromWallpaper()
@@ -128,9 +133,11 @@ class LockscreenSmartspaceController @Inject constructor( 
        override fun onViewDetachedFromWindow(v: View) {

            smartspaceViews.remove(v as SmartspaceView)



            if (regionSamplingEnabled) {

                var regionSampler = regionSamplers.getValue(v)

                regionSampler.stopRegionSampler()

                regionSamplers.remove(v)

            }



            if (smartspaceViews.isEmpty()) {

                disconnect()