Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit abfb6795 authored Jun 01, 2023 by Joe Bolinger Committed by Automerger Merge Worker Jun 01, 2023

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

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

Change-Id: I8514f17e3b928db2d90186d0b6a480fcf213b1dd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

parents 98fdd5a9 53d81289

packages/SystemUI/src/com/android/systemui/biometrics/AuthContainerView.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -638,12 +638,12 @@ public class AuthContainerView extends LinearLayout

		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:

packages/SystemUI/src/com/android/systemui/biometrics/AuthPanelController.java

+7 −1

Original line number	Diff line number	Diff line
		@@ -114,8 +114,14 @@ public class AuthPanelController extends ViewOutlineProvider {
		}

		private int getTopBound(@Position int position) {
		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) {
		if (DEBUG) {