Merge "Check the page searchability for both wifi and network provider page" into sc-v2-dev (822f98c1) · Commits · e / os / android_packages_apps_Settings

res/xml/network_provider_settings.xml

+1 −1

Original line number	Diff line number	Diff line
		@@ -68,7 +68,7 @@
		android:layout="@layout/preference_category_no_label"/>

		<Preference
		android:key="configure_wifi_settings"
		android:key="configure_network_settings"
		android:title="@string/network_and_internet_preferences_title"
		settings:allowDividerAbove="true"
		android:fragment="com.android.settings.wifi.ConfigureWifiSettings"/>

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

+9 −3

Original line number	Diff line number	Diff line
		@@ -60,6 +60,7 @@ import androidx.recyclerview.widget.RecyclerView;
		import com.android.settings.AirplaneModeEnabler;
		import com.android.settings.R;
		import com.android.settings.RestrictedSettingsFragment;
		import com.android.settings.Utils;
		import com.android.settings.core.FeatureFlags;
		import com.android.settings.core.SubSettingLauncher;
		import com.android.settings.datausage.DataUsagePreference;
		@@ -133,7 +134,7 @@ public class NetworkProviderSettings extends RestrictedSettingsFragment
		@VisibleForTesting
		static final String PREF_KEY_FIRST_ACCESS_POINTS = "first_access_points";
		private static final String PREF_KEY_ACCESS_POINTS = "access_points";
		private static final String PREF_KEY_CONFIGURE_WIFI_SETTINGS = "configure_wifi_settings";
		private static final String PREF_KEY_CONFIGURE_NETWORK_SETTINGS = "configure_network_settings";
		private static final String PREF_KEY_SAVED_NETWORKS = "saved_networks";
		@VisibleForTesting
		static final String PREF_KEY_DATA_USAGE = "non_carrier_data_usage";
		@@ -278,7 +279,7 @@ public class NetworkProviderSettings extends RestrictedSettingsFragment
		@Override
		public void onCreate(Bundle icicle) {
		super.onCreate(icicle);
		if (!FeatureFlagUtils.isEnabled(getContext(), FeatureFlagUtils.SETTINGS_PROVIDER_MODEL)) {
		if (!Utils.isProviderModelEnabled(getContext())) {
		final Intent intent = new Intent(getContext(), WifiSettingsActivity.class);
		final Bundle extras = getActivity().getIntent().getExtras();
		if (extras != null) {
		@@ -308,7 +309,7 @@ public class NetworkProviderSettings extends RestrictedSettingsFragment
		mConnectedWifiEntryPreferenceCategory = findPreference(PREF_KEY_CONNECTED_ACCESS_POINTS);
		mFirstWifiEntryPreferenceCategory = findPreference(PREF_KEY_FIRST_ACCESS_POINTS);
		mWifiEntryPreferenceCategory = findPreference(PREF_KEY_ACCESS_POINTS);
		mConfigureWifiSettingsPreference = findPreference(PREF_KEY_CONFIGURE_WIFI_SETTINGS);
		mConfigureWifiSettingsPreference = findPreference(PREF_KEY_CONFIGURE_NETWORK_SETTINGS);
		mSavedNetworksPreference = findPreference(PREF_KEY_SAVED_NETWORKS);
		mAddWifiNetworkPreference = new AddWifiNetworkPreference(getPrefContext());
		mDataUsagePreference = findPreference(PREF_KEY_DATA_USAGE);
		@@ -1186,6 +1187,11 @@ public class NetworkProviderSettings extends RestrictedSettingsFragment

		public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
		new BaseSearchIndexProvider(R.xml.network_provider_settings) {
		@Override
		protected boolean isPageSearchEnabled(Context context) {
		return Utils.isProviderModelEnabled(context);
		}

		@Override
		public List<String> getNonIndexableKeys(Context context) {
		final List<String> keys = super.getNonIndexableKeys(context);

src/com/android/settings/wifi/WifiSettings.java

+7 −1

Original line number	Diff line number	Diff line
		@@ -59,6 +59,7 @@ import com.android.settings.LinkifyUtils;
		import com.android.settings.R;
		import com.android.settings.RestrictedSettingsFragment;
		import com.android.settings.SettingsActivity;
		import com.android.settings.Utils;
		import com.android.settings.core.FeatureFlags;
		import com.android.settings.core.SubSettingLauncher;
		import com.android.settings.datausage.DataUsagePreference;
		@@ -231,7 +232,7 @@ public class WifiSettings extends RestrictedSettingsFragment
		public void onCreate(Bundle icicle) {
		super.onCreate(icicle);

		if (FeatureFlagUtils.isEnabled(getContext(), FeatureFlagUtils.SETTINGS_PROVIDER_MODEL)) {
		if (Utils.isProviderModelEnabled(getContext())) {
		final Intent intent = new Intent("android.settings.NETWORK_PROVIDER_SETTINGS");
		// Add FLAG_ACTIVITY_NEW_TASK and FLAG_ACTIVITY_CLEAR_TASK to avoid multiple
		// instances issue. (e.g. b/191956700)
		@@ -1067,6 +1068,11 @@ public class WifiSettings extends RestrictedSettingsFragment

		public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
		new BaseSearchIndexProvider(R.xml.wifi_settings) {
		@Override
		protected boolean isPageSearchEnabled(Context context) {
		return !Utils.isProviderModelEnabled(context);
		}

		@Override
		public List<String> getNonIndexableKeys(Context context) {
		final List<String> keys = super.getNonIndexableKeys(context);

src/com/android/settings/wifi/slice/WifiSlice.java

+1 −2

Original line number	Diff line number	Diff line
		@@ -33,7 +33,6 @@ import android.net.Uri;
		import android.net.wifi.WifiManager;
		import android.os.Bundle;
		import android.text.TextUtils;
		import android.util.FeatureFlagUtils;

		import androidx.annotation.VisibleForTesting;
		import androidx.core.graphics.drawable.IconCompat;
		@@ -274,7 +273,7 @@ public class WifiSlice implements CustomSliceable {
		final Uri contentUri = new Uri.Builder().appendPath(KEY_WIFI).build();
		final String className;
		final String key;
		if (FeatureFlagUtils.isEnabled(mContext, FeatureFlagUtils.SETTINGS_PROVIDER_MODEL)) {
		if (Utils.isProviderModelEnabled(mContext)) {
		className = NetworkProviderSettings.class.getName();
		key = WifiSwitchPreferenceController.KEY;
		} else {