From 2356d5f753ed830c35394b16c6dc6529ba7ef31a Mon Sep 17 00:00:00 2001
From: Junichi Monma <monma@google.com>
Date: Fri, 29 Jun 2012 19:53:45 +0900
Subject: Enable ETWS setting via Setting and MMS apps.

Move general alert settings from developer preference category
to emergency preference category, and enable for ETWS builds and
when developer options is enabled.

CMAS settings are moved to the emergency alert category, and
removed individually for non-CMAS builds. The general alert
settings are removed individually for CMAS builds, unless
developer options are enabled. This satisfies requirements
for ETWS carriers (who do want those options available)
and CMAS carriers (who don't want those options and don't
want a separate preference category for CMAS).

Also disabled ETWS settings in the default config.xml
(used for CMAS). ETWS is enabled in the DoCoMo overlay.

Bug: 6758807
Change-Id: I2dea0a372ab239b1a9e3d7d28aae7f9772b9273d
---
 res/xml/preferences.xml | 54 +++++++++++++++++++++++++++----------------------
 1 file changed, 30 insertions(+), 24 deletions(-)

(limited to 'res/xml')

diff --git a/res/xml/preferences.xml b/res/xml/preferences.xml
index 164bbd0d..6d8a54db 100644
--- a/res/xml/preferences.xml
+++ b/res/xml/preferences.xml
@@ -18,9 +18,9 @@
 -->
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <!-- Emergency alert settings for CMAS. -->
+    <!-- General and CMAS emergency alert settings. -->
     <PreferenceCategory android:title="@string/emergency_alert_settings_title"
-                        android:key="category_cmas_settings">
+                        android:key="category_alert_settings">
 
         <!-- Enable CMAS Extreme Threat alerts -->
         <CheckBoxPreference android:defaultValue="true"
@@ -40,6 +40,34 @@
                             android:summary="@string/enable_cmas_amber_alerts_summary"
                             android:title="@string/enable_cmas_amber_alerts_title" />
 
+        <CheckBoxPreference android:defaultValue="true"
+                            android:key="enable_emergency_alerts"
+                            android:summary="@string/enable_emergency_alerts_summary"
+                            android:title="@string/enable_emergency_alerts_title" />
+
+        <ListPreference android:key="alert_sound_duration"
+                        android:title="@string/alert_sound_duration_title"
+                        android:entries="@array/alert_sound_duration_entries"
+                        android:entryValues="@array/alert_sound_duration_values"
+                        android:defaultValue="4"
+                        android:dialogTitle="@string/alert_sound_duration_title" />
+
+        <CheckBoxPreference android:defaultValue="true"
+                            android:key="enable_alert_speech"
+                            android:summary="@string/enable_alert_speech_summary"
+                            android:title="@string/enable_alert_speech_title" />
+
+    </PreferenceCategory>
+
+    <!-- Emergency alert settings for ETWS. -->
+    <PreferenceCategory android:title="@string/category_etws_settings_title"
+                        android:key="category_etws_settings">
+
+        <CheckBoxPreference android:defaultValue="false"
+                            android:key="enable_etws_test_alerts"
+                            android:summary="@string/enable_etws_test_alerts_summary"
+                            android:title="@string/enable_etws_test_alerts_title" />
+
     </PreferenceCategory>
 
     <PreferenceCategory android:title="@string/category_brazil_settings_title"
@@ -58,33 +86,11 @@
     <PreferenceCategory android:title="@string/category_dev_settings_title"
                         android:key="category_dev_settings">
 
-        <CheckBoxPreference android:defaultValue="false"
-                            android:key="enable_etws_test_alerts"
-                            android:summary="@string/enable_etws_test_alerts_summary"
-                            android:title="@string/enable_etws_test_alerts_title" />
-
         <CheckBoxPreference android:defaultValue="false"
                             android:key="enable_cmas_test_alerts"
                             android:summary="@string/enable_cmas_test_alerts_summary"
                             android:title="@string/enable_cmas_test_alerts_title" />
 
-        <CheckBoxPreference android:defaultValue="true"
-                            android:key="enable_emergency_alerts"
-                            android:summary="@string/enable_emergency_alerts_summary"
-                            android:title="@string/enable_emergency_alerts_title" />
-
-        <ListPreference android:key="alert_sound_duration"
-                        android:title="@string/alert_sound_duration_title"
-                        android:entries="@array/alert_sound_duration_entries"
-                        android:entryValues="@array/alert_sound_duration_values"
-                        android:defaultValue="4"
-                        android:dialogTitle="@string/alert_sound_duration_title" />
-
-        <CheckBoxPreference android:defaultValue="true"
-                            android:key="enable_alert_speech"
-                            android:summary="@string/enable_alert_speech_summary"
-                            android:title="@string/enable_alert_speech_title" />
-
     </PreferenceCategory>
 
 </PreferenceScreen>
-- 
cgit v1.2.3