From cb5ce3c3eceb1deeec209af6a0c606af98bdab0b Mon Sep 17 00:00:00 2001 From: Sukesh Ram Date: Thu, 19 Dec 2024 14:33:27 -0800 Subject: [PATCH] [CD Taskbar] Pass displayId to TouchInteractionService for per-display wallpaper updates Modified TouchInteractionService.updateWallpaperVisibility() to accept a displayId parameter. This allows TaskbarManager to apply wallpaper visibility changes (e.g., dimming) on a per-display basis, ensuring correct behavior with multiple connected displays. This change addresses the issue where wallpaper dimming was not being applied correctly on secondary displays when the Taskbar was visible. Bug: 385200423 Test: Manual Flag: EXEMPT not adding behavior Change-Id: I72ddeb6df29f84c16f91d5c6de446266bee98342 --- .../src/com/android/launcher3/taskbar/TaskbarManager.java | 7 +++++-- .../com/android/quickstep/TouchInteractionService.java | 8 ++++---- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarManager.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarManager.java index 9407e73936..cb6c5e459e 100644 --- a/quickstep/src/com/android/launcher3/taskbar/TaskbarManager.java +++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarManager.java @@ -590,9 +590,12 @@ public class TaskbarManager { } } - public void setWallpaperVisible(boolean isVisible) { + /** + * Sets wallpaper visibility for specific display. + */ + public void setWallpaperVisible(int displayId, boolean isVisible) { mSharedState.wallpaperVisible = isVisible; - TaskbarActivityContext taskbar = getTaskbarForDisplay(getDefaultDisplayId()); + TaskbarActivityContext taskbar = getTaskbarForDisplay(displayId); if (taskbar != null) { taskbar.setWallpaperVisible(isVisible); } diff --git a/quickstep/src/com/android/quickstep/TouchInteractionService.java b/quickstep/src/com/android/quickstep/TouchInteractionService.java index 4ddbcdb4e1..b0618418fd 100644 --- a/quickstep/src/com/android/quickstep/TouchInteractionService.java +++ b/quickstep/src/com/android/quickstep/TouchInteractionService.java @@ -309,10 +309,10 @@ public class TouchInteractionService extends Service { @BinderThread @Override public void updateWallpaperVisibility(int displayId, boolean visible) { - MAIN_EXECUTOR.execute(() -> executeForTouchInteractionService(tis -> - executeForTaskbarManager( - taskbarManager -> taskbarManager.setWallpaperVisible(visible)) - )); + MAIN_EXECUTOR.execute(() -> executeForTouchInteractionService( + tis -> executeForTaskbarManager( + taskbarManager -> taskbarManager.setWallpaperVisible(displayId, + visible)))); } @BinderThread