| commit | 3d2e5c24d5abe8b4bcbe2254f032dfc2fb0e6a0e | [log] [tgz] |
|---|---|---|
| author | Joe Bolinger <jbolinger@google.com> | Thu Jun 01 17:08:33 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Jun 01 17:08:33 2023 +0000 |
| tree | 0869662645425fe5fae28d645d54f9f5ba8656ac | |
| parent | 912d99c0387111471cd5276ba6b6dfc726d475d8 [diff] | |
| parent | 53d81289ca4a48f3295e24153c43846ded77274b [diff] |
Merge "Fix UDFPS alignment for shared code across new / legacy prompt." into udc-dev am: 53d81289ca Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23505328 Change-Id: Iee8f6164b7082953f19c15cfaa50e8eee8b56c03 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/packages/SystemUI/src/com/android/systemui/biometrics/AuthContainerView.java b/packages/SystemUI/src/com/android/systemui/biometrics/AuthContainerView.java index 43a3b99..f86e2ed 100644 --- a/packages/SystemUI/src/com/android/systemui/biometrics/AuthContainerView.java +++ b/packages/SystemUI/src/com/android/systemui/biometrics/AuthContainerView.java
@@ -638,12 +638,12 @@ case Surface.ROTATION_90: mPanelController.setPosition(AuthPanelController.POSITION_RIGHT); - setScrollViewGravity(Gravity.BOTTOM | Gravity.RIGHT); + setScrollViewGravity(Gravity.CENTER_VERTICAL | Gravity.RIGHT); break; case Surface.ROTATION_270: mPanelController.setPosition(AuthPanelController.POSITION_LEFT); - setScrollViewGravity(Gravity.BOTTOM | Gravity.LEFT); + setScrollViewGravity(Gravity.CENTER_VERTICAL | Gravity.LEFT); break; case Surface.ROTATION_180:
diff --git a/packages/SystemUI/src/com/android/systemui/biometrics/AuthPanelController.java b/packages/SystemUI/src/com/android/systemui/biometrics/AuthPanelController.java index acdde34..167067e 100644 --- a/packages/SystemUI/src/com/android/systemui/biometrics/AuthPanelController.java +++ b/packages/SystemUI/src/com/android/systemui/biometrics/AuthPanelController.java
@@ -114,7 +114,13 @@ } 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) {