From 29a430fc2177ab99050e6855c8e69f0f3d1dbeb3 Mon Sep 17 00:00:00 2001 From: Sukesh Ram Date: Tue, 5 Nov 2024 00:48:43 +0000 Subject: [PATCH] [Connected Displays in Taskbar] Refactor TaskbarDelegate for Display Signals Refactor the TaskbarDelegate to support multiple pass down displayId specific signals down to the taskbar level. Flag: EXEMPT not adding new behavior Bug: 376128251 Test: Manual Change-Id: I61aef4eb746d671be69eefeb15d876d48dd9a8fa --- .../launcher3/taskbar/TaskbarManager.java | 8 +-- .../quickstep/TouchInteractionService.java | 56 +++++++++---------- 2 files changed, 32 insertions(+), 32 deletions(-) diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarManager.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarManager.java index ab4b1b6b5a..fa54f7cea5 100644 --- a/quickstep/src/com/android/launcher3/taskbar/TaskbarManager.java +++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarManager.java @@ -560,25 +560,25 @@ public class TaskbarManager { } } - public void checkNavBarModes() { + public void checkNavBarModes(int displayId) { if (mTaskbarActivityContext != null) { mTaskbarActivityContext.checkNavBarModes(); } } - public void finishBarAnimations() { + public void finishBarAnimations(int displayId) { if (mTaskbarActivityContext != null) { mTaskbarActivityContext.finishBarAnimations(); } } - public void touchAutoDim(boolean reset) { + public void touchAutoDim(int displayId, boolean reset) { if (mTaskbarActivityContext != null) { mTaskbarActivityContext.touchAutoDim(reset); } } - public void transitionTo(@BarTransitions.TransitionMode int barMode, + public void transitionTo(int displayId, @BarTransitions.TransitionMode int barMode, boolean animate) { if (mTaskbarActivityContext != null) { mTaskbarActivityContext.transitionTo(barMode, animate); diff --git a/quickstep/src/com/android/quickstep/TouchInteractionService.java b/quickstep/src/com/android/quickstep/TouchInteractionService.java index e8f38be88b..5b085d2185 100644 --- a/quickstep/src/com/android/quickstep/TouchInteractionService.java +++ b/quickstep/src/com/android/quickstep/TouchInteractionService.java @@ -342,36 +342,36 @@ public class TouchInteractionService extends Service { @BinderThread @Override - public void checkNavBarModes() { - MAIN_EXECUTOR.execute(() -> executeForTouchInteractionService(tis -> - executeForTaskbarManager(TaskbarManager::checkNavBarModes) - )); - } - - @BinderThread - @Override - public void finishBarAnimations() { - MAIN_EXECUTOR.execute(() -> executeForTouchInteractionService(tis -> - executeForTaskbarManager(TaskbarManager::finishBarAnimations) - )); - } - - @BinderThread - @Override - public void touchAutoDim(boolean reset) { - MAIN_EXECUTOR.execute(() -> executeForTouchInteractionService(tis -> - executeForTaskbarManager(taskbarManager -> taskbarManager.touchAutoDim(reset)) - )); - } - - @BinderThread - @Override - public void transitionTo(@BarTransitions.TransitionMode int barMode, - boolean animate) { + public void checkNavBarModes(int displayId) { MAIN_EXECUTOR.execute(() -> executeForTouchInteractionService(tis -> executeForTaskbarManager( - taskbarManager -> taskbarManager.transitionTo(barMode, animate)) - )); + taskbarManager -> taskbarManager.checkNavBarModes(displayId)))); + } + + @BinderThread + @Override + public void finishBarAnimations(int displayId) { + MAIN_EXECUTOR.execute(() -> executeForTouchInteractionService( + tis -> executeForTaskbarManager( + taskbarManager -> taskbarManager.finishBarAnimations(displayId)))); + } + + @BinderThread + @Override + public void touchAutoDim(int displayId, boolean reset) { + MAIN_EXECUTOR.execute(() -> executeForTouchInteractionService( + tis -> executeForTaskbarManager( + taskbarManager -> taskbarManager.touchAutoDim(displayId, reset)))); + } + + @BinderThread + @Override + public void transitionTo(int displayId, @BarTransitions.TransitionMode int barMode, + boolean animate) { + MAIN_EXECUTOR.execute(() -> executeForTouchInteractionService( + tis -> executeForTaskbarManager( + taskbarManager -> taskbarManager.transitionTo(displayId, barMode, + animate)))); } @BinderThread