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

Commit c1b9a8e5 authored by Adrian Roos's avatar Adrian Roos Committed by android-build-merger
Browse files

Merge "FRP: Fix positioning of cancel button in ConfirmCredential screens with... 

Merge "FRP: Fix positioning of cancel button in ConfirmCredential screens with internal theme" into oc-mr1-dev am: eafcc98a
am: fce69dbb

Change-Id: I43cef01451f2dead8a2a0a6abf745daa2f2090bb
parents 15b71d03 fce69dbb

res/layout/confirm_lock_password_internal.xml

+5 −1
Original line number Diff line number Diff line
@@ -81,10 +81,14 @@ 
            android:visibility="gone"/>



        <Button

            style="@style/SetupWizardButton.Negative"

            android:id="@+id/cancelButton"

            style="@style/SuwGlifButton.Secondary"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:layout_marginStart="?attr/suwMarginSides"

            android:layout_marginEnd="?attr/suwMarginSides"

            android:layout_marginBottom="80dp"

            android:layout_gravity="center_horizontal"

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



    </com.android.internal.widget.LinearLayoutWithDefaultTouchRecepient>

res/layout/confirm_lock_pattern_internal_base.xml

+10 −9
Original line number Diff line number Diff line
@@ -100,8 +100,6 @@ 
                android:contentDescription="@string/confirm_fingerprint_icon_content_description"

                android:visibility="gone"/>



        </LinearLayout>



            <Button

                android:id="@+id/cancelButton"

                style="@style/SuwGlifButton.Secondary"
@@ -109,8 +107,11 @@ 
                android:layout_height="wrap_content"

                android:layout_marginStart="?attr/suwMarginSides"

                android:layout_marginEnd="?attr/suwMarginSides"

                android:layout_marginBottom="80dp"

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



        </LinearLayout>



    </com.android.internal.widget.LinearLayoutWithDefaultTouchRecepient>



</com.android.setupwizardlib.GlifLayout>