Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 0036b4de: am df7dbb68: Fix bug 2252145 - Notification panel not closing completely when a call comes in

Browse Source 
Merge commit '0036b4def5242429abdf6e8e420896eb5296316e' into eclair-mr2-plus-aosp

* commit '0036b4def5242429abdf6e8e420896eb5296316e':
  Fix bug 2252145 - Notification panel not closing completely when a call comes in
This commit is contained in:
Joe Onorato
2009-11-17 16:05:27 -08:00
committed by Android Git Automerger
parent fe537b3fe4 0036b4def5
commit 95230656e4
1 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
services/java/com/android/server/status/StatusBarService.java
View File

@@ -85,10 +85,8 @@ import java.util.Set;
public class StatusBarService extends IStatusBar.Stub public class StatusBarService extends IStatusBar.Stub
{ {
static final String TAG = "StatusBar"; static final String TAG = "StatusBar";
static final boolean DEBUG = false;
static final boolean SPEW = false; static final boolean SPEW = false;
static final boolean DBG = false;
static final int EXPANDED_LEAVE_ALONE = -10000; static final int EXPANDED_LEAVE_ALONE = -10000;
static final int EXPANDED_FULL_OPEN = -10001; static final int EXPANDED_FULL_OPEN = -10001;
@@ -656,7 +654,7 @@ public class StatusBarService extends IStatusBar.Stub
/* private */ void performAddUpdateIcon(IBinder key, IconData data, NotificationData n) /* private */ void performAddUpdateIcon(IBinder key, IconData data, NotificationData n)
throws StatusBarException { throws StatusBarException {
if (DBG) { if (SPEW) {
Log.d(TAG, "performAddUpdateIcon icon=" + data + " notification=" + n + " key=" + key); Log.d(TAG, "performAddUpdateIcon icon=" + data + " notification=" + n + " key=" + key);
} }
// notification // notification
@@ -748,7 +746,7 @@ public class StatusBarService extends IStatusBar.Stub
/* private */ void performSetIconVisibility(IBinder key, boolean visible) { /* private */ void performSetIconVisibility(IBinder key, boolean visible) {
synchronized (mIconMap) { synchronized (mIconMap) {
if (DBG) { if (SPEW) {
Log.d(TAG, "performSetIconVisibility key=" + key + " visible=" + visible); Log.d(TAG, "performSetIconVisibility key=" + key + " visible=" + visible);
} }
StatusBarIcon icon = mIconMap.get(key); StatusBarIcon icon = mIconMap.get(key);
@@ -758,7 +756,7 @@ public class StatusBarService extends IStatusBar.Stub
/* private */ void performRemoveIcon(IBinder key) { /* private */ void performRemoveIcon(IBinder key) {
synchronized (this) { synchronized (this) {
if (DBG) { if (SPEW) {
Log.d(TAG, "performRemoveIcon key=" + key); Log.d(TAG, "performRemoveIcon key=" + key);
} }
StatusBarIcon icon = mIconMap.remove(key); StatusBarIcon icon = mIconMap.remove(key);
@@ -997,7 +995,7 @@ public class StatusBarService extends IStatusBar.Stub
} }
void performExpand() { void performExpand() {
if (SPEW) Log.d(TAG, "Perform expand: expanded=" + mExpanded); if (SPEW) Log.d(TAG, "performExpand: mExpanded=" + mExpanded);
if ((mDisabled & StatusBarManager.DISABLE_EXPAND) != 0) { if ((mDisabled & StatusBarManager.DISABLE_EXPAND) != 0) {
return ; return ;
} }
@@ -1022,8 +1020,8 @@ public class StatusBarService extends IStatusBar.Stub
} }
void performCollapse() { void performCollapse() {
if (SPEW) Log.d(TAG, "Perform collapse: expanded=" + mExpanded if (SPEW) Log.d(TAG, "performCollapse: mExpanded=" + mExpanded
+ " expanded visible=" + mExpandedVisible); + " mExpandedVisible=" + mExpandedVisible);
if (!mExpandedVisible) { if (!mExpandedVisible) {
return; return;
@@ -1668,7 +1666,7 @@ public class StatusBarService extends IStatusBar.Stub
// act accordingly // act accordingly
if ((diff & StatusBarManager.DISABLE_EXPAND) != 0) { if ((diff & StatusBarManager.DISABLE_EXPAND) != 0) {
if ((net & StatusBarManager.DISABLE_EXPAND) != 0) { if ((net & StatusBarManager.DISABLE_EXPAND) != 0) {
performCollapse(); animateCollapse();
} }
} }
if ((diff & StatusBarManager.DISABLE_NOTIFICATION_ICONS) != 0) { if ((diff & StatusBarManager.DISABLE_NOTIFICATION_ICONS) != 0) {