summaryrefslogtreecommitdiffstats
path: root/AndroidManifest.xml
diff options
context:
space:
mode:
authorMartijn Coenen <maco@google.com>2011-09-14 11:47:59 +0200
committerMartijn Coenen <maco@google.com>2011-09-15 22:31:51 +0200
commit943af0bc69048d827c3dd1b92daeaa2cf1b77145 (patch)
tree35ac298df2cac46a2833fd4c6489c88966c5c65f /AndroidManifest.xml
parent85eeb1c16a43eda16b8948e3ba966871ae6b73fa (diff)
downloadpackages_apps_settings-943af0bc69048d827c3dd1b92daeaa2cf1b77145.zip
packages_apps_settings-943af0bc69048d827c3dd1b92daeaa2cf1b77145.tar.gz
packages_apps_settings-943af0bc69048d827c3dd1b92daeaa2cf1b77145.tar.bz2
Remove NFC sharing from Settings.
Bug: 5297151 Change-Id: I64304230296912519aa057a89f139a2242b557e3
Diffstat (limited to 'AndroidManifest.xml')
-rw-r--r--AndroidManifest.xml13
1 files changed, 0 insertions, 13 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index ab9d975..4b2ccfe 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -967,19 +967,6 @@
</intent-filter>
</activity>
- <!-- NFC settings -->
- <activity android:name="Settings$NfcSharingSettingsActivity"
- android:label="@string/ndef_push_settings_title"
- android:clearTaskOnLaunch="true">
- <intent-filter>
- <action android:name="android.intent.action.MAIN" />
- <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" />
- </activity>
-
<!-- Accessibility tutorial -->
<activity android:name="AccessibilityTutorialActivity"
android:label="@string/accessibility_tutorial_title"