From e0eedf7157d0ad2ff1f96548cb082cfb770480ec Mon Sep 17 00:00:00 2001
From: Nick Pelly <npelly@google.com>
Date: Mon, 31 Oct 2011 14:11:29 -0700
Subject: [PATCH] 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>
---
 AndroidManifest.xml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 1da79f88073..6a17bb95512 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 -->