Merge "[Wi-Fi] Apply new mock for supporting WiFi detail page for OpenRoaming... (3b67e90a) · Commits · e / os / android_packages_apps_Settings

res/values/strings.xml

+4 −2

Original line number	Diff line number	Diff line
		@@ -2031,8 +2031,10 @@
		<string name="wifi_ip_settings">IP settings</string>
		<!-- Label for the spinner to show Wifi MAC randomization [CHAR LIMIT=25] -->
		<string name="wifi_privacy_settings">Privacy</string>
		<!-- Label for the subscription detail preference. [CHAR LIMIT=32] -->
		<string name="wifi_subscription_detail">Subscription details</string>
		<!-- Label for the subscription preference. [CHAR LIMIT=32] -->
		<string name="wifi_subscription">Subscription</string>
		<!-- Summary text for the subscription preference. [CHAR LIMIT=NONE] -->
		<string name="wifi_subscription_summary">View or change subscription</string>
		<!-- Summary for Wifi MAC randomization option when it is ephemeral network [CHAR LIMIT=50] -->
		<string name="wifi_privacy_settings_ephemeral_summary">Randomized MAC</string>
		<!-- Title for the fragment to add a device into the wifi network [CHAR LIMIT=50] -->

res/xml/wifi_network_details_fragment2.xml

+6 −5

Original line number	Diff line number	Diff line
		@@ -69,6 +69,12 @@
		android:entries="@array/wifi_privacy_entries"
		android:entryValues="@array/wifi_privacy_values"/>

		<Preference
		android:key="subscription_detail"
		android:title="@string/wifi_subscription"
		android:summary="@string/wifi_subscription_summary"
		settings:allowDividerAbove="true"/>

		<SwitchPreference
		android:key="auto_connect"
		android:title="@string/wifi_auto_connect_title"
		@@ -139,9 +145,4 @@
		settings:enableCopying="true"/>
		</PreferenceCategory>

		<Preference
		android:key="subscription_detail"
		android:title="@string/wifi_subscription_detail"
		settings:allowDividerAbove="true"/>

		</PreferenceScreen>

src/com/android/settings/wifi/details2/AddDevicePreferenceController2.java

+2 −5

Original line number	Diff line number	Diff line
		@@ -51,11 +51,8 @@ public class AddDevicePreferenceController2 extends BasePreferenceController {

		@Override
		public int getAvailabilityStatus() {
		if (!WifiDppUtils.isSupportConfiguratorQrCodeScanner(mContext, mWifiEntry)
		\|\| mWifiEntry.canManageSubscription()) {
		return CONDITIONALLY_UNAVAILABLE;
		}
		return AVAILABLE;
		return WifiDppUtils.isSupportConfiguratorQrCodeScanner(mContext, mWifiEntry) ? AVAILABLE
		: CONDITIONALLY_UNAVAILABLE;
		}

		@Override

src/com/android/settings/wifi/details2/WifiDetailPreferenceController2.java

+8 −42

Original line number	Diff line number	Diff line
		@@ -145,7 +145,6 @@ public class WifiDetailPreferenceController2 extends AbstractPreferenceControlle
		static final String KEY_IPV6_CATEGORY = "ipv6_category";
		@VisibleForTesting
		static final String KEY_IPV6_ADDRESSES_PREF = "ipv6_addresses";
		static final String KEY_IP_DETAILS_CATEGORY = "ip_details_category";

		private final WifiEntry mWifiEntry;
		private final ConnectivityManager mConnectivityManager;
		@@ -165,7 +164,6 @@ public class WifiDetailPreferenceController2 extends AbstractPreferenceControlle
		private ActionButtonsPreference mButtonsPref;
		private EntityHeaderController mEntityHeaderController;
		private Preference mSignalStrengthPref;
		private PreferenceCategory mIpDetailsCategory;
		private Preference mTxLinkSpeedPref;
		private Preference mRxLinkSpeedPref;
		private Preference mFrequencyPref;
		@@ -196,11 +194,9 @@ public class WifiDetailPreferenceController2 extends AbstractPreferenceControlle
		mLinkProperties = lp;
		refreshEntityHeader();
		refreshButtons();
		if (!mWifiEntry.canManageSubscription()) {
		refreshIpLayerInfo();
		}
		}
		}

		private boolean hasCapabilityChanged(NetworkCapabilities nc, int cap) {
		// If this is the first time we get NetworkCapabilities, report that something changed.
		@@ -238,11 +234,9 @@ public class WifiDetailPreferenceController2 extends AbstractPreferenceControlle
		}
		mNetworkCapabilities = nc;
		refreshButtons();
		if (!mWifiEntry.canManageSubscription()) {
		refreshIpLayerInfo();
		}
		}
		}

		@Override
		public void onLost(Network network) {
		@@ -335,7 +329,6 @@ public class WifiDetailPreferenceController2 extends AbstractPreferenceControlle
		updateCaptivePortalButton();

		mSignalStrengthPref = screen.findPreference(KEY_SIGNAL_STRENGTH_PREF);
		mIpDetailsCategory = screen.findPreference(KEY_IP_DETAILS_CATEGORY);
		mTxLinkSpeedPref = screen.findPreference(KEY_TX_LINK_SPEED);
		mRxLinkSpeedPref = screen.findPreference(KEY_RX_LINK_SPEED);
		mFrequencyPref = screen.findPreference(KEY_FREQUENCY_PREF);
		@@ -351,13 +344,6 @@ public class WifiDetailPreferenceController2 extends AbstractPreferenceControlle
		mIpv6Category = screen.findPreference(KEY_IPV6_CATEGORY);
		mIpv6AddressPref = screen.findPreference(KEY_IPV6_ADDRESSES_PREF);

		if (mWifiEntry.canManageSubscription()) {
		mIpDetailsCategory.setVisible(false);
		mIpv6Category.setVisible(false);
		mSignalStrengthPref.setVisible(false);
		mFrequencyPref.setVisible(false);
		mSecurityPref.setVisible(false);
		}
		mSecurityPref.setSummary(mWifiEntry.getSecurityString(false /* concise */));
		}

		@@ -505,16 +491,10 @@ public class WifiDetailPreferenceController2 extends AbstractPreferenceControlle

		// refresh header
		refreshEntityHeader();
		refreshEntityHeaderIcon();

		// refresh Buttons
		refreshButtons();

		// When support manage subscription, there won't have any detail information, so don't
		// need to update those detail UIs.
		if (mWifiEntry.canManageSubscription()) {
		return;
		}

		// Update Connection Header icon and Signal Strength Preference
		refreshRssiViews();
		// Frequency Pref
		@@ -531,11 +511,7 @@ public class WifiDetailPreferenceController2 extends AbstractPreferenceControlle
		refreshMacAddress();
		}

		private void refreshEntityHeaderIcon() {
		if (mEntityHeaderController == null) {
		return;
		}

		private void refreshRssiViews() {
		int signalLevel = mWifiEntry.getLevel();

		// Disappears signal view if not in range. e.g. for saved networks.
		@@ -550,23 +526,13 @@ public class WifiDetailPreferenceController2 extends AbstractPreferenceControlle
		}
		mRssiSignalLevel = signalLevel;
		Drawable wifiIcon = mIconInjector.getIcon(mRssiSignalLevel);

		if (mEntityHeaderController != null) {
		mEntityHeaderController
		.setIcon(redrawIconForHeader(wifiIcon)).done(mFragment.getActivity(),
		true /* rebind */);
		}

		private void refreshRssiViews() {
		int signalLevel = mWifiEntry.getLevel();

		// Disappears signal view if not in range. e.g. for saved networks.
		if (signalLevel == WifiEntry.WIFI_LEVEL_UNREACHABLE) {
		mSignalStrengthPref.setVisible(false);
		mRssiSignalLevel = -1;
		return;
		}

		mRssiSignalLevel = signalLevel;
		Drawable wifiIcon = mIconInjector.getIcon(mRssiSignalLevel);
		Drawable wifiIconDark = wifiIcon.getConstantState().newDrawable().mutate();
		wifiIconDark.setTintList(Utils.getColorAttr(mContext, android.R.attr.colorControlNormal));
		mSignalStrengthPref.setIcon(wifiIconDark);

src/com/android/settings/wifi/details2/WifiMeteredPreferenceController2.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -55,7 +55,7 @@ public class WifiMeteredPreferenceController2 extends BasePreferenceController i

		@Override
		public int getAvailabilityStatus() {
		return mWifiEntry.canManageSubscription() ? CONDITIONALLY_UNAVAILABLE : AVAILABLE;
		return AVAILABLE;
		}

		@Override