PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

WifiSettings: rename WifiSettings2 to WifiSettings.

Browse Source
This commit is contained in:
Chia-chi Yeh
2010-02-03 15:56:55 +08:00
parent df90dd9f55
commit 065cd4be64
5 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
AndroidManifest.xml
View File

@@ -80,7 +80,7 @@
<!-- Top-level settings --> <!-- Top-level settings -->
<activity android:name=".wifi.WifiSettings2" <activity android:name=".wifi.WifiSettings"
android:label="@string/wifi_settings" android:label="@string/wifi_settings"
android:configChanges="orientation|keyboardHidden" android:configChanges="orientation|keyboardHidden"
android:clearTaskOnLaunch="true" android:clearTaskOnLaunch="true"

0
res/xml/wifi_access_points2.xml → res/xml/wifi_access_points.xml
View File

0
res/xml/wifi_settings2.xml → res/xml/wifi_settings.xml
View File

2
res/xml/wireless_settings.xml
View File

@@ -37,7 +37,7 @@
<intent <intent
android:action="android.intent.action.MAIN" android:action="android.intent.action.MAIN"
android:targetPackage="com.android.settings" android:targetPackage="com.android.settings"
android:targetClass="com.android.settings.wifi.WifiSettings2" /> android:targetClass="com.android.settings.wifi.WifiSettings" />
</PreferenceScreen> </PreferenceScreen>
<CheckBoxPreference <CheckBoxPreference

10
src/com/android/settings/wifi/WifiSettings2.java → src/com/android/settings/wifi/WifiSettings.java
View File

@@ -54,7 +54,7 @@ import android.widget.Toast;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; 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_SCAN = Menu.FIRST;
private static final int MENU_ID_ADVANCED = Menu.FIRST + 1; private static final int MENU_ID_ADVANCED = Menu.FIRST + 1;
private static final int MENU_ID_CONNECT = Menu.FIRST + 2; private static final int MENU_ID_CONNECT = Menu.FIRST + 2;
@@ -81,7 +81,7 @@ public class WifiSettings2 extends PreferenceActivity implements DialogInterface
private AccessPoint mSelected; private AccessPoint mSelected;
private WifiDialog mDialog; private WifiDialog mDialog;
public WifiSettings2() { public WifiSettings() {
mFilter = new IntentFilter(); mFilter = new IntentFilter();
mFilter.addAction(WifiManager.WIFI_STATE_CHANGED_ACTION); mFilter.addAction(WifiManager.WIFI_STATE_CHANGED_ACTION);
mFilter.addAction(WifiManager.SCAN_RESULTS_AVAILABLE_ACTION); mFilter.addAction(WifiManager.SCAN_RESULTS_AVAILABLE_ACTION);
@@ -107,9 +107,9 @@ public class WifiSettings2 extends PreferenceActivity implements DialogInterface
mWifiManager = (WifiManager) getSystemService(Context.WIFI_SERVICE); mWifiManager = (WifiManager) getSystemService(Context.WIFI_SERVICE);
if (getIntent().getBooleanExtra("only_access_points", false)) { if (getIntent().getBooleanExtra("only_access_points", false)) {
addPreferencesFromResource(R.xml.wifi_access_points2); addPreferencesFromResource(R.xml.wifi_access_points);
} else { } else {
addPreferencesFromResource(R.xml.wifi_settings2); addPreferencesFromResource(R.xml.wifi_settings);
mWifiEnabler = new WifiEnabler(this, mWifiManager, mWifiEnabler = new WifiEnabler(this, mWifiManager,
(CheckBoxPreference) findPreference("enable_wifi")); (CheckBoxPreference) findPreference("enable_wifi"));
mNotifyOpenNetworks = mNotifyOpenNetworks =
@@ -474,7 +474,7 @@ public class WifiSettings2 extends PreferenceActivity implements DialogInterface
mRetry = 0; mRetry = 0;
} else if (++mRetry >= 3) { } else if (++mRetry >= 3) {
mRetry = 0; 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(); Toast.LENGTH_LONG).show();
} }
mAccessPoints.setProgress(mRetry != 0); mAccessPoints.setProgress(mRetry != 0);