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

Disable buttons during first scan.

Browse Source 
Also remove status manager code, as they should not be here.

Bug: 3069020
Change-Id: I6fcf8470066f96b7f608ceb519b0783e44307846
This commit is contained in:
Daisuke Miyakawa
2010-10-06 13:32:32 -07:00
parent c5361927f4
commit fef4125d4e
3 changed files with 28 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
res/layout-xlarge/wifi_settings_for_setup_wizard_xl.xml
View File

@@ -109,26 +109,29 @@
android:text="@string/wifi_forget"
android:visibility="gone" />
<Button android:id="@+id/wifi_setup_add_network"
android:layout_width="220dip"
android:layout_height="wrap_content"
android:layout_above="@+id/wifi_setup_refresh_list"
android:textSize="24dip"
android:text="@string/wifi_setup_add_network"
android:enabled="false" />
<Button android:id="@+id/wifi_setup_refresh_list"
android:layout_width="220dip"
android:layout_height="wrap_content"
android:layout_above="@+id/wifi_setup_skip_or_next"
android:textSize="24dip"
android:text="@string/wifi_setup_refresh_list"
android:enabled="false" />
<Button android:id="@+id/wifi_setup_skip_or_next"
android:layout_width="220dip"
android:layout_height="wrap_content"
android:layout_marginTop="30dip"
android:layout_alignParentBottom="true"
android:textSize="24dip"
android:text="@string/wifi_setup_skip" />
<Button android:id="@+id/wifi_setup_refresh_list"
android:layout_width="220dip"
android:layout_height="wrap_content"
android:layout_above="@id/wifi_setup_skip_or_next"
android:textSize="24dip"
android:text="@string/wifi_setup_refresh_list" />
<Button android:id="@+id/wifi_setup_add_network"
android:layout_width="220dip"
android:layout_height="wrap_content"
android:layout_above="@id/wifi_setup_refresh_list"
android:textSize="24dip"
android:text="@string/wifi_setup_add_network" />
android:text="@string/wifi_setup_skip"
android:enabled="false" />
</RelativeLayout>
</LinearLayout>

1
src/com/android/settings/wifi/WifiSettings.java
View File

@@ -607,7 +607,6 @@ public class WifiSettings extends SettingsPreferenceFragment
if (mInXlSetupWizard) {
final Button button =
(Button)getActivity().findViewById(R.id.wifi_setup_skip_or_next);
button.setEnabled(true);
if (wifiAvailable) {
button.setText(R.string.wifi_setup_next);
} else {

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

@@ -61,7 +61,6 @@ public class WifiSettingsForSetupWizardXL extends Activity implements OnClickLis
private WifiSettings mWifiSettings;
private TextView mStatusText;
private StatusBarManager mStatusBarManager;
private InputMethodManager mInputMethodManager;
// This count reduces every time when there's a notification about WiFi status change.
@@ -87,30 +86,6 @@ public class WifiSettingsForSetupWizardXL extends Activity implements OnClickLis
setup();
// XXX: should we use method?
getIntent().putExtra(WifiSettings.IN_XL_SETUP_WIZARD, true);
mStatusBarManager = (StatusBarManager)getSystemService(Context.STATUS_BAR_SERVICE);
}
@Override
public void onResume() {
super.onResume();
if (mStatusBarManager != null) {
mStatusBarManager.disable(StatusBarManager.DISABLE_EXPAND
| StatusBarManager.DISABLE_NOTIFICATION_ICONS
| StatusBarManager.DISABLE_NOTIFICATION_ALERTS
| StatusBarManager.DISABLE_SYSTEM_INFO
| StatusBarManager.DISABLE_NAVIGATION);
} else {
Log.e(TAG, "StatusBarManager isn't available.");
}
}
@Override
public void onStop() {
if (mStatusBarManager != null) {
mStatusBarManager.disable(StatusBarManager.DISABLE_NONE);
}
super.onStop();
}
public void setup() {
@@ -195,6 +170,7 @@ public class WifiSettingsForSetupWizardXL extends Activity implements OnClickLis
mProgressBar.setProgress(2);
mProgressText.setText(Summary.get(this, state));
mStatusText.setText(R.string.wifi_setup_status_proceed_to_next);
enableButtons();
if (mIgnoringWifiNotificationCount > 0) {
// The network is already available before doing anything. We avoid skip this
@@ -212,6 +188,7 @@ public class WifiSettingsForSetupWizardXL extends Activity implements OnClickLis
mProgressBar.setProgress(0);
mStatusText.setText(R.string.wifi_setup_status_select_network);
mProgressText.setText(Summary.get(this, state));
enableButtons();
break;
}
default: // Not connected.
@@ -225,11 +202,19 @@ public class WifiSettingsForSetupWizardXL extends Activity implements OnClickLis
mProgressBar.setProgress(0);
mStatusText.setText(R.string.wifi_setup_status_select_network);
mProgressText.setText(getString(R.string.wifi_setup_not_connected));
enableButtons();
}
break;
}
}
private void enableButtons() {
((Button)findViewById(R.id.wifi_setup_refresh_list)).setEnabled(true);
((Button)findViewById(R.id.wifi_setup_add_network)).setEnabled(true);
((Button)findViewById(R.id.wifi_setup_skip_or_next)).setEnabled(true);
}
public void onWifiConfigPreferenceAttached(boolean isNewNetwork) {
mStatusText.setText(R.string.wifi_setup_status_edit_network);
}