diff options
| author | 2019-08-02 10:38:19 -0700 | |
|---|---|---|
| committer | 2019-08-02 10:38:19 -0700 | |
| commit | 1e7ebab8b488d8140f1d305ff92102ab3e132eb7 (patch) | |
| tree | 4f86ff48432f02ef0bfbd6af0f5d4a3debc3e255 | |
| parent | 98fe256cefdcb7dfb18d0f845356944e00737cf8 (diff) | |
| parent | bea597d4044685c0b7dd672621639bf6351a900e (diff) | |
Merge "Don't tell Assistant to hide on gesture completion or cancel" into qt-r1-dev
am: bea597d404
Change-Id: I51fe118677fdfb8fd88c64c66738bd99afeaf680
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/assist/AssistManager.java | 2 | ||||
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/assist/ui/DefaultUiController.java | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/assist/AssistManager.java b/packages/SystemUI/src/com/android/systemui/assist/AssistManager.java index 0b00b919f4f2..4a4feada3c65 100644 --- a/packages/SystemUI/src/com/android/systemui/assist/AssistManager.java +++ b/packages/SystemUI/src/com/android/systemui/assist/AssistManager.java @@ -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(); } diff --git a/packages/SystemUI/src/com/android/systemui/assist/ui/DefaultUiController.java b/packages/SystemUI/src/com/android/systemui/assist/ui/DefaultUiController.java index 662de3a5b5f5..0c4f05123c79 100644 --- a/packages/SystemUI/src/com/android/systemui/assist/ui/DefaultUiController.java +++ b/packages/SystemUI/src/com/android/systemui/assist/ui/DefaultUiController.java @@ -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(); |