Snap for 7668007 from 8e98df31a474b8f0ae3d49980187a6af58438dab to sc-qpr1-release (20586ebb) · Commits · e / os / android_packages_apps_Settings

AndroidManifest.xml

+1 −5

Original line number	Diff line number	Diff line
		@@ -273,10 +273,6 @@
		<action android:name="android.settings.WIFI_SETTINGS" />
		<category android:name="android.intent.category.DEFAULT" />
		</intent-filter>
		<intent-filter android:priority="1">
		<action android:name="android.intent.action.MAIN" />
		<category android:name="com.android.settings.SHORTCUT" />
		</intent-filter>
		<meta-data android:name="com.android.settings.FRAGMENT_CLASS"
		android:value="com.android.settings.wifi.WifiSettings" />
		<meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
		@@ -285,7 +281,7 @@

		<activity
		android:name="Settings$NetworkProviderSettingsActivity"
		android:label="@string/network_dashboard_title"
		android:label="@string/provider_internet_settings"
		android:icon="@drawable/ic_homepage_network"
		android:exported="true"
		android:configChanges="orientation\|keyboardHidden\|screenSize">

res/values/strings.xml

+3 −1

Original line number	Diff line number	Diff line
		@@ -13366,8 +13366,10 @@
		<string name="carrier_wifi_network_title">W+ network</string>
		<!-- Provider Model: title of SIM category -->
		<string name="sim_category_title">SIM</string>
		<!-- Provider Model: title of Downloaded category. [CHAR LIMIT=50] -->
		<!-- Provider Model: title of Downloaded SIM category. [CHAR LIMIT=50] -->
		<string name="downloaded_sim_category_title">DOWNLOADED SIM</string>
		<!-- Provider Model: title of Downloaded SIMs category. [CHAR LIMIT=50] -->
		<string name="downloaded_sims_category_title">DOWNLOADED SIMS</string>
		<!-- Provider Model: summary of Active in SIM category. [CHAR LIMIT=50] -->
		<string name="sim_category_active_sim">Active</string>
		<!-- Provider Model: summary of Inactive in SIM category. [CHAR LIMIT=50] -->

src/com/android/settings/network/NetworkProviderCallsSmsController.java

+11 −2

Original line number	Diff line number	Diff line
		@@ -24,6 +24,7 @@ import android.telephony.ServiceState;
		import android.telephony.SubscriptionInfo;
		import android.telephony.SubscriptionManager;
		import android.telephony.TelephonyManager;
		import android.view.View;

		import androidx.annotation.VisibleForTesting;
		import androidx.lifecycle.LifecycleObserver;
		@@ -44,12 +45,14 @@ public class NetworkProviderCallsSmsController extends AbstractPreferenceControl

		private static final String TAG = "NetworkProviderCallsSmsController";
		private static final String KEY = "calls_and_sms";
		private static final String RTL_MARK = "\u200F";

		private UserManager mUserManager;
		private SubscriptionManager mSubscriptionManager;
		private SubscriptionsChangeListener mSubscriptionsChangeListener;
		private TelephonyManager mTelephonyManager;
		private RestrictedPreference mPreference;
		private boolean mIsRtlMode;

		/**
		* The summary text and click behavior of the "Calls & SMS" item on the
		@@ -61,6 +64,8 @@ public class NetworkProviderCallsSmsController extends AbstractPreferenceControl
		mUserManager = context.getSystemService(UserManager.class);
		mSubscriptionManager = context.getSystemService(SubscriptionManager.class);
		mTelephonyManager = mContext.getSystemService(TelephonyManager.class);
		mIsRtlMode = context.getResources().getConfiguration().getLayoutDirection()
		== View.LAYOUT_DIRECTION_RTL;
		if (lifecycle != null) {
		mSubscriptionsChangeListener = new SubscriptionsChangeListener(context, this);
		lifecycle.addObserver(this);
		@@ -121,6 +126,10 @@ public class NetworkProviderCallsSmsController extends AbstractPreferenceControl
		if (subInfo != subs.get(subs.size() - 1)) {
		summary.append(", ");
		}

		if (mIsRtlMode) {
		summary.insert(0, RTL_MARK).insert(summary.length(), RTL_MARK);
		}
		}
		return summary;
		}

src/com/android/settings/network/NetworkProviderDownloadedSimsCategoryController.java

+15 −2

Original line number	Diff line number	Diff line
		@@ -3,9 +3,11 @@ package com.android.settings.network;
		import android.content.Context;

		import androidx.annotation.VisibleForTesting;
		import androidx.preference.Preference;
		import androidx.preference.PreferenceCategory;
		import androidx.preference.PreferenceScreen;

		import com.android.settings.R;
		import com.android.settings.widget.PreferenceCategoryController;
		import com.android.settingslib.core.lifecycle.Lifecycle;
		import com.android.settingslib.core.lifecycle.LifecycleObserver;
		@@ -15,6 +17,7 @@ public class NetworkProviderDownloadedSimsCategoryController extends

		private static final String KEY_PREFERENCE_CATEGORY_DOWNLOADED_SIM =
		"provider_model_downloaded_sim_category";
		private PreferenceCategory mPreferenceCategory;
		private NetworkProviderDownloadedSimListController mNetworkProviderDownloadedSimListController;

		public NetworkProviderDownloadedSimsCategoryController(Context context, String key) {
		@@ -44,9 +47,19 @@ public class NetworkProviderDownloadedSimsCategoryController extends
		@Override
		public void displayPreference(PreferenceScreen screen) {
		super.displayPreference(screen);
		PreferenceCategory preferenceCategory = screen.findPreference(
		mPreferenceCategory = screen.findPreference(
		KEY_PREFERENCE_CATEGORY_DOWNLOADED_SIM);
		preferenceCategory.setVisible(isAvailable());
		mPreferenceCategory.setVisible(isAvailable());
		mNetworkProviderDownloadedSimListController.displayPreference(screen);
		}

		@Override
		public void updateState(Preference preference) {
		super.updateState(preference);
		int count = mPreferenceCategory.getPreferenceCount();
		String title = mContext.getString(count > 1
		? R.string.downloaded_sims_category_title
		: R.string.downloaded_sim_category_title);
		mPreferenceCategory.setTitle(title);
		}
		}

src/com/android/settings/network/NetworkProviderSettings.java

+10 −0

Original line number	Diff line number	Diff line
		@@ -710,6 +710,11 @@ public class NetworkProviderSettings extends RestrictedSettingsFragment
		Log.i(TAG, "onWifiStateChanged called with wifi state: " + wifiState);
		}

		if (isFinishingOrDestroyed()) {
		Log.w(TAG, "onWifiStateChanged shouldn't run when fragment is finishing or destroyed");
		return;
		}

		switch (wifiState) {
		case WifiManager.WIFI_STATE_ENABLED:
		updateWifiEntryPreferences();
		@@ -981,6 +986,11 @@ public class NetworkProviderSettings extends RestrictedSettingsFragment

		private String getSavedNetworkSettingsSummaryText(
		int numSavedNetworks, int numSavedSubscriptions) {
		if (getResources() == null) {
		Log.w(TAG, "getSavedNetworkSettingsSummaryText shouldn't run if resource is not ready");
		return null;
		}

		if (numSavedSubscriptions == 0) {
		return getResources().getQuantityString(R.plurals.wifi_saved_access_points_summary,
		numSavedNetworks, numSavedNetworks);