Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 6c306b8e: Merge "Settings.Global.LOCK_SCREEN_SHOW_NOTIFICATIONS."

Browse Source 
* commit '6c306b8e4e1cd1bf303c58676148378116b2e396':
  Settings.Global.LOCK_SCREEN_SHOW_NOTIFICATIONS.
This commit is contained in:
Dan Sandler
2014-02-18 18:28:31 -08:00
committed by Android Git Automerger
parent e995786f46 6c306b8e4e
commit e515b32dcd
3 changed files with 17 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
core/java/android/provider/Settings.java
View File

@@ -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.