summaryrefslogtreecommitdiffstats
path: root/AndroidManifest.xml
diff options
context:
space:
mode:
authorDanny Baumann <dannybaumann@web.de>2014-11-12 17:14:27 -0800
committerSteve Kondik <steve@cyngn.com>2015-11-13 09:01:09 +0100
commite2bdd4895c967771c6c31b4a037cbd85092e4abf (patch)
tree4c2e398eef74ce372d395570374315916d9f15ae /AndroidManifest.xml
parent925bfff09a29db5d2f5ae1e852c71a82173b9414 (diff)
downloadpackages_apps_Settings-e2bdd4895c967771c6c31b4a037cbd85092e4abf.zip
packages_apps_Settings-e2bdd4895c967771c6c31b4a037cbd85092e4abf.tar.gz
packages_apps_Settings-e2bdd4895c967771c6c31b4a037cbd85092e4abf.tar.bz2
Add back blacklist settings.
Change-Id: Iae35717acfa9af4da75c07d24352acf981d19fc7 Improve translatability of summaries. Change-Id: I362b335cbe219d6e371a458c9d50fcd66bdf19fe Settings: Alert user when they attempt to add an invalid number to BL. - BlacklistProvider will reject numbers that aren't valid, silently. So instead of resuming to a blank screen, we should alert the user that the number they attempted to add is invalid by utilizing BlacklistUtils#addOrUpdate method. Change-Id: I1ca32427baad41c1c9379e18046e6ca7937b6d32 Add missing blacklist xxhdpi drawables. Change-Id: I327f408ff344e9358c479cf5fe9dc341918511b2 Blacklist: Fix launching blacklist settings Change-Id: I0043503e6ac0d3536941394ee5057001b72f9114 Settings : Launch only contacts picker for blacklist entry Change-Id: I266d1ad7f1aab745728b33490268cb197188f2b3
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">