From bc3e2e11cc97b8eca39bde389b03e6cb6755f824 Mon Sep 17 00:00:00 2001
From: Adrian Roos <roosa@google.com>
Date: Wed, 23 Mar 2016 11:23:51 -0700
Subject: [PATCH] Follow-up to "Close notification panel when user button is
 tapped"

The original CL just collapsed the panel. Instead, we're using the
dedicated startActivityDismissingKeyguard to make sure the Keyguard
gets properly dismissed first.

Follow-Up-To: I66ebcb66c898dfebe1d09b798f750f696c360da8
Bug: 27790403
Change-Id: I41c02221de951df885ecfb4f2869820b38410f18
---
 .../com/android/systemui/statusbar/phone/MultiUserSwitch.java  | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/MultiUserSwitch.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/MultiUserSwitch.java
index 8225dab4a598b..54af684c3cd60 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/MultiUserSwitch.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/MultiUserSwitch.java
@@ -130,9 +130,8 @@ public class MultiUserSwitch extends FrameLayout implements View.OnClickListener
             Intent intent = ContactsContract.QuickContact.composeQuickContactsIntent(
                     getContext(), v, ContactsContract.Profile.CONTENT_URI,
                     ContactsContract.QuickContact.MODE_LARGE, null);
-            getContext().startActivityAsUser(intent, new UserHandle(UserHandle.USER_CURRENT));
             if (mQsPanel != null) {
-                mQsPanel.getHost().collapsePanels();
+                mQsPanel.getHost().startActivityDismissingKeyguard(intent);
             }
         }
     }