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

Commit 79dd2c6a authored by Caitlin Cassidy's avatar Caitlin Cassidy
Browse files

[Status Bar Refactor] Remove unnecessary return value from 

StatusBar#interceptTouchEvent.

That method always returned false.

Test: Manual
Bug: 199733640
Change-Id: Ie3b4c57191e72d9ca73914fd774ee3506d89a726
parent 2e4f5782

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

+5 −5
Original line number Diff line number Diff line
@@ -200,17 +200,16 @@ public class PhoneStatusBarView extends PanelBar { 


    @Override

    public boolean onTouchEvent(MotionEvent event) {

        boolean barConsumedEvent = mBar.interceptTouchEvent(event);

        mBar.onTouchEvent(event);



        if (DEBUG_GESTURES) {

            if (event.getActionMasked() != MotionEvent.ACTION_MOVE) {

                EventLog.writeEvent(EventLogTags.SYSUI_PANELBAR_TOUCH,

                        event.getActionMasked(), (int) event.getX(), (int) event.getY(),

                        barConsumedEvent ? 1 : 0);

                        event.getActionMasked(), (int) event.getX(), (int) event.getY());

            }

        }



        return barConsumedEvent || super.onTouchEvent(event);

        return super.onTouchEvent(event);

    }



    @Override
@@ -240,7 +239,8 @@ public class PhoneStatusBarView extends PanelBar { 


    @Override

    public boolean onInterceptTouchEvent(MotionEvent event) {

        return mBar.interceptTouchEvent(event) || super.onInterceptTouchEvent(event);

        mBar.onTouchEvent(event);

        return super.onInterceptTouchEvent(event);

    }



    @Override

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

+2 −2
Original line number Diff line number Diff line
@@ -2206,7 +2206,8 @@ public class StatusBar extends SystemUI implements 
        }

    }



    public boolean interceptTouchEvent(MotionEvent event) {

    /** Called when a touch event occurred on {@link PhoneStatusBarView}. */

    public void onTouchEvent(MotionEvent event) {

        if (DEBUG_GESTURES) {

            if (event.getActionMasked() != MotionEvent.ACTION_MOVE) {

                EventLog.writeEvent(EventLogTags.SYSUI_STATUSBAR_TOUCH,
@@ -2238,7 +2239,6 @@ public class StatusBar extends SystemUI implements 
                    event.getAction() == MotionEvent.ACTION_CANCEL;

            setInteracting(StatusBarManager.WINDOW_STATUS_BAR, !upOrCancel || mExpandedVisible);

        }

        return false;

    }



    boolean isSameStatusBarState(int state) {