Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Status Bar Refactor] Remove unnecessary return value from

Browse Source 
StatusBar#interceptTouchEvent.

That method always returned false.

Test: Manual
Bug: 199733640
Change-Id: Ie3b4c57191e72d9ca73914fd774ee3506d89a726
This commit is contained in:
Caitlin Cassidy
2021-10-08 15:14:45 +00:00
parent 2e4f5782b6
commit 79dd2c6afb
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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

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

@@ -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) {