Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ed564b31 authored by Amith Yamasani's avatar Amith Yamasani
Browse files

Revert "Revert "Fix notification bar performance."" 

This reverts commit 6e8f47b0.
parent dcdd2978

services/java/com/android/server/status/StatusBarService.java

+9 −5
Original line number Diff line number Diff line
@@ -951,7 +951,8 @@ public class StatusBarService extends IStatusBar.Stub 
        panelSlightlyVisible(true);

        

        updateExpandedViewPos(EXPANDED_LEAVE_ALONE);

        mExpandedDialog.show();

        mExpandedParams.flags &= ~WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE;

        mExpandedDialog.getWindow().setAttributes(mExpandedParams);

        mExpandedView.requestFocus(View.FOCUS_FORWARD);

        mTrackingView.setVisibility(View.VISIBLE);
@@ -1028,7 +1029,8 @@ public class StatusBarService extends IStatusBar.Stub 
        }

        mExpandedVisible = false;

        panelSlightlyVisible(false);

        mExpandedDialog.hide();

        mExpandedParams.flags |= WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE;

        mExpandedDialog.getWindow().setAttributes(mExpandedParams);

        mTrackingView.setVisibility(View.GONE);



        if ((mDisabled & StatusBarManager.DISABLE_NOTIFICATION_ICONS) == 0) {
@@ -1057,6 +1059,7 @@ public class StatusBarService extends IStatusBar.Stub 
            else if (mAnimY < mStatusBarView.getHeight()) {

                if (SPEW) Log.d(TAG, "Animation completed to collapsed state.");

                mAnimating = false;

                updateExpandedViewPos(0);

                performCollapse();

            }

            else {
@@ -1509,17 +1512,19 @@ public class StatusBarService extends IStatusBar.Stub 
            }

        }



        final int disph = mDisplay.getHeight();

        lp = mExpandedDialog.getWindow().getAttributes();

        lp.width = ViewGroup.LayoutParams.FILL_PARENT;

        lp.height = ViewGroup.LayoutParams.WRAP_CONTENT;

        lp.x = 0;

        lp.y = 0;

        mTrackingPosition = lp.y = -disph; // sufficiently large negative

        lp.type = WindowManager.LayoutParams.TYPE_STATUS_BAR_PANEL;

        lp.flags = WindowManager.LayoutParams.FLAG_LAYOUT_IN_SCREEN

                | WindowManager.LayoutParams.FLAG_LAYOUT_NO_LIMITS

                | WindowManager.LayoutParams.FLAG_NOT_TOUCH_MODAL

                | WindowManager.LayoutParams.FLAG_ALT_FOCUSABLE_IM

                | WindowManager.LayoutParams.FLAG_DITHER;

                | WindowManager.LayoutParams.FLAG_DITHER

                | WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE;

        lp.format = pixelFormat;

        lp.gravity = Gravity.TOP | Gravity.FILL_HORIZONTAL;

        lp.setTitle("StatusBarExpanded");
@@ -1532,7 +1537,6 @@ public class StatusBarService extends IStatusBar.Stub 
                new ViewGroup.LayoutParams(ViewGroup.LayoutParams.FILL_PARENT,

                                           ViewGroup.LayoutParams.WRAP_CONTENT));

        mExpandedDialog.show();

        mExpandedDialog.hide();

        FrameLayout hack = (FrameLayout)mExpandedView.getParent();

        hack.setForeground(null);

    }

services/java/com/android/server/status/TrackingPatternView.java

+0 −2
Original line number Diff line number Diff line
@@ -55,8 +55,6 @@ public class TrackingPatternView extends View { 
        final int textureWidth = mTextureWidth;

        final int textureHeight = mTextureHeight;



        Log.d("TrackingPatternView", "width=" + width + " textureWidth=" + textureWidth);



        int x = 0;

        int y;