Merge "Fix talkback issue about announcing wrong number of items"

This commit is contained in:
TreeHugger Robot
2019-07-02 07:46:23 +00:00
committed by Android (Google) Code Review
3 changed files with 10 additions and 9 deletions

View File

@@ -17,7 +17,8 @@
<LinearLayout <LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content"> android:layout_height="wrap_content"
android:minHeight="?android:attr/listPreferredItemHeight">
<Button <Button
android:id="@+id/security_settings_face_settings_enroll_button" android:id="@+id/security_settings_face_settings_enroll_button"

View File

@@ -17,7 +17,8 @@
<LinearLayout <LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content"> android:layout_height="wrap_content"
android:minHeight="?android:attr/listPreferredItemHeight">
<Button <Button
android:id="@+id/security_settings_face_settings_remove_button" android:id="@+id/security_settings_face_settings_remove_button"

View File

@@ -68,17 +68,16 @@
<com.android.settingslib.widget.LayoutPreference <com.android.settingslib.widget.LayoutPreference
android:key="security_settings_face_delete_faces_container" android:key="security_settings_face_delete_faces_container"
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:selectable="false" android:selectable="false"
android:layout="@layout/face_enroll_button " /> android:layout="@layout/face_enroll_button "
</PreferenceCategory> settings:allowDividerBelow="true"/>
<PreferenceCategory
android:key="security_settings_face_footer_container">
<com.android.settingslib.widget.FooterPreference />
</PreferenceCategory> </PreferenceCategory>
<com.android.settingslib.widget.FooterPreference
settings:allowDividerAbove="true"/>
</PreferenceScreen> </PreferenceScreen>