diff options
| author | Jorim Jaggi <jjaggi@google.com> | 2015-06-25 15:01:29 -0700 |
|---|---|---|
| committer | Jorim Jaggi <jjaggi@google.com> | 2015-06-25 22:39:53 +0000 |
| commit | 91617a793ed6a80f3abfd3653b0f74b9321fe0f6 (patch) | |
| tree | dc195fc3c110933b2858c6373ff7c08ab7730ce7 | |
| parent | 7e6571f13da776dca4966dee0159e7741102fca9 (diff) | |
| download | frameworks_base-91617a793ed6a80f3abfd3653b0f74b9321fe0f6.zip frameworks_base-91617a793ed6a80f3abfd3653b0f74b9321fe0f6.tar.gz frameworks_base-91617a793ed6a80f3abfd3653b0f74b9321fe0f6.tar.bz2 | |
Hide assist when launching an activity over an action
Also make sure to resume app switches in this case.
Bug: 22071080
Change-Id: Ib30e064f4a5d0768b608e23183a34e326ada32e6
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java b/packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java index 8d20772..3e66907 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java @@ -303,6 +303,7 @@ public abstract class BaseStatusBar extends SystemUI implements try { ActivityManagerNative.getDefault() .keyguardWaitingForActivityDrawn(); + ActivityManagerNative.getDefault().resumeAppSwitches(); } catch (RemoteException e) { } } @@ -315,7 +316,9 @@ public abstract class BaseStatusBar extends SystemUI implements animateCollapsePanels(CommandQueue.FLAG_EXCLUDE_RECENTS_PANEL, true /* force */); visibilityChanged(false); + mAssistManager.hideAssist(); } + // Wait for activity start. return handled; } |