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

am 402152d6: Merge "Reveal notification listener settings APIs." into lmp-mr1-dev

Browse Source 
* commit '402152d6736839d89a9179cd4371201020074797':
  Reveal notification listener settings APIs.
This commit is contained in:
Chris Wren
2014-10-29 22:50:08 +00:00
committed by Android Git Automerger
parent a27e1a366a 402152d673
commit b3239da9a0
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
api/current.txt
View File

@@ -25165,6 +25165,7 @@ package android.provider {
field public static final java.lang.String ACTION_NFCSHARING_SETTINGS = "android.settings.NFCSHARING_SETTINGS"; field public static final java.lang.String ACTION_NFCSHARING_SETTINGS = "android.settings.NFCSHARING_SETTINGS";
field public static final java.lang.String ACTION_NFC_PAYMENT_SETTINGS = "android.settings.NFC_PAYMENT_SETTINGS"; field public static final java.lang.String ACTION_NFC_PAYMENT_SETTINGS = "android.settings.NFC_PAYMENT_SETTINGS";
field public static final java.lang.String ACTION_NFC_SETTINGS = "android.settings.NFC_SETTINGS"; field public static final java.lang.String ACTION_NFC_SETTINGS = "android.settings.NFC_SETTINGS";
field public static final java.lang.String ACTION_NOTIFICATION_LISTENER_SETTINGS = "android.settings.ACTION_NOTIFICATION_LISTENER_SETTINGS";
field public static final java.lang.String ACTION_PRINT_SETTINGS = "android.settings.ACTION_PRINT_SETTINGS"; field public static final java.lang.String ACTION_PRINT_SETTINGS = "android.settings.ACTION_PRINT_SETTINGS";
field public static final java.lang.String ACTION_PRIVACY_SETTINGS = "android.settings.PRIVACY_SETTINGS"; field public static final java.lang.String ACTION_PRIVACY_SETTINGS = "android.settings.PRIVACY_SETTINGS";
field public static final java.lang.String ACTION_QUICK_LAUNCH_SETTINGS = "android.settings.QUICK_LAUNCH_SETTINGS"; field public static final java.lang.String ACTION_QUICK_LAUNCH_SETTINGS = "android.settings.QUICK_LAUNCH_SETTINGS";

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

@@ -787,11 +787,10 @@ public final class Settings {
* <p> * <p>
* Output: Nothing. * Output: Nothing.
* @see android.service.notification.NotificationListenerService * @see android.service.notification.NotificationListenerService
* @hide
*/ */
@SdkConstant(SdkConstantType.ACTIVITY_INTENT_ACTION) @SdkConstant(SdkConstantType.ACTIVITY_INTENT_ACTION)
public static final String ACTION_NOTIFICATION_LISTENER_SETTINGS public static final String ACTION_NOTIFICATION_LISTENER_SETTINGS
= "android.settings.NOTIFICATION_LISTENER_SETTINGS"; = "android.settings.ACTION_NOTIFICATION_LISTENER_SETTINGS";
/** /**
* @hide * @hide
@@ -4738,8 +4737,8 @@ public final class Settings {
public static final String SMS_DEFAULT_APPLICATION = "sms_default_application"; public static final String SMS_DEFAULT_APPLICATION = "sms_default_application";
/** /**
* Name of a package that the current user has explicitly allowed to see all of that * Names of the packages that the current user has explicitly allowed to
* user's notifications. * see all of the user's notifications, separated by ':'.
* *
* @hide * @hide
*/ */