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

Commit 4e6b2d3e authored by Selim Cinek's avatar Selim Cinek
Browse files

Fixed a crash where onTouch might have been called too early 

Bug: 21906153
Change-Id: I1fbc8b29f9cb0d7d71d6cb81e95a35da2fe9959e
parent 2a46d685

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

+1 −1
Original line number Original line Diff line number Diff line
@@ -614,7 +614,7 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode, 




        mStatusBarWindow = (StatusBarWindowView) View.inflate(context,

        mStatusBarWindow = (StatusBarWindowView) View.inflate(context,

                R.layout.super_status_bar, null);

                R.layout.super_status_bar, null);

        mStatusBarWindow.mService = this;

        mStatusBarWindow.setService(this);

        mStatusBarWindow.setOnTouchListener(new View.OnTouchListener() {

        mStatusBarWindow.setOnTouchListener(new View.OnTouchListener() {

            @Override

            @Override

            public boolean onTouch(View v, MotionEvent event) {

            public boolean onTouch(View v, MotionEvent event) {

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

+13 −5
Original line number Original line Diff line number Diff line
@@ -53,7 +53,7 @@ public class StatusBarWindowView extends FrameLayout { 




    private int mRightInset = 0;

    private int mRightInset = 0;





    PhoneStatusBar mService;

    private PhoneStatusBar mService;

    private final Paint mTransparentSrcPaint = new Paint();

    private final Paint mTransparentSrcPaint = new Paint();





    public StatusBarWindowView(Context context, AttributeSet attrs) {

    public StatusBarWindowView(Context context, AttributeSet attrs) {
@@ -124,14 +124,22 @@ public class StatusBarWindowView extends FrameLayout { 
    }

    }





    @Override

    @Override

    protected void onAttachedToWindow () {

    protected void onFinishInflate() {

        super.onAttachedToWindow();

        super.onFinishInflate();



        mStackScrollLayout = (NotificationStackScrollLayout) findViewById(

        mStackScrollLayout = (NotificationStackScrollLayout) findViewById(

                R.id.notification_stack_scroller);

                R.id.notification_stack_scroller);

        mNotificationPanel = (NotificationPanelView) findViewById(R.id.notification_panel);

        mNotificationPanel = (NotificationPanelView) findViewById(R.id.notification_panel);

        mDragDownHelper = new DragDownHelper(getContext(), this, mStackScrollLayout, mService);

        mBrightnessMirror = findViewById(R.id.brightness_mirror);

        mBrightnessMirror = findViewById(R.id.brightness_mirror);

    }



    public void setService(PhoneStatusBar service) {

        mService = service;

        mDragDownHelper = new DragDownHelper(getContext(), this, mStackScrollLayout, mService);

    }



    @Override

    protected void onAttachedToWindow () {

        super.onAttachedToWindow();





        // We really need to be able to animate while window animations are going on

        // We really need to be able to animate while window animations are going on

        // so that activities may be started asynchronously from panel animations

        // so that activities may be started asynchronously from panel animations