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

Merge changes from topic "am-6e211d057385482094e3c15ffd4b3efe" into tm-qpr-dev-plus-aosp

Browse Source 
* changes:
  Merge "DO NOT MERGE: Fix Budget bakers wallet app's fingerprint icon doesn't line up with sensor" into tm-dev am: 021ef9a6f8 am: 7a450c60b3 am: 87306bd5db
  DO NOT MERGE: Fix Budget bakers wallet app's fingerprint icon doesn't line up with sensor am: 29f4d11428 am: fedde47d82 am: ad34cc486e
This commit is contained in:
Automerger Merge Worker
2022-05-06 16:10:28 +00:00
committed by Android (Google) Code Review
parent 28561f4122 64cb7b1ecd
commit 08203543f6
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
packages/SystemUI/src/com/android/systemui/biometrics/UdfpsDialogMeasureAdapter.java
View File

@@ -154,7 +154,9 @@ public class UdfpsDialogMeasureAdapter {
//re-calculate the height of description
View description = mView.findViewById(R.id.description);
totalHeight += measureDescription(description, displayHeight, width, totalHeight);
if (description != null && description.getVisibility() != View.GONE) {
totalHeight += measureDescription(description, displayHeight, width, totalHeight);
}
return new AuthDialog.LayoutParams(width, totalHeight);
}