commit 3d670de5ce9180e0a75d0884832c4714cb56e1b5
author Jeff Hamilton <jham@android.com> Wed Sep 21 16:44:36 2011 -0500
committer Jeff Hamilton <jham@android.com> Thu Sep 22 12:35:55 2011 -0500
tree 2e41eb2d978f3a1fd6e10c36bc1fe64b8c6e11ee
parent 7c430090c9a5033ad5ee91e968dab1618cf5eed3

Bring back the Android Beam settings panel.

Bug: 5350022
Change-Id: I22d2c6f91f7ab86501021fe97a2d57b109ed10bf

AndroidManifest.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 4b2ccfe..6477c0b 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -967,6 +967,19 @@
             </intent-filter>
         </activity>
 
+        <!-- NFC settings -->
+        <activity android:name="Settings$AndroidBeamSettingsActivity"
+                android:label="@string/android_beam_settings_title"
+                android:clearTaskOnLaunch="true">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <action android:name="android.settings.ANDROID_BEAM_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" />
+        </activity>
+
         <!-- Accessibility tutorial -->
         <activity android:name="AccessibilityTutorialActivity"
                 android:label="@string/accessibility_tutorial_title"