diff options
| author | Jeff Hamilton <jham@android.com> | 2011-09-21 16:44:36 -0500 |
|---|---|---|
| committer | Jeff Hamilton <jham@android.com> | 2011-09-22 12:35:55 -0500 |
| commit | 3d670de5ce9180e0a75d0884832c4714cb56e1b5 (patch) | |
| tree | 2e41eb2d978f3a1fd6e10c36bc1fe64b8c6e11ee /AndroidManifest.xml | |
| parent | 7c430090c9a5033ad5ee91e968dab1618cf5eed3 (diff) | |
| download | packages_apps_settings-3d670de5ce9180e0a75d0884832c4714cb56e1b5.zip packages_apps_settings-3d670de5ce9180e0a75d0884832c4714cb56e1b5.tar.gz packages_apps_settings-3d670de5ce9180e0a75d0884832c4714cb56e1b5.tar.bz2 | |
Bring back the Android Beam settings panel.
Bug: 5350022
Change-Id: I22d2c6f91f7ab86501021fe97a2d57b109ed10bf
Diffstat (limited to 'AndroidManifest.xml')
| -rw-r--r-- | AndroidManifest.xml | 13 |
1 files changed, 13 insertions, 0 deletions
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" |