From 79dd2c6afbbb4fe3967738e06fc0282829d409b1 Mon Sep 17 00:00:00 2001 From: Caitlin Cassidy Date: Fri, 8 Oct 2021 15:14:45 +0000 Subject: [PATCH] [Status Bar Refactor] Remove unnecessary return value from StatusBar#interceptTouchEvent. That method always returned false. Test: Manual Bug: 199733640 Change-Id: Ie3b4c57191e72d9ca73914fd774ee3506d89a726 --- .../systemui/statusbar/phone/PhoneStatusBarView.java | 10 +++++----- .../android/systemui/statusbar/phone/StatusBar.java | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBarView.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBarView.java index 610b0a758b499..800c2864d492f 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBarView.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBarView.java @@ -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 diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java index b10972a31eb24..90394d3da4bfa 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java @@ -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) {