Merge "Use mContext instead of TaskbarActivityContex to enable transient taskbar." into tm-qpr-dev am: 4b26e8f081

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/20511769

Change-Id: If783c22198f860dee1e184040f3aa64dea9805e2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Jon Miranda
2022-11-18 03:41:01 +00:00
committed by Automerger Merge Worker

View File

@@ -138,15 +138,11 @@ public class QuickstepTestInformationHandler extends TestInformationHandler {
return response;
case TestProtocol.REQUEST_ENABLE_TRANSIENT_TASKBAR:
runOnTISBinder(tisBinder -> {
enableTransientTaskbar(tisBinder, true);
});
enableTransientTaskbar(true);
return response;
case TestProtocol.REQUEST_DISABLE_TRANSIENT_TASKBAR:
runOnTISBinder(tisBinder -> {
enableTransientTaskbar(tisBinder, false);
});
enableTransientTaskbar(false);
return response;
}
@@ -190,17 +186,8 @@ public class QuickstepTestInformationHandler extends TestInformationHandler {
}
}
private void enableTransientTaskbar(
TouchInteractionService.TISBinder tisBinder, boolean enable) {
TaskbarActivityContext context = tisBinder.getTaskbarManager().getCurrentActivityContext();
if (context == null) {
if (TestProtocol.sDebugTracing) {
Log.d(NPE_TRANSIENT_TASKBAR, "enableTransientTaskbar: enable=" + enable,
new Exception());
}
} else {
DisplayController.INSTANCE.get(context).enableTransientTaskbarForTests(enable);
}
private void enableTransientTaskbar(boolean enable) {
DisplayController.INSTANCE.get(mContext).enableTransientTaskbarForTests(enable);
}
/**