diff options
| author | 2011-07-28 11:21:39 -0500 | |
|---|---|---|
| committer | 2011-07-28 12:37:18 -0500 | |
| commit | 9b3c83fbad86989158db27a88f872562c3973a14 (patch) | |
| tree | cda49af6fff180638cc334cfa903e2b4b05d90c6 | |
| parent | b03c4af05ea367d7d9f792403ac7235be562aa5e (diff) | |
Add constant for NFC sharing settings screen.
Change-Id: Ibeea153442110542f05d1ece57a7dc6388a91fbf
| -rw-r--r-- | api/current.txt | 1 | ||||
| -rw-r--r-- | core/java/android/provider/Settings.java | 14 |
2 files changed, 15 insertions, 0 deletions
diff --git a/api/current.txt b/api/current.txt index 4135b5d69390..ac4009679260 100644 --- a/api/current.txt +++ b/api/current.txt @@ -16667,6 +16667,7 @@ package android.provider { field public static final java.lang.String ACTION_MANAGE_APPLICATIONS_SETTINGS = "android.settings.MANAGE_APPLICATIONS_SETTINGS"; field public static final java.lang.String ACTION_MEMORY_CARD_SETTINGS = "android.settings.MEMORY_CARD_SETTINGS"; field public static final java.lang.String ACTION_NETWORK_OPERATOR_SETTINGS = "android.settings.NETWORK_OPERATOR_SETTINGS"; + field public static final java.lang.String ACTION_NFCSHARING_SETTINGS = "android.settings.NFCSHARING_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_SEARCH_SETTINGS = "android.search.action.SEARCH_SETTINGS"; diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java index cd4e32e8ce32..b6bb3cf33fa7 100644 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -549,6 +549,20 @@ public final class Settings { public static final String ACTION_DEVICE_INFO_SETTINGS = "android.settings.DEVICE_INFO_SETTINGS"; + /** + * Activity Action: Show NFC sharing settings. + * <p> + * In some cases, a matching Activity may not exist, so ensure you + * safeguard against this. + * <p> + * Input: Nothing. + * <p> + * Output: Nothing + */ + @SdkConstant(SdkConstantType.ACTIVITY_INTENT_ACTION) + public static final String ACTION_NFCSHARING_SETTINGS = + "android.settings.NFCSHARING_SETTINGS"; + // End of Intent actions for Settings /** |