diff options
| author | Dan Sandler <dsandler@android.com> | 2014-01-30 18:33:47 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-01-30 18:33:47 +0000 |
| commit | 1b7be3465d0be95e17c8ac9c759a45abaab50017 (patch) | |
| tree | b37b010c7f55c6772bf70a3862b785ed957adf00 /core/java/android | |
| parent | f56834018d124b8ad30b77bcc043645c31ffb7b1 (diff) | |
| parent | a5e0f415d351ad1a9c0ffde8d93df91a2384591f (diff) | |
Merge "SystemUI support for notification visibility."
Diffstat (limited to 'core/java/android')
| -rw-r--r-- | core/java/android/app/StatusBarManager.java | 3 | ||||
| -rw-r--r-- | core/java/android/provider/Settings.java | 8 |
2 files changed, 11 insertions, 0 deletions
diff --git a/core/java/android/app/StatusBarManager.java b/core/java/android/app/StatusBarManager.java index 2045ed8411a3..a6a04d11ee16 100644 --- a/core/java/android/app/StatusBarManager.java +++ b/core/java/android/app/StatusBarManager.java @@ -38,8 +38,11 @@ public class StatusBarManager { public static final int DISABLE_NOTIFICATION_ICONS = View.STATUS_BAR_DISABLE_NOTIFICATION_ICONS; public static final int DISABLE_NOTIFICATION_ALERTS = View.STATUS_BAR_DISABLE_NOTIFICATION_ALERTS; + @Deprecated public static final int DISABLE_NOTIFICATION_TICKER = View.STATUS_BAR_DISABLE_NOTIFICATION_TICKER; + public static final int DISABLE_PRIVATE_NOTIFICATIONS + = View.STATUS_BAR_DISABLE_NOTIFICATION_TICKER; public static final int DISABLE_SYSTEM_INFO = View.STATUS_BAR_DISABLE_SYSTEM_INFO; public static final int DISABLE_HOME = View.STATUS_BAR_DISABLE_HOME; public static final int DISABLE_RECENT = View.STATUS_BAR_DISABLE_RECENT; diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java index ee370451bb77..b9a898e42b7b 100644 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -3468,6 +3468,14 @@ public final class Settings { "lock_screen_owner_info_enabled"; /** + * This preference enables expanding the notification panel even over a securely + * locked screen, showing only "public" notifications in this case. + * @hide + */ + public static final String LOCK_SCREEN_ALLOW_NOTIFICATIONS = + "lock_screen_allow_notifications"; + + /** * The Logging ID (a unique 64-bit value) as a hex string. * Used as a pseudonymous identifier for logging. * @deprecated This identifier is poorly initialized and has |