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

Merge changes I59089884,I0ec61e11 into sc-v2-dev am: 7a8f7189e2

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

Change-Id: Id2928964001b7e04bd1ce3ab05af83f80d840814
This commit is contained in:
Kevin Chyn
2021-10-08 18:32:31 +00:00
committed by Automerger Merge Worker
parent f936e61cfe 7a8f7189e2
commit 97613d7c20
1 changed files with 6 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
packages/SystemUI/src/com/android/systemui/biometrics/AuthBiometricView.java
View File

@@ -824,12 +824,8 @@ public abstract class AuthBiometricView extends LinearLayout {
return new AuthDialog.LayoutParams(width, totalHeight);
}
/**
* Simple heuristic which should return true displays that are larger than a normal phone.
* For example, tablet displays, or the unfolded display for foldables.
*/
private boolean isLargeDisplay(int width, int height) {
return width > 1200 && height > 1200;
private boolean isLargeDisplay() {
return com.android.systemui.util.Utils.shouldUseSplitNotificationShade(getResources());
}
@Override
@@ -837,12 +833,12 @@ public abstract class AuthBiometricView extends LinearLayout {
final int width = MeasureSpec.getSize(widthMeasureSpec);
final int height = MeasureSpec.getSize(heightMeasureSpec);
Log.d(TAG, "Width: " + width + ", height: " + height);
final boolean isLargeDisplay = isLargeDisplay();
final int newWidth;
if (isLargeDisplay(width, height)) {
// TODO: Unless we can come up with a one-size-fits-all equation, we may want to
// consider moving this to an overlay.
if (isLargeDisplay) {
// TODO(b/201811580): Unless we can come up with a one-size-fits-all equation, we may
// want to consider moving this to an overlay.
newWidth = 2 * Math.min(width, height) / 3;
} else {
newWidth = Math.min(width, height);