commit 3fb4ee4e03351078ceadf3d8dd05789ae152e8dd
author Daniel Sandler <dsandler@android.com> Fri Jan 08 12:31:03 2010 -0800
committer Android (Google) Code Review <android-gerrit@google.com> Fri Jan 08 12:31:03 2010 -0800
tree 52b2045e5c46fa94786e85c0cba5b8bf661a33c5
parent 663ec308801a34de82db9ab993f0e906da690f89
parent 5808317af880d0042dc8de451bbdaf039665433b

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

services/java/com/android/server/status/StatusBarService.java

diff --git a/services/java/com/android/server/status/StatusBarService.java b/services/java/com/android/server/status/StatusBarService.java
index a103dcb..34921d6 100644
--- a/services/java/com/android/server/status/StatusBarService.java
+++ b/services/java/com/android/server/status/StatusBarService.java
@@ -1672,7 +1672,10 @@
         // 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) {