summaryrefslogtreecommitdiffstats
path: root/AndroidManifest.xml
diff options
context:
space:
mode:
authorSven Dawitz <sven@dawitz.de>2012-12-17 01:29:48 +0100
committerDvTonder <david.vantonder@gmail.com>2012-12-17 21:03:16 -0500
commitf779d2322c6402331319d68b15af4b995a4c03e3 (patch)
treeb361c52a55b7376436ab040641945f11853989b3 /AndroidManifest.xml
parent41475909c60910a84c153e401a94f39ccc0b84aa (diff)
downloadpackages_apps_settings-f779d2322c6402331319d68b15af4b995a4c03e3.zip
packages_apps_settings-f779d2322c6402331319d68b15af4b995a4c03e3.tar.gz
packages_apps_settings-f779d2322c6402331319d68b15af4b995a4c03e3.tar.bz2
QuickSettings: Added ProfileTile (1/2)
see frameworks commit for details Patchset 2: using blunden's png resource making ProfileSettings reachable from the outside Patchset 3: The profile tile should not be available if profiles are turned off Side rant: I really hate manifest cleanups. i would wish for our settings not beeing such a mess and comply with fragments properly. Change-Id: I3e7bcce4b5f54b9bed065780779c9946a73936be
Diffstat (limited to 'AndroidManifest.xml')
-rw-r--r--AndroidManifest.xml28
1 files changed, 28 insertions, 0 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 4cc4ba0..e01dce7 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -1464,6 +1464,34 @@
<activity android:name=".cyanogenmod.PerformanceSettings" />
<activity android:name=".profiles.ProfilesSettings" />
+ <activity android:name="Settings$ProfilesSettingsActivity"
+ android:label="@string/profile_settings"
+ android:taskAffinity=""
+ android:excludeFromRecents="true">
+ <intent-filter>
+ <action android:name="android.intent.action.MAIN" />
+ <action android:name="android.settings.PROFILES_SETTINGS" />
+ <action android:name="com.android.settings.PROFILES_SETTINGS" />
+ <category android:name="android.intent.category.VOICE_LAUNCH" />
+ <category android:name="android.intent.category.DEFAULT" />
+ <category android:name="android.intent.category.SHORTCUT" />
+ </intent-filter>
+ <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
+ android:value="com.android.settings.profiles.ProfilesSettings" />
+ <meta-data android:name="com.android.settings.TOP_LEVEL_HEADER_ID"
+ android:resource="@id/profiles_settings" />
+ </activity>
+
+ <!-- Keep compatibility with old shortcuts. -->
+ <activity-alias android:name="ProfileSettings"
+ android:label="@string/profile_settings"
+ android:exported="true"
+ android:targetActivity="Settings$ProfilesSettingsActivity">
+ <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
+ android:value="com.android.settings.profiles.ProfilesSettings" />
+ <meta-data android:name="com.android.settings.TOP_LEVEL_HEADER_ID"
+ android:resource="@id/profiles_settings" />
+ </activity-alias>
<activity android:name=".profiles.ProfileConfig" />