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

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

Browse Source
This commit is contained in:
Quang Luong
2019-12-30 06:02:23 +00:00
committed by Android (Google) Code Review
parent 066d3f693d f07f79988d
commit 942af81d73
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

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