Merge "Fix to launch sub-preference activities."

AndroidManifest.xml

@@ -71,6 +71,12 @@
             </intent-filter>
         </activity>
 
+        <activity android:name=".SubSettings"
+                android:taskAffinity="com.android.settings"
+                android:theme="@android:style/Theme.Holo"
+                >
+        </activity>
+
         <activity android:name="CreateShortcut" android:label="@string/settings_shortcut"
             android:theme="@style/Theme.CreateShortCut">
             <intent-filter>

src/com/android/settings/Settings.java

@@ -229,6 +229,13 @@ public class Settings extends PreferenceActivity implements ButtonBarHandler {
         return super.onGetInitialHeader();
     }
 
+    @Override
+    public Intent onBuildStartFragmentIntent(String fragmentName, Bundle args) {
+        Intent intent = super.onBuildStartFragmentIntent(fragmentName, args);
+        intent.setClass(this, SubSettings.class);
+        return intent;
+    }
+    
     /**
      * Populate the activity with the top-level headers.
      */