From b981068248d058bf20f394bf97ff4bc61c4d97c2 Mon Sep 17 00:00:00 2001
From: tmfang <tmfang@google.com>
Date: Thu, 27 Jun 2019 17:50:20 +0800
Subject: [PATCH] Fix talkback issue about announcing wrong number of items

From hierarchical view, one of root cause is PreferenceCategory.
Looks like PreferenceCategory generates an invisible space when
we add a footerPreference as a child.

So, we remove PreferenceCategory directly, and declard "allow divider"
attribute for neccessary preferences.

Test: Visual
Fixes: 130396913
Change-Id: I6d56ac165633aa211e794e07417821066380d041
---
 res/layout/face_enroll_button.xml  |  3 ++-
 res/layout/face_remove_button.xml  |  3 ++-
 res/xml/security_settings_face.xml | 13 ++++++-------
 3 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/res/layout/face_enroll_button.xml b/res/layout/face_enroll_button.xml
index 2a6d676dac8..f40c42c4bf1 100644
--- a/res/layout/face_enroll_button.xml
+++ b/res/layout/face_enroll_button.xml
@@ -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"
diff --git a/res/layout/face_remove_button.xml b/res/layout/face_remove_button.xml
index 7fd28b6fcd1..98459f09422 100644
--- a/res/layout/face_remove_button.xml
+++ b/res/layout/face_remove_button.xml
@@ -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"
diff --git a/res/xml/security_settings_face.xml b/res/xml/security_settings_face.xml
index 7d59f30c5ad..19d6ed0308c 100644
--- a/res/xml/security_settings_face.xml
+++ b/res/xml/security_settings_face.xml
@@ -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>
\ No newline at end of file