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

Merge "Check the page searchability for both wifi and network provider page" into sc-v2-dev am: 822f98c1a4 am: 24a738d79f

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16241518

Change-Id: Idbd2b242fa92a2f3c180066adb1d4f4ffade74d6
This commit is contained in:
Jason Chiu
2021-11-12 03:26:41 +00:00
committed by Automerger Merge Worker
parent d8e3836c10 24a738d79f
commit a9c97f4b60
4 changed files with 18 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/com/android/settings/wifi/WifiSettings.java
View File

@@ -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;
@@ -230,7 +231,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);

3
src/com/android/settings/wifi/slice/WifiSlice.java
View File

@@ -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 {