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

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

Merge "Visual update for FaceSettings" into sc-dev

parents a07eb699 4e168dd6

AndroidManifest.xml

+1 −0
Original line number Diff line number Diff line
@@ -473,6 +473,7 @@ 


        <activity android:name="Settings$FaceSettingsActivity"

            android:label="@string/security_settings_face_preference_title"

            android:theme="@style/Theme.SubSettings"

            android:exported="true"

            android:icon="@drawable/ic_face_header">

            <intent-filter>

res/layout/face_enroll_button.xml

+1 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ 


    <Button

        android:id="@+id/security_settings_face_settings_enroll_button"

        android:layout_marginStart="@dimen/screen_margin_sides"

        android:layout_marginStart="20dp"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_gravity="start"

res/layout/face_remove_button.xml

+1 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ 


    <Button

        android:id="@+id/security_settings_face_settings_remove_button"

        android:layout_marginStart="@dimen/screen_margin_sides"

        android:layout_marginStart="20dp"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_gravity="start"

res/xml/security_settings_face.xml

+2 −11
Original line number Diff line number Diff line
@@ -19,12 +19,6 @@ 
    xmlns:settings="http://schemas.android.com/apk/res-auto"

    android:title="@string/security_settings_face_preference_title">



    <com.android.settings.widget.VideoPreference

        android:key="security_settings_face_video"

        android:title="@string/summary_placeholder"

        settings:animation="@raw/face_settings"

        settings:controller="com.android.settings.widget.VideoPreferenceController"/>



    <com.android.settingslib.widget.TopIntroPreference

        android:title="@string/security_settings_face_settings_top_intro"

        settings:searchable="false"/>
@@ -83,19 +77,16 @@ 
            android:key="security_settings_face_delete_faces_container"

            android:title="@string/security_settings_face_settings_remove_face_model"

            android:selectable="false"

            android:layout="@layout/face_remove_button"

            settings:allowDividerBelow="true"/>

            android:layout="@layout/face_remove_button"/>



        <com.android.settingslib.widget.LayoutPreference

            android:key="security_settings_face_enroll_faces_container"

            android:title="@string/security_settings_face_settings_enroll"

            android:selectable="false"

            android:layout="@layout/face_enroll_button"

            settings:allowDividerBelow="true"/>

            android:layout="@layout/face_enroll_button"/>

    </PreferenceCategory>



    <com.android.settingslib.widget.FooterPreference

        android:key="security_face_footer"

        settings:allowDividerAbove="true"

        settings:controller="com.android.settings.biometrics.face.FaceSettingsFooterPreferenceController" />

</PreferenceScreen>