diff options
| author | Dan Sandler <dsandler@android.com> | 2014-07-22 23:14:54 -0400 |
|---|---|---|
| committer | Dan Sandler <dsandler@android.com> | 2014-08-06 18:00:53 +0000 |
| commit | 52e5701eea2da526191e997f9df5c41ef1e1c938 (patch) | |
| tree | 33a48d4653299f655eb4a867d4af3e01ff9ff1a1 /core/java/android/provider | |
| parent | ea844f92a324ec08818d8dbd9f7ff1ec45e4a812 (diff) | |
| download | frameworks_base-52e5701eea2da526191e997f9df5c41ef1e1c938.zip frameworks_base-52e5701eea2da526191e997f9df5c41ef1e1c938.tar.gz frameworks_base-52e5701eea2da526191e997f9df5c41ef1e1c938.tar.bz2 | |
Move LOCK_SCREEN_SHOW_NOTIFICATIONS to per-user Settings.Secure.
Bug: 15331132
Change-Id: Ia80ccb2cfdf60116bd50601e60ff131619eafcc5
Diffstat (limited to 'core/java/android/provider')
| -rw-r--r-- | core/java/android/provider/Settings.java | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java index 4b7e615..de1df56 100644 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -4722,6 +4722,13 @@ public final class Settings { public static final String UNSAFE_VOLUME_MUSIC_ACTIVE_MS = "unsafe_volume_music_active_ms"; /** + * This preference enables notification display on the lockscreen. + * @hide + */ + public static final String LOCK_SCREEN_SHOW_NOTIFICATIONS = + "lock_screen_show_notifications"; + + /** * This are the settings to be backed up. * * NOTE: Settings are backed up and restored in the order they appear @@ -6365,15 +6372,6 @@ 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"; - /** * Defines global zen mode. ZEN_MODE_OFF, ZEN_MODE_IMPORTANT_INTERRUPTIONS, * or ZEN_MODE_NO_INTERRUPTIONS. |