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

Commit b31f7112 authored by Alina Zaidi's avatar Alina Zaidi
Browse files

Check windowManager#shouldShowSystemDecors on onDisplayAddSystemDecorations callbacks 

Before the CD project, ie when content mode flag is OFF, onDisplayAddSystemDecorations() is always sent to status bar upon a new display is created.

Test: atest com.android.systemui.display.data.repository.DisplayRepositoryTest
Bug: 424787145
Flag: com.android.systemui.shared.status_bar_connected_displays
Change-Id: Ia34636cbd011fa21496a4a398a08ee58224b8fdf
parent e85351bd

displaylib/src/com/android/app/displaylib/DisplaysWithDecorationsRepository.kt

+8 −1
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ import android.content.res.Configuration 
import android.graphics.Rect

import android.view.IDisplayWindowListener

import android.view.IWindowManager

import android.window.DesktopExperienceFlags.ENABLE_DISPLAY_CONTENT_MODE_MANAGEMENT

import javax.inject.Inject

import javax.inject.Singleton

import kotlinx.coroutines.CoroutineScope
@@ -53,7 +54,13 @@ constructor( 
        val callback =

            object : IDisplayWindowListener.Stub() {

                override fun onDisplayAddSystemDecorations(displayId: Int) {

                    if (ENABLE_DISPLAY_CONTENT_MODE_MANAGEMENT.isTrue()) {

                        trySend(Event.Add(displayId))

                    } else {

                        if (windowManager.shouldShowSystemDecors(displayId)) {

                            trySend(Event.Add(displayId))

                        }

                    }

                }



                override fun onDisplayRemoveSystemDecorations(displayId: Int) {