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 am: 5e0131613a

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15313964

Change-Id: I19a599950d0dc184cb42c46e0633859b2f5a9ba7
This commit is contained in:
TreeHugger Robot
2021-07-18 22:37:58 +00:00
committed by Automerger Merge Worker
parent 33ff2f38ad 5e0131613a
commit 8de5056d19
1 changed files with 4 additions and 1 deletions
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 mShowLockIcon;
private boolean mDownDetected; private boolean mDownDetected;
private boolean mDetectedLongPress;
private final Rect mSensorTouchLocation = new Rect(); private final Rect mSensorTouchLocation = new Rect();
@Inject @Inject
@@ -485,6 +486,7 @@ public class LockIconViewController extends ViewController<LockIconView> impleme
private final GestureDetector mGestureDetector = private final GestureDetector mGestureDetector =
new GestureDetector(new SimpleOnGestureListener() { new GestureDetector(new SimpleOnGestureListener() {
public boolean onDown(MotionEvent e) { public boolean onDown(MotionEvent e) {
mDetectedLongPress = false;
if (!isClickable()) { if (!isClickable()) {
mDownDetected = false; mDownDetected = false;
return false; return false;
@@ -517,6 +519,7 @@ public class LockIconViewController extends ViewController<LockIconView> impleme
"lockIcon-onLongPress", "lockIcon-onLongPress",
VIBRATION_SONIFICATION_ATTRIBUTES); VIBRATION_SONIFICATION_ATTRIBUTES);
} }
mDetectedLongPress = true;
onAffordanceClick(); 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 // 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 // or MotionEvent.ACTION_UP. this is to avoid passing the touch to NPV
// after the lock icon disappears on device entry // after the lock icon disappears on device entry
if (mDownDetected) { if (mDownDetected && mDetectedLongPress) {
if (event.getAction() == MotionEvent.ACTION_CANCEL if (event.getAction() == MotionEvent.ACTION_CANCEL
|| event.getAction() == MotionEvent.ACTION_UP) { || event.getAction() == MotionEvent.ACTION_UP) {
mDownDetected = false; mDownDetected = false;