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

Commit e10fc2a0 authored by Michael Mikhail's avatar Michael Mikhail Committed by Automerger Merge Worker
Browse files

Merge "Remove MEDIA_EXPLICIT_INDICATOR flag" into udc-qpr-dev am: 7edd53dc am: 4ee68a30 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23921323



Change-Id: Ibcab0203f85e3f871ccf1553f8f3134640c93cbd
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents f905c4cd 4ee68a30

packages/SystemUI/src/com/android/systemui/flags/Flags.kt

+0 −3
Original line number Diff line number Diff line
@@ -437,9 +437,6 @@ object Flags { 
    // TODO(b/263272731): Tracking Bug

    val MEDIA_TTT_RECEIVER_SUCCESS_RIPPLE = releasedFlag(910, "media_ttt_receiver_success_ripple")



    // TODO(b/263512203): Tracking Bug

    val MEDIA_EXPLICIT_INDICATOR = releasedFlag(911, "media_explicit_indicator")



    // TODO(b/265813373): Tracking Bug

    val MEDIA_TAP_TO_TRANSFER_DISMISS_GESTURE = releasedFlag(912, "media_ttt_dismiss_gesture")

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

+5 −8
Original line number Diff line number Diff line
@@ -716,8 +716,7 @@ class MediaDataManager( 
        val appUid = currentEntry?.appUid ?: Process.INVALID_UID

        val isExplicit =

            desc.extras?.getLong(MediaConstants.METADATA_KEY_IS_EXPLICIT) ==

                MediaConstants.METADATA_VALUE_ATTRIBUTE_PRESENT &&

                mediaFlags.isExplicitIndicatorEnabled()

                MediaConstants.METADATA_VALUE_ATTRIBUTE_PRESENT



        val progress =

            if (mediaFlags.isResumeProgressEnabled()) {
@@ -826,12 +825,10 @@ class MediaDataManager( 


        // Explicit Indicator

        var isExplicit = false

        if (mediaFlags.isExplicitIndicatorEnabled()) {

        val mediaMetadataCompat = MediaMetadataCompat.fromMediaMetadata(metadata)

        isExplicit =

            mediaMetadataCompat?.getLong(MediaConstants.METADATA_KEY_IS_EXPLICIT) ==

                MediaConstants.METADATA_VALUE_ATTRIBUTE_PRESENT

        }



        // Artist name

        var artist: CharSequence? = metadata?.getString(MediaMetadata.METADATA_KEY_ARTIST)

packages/SystemUI/src/com/android/systemui/media/controls/util/MediaFlags.kt

+0 −3
Original line number Diff line number Diff line
@@ -43,9 +43,6 @@ class MediaFlags @Inject constructor(private val featureFlags: FeatureFlags) { 
     */

    fun areNearbyMediaDevicesEnabled() = featureFlags.isEnabled(Flags.MEDIA_NEARBY_DEVICES)



    /** Check whether we show explicit indicator on UMO */

    fun isExplicitIndicatorEnabled() = featureFlags.isEnabled(Flags.MEDIA_EXPLICIT_INDICATOR)



    /**

     * If true, keep active media controls for the lifetime of the MediaSession, regardless of

     * whether the underlying notification was dismissed

packages/SystemUI/tests/src/com/android/systemui/media/controls/pipeline/MediaDataManagerTest.kt

+0 −1
Original line number Diff line number Diff line
@@ -261,7 +261,6 @@ class MediaDataManagerTest : SysuiTestCase() { 
        whenever(mediaSmartspaceTarget.creationTimeMillis).thenReturn(SMARTSPACE_CREATION_TIME)

        whenever(mediaSmartspaceTarget.expiryTimeMillis).thenReturn(SMARTSPACE_EXPIRY_TIME)

        whenever(mediaFlags.areMediaSessionActionsEnabled(any(), any())).thenReturn(false)

        whenever(mediaFlags.isExplicitIndicatorEnabled()).thenReturn(true)

        whenever(mediaFlags.isRetainingPlayersEnabled()).thenReturn(false)

        whenever(mediaFlags.isPersistentSsCardEnabled()).thenReturn(false)

        whenever(mediaFlags.isRemoteResumeAllowed()).thenReturn(false)

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

+0 −1
Original line number Diff line number Diff line
@@ -233,7 +233,6 @@ public class MediaControlPanelTest : SysuiTestCase() { 
        FakeFeatureFlags().apply {

            this.set(Flags.UMO_SURFACE_RIPPLE, false)

            this.set(Flags.UMO_TURBULENCE_NOISE, false)

            this.set(Flags.MEDIA_EXPLICIT_INDICATOR, true)

            this.set(Flags.MEDIA_RECOMMENDATION_CARD_UPDATE, false)

        }

    @Mock private lateinit var globalSettings: GlobalSettings