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

Merge "Fix crash when BiometricPrompt requests swipe pattern and talk back is enabled." into sc-dev am: aa910853fb

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

Change-Id: Ib2b00c45b45cba9b4311fb20a925f48955c80eb8
This commit is contained in:
Joe Bolinger
2021-06-23 21:38:02 +00:00
committed by Automerger Merge Worker
parent f811370bf1 aa910853fb
commit f45efd5cf7
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/java/com/android/internal/widget/LockPatternView.java
View File

@@ -1524,8 +1524,10 @@ public class LockPatternView extends View {
if (virtualViewId != ExploreByTouchHelper.INVALID_ID) { if (virtualViewId != ExploreByTouchHelper.INVALID_ID) {
int row = (virtualViewId - VIRTUAL_BASE_VIEW_ID) / 3; int row = (virtualViewId - VIRTUAL_BASE_VIEW_ID) / 3;
int col = (virtualViewId - VIRTUAL_BASE_VIEW_ID) % 3; int col = (virtualViewId - VIRTUAL_BASE_VIEW_ID) % 3;
if (row < 3) {
return !mPatternDrawLookup[row][col]; return !mPatternDrawLookup[row][col];
} }
}
return false; return false;
} }
@@ -1570,7 +1572,6 @@ public class LockPatternView extends View {
final Rect bounds = mTempRect; final Rect bounds = mTempRect;
final int row = ordinal / 3; final int row = ordinal / 3;
final int col = ordinal % 3; final int col = ordinal % 3;
final CellState cell = mCellStates[row][col];
float centerX = getCenterXForColumn(col); float centerX = getCenterXForColumn(col);
float centerY = getCenterYForRow(row); float centerY = getCenterYForRow(row);
float cellheight = mSquareHeight * mHitFactor * 0.5f; float cellheight = mSquareHeight * mHitFactor * 0.5f;