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

Merge "Update the toggle state in constructor." into pi-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2018-03-22 21:43:52 +00:00
committed by Android (Google) Code Review
parent 4aa9d5d2b4 592faf364d
commit 5cafb0b553
2 changed files with 72 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/com/android/settings/wifi/tether/WifiTetherSwitchBarController.java
View File

@@ -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) {