PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Visual update for FaceSettings" into sc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2021-05-19 03:19:07 +00:00
committed by Android (Google) Code Review
parent a07eb69948 4e168dd691
commit 2a7e608ef2
4 changed files with 5 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
AndroidManifest.xml
View File

@@ -473,6 +473,7 @@
<activity android:name="Settings$FaceSettingsActivity" <activity android:name="Settings$FaceSettingsActivity"
android:label="@string/security_settings_face_preference_title" android:label="@string/security_settings_face_preference_title"
android:theme="@style/Theme.SubSettings"
android:exported="true" android:exported="true"
android:icon="@drawable/ic_face_header"> android:icon="@drawable/ic_face_header">
<intent-filter> <intent-filter>

2
res/layout/face_enroll_button.xml
View File

@@ -22,7 +22,7 @@
<Button <Button
android:id="@+id/security_settings_face_settings_enroll_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_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="start" android:layout_gravity="start"

2
res/layout/face_remove_button.xml
View File

@@ -22,7 +22,7 @@
<Button <Button
android:id="@+id/security_settings_face_settings_remove_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_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="start" android:layout_gravity="start"

13
res/xml/security_settings_face.xml
View File

@@ -19,12 +19,6 @@
xmlns:settings="http://schemas.android.com/apk/res-auto" xmlns:settings="http://schemas.android.com/apk/res-auto"
android:title="@string/security_settings_face_preference_title"> 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 <com.android.settingslib.widget.TopIntroPreference
android:title="@string/security_settings_face_settings_top_intro" android:title="@string/security_settings_face_settings_top_intro"
settings:searchable="false"/> settings:searchable="false"/>
@@ -83,19 +77,16 @@
android:key="security_settings_face_delete_faces_container" android:key="security_settings_face_delete_faces_container"
android:title="@string/security_settings_face_settings_remove_face_model" android:title="@string/security_settings_face_settings_remove_face_model"
android:selectable="false" android:selectable="false"
android:layout="@layout/face_remove_button" android:layout="@layout/face_remove_button"/>
settings:allowDividerBelow="true"/>
<com.android.settingslib.widget.LayoutPreference <com.android.settingslib.widget.LayoutPreference
android:key="security_settings_face_enroll_faces_container" android:key="security_settings_face_enroll_faces_container"
android:title="@string/security_settings_face_settings_enroll" android:title="@string/security_settings_face_settings_enroll"
android:selectable="false" android:selectable="false"
android:layout="@layout/face_enroll_button" android:layout="@layout/face_enroll_button"/>
settings:allowDividerBelow="true"/>
</PreferenceCategory> </PreferenceCategory>
<com.android.settingslib.widget.FooterPreference <com.android.settingslib.widget.FooterPreference
android:key="security_face_footer" android:key="security_face_footer"
settings:allowDividerAbove="true"
settings:controller="com.android.settings.biometrics.face.FaceSettingsFooterPreferenceController" /> settings:controller="com.android.settings.biometrics.face.FaceSettingsFooterPreferenceController" />
</PreferenceScreen> </PreferenceScreen>