Merge "Add a test for stashed bubble bar" into main

This commit is contained in:
Liran Binyamin
2024-01-05 21:19:19 +00:00
committed by Android (Google) Code Review
4 changed files with 26 additions and 0 deletions

View File

@@ -1341,6 +1341,16 @@ public class TaskbarActivityContext extends BaseTaskbarContext {
}
}
/** Unstashes the Bubble Bar if it is stashed. */
@VisibleForTesting
public void unstashBubbleBarIfStashed() {
mControllers.bubbleControllers.ifPresent(bubbleControllers -> {
if (bubbleControllers.bubbleStashController.isStashed()) {
bubbleControllers.bubbleStashController.showBubbleBar(false);
}
});
}
protected boolean isUserSetupComplete() {
return mIsUserSetupComplete;
}

View File

@@ -160,6 +160,14 @@ public class QuickstepTestInformationHandler extends TestInformationHandler {
// Allow null-pointer to catch illegal states.
runOnTISBinder(tisBinder -> tisBinder.getTaskbarManager().recreateTaskbar());
return response;
case TestProtocol.REQUEST_UNSTASH_BUBBLE_BAR_IF_STASHED:
runOnTISBinder(tisBinder -> {
// Allow null-pointer to catch illegal states.
tisBinder.getTaskbarManager().getCurrentActivityContext()
.unstashBubbleBarIfStashed();
});
return response;
}
return super.call(method, arg, extras);

View File

@@ -174,6 +174,9 @@ public final class TestProtocol {
public static final String REQUEST_FLAG_ENABLE_GRID_ONLY_OVERVIEW = "enable-grid-only-overview";
public static final String REQUEST_UNSTASH_BUBBLE_BAR_IF_STASHED =
"unstash-bubble-bar-if-stashed";
/** Logs {@link Log#d(String, String)} if {@link #sDebugTracing} is true. */
public static void testLogD(String tag, String message) {
if (!sDebugTracing) {

View File

@@ -2160,6 +2160,11 @@ public final class LauncherInstrumentation {
getTestInfo(TestProtocol.REQUEST_UNSTASH_TASKBAR_IF_STASHED);
}
/** Shows the bubble bar if it is stashed, otherwise this does nothing. */
public void showBubbleBarIfHidden() {
getTestInfo(TestProtocol.REQUEST_UNSTASH_BUBBLE_BAR_IF_STASHED);
}
/** Blocks the taskbar from automatically stashing based on time. */
public void enableBlockTimeout(boolean enable) {
getTestInfo(enable