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

Merge "Refresh security pref in Network Details page" into sc-dev am: ae59885f3d

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14492881

Change-Id: Ic86c48d54aa589581b8cacaf7b0cf1be91604742
This commit is contained in:
Quang Luong
2021-05-21 17:19:29 +00:00
committed by Automerger Merge Worker
parent 61ea520982 ae59885f3d
commit bc39d7bd0b
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -87,14 +87,10 @@ import com.android.settingslib.widget.ActionButtonsPreference;
import com.android.settingslib.widget.LayoutPreference;
import com.android.wifitrackerlib.WifiEntry;
import com.android.wifitrackerlib.WifiEntry.ConnectCallback;
import com.android.wifitrackerlib.WifiEntry.ConnectCallback.ConnectStatus;
import com.android.wifitrackerlib.WifiEntry.ConnectedInfo;
import com.android.wifitrackerlib.WifiEntry.DisconnectCallback;
import com.android.wifitrackerlib.WifiEntry.DisconnectCallback.DisconnectStatus;
import com.android.wifitrackerlib.WifiEntry.ForgetCallback;
import com.android.wifitrackerlib.WifiEntry.ForgetCallback.ForgetStatus;
import com.android.wifitrackerlib.WifiEntry.SignInCallback;
import com.android.wifitrackerlib.WifiEntry.SignInCallback.SignInStatus;
import com.android.wifitrackerlib.WifiEntry.WifiEntryCallback;
import java.net.Inet4Address;
@@ -390,8 +386,6 @@ public class WifiDetailPreferenceController2 extends AbstractPreferenceControlle
mIpv6Category = screen.findPreference(KEY_IPV6_CATEGORY);
mIpv6AddressPref = screen.findPreference(KEY_IPV6_ADDRESSES_PREF);
mSecurityPref.setSummary(mWifiEntry.getSecurityString(false /* concise */));
}
/**
@@ -545,6 +539,8 @@ public class WifiDetailPreferenceController2 extends AbstractPreferenceControlle
refreshRssiViews();
// Frequency Pref
refreshFrequency();
// Security Pref
refreshSecurity();
// Transmit Link Speed Pref
refreshTxSpeed();
// Receive Link Speed Pref
@@ -646,6 +642,10 @@ public class WifiDetailPreferenceController2 extends AbstractPreferenceControlle
mFrequencyPref.setVisible(true);
}
private void refreshSecurity() {
mSecurityPref.setSummary(mWifiEntry.getSecurityString(false /* concise */));
}
private void refreshTxSpeed() {
if (mWifiInfo == null
|| mWifiEntry.getConnectedState() != WifiEntry.CONNECTED_STATE_CONNECTED) {