diff options
| author | Chris Wren <cwren@android.com> | 2014-08-29 21:25:42 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-08-29 21:25:43 +0000 |
| commit | 4775109ec1e08092befa836078ecc76eee773e33 (patch) | |
| tree | 17fec35ed6447e6d867c37eae160c46d0ddf3768 /core/java/android/provider | |
| parent | 68245c074c0592284b89253c4ea662d0fa76cf90 (diff) | |
| parent | cd8f4f71fc75b4f57d21c4e9f80f1107101ca369 (diff) | |
| download | frameworks_base-4775109ec1e08092befa836078ecc76eee773e33.zip frameworks_base-4775109ec1e08092befa836078ecc76eee773e33.tar.gz frameworks_base-4775109ec1e08092befa836078ecc76eee773e33.tar.bz2 | |
Merge "Disable lockscreen notifications for secure users on upgrade." into lmp-dev
Diffstat (limited to 'core/java/android/provider')
| -rw-r--r-- | core/java/android/provider/Settings.java | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java index ae11f47..33e0468 100644 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -904,6 +904,15 @@ public final class Settings { public static final String ACTION_APP_NOTIFICATION_SETTINGS = "android.settings.APP_NOTIFICATION_SETTINGS"; + /** + * Activity Action: Show notification redaction settings. + * + * @hide + */ + @SdkConstant(SdkConstantType.ACTIVITY_INTENT_ACTION) + public static final String ACTION_APP_NOTIFICATION_REDACTION + = "android.settings.ACTION_APP_NOTIFICATION_REDACTION"; + /** @hide */ public static final String EXTRA_APP_UID = "app_uid"; /** @hide */ public static final String EXTRA_APP_PACKAGE = "app_package"; @@ -3714,6 +3723,14 @@ public final class Settings { "lock_screen_allow_private_notifications"; /** + * Set by the system to track if the user needs to see the call to action for + * the lockscreen notification policy. + * @hide + */ + public static final String SHOW_NOTE_ABOUT_NOTIFICATION_HIDING = + "show_note_about_notification_hiding"; + + /** * 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 |