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

2 files changed, 33 insertions, 27 deletions

diff --git a/res/values/config.xml b/res/values/config.xml
index 02311a98..7e7ae9bb 100644
--- a/res/values/config.xml
+++ b/res/values/config.xml
@@ -4,9 +4,9 @@
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
      You may obtain a copy of the License at
-  
+
           http://www.apache.org/licenses/LICENSE-2.0
-  
+
      Unless required by applicable law or agreed to in writing, software
      distributed under the License is distributed on an "AS IS" BASIS,
      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -16,7 +16,7 @@
 
 <resources>
     <!-- Whether to enable ETWS settings (Japan) -->
-    <bool name="show_etws_settings">true</bool>
+    <bool name="show_etws_settings">false</bool>
     <!-- Whether to enable CMAS settings (United States) -->
     <bool name="show_cmas_settings">true</bool>
     <!-- Whether to enable channel 50 settings (Brazil) -->
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"
@@ -59,32 +87,10 @@
                         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>