diff options
| author | Jason Simmons <jsimmons@google.com> | 2011-11-08 10:05:56 -0800 |
|---|---|---|
| committer | Jason Simmons <jsimmons@google.com> | 2011-11-08 10:05:56 -0800 |
| commit | bfc3e70662900564e795a174d14939bf1271757c (patch) | |
| tree | ed874d95c99b118b94c503a694432b2702f9a7ba /core/java/android/provider | |
| parent | d6739fccfc3f97a94366c537797b7b9821e64e15 (diff) | |
| parent | 1366c756d28cdbb6c7c07959dfb4c93c81a9539d (diff) | |
| download | frameworks_base-bfc3e70662900564e795a174d14939bf1271757c.zip frameworks_base-bfc3e70662900564e795a174d14939bf1271757c.tar.gz frameworks_base-bfc3e70662900564e795a174d14939bf1271757c.tar.bz2 | |
resolved conflicts for merge of 1366c756 to ics-aah
Change-Id: I9faea6d9604f44b389acb4268941a7e5917ef1a8
Diffstat (limited to 'core/java/android/provider')
| -rw-r--r-- | core/java/android/provider/Settings.java | 10 | ||||
| -rwxr-xr-x | core/java/android/provider/Telephony.java | 10 |
2 files changed, 19 insertions, 1 deletions
diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java index 1b5d2a2..243ae8d 100644 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -4080,6 +4080,13 @@ public final class Settings { "contacts_preauth_uri_expiration"; /** + * Whether the Messaging app posts notifications. + * 0=disabled. 1=enabled. + */ + public static final String MESSAGING_APP_NOTIFICATIONS = "messaging_app_notifications"; + + + /** * This are the settings to be backed up. * * NOTE: Settings are backed up and restored in the order they appear @@ -4116,7 +4123,8 @@ public final class Settings { MOUNT_UMS_NOTIFY_ENABLED, UI_NIGHT_MODE, LOCK_SCREEN_OWNER_INFO, - LOCK_SCREEN_OWNER_INFO_ENABLED + LOCK_SCREEN_OWNER_INFO_ENABLED, + MESSAGING_APP_NOTIFICATIONS }; /** diff --git a/core/java/android/provider/Telephony.java b/core/java/android/provider/Telephony.java index 0e6d07d..8eb9da1 100755 --- a/core/java/android/provider/Telephony.java +++ b/core/java/android/provider/Telephony.java @@ -1838,5 +1838,15 @@ public final class Telephony { public static final String EXTRA_PLMN = "plmn"; public static final String EXTRA_SHOW_SPN = "showSpn"; public static final String EXTRA_SPN = "spn"; + + /** + * Activity Action: Shows a dialog to turn off Messaging app notification. + * <p>Input: Nothing. + * <p>Output: Nothing. + */ + @SdkConstant(SdkConstantType.ACTIVITY_INTENT_ACTION) + public static final String ACTION_MESSAGING_APP_NOTIFICATIONS = + "android.provider.Telephony.MESSAGING_APP_NOTIFICATIONS"; + } } |