WifiSettings: rename WifiSettings2 to WifiSettings.
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 5fd5650..74092e5 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -80,7 +80,7 @@
<!-- Top-level settings -->
- <activity android:name=".wifi.WifiSettings2"
+ <activity android:name=".wifi.WifiSettings"
android:label="@string/wifi_settings"
android:configChanges="orientation|keyboardHidden"
android:clearTaskOnLaunch="true"
diff --git a/res/xml/wifi_access_points2.xml b/res/xml/wifi_access_points.xml
similarity index 100%
rename from res/xml/wifi_access_points2.xml
rename to res/xml/wifi_access_points.xml
diff --git a/res/xml/wifi_settings2.xml b/res/xml/wifi_settings.xml
similarity index 100%
rename from res/xml/wifi_settings2.xml
rename to res/xml/wifi_settings.xml
diff --git a/res/xml/wireless_settings.xml b/res/xml/wireless_settings.xml
index d3c593f..2493021 100644
--- a/res/xml/wireless_settings.xml
+++ b/res/xml/wireless_settings.xml
@@ -37,7 +37,7 @@
<intent
android:action="android.intent.action.MAIN"
android:targetPackage="com.android.settings"
- android:targetClass="com.android.settings.wifi.WifiSettings2" />
+ android:targetClass="com.android.settings.wifi.WifiSettings" />
</PreferenceScreen>
<CheckBoxPreference
diff --git a/src/com/android/settings/wifi/WifiSettings2.java b/src/com/android/settings/wifi/WifiSettings.java
similarity index 97%
rename from src/com/android/settings/wifi/WifiSettings2.java
rename to src/com/android/settings/wifi/WifiSettings.java
index 0c177b1..25b1cdc 100644
--- a/src/com/android/settings/wifi/WifiSettings2.java
+++ b/src/com/android/settings/wifi/WifiSettings.java
@@ -54,7 +54,7 @@
import java.util.ArrayList;
import java.util.List;
-public class WifiSettings2 extends PreferenceActivity implements DialogInterface.OnClickListener {
+public class WifiSettings extends PreferenceActivity implements DialogInterface.OnClickListener {
private static final int MENU_ID_SCAN = Menu.FIRST;
private static final int MENU_ID_ADVANCED = Menu.FIRST + 1;
private static final int MENU_ID_CONNECT = Menu.FIRST + 2;
@@ -81,7 +81,7 @@
private AccessPoint mSelected;
private WifiDialog mDialog;
- public WifiSettings2() {
+ public WifiSettings() {
mFilter = new IntentFilter();
mFilter.addAction(WifiManager.WIFI_STATE_CHANGED_ACTION);
mFilter.addAction(WifiManager.SCAN_RESULTS_AVAILABLE_ACTION);
@@ -107,9 +107,9 @@
mWifiManager = (WifiManager) getSystemService(Context.WIFI_SERVICE);
if (getIntent().getBooleanExtra("only_access_points", false)) {
- addPreferencesFromResource(R.xml.wifi_access_points2);
+ addPreferencesFromResource(R.xml.wifi_access_points);
} else {
- addPreferencesFromResource(R.xml.wifi_settings2);
+ addPreferencesFromResource(R.xml.wifi_settings);
mWifiEnabler = new WifiEnabler(this, mWifiManager,
(CheckBoxPreference) findPreference("enable_wifi"));
mNotifyOpenNetworks =
@@ -474,7 +474,7 @@
mRetry = 0;
} else if (++mRetry >= 3) {
mRetry = 0;
- Toast.makeText(WifiSettings2.this, R.string.wifi_fail_to_scan,
+ Toast.makeText(WifiSettings.this, R.string.wifi_fail_to_scan,
Toast.LENGTH_LONG).show();
}
mAccessPoints.setProgress(mRetry != 0);