Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3142d56f authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Clean up styles and aliases"

parents 2fe6673d f6d42a99

res/layout-land/confirm_lock_password.xml

+1 −1
Original line number Diff line number Diff line
@@ -78,7 +78,7 @@ 
                    android:gravity="center"

                    style="@style/TextAppearance.PasswordEntry"/>



                <TextView style="@style/TextAppearance.ConfirmDeviceCredentialsErrorText"

                <TextView style="@style/TextAppearance.ErrorText"

                    android:accessibilityLiveRegion="polite"

                    android:id="@+id/errorText"

                    android:layout_width="wrap_content"

res/layout-land/confirm_lock_pattern.xml

+1 −1
Original line number Diff line number Diff line
@@ -94,7 +94,7 @@ 
                    android:layout_gravity="center_vertical"/>



                <TextView

                    style="@style/TextAppearance.ConfirmDeviceCredentialsErrorText"

                    style="@style/TextAppearance.ErrorText"

                    android:accessibilityLiveRegion="polite"

                    android:id="@+id/errorText"

                    android:layout_width="wrap_content"

res/layout-land/confirm_lock_pattern_normal.xml

+1 −1
Original line number Diff line number Diff line
@@ -76,7 +76,7 @@ 
                    android:layout_weight="1" />



                <TextView

                    style="@style/TextAppearance.ConfirmDeviceCredentialsErrorText"

                    style="@style/TextAppearance.ErrorText"

                    android:accessibilityLiveRegion="polite"

                    android:id="@+id/errorText"

                    android:layout_width="wrap_content"

res/layout-land/fingerprint_enroll_enrolling.xml

+1 −1
Original line number Diff line number Diff line
@@ -123,7 +123,7 @@ 
                </com.google.android.setupdesign.view.FillContentLayout>



                <TextView

                    style="@style/TextAppearance.FingerprintErrorText"

                    style="@style/TextAppearance.ErrorText"

                    android:id="@+id/error_text"

                    android:layout_width="wrap_content"

                    android:layout_height="wrap_content"

res/layout/confirm_lock_password_base.xml

+1 −1
Original line number Diff line number Diff line
@@ -79,7 +79,7 @@ 
                style="@style/TextAppearance.PasswordEntry"/>



            <TextView

                style="@style/TextAppearance.ConfirmDeviceCredentialsErrorText"

                style="@style/TextAppearance.ErrorText"

                android:accessibilityLiveRegion="polite"

                android:id="@+id/errorText"

                android:layout_width="wrap_content"