Merge "Tweak the theme and style for TextInputLayout" into main (5d0a0fa9) · Commits · e / os / android_packages_apps_Settings

res/drawable/ic_lock.xml

+7 −6

Original line number	Diff line number	Diff line
		@@ -17,11 +17,12 @@
		android:width="32dp"
		android:height="32dp"
		android:viewportWidth="24"
		android:viewportHeight="24">
		android:viewportHeight="24"
		android:tint="?android:attr/colorAccent">
		<path
		android:fillColor="?android:attr/colorPrimary"
		android:fillColor="@android:color/white"
		android:pathData="M12,15m-2,0a2,2 0,1 1,4 0a2,2 0,1 1,-4 0"/>
		<path
		android:fillColor="?android:attr/colorPrimary"
		android:fillColor="@android:color/white"
		android:pathData="M18,8h-1.5V5.5C16.5,3.01 14.49,1 12,1S7.5,3.01 7.5,5.5V8H6c-1.1,0 -2,0.9 -2,2v10c0,1.1 0.9,2 2,2h12c1.1,0 2,-0.9 2,-2V10C20,8.9 19.1,8 18,8zM9.5,5.5C9.5,4.12 10.62,3 12,3c1.38,0 2.5,1.12 2.5,2.5V8h-5V5.5zM18,20H6V10h1.5h9H18V20z"/>
		</vector>

res/layout/choose_lock_password_expressive.xml

+5 −9

Original line number	Diff line number	Diff line
		@@ -16,7 +16,6 @@
		-->
		<com.google.android.setupdesign.GlifLayout
		xmlns:android="http://schemas.android.com/apk/res/android"
		xmlns:settings="http://schemas.android.com/apk/res-auto"
		android:id="@+id/setup_wizard_layout"
		android:layout_width="match_parent"
		android:layout_height="match_parent"
		@@ -40,15 +39,14 @@
		android:minLines="2"/>

		<LinearLayout
		android:theme="@style/Theme.LockPassword"
		android:id="@+id/password_container"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:layout_marginTop="16dp"
		android:clipChildren="false"
		android:clipToPadding="false"
		android:orientation="vertical"
		android:layoutMode="opticalBounds"
		android:paddingBottom="8dp">
		android:layoutMode="opticalBounds">

		<!-- Password entry field -->
		<com.google.android.material.textfield.TextInputLayout
		@@ -56,19 +54,18 @@
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:layout_marginBottom="16dip"
		style="@style/TextAppearance.PasswordEntry">
		style="@style/LockPasswordTextInputLayoutStyle">
		<com.android.settings.widget.ImeAwareTextInputEditText
		android:id="@+id/password_entry"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:textAlignment="center"
		android:inputType="textPassword"
		android:imeOptions="actionNext\|flagNoExtractUi\|flagForceAscii" />
		android:imeOptions="actionNext\|flagNoExtractUi\|flagForceAscii"
		style="@style/LockPasswordTextInputEditTextStyle"/>
		</com.google.android.material.textfield.TextInputLayout>

		<CheckBox
		android:id="@+id/auto_pin_confirm_enabler"
		android:layout_marginTop="8dp"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:layout_gravity="center_horizontal"
		@@ -84,7 +81,6 @@
		android:id="@+id/auto_pin_confirm_security_message"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:layout_marginTop="24dp"
		android:gravity="center"
		android:text="@string/auto_pin_confirm_opt_in_security_message"
		android:textSize="16sp"

res/values/styles.xml

+23 −0

Original line number	Diff line number	Diff line
		@@ -502,6 +502,29 @@
		<item name="android:layout_gravity">start\|top</item>
		</style>

		<style name="Theme.LockPassword" parent="@style/Theme.Material3.DynamicColors.DayNight">
		<item name="textInputStyle">@style/Widget.Material3.TextInputLayout.OutlinedBox</item>
		</style>

		<style name="LockPasswordTextInputLayoutStyle">
		<item name="android:layout_width">match_parent</item>
		<item name="android:layout_height">wrap_content</item>
		<item name="android:minHeight">@dimen/min_tap_target_size</item>
		<item name="android:paddingBottom">8dp</item>
		<item name="android:gravity">bottom</item>
		<item name="android:textAppearance">?android:attr/textAppearanceSmall</item>
		</style>

		<style name="LockPasswordTextInputEditTextStyle">
		<item name="android:layout_width">match_parent</item>
		<item name="android:layout_height">wrap_content</item>
		<item name="android:textAppearance">?android:attr/textAppearanceMedium</item>
		<item name="android:singleLine">true</item>
		<item name="android:textAlignment">viewStart</item>
		<item name="android:minHeight">@dimen/min_tap_target_size</item>
		<item name="android:textColorHint">?android:attr/textColorSecondary</item>
		</style>

		<style name="WorkChallengeEmergencyButtonStyle">
		<item name="android:background">@drawable/work_challenge_emergency_button_background</item>
		<item name="android:textColor">@android:color/system_accent3_900</item>