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

Commit 5d890391 authored by András Kurucz's avatar András Kurucz
Browse files

[Flexiglass] Don't add MediaContainerView to the NSSL 

NSSL had a 0 height, but visible MediaContainerView, which produced
a spacing gap after it, which offsetted the whole stack wrongly.

The new compose version of MediaContainerView doesn't use the NSSL
to place it, so it is safe to remove it now.

Fixes: 443055172
Fixes: 443052463
Test: check the paddings when media in compose is enabled
Flag: com.android.systemui.scene_container

Change-Id: Ib6f079aa39cbdf41828f1560b9642ecb70012bc5
parent 96f6c51e

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)

    }

}