Merge "Fix talkback issue about announcing wrong number of items"
This commit is contained in:
committed by
Android (Google) Code Review
commit
74e5e4fd26
@@ -17,7 +17,8 @@
|
||||
<LinearLayout
|
||||
xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content">
|
||||
android:layout_height="wrap_content"
|
||||
android:minHeight="?android:attr/listPreferredItemHeight">
|
||||
|
||||
<Button
|
||||
android:id="@+id/security_settings_face_settings_enroll_button"
|
||||
|
||||
@@ -17,7 +17,8 @@
|
||||
<LinearLayout
|
||||
xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content">
|
||||
android:layout_height="wrap_content"
|
||||
android:minHeight="?android:attr/listPreferredItemHeight">
|
||||
|
||||
<Button
|
||||
android:id="@+id/security_settings_face_settings_remove_button"
|
||||
|
||||
@@ -68,17 +68,16 @@
|
||||
<com.android.settingslib.widget.LayoutPreference
|
||||
android:key="security_settings_face_delete_faces_container"
|
||||
android:selectable="false"
|
||||
android:layout="@layout/face_remove_button" />
|
||||
android:layout="@layout/face_remove_button"
|
||||
settings:allowDividerBelow="true"/>
|
||||
|
||||
<com.android.settingslib.widget.LayoutPreference
|
||||
android:key="security_settings_face_enroll_faces_container"
|
||||
android:selectable="false"
|
||||
android:layout="@layout/face_enroll_button " />
|
||||
</PreferenceCategory>
|
||||
|
||||
<PreferenceCategory
|
||||
android:key="security_settings_face_footer_container">
|
||||
<com.android.settingslib.widget.FooterPreference />
|
||||
android:layout="@layout/face_enroll_button "
|
||||
settings:allowDividerBelow="true"/>
|
||||
</PreferenceCategory>
|
||||
|
||||
<com.android.settingslib.widget.FooterPreference
|
||||
settings:allowDividerAbove="true"/>
|
||||
</PreferenceScreen>
|
||||
Reference in New Issue
Block a user