am 91617a79: Hide assist when launching an activity over an action

* commit '91617a793ed6a80f3abfd3653b0f74b9321fe0f6': Hide assist when launching an activity over an action
2015-06-25 22:50:14 +00:00
parent 37a2b9929a 91617a793e
commit ba654e6c04
1 changed files with 3 additions and 0 deletions
--- 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;
                    }