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

Merge "Check for false touches when determining if the notif menu should be shown" into oc-dev

Browse Source 
am: 70739fb812

Change-Id: Ie2014ee92ec3fb629801b18465ec42c36b6e2283
This commit is contained in:
Mady Mellor
2017-05-26 15:00:07 +00:00
committed by android-build-merger
parent 89255babb6 70739fb812
commit 2cd3e9c500
4 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/SystemUI/plugin/src/com/android/systemui/plugins/statusbar/NotificationSwipeActionHelper.java
View File

@@ -49,6 +49,8 @@ public interface NotificationSwipeActionHelper {
public boolean isDismissGesture(MotionEvent ev);
public boolean isFalseGesture(MotionEvent ev);
public boolean swipedFarEnough(float translation, float viewSize);
public boolean swipedFastEnough(float translation, float velocity);

10
packages/SystemUI/src/com/android/systemui/SwipeHelper.java
View File

@@ -653,15 +653,19 @@ public class SwipeHelper implements Gefingerpoken {
}
public boolean isDismissGesture(MotionEvent ev) {
return ev.getActionMasked() == MotionEvent.ACTION_UP
&& !isFalseGesture(ev) && (swipedFastEnough() || swipedFarEnough())
&& mCallback.canChildBeDismissed(mCurrView);
}
public boolean isFalseGesture(MotionEvent ev) {
boolean falsingDetected = mCallback.isAntiFalsingNeeded();
if (mFalsingManager.isClassiferEnabled()) {
falsingDetected = falsingDetected && mFalsingManager.isFalseTouch();
} else {
falsingDetected = falsingDetected && !mTouchAboveFalsingThreshold;
}
return !falsingDetected && (swipedFastEnough() || swipedFarEnough())
&& ev.getActionMasked() == MotionEvent.ACTION_UP
&& mCallback.canChildBeDismissed(mCurrView);
return falsingDetected;
}
protected boolean swipedFastEnough() {

3
packages/SystemUI/src/com/android/systemui/statusbar/NotificationMenuRow.java
View File

@@ -337,7 +337,8 @@ public class NotificationMenuRow implements NotificationMenuRowPlugin, View.OnCl
} else {
snapBack(animView, velocity);
}
} else if ((swipedEnoughToShowMenu() && (!gestureFastEnough || showMenuForSlowOnGoing))
} else if (!mSwipeHelper.isFalseGesture(ev)
&& (swipedEnoughToShowMenu() && (!gestureFastEnough || showMenuForSlowOnGoing))
|| (gestureTowardsMenu && !mSwipeHelper.isDismissGesture(ev))) {
// Menu has not been snapped to previously and this is menu revealing gesture
showMenu(animView, menuSnapTarget, velocity);

4
packages/SystemUI/src/com/android/systemui/statusbar/stack/NotificationStackScrollLayout.java
View File

@@ -4353,6 +4353,10 @@ public class NotificationStackScrollLayout extends ViewGroup
mStatusBar.setNotificationSnoozed(sbn, snoozeOption);
}
public boolean isFalseGesture(MotionEvent ev) {
return super.isFalseGesture(ev);
}
private void handleMenuCoveredOrDismissed() {
if (mMenuExposedView != null && mMenuExposedView == mTranslatingParentView) {
mMenuExposedView = null;