Merge "Implement PromptContentViewWithMoreOptionsButton for bp" into main (597e187c) · Commits · e / os / android_frameworks_base

packages/SystemUI/res/drawable/biometric_prompt_content_view_background.xml→packages/SystemUI/res/drawable/biometric_prompt_vertical_list_content_view_background.xml

+0 −0

File moved.

+1 −0

Original line number	Diff line number	Diff line
		@@ -3,6 +3,7 @@
		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:id="@+id/biometric_prompt_constraint_layout"
		android:layout_width="match_parent"
		android:layout_height="match_parent">

+1 −0

Original line number	Diff line number	Diff line
		@@ -3,6 +3,7 @@
		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:id="@+id/biometric_prompt_constraint_layout"
		android:layout_width="match_parent"
		android:layout_height="match_parent">

+3 −1

Original line number	Diff line number	Diff line
		@@ -3,6 +3,7 @@
		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:id="@+id/biometric_prompt_constraint_layout"
		android:layout_width="match_parent"
		android:layout_height="match_parent">

		@@ -114,6 +115,7 @@
		android:gravity="center_vertical"
		android:orientation="vertical"
		android:visibility="gone"
		android:paddingTop="24dp"
		app:layout_constraintBottom_toBottomOf="parent"
		app:layout_constraintEnd_toEndOf="parent"
		app:layout_constraintStart_toStartOf="parent"
		@@ -125,7 +127,7 @@
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:gravity="@integer/biometric_dialog_text_gravity"
		android:paddingTop="16dp"
		android:paddingTop="24dp"
		app:layout_constraintBottom_toBottomOf="parent"
		app:layout_constraintEnd_toEndOf="parent"
		app:layout_constraintStart_toStartOf="parent"

0 → 100644

+35 −0

Original line number	Diff line number	Diff line
		<?xml version="1.0" encoding="utf-8"?><!--
		~ Copyright (C) 2023 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.
		-->
		<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
		android:id="@+id/customized_view"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		style="@style/AuthCredentialContentViewStyle">

		<TextView
		android:id="@+id/customized_view_description"
		style="@style/TextAppearance.AuthCredential.ContentViewWithButtonDescription"
		android:paddingBottom="16dp"
		android:layout_width="match_parent"
		android:layout_height="wrap_content" />

		<Button
		android:id="@+id/customized_view_more_options_button"
		style="@style/AuthCredentialContentViewMoreOptionsButtonStyle"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:text="@string/biometric_dialog_content_view_more_options_button"/>
		</LinearLayout>