Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2049f399 authored by Jon Miranda's avatar Jon Miranda
Browse files

Use mContext instead of TaskbarActivityContex to enable transient taskbar.

Bug: 259586791
Bug: 259337908
Bug: 257549303
Test: TaplTestsTaskbar
Change-Id: Ibb0a8e8539946f3a496318a6a9cf4b553693d790
parent 1eb1e036
Loading
Loading
Loading
Loading
+4 −17
Original line number Diff line number Diff line
@@ -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);
    }

    /**