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

Commit bee465f9 authored by Selim Cinek's avatar Selim Cinek Committed by Android (Google) Code Review
Browse files

Merge "Fixed a ordering bug with the notification shade" into lmp-dev

parents 4581cf82 becf5e30

packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java

+2 −2
Original line number Diff line number Diff line
@@ -1431,8 +1431,8 @@ public abstract class BaseStatusBar extends SystemUI implements 


        mStackScroller.changeViewPosition(mKeyguardIconOverflowContainer,

                mStackScroller.getChildCount() - 3);

        mStackScroller.changeViewPosition(mDismissView, mStackScroller.getChildCount() - 2);

        mStackScroller.changeViewPosition(mEmptyShadeView, mStackScroller.getChildCount() - 1);

        mStackScroller.changeViewPosition(mEmptyShadeView, mStackScroller.getChildCount() - 2);

        mStackScroller.changeViewPosition(mDismissView, mStackScroller.getChildCount() - 1);

    }



    private boolean shouldShowOnKeyguard(StatusBarNotification sbn) {

packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java

+3 −3
Original line number Diff line number Diff line
@@ -690,6 +690,9 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode, 
        SpeedBumpView speedBump = (SpeedBumpView) LayoutInflater.from(mContext).inflate(

                        R.layout.status_bar_notification_speed_bump, mStackScroller, false);

        mStackScroller.setSpeedBumpView(speedBump);

        mEmptyShadeView = (EmptyShadeView) LayoutInflater.from(mContext).inflate(

                R.layout.status_bar_no_notifications, mStackScroller, false);

        mStackScroller.setEmptyShadeView(mEmptyShadeView);

        mDismissView = (DismissView) LayoutInflater.from(mContext).inflate(

                R.layout.status_bar_notification_dismiss_all, mStackScroller, false);

        mDismissView.setOnButtonClickListener(new View.OnClickListener() {
@@ -699,9 +702,6 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode, 
            }

        });

        mStackScroller.setDismissView(mDismissView);

        mEmptyShadeView = (EmptyShadeView) LayoutInflater.from(mContext).inflate(

                R.layout.status_bar_no_notifications, mStackScroller, false);

        mStackScroller.setEmptyShadeView(mEmptyShadeView);

        mExpandedContents = mStackScroller;



        mScrimController = new ScrimController(mStatusBarWindow.findViewById(R.id.scrim_behind),