Merge "Implement per-app sensitivity settings toggle." into lmp-dev

res/xml/app_notification_settings.xml

@@ -39,7 +39,6 @@
             android:key="sensitive"
             android:title="@string/app_notification_sensitive_title"
             android:summary="@string/app_notification_sensitive_summary"
-            android:enabled="false"
             android:persistent="false" />
 
 </PreferenceScreen>

src/com/android/settings/notification/AppNotificationSettings.java

@@ -137,7 +137,9 @@ public class AppNotificationSettings extends SettingsPreferenceFragment {
         mSensitive = (SwitchPreference) findPreference(KEY_SENSITIVE);
 
         final boolean secure = new LockPatternUtils(getActivity()).isSecure();
-        if (!secure) {
+        final boolean enabled = getLockscreenNotificationsEnabled();
+        final boolean allowPrivate = getLockscreenAllowPrivateNotifications();
+        if (!secure || !enabled || !allowPrivate) {
             getPreferenceScreen().removePreference(mSensitive);
         }
 
@@ -193,6 +195,16 @@ public class AppNotificationSettings extends SettingsPreferenceFragment {
         }
     }
 
+    private boolean getLockscreenNotificationsEnabled() {
+        return Settings.Secure.getInt(getContentResolver(),
+                Settings.Secure.LOCK_SCREEN_SHOW_NOTIFICATIONS, 0) != 0;
+    }
+
+    private boolean getLockscreenAllowPrivateNotifications() {
+        return Settings.Secure.getInt(getContentResolver(),
+                Settings.Secure.LOCK_SCREEN_ALLOW_PRIVATE_NOTIFICATIONS, 0) != 0;
+    }
+
     private void toastAndFinish() {
         Toast.makeText(mContext, R.string.app_not_found_dlg_text, Toast.LENGTH_SHORT).show();
         getActivity().finish();

src/com/android/settings/notification/NotificationAppList.java

@@ -568,13 +568,28 @@ public class NotificationAppList extends PinnedHeaderListFragment
         }
 
         public boolean getSensitive(String pkg, int uid) {
-            // TODO get visibility state from NoMan
+            INotificationManager nm = INotificationManager.Stub.asInterface(
-            return false;
+                    ServiceManager.getService(Context.NOTIFICATION_SERVICE));
+            try {
+                return nm.getPackageVisibility(pkg, uid) == Notification.VISIBILITY_PRIVATE;
+            } catch (Exception e) {
+                Log.w(TAG, "Error calling NoMan", e);
+                return false;
+            }
         }
 
         public boolean setSensitive(String pkg, int uid, boolean sensitive) {
-            // TODO save visibility state to NoMan
+            INotificationManager nm = INotificationManager.Stub.asInterface(
-            return true;
+                    ServiceManager.getService(Context.NOTIFICATION_SERVICE));
+            try {
+                nm.setPackageVisibility(pkg, uid,
+                        sensitive ? Notification.VISIBILITY_PRIVATE
+                                : Notification.VISIBILITY_NO_OVERRIDE);
+                return true;
+            } catch (Exception e) {
+                Log.w(TAG, "Error calling NoMan", e);
+                return false;
+            }
         }
     }
 }