commit c713fab146121b17f66b4818953c651b360e803d
author TreeHugger Robot <treehugger-gerrit@google.com> Fri Nov 17 01:18:27 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Nov 17 01:18:27 2017 +0000
tree 2c5744a09faef87448aa727ff2efefbcd49a5d46
parent 57eabc8a29b74715e9d0847080e1f077bb0a9a27
parent c11cf270a005c1b2d8c9aca065dd8c735ffbc53e

Merge "Add android:key to all preferences."

res/xml/edit_emergency_info.xml

diff --git a/res/xml/edit_emergency_info.xml b/res/xml/edit_emergency_info.xml
index c7512a9..f537c33 100644
--- a/res/xml/edit_emergency_info.xml
+++ b/res/xml/edit_emergency_info.xml
@@ -15,6 +15,7 @@
 -->
 <PreferenceScreen
         xmlns:android="http://schemas.android.com/apk/res/android"
+        android:key="edit_emergency_info_settings"
         android:title="@string/app_label">
     <PreferenceCategory
             android:key="medical_info"
@@ -108,5 +109,6 @@
 
     <com.android.settingslib.widget.FooterPreference
         android:title="@string/emergency_info_footer"
+        android:key="footer_preference"
         android:selectable="false"/>
 </PreferenceScreen>

res/xml/edit_medical_info.xml

diff --git a/res/xml/edit_medical_info.xml b/res/xml/edit_medical_info.xml
index 178cda6..8bc2383 100644
--- a/res/xml/edit_medical_info.xml
+++ b/res/xml/edit_medical_info.xml
@@ -15,7 +15,8 @@
 -->
 <PreferenceScreen
     xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:key="edit_medical_info_settings">
 
     <com.android.emergency.preferences.NameAutoCompletePreference
         android:icon="@drawable/ic_account_circle"