Snap for 4459973 from c713fab146121b17f66b4818953c651b360e803d to pi-release
Change-Id: I6a1eb4c2f11d1ad8fac1eaed8eb7ce93705bb986
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>
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"
diff --git a/tests/robolectric/Android.mk b/tests/robolectric/Android.mk
index 9d48705..f9c6bf2 100644
--- a/tests/robolectric/Android.mk
+++ b/tests/robolectric/Android.mk
@@ -19,7 +19,7 @@
LOCAL_JAVA_LIBRARIES := \
junit \
- platform-robolectric-prebuilt \
+ platform-robolectric-3.1.1-prebuilt \
sdk_vcurrent
LOCAL_STATIC_JAVA_LIBRARIES := \
@@ -51,4 +51,4 @@
LOCAL_INSTRUMENT_SOURCE_DIRS := $(dir $(LOCAL_PATH))../src
-include prebuilts/misc/common/robolectric/run_robotests.mk
+include prebuilts/misc/common/robolectric/3.1.1/run_robotests.mk