diff options
| author | Daniel Sandler <dsandler@google.com> | 2009-12-23 14:47:18 -0600 |
|---|---|---|
| committer | Daniel Sandler <dsandler@google.com> | 2009-12-27 14:08:51 -0500 |
| commit | 5808317af880d0042dc8de451bbdaf039665433b (patch) | |
| tree | af6afa9ab89bb41285ae7e91b5e2d5ea1da8becb /services/java | |
| parent | eb5ffc239b6482b9c1e046f6f5872187043d852c (diff) | |
| download | frameworks_base-5808317af880d0042dc8de451bbdaf039665433b.zip frameworks_base-5808317af880d0042dc8de451bbdaf039665433b.tar.gz frameworks_base-5808317af880d0042dc8de451bbdaf039665433b.tar.bz2 | |
Immediately close the shade when the status bar is disabled. (DO NOT MERGE)
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).
Merged from master (I92a824fe).
TODO: safely restore code to animate the shade closed rather
than simply causing it to disappear.
Change-Id: I53dc76fdfe86636f30f37a223a88d27a5766d3eb
Diffstat (limited to 'services/java')
| -rw-r--r-- | services/java/com/android/server/status/StatusBarService.java | 5 |
1 files changed, 4 insertions, 1 deletions
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 @@ 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) { |