diff options
| author | Jeff Hamilton <jham@android.com> | 2011-09-22 10:48:20 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-09-22 10:48:20 -0700 |
| commit | 4cfe105506035f151242080e0ac7bd205542a2d9 (patch) | |
| tree | b4bc375420423fd0bfc4fd84ac3197f164a9e668 /AndroidManifest.xml | |
| parent | a1b6fdf4738e0d0aec4eb389316a7c354fe37c00 (diff) | |
| parent | 0d299625ebadae3d8b0881979633680e16b07daa (diff) | |
| download | packages_apps_Settings-4cfe105506035f151242080e0ac7bd205542a2d9.zip packages_apps_Settings-4cfe105506035f151242080e0ac7bd205542a2d9.tar.gz packages_apps_Settings-4cfe105506035f151242080e0ac7bd205542a2d9.tar.bz2 | |
am 0d299625: Merge "Bring back the Android Beam settings panel." into ics-factoryrom
* commit '0d299625ebadae3d8b0881979633680e16b07daa':
Bring back the Android Beam settings panel.
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 3155ccb..5269457 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -970,6 +970,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" |