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

Merge "Allow gestures to executed started from deadzone on nav bar" into pi-dev

Browse Source
This commit is contained in:
android-build-team Robot
2018-05-04 19:30:28 +00:00
committed by Android (Google) Code Review
parent 506512789d 1e14e96167
commit ffee7c7211
1 changed files with 23 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarView.java
View File

@@ -124,6 +124,7 @@ public class NavigationBarView extends FrameLayout implements PluginListener<Nav
private GestureHelper mGestureHelper; private GestureHelper mGestureHelper;
private final DeadZone mDeadZone; private final DeadZone mDeadZone;
private boolean mDeadZoneConsuming = false;
private final NavigationBarTransitions mBarTransitions; private final NavigationBarTransitions mBarTransitions;
private final OverviewProxyService mOverviewProxyService; private final OverviewProxyService mOverviewProxyService;
@@ -291,8 +292,7 @@ public class NavigationBarView extends FrameLayout implements PluginListener<Nav
@Override @Override
public boolean onInterceptTouchEvent(MotionEvent event) { public boolean onInterceptTouchEvent(MotionEvent event) {
if (mDeadZone.onTouchEvent(event)) { if (shouldDeadZoneConsumeTouchEvents(event)) {
// Consumed the touch event
return true; return true;
} }
switch (event.getActionMasked()) { switch (event.getActionMasked()) {
@@ -314,8 +314,7 @@ public class NavigationBarView extends FrameLayout implements PluginListener<Nav
@Override @Override
public boolean onTouchEvent(MotionEvent event) { public boolean onTouchEvent(MotionEvent event) {
if (mDeadZone.onTouchEvent(event)) { if (shouldDeadZoneConsumeTouchEvents(event)) {
// Consumed the touch event
return true; return true;
} }
if (mGestureHelper.onTouchEvent(event)) { if (mGestureHelper.onTouchEvent(event)) {
@@ -324,6 +323,26 @@ public class NavigationBarView extends FrameLayout implements PluginListener<Nav
return super.onTouchEvent(event); return super.onTouchEvent(event);
} }
private boolean shouldDeadZoneConsumeTouchEvents(MotionEvent event) {
if (mDeadZone.onTouchEvent(event) || mDeadZoneConsuming) {
switch (event.getActionMasked()) {
case MotionEvent.ACTION_DOWN:
// Allow gestures starting in the deadzone to be slippery
setSlippery(true);
mDeadZoneConsuming = true;
break;
case MotionEvent.ACTION_CANCEL:
case MotionEvent.ACTION_UP:
// When a gesture started in the deadzone is finished, restore slippery state
updateSlippery();
mDeadZoneConsuming = false;
break;
}
return true;
}
return false;
}
public @NavigationBarCompat.HitTarget int getDownHitTarget() { public @NavigationBarCompat.HitTarget int getDownHitTarget() {
return mDownHitTarget; return mDownHitTarget;
} }