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

Merge "Fix UDFPS alignment for shared code across new / legacy prompt." into udc-dev am: 53d81289ca

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

Change-Id: I523617566f3f014dbbc28b2b21856181dcb32fb6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Joe Bolinger
2023-06-01 17:03:47 +00:00
committed by Automerger Merge Worker
parent d2b5c15ac1 53d81289ca
commit 3481962e9d
2 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -638,12 +638,12 @@ public class AuthContainerView extends LinearLayout
case Surface.ROTATION_90: case Surface.ROTATION_90:
mPanelController.setPosition(AuthPanelController.POSITION_RIGHT); mPanelController.setPosition(AuthPanelController.POSITION_RIGHT);
setScrollViewGravity(Gravity.BOTTOM | Gravity.RIGHT); setScrollViewGravity(Gravity.CENTER_VERTICAL | Gravity.RIGHT);
break; break;
case Surface.ROTATION_270: case Surface.ROTATION_270:
mPanelController.setPosition(AuthPanelController.POSITION_LEFT); mPanelController.setPosition(AuthPanelController.POSITION_LEFT);
setScrollViewGravity(Gravity.BOTTOM | Gravity.LEFT); setScrollViewGravity(Gravity.CENTER_VERTICAL | Gravity.LEFT);
break; break;
case Surface.ROTATION_180: case Surface.ROTATION_180:

8
packages/SystemUI/src/com/android/systemui/biometrics/AuthPanelController.java
View File

@@ -114,7 +114,13 @@ public class AuthPanelController extends ViewOutlineProvider {
} }
private int getTopBound(@Position int position) { private int getTopBound(@Position int position) {
return Math.max(mContainerHeight - mContentHeight - mMargin, mMargin); switch (position) {
case POSITION_LEFT:
case POSITION_RIGHT:
return Math.max((mContainerHeight - mContentHeight) / 2, mMargin);
default:
return Math.max(mContainerHeight - mContentHeight - mMargin, mMargin);
}
} }
public void setContainerDimensions(int containerWidth, int containerHeight) { public void setContainerDimensions(int containerWidth, int containerHeight) {