commit e3ff4d8e92a19473c622c1d46b30c63bf2d001d0
author Fabrice Di Meglio <fdimeglio@google.com> Wed Jul 23 20:03:20 2014 -0700
committer Fabrice Di Meglio <fdimeglio@google.com> Thu Jul 24 14:07:02 2014 -0700
tree cf6f25b22ca44d8247a8690f6c2fec3e7094a365
parent 958d1ee6d584b7489d57071305c44635a0534ba9

Fix bug #16515550 Settings app crashes for intent com.android.settings.QUICK_LAUNCH_SETTINGS

- make it work again (what a code...)

Change-Id: Ic71d8e40ff8a5e0c663fd40655e4f4cc31bc8caf

AndroidManifest.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 17f1e54..0783c65 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -1148,8 +1148,7 @@
             </intent-filter>
         </activity>
 
-        <!-- TODO: Test this once Settings stops crashing for this intent -->
-        <activity android:name=".quicklaunch.QuickLaunchSettings"
+        <activity android:name="Settings$QuickLaunchSettingsActivity"
                 android:label="@string/quick_launch_title">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -1158,8 +1157,10 @@
                 <category android:name="android.intent.category.VOICE_LAUNCH" />
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
+            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
+                       android:value="com.android.settings.quicklaunch.QuickLaunchSettings" />
             <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
-                android:value="true" />
+                       android:value="true" />
         </activity>
 
         <activity android:name=".quicklaunch.BookmarkPicker" android:label="@string/quick_launch_title">