Snap for 6621766 from 1d6acb4f8cbecb20b7c0f6bc0d9a82da7407709a to rvc-release (4b51e9f9) · Commits · e / os / android_packages_apps_Settings

res/values/styles.xml

+2 −0

Original line number	Diff line number	Diff line
		@@ -587,6 +587,8 @@
		<item name="titleItemStartPadding">10dp</item>
		<!-- Layout is 48dp and actual icon size is 48-(iconSize/2) -->
		<item name="iconSize">12dp</item>
		<!-- RecycleView item animator -->
		<item name="disableRecyclerViewItemAnimator">true</item>
		</style>

		<style name="DisclaimerPositiveButton" parent="@style/SudGlifButton.Primary">

+0 −1

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

		boolean show4GForLTE = false;

+12 −9

Original line number	Diff line number	Diff line
		@@ -214,15 +214,7 @@ public class WifiDetailPreferenceController extends AbstractPreferenceController
		public void onReceive(Context context, Intent intent) {
		switch (intent.getAction()) {
		case WifiManager.CONFIGURED_NETWORKS_CHANGED_ACTION:
		if (!intent.getBooleanExtra(WifiManager.EXTRA_MULTIPLE_NETWORKS_CHANGED,
		false /* defaultValue */)) {
		// only one network changed
		WifiConfiguration wifiConfiguration = intent
		.getParcelableExtra(WifiManager.EXTRA_WIFI_CONFIGURATION);
		if (mAccessPoint.matches(wifiConfiguration)) {
		mWifiConfig = wifiConfiguration;
		}
		}
		updateMatchingWifiConfig();
		// fall through
		case WifiManager.NETWORK_STATE_CHANGED_ACTION:
		case WifiManager.RSSI_CHANGED_ACTION:
		@@ -230,6 +222,17 @@ public class WifiDetailPreferenceController extends AbstractPreferenceController
		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()