summaryrefslogtreecommitdiffstats
path: root/AndroidManifest.xml
diff options
context:
space:
mode:
Diffstat (limited to 'AndroidManifest.xml')
-rw-r--r--AndroidManifest.xml24
1 files changed, 21 insertions, 3 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index e28c1d4..28489d6 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -2161,12 +2161,12 @@
<category android:name="android.intent.category.VOICE_LAUNCH" />
<category android:name="android.intent.category.DEFAULT" />
<category android:name="android.intent.category.SHORTCUT" />
- </intent-filter>
+ </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>
+ </activity>
<!-- Keep compatibility with old shortcuts. -->
<activity-alias android:name="ProfileSettings"
@@ -2219,10 +2219,28 @@
<meta-data android:name="com.android.settings.TOP_LEVEL_HEADER_ID"
android:resource="@id/display_settings" />
</activity-alias>
- <!-- CyanogenMod activities End -->
+
<activity android:name=".cyanogenmod.SpamList" />
+ <!-- "Blacklist settings" UI, used only on voice-capable phone devices. -->
+ <activity android:name="Settings$BlacklistSettingsActivity"
+ android:theme="@style/Theme.SubSettingsDialogWhenLarge"
+ android:uiOptions="splitActionBarWhenNarrow"
+ android:label="@string/blacklist_title"
+ android:excludeFromRecents="true">
+ <intent-filter>
+ <action android:name="android.intent.action.MAIN" />
+ <category android:name="android.intent.category.DEFAULT" />
+ </intent-filter>
+ <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
+ android:value="com.android.settings.blacklist.BlacklistSettings" />
+ <meta-data android:name="com.android.settings.TOP_LEVEL_HEADER_ID"
+ android:resource="@id/security_settings" />
+ </activity>
+
+ <!-- CyanogenMod activities End -->
+
<!-- Pseudo-activity used to provide an intent-filter entry point to encryption settings -->
<activity android:name="Settings$CryptKeeperSettingsActivity"
android:label="@string/crypt_keeper_encrypt_title">