diff options
| author | Fabrice Di Meglio <fdimeglio@google.com> | 2014-07-24 21:22:06 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-07-24 15:36:02 +0000 |
| commit | 6cef9d23b8572d8bd87329999f10286e29a861c0 (patch) | |
| tree | 53d366cc4d05d7b9b4efcd883f7e08526e967e79 /AndroidManifest.xml | |
| parent | 468d39160fd417cf23cba3d592acb349d3f59c55 (diff) | |
| parent | e3ff4d8e92a19473c622c1d46b30c63bf2d001d0 (diff) | |
| download | packages_apps_Settings-6cef9d23b8572d8bd87329999f10286e29a861c0.zip packages_apps_Settings-6cef9d23b8572d8bd87329999f10286e29a861c0.tar.gz packages_apps_Settings-6cef9d23b8572d8bd87329999f10286e29a861c0.tar.bz2 | |
Merge "Fix bug #16515550 Settings app crashes for intent com.android.settings.QUICK_LAUNCH_SETTINGS" into lmp-dev
Diffstat (limited to 'AndroidManifest.xml')
| -rw-r--r-- | AndroidManifest.xml | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 72defac..e1edaad 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"> |