Merge "Immediately close the shade when the status bar is disabled. (DO NOT MERGE)" into eclair

2010-01-08 12:31:03 -08:00
parent 663ec30880 5808317af8
commit 3fb4ee4e03
1 changed files with 4 additions and 1 deletions
--- a/services/java/com/android/server/status/StatusBarService.java
+++ b/services/java/com/android/server/status/StatusBarService.java
@@ -1672,7 +1672,10 @@ public class StatusBarService extends IStatusBar.Stub
        // act accordingly
        if ((diff & StatusBarManager.DISABLE_EXPAND) != 0) {
            if ((net & StatusBarManager.DISABLE_EXPAND) != 0) {
-                animateCollapse();
+                Log.d(TAG, "DISABLE_EXPAND: yes");
+                mAnimating = false;
+                updateExpandedViewPos(0);
+                performCollapse();
            }
        }
        if ((diff & StatusBarManager.DISABLE_NOTIFICATION_ICONS) != 0) {