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

Commit 855dc04b authored by Bill Lin's avatar Bill Lin Committed by Automerger Merge Worker
Browse files

Merge "Refine face enroll & remove button layout padding" into tm-qpr-dev am:... 

Merge "Refine face enroll & remove button layout padding" into tm-qpr-dev am: 37dfb4c4 am: b154b585

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19742513



Change-Id: Ia0594542f46c9d3b62c0e78f439d1d13cecdbcd1
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 9c16fc37 b154b585

res/layout/face_enroll_button.xml

+3 −2
Original line number Diff line number Diff line
@@ -18,7 +18,9 @@ 
    xmlns:android="http://schemas.android.com/apk/res/android"

    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:minHeight="?android:attr/listPreferredItemHeight">

    android:minHeight="?android:attr/listPreferredItemHeight"

    android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"

    android:paddingStart="?android:attr/listPreferredItemPaddingStart">



    <Button

        android:id="@+id/security_settings_face_settings_enroll_button"
@@ -26,7 +28,6 @@ 
        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_gravity="start"

        android:layout_marginStart="20dp"

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



</LinearLayout>
 
 No newline at end of file

res/layout/face_remove_button.xml

+3 −2
Original line number Diff line number Diff line
@@ -18,7 +18,9 @@ 
    xmlns:android="http://schemas.android.com/apk/res/android"

    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:minHeight="?android:attr/listPreferredItemHeight">

    android:minHeight="?android:attr/listPreferredItemHeight"

    android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"

    android:paddingStart="?android:attr/listPreferredItemPaddingStart">



    <Button

        android:id="@+id/security_settings_face_settings_remove_button"
@@ -26,7 +28,6 @@ 
        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_gravity="start"

        android:layout_marginStart="20dp"

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



</LinearLayout>
 
 No newline at end of file