From b7258186deed799c149be83ecea786b681ba8e84 Mon Sep 17 00:00:00 2001
From: Dianne Hackborn <hackbod@google.com>
Date: Tue, 15 Mar 2011 16:23:55 -0700
Subject: [PATCH] Fix to launch sub-preference activities.

Change-Id: Ie7b5a6737b30159467d5ff5786b22107d73daedc
---
 AndroidManifest.xml                    | 6 ++++++
 src/com/android/settings/Settings.java | 7 +++++++
 2 files changed, 13 insertions(+)

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 7879d0c9885..23dc6a73bd2 100644
--- a/AndroidManifest.xml
+++ b/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>
diff --git a/src/com/android/settings/Settings.java b/src/com/android/settings/Settings.java
index 25327475cbd..c64004bf2f6 100644
--- a/src/com/android/settings/Settings.java
+++ b/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.
      */