Merge "Collapse QS panel forcibly after dismissing Keyguard" into oc-dev

am: dc23c5e809

Change-Id: Ib7611306c6117754759af2b07e21f9cd26610173

packages/SystemUI/src/com/android/systemui/qs/QSHost.java

@@ -24,6 +24,7 @@ import java.util.Collection;
 public interface QSHost {
     void warn(String message, Throwable t);
     void collapsePanels();
+    void forceCollapsePanels();
     void openPanels();
     Context getContext();
     Collection<QSTile> getTiles();

packages/SystemUI/src/com/android/systemui/qs/QSTileHost.java

@@ -142,6 +142,11 @@ public class QSTileHost implements QSHost, Tunable, PluginListener<QSFactory> {
         mStatusBar.postAnimateCollapsePanels();
     }
 
+    @Override
+    public void forceCollapsePanels() {
+        mStatusBar.postAnimateForceCollapsePanels();
+    }
+
     @Override
     public void openPanels() {
         mStatusBar.postAnimateOpenPanels();

packages/SystemUI/src/com/android/systemui/qs/external/TileServices.java

@@ -204,7 +204,7 @@ public class TileServices extends IQSService.Stub {
         if (customTile != null) {
             verifyCaller(customTile);
             customTile.onDialogShown();
-            mHost.collapsePanels();
+            mHost.forceCollapsePanels();
             mServices.get(customTile).setShowingDialog(true);
         }
     }
@@ -224,7 +224,7 @@ public class TileServices extends IQSService.Stub {
         CustomTile customTile = getTileForToken(token);
         if (customTile != null) {
             verifyCaller(customTile);
-            mHost.collapsePanels();
+            mHost.forceCollapsePanels();
         }
     }
 

packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java

@@ -2878,6 +2878,15 @@ public class StatusBar extends SystemUI implements DemoMode,
         mHandler.post(mAnimateCollapsePanels);
     }
 
+    public void postAnimateForceCollapsePanels() {
+        mHandler.post(new Runnable() {
+            @Override
+            public void run() {
+                animateCollapsePanels(CommandQueue.FLAG_EXCLUDE_NONE, true /* force */);
+            }
+        });
+    }
+
     public void postAnimateOpenPanels() {
         mHandler.sendEmptyMessage(MSG_OPEN_SETTINGS_PANEL);
     }