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

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

Merge "Add recommendation view holder to controller" into main

parents 7e19e149 e636d3f1

packages/SystemUI/src/com/android/systemui/media/controls/ui/binder/MediaRecommendationsViewBinder.kt

+1 −1
Original line number Diff line number Diff line
@@ -239,7 +239,7 @@ object MediaRecommendationsViewBinder { 
        set.setAlpha(resId, if (visible) 1.0f else 0.0f)

    }



    private fun updateRecommendationsVisibility(

    fun updateRecommendationsVisibility(

        mediaViewController: MediaViewController,

        cardView: TransitionLayout,

    ) {

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

+14 −1
Original line number Diff line number Diff line
@@ -37,6 +37,7 @@ import com.android.systemui.dagger.qualifiers.Main 
import com.android.systemui.media.controls.ui.animation.ColorSchemeTransition

import com.android.systemui.media.controls.ui.animation.MetadataAnimationHandler

import com.android.systemui.media.controls.ui.binder.MediaControlViewBinder

import com.android.systemui.media.controls.ui.binder.MediaRecommendationsViewBinder

import com.android.systemui.media.controls.ui.binder.SeekBarObserver

import com.android.systemui.media.controls.ui.controller.MediaCarouselController.Companion.calculateAlpha

import com.android.systemui.media.controls.ui.view.GutsViewHolder
@@ -185,7 +186,10 @@ constructor( 
    private var nextNotVisibleValue = ConstraintSet.GONE

    private var isNextButtonAvailable = false



    private lateinit var mediaViewHolder: MediaViewHolder

    /** View holders for controller */

    lateinit var recommendationViewHolder: RecommendationViewHolder

    lateinit var mediaViewHolder: MediaViewHolder



    private lateinit var seekBarObserver: SeekBarObserver

    private lateinit var turbulenceNoiseController: TurbulenceNoiseController

    private lateinit var loadingEffect: LoadingEffect
@@ -788,6 +792,15 @@ constructor( 
        }

    }



    fun attachRecommendations(recommendationViewHolder: RecommendationViewHolder) {

        if (!mediaFlags.isMediaControlsRefactorEnabled()) return

        this.recommendationViewHolder = recommendationViewHolder



        attach(recommendationViewHolder.recommendations, TYPE.RECOMMENDATION)

        recsConfigurationChangeListener =

            MediaRecommendationsViewBinder::updateRecommendationsVisibility

    }



    fun bindSeekBar(onSeek: () -> Unit, onBindSeekBar: (SeekBarViewModel) -> Unit) {

        if (!mediaFlags.isMediaControlsRefactorEnabled()) return

        seekBarViewModel.logSeek = onSeek