PawletOS/Lawnchair
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Check both content mode and sys decor flag to get system decoration callbacks from window manager.

Browse Source 
This is needed as there is no guarantee content mode will be enabled everytime sys decor flag is enabled.

Bug: 422070126
Test: NA
Flag: EXEMPT bug fix
Change-Id: I6bb85e320448448bc7ce1756250a81747f0cbb42
This commit is contained in:
Ebru Kurnaz
2025-06-03 16:18:39 +00:00
parent 4851c5cab9
commit b4f2db4051
2 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
quickstep/src/com/android/launcher3/taskbar/TaskbarManagerImpl.java
+4 -2
View File
@@ -484,7 +484,8 @@ public class TaskbarManagerImpl implements DisplayDecorationListener {
.register(USER_SETUP_COMPLETE_URI, mOnSettingsChangeListener);
SettingsCache.INSTANCE.get(mPrimaryWindowContext)
.register(NAV_BAR_KIDS_MODE, mOnSettingsChangeListener);
if (DesktopExperienceFlags.ENABLE_SYS_DECORS_CALLBACKS_VIA_WM.isTrue()) {
if (DesktopExperienceFlags.ENABLE_SYS_DECORS_CALLBACKS_VIA_WM.isTrue()
&& DesktopExperienceFlags.ENABLE_DISPLAY_CONTENT_MODE_MANAGEMENT.isTrue()) {
displaysWithDecorationsRepositoryCompat
.registerDisplayDecorationListener(this, dispatcher);
} else {
@@ -1176,7 +1177,8 @@ public class TaskbarManagerImpl implements DisplayDecorationListener {
.unregister(USER_SETUP_COMPLETE_URI, mOnSettingsChangeListener);
SettingsCache.INSTANCE.get(mPrimaryWindowContext)
.unregister(NAV_BAR_KIDS_MODE, mOnSettingsChangeListener);
if (DesktopExperienceFlags.ENABLE_SYS_DECORS_CALLBACKS_VIA_WM.isTrue()) {
if (DesktopExperienceFlags.ENABLE_SYS_DECORS_CALLBACKS_VIA_WM.isTrue()
&& DesktopExperienceFlags.ENABLE_DISPLAY_CONTENT_MODE_MANAGEMENT.isTrue()) {
mDisplaysWithDecorationsRepositoryCompat.unregisterDisplayDecorationListener(this);
} else {
SystemDecorationChangeObserver.getINSTANCE().get(mPrimaryWindowContext)
quickstep/src/com/android/quickstep/DisplayModel.kt
+4 -1
View File
@@ -64,7 +64,10 @@ abstract class DisplayModel<RESOURCE_TYPE : DisplayResource>(
protected abstract fun createDisplayResource(display: Display): RESOURCE_TYPE
protected fun initializeDisplays() {
if (DesktopExperienceFlags.ENABLE_SYS_DECORS_CALLBACKS_VIA_WM.isTrue()) {
if (
DesktopExperienceFlags.ENABLE_SYS_DECORS_CALLBACKS_VIA_WM.isTrue() &&
DesktopExperienceFlags.ENABLE_DISPLAY_CONTENT_MODE_MANAGEMENT.isTrue()
) {
displaysWithDecorationsRepositoryCompat.registerDisplayDecorationListener(
this,
dispatcher,