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

Commit 1e7ebab8 authored by James O'Leary's avatar James O'Leary Committed by android-build-merger
Browse files

Merge "Don't tell Assistant to hide on gesture completion or cancel" into qt-r1-dev 

am: bea597d4

Change-Id: I51fe118677fdfb8fd88c64c66738bd99afeaf680
parents 98fe256c bea597d4

packages/SystemUI/src/com/android/systemui/assist/AssistManager.java

+1 −1
Original line number Diff line number Diff line
@@ -82,7 +82,7 @@ public class AssistManager implements ConfigurationChangedReceiver { 
        void processBundle(Bundle hints);



        /**

         * Hides the UI.

         * Hides any SysUI for the assistant, but _does not_ close the assistant itself.

         */

        void hide();

    }

packages/SystemUI/src/com/android/systemui/assist/ui/DefaultUiController.java

+0 −1
Original line number Diff line number Diff line
@@ -118,7 +118,6 @@ public class DefaultUiController implements AssistManager.UiController { 


    @Override // AssistManager.UiController

    public void hide() {

        Dependency.get(AssistManager.class).hideAssist();

        detach();

        if (mInvocationAnimator.isRunning()) {

            mInvocationAnimator.cancel();