Merge "Add RTL support to new BP layout" into main (edad4122) · Commits · e / os / android_frameworks_base

packages/SystemUI/res/layout-land/biometric_prompt_constraint_layout.xml

+10 −7

Original line number	Diff line number	Diff line
		@@ -26,8 +26,8 @@ android:layout_height="match_parent">
		android:paddingVertical="16dp"
		android:visibility="visible"
		app:layout_constraintBottom_toBottomOf="parent"
		app:layout_constraintEnd_toStartOf="@+id/rightGuideline"
		app:layout_constraintStart_toStartOf="@+id/leftGuideline"
		app:layout_constraintRight_toLeftOf="@+id/rightGuideline"
		app:layout_constraintLeft_toLeftOf="@+id/leftGuideline"
		app:layout_constraintTop_toTopOf="@+id/topGuideline" />

		<com.android.systemui.biometrics.BiometricPromptLottieViewWrapper
		@@ -35,8 +35,8 @@ android:layout_height="match_parent">
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		app:layout_constraintBottom_toBottomOf="parent"
		app:layout_constraintEnd_toEndOf="parent"
		app:layout_constraintStart_toStartOf="parent"
		app:layout_constraintRight_toRightOf="parent"
		app:layout_constraintLeft_toLeftOf="parent"
		app:layout_constraintTop_toTopOf="parent"
		tools:srcCompat="@tools:sample/avatars" />

		@@ -63,8 +63,8 @@ android:layout_height="match_parent">
		android:paddingTop="24dp"
		android:fadeScrollbars="false"
		app:layout_constraintBottom_toTopOf="@+id/button_bar"
		app:layout_constraintEnd_toStartOf="@+id/midGuideline"
		app:layout_constraintStart_toStartOf="@id/leftGuideline"
		app:layout_constraintRight_toLeftOf="@+id/midGuideline"
		app:layout_constraintLeft_toLeftOf="@id/leftGuideline"
		app:layout_constraintTop_toTopOf="@+id/topGuideline">

		<androidx.constraintlayout.widget.ConstraintLayout
		@@ -89,7 +89,7 @@ android:layout_height="match_parent">
		android:layout_width="0dp"
		android:layout_height="wrap_content"
		android:textAlignment="viewStart"
		android:paddingLeft="16dp"
		android:paddingStart="16dp"
		app:layout_constraintBottom_toBottomOf="@+id/logo"
		app:layout_constraintEnd_toEndOf="parent"
		app:layout_constraintStart_toEndOf="@+id/logo"
		@@ -209,6 +209,7 @@ android:layout_height="match_parent">
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:orientation="vertical"
		app:guidelineUseRtl="false"
		app:layout_constraintGuide_begin="@dimen/biometric_dialog_border_padding" />

		<androidx.constraintlayout.widget.Guideline
		@@ -216,6 +217,7 @@ android:layout_height="match_parent">
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:orientation="vertical"
		app:guidelineUseRtl="false"
		app:layout_constraintGuide_end="@dimen/biometric_dialog_border_padding" />

		<androidx.constraintlayout.widget.Guideline
		@@ -223,6 +225,7 @@ android:layout_height="match_parent">
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:orientation="vertical"
		app:guidelineUseRtl="false"
		app:layout_constraintGuide_begin="406dp" />

		<androidx.constraintlayout.widget.Guideline

packages/SystemUI/res/layout/biometric_prompt_button_bar.xml

+5 −5

Original line number	Diff line number	Diff line
		@@ -27,7 +27,7 @@
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:layout_gravity="center_vertical"
		android:layout_marginLeft="24dp"
		android:layout_marginStart="24dp"
		android:ellipsize="end"
		android:maxLines="2"
		android:visibility="invisible"
		@@ -41,7 +41,7 @@
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:layout_gravity="center_vertical"
		android:layout_marginLeft="24dp"
		android:layout_marginStart="24dp"
		android:text="@string/cancel"
		android:visibility="invisible"
		app:layout_constraintBottom_toBottomOf="parent"
		@@ -54,7 +54,7 @@
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:layout_gravity="center_vertical"
		android:layout_marginLeft="24dp"
		android:layout_marginStart="24dp"
		android:visibility="invisible"
		app:layout_constraintBottom_toBottomOf="parent"
		app:layout_constraintStart_toStartOf="parent" />
		@@ -66,7 +66,7 @@
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:layout_gravity="center_vertical"
		android:layout_marginRight="24dp"
		android:layout_marginEnd="24dp"
		android:ellipsize="end"
		android:maxLines="2"
		android:text="@string/biometric_dialog_confirm"
		@@ -81,7 +81,7 @@
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:layout_gravity="center_vertical"
		android:layout_marginRight="24dp"
		android:layout_marginEnd="24dp"
		android:ellipsize="end"
		android:maxLines="2"
		android:text="@string/biometric_dialog_try_again"

packages/SystemUI/src/com/android/systemui/biometrics/ui/binder/BiometricViewSizeBinder.kt

+23 −20

Original line number	Diff line number	Diff line
		@@ -199,29 +199,32 @@ object BiometricViewSizeBinder {
		iconParams.leftMargin = position.left
		mediumConstraintSet.clear(
		R.id.biometric_icon,
		ConstraintSet.END
		ConstraintSet.RIGHT
		)
		mediumConstraintSet.connect(
		R.id.biometric_icon,
		ConstraintSet.START,
		ConstraintSet.LEFT,
		ConstraintSet.PARENT_ID,
		ConstraintSet.START
		ConstraintSet.LEFT
		)
		mediumConstraintSet.setMargin(
		R.id.biometric_icon,
		ConstraintSet.START,
		ConstraintSet.LEFT,
		position.left
		)
		smallConstraintSet.clear(R.id.biometric_icon, ConstraintSet.END)
		smallConstraintSet.clear(
		R.id.biometric_icon,
		ConstraintSet.RIGHT
		)
		smallConstraintSet.connect(
		R.id.biometric_icon,
		ConstraintSet.START,
		ConstraintSet.LEFT,
		ConstraintSet.PARENT_ID,
		ConstraintSet.START
		ConstraintSet.LEFT
		)
		smallConstraintSet.setMargin(
		R.id.biometric_icon,
		ConstraintSet.START,
		ConstraintSet.LEFT,
		position.left
		)
		}
		@@ -252,32 +255,32 @@ object BiometricViewSizeBinder {
		iconParams.rightMargin = position.right
		mediumConstraintSet.clear(
		R.id.biometric_icon,
		ConstraintSet.START
		ConstraintSet.LEFT
		)
		mediumConstraintSet.connect(
		R.id.biometric_icon,
		ConstraintSet.END,
		ConstraintSet.RIGHT,
		ConstraintSet.PARENT_ID,
		ConstraintSet.END
		ConstraintSet.RIGHT
		)
		mediumConstraintSet.setMargin(
		R.id.biometric_icon,
		ConstraintSet.END,
		ConstraintSet.RIGHT,
		position.right
		)
		smallConstraintSet.clear(
		R.id.biometric_icon,
		ConstraintSet.START
		ConstraintSet.LEFT
		)
		smallConstraintSet.connect(
		R.id.biometric_icon,
		ConstraintSet.END,
		ConstraintSet.RIGHT,
		ConstraintSet.PARENT_ID,
		ConstraintSet.END
		ConstraintSet.RIGHT
		)
		smallConstraintSet.setMargin(
		R.id.biometric_icon,
		ConstraintSet.END,
		ConstraintSet.RIGHT,
		position.right
		)
		}
		@@ -383,15 +386,15 @@ object BiometricViewSizeBinder {
		// Move all content to other panel
		flipConstraintSet.connect(
		R.id.scrollView,
		ConstraintSet.START,
		ConstraintSet.LEFT,
		R.id.midGuideline,
		ConstraintSet.START
		ConstraintSet.LEFT
		)
		flipConstraintSet.connect(
		R.id.scrollView,
		ConstraintSet.END,
		ConstraintSet.RIGHT,
		R.id.rightGuideline,
		ConstraintSet.END
		ConstraintSet.RIGHT
		)
		}