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

Commit 92d90a9d authored by Maurice Lam's avatar Maurice Lam Committed by Android (Google) Code Review
Browse files

Merge "Update button styles in fingerprint setup" into nyc-mr1-dev

parents 6193fb90 558c82ff

res/layout-land/fingerprint_enroll_find_sensor.xml

+1 −3
Original line number Diff line number Diff line
@@ -45,13 +45,11 @@ 
                android:text="@string/security_settings_fingerprint_enroll_find_sensor_message"/>



            <Button

                style="@style/Button.FingerprintButton"

                style="@style/SetupWizardButton.Positive"

                android:id="@+id/next_button"

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

                android:layout_marginTop="8dp"

                android:layout_marginStart="-12dp"

                android:gravity="start|center_vertical"

                android:text="@string/fingerprint_enroll_button_next" />

        </LinearLayout>

res/layout-land/fingerprint_enroll_finish.xml

+2 −2
Original line number Diff line number Diff line
@@ -63,7 +63,7 @@ 
                android:orientation="horizontal">



                <Button

                    style="@style/Button.FingerprintButton"

                    style="@style/SetupWizardButton.Negative"

                    android:id="@+id/add_another_button"

                    android:layout_width="wrap_content"

                    android:layout_height="wrap_content"
@@ -72,7 +72,7 @@ 
                    android:text="@string/fingerprint_enroll_button_add" />



                <Button

                    style="@style/Button.FingerprintButton"

                    style="@style/SetupWizardButton.Positive"

                    android:id="@+id/next_button"

                    android:layout_width="wrap_content"

                    android:layout_height="wrap_content"

res/layout-land/setup_fingerprint_enroll_find_sensor.xml

+1 −3
Original line number Diff line number Diff line
@@ -45,13 +45,11 @@ 
                    android:text="@string/security_settings_fingerprint_enroll_find_sensor_message"/>



            <Button

                    style="@style/Button.FingerprintButton"

                    style="@style/SetupWizardButton.Positive"

                    android:id="@+id/next_button"

                    android:layout_width="wrap_content"

                    android:layout_height="wrap_content"

                    android:layout_marginTop="8dp"

                    android:layout_marginStart="-12dp"

                    android:gravity="start|center_vertical"

                    android:text="@string/fingerprint_enroll_button_next" />

        </LinearLayout>

res/layout/fingerprint_enroll_find_sensor_base.xml

+1 −2
Original line number Diff line number Diff line
@@ -56,12 +56,11 @@ 
                android:layout_weight="1"/>



            <Button

                style="@style/Button.FingerprintButton"

                style="@style/SetupWizardButton.Positive"

                android:id="@+id/next_button"

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

                android:layout_marginBottom="4dp"

                android:layout_marginEnd="-12dp"

                android:layout_gravity="end"

                android:text="@string/fingerprint_enroll_button_next" />

res/layout/fingerprint_enroll_finish_base.xml

+2 −2
Original line number Diff line number Diff line
@@ -80,14 +80,14 @@ 
            android:orientation="horizontal">



            <Button

                style="@style/Button.FingerprintButton"

                style="@style/SetupWizardButton.Negative"

                android:id="@+id/add_another_button"

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

                android:text="@string/fingerprint_enroll_button_add" />



            <Button

                style="@style/Button.FingerprintButton"

                style="@style/SetupWizardButton.Positive"

                android:id="@+id/next_button"

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"