Revert "fix 2233092 - Notification shade gets stuck half-open"
As per Dr. No; revert commit 6a7899a8d6444989657d1058666269263b5b50c0.
diff --git a/services/java/com/android/server/status/StatusBarService.java b/services/java/com/android/server/status/StatusBarService.java
index 31ee1d3..59e9832 100644
--- a/services/java/com/android/server/status/StatusBarService.java
+++ b/services/java/com/android/server/status/StatusBarService.java
@@ -692,7 +692,6 @@
mTicker.addEntry(n, StatusBarIcon.getIcon(mContext, data), n.tickerText);
}
}
- updateExpandedViewPos(EXPANDED_LEAVE_ALONE);
}
// icon
@@ -1559,24 +1558,15 @@
+ " 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 @@
private View.OnClickListener mClearButtonListener = new View.OnClickListener() {
public void onClick(View v) {
mNotificationCallbacks.onClearAll();
- addPendingOp(OP_EXPAND, null, false);
+ performCollapse();
}
};
