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

am c6b2d297: am b96a9d92: Revert "fix 2233092 - Notification shade gets stuck half-open"

Browse Source 
Merge commit 'c6b2d2970891790aa1c626a6f0d5ea39f5240161' into eclair-mr2-plus-aosp

* commit 'c6b2d2970891790aa1c626a6f0d5ea39f5240161':
  Revert "fix 2233092 - Notification shade gets stuck half-open"
This commit is contained in:
Android Git Automerger
2009-11-03 13:40:54 -08:00
parent 264863cb4b c6b2d29708
commit fe6168b897
1 changed files with 6 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -692,7 +692,6 @@ public class StatusBarService extends IStatusBar.Stub
mTicker.addEntry(n, StatusBarIcon.getIcon(mContext, data), n.tickerText);
}
}
updateExpandedViewPos(EXPANDED_LEAVE_ALONE);
}
// icon
@@ -1559,24 +1558,15 @@ public class StatusBarService extends IStatusBar.Stub
+ " mTrackingPosition=" + mTrackingPosition);
}
int h = mStatusBarView.getHeight();
int disph = mDisplay.getHeight();
// If the expanded view is not visible, make sure they're still off screen.
// Maybe the view was resized.
// If the expanded view is not visible, there is no reason to do
// any work.
if (!mExpandedVisible) {
if (mTrackingView != null) {
mTrackingPosition = mTrackingParams.y = -disph;
WindowManagerImpl.getDefault().updateViewLayout(mTrackingView, mTrackingParams);
}
if (mExpandedParams != null) {
mExpandedParams.y = -disph;
mExpandedDialog.getWindow().setAttributes(mExpandedParams);
}
return;
}
// tracking view...
int h = mStatusBarView.getHeight();
int disph = mDisplay.getHeight();
int pos;
if (expandedPosition == EXPANDED_FULL_OPEN) {
pos = h;
@@ -1687,7 +1677,7 @@ public class StatusBarService extends IStatusBar.Stub
private View.OnClickListener mClearButtonListener = new View.OnClickListener() {
public void onClick(View v) {
mNotificationCallbacks.onClearAll();
addPendingOp(OP_EXPAND, null, false);
performCollapse();
}
};