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

Commit 1c048583 authored by Michael Mikhail's avatar Michael Mikhail
Browse files

Move listener to lockscreen setting to application scope 

There is a binder call in the code checking lockscreen setting.
Executing this code everytime screen transitions go to lockscreen is
expensive. It is better to execute the binder call one time in the
application scope.

Flag: EXEMPT BUGFIX
Bug: 331800609
Bug: 330801389
Test: atest MediaCarouselControllerTest

Change-Id: Ia165e7fd63690403bfa6b61890d63b632c031d5e
parent 328a9f17

packages/SystemUI/src/com/android/systemui/media/controls/ui/controller/MediaCarouselController.kt

+4 −3
Original line number Diff line number Diff line
@@ -42,6 +42,7 @@ import com.android.keyguard.KeyguardUpdateMonitor 
import com.android.keyguard.KeyguardUpdateMonitorCallback

import com.android.systemui.Dumpable

import com.android.systemui.dagger.SysUISingleton

import com.android.systemui.dagger.qualifiers.Application

import com.android.systemui.dagger.qualifiers.Background

import com.android.systemui.dagger.qualifiers.Main

import com.android.systemui.dump.DumpManager
@@ -123,6 +124,7 @@ private val DEBUG = Log.isLoggable(TAG, Log.DEBUG) 
class MediaCarouselController

@Inject

constructor(

    @Application applicationScope: CoroutineScope,

    private val context: Context,

    private val mediaControlPanelFactory: Provider<MediaControlPanel>,

    private val visualStabilityProvider: VisualStabilityProvider,
@@ -387,12 +389,12 @@ constructor( 
            repeatOnLifecycle(Lifecycle.State.STARTED) {

                listenForAnyStateToGoneKeyguardTransition(this)

                listenForAnyStateToLockscreenTransition(this)

                listenForLockscreenSettingChanges(this)



                if (!mediaFlags.isMediaControlsRefactorEnabled()) return@repeatOnLifecycle

                listenForMediaItemsChanges(this)

            }

        }

        listenForLockscreenSettingChanges(applicationScope)



        // Notifies all active players about animation scale changes.

        globalSettings.registerContentObserver(
@@ -882,8 +884,7 @@ constructor( 
                    val previousVisibleIndex =

                        MediaPlayerData.playerKeys().indexOfFirst { key -> it == key }

                    mediaCarouselScrollHandler.scrollToPlayer(previousVisibleIndex, mediaIndex)

                }

                    ?: mediaCarouselScrollHandler.scrollToPlayer(destIndex = mediaIndex)

                } ?: mediaCarouselScrollHandler.scrollToPlayer(destIndex = mediaIndex)

            }

        } else if (isRtl && mediaContent.childCount > 0) {

            // In RTL, Scroll to the first player as it is the rightmost player in media carousel.

packages/SystemUI/tests/src/com/android/systemui/media/controls/ui/controller/MediaCarouselControllerTest.kt

+10 −2
Original line number Diff line number Diff line
@@ -40,6 +40,7 @@ import com.android.systemui.flags.fakeFeatureFlagsClassic 
import com.android.systemui.keyguard.data.repository.fakeKeyguardTransitionRepository

import com.android.systemui.keyguard.domain.interactor.keyguardTransitionInteractor

import com.android.systemui.keyguard.shared.model.KeyguardState

import com.android.systemui.kosmos.applicationCoroutineScope

import com.android.systemui.kosmos.testDispatcher

import com.android.systemui.kosmos.testScope

import com.android.systemui.media.controls.MediaTestUtils
@@ -158,6 +159,7 @@ class MediaCarouselControllerTest : SysuiTestCase() { 
        testDispatcher = UnconfinedTestDispatcher()

        mediaCarouselController =

            MediaCarouselController(

                applicationScope = kosmos.applicationCoroutineScope,

                context = context,

                mediaControlPanelFactory = mediaControlPanelFactory,

                visualStabilityProvider = visualStabilityProvider,
@@ -893,7 +895,10 @@ class MediaCarouselControllerTest : SysuiTestCase() { 
            mediaCarouselController.updateHostVisibility = { updatedVisibility = true }

            mediaCarouselController.mediaCarousel = mediaCarousel



            val settingsJob = mediaCarouselController.listenForLockscreenSettingChanges(this)

            val settingsJob =

                mediaCarouselController.listenForLockscreenSettingChanges(

                    kosmos.applicationCoroutineScope

                )

            secureSettings.putBool(Settings.Secure.MEDIA_CONTROLS_LOCK_SCREEN, false)



            val keyguardJob = mediaCarouselController.listenForAnyStateToLockscreenTransition(this)
@@ -920,7 +925,10 @@ class MediaCarouselControllerTest : SysuiTestCase() { 
            mediaCarouselController.updateHostVisibility = { updatedVisibility = true }

            mediaCarouselController.mediaCarousel = mediaCarousel



            val settingsJob = mediaCarouselController.listenForLockscreenSettingChanges(this)

            val settingsJob =

                mediaCarouselController.listenForLockscreenSettingChanges(

                    kosmos.applicationCoroutineScope

                )

            secureSettings.putBool(Settings.Secure.MEDIA_CONTROLS_LOCK_SCREEN, true)



            val keyguardJob = mediaCarouselController.listenForAnyStateToLockscreenTransition(this)