Update the toggle state in constructor.
Before this cl, the update of toggle depends on BroadcastReceiver. However it is not called when toggle is inited, which make the toggle in broken state sometimes. This cl make it execute the update method in constructor, so toggle can get the correct state when it is created. Fixes: 73718975 Test: RunSettingsRoboTests Change-Id: Icb798afaff0bdeedad3a966315441712be2e2523
This commit is contained in:
@@ -59,6 +59,7 @@ public class WifiTetherSwitchBarController implements SwitchWidgetController.OnS
|
||||
mWifiManager = (WifiManager) context.getSystemService(Context.WIFI_SERVICE);
|
||||
mSwitchBar.setChecked(mWifiManager.getWifiApState() == WifiManager.WIFI_AP_STATE_ENABLED);
|
||||
mSwitchBar.setListener(this);
|
||||
updateWifiSwitch();
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -103,7 +104,7 @@ public class WifiTetherSwitchBarController implements SwitchWidgetController.OnS
|
||||
WifiManager.EXTRA_WIFI_AP_STATE, WifiManager.WIFI_AP_STATE_FAILED);
|
||||
handleWifiApStateChanged(state);
|
||||
} else if (Intent.ACTION_AIRPLANE_MODE_CHANGED.equals(action)) {
|
||||
enableWifiSwitch();
|
||||
updateWifiSwitch();
|
||||
}
|
||||
}
|
||||
};
|
||||
@@ -117,7 +118,7 @@ public class WifiTetherSwitchBarController implements SwitchWidgetController.OnS
|
||||
if (!mSwitchBar.isChecked()) {
|
||||
mSwitchBar.setChecked(true);
|
||||
}
|
||||
enableWifiSwitch();
|
||||
updateWifiSwitch();
|
||||
break;
|
||||
case WifiManager.WIFI_AP_STATE_DISABLING:
|
||||
if (mSwitchBar.isChecked()) {
|
||||
@@ -127,16 +128,16 @@ public class WifiTetherSwitchBarController implements SwitchWidgetController.OnS
|
||||
break;
|
||||
case WifiManager.WIFI_AP_STATE_DISABLED:
|
||||
mSwitchBar.setChecked(false);
|
||||
enableWifiSwitch();
|
||||
updateWifiSwitch();
|
||||
break;
|
||||
default:
|
||||
mSwitchBar.setChecked(false);
|
||||
enableWifiSwitch();
|
||||
updateWifiSwitch();
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
private void enableWifiSwitch() {
|
||||
private void updateWifiSwitch() {
|
||||
boolean isAirplaneMode = Settings.Global.getInt(mContext.getContentResolver(),
|
||||
Settings.Global.AIRPLANE_MODE_ON, 0) != 0;
|
||||
if (!isAirplaneMode) {
|
||||
|
Reference in New Issue
Block a user