From 3440b9529f6f5e0610c15f4f1ee462b1604ff098 Mon Sep 17 00:00:00 2001
From: Fan Zhang <zhfan@google.com>
Date: Mon, 11 Jan 2021 15:25:02 -0800
Subject: [PATCH] Remove some emergency setting items scattered in settings

All these items are displayed in the new Safety & emergency page.

Bug: 175158310
Test: manual
Change-Id: I3e323f2452db6d62aa98c79835c964c1c06a06cf
---
 res/xml/gestures.xml                   |  6 ------
 res/xml/my_device_info.xml             |  7 -------
 res/xml/top_level_settings.xml         | 13 ++++++-------
 res/xml/top_level_settings_grouped.xml | 15 ++++++++-------
 4 files changed, 14 insertions(+), 27 deletions(-)

diff --git a/res/xml/gestures.xml b/res/xml/gestures.xml
index 32dad203e43..970ad217bfd 100644
--- a/res/xml/gestures.xml
+++ b/res/xml/gestures.xml
@@ -20,12 +20,6 @@
     xmlns:settings="http://schemas.android.com/apk/res-auto"
     android:title="@string/gesture_preference_title">
 
-    <Preference
-        android:key="gesture_emergency_summary"
-        android:title="@string/emergency_gesture_screen_title"
-        android:fragment="com.android.settings.gestures.EmergencyGestureSettings"
-        settings:controller="com.android.settings.gestures.EmergencyGestureEntrypointPreferenceController" />
-
     <Preference
         android:key="gesture_assist_input_summary"
         android:title="@string/assist_gesture_title"
diff --git a/res/xml/my_device_info.xml b/res/xml/my_device_info.xml
index eb9ceb4dfaf..5077f77b414 100644
--- a/res/xml/my_device_info.xml
+++ b/res/xml/my_device_info.xml
@@ -56,13 +56,6 @@
         settings:controller="com.android.settings.deviceinfo.PhoneNumberPreferenceController"
         settings:enableCopying="true"/>
 
-    <Preference
-        android:key="emergency_info"
-        android:order="14"
-        android:title="@string/emergency_info_title"
-        android:summary="@string/summary_placeholder"
-        settings:controller="com.android.settings.accounts.EmergencyInfoPreferenceController"/>
-
     <!-- Legal information -->
     <Preference
         android:key="legal_container"
diff --git a/res/xml/top_level_settings.xml b/res/xml/top_level_settings.xml
index 3c65f7bc095..78dfe9b90b6 100644
--- a/res/xml/top_level_settings.xml
+++ b/res/xml/top_level_settings.xml
@@ -125,13 +125,12 @@
         android:fragment="com.android.settings.accessibility.AccessibilitySettings"
         settings:controller="com.android.settings.accessibility.TopLevelAccessibilityPreferenceController"/>
 
-        <!--    TODO(b/175158310): Enable this tile when the setting content is more flushed out-->
-        <!--    <Preference-->
-        <!--        android:key="top_level_emergency"-->
-        <!--        android:title="@string/emergency_settings_preference_title"-->
-        <!--        android:icon="@drawable/ic_homepage_emergency"-->
-        <!--        android:order="-10"-->
-        <!--        android:fragment="com.android.settings.emergency.EmergencyDashboardFragment"/>-->
+    <Preference
+        android:key="top_level_emergency"
+        android:title="@string/emergency_settings_preference_title"
+        android:icon="@drawable/ic_homepage_emergency"
+        android:order="-10"
+        android:fragment="com.android.settings.emergency.EmergencyDashboardFragment"/>
 
     <Preference
         android:key="top_level_system"
diff --git a/res/xml/top_level_settings_grouped.xml b/res/xml/top_level_settings_grouped.xml
index 1ae6131b229..1358a022b0f 100644
--- a/res/xml/top_level_settings_grouped.xml
+++ b/res/xml/top_level_settings_grouped.xml
@@ -134,13 +134,14 @@
             android:order="-20"
             android:title="@string/security_settings_title"
             settings:controller="com.android.settings.security.TopLevelSecurityEntryPreferenceController"/>
-        <!--    TODO(b/175158310): Enable this tile when the setting content is more flushed out-->
-        <!--        <Preference-->
-        <!--            android:key="top_level_emergency"-->
-        <!--            android:title="@string/emergency_settings_preference_title"-->
-        <!--            android:icon="@drawable/ic_homepage_emergency"-->
-        <!--            android:order="-10"-->
-        <!--            android:fragment="com.android.settings.emergency.EmergencyDashboardFragment"/>-->
+
+        <Preference
+            android:key="top_level_emergency"
+            android:title="@string/emergency_settings_preference_title"
+            android:icon="@drawable/ic_homepage_emergency"
+            android:order="-10"
+            android:fragment="com.android.settings.emergency.EmergencyDashboardFragment"/>
+
     </PreferenceCategory>
 
     <PreferenceCategory