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

Commit 358fef93 authored by Beth Thibodeau's avatar Beth Thibodeau
Browse files

[Flexiglass] Simplify flagging references 

Remove redundant method in MediaFlags, and update tests to use annotations

Bug: 296122467
Flag: com.android.systemui.scene_container
Test: atest com.android.systemui.media.controls
Change-Id: Ic5253ad9ba9356b30e83d04b2a9a32e9b968fe22
parent efe333be

packages/SystemUI/src/com/android/systemui/media/controls/domain/MediaDomainModule.kt

+2 −3
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ import com.android.systemui.media.controls.domain.pipeline.LegacyMediaDataManage 
import com.android.systemui.media.controls.domain.pipeline.MediaDataManager

import com.android.systemui.media.controls.domain.pipeline.MediaDataProcessor

import com.android.systemui.media.controls.domain.pipeline.interactor.MediaCarouselInteractor

import com.android.systemui.media.controls.util.MediaFlags

import com.android.systemui.scene.shared.flag.SceneContainerFlag

import dagger.Binds

import dagger.Module

import dagger.Provides
@@ -51,9 +51,8 @@ interface MediaDomainModule { 
        fun providesMediaDataManager(

            legacyProvider: Provider<LegacyMediaDataManagerImpl>,

            newProvider: Provider<MediaCarouselInteractor>,

            mediaFlags: MediaFlags,

        ): MediaDataManager {

            return if (mediaFlags.isSceneContainerEnabled()) {

            return if (SceneContainerFlag.isEnabled) {

                newProvider.get()

            } else {

                legacyProvider.get()

packages/SystemUI/src/com/android/systemui/media/controls/domain/pipeline/MediaDataProcessor.kt

+2 −1
Original line number Diff line number Diff line
@@ -91,6 +91,7 @@ import com.android.systemui.media.controls.util.SmallHash 
import com.android.systemui.plugins.ActivityStarter

import com.android.systemui.plugins.BcSmartspaceDataPlugin

import com.android.systemui.res.R

import com.android.systemui.scene.shared.flag.SceneContainerFlag

import com.android.systemui.statusbar.NotificationMediaManager.isConnectingState

import com.android.systemui.statusbar.NotificationMediaManager.isPlayingState

import com.android.systemui.statusbar.notification.row.HybridGroupManager
@@ -272,7 +273,7 @@ class MediaDataProcessor( 
        }



    override fun start() {

        if (!mediaFlags.isSceneContainerEnabled()) {

        if (!SceneContainerFlag.isEnabled) {

            return

        }

packages/SystemUI/src/com/android/systemui/media/controls/domain/pipeline/interactor/MediaCarouselInteractor.kt

+1 −1
Original line number Diff line number Diff line
@@ -105,7 +105,7 @@ constructor( 
    val currentMedia: StateFlow<List<MediaCommonModel>> = mediaFilterRepository.currentMedia



    override fun start() {

        if (!mediaFlags.isSceneContainerEnabled()) {

        if (!SceneContainerFlag.isEnabled) {

            return

        }

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

+12 −12
Original line number Diff line number Diff line
@@ -220,7 +220,7 @@ constructor( 
    private val animationScaleObserver: ContentObserver =

        object : ContentObserver(executor, 0) {

            override fun onChange(selfChange: Boolean) {

                if (!mediaFlags.isSceneContainerEnabled()) {

                if (!SceneContainerFlag.isEnabled) {

                    MediaPlayerData.players().forEach { it.updateAnimatorDurationScale() }

                } else {

                    controllerById.values.forEach { it.updateAnimatorDurationScale() }
@@ -350,7 +350,7 @@ constructor( 
        inflateSettingsButton()

        mediaContent = mediaCarousel.requireViewById(R.id.media_carousel)

        configurationController.addCallback(configListener)

        if (!mediaFlags.isSceneContainerEnabled()) {

        if (!SceneContainerFlag.isEnabled) {

            setUpListeners()

        } else {

            val visualStabilityCallback = OnReorderingAllowedListener {
@@ -391,7 +391,7 @@ constructor( 
                listenForAnyStateToGoneKeyguardTransition(this)

                listenForAnyStateToLockscreenTransition(this)



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

                if (!SceneContainerFlag.isEnabled) return@repeatOnLifecycle

                listenForMediaItemsChanges(this)

            }

        }
@@ -733,7 +733,7 @@ constructor( 
        when (commonViewModel) {

            is MediaCommonViewModel.MediaControl -> {

                val viewHolder = MediaViewHolder.create(LayoutInflater.from(context), mediaContent)

                if (mediaFlags.isSceneContainerEnabled()) {

                if (SceneContainerFlag.isEnabled) {

                    viewController.widthInSceneContainerPx = widthInSceneContainerPx

                    viewController.heightInSceneContainerPx = heightInSceneContainerPx

                }
@@ -965,7 +965,7 @@ constructor( 
                    .elementAtOrNull(mediaCarouselScrollHandler.visibleMediaIndex)

            if (existingPlayer == null) {

                val newPlayer = mediaControlPanelFactory.get()

                if (mediaFlags.isSceneContainerEnabled()) {

                if (SceneContainerFlag.isEnabled) {

                    newPlayer.mediaViewController.widthInSceneContainerPx = widthInSceneContainerPx

                    newPlayer.mediaViewController.heightInSceneContainerPx =

                        heightInSceneContainerPx
@@ -1140,7 +1140,7 @@ constructor( 
    }



    private fun updatePlayers(recreateMedia: Boolean) {

        if (mediaFlags.isSceneContainerEnabled()) {

        if (SceneContainerFlag.isEnabled) {

            updateMediaPlayers(recreateMedia)

            return

        }
@@ -1240,7 +1240,7 @@ constructor( 
            currentStartLocation = startLocation

            currentEndLocation = endLocation

            currentTransitionProgress = progress

            if (!mediaFlags.isSceneContainerEnabled()) {

            if (!SceneContainerFlag.isEnabled) {

                for (mediaPlayer in MediaPlayerData.players()) {

                    updateViewControllerToState(mediaPlayer.mediaViewController, immediately)

                }
@@ -1300,7 +1300,7 @@ constructor( 


    /** Update listening to seekbar. */

    private fun updateSeekbarListening(visibleToUser: Boolean) {

        if (!mediaFlags.isSceneContainerEnabled()) {

        if (!SceneContainerFlag.isEnabled) {

            for (player in MediaPlayerData.players()) {

                player.setListening(visibleToUser && currentlyExpanded)

            }
@@ -1313,7 +1313,7 @@ constructor( 
    private fun updateCarouselDimensions() {

        var width = 0

        var height = 0

        if (!mediaFlags.isSceneContainerEnabled()) {

        if (!SceneContainerFlag.isEnabled) {

            for (mediaPlayer in MediaPlayerData.players()) {

                val controller = mediaPlayer.mediaViewController

                // When transitioning the view to gone, the view gets smaller, but the translation
@@ -1405,7 +1405,7 @@ constructor( 
                        !mediaManager.hasActiveMediaOrRecommendation() &&

                        desiredHostState.showsOnlyActiveMedia



                if (!mediaFlags.isSceneContainerEnabled()) {

                if (!SceneContainerFlag.isEnabled) {

                    for (mediaPlayer in MediaPlayerData.players()) {

                        if (animate) {

                            mediaPlayer.mediaViewController.animatePendingStateChange(
@@ -1445,7 +1445,7 @@ constructor( 
        }



    fun closeGuts(immediate: Boolean = true) {

        if (!mediaFlags.isSceneContainerEnabled()) {

        if (!SceneContainerFlag.isEnabled) {

            MediaPlayerData.players().forEach { it.closeGuts(immediate) }

        } else {

            controllerById.values.forEach { it.closeGuts(immediate) }
@@ -1596,7 +1596,7 @@ constructor( 


    @VisibleForTesting

    fun onSwipeToDismiss() {

        if (mediaFlags.isSceneContainerEnabled()) {

        if (SceneContainerFlag.isEnabled) {

            mediaCarouselViewModel.onSwipeToDismiss(currentEndLocation)

            return

        }

packages/SystemUI/src/com/android/systemui/media/controls/ui/controller/MediaControlPanel.java

+4 −7
Original line number Diff line number Diff line
@@ -111,7 +111,6 @@ import com.android.systemui.media.controls.ui.view.MediaViewHolder; 
import com.android.systemui.media.controls.ui.view.RecommendationViewHolder;

import com.android.systemui.media.controls.ui.viewmodel.SeekBarViewModel;

import com.android.systemui.media.controls.util.MediaDataUtils;

import com.android.systemui.media.controls.util.MediaFlags;

import com.android.systemui.media.controls.util.MediaUiEventLogger;

import com.android.systemui.media.controls.util.SmallHash;

import com.android.systemui.media.dialog.MediaOutputDialogManager;
@@ -120,6 +119,7 @@ import com.android.systemui.monet.Style; 
import com.android.systemui.plugins.ActivityStarter;

import com.android.systemui.plugins.FalsingManager;

import com.android.systemui.res.R;

import com.android.systemui.scene.shared.flag.SceneContainerFlag;

import com.android.systemui.shared.system.SysUiStatsLog;

import com.android.systemui.statusbar.NotificationLockscreenUserManager;

import com.android.systemui.statusbar.policy.KeyguardStateController;
@@ -209,7 +209,6 @@ public class MediaControlPanel { 
    static final long TURBULENCE_NOISE_PLAY_DURATION = 7500L;



    private final SeekBarViewModel mSeekBarViewModel;

    private final MediaFlags mMediaFlags;

    private final CommunalSceneInteractor mCommunalSceneInteractor;

    private SeekBarObserver mSeekBarObserver;

    protected final Executor mBackgroundExecutor;
@@ -323,8 +322,7 @@ public class MediaControlPanel { 
            CommunalSceneInteractor communalSceneInteractor,

            NotificationLockscreenUserManager lockscreenUserManager,

            BroadcastDialogController broadcastDialogController,

            GlobalSettings globalSettings,

            MediaFlags mediaFlags

            GlobalSettings globalSettings

    ) {

        mContext = context;

        mBackgroundExecutor = backgroundExecutor;
@@ -343,7 +341,6 @@ public class MediaControlPanel { 
        mActivityIntentHelper = activityIntentHelper;

        mLockscreenUserManager = lockscreenUserManager;

        mBroadcastDialogController = broadcastDialogController;

        mMediaFlags = mediaFlags;

        mCommunalSceneInteractor = communalSceneInteractor;



        mSeekBarViewModel.setLogSeek(() -> {
@@ -641,7 +638,7 @@ public class MediaControlPanel { 
        // State refresh interferes with the translation animation, only run it if it's not running.

        if (!mMetadataAnimationHandler.isRunning()) {

            // Don't refresh in scene framework, because it will calculate with invalid layout sizes

            if (!mMediaFlags.isSceneContainerEnabled()) {

            if (!SceneContainerFlag.isEnabled()) {

                mMediaViewController.refreshState();

            }

        }
@@ -909,7 +906,7 @@ public class MediaControlPanel { 
        // Capture width & height from views in foreground for artwork scaling in background

        int width = mMediaViewHolder.getAlbumView().getMeasuredWidth();

        int height = mMediaViewHolder.getAlbumView().getMeasuredHeight();

        if (mMediaFlags.isSceneContainerEnabled() && (width <= 0 || height <= 0)) {

        if (SceneContainerFlag.isEnabled() && (width <= 0 || height <= 0)) {

            // TODO(b/312714128): ensure we have a valid size before setting background

            width = mMediaViewController.getWidthInSceneContainerPx();

            height = mMediaViewController.getHeightInSceneContainerPx();