summaryrefslogtreecommitdiffstats
path: root/src/com/android/settings/Settings.java
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 /src/com/android/settings/Settings.java
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 'src/com/android/settings/Settings.java')
-rwxr-xr-x[-rw-r--r--]src/com/android/settings/Settings.java2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/com/android/settings/Settings.java b/src/com/android/settings/Settings.java
index 101219b..06f0149 100644..100755
--- a/src/com/android/settings/Settings.java
+++ b/src/com/android/settings/Settings.java
@@ -17,6 +17,7 @@
package com.android.settings;
import com.android.settings.applications.AppOpsSummary;
+import com.android.settings.blacklist.BlacklistSettings;
/**
* Top-level Settings activity
@@ -118,4 +119,5 @@ public class Settings extends SettingsActivity {
public static class AppDrawOverlaySettingsActivity extends SettingsActivity { /* empty */ }
public static class AppWriteSettingsActivity extends SettingsActivity { /* empty */ }
public static class LiveDisplayActivity extends SettingsActivity { /* empty */ }
+ public static class BlacklistSettingsActivity extends SettingsActivity { /* empty */ }
}