drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Only intercept lockIcon touches after longpress" into sc-dev

Browse Source
This commit is contained in:
TreeHugger Robot 2021-07-18 22:16:21 +00:00 committed by Android (Google) Code Review
commit 5e0131613a
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
packages/SystemUI/src/com/android/keyguard/LockIconViewController.java
View File

@ -119,6 +119,7 @@ public class LockIconViewController extends ViewController<LockIconView> impleme
private boolean mShowLockIcon;
private boolean mDownDetected;
private boolean mDetectedLongPress;
private final Rect mSensorTouchLocation = new Rect();
@Inject
@ -485,6 +486,7 @@ public class LockIconViewController extends ViewController<LockIconView> impleme
private final GestureDetector mGestureDetector =
new GestureDetector(new SimpleOnGestureListener() {
public boolean onDown(MotionEvent e) {
mDetectedLongPress = false;
if (!isClickable()) {
mDownDetected = false;
return false;
@ -517,6 +519,7 @@ public class LockIconViewController extends ViewController<LockIconView> impleme
"lockIcon-onLongPress",
VIBRATION_SONIFICATION_ATTRIBUTES);
}
mDetectedLongPress = true;
onAffordanceClick();
}
@ -559,7 +562,7 @@ public class LockIconViewController extends ViewController<LockIconView> impleme
// we continue to intercept all following touches until we see MotionEvent.ACTION_CANCEL UP
// or MotionEvent.ACTION_UP. this is to avoid passing the touch to NPV
// after the lock icon disappears on device entry
if (mDownDetected) {
if (mDownDetected && mDetectedLongPress) {
if (event.getAction() == MotionEvent.ACTION_CANCEL
|| event.getAction() == MotionEvent.ACTION_UP) {
mDownDetected = false;