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

Commit d05f1f72 authored by Michael Mikhail's avatar Michael Mikhail Committed by Android (Google) Code Review
Browse files

Revert "Move listener to lockscreen setting to application scope" 

This reverts commit 1c048583.

Reason for revert: b/344388050

Change-Id: I5bb86804bbf48a87b0f8bf3df7fc50187ff5445b
parent 1c048583

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

+3 −4
Original line number Diff line number Diff line
@@ -42,7 +42,6 @@ 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
@@ -124,7 +123,6 @@ 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,
@@ -389,12 +387,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(
@@ -884,7 +882,8 @@ 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

+2 −10
Original line number Diff line number Diff line
@@ -40,7 +40,6 @@ 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
@@ -159,7 +158,6 @@ class MediaCarouselControllerTest : SysuiTestCase() { 
        testDispatcher = UnconfinedTestDispatcher()

        mediaCarouselController =

            MediaCarouselController(

                applicationScope = kosmos.applicationCoroutineScope,

                context = context,

                mediaControlPanelFactory = mediaControlPanelFactory,

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

            mediaCarouselController.mediaCarousel = mediaCarousel



            val settingsJob =

                mediaCarouselController.listenForLockscreenSettingChanges(

                    kosmos.applicationCoroutineScope

                )

            val settingsJob = mediaCarouselController.listenForLockscreenSettingChanges(this)

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



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

            mediaCarouselController.mediaCarousel = mediaCarousel



            val settingsJob =

                mediaCarouselController.listenForLockscreenSettingChanges(

                    kosmos.applicationCoroutineScope

                )

            val settingsJob = mediaCarouselController.listenForLockscreenSettingChanges(this)

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



            val keyguardJob = mediaCarouselController.listenForAnyStateToLockscreenTransition(this)