diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarNavButtonController.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarNavButtonController.java index fa1c789aba..ac4f565860 100644 --- a/quickstep/src/com/android/launcher3/taskbar/TaskbarNavButtonController.java +++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarNavButtonController.java @@ -121,6 +121,7 @@ public class TaskbarNavButtonController implements TaskbarControllers.LoggableTa private final SystemUiProxy mSystemUiProxy; private final Handler mHandler; private final ContextualSearchInvoker mContextualSearchInvoker; + private TaskbarControllers mControllers; @Nullable private StatsLogManager mStatsLogManager; private final Runnable mResetLongPress = this::resetScreenUnpin; @@ -305,7 +306,8 @@ public class TaskbarNavButtonController implements TaskbarControllers.LoggableTa } public void init(TaskbarControllers taskbarControllers) { - mStatsLogManager = taskbarControllers.getTaskbarActivityContext().getStatsLogManager(); + mControllers = taskbarControllers; + mStatsLogManager = mControllers.getTaskbarActivityContext().getStatsLogManager(); } public void onDestroy() { @@ -349,6 +351,7 @@ public class TaskbarNavButtonController implements TaskbarControllers.LoggableTa } long time = SystemClock.uptimeMillis(); KeyEvent keyEvent = new KeyEvent(time, time, action, KeyEvent.KEYCODE_BACK, 0); + keyEvent.setDisplayId(mControllers.getTaskbarActivityContext().getDisplayId()); if (cancelled) { keyEvent.cancel(); } diff --git a/quickstep/tests/multivalentTests/src/com/android/launcher3/taskbar/TaskbarNavButtonControllerTest.java b/quickstep/tests/multivalentTests/src/com/android/launcher3/taskbar/TaskbarNavButtonControllerTest.java index 0ac5ec7259..d2e144850c 100644 --- a/quickstep/tests/multivalentTests/src/com/android/launcher3/taskbar/TaskbarNavButtonControllerTest.java +++ b/quickstep/tests/multivalentTests/src/com/android/launcher3/taskbar/TaskbarNavButtonControllerTest.java @@ -110,6 +110,7 @@ public class TaskbarNavButtonControllerTest { when(mockTaskbarControllers.getTaskbarActivityContext()) .thenReturn(mockTaskbarActivityContext); doReturn(mockStatsLogManager).when(mockTaskbarActivityContext).getStatsLogManager(); + when(mockTaskbarActivityContext.getDisplayId()).thenReturn(DISPLAY_ID); mNavButtonController = new TaskbarNavButtonController( mockService, mCallbacks, @@ -343,6 +344,7 @@ public class TaskbarNavButtonControllerTest { @Test @RequiresFlagsEnabled(FLAG_PREDICTIVE_BACK_THREE_BUTTON_NAV) public void testPredictiveBackInvoked() { + mNavButtonController.init(mockTaskbarControllers); ArgumentCaptor keyEventCaptor = ArgumentCaptor.forClass(KeyEvent.class); mNavButtonController.sendBackKeyEvent(KeyEvent.ACTION_DOWN, false); mNavButtonController.sendBackKeyEvent(KeyEvent.ACTION_UP, false); @@ -354,6 +356,7 @@ public class TaskbarNavButtonControllerTest { @Test @RequiresFlagsEnabled(FLAG_PREDICTIVE_BACK_THREE_BUTTON_NAV) public void testPredictiveBackCancelled() { + mNavButtonController.init(mockTaskbarControllers); ArgumentCaptor keyEventCaptor = ArgumentCaptor.forClass(KeyEvent.class); mNavButtonController.sendBackKeyEvent(KeyEvent.ACTION_DOWN, false); mNavButtonController.sendBackKeyEvent(KeyEvent.ACTION_UP, true); @@ -365,6 +368,7 @@ public class TaskbarNavButtonControllerTest { @Test @RequiresFlagsEnabled(FLAG_PREDICTIVE_BACK_THREE_BUTTON_NAV) public void testButtonsDisabledWhileBackPressed() { + mNavButtonController.init(mockTaskbarControllers); mNavButtonController.sendBackKeyEvent(KeyEvent.ACTION_DOWN, false); mNavButtonController.onButtonClick(BUTTON_HOME, mockView); mNavButtonController.onButtonClick(BUTTON_RECENTS, mockView);