diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 35dd268691a..504ca907b91 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -133,7 +133,6 @@ diff --git a/res/drawable-hdpi/setups_bg_complete.png b/res/drawable-hdpi/setups_bg_complete.png deleted file mode 100644 index d9228593f13..00000000000 Binary files a/res/drawable-hdpi/setups_bg_complete.png and /dev/null differ diff --git a/res/drawable-hdpi/setups_bg_default.png b/res/drawable-hdpi/setups_bg_default.png deleted file mode 100644 index 5883b1defc0..00000000000 Binary files a/res/drawable-hdpi/setups_bg_default.png and /dev/null differ diff --git a/res/drawable-hdpi/setups_bg_wifi.png b/res/drawable-hdpi/setups_bg_wifi.png deleted file mode 100644 index 6b83d9b315f..00000000000 Binary files a/res/drawable-hdpi/setups_bg_wifi.png and /dev/null differ diff --git a/res/drawable-large-mdpi/setups_bg_complete.png b/res/drawable-large-mdpi/setups_bg_complete.png deleted file mode 100644 index ac9fa2826c6..00000000000 Binary files a/res/drawable-large-mdpi/setups_bg_complete.png and /dev/null differ diff --git a/res/drawable-large-mdpi/setups_bg_default.png b/res/drawable-large-mdpi/setups_bg_default.png deleted file mode 100644 index 989d82b2a62..00000000000 Binary files a/res/drawable-large-mdpi/setups_bg_default.png and /dev/null differ diff --git a/res/drawable-large-mdpi/setups_bg_wifi.png b/res/drawable-large-mdpi/setups_bg_wifi.png deleted file mode 100644 index c4d7612a013..00000000000 Binary files a/res/drawable-large-mdpi/setups_bg_wifi.png and /dev/null differ diff --git a/res/drawable-mdpi/setups_bg_complete.png b/res/drawable-mdpi/setups_bg_complete.png deleted file mode 100644 index a0cd961d8ea..00000000000 Binary files a/res/drawable-mdpi/setups_bg_complete.png and /dev/null differ diff --git a/res/drawable-mdpi/setups_bg_default.png b/res/drawable-mdpi/setups_bg_default.png deleted file mode 100644 index f05bf96757a..00000000000 Binary files a/res/drawable-mdpi/setups_bg_default.png and /dev/null differ diff --git a/res/drawable-mdpi/setups_bg_wifi.png b/res/drawable-mdpi/setups_bg_wifi.png deleted file mode 100644 index 4fa16191173..00000000000 Binary files a/res/drawable-mdpi/setups_bg_wifi.png and /dev/null differ diff --git a/res/drawable-xhdpi/setups_bg_complete.png b/res/drawable-xhdpi/setups_bg_complete.png deleted file mode 100644 index bcf55ad0982..00000000000 Binary files a/res/drawable-xhdpi/setups_bg_complete.png and /dev/null differ diff --git a/res/drawable-xhdpi/setups_bg_default.png b/res/drawable-xhdpi/setups_bg_default.png deleted file mode 100644 index 12d171f3b16..00000000000 Binary files a/res/drawable-xhdpi/setups_bg_default.png and /dev/null differ diff --git a/res/drawable-xhdpi/setups_bg_wifi.png b/res/drawable-xhdpi/setups_bg_wifi.png deleted file mode 100644 index aa086c751e6..00000000000 Binary files a/res/drawable-xhdpi/setups_bg_wifi.png and /dev/null differ diff --git a/res/drawable-xlarge-mdpi/setups_bg_complete.png b/res/drawable-xlarge-mdpi/setups_bg_complete.png deleted file mode 100644 index 4a854e3be1e..00000000000 Binary files a/res/drawable-xlarge-mdpi/setups_bg_complete.png and /dev/null differ diff --git a/res/drawable-xlarge-mdpi/setups_bg_default.png b/res/drawable-xlarge-mdpi/setups_bg_default.png deleted file mode 100644 index ea0db1611a0..00000000000 Binary files a/res/drawable-xlarge-mdpi/setups_bg_default.png and /dev/null differ diff --git a/res/drawable-xlarge-mdpi/setups_bg_wifi.png b/res/drawable-xlarge-mdpi/setups_bg_wifi.png deleted file mode 100644 index 9058c307713..00000000000 Binary files a/res/drawable-xlarge-mdpi/setups_bg_wifi.png and /dev/null differ diff --git a/src/com/android/settings/wifi/WifiSettingsForSetupWizardXL.java b/src/com/android/settings/wifi/WifiSettingsForSetupWizardXL.java index a3f1764551e..4b6a0814d34 100644 --- a/src/com/android/settings/wifi/WifiSettingsForSetupWizardXL.java +++ b/src/com/android/settings/wifi/WifiSettingsForSetupWizardXL.java @@ -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; - } - } }