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

Merge "Calculate pattern bounds correctly" into qt-dev

Browse Source
This commit is contained in:
Lucas Dupin
2019-05-16 01:44:52 +00:00
committed by Android (Google) Code Review
parent 75fb684e00 727890f180
commit a9610c2452
1 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
packages/SystemUI/src/com/android/keyguard/KeyguardPatternView.java
View File

@@ -68,6 +68,9 @@ public class KeyguardPatternView extends LinearLayout implements KeyguardSecurit
private final AppearAnimationUtils mAppearAnimationUtils;
private final DisappearAnimationUtils mDisappearAnimationUtils;
private final DisappearAnimationUtils mDisappearAnimationUtilsLocked;
private final int[] mTmpPosition = new int[2];
private final Rect mTempRect = new Rect();
private final Rect mLockPatternScreenBounds = new Rect();
private CountDownTimer mCountdownTimer = null;
private LockPatternUtils mLockPatternUtils;
@@ -92,7 +95,6 @@ public class KeyguardPatternView extends LinearLayout implements KeyguardSecurit
mLockPatternView.clearPattern();
}
};
private Rect mTempRect = new Rect();
@VisibleForTesting
KeyguardMessageArea mSecurityMessageDisplay;
private View mEcaView;
@@ -198,6 +200,15 @@ public class KeyguardPatternView extends LinearLayout implements KeyguardSecurit
return result;
}
@Override
protected void onLayout(boolean changed, int l, int t, int r, int b) {
super.onLayout(changed, l, t, r, b);
mLockPatternView.getLocationOnScreen(mTmpPosition);
mLockPatternScreenBounds.set(mTmpPosition[0], mTmpPosition[1],
mTmpPosition[0] + mLockPatternView.getWidth(),
mTmpPosition[1] + mLockPatternView.getHeight());
}
@Override
public void reset() {
// reset lock pattern
@@ -233,9 +244,7 @@ public class KeyguardPatternView extends LinearLayout implements KeyguardSecurit
@Override
public boolean disallowInterceptTouch(MotionEvent event) {
mTempRect.set(mLockPatternView.getLeft(), mLockPatternView.getTop(),
mLockPatternView.getRight(), mLockPatternView.getBottom());
return mTempRect.contains((int) event.getX(), (int) event.getY());
return mLockPatternScreenBounds.contains((int) event.getRawX(), (int) event.getRawY());
}
/** TODO: hook this up */