Fix Talkback speak n+1 items on medical info view

The design was an 8dp padding between ActionBar and PreferenceList. The
original implementation was adding an empty Preference with 8dp hight to
have the padding effect, but Talkback would take the item into account.
So the Talkback would always speak n+1 items.

Solution: add a top padding (8dp) to the Preference View, and remove
the empty preference.

Bug: 118583643
Test: Manually
Change-Id: I159309e8a5c5e87f4fe0d8ec48e54c88f79848e9

4 files changed, 16 insertions, 26 deletions

diff --git a/res/layout/view_emergency_preference_margin.xml b/res/layout/view_emergency_preference_margin.xml
deleted file mode 100644
index 8c18b2bf..00000000
--- a/res/layout/view_emergency_preference_margin.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2018 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-          android:layout_width="match_parent"
-          android:layout_height="8dp"/>
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 4cd07f9f..e898fb3e 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -20,6 +20,7 @@
     <dimen name="tab_elevation">4dp</dimen>
     <dimen name="action_bar_size">56dp</dimen>
     <dimen name="tab_height">48dp</dimen>
+    <dimen name="view_emergency_info_top_padding">8dp</dimen>
 
     <!-- Minimum width for the popup for updating a user's photo. -->
     <dimen name="update_user_photo_popup_min_width">300dip</dimen>
diff --git a/res/xml/view_emergency_info.xml b/res/xml/view_emergency_info.xml
index 98e87136..4755dade 100644
--- a/res/xml/view_emergency_info.xml
+++ b/res/xml/view_emergency_info.xml
@@ -15,13 +15,6 @@
 <PreferenceScreen
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res/com.android.emergency">
-
-    <Preference
-        android:enabled="false"
-        android:focusable="false"
-        android:selectable="false"
-        android:layout="@layout/view_emergency_preference_margin"/>
-
     <com.android.emergency.preferences.EmergencyEditTextPreference
         android:enabled="false"
         android:focusable="true"
diff --git a/src/com/android/emergency/view/ViewEmergencyInfoFragment.java b/src/com/android/emergency/view/ViewEmergencyInfoFragment.java
index 4efcca0e..3f2bdd60 100644
--- a/src/com/android/emergency/view/ViewEmergencyInfoFragment.java
+++ b/src/com/android/emergency/view/ViewEmergencyInfoFragment.java
@@ -15,8 +15,12 @@
  */
 package com.android.emergency.view;
 
-import androidx.fragment.app.Fragment;
+import android.view.View;
 import android.os.Bundle;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.fragment.app.Fragment;
 import androidx.preference.PreferenceFragmentCompat;
 import androidx.preference.Preference;
 import androidx.preference.PreferenceManager;
@@ -49,6 +53,16 @@ public class ViewEmergencyInfoFragment extends PreferenceFragmentCompat {
         }
     }
 
+  @Override
+  public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
+      super.onViewCreated(view, savedInstanceState);
+
+      // Set a top padding for the EmergencyInfo View.
+      int topPadding = (int) getResources().getDimension(R.dimen.view_emergency_info_top_padding);
+      view.setPadding(view.getPaddingLeft(), view.getPaddingTop() + topPadding,
+          view.getPaddingRight(), view.getPaddingBottom());
+  }
+
     @Override
     public void onResume() {
         super.onResume();