Create activity wrappers for settings launchable through intents or shortcuts.

Meta data specifies the fragment class and top-level header that it belongs to.

Bug: 3127704

2 files changed, 30 insertions, 36 deletions

diff --git a/res/xml/application_settings.xml b/res/xml/application_settings.xml
index 76fa0bc..2e446a2 100644
--- a/res/xml/application_settings.xml
+++ b/res/xml/application_settings.xml
@@ -53,7 +53,7 @@
             android:fragment="com.android.settings.applications.ManageApplications"
             android:title="@string/runningservices_settings_title"
             android:summary="@string/runningservices_settings_summary">
-        <extra android:name="classname" android:value="com.android.settings.RunningServices" />
+        <extra android:name="classname" android:value="com.android.settings.Settings$RunningServicesActivity" />
     </PreferenceScreen>
 
     <PreferenceScreen
@@ -61,7 +61,7 @@
             android:title="@string/storageuse_settings_title"
             android:summary="@string/storageuse_settings_summary">
         <extra android:name="classname"
-                android:value="com.android.settings.applications.StorageUse" />
+                android:value="com.android.settings.Settings$StorageUseActivity" />
     </PreferenceScreen>
 
     <PreferenceScreen
@@ -75,10 +75,8 @@
 
     <PreferenceScreen 
             android:title="@string/development_settings_title" 
-            android:summary="@string/development_settings_summary">
-        <intent android:action="android.intent.action.MAIN"
-                android:targetPackage="com.android.settings"
-                android:targetClass="com.android.settings.DevelopmentSettings" />
+            android:summary="@string/development_settings_summary"
+            android:fragment="com.android.settings.DevelopmentSettings">
     </PreferenceScreen>
     
 </PreferenceScreen>
diff --git a/res/xml/settings_headers.xml b/res/xml/settings_headers.xml
index 26e3873..5c99c5f 100644
--- a/res/xml/settings_headers.xml
+++ b/res/xml/settings_headers.xml
@@ -36,10 +36,10 @@
     <!-- Wireless controls -->
 
     <header
+        android:id="@+id/wireless_settings"
         android:title="@string/radio_controls_title"
         android:fragment="com.android.settings.WirelessSettings"
-        android:icon="@drawable/ic_settings_wireless">
-    </header>
+        android:icon="@drawable/ic_settings_wireless" />
 
     <!-- Call settings - this is in the phone process -->
 
@@ -56,18 +56,18 @@
     <!-- Sound -->
 
     <header
+        android:id="@+id/sound_settings"
         android:icon="@drawable/ic_settings_sound"
         android:fragment="com.android.settings.SoundSettings"
-        android:title="@string/sound_settings_title">
-    </header>
+        android:title="@string/sound_settings_title" />
 
     <!-- Display -->
 
     <header
+        android:id="@+id/display_settings"
         android:icon="@drawable/ic_settings_display"
         android:fragment="com.android.settings.DisplaySettings"
-        android:title="@string/display_settings_title">
-    </header>
+        android:title="@string/display_settings_title" />
 
     <!-- Security & Location -->
 
@@ -75,8 +75,7 @@
         android:fragment="com.android.settings.SecuritySettings"
         android:icon="@drawable/ic_settings_security"
         android:title="@string/security_settings_title"
-        android:id="@+id/security_settings">
-    </header>
+        android:id="@+id/security_settings" />
 
     <!-- Application Settings -->
 
@@ -84,8 +83,7 @@
         android:fragment="com.android.settings.ApplicationSettings"
         android:icon="@drawable/ic_settings_applications"
         android:title="@string/applications_settings"
-        android:id="@+id/applications_settings">
-    </header>
+        android:id="@+id/application_settings" />
 
     <!-- Data Sync. The settings activity will ensure this is resolved to an
          activity on the system image, otherwise it will remove this
@@ -95,8 +93,7 @@
         android:fragment="com.android.settings.ManageAccountsSettings"
         android:icon="@drawable/ic_settings_sync"
         android:title="@string/sync_settings"
-        android:id="@+id/sync_settings">
-    </header>
+        android:id="@+id/sync_settings" />
 
     <!-- Privacy -->
 
@@ -104,40 +101,39 @@
         android:fragment="com.android.settings.PrivacySettings"
         android:icon="@drawable/ic_settings_privacy"
         android:title="@string/privacy_settings"
-        android:id="@+id/privacy_settings">
-    </header>
+        android:id="@+id/privacy_settings" />
 
     <!-- Storage -->
 
     <header
+        android:id="@+id/storage_settings"
         android:fragment="com.android.settings.deviceinfo.Memory"
         android:icon="@drawable/ic_settings_storage"
-        android:title="@string/storage_settings">
-    </header>
+        android:title="@string/storage_settings" />
 
     <!-- Language -->
 
     <header
+        android:id="@+id/language_settings"
         android:fragment="com.android.settings.inputmethod.InputMethodAndLanguageSettings"
         android:icon="@drawable/ic_settings_language"
-        android:title="@string/language_settings">
-    </header>
+        android:title="@string/language_settings" />
 
     <!-- Voice input & output -->
 
     <header
+        android:id="@+id/voice_input_output_settings"
         android:fragment="com.android.settings.VoiceInputOutputSettings"
         android:icon="@drawable/ic_settings_speech"
-        android:title="@string/voice_input_output_settings">
-    </header>
+        android:title="@string/voice_input_output_settings" />
 
     <!-- Accessibility feedback -->
 
     <header
+        android:id="@+id/accessibility_settings"
         android:fragment="com.android.settings.AccessibilitySettings"
         android:icon="@drawable/ic_settings_accessibility"
-        android:title="@string/accessibility_settings">
-    </header>
+        android:title="@string/accessibility_settings" />
 
     <!-- Dock -->
 
@@ -145,30 +141,30 @@
         android:id="@+id/dock_settings"
         android:fragment="com.android.settings.DockSettings"
         android:icon="@drawable/ic_settings_dock"
-        android:title="@string/dock_settings">
-    </header>
+        android:title="@string/dock_settings" />
 
     <!-- Date & Time -->
 
     <header
+        android:id="@+id/date_time_settings"
         android:fragment="com.android.settings.DateTimeSettings"
         android:icon="@drawable/ic_settings_date_time"
-        android:title="@string/date_and_time_settings_title">
-    </header>
+        android:title="@string/date_and_time_settings_title" />
 
     <!-- Owner info -->
 
     <header
+        android:id="@+id/owner_info_settings"
         android:fragment="com.android.settings.OwnerInfoSettings"
         android:icon="@drawable/ic_settings_about"
-        android:title="@string/owner_info_settings_title">
-    </header>
+        android:title="@string/owner_info_settings_title" />
 
     <!-- About Device -->
 
     <header
+        android:id="@+id/about_settings"
         android:fragment="com.android.settings.DeviceInfoSettings"
         android:icon="@drawable/ic_settings_about"
-        android:title="@string/about_settings">
-    </header>
+        android:title="@string/about_settings" />
+
 </preference-headers>