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

diff --cc src/com/android/settings/notification/AppNotificationSettings.java
index 050008d,09271bf..1dd3bdc
--- 1/src/com/android/settings/notification/AppNotificationSettings.java
--- 2/src/com/android/settings/notification/AppNotificationSettings.java
+++ b/src/com/android/settings/notification/AppNotificationSettings.java
@@@ -185,14 -186,18 +187,24 @@@ public class AppNotificationSettings ex
                  }
              });
          }
 +
 +        // Users cannot block notifications from system/signature packages
 +        if (Utils.isSystemPackage(pm, info)) {
 +            getPreferenceScreen().removePreference(mBlock);
 +            mPriority.setDependency(null); // don't have it depend on a preference that's gone
 +        }
      }
  
+     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();

diff --cc src/com/android/settings/notification/NotificationAppList.java
Simple merge