Settings: update layouts

Settings: update layouts
- User materialish oval shapes instead of rectangles
- Rearrange notifications, wireless, display and sound entries
- Update some strings

Signed-off-by: jrizzoli <joey@cyanogenmoditalia.it>

Settings: update control ring stream string
Signed-off-by: Jorge Ruesga <jorge@ruesga.com>

WirelessSettings: Remove NFC category if there's no NFC adapter

+ Settings: add mobile network entry to dashboard

Change-Id: I3fcd758f77a217e5c37a22f4d797398a7613b5a2
Signed-off-by: jrizzoli <joey@cyanogenmoditalia.it>

4 files changed, 59 insertions, 50 deletions

diff --git a/res/xml/button_settings.xml b/res/xml/button_settings.xml
index 27557cf..93dde2b 100644
--- a/res/xml/button_settings.xml
+++ b/res/xml/button_settings.xml
@@ -255,7 +255,8 @@
         <com.android.settings.cyanogenmod.SecureSettingSwitchPreference
             android:key="volume_keys_control_ring_stream"
             android:title="@string/volume_keys_control_ring_stream_title"
-            android:summary="@string/volume_keys_control_ring_stream_summary"/>
+            android:summaryOn="@string/volume_keys_control_ring_stream_summary_on"
+            android:summaryOff="@string/volume_keys_control_ring_stream_summary_off" />
 
         <ListPreference
             android:key="volume_key_cursor_control"
diff --git a/res/xml/dashboard_categories.xml b/res/xml/dashboard_categories.xml
index a8db559..a6013f0 100644
--- a/res/xml/dashboard_categories.xml
+++ b/res/xml/dashboard_categories.xml
@@ -39,6 +39,16 @@
                 android:icon="@drawable/ic_settings_bluetooth"
                 />
 
+        <dashboard-tile
+                android:id="@+id/mobile_networks"
+                android:title="@string/network_settings_title"
+                android:icon="@drawable/ic_settings_cellular">
+            <intent
+                    android:action="android.intent.action.MAIN"
+                    android:targetPackage="com.android.phone"
+                    android:targetClass="com.android.phone.MobileNetworkSettings" />
+        </dashboard-tile>
+
         <!-- SIM Cards -->
         <dashboard-tile
                 android:id="@+id/sim_settings"
diff --git a/res/xml/display_settings.xml b/res/xml/display_settings.xml
index 8e9727f..c7dd2ae 100644
--- a/res/xml/display_settings.xml
+++ b/res/xml/display_settings.xml
@@ -44,12 +44,6 @@
             android:entryValues="@array/night_mode_values" /> -->
 
         <PreferenceScreen
-                android:key="wallpaper"
-                android:title="@string/wallpaper_settings_title"
-                settings:keywords="@string/keywords_display_wallpaper"
-                android:fragment="com.android.settings.WallpaperTypeSettings" />
-
-        <PreferenceScreen
                 android:key="display_rotation"
                 android:title="@string/display_rotation_title"
                 android:fragment="com.android.settings.cyanogenmod.DisplayRotation" />
@@ -115,19 +109,6 @@
                 android:summary="@string/double_tap_to_sleep_summary"
                 android:defaultValue="true" />
 
-        <!-- Search in Recents -->
-        <com.android.settings.cyanogenmod.CMSystemSettingSwitchPreference
-                android:key="recents_show_search_bar"
-                android:title="@string/recents_show_searchbar"
-                android:defaultValue="true" />
-
-        <com.android.settings.FontDialogPreference
-                android:key="font_size"
-                android:title="@string/title_font_size"
-                settings:keywords="@string/keywords_display_font_size"
-                android:summary="@string/summary_font_size"
-                android:dialogTitle="@string/dialog_title_font_size" />
-
         <PreferenceScreen
                 android:key="wifi_display"
                 android:title="@string/wifi_display_settings_title"
@@ -137,11 +118,32 @@
         <PreferenceCategory
                 android:key="interface"
                 android:title="@string/category_interface">
-                <!-- expanded desktop -->
-                <PreferenceScreen
-                        android:key="expanded_desktop"
-                        android:title="@string/power_menu_expanded_desktop"
-                        android:fragment="com.android.settings.applications.ExpandedDesktopPreferenceFragment" />
+
+            <PreferenceScreen
+                    android:key="wallpaper"
+                    android:title="@string/wallpaper_settings_title"
+                    settings:keywords="@string/keywords_display_wallpaper"
+                    android:fragment="com.android.settings.WallpaperTypeSettings" />
+
+            <!-- expanded desktop -->
+            <PreferenceScreen
+                    android:key="expanded_desktop"
+                    android:title="@string/power_menu_expanded_desktop"
+                    android:fragment="com.android.settings.applications.ExpandedDesktopPreferenceFragment" />
+
+            <!-- Search in Recents -->
+            <com.android.settings.cyanogenmod.CMSystemSettingSwitchPreference
+                    android:key="recents_show_search_bar"
+                    android:title="@string/recents_show_searchbar"
+                    android:defaultValue="true" />
+
+            <com.android.settings.FontDialogPreference
+                    android:key="font_size"
+                    android:title="@string/title_font_size"
+                    settings:keywords="@string/keywords_display_font_size"
+                    android:summary="@string/summary_font_size"
+                    android:dialogTitle="@string/dialog_title_font_size" />
+
         </PreferenceCategory>
 
         <PreferenceCategory
diff --git a/res/xml/wireless_settings.xml b/res/xml/wireless_settings.xml
index f08de5e..4a3741e 100644
--- a/res/xml/wireless_settings.xml
+++ b/res/xml/wireless_settings.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.
@@ -24,12 +24,6 @@
         android:persistent="false"
         android:disableDependentsState="true" />
 
-    <SwitchPreference
-        android:key="toggle_nfc"
-        android:title="@string/nfc_quick_toggle_title"
-        android:summary="@string/nfc_quick_toggle_summary"
-        android:persistent="false" />
-
     <PreferenceScreen
         android:key="wifi_calling_settings"
         android:title="@string/wifi_calling_settings_title"
@@ -37,11 +31,6 @@
         android:fragment="com.android.settings.WifiCallingSettings" />
 
     <PreferenceScreen
-        android:fragment="com.android.settings.nfc.AndroidBeam"
-        android:key="android_beam_settings"
-        android:title="@string/android_beam_settings_title" />
-
-    <PreferenceScreen
         android:fragment="com.android.settings.TetherSettings"
         android:key="tether_settings"
         android:title="@string/tether_settings_title_all" />
@@ -51,21 +40,11 @@
         android:key="vpn_settings"
         android:title="@string/vpn_settings_title" />
 
-    <PreferenceScreen
-        android:key="mobile_network_settings"
-        android:title="@string/network_settings_title"
-        settings:keywords="@string/keywords_more_mobile_networks"
-        android:dependency="toggle_airplane">
-        <intent
-            android:action="android.intent.action.MAIN"
-            android:targetPackage="com.android.phone"
-            android:targetClass="com.android.phone.MobileNetworkSettings" />
-    </PreferenceScreen>
-
     <Preference
         android:key="manage_mobile_plan"
         android:title="@string/manage_mobile_plan_title"
-        android:persistent="false" />
+        android:persistent="false"
+        android:visibility="gone" />
 
     <PreferenceScreen
         android:key="wimax_settings"
@@ -96,4 +75,21 @@
             android:targetClass="com.android.cellbroadcastreceiver.CellBroadcastSettings" />
     </PreferenceScreen>
 
+     <PreferenceCategory
+        android:key="nfc_category_settings"
+        android:title="@string/nfc_title_category" >
+
+        <SwitchPreference
+            android:key="toggle_nfc"
+            android:title="@string/nfc_quick_toggle_title"
+            android:summary="@string/nfc_quick_toggle_summary"
+            android:persistent="false" />
+
+        <PreferenceScreen
+            android:fragment="com.android.settings.nfc.AndroidBeam"
+            android:key="android_beam_settings"
+            android:title="@string/android_beam_settings_title" />
+
+    </PreferenceCategory>
+
 </PreferenceScreen>