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

Merge "remove obsolete background bitmaps"

Browse Source
This commit is contained in:
Freeman Ng
2011-08-17 17:01:28 -07:00
committed by Android (Google) Code Review
parent 1079007cf7 7e84e4682d
commit ba36152bad
17 changed files with 1 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/com/android/settings/wifi/WifiSettingsForSetupWizardXL.java
View File

@@ -135,8 +135,6 @@ public class WifiSettingsForSetupWizardXL extends Activity implements OnClickLis
*/
private DetailedState mPreviousNetworkState = DetailedState.DISCONNECTED;
private int mBackgroundId = R.drawable.setups_bg_default;
@Override
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
@@ -284,7 +282,7 @@ public class WifiSettingsForSetupWizardXL extends Activity implements OnClickLis
case SCANNING: {
if (mScreenState == SCREEN_STATE_DISCONNECTED) {
if (mWifiSettings.getAccessPointsCount() == 0) {
showScanningState();
showScanningState();
} else {
showDisconnectedProgressBar();
mWifiSettingsFragmentLayout.setVisibility(View.VISIBLE);
@@ -347,7 +345,6 @@ public class WifiSettingsForSetupWizardXL extends Activity implements OnClickLis
hideSoftwareKeyboard();
setPaddingVisibility(View.VISIBLE);
trySetBackground(R.drawable.setups_bg_complete);
showConnectedTitle();
showConnectedProgressBar();
@@ -454,8 +451,6 @@ public class WifiSettingsForSetupWizardXL extends Activity implements OnClickLis
edit = true;
}
trySetBackground(R.drawable.setups_bg_default);
// We don't want to keep scanning Wifi networks during users' configuring a network.
mWifiSettings.pauseWifiScan();
@@ -568,8 +563,6 @@ public class WifiSettingsForSetupWizardXL extends Activity implements OnClickLis
/* package */ void onConnectButtonPressed() {
mScreenState = SCREEN_STATE_CONNECTING;
trySetBackground(R.drawable.setups_bg_wifi);
mWifiSettings.submit(mWifiConfig.getController());
// updateConnectionState() isn't called soon by the main Wifi module after the user's
@@ -597,7 +590,6 @@ public class WifiSettingsForSetupWizardXL extends Activity implements OnClickLis
}
private void onBackButtonPressed() {
trySetBackground(R.drawable.setups_bg_default);
if (mScreenState == SCREEN_STATE_CONNECTING || mScreenState == SCREEN_STATE_CONNECTED) {
if (DEBUG) Log.d(TAG, "Back button pressed after connect action.");
@@ -717,8 +709,6 @@ public class WifiSettingsForSetupWizardXL extends Activity implements OnClickLis
mConnectButton.setVisibility(View.VISIBLE);
mConnectButton.setEnabled(true);
trySetBackground(R.drawable.setups_bg_default);
if (!TextUtils.isEmpty(mEditingTitle)) {
mTitleView.setText(mEditingTitle);
} else {
@@ -785,14 +775,4 @@ public class WifiSettingsForSetupWizardXL extends Activity implements OnClickLis
// We want to both save and connect a network. connectNetwork() does both.
mWifiManager.connectNetwork(config);
}
/**
* Replace the current background with a new background whose id is resId if needed.
*/
private void trySetBackground(int resId) {
if (mBackgroundId != resId) {
getWindow().setBackgroundDrawable(getResources().getDrawable(resId));
mBackgroundId = resId;
}
}
}