diff options
| author | The Android Automerger <android-build@android.com> | 2011-11-02 20:58:19 -0700 |
|---|---|---|
| committer | The Android Automerger <android-build@android.com> | 2011-11-02 20:58:19 -0700 |
| commit | 850cb95af3949ca7967deea104844c800f7d4b62 (patch) | |
| tree | bf9ce559427358692c44f24b96243f74aa81cbcf | |
| parent | ae076c958c704628cc60bc897084689670f740d6 (diff) | |
| download | packages_apps_Settings-850cb95af3949ca7967deea104844c800f7d4b62.tar.gz packages_apps_Settings-850cb95af3949ca7967deea104844c800f7d4b62.tar.bz2 packages_apps_Settings-850cb95af3949ca7967deea104844c800f7d4b62.zip | |
Revert "Merge "Fix ACTION_NFCSHARING_SETTINGS. Add ACTION_NFC_SETTINGS." into ics-mr0"android-4.0.1_r1.2android-4.0.1_r1.1android-4.0.1_r1
This reverts commit 1b4f5d743594971eab9747a84ee21420a8602bbe, reversing
changes made to 19d9a3d2846c538502003a81522f6d285b9ff24b.
| -rw-r--r-- | AndroidManifest.xml | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 6a17bb9551..1da79f8807 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -94,7 +94,6 @@ <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> @@ -980,11 +979,11 @@ android:clearTaskOnLaunch="true"> <intent-filter> <action android:name="android.intent.action.MAIN" /> - <action android:name="android.settings.NFCSHARING_SETTINGS" /> + <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.AndroidBeam" /> + android:value="com.android.settings.nfc.NdefPush" /> </activity> <!-- Accessibility tutorial --> |