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

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

Merge "Update UI style for GLIF buttons" into nyc-mr1-dev

parents e3387277 52ae1eb0

res/layout-land/fingerprint_enroll_finish.xml

+6 −3
Original line number Diff line number Diff line
@@ -56,10 +56,9 @@ 
                android:visibility="gone" />



            <LinearLayout

                android:layout_width="wrap_content"

                android:layout_width="match_parent"

                android:layout_height="wrap_content"

                android:layout_marginTop="8dp"

                android:layout_marginStart="-12dp"

                android:orientation="horizontal">



                <Button
@@ -68,9 +67,13 @@ 
                    android:layout_width="wrap_content"

                    android:layout_height="wrap_content"

                    android:layout_marginEnd="8dp"

                    android:gravity="start|center_vertical"

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



                <Space

                    android:layout_width="0dp"

                    android:layout_height="0dp"

                    android:layout_weight="1" />



                <Button

                    style="@style/SetupWizardButton.Positive"

                    android:id="@+id/next_button"

res/layout-land/setup_choose_lock_pattern.xml

+7 −1
Original line number Diff line number Diff line
@@ -55,9 +55,10 @@ 


                <!-- confirm / restart buttons -->

                <LinearLayout android:id="@+id/buttonContainer"

                    android:layout_width="match_parent"

                    android:layout_height="wrap_content"

                    android:layout_centerHorizontal="true"

                    android:layout_alignParentBottom="true"

                    android:gravity="end"

                    android:orientation="horizontal">



                    <!-- left / top button: skip, or re-try -->
@@ -67,6 +68,11 @@ 
                        android:layout_height="wrap_content"

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



                    <Space

                        android:layout_width="0dp"

                        android:layout_height="0dp"

                        android:layout_weight="1" />



                    <!-- right / bottom button: confirm or ok -->

                    <Button android:id="@+id/footerRightButton"

                        style="@style/SetupWizardButton.Positive"

res/layout/fingerprint_enroll_enrolling_base.xml

+0 −1
Original line number Diff line number Diff line
@@ -75,7 +75,6 @@ 
            style="@style/SetupWizardButton.Negative"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:layout_gravity="end"

            android:text="@string/skip_label"

            android:visibility="gone" />

res/layout/fingerprint_enroll_finish_base.xml

+6 −3
Original line number Diff line number Diff line
@@ -72,11 +72,9 @@ 
            android:layout_weight="1"/>



        <LinearLayout

            android:layout_width="wrap_content"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:layout_marginEnd="-12dp"

            android:layout_marginBottom="4dp"

            android:layout_gravity="end"

            android:orientation="horizontal">



            <Button
@@ -86,6 +84,11 @@ 
                android:layout_height="wrap_content"

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



            <Space

                android:layout_width="0dp"

                android:layout_height="0dp"

                android:layout_weight="1" />



            <Button

                style="@style/SetupWizardButton.Positive"

                android:id="@+id/next_button"

res/layout/setup_choose_lock_password.xml

+5 −0
Original line number Diff line number Diff line
@@ -64,6 +64,11 @@ 
                android:layout_height="wrap_content"

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



            <Space

                android:layout_width="0dp"

                android:layout_height="0dp"

                android:layout_weight="1" />



            <!-- right : continue -->

            <Button android:id="@+id/next_button"

                style="@style/SetupWizardButton.Positive"