commit 17347407edd61fc15a316fa7aa55c17b399433ea
author Eric Fischer <enf@google.com> Tue Nov 01 13:51:13 2011 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Tue Nov 01 13:51:13 2011 -0700
tree 9cb91b8c2f62918ab27000bdebcd91f9ea9fedb3
parent 815b329af8704e58008860318429f2c70ec547f0
parent 78730481fe86e3bd5100e842c0f36fc2edb94f74

Merge "Import revised translations.  DO NOT MERGE" into ics-mr1

AndroidManifest.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 1da79f8..6a17bb9 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -94,6 +94,7 @@
                 <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>
@@ -979,11 +980,11 @@
                 android:clearTaskOnLaunch="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
-                <action android:name="android.settings.ANDROID_BEAM_SETTINGS" />
+                <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" />
+                android:value="com.android.settings.nfc.AndroidBeam" />
         </activity>
 
         <!-- Accessibility tutorial -->

src/com/android/settings/wifi/WifiConfigController.java

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