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

am 6e8f47b0: Revert "Fix notification bar performance."

Browse Source 
Merge commit '6e8f47b0ed2ffdb55b695d9f154cccd3ea3c98de' into eclair-mr2

* commit '6e8f47b0ed2ffdb55b695d9f154cccd3ea3c98de':
  Revert "Fix notification bar performance."
This commit is contained in:
Android Git Automerger
2009-11-03 12:35:55 -08:00
parent 4d7860d408 6e8f47b0ed
commit a3f84bb2f4
2 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -951,8 +951,7 @@ public class StatusBarService extends IStatusBar.Stub
panelSlightlyVisible(true); panelSlightlyVisible(true);
updateExpandedViewPos(EXPANDED_LEAVE_ALONE); updateExpandedViewPos(EXPANDED_LEAVE_ALONE);
mExpandedParams.flags &= ~WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE; mExpandedDialog.show();
mExpandedDialog.getWindow().setAttributes(mExpandedParams);
mExpandedView.requestFocus(View.FOCUS_FORWARD); mExpandedView.requestFocus(View.FOCUS_FORWARD);
mTrackingView.setVisibility(View.VISIBLE); mTrackingView.setVisibility(View.VISIBLE);
@@ -1029,8 +1028,7 @@ public class StatusBarService extends IStatusBar.Stub
} }
mExpandedVisible = false; mExpandedVisible = false;
panelSlightlyVisible(false); panelSlightlyVisible(false);
mExpandedParams.flags |= WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE; mExpandedDialog.hide();
mExpandedDialog.getWindow().setAttributes(mExpandedParams);
mTrackingView.setVisibility(View.GONE); mTrackingView.setVisibility(View.GONE);
if ((mDisabled & StatusBarManager.DISABLE_NOTIFICATION_ICONS) == 0) { if ((mDisabled & StatusBarManager.DISABLE_NOTIFICATION_ICONS) == 0) {
@@ -1059,7 +1057,6 @@ public class StatusBarService extends IStatusBar.Stub
else if (mAnimY < mStatusBarView.getHeight()) { else if (mAnimY < mStatusBarView.getHeight()) {
if (SPEW) Log.d(TAG, "Animation completed to collapsed state."); if (SPEW) Log.d(TAG, "Animation completed to collapsed state.");
mAnimating = false; mAnimating = false;
updateExpandedViewPos(0);
performCollapse(); performCollapse();
} }
else { else {
@@ -1512,19 +1509,17 @@ public class StatusBarService extends IStatusBar.Stub
} }
} }
final int disph = mDisplay.getHeight();
lp = mExpandedDialog.getWindow().getAttributes(); lp = mExpandedDialog.getWindow().getAttributes();
lp.width = ViewGroup.LayoutParams.FILL_PARENT; lp.width = ViewGroup.LayoutParams.FILL_PARENT;
lp.height = ViewGroup.LayoutParams.WRAP_CONTENT; lp.height = ViewGroup.LayoutParams.WRAP_CONTENT;
lp.x = 0; lp.x = 0;
mTrackingPosition = lp.y = -disph; // sufficiently large negative lp.y = 0;
lp.type = WindowManager.LayoutParams.TYPE_STATUS_BAR_PANEL; lp.type = WindowManager.LayoutParams.TYPE_STATUS_BAR_PANEL;
lp.flags = WindowManager.LayoutParams.FLAG_LAYOUT_IN_SCREEN lp.flags = WindowManager.LayoutParams.FLAG_LAYOUT_IN_SCREEN
| WindowManager.LayoutParams.FLAG_LAYOUT_NO_LIMITS | WindowManager.LayoutParams.FLAG_LAYOUT_NO_LIMITS
| WindowManager.LayoutParams.FLAG_NOT_TOUCH_MODAL | WindowManager.LayoutParams.FLAG_NOT_TOUCH_MODAL
| WindowManager.LayoutParams.FLAG_ALT_FOCUSABLE_IM | WindowManager.LayoutParams.FLAG_ALT_FOCUSABLE_IM
| WindowManager.LayoutParams.FLAG_DITHER | WindowManager.LayoutParams.FLAG_DITHER;
| WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE;
lp.format = pixelFormat; lp.format = pixelFormat;
lp.gravity = Gravity.TOP | Gravity.FILL_HORIZONTAL; lp.gravity = Gravity.TOP | Gravity.FILL_HORIZONTAL;
lp.setTitle("StatusBarExpanded"); lp.setTitle("StatusBarExpanded");
@@ -1537,6 +1532,7 @@ public class StatusBarService extends IStatusBar.Stub
new ViewGroup.LayoutParams(ViewGroup.LayoutParams.FILL_PARENT, new ViewGroup.LayoutParams(ViewGroup.LayoutParams.FILL_PARENT,
ViewGroup.LayoutParams.WRAP_CONTENT)); ViewGroup.LayoutParams.WRAP_CONTENT));
mExpandedDialog.show(); mExpandedDialog.show();
mExpandedDialog.hide();
FrameLayout hack = (FrameLayout)mExpandedView.getParent(); FrameLayout hack = (FrameLayout)mExpandedView.getParent();
hack.setForeground(null); hack.setForeground(null);
} }

2
services/java/com/android/server/status/TrackingPatternView.java
View File

@@ -55,6 +55,8 @@ public class TrackingPatternView extends View {
final int textureWidth = mTextureWidth; final int textureWidth = mTextureWidth;
final int textureHeight = mTextureHeight; final int textureHeight = mTextureHeight;
Log.d("TrackingPatternView", "width=" + width + " textureWidth=" + textureWidth);
int x = 0; int x = 0;
int y; int y;