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

[Wi-Fi] Sync Connect button UI with WifiEntry connected state

Browse Source 
The Connect button in the Network Details Page should be synced to the
connected state of WifiEntry and should toggle between not visible,
"Connect", and "Connecting..." accordingly.

Bug: 70983952
Test: manual - connect to in-range saved network through Network Details
page

Change-Id: Id34a840dd81fb99c8e64ad219b0b7af73946c1bf
This commit is contained in:
Quang Luong
2019-12-19 15:57:38 -08:00
parent 04def02253
commit f07f79988d
1 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/com/android/settings/wifi/details2/WifiDetailPreferenceController2.java
View File

@@ -588,16 +588,24 @@ public class WifiDetailPreferenceController2 extends AbstractPreferenceControlle
private void refreshButtons() {
boolean canForgetNetwork = mWifiEntry.canForget();
boolean canSignIntoNetwork = canSignIntoNetwork();
boolean canConnectNetwork = mWifiEntry.canConnect();
boolean showConnectButton = mWifiEntry.canConnect()
|| mWifiEntry.getConnectedState() == WifiEntry.CONNECTED_STATE_CONNECTING;
boolean canShareNetwork = canShareNetwork();
mButtonsPref.setButton1Visible(canForgetNetwork);
mButtonsPref.setButton2Visible(canSignIntoNetwork);
mButtonsPref.setButton3Visible(canConnectNetwork);
mButtonsPref.setButton3Visible(showConnectButton);
if (showConnectButton) {
if (mWifiEntry.getConnectedState() == WifiEntry.CONNECTED_STATE_CONNECTING) {
mButtonsPref.setButton3Text(R.string.wifi_connecting).setButton3Enabled(false);
} else {
mButtonsPref.setButton3Text(R.string.wifi_connect).setButton3Enabled(true);
}
}
mButtonsPref.setButton4Visible(canShareNetwork);
mButtonsPref.setVisible(canForgetNetwork
|| canSignIntoNetwork
|| canConnectNetwork
|| showConnectButton
|| canShareNetwork);
}
@@ -804,8 +812,6 @@ public class WifiDetailPreferenceController2 extends AbstractPreferenceControlle
@VisibleForTesting
void connectNetwork() {
// TODO(b/143326832): What to do with WifiManager#isWifiEnabled() false case?
mButtonsPref.setButton3Text(R.string.wifi_connecting).setButton3Enabled(false);
mWifiEntry.connect();
}
@@ -845,8 +851,6 @@ public class WifiDetailPreferenceController2 extends AbstractPreferenceControlle
Toast.makeText(mContext,
mContext.getString(R.string.wifi_connected_to_message, mWifiEntry.getTitle()),
Toast.LENGTH_SHORT).show();
updateNetworkInfo();
refreshPage();
} else if (mWifiEntry.getLevel() == WifiEntry.WIFI_LEVEL_UNREACHABLE) {
Toast.makeText(mContext,
R.string.wifi_not_in_range_message,