Merge "Fix specs for custom bp" into main (bca97813) · Commits · e / os / android_frameworks_base

packages/SystemUI/res/drawable/biometric_prompt_content_view_background.xml

0 → 100644

+23 −0

Original line number	Diff line number	Diff line
		<?xml version="1.0" encoding="utf-8"?><!--
		~ Copyright (C) 2024 The Android Open Source Project
		~
		~ Licensed under the Apache License, Version 2.0 (the "License");
		~ you may not use this file except in compliance with the License.
		~ You may obtain a copy of the License at
		~
		~ http://www.apache.org/licenses/LICENSE-2.0
		~
		~ Unless required by applicable law or agreed to in writing, software
		~ distributed under the License is distributed on an "AS IS" BASIS,
		~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		~ See the License for the specific language governing permissions and
		~ limitations under the License.
		-->

		<shape
		xmlns:android="http://schemas.android.com/apk/res/android"
		xmlns:androidprv="http://schemas.android.com/apk/prv/res/android"
		android:shape="rectangle">
		<solid android:color="?androidprv:attr/materialColorSurfaceContainerHigh"/>
		<corners android:radius="@dimen/biometric_prompt_content_corner_radius"/>
		</shape>

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

+8 −19

Original line number	Diff line number	Diff line
		@@ -2,6 +2,7 @@
		<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
		xmlns:app="http://schemas.android.com/apk/res-auto"
		xmlns:tools="http://schemas.android.com/tools"
		xmlns:androidprv="http://schemas.android.com/apk/prv/res/android"
		android:layout_width="match_parent"
		android:layout_height="match_parent">

		@@ -19,7 +20,7 @@ android:layout_height="match_parent">
		android:id="@+id/panel"
		android:layout_width="0dp"
		android:layout_height="0dp"
		android:background="?android:attr/colorBackgroundFloating"
		android:background="?androidprv:attr/materialColorSurfaceBright"
		android:clickable="true"
		android:clipToOutline="true"
		android:importantForAccessibility="no"
		@@ -74,8 +75,9 @@ android:layout_height="match_parent">

		<ImageView
		android:id="@+id/logo"
		android:layout_width="@dimen/biometric_auth_icon_size"
		android:layout_height="@dimen/biometric_auth_icon_size"
		android:contentDescription="@string/biometric_dialog_logo"
		android:layout_width="@dimen/biometric_prompt_logo_size"
		android:layout_height="@dimen/biometric_prompt_logo_size"
		android:layout_gravity="center"
		android:scaleType="fitXY"
		android:visibility="visible"
		@@ -84,12 +86,9 @@ android:layout_height="match_parent">

		<TextView
		android:id="@+id/logo_description"
		style="@style/TextAppearance.AuthCredential.LogoDescription"
		android:layout_width="0dp"
		android:layout_height="wrap_content"
		android:ellipsize="marquee"
		android:gravity="@integer/biometric_dialog_text_gravity"
		android:marqueeRepeatLimit="1"
		android:singleLine="true"
		android:textAlignment="viewStart"
		android:paddingLeft="8dp"
		app:layout_constraintBottom_toBottomOf="@+id/logo"
		@@ -97,12 +96,6 @@ android:layout_height="match_parent">
		app:layout_constraintStart_toEndOf="@+id/logo"
		app:layout_constraintTop_toTopOf="@+id/logo" />

		<Space
		android:id="@+id/space_above_content"
		android:layout_width="match_parent"
		android:layout_height="@dimen/biometric_prompt_space_above_content"
		android:visibility="gone" />

		<TextView
		android:id="@+id/title"
		style="@style/TextAppearance.AuthCredential.Title"
		@@ -137,11 +130,10 @@ android:layout_height="match_parent">

		<LinearLayout
		android:id="@+id/customized_view_container"
		android:layout_width="wrap_content"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:gravity="center_vertical"
		android:orientation="vertical"
		android:paddingHorizontal="0dp"
		android:visibility="gone"
		app:layout_constraintBottom_toBottomOf="parent"
		app:layout_constraintEnd_toEndOf="parent"
		@@ -165,7 +157,6 @@ android:layout_height="match_parent">
		app:layout_constraintTop_toBottomOf="@+id/subtitle"
		app:layout_constraintVertical_bias="0.0" />


		<androidx.constraintlayout.widget.Barrier
		android:id="@+id/contentBarrier"
		android:layout_width="wrap_content"
		@@ -179,16 +170,14 @@ android:layout_height="match_parent">

		<TextView
		android:id="@+id/indicator"
		style="@style/TextAppearance.AuthCredential.Indicator"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:layout_marginTop="24dp"
		android:accessibilityLiveRegion="polite"
		android:fadingEdge="horizontal"
		android:gravity="center_horizontal"
		android:marqueeRepeatLimit="marquee_forever"
		android:scrollHorizontally="true"
		android:textColor="@color/biometric_dialog_gray"
		android:textSize="12sp"
		app:layout_constraintBottom_toTopOf="@+id/buttonBarrier"
		app:layout_constraintEnd_toEndOf="@+id/biometric_icon"
		app:layout_constraintStart_toStartOf="@+id/biometric_icon"

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

+8 −19

Original line number	Diff line number	Diff line
		@@ -2,6 +2,7 @@
		<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
		xmlns:app="http://schemas.android.com/apk/res-auto"
		xmlns:tools="http://schemas.android.com/tools"
		xmlns:androidprv="http://schemas.android.com/apk/prv/res/android"
		android:layout_width="match_parent"
		android:layout_height="match_parent">

		@@ -19,7 +20,7 @@
		android:id="@+id/panel"
		android:layout_width="0dp"
		android:layout_height="0dp"
		android:background="?android:attr/colorBackgroundFloating"
		android:background="?androidprv:attr/materialColorSurfaceBright"
		android:clickable="true"
		android:clipToOutline="true"
		android:importantForAccessibility="no"
		@@ -61,8 +62,9 @@

		<ImageView
		android:id="@+id/logo"
		android:layout_width="@dimen/biometric_auth_icon_size"
		android:layout_height="@dimen/biometric_auth_icon_size"
		android:contentDescription="@string/biometric_dialog_logo"
		android:layout_width="@dimen/biometric_prompt_logo_size"
		android:layout_height="@dimen/biometric_prompt_logo_size"
		android:layout_gravity="center"
		android:scaleType="fitXY"
		android:visibility="visible"
		@@ -73,24 +75,14 @@

		<TextView
		android:id="@+id/logo_description"
		style="@style/TextAppearance.AuthCredential.LogoDescription"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:ellipsize="marquee"
		android:gravity="@integer/biometric_dialog_text_gravity"
		android:marqueeRepeatLimit="1"
		android:singleLine="true"
		android:paddingTop="16dp"
		app:layout_constraintBottom_toTopOf="@+id/title"
		app:layout_constraintEnd_toEndOf="parent"
		app:layout_constraintStart_toStartOf="parent"
		app:layout_constraintTop_toBottomOf="@+id/logo" />

		<Space
		android:id="@+id/space_above_content"
		android:layout_width="match_parent"
		android:layout_height="@dimen/biometric_prompt_space_above_content"
		android:visibility="gone" />

		<TextView
		android:id="@+id/title"
		style="@style/TextAppearance.AuthCredential.Title"
		@@ -117,11 +109,10 @@

		<LinearLayout
		android:id="@+id/customized_view_container"
		android:layout_width="wrap_content"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:gravity="center_vertical"
		android:orientation="vertical"
		android:paddingHorizontal="@dimen/biometric_prompt_content_container_padding_horizontal"
		android:visibility="gone"
		app:layout_constraintBottom_toBottomOf="parent"
		app:layout_constraintEnd_toEndOf="parent"
		@@ -153,16 +144,14 @@
		<!-- Cancel Button, replaces negative button when biometric is accepted -->
		<TextView
		android:id="@+id/indicator"
		style="@style/TextAppearance.AuthCredential.Indicator"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:layout_marginTop="24dp"
		android:accessibilityLiveRegion="polite"
		android:fadingEdge="horizontal"
		android:gravity="center_horizontal"
		android:marqueeRepeatLimit="marquee_forever"
		android:scrollHorizontally="true"
		android:textColor="@color/biometric_dialog_gray"
		android:textSize="12sp"
		app:layout_constraintBottom_toTopOf="@+id/buttonBarrier"
		app:layout_constraintEnd_toEndOf="@+id/panel"
		app:layout_constraintStart_toStartOf="@+id/panel"

packages/SystemUI/res/layout/biometric_prompt_constraint_layout.xml

+7 −13

Original line number	Diff line number	Diff line
		@@ -2,6 +2,7 @@
		<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
		xmlns:app="http://schemas.android.com/apk/res-auto"
		xmlns:tools="http://schemas.android.com/tools"
		xmlns:androidprv="http://schemas.android.com/apk/prv/res/android"
		android:layout_width="match_parent"
		android:layout_height="match_parent">

		@@ -19,7 +20,7 @@
		android:id="@+id/panel"
		android:layout_width="0dp"
		android:layout_height="0dp"
		android:background="?android:attr/colorBackgroundFloating"
		android:background="?androidprv:attr/materialColorSurfaceBright"
		android:clickable="true"
		android:clipToOutline="true"
		android:importantForAccessibility="no"
		@@ -61,8 +62,9 @@

		<ImageView
		android:id="@+id/logo"
		android:layout_width="@dimen/biometric_auth_icon_size"
		android:layout_height="@dimen/biometric_auth_icon_size"
		android:contentDescription="@string/biometric_dialog_logo"
		android:layout_width="@dimen/biometric_prompt_logo_size"
		android:layout_height="@dimen/biometric_prompt_logo_size"
		android:layout_gravity="center"
		android:scaleType="fitXY"
		app:layout_constraintBottom_toTopOf="@+id/logo_description"
		@@ -73,21 +75,14 @@

		<TextView
		android:id="@+id/logo_description"
		style="@style/TextAppearance.AuthCredential.LogoDescription"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:gravity="@integer/biometric_dialog_text_gravity"
		android:singleLine="true"
		app:layout_constraintBottom_toTopOf="@+id/title"
		app:layout_constraintEnd_toEndOf="parent"
		app:layout_constraintStart_toStartOf="parent"
		app:layout_constraintTop_toBottomOf="@+id/logo" />

		<Space
		android:id="@+id/space_above_content"
		android:layout_width="match_parent"
		android:layout_height="@dimen/biometric_prompt_space_above_content"
		android:visibility="gone" />

		<TextView
		android:id="@+id/title"
		style="@style/TextAppearance.AuthCredential.Title"
		@@ -119,7 +114,6 @@
		android:gravity="center_vertical"
		android:orientation="vertical"
		android:visibility="gone"
		android:paddingTop="8dp"
		app:layout_constraintBottom_toBottomOf="parent"
		app:layout_constraintEnd_toEndOf="parent"
		app:layout_constraintStart_toStartOf="parent"
		@@ -150,6 +144,7 @@

		<TextView
		android:id="@+id/indicator"
		style="@style/TextAppearance.AuthCredential.Indicator"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:layout_marginTop="24dp"
		@@ -229,5 +224,4 @@
		app:layout_constraintEnd_toEndOf="@+id/biometric_icon"
		app:layout_constraintStart_toStartOf="@+id/biometric_icon"
		app:layout_constraintTop_toTopOf="@+id/biometric_icon" />

		</androidx.constraintlayout.widget.ConstraintLayout>

packages/SystemUI/res/layout/biometric_prompt_content_layout.xml

+3 −8

Original line number	Diff line number	Diff line
		@@ -17,16 +17,11 @@
		android:id="@+id/customized_view"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:gravity="center_vertical"
		android:orientation="vertical"
		style="@style/AuthCredentialContentLayoutStyle">

		<TextView
		android:id="@+id/customized_view_title"
		style="@style/TextAppearance.AuthCredential.ContentViewTitle"
		android:id="@+id/customized_view_description"
		style="@style/TextAppearance.AuthCredential.ContentViewDescription"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:ellipsize="marquee"
		android:marqueeRepeatLimit="1"
		android:singleLine="true" />
		android:layout_height="wrap_content" />
		</LinearLayout>