Move Blacklist and Notif Filter to Privacy

Match CM 11

Change-Id: I5e3f9c26b68a89ba1622d95e2d0e4f4a93361c5e

Cleanup Security/Privacy settings code

Cleanup:
* Mismerges
* Code style
* Copyright headers
* File permissions

Change-Id: I6c34586680f0ccbaa613a0acfee366113c32a81c

1 files changed, 30 insertions, 4 deletions

diff --git a/src/com/android/settings/cyanogenmod/PrivacySettings.java b/src/com/android/settings/cyanogenmod/PrivacySettings.java
index 76cb9cb..ced0832 100644
--- a/src/com/android/settings/cyanogenmod/PrivacySettings.java
+++ b/src/com/android/settings/cyanogenmod/PrivacySettings.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2009 The Android Open Source Project
+ * Copyright (C) 2014 The CyanogenMod Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,25 +16,39 @@
 
 package com.android.settings.cyanogenmod;
 
-//import android.content.pm.PackageManager;
+import android.content.pm.PackageManager;
 import android.os.Bundle;
-//import android.preference.PreferenceScreen;
-//import com.android.settings.Utils;
+import android.preference.PreferenceScreen;
 
 import com.android.internal.logging.MetricsLogger;
 import com.android.settings.R;
 import com.android.settings.SettingsPreferenceFragment;
 import com.android.settings.Utils;
+import com.android.internal.telephony.util.BlacklistUtils;
 
 /**
  * Privacy settings
  */
 public class PrivacySettings extends SettingsPreferenceFragment {
 
+    private static final String KEY_BLACKLIST = "blacklist";
+
+    private PreferenceScreen mBlacklist;
+
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         addPreferencesFromResource(R.xml.privacy_settings_cyanogenmod);
+
+        // Add package manager to check if features are available
+        PackageManager pm = getPackageManager();
+
+        // Determine options based on device telephony support
+        if (!pm.hasSystemFeature(PackageManager.FEATURE_TELEPHONY)) {
+            // No telephony, remove dependent options
+        PreferenceScreen root = getPreferenceScreen();
+            root.removePreference(mBlacklist);
+        }
     }
 
     @Override
@@ -45,5 +59,17 @@ public class PrivacySettings extends SettingsPreferenceFragment {
     @Override
     public void onResume() {
         super.onResume();
+        updateBlacklistSummary();
     }
+
+    private void updateBlacklistSummary() {
+        if (mBlacklist != null) {
+            if (BlacklistUtils.isBlacklistEnabled(getActivity())) {
+                mBlacklist.setSummary(R.string.blacklist_summary);
+            } else {
+                mBlacklist.setSummary(R.string.blacklist_summary_disabled);
+            }
+        }
+    }
+
 }