summaryrefslogtreecommitdiffstats
path: root/src/com/android/settings/SettingsActivity.java
diff options
context:
space:
mode:
authorDiogo Ferreira <defer@cyngn.com>2014-12-03 15:02:57 +0000
committerSteve Kondik <steve@cyngn.com>2015-11-13 09:01:09 +0100
commit9897751d02be1f51caeb5a8d9647c1f8ae7a03ff (patch)
tree3c98ece0a058da3a7d880d326210a5dd83167682 /src/com/android/settings/SettingsActivity.java
parent1bf1d26827d35dca4564c4195bf86bc629c1e93b (diff)
downloadpackages_apps_Settings-9897751d02be1f51caeb5a8d9647c1f8ae7a03ff.zip
packages_apps_Settings-9897751d02be1f51caeb5a8d9647c1f8ae7a03ff.tar.gz
packages_apps_Settings-9897751d02be1f51caeb5a8d9647c1f8ae7a03ff.tar.bz2
privacy: Actually set the blacklist preference
The preference was not being set, which caused this code to throw an NPE on devices without telephony when opening the privacy preferences. This bug also affects devices with telephony in that the preference doesn't update its text. I also got rid of the null check because the preference always exists, the null check is pointless and ended up hiding this bug. Change-Id: I95555d44349700a8f29a71a2f2ee9aedf419b49b Settings: Fix blacklist settings crash Change-Id: Idd261aa9f8e2867312aaaece26150671b177994c Settings: materialize Blacklist settings * Add a FAB * Add a (generic system) enable/disable switch bar Change-Id: I0984bf6769abef48cc7e0a643c2bdd73219954fc Signed-off-by: Roman Birg <roman@cyngn.com> Settings: add a way to open blacklist settings externally Opening the activity doesn't theme the switch bar - an alias works. Change-Id: I78efb382f4f1f4d208f122fedb0d71a86b515405 Signed-off-by: Roman Birg <roman@cyngn.com> blacklist: make it possible to unblacklist phone/messages via checkboxes Change-Id: I7d982d17818efe065e4e22f2a86a46493672584a Settings: fix blacklist settings crash On a device rotate, the MultiSelectListPreference would try and restore its state since the preferences aren't persisted. Clear the persisted flag so the MultiSelectPreference doesn't try and restore the states, as they get populated in onResume(). Change-Id: I0d0304e2367ade66e35ae7df432575d13ed0993e Signed-off-by: Roman Birg <roman@cyngn.com> Settings : Update blacklist strings Change-Id: I08ea4405f41f86a9eaf7bae74cbb61fa1fb0c8aa (cherry picked from commit 6d8cc2c697752a1357915ea88651b2fe220a54ba) Settings : Add input checks for blacklist input There can be situations where user enters invalid input. Ensure that is handled. Repro : 1. Add new blacklist entry 2. Enter / 3. Press ok 4. Enjoy crash issue-id: CYNGNOS-980 Change-Id: Ica90ac835f374569123e679ba39c3caa7179ef65 Settings : Fix blacklist delete number crash issue-id : HAM-795 Change-Id: I25306b3d4bead5487f039c3f51b631b1ef88b18d
Diffstat (limited to 'src/com/android/settings/SettingsActivity.java')
-rw-r--r--src/com/android/settings/SettingsActivity.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/com/android/settings/SettingsActivity.java b/src/com/android/settings/SettingsActivity.java
index 74b8ff9..c8c8ec7 100644
--- a/src/com/android/settings/SettingsActivity.java
+++ b/src/com/android/settings/SettingsActivity.java
@@ -364,7 +364,7 @@ public class SettingsActivity extends Activity
DrawOverlayDetails.class.getName(),
WriteSettingsDetails.class.getName(),
LiveDisplay.class.getName(),
- com.android.settings.cyanogenmod.PrivacySettings.class.getName()
+ com.android.settings.cyanogenmod.PrivacySettings.class.getName(),
BlacklistSettings.class.getName()
};