diff options
| author | Dan Sandler <dsandler@android.com> | 2014-02-18 18:28:31 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-02-18 18:28:31 -0800 |
| commit | e515b32dcde3fa70e2f120049574e208a2a71a42 (patch) | |
| tree | e6e681f19454de69c14a68e4997352690f0040e3 /core/java/android/provider | |
| parent | e995786f46ef923442a0353970e5cdca354a166d (diff) | |
| parent | 6c306b8e4e1cd1bf303c58676148378116b2e396 (diff) | |
| download | frameworks_base-e515b32dcde3fa70e2f120049574e208a2a71a42.zip frameworks_base-e515b32dcde3fa70e2f120049574e208a2a71a42.tar.gz frameworks_base-e515b32dcde3fa70e2f120049574e208a2a71a42.tar.bz2 | |
am 6c306b8e: Merge "Settings.Global.LOCK_SCREEN_SHOW_NOTIFICATIONS."
* commit '6c306b8e4e1cd1bf303c58676148378116b2e396':
Settings.Global.LOCK_SCREEN_SHOW_NOTIFICATIONS.
Diffstat (limited to 'core/java/android/provider')
| -rw-r--r-- | core/java/android/provider/Settings.java | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java index f5505ae..c687933 100644 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -3476,16 +3476,8 @@ 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"; - - /** - * When set in conjunction with {@link #LOCK_SCREEN_ALLOW_NOTIFICATIONS}, shows - * notifications in their "private" form (same as when the device is unlocked). + * When set by a user, allows notifications to be shown atop a securely locked screen + * in their full "private" form (same as when the device is unlocked). * @hide */ public static final String LOCK_SCREEN_ALLOW_PRIVATE_NOTIFICATIONS = @@ -6082,6 +6074,15 @@ public final class Settings { */ public static final String POLICY_CONTROL = "policy_control"; + + /** + * This preference enables notification display even over a securely + * locked screen. + * @hide + */ + public static final String LOCK_SCREEN_SHOW_NOTIFICATIONS = + "lock_screen_show_notifications"; + /** * Settings to backup. This is here so that it's in the same place as the settings * keys and easy to update. |