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

Commit b46daaa7 authored by Xiaowen Lei's avatar Xiaowen Lei Committed by Android (Google) Code Review
Browse files

Merge "Guard regionSampler registering/deregistering code behind the flag." into tm-qpr-dev

parents ccafe39e 897cb19e

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

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

    private var showSensitiveContentForManagedUser = false

    private var managedUserHandle: UserHandle? = null

    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() }

    private val updateFun: UpdateColorCallback = { updateTextColorFromRegionSampler() }





    var stateChangeListener = object : View.OnAttachStateChangeListener {

    var stateChangeListener = object : View.OnAttachStateChangeListener {

        override fun onViewAttachedToWindow(v: View) {

        override fun onViewAttachedToWindow(v: View) {

            smartspaceViews.add(v as SmartspaceView)

            smartspaceViews.add(v as SmartspaceView)





            if (regionSamplingEnabled) {

                var regionSampler = RegionSampler(

                var regionSampler = RegionSampler(

                        v,

                        v,

                        uiExecutor,

                        uiExecutor,
@@ -118,6 +121,8 @@ class LockscreenSmartspaceController @Inject constructor( 
                initializeTextColors(regionSampler)

                initializeTextColors(regionSampler)

                regionSampler.startRegionSampler()

                regionSampler.startRegionSampler()

                regionSamplers.put(v, regionSampler)

                regionSamplers.put(v, regionSampler)

            }



            connectSession()

            connectSession()





            updateTextColorFromWallpaper()

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

        override fun onViewDetachedFromWindow(v: View) {

            smartspaceViews.remove(v as SmartspaceView)

            smartspaceViews.remove(v as SmartspaceView)





            if (regionSamplingEnabled) {

                var regionSampler = regionSamplers.getValue(v)

                var regionSampler = regionSamplers.getValue(v)

                regionSampler.stopRegionSampler()

                regionSampler.stopRegionSampler()

                regionSamplers.remove(v)

                regionSamplers.remove(v)

            }





            if (smartspaceViews.isEmpty()) {

            if (smartspaceViews.isEmpty()) {

                disconnect()

                disconnect()