From 9e29ad6cb2774184aeb9cb66b035a790bfd1339a Mon Sep 17 00:00:00 2001
From: The Android Automerger <android-build@android.com>
Date: Wed, 2 Nov 2011 04:41:12 -0700
Subject: [PATCH 1/5] Revert "Merge "Fix ACTION_NFCSHARING_SETTINGS. Add
 ACTION_NFC_SETTINGS." into ics-mr0"

This reverts commit 1b4f5d743594971eab9747a84ee21420a8602bbe, reversing
changes made to 19d9a3d2846c538502003a81522f6d285b9ff24b.
---
 AndroidManifest.xml | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 6a17bb95512..1da79f88073 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 -->

From 90e6d7933311752deb608d9f1cb9ad5a63730688 Mon Sep 17 00:00:00 2001
From: The Android Automerger <android-build@android.com>
Date: Wed, 2 Nov 2011 10:07:38 -0700
Subject: [PATCH 2/5] Revert "Merge "Fix WPS pin input UI" into ics-mr0"

This reverts commit 19d9a3d2846c538502003a81522f6d285b9ff24b, reversing
changes made to 480b2e440646e4859ebdd88b82441b4bd9a61651.
---
 src/com/android/settings/wifi/WifiConfigController.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/com/android/settings/wifi/WifiConfigController.java b/src/com/android/settings/wifi/WifiConfigController.java
index 2f8ae549106..44dc8451416 100644
--- a/src/com/android/settings/wifi/WifiConfigController.java
+++ b/src/com/android/settings/wifi/WifiConfigController.java
@@ -575,7 +575,7 @@ public class WifiConfigController implements TextWatcher,
         int pos = mNetworkSetupSpinner.getSelectedItemPosition();
 
         /* Show pin text input if needed */
-        if (pos == WPS_KEYPAD) {
+        if (pos == WPS_DISPLAY) {
             mView.findViewById(R.id.wps_fields).setVisibility(View.VISIBLE);
         } else {
             mView.findViewById(R.id.wps_fields).setVisibility(View.GONE);

From 12790a38a6c0e36a2cdc4155e457f294f93aa528 Mon Sep 17 00:00:00 2001
From: The Android Automerger <android-build@android.com>
Date: Wed, 2 Nov 2011 10:07:45 -0700
Subject: [PATCH 3/5] Revert "Merge "Fix ACTION_NFCSHARING_SETTINGS. Add
 ACTION_NFC_SETTINGS." into ics-mr0"

This reverts commit 1b4f5d743594971eab9747a84ee21420a8602bbe, reversing
changes made to 19d9a3d2846c538502003a81522f6d285b9ff24b.
---
 AndroidManifest.xml | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 6a17bb95512..1da79f88073 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 -->

From ae076c958c704628cc60bc897084689670f740d6 Mon Sep 17 00:00:00 2001
From: The Android Automerger <android-build@android.com>
Date: Wed, 2 Nov 2011 20:58:10 -0700
Subject: [PATCH 4/5] Revert "Merge "Fix WPS pin input UI" into ics-mr0"

This reverts commit 19d9a3d2846c538502003a81522f6d285b9ff24b, reversing
changes made to 480b2e440646e4859ebdd88b82441b4bd9a61651.
---
 src/com/android/settings/wifi/WifiConfigController.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/com/android/settings/wifi/WifiConfigController.java b/src/com/android/settings/wifi/WifiConfigController.java
index 2f8ae549106..44dc8451416 100644
--- a/src/com/android/settings/wifi/WifiConfigController.java
+++ b/src/com/android/settings/wifi/WifiConfigController.java
@@ -575,7 +575,7 @@ public class WifiConfigController implements TextWatcher,
         int pos = mNetworkSetupSpinner.getSelectedItemPosition();
 
         /* Show pin text input if needed */
-        if (pos == WPS_KEYPAD) {
+        if (pos == WPS_DISPLAY) {
             mView.findViewById(R.id.wps_fields).setVisibility(View.VISIBLE);
         } else {
             mView.findViewById(R.id.wps_fields).setVisibility(View.GONE);

From 850cb95af3949ca7967deea104844c800f7d4b62 Mon Sep 17 00:00:00 2001
From: The Android Automerger <android-build@android.com>
Date: Wed, 2 Nov 2011 20:58:19 -0700
Subject: [PATCH 5/5] Revert "Merge "Fix ACTION_NFCSHARING_SETTINGS. Add
 ACTION_NFC_SETTINGS." into ics-mr0"

This reverts commit 1b4f5d743594971eab9747a84ee21420a8602bbe, reversing
changes made to 19d9a3d2846c538502003a81522f6d285b9ff24b.
---
 AndroidManifest.xml | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 6a17bb95512..1da79f88073 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 -->