Snap for 9253587 from 2552ae08aecbbb927cc66ad4f3462eedac121e1f to tm-qpr2-release (73af5918) · Commits · e / os / android_packages_apps_Settings

res/drawable/volume_dialog_button_background_outline.xml

+17 −14

Original line number	Diff line number	Diff line
		@@ -14,9 +14,11 @@
		See the License for the specific language governing permissions and
		limitations under the License.
		-->

		<shape xmlns:android="http://schemas.android.com/apk/res/android"
		<inset xmlns:android="http://schemas.android.com/apk/res/android"
		xmlns:androidprv="http://schemas.android.com/apk/prv/res/android"
		android:insetTop="6dp"
		android:insetBottom="6dp">
		<shape
		android:shape="rectangle">
		<stroke
		android:color="?androidprv:attr/colorAccentPrimaryVariant"
		@@ -29,3 +31,4 @@
		android:bottom="8dp" />
		<solid android:color="@android:color/transparent" />
		</shape>
		</inset>
		No newline at end of file

res/drawable/volume_dialog_button_background_solid.xml

+16 −13

Original line number	Diff line number	Diff line
		@@ -15,9 +15,11 @@
		limitations under the License.
		-->

		<shape xmlns:android="http://schemas.android.com/apk/res/android"
		<inset xmlns:android="http://schemas.android.com/apk/res/android"
		xmlns:androidprv="http://schemas.android.com/apk/prv/res/android"
		android:shape="rectangle">
		android:insetTop="6dp"
		android:insetBottom="6dp">
		<shape android:shape="rectangle">
		<stroke
		android:color="@android:color/transparent"
		android:width="1dp"/>
		@@ -29,3 +31,4 @@
		android:bottom="8dp" />
		<solid android:color="?androidprv:attr/colorAccentPrimary" />
		</shape>
		</inset>
		No newline at end of file

res/layout/panel_layout.xml

+2 −2

Original line number	Diff line number	Diff line
		@@ -117,7 +117,7 @@
		android:id="@+id/see_more"
		style="@style/PanelOptionRoundedOutlinedButton"
		android:layout_width="wrap_content"
		android:layout_height="36dp"
		android:layout_height="wrap_content"
		android:minWidth="0dp"
		android:text="@string/settings_button"/>

		@@ -130,7 +130,7 @@
		android:id="@+id/done"
		style="@style/PanelOptionRoundedSolidButton"
		android:layout_width="wrap_content"
		android:layout_height="36dp"
		android:layout_height="wrap_content"
		android:minWidth="0dp"
		android:text="@string/done"/>
		</LinearLayout>

res/layout/sfps_enroll_finish_base.xml

+10 −6

Original line number	Diff line number	Diff line
		@@ -55,13 +55,17 @@
		android:src="@drawable/sfps_enroll_finish" />
		</com.google.android.setupdesign.view.FillContentLayout>

		<!-- Added to align elements with fingerprint_enroll_enrolling_base -->
		<TextView
		style="@style/TextAppearance.ErrorText"
		<Space
		android:layout_width="0dp"
		android:layout_height="0dp"
		android:layout_weight="1" />

		<com.android.settings.biometrics.fingerprint.FingerprintRequireScreenOnToAuthToggle
		style="@style/SudSwitchStyle"
		android:id="@+id/require_screen_on_to_auth_toggle"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:layout_gravity="center_horizontal\|bottom"
		android:visibility="invisible" />
		android:layout_gravity="center_horizontal\|bottom" />

		</LinearLayout>

res/layout/sfps_require_screen_on_to_auth_toggle.xml

0 → 100644

+79 −0

Original line number	Diff line number	Diff line
		<!--
		~ Copyright (C) 2022 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.
		-->

		<RelativeLayout
		xmlns:android="http://schemas.android.com/apk/res/android"
		android:orientation="vertical"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		style="?attr/fingerprint_layout_theme">

		<!-- Top divider -->
		<View
		android:layout_alignParentTop="true"
		android:layout_width="match_parent"
		android:layout_height="1dp"
		android:background="?android:attr/listDivider" />

		<!-- Title -->
		<com.google.android.setupdesign.view.RichTextView
		android:id="@+id/title"
		android:paddingHorizontal="8dp"
		android:paddingTop="8dp"
		android:paddingBottom="4dp"
		android:gravity="start"
		android:layout_alignParentStart="true"
		android:layout_toStartOf="@+id/toggle"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:text="@string/security_settings_require_screen_on_to_auth_title"
		android:textColor="?android:attr/textColorPrimary"
		android:textSize="@dimen/sud_description_text_size"
		/>

		<!-- Subtitle -->
		<TextView
		android:id="@+id/subtitle"
		android:paddingHorizontal="8dp"
		android:paddingBottom="8dp"
		android:layout_alignParentStart="true"
		android:layout_toStartOf="@+id/toggle"
		android:layout_below="@+id/title"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:text="@string/security_settings_require_screen_on_to_auth_description"
		android:textColor="?android:attr/textColorSecondary"/>

		<!-- Vertical divider -->
		<View
		android:layout_centerVertical="true"
		android:layout_alignTop="@+id/toggle"
		android:layout_alignBottom="@+id/toggle"
		android:layout_toStartOf="@+id/toggle"
		android:layout_width="1dp"
		android:layout_height="wrap_content"
		android:background="?android:attr/listDivider" />

		<!-- Toggle -->
		<Switch
		android:layout_alignParentEnd="true"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:id="@+id/toggle"
		android:layout_centerVertical="true"
		android:checked="false"/>

		</RelativeLayout>
		No newline at end of file