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

Commit d6aea705 authored by András Kurucz's avatar András Kurucz Committed by Android (Google) Code Review
Browse files

Merge "[Flexiglass] Don't add MediaContainerView to the NSSL" into main

parents ad03e9a1 5d890391

packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/notification/collection/render/NodeSpecBuilderTest.kt

+8 −2
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ package com.android.systemui.statusbar.notification.collection.render 
import androidx.test.ext.junit.runners.AndroidJUnit4

import androidx.test.filters.SmallTest

import com.android.systemui.SysuiTestCase

import com.android.systemui.flags.DisableSceneContainer

import com.android.systemui.log.logcatLogBuffer

import com.android.systemui.statusbar.notification.NotificationSectionsFeatureManager

import com.android.systemui.statusbar.notification.OnboardingAffordanceManager
@@ -38,7 +39,6 @@ import com.android.systemui.statusbar.notification.stack.BUCKET_SILENT 
import com.android.systemui.statusbar.notification.stack.PriorityBucket

import com.android.systemui.util.mockito.any

import com.android.systemui.util.mockito.mock

import org.junit.Assert

import org.junit.Assert.assertThrows

import org.junit.Before

import org.junit.Test
@@ -121,7 +121,12 @@ class NodeSpecBuilderTest : SysuiTestCase() { 
        whenever(sectionHeaderVisibilityProvider.sectionHeadersVisible).thenReturn(true)

        assertThrows(RuntimeException::class.java) {

            checkOutput(

                listOf(notif(0, section0), notif(1, section1), notif(2, section3), notif(3, section1)),

                listOf(

                    notif(0, section0),

                    notif(1, section1),

                    notif(2, section3),

                    notif(3, section1),

                ),

                tree(),

            )

        }
@@ -145,6 +150,7 @@ class NodeSpecBuilderTest : SysuiTestCase() { 
    }



    @Test

    @DisableSceneContainer

    fun testSimpleMappingWithMedia() {

        whenever(sectionHeaderVisibilityProvider.sectionHeadersVisible).thenReturn(true)

        // WHEN media controls are enabled

packages/SystemUI/src/com/android/systemui/statusbar/notification/NotificationSectionsFeatureManager.kt

+3 −1
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ package com.android.systemui.statusbar.notification 


import android.content.Context

import com.android.systemui.dagger.SysUISingleton

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

import com.android.systemui.shade.ShadeDisplayAware

import com.android.systemui.util.Utils

import javax.inject.Inject
@@ -28,6 +29,7 @@ class NotificationSectionsFeatureManager 
constructor(@ShadeDisplayAware val context: Context) {



    fun isMediaControlsEnabled(): Boolean {

        return Utils.useQsMediaPlayer(context)

        // in SceneContainer media is not hosted by the NSSL, so we don't need a a node for it

        return !SceneContainerFlag.isEnabled && Utils.useQsMediaPlayer(context)

    }

}