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

Snap for 6622447 from d43aa0206a to mainline-release

Browse Source 
Change-Id: I138cece67638dfc0c00117a9f39793e058bb9b19
This commit is contained in:
android-build-team Robot
2020-06-24 03:10:13 +00:00
parent d4f72dfc92 d43aa0206a
commit 95c0c77f92
3 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
res/values/styles.xml
View File

@@ -587,6 +587,8 @@
<item name="titleItemStartPadding">10dp</item> <item name="titleItemStartPadding">10dp</item>
<!-- Layout is 48dp and actual icon size is 48-(iconSize/2) --> <!-- Layout is 48dp and actual icon size is 48-(iconSize/2) -->
<item name="iconSize">12dp</item> <item name="iconSize">12dp</item>
<!-- RecycleView item animator -->
<item name="disableRecyclerViewItemAnimator">true</item>
</style> </style>
<style name="DisclaimerPositiveButton" parent="@style/SudGlifButton.Primary"> <style name="DisclaimerPositiveButton" parent="@style/SudGlifButton.Primary">

1
src/com/android/settings/deviceinfo/simstatus/SimStatusDialogController.java
View File

@@ -525,7 +525,6 @@ public class SimStatusDialogController implements LifecycleObserver, OnResume, O
if (overrideNetworkType == TelephonyDisplayInfo.OVERRIDE_NETWORK_TYPE_NR_NSA_MMWAVE if (overrideNetworkType == TelephonyDisplayInfo.OVERRIDE_NETWORK_TYPE_NR_NSA_MMWAVE
|| overrideNetworkType == TelephonyDisplayInfo.OVERRIDE_NETWORK_TYPE_NR_NSA) { || overrideNetworkType == TelephonyDisplayInfo.OVERRIDE_NETWORK_TYPE_NR_NSA) {
dataNetworkTypeName = "NR NSA"; dataNetworkTypeName = "NR NSA";
voiceNetworkTypeName = "NR NSA";
} }
boolean show4GForLTE = false; boolean show4GForLTE = false;

21
src/com/android/settings/wifi/details/WifiDetailPreferenceController.java
View File

@@ -214,15 +214,7 @@ public class WifiDetailPreferenceController extends AbstractPreferenceController
public void onReceive(Context context, Intent intent) { public void onReceive(Context context, Intent intent) {
switch (intent.getAction()) { switch (intent.getAction()) {
case WifiManager.CONFIGURED_NETWORKS_CHANGED_ACTION: case WifiManager.CONFIGURED_NETWORKS_CHANGED_ACTION:
if (!intent.getBooleanExtra(WifiManager.EXTRA_MULTIPLE_NETWORKS_CHANGED, updateMatchingWifiConfig();
false /* defaultValue */)) {
// only one network changed
WifiConfiguration wifiConfiguration = intent
.getParcelableExtra(WifiManager.EXTRA_WIFI_CONFIGURATION);
if (mAccessPoint.matches(wifiConfiguration)) {
mWifiConfig = wifiConfiguration;
}
}
// fall through // fall through
case WifiManager.NETWORK_STATE_CHANGED_ACTION: case WifiManager.NETWORK_STATE_CHANGED_ACTION:
case WifiManager.RSSI_CHANGED_ACTION: case WifiManager.RSSI_CHANGED_ACTION:
@@ -230,6 +222,17 @@ public class WifiDetailPreferenceController extends AbstractPreferenceController
break; break;
} }
} }
private void updateMatchingWifiConfig() {
// use getPrivilegedConfiguredNetworks() to get Passpoint & other ephemeral networks
for (WifiConfiguration wifiConfiguration :
mWifiManager.getPrivilegedConfiguredNetworks()) {
if (mAccessPoint.matches(wifiConfiguration)) {
mWifiConfig = wifiConfiguration;
break;
}
}
}
}; };
private final NetworkRequest mNetworkRequest = new NetworkRequest.Builder() private final NetworkRequest mNetworkRequest = new NetworkRequest.Builder()