Merge "Add config for showing/hiding emergency setting entry"
diff --git a/res/values/config.xml b/res/values/config.xml
index 277176f..48d698c 100755
--- a/res/values/config.xml
+++ b/res/values/config.xml
@@ -492,6 +492,9 @@
<!-- Whether to show Smooth Display feature in Settings Options -->
<bool name="config_show_smooth_display">false</bool>
+ <!-- Whether to show emergency settings in top-level Settings -->
+ <bool name="config_show_emergency_settings">true</bool>
+
<!-- Whether to show emergency gesture in Settings -->
<bool name="config_show_emergency_gesture_settings">true</bool>
diff --git a/res/xml/top_level_settings.xml b/res/xml/top_level_settings.xml
index 280c3f3..c9e6017 100644
--- a/res/xml/top_level_settings.xml
+++ b/res/xml/top_level_settings.xml
@@ -162,6 +162,7 @@
android:icon="@drawable/ic_settings_emergency"
android:order="-20"
android:fragment="com.android.settings.emergency.EmergencyDashboardFragment"
+ settings:isPreferenceVisible="@bool/config_show_emergency_settings"
settings:highlightableMenuKey="@string/menu_key_emergency"/>
<com.android.settings.widget.HomepagePreference