diff options
| author | Nick Pelly <npelly@google.com> | 2011-10-31 14:11:29 -0700 |
|---|---|---|
| committer | Nick Pelly <npelly@google.com> | 2011-10-31 14:56:18 -0700 |
| commit | e0eedf7157d0ad2ff1f96548cb082cfb770480ec (patch) | |
| tree | 698ab5eda972703ed643d551b2dd18e2fa5d7ad5 /AndroidManifest.xml | |
| parent | d9bf0d1afa7857ec3f678ac2aa041b42bcf2ef5a (diff) | |
| download | packages_apps_settings-e0eedf7157d0ad2ff1f96548cb082cfb770480ec.zip packages_apps_settings-e0eedf7157d0ad2ff1f96548cb082cfb770480ec.tar.gz packages_apps_settings-e0eedf7157d0ad2ff1f96548cb082cfb770480ec.tar.bz2 | |
Fix ACTION_NFCSHARING_SETTINGS. Add ACTION_NFC_SETTINGS.
ACTION_NFCSHARING_SETTINGS is a new ICS API that doesn't work until now.
It allows application to show UI to turn Android Beam on.
Add ACTION_NFC_SHARING - exposed in MR2.
Remove ANDROID_BEAM_SETTINGS, this was orphanned.
I wish we had renamed ACTION_NFCSHARING_SETTINGS to ACTION_NDEF_PUSH_SETTINGS,
but too late now. It's already released in SDK.
Bug: 5465097
Change-Id: I641b2efa39a3567cbd1c31587f3b67b1b0a0caa0
Signed-off-by: Nick Pelly <npelly@google.com>
Diffstat (limited to 'AndroidManifest.xml')
| -rw-r--r-- | AndroidManifest.xml | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 1da79f8..6a17bb9 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -94,6 +94,7 @@ <action android:name="android.intent.action.MAIN" /> <action android:name="android.settings.WIRELESS_SETTINGS" /> <action android:name="android.settings.AIRPLANE_MODE_SETTINGS" /> + <action android:name="android.settings.NFC_SETTINGS" /> <category android:name="android.intent.category.DEFAULT" /> <category android:name="android.intent.category.VOICE_LAUNCH" /> </intent-filter> @@ -979,11 +980,11 @@ android:clearTaskOnLaunch="true"> <intent-filter> <action android:name="android.intent.action.MAIN" /> - <action android:name="android.settings.ANDROID_BEAM_SETTINGS" /> + <action android:name="android.settings.NFCSHARING_SETTINGS" /> <category android:name="android.intent.category.DEFAULT" /> </intent-filter> <meta-data android:name="com.android.settings.FRAGMENT_CLASS" - android:value="com.android.settings.nfc.NdefPush" /> + android:value="com.android.settings.nfc.AndroidBeam" /> </activity> <!-- Accessibility tutorial --> |