From af5e9de9fd4a2473b2b56a012bd383e8d361bd63 Mon Sep 17 00:00:00 2001 From: Daniel Sandler Date: Wed, 23 Dec 2009 14:47:18 -0600 Subject: [PATCH] Immediately close the shade when the status bar is disabled. This provides a quick fix for http://b/2298803 (if the in-call UI comes up while the user is holding the windowshade, the shade sticks in place and the display becomes unresponsive). (NB: The shade disappears immediately when the status bar is disabled. It might be better for the shade to animate closed; indeed, this seems to be what the code was trying to do, but an unfortunate interaction of the animation and touch-handling code is what caused this bug in the first place.) Change-Id: I92a824fe385c8d6e51993be1657b492e580f1e7b --- .../java/com/android/server/status/StatusBarService.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/services/java/com/android/server/status/StatusBarService.java b/services/java/com/android/server/status/StatusBarService.java index a103dcb4e68d9..34921d66cdc83 100644 --- 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) {