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

Merge "Remove feature flag for provider model in wifi settings" into sc-v2-dev am: 21967a6ff8

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

Change-Id: I06611c86c0db787198031edcf10d1d60217d577c
This commit is contained in:
Betty Chang
2021-11-18 06:30:27 +00:00
committed by Automerger Merge Worker
parent 023e325653 21967a6ff8
commit 4375590837
3 changed files with 12 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -89,9 +89,10 @@ import java.util.Optional;
/** /**
* UI for Wi-Fi settings screen * UI for Wi-Fi settings screen
* *
* TODO(b/167474581): This file will be deprecated at Android S, please merge your WifiSettings * @deprecated This file will be deprecated at Android S, please merge your WifiSettings
* in change in {@link NetworkProviderSettings}. * in change in {@link NetworkProviderSettings}.
*/ */
@Deprecated
@SearchIndexable @SearchIndexable
public class WifiSettings extends RestrictedSettingsFragment public class WifiSettings extends RestrictedSettingsFragment
implements Indexable, WifiPickerTracker.WifiPickerTrackerCallback, implements Indexable, WifiPickerTracker.WifiPickerTrackerCallback,
@@ -99,6 +100,10 @@ public class WifiSettings extends RestrictedSettingsFragment
private static final String TAG = "WifiSettings"; private static final String TAG = "WifiSettings";
// Set the Provider Model is always enabled
@VisibleForTesting
static Boolean IS_ENABLED_PROVIDER_MODEL = true;
// IDs of context menu // IDs of context menu
static final int MENU_ID_CONNECT = Menu.FIRST + 1; static final int MENU_ID_CONNECT = Menu.FIRST + 1;
@VisibleForTesting @VisibleForTesting
@@ -232,7 +237,7 @@ public class WifiSettings extends RestrictedSettingsFragment
public void onCreate(Bundle icicle) { public void onCreate(Bundle icicle) {
super.onCreate(icicle); super.onCreate(icicle);
if (Utils.isProviderModelEnabled(getContext())) { if (IS_ENABLED_PROVIDER_MODEL) {
final Intent intent = new Intent("android.settings.NETWORK_PROVIDER_SETTINGS"); final Intent intent = new Intent("android.settings.NETWORK_PROVIDER_SETTINGS");
// Add FLAG_ACTIVITY_NEW_TASK and FLAG_ACTIVITY_CLEAR_TASK to avoid multiple // Add FLAG_ACTIVITY_NEW_TASK and FLAG_ACTIVITY_CLEAR_TASK to avoid multiple
// instances issue. (e.g. b/191956700) // instances issue. (e.g. b/191956700)
@@ -1070,7 +1075,7 @@ public class WifiSettings extends RestrictedSettingsFragment
new BaseSearchIndexProvider(R.xml.wifi_settings) { new BaseSearchIndexProvider(R.xml.wifi_settings) {
@Override @Override
protected boolean isPageSearchEnabled(Context context) { protected boolean isPageSearchEnabled(Context context) {
return !Utils.isProviderModelEnabled(context); return !IS_ENABLED_PROVIDER_MODEL;
} }
@Override @Override

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

@@ -271,15 +271,9 @@ public class WifiSlice implements CustomSliceable {
public Intent getIntent() { public Intent getIntent() {
final String screenTitle = mContext.getText(R.string.wifi_settings).toString(); final String screenTitle = mContext.getText(R.string.wifi_settings).toString();
final Uri contentUri = new Uri.Builder().appendPath(KEY_WIFI).build(); final Uri contentUri = new Uri.Builder().appendPath(KEY_WIFI).build();
final String className; final String className = NetworkProviderSettings.class.getName();
final String key; final String key = WifiSwitchPreferenceController.KEY;
if (Utils.isProviderModelEnabled(mContext)) {
className = NetworkProviderSettings.class.getName();
key = WifiSwitchPreferenceController.KEY;
} else {
className = WifiSettings.class.getName();
key = KEY_WIFI;
}
final Intent intent = SliceBuilderUtils.buildSearchResultPageIntent(mContext, className, final Intent intent = SliceBuilderUtils.buildSearchResultPageIntent(mContext, className,
key, screenTitle, SettingsEnums.DIALOG_WIFI_AP_EDIT, this) key, screenTitle, SettingsEnums.DIALOG_WIFI_AP_EDIT, this)
.setClassName(mContext.getPackageName(), SubSettings.class.getName()) .setClassName(mContext.getPackageName(), SubSettings.class.getName())

2
tests/robotests/src/com/android/settings/wifi/WifiSettingsTest.java
View File

@@ -106,7 +106,7 @@ public class WifiSettingsTest {
mWifiSettings.mConfigureWifiSettingsPreference = new Preference(mContext); mWifiSettings.mConfigureWifiSettingsPreference = new Preference(mContext);
mWifiSettings.mWifiPickerTracker = mMockWifiPickerTracker; mWifiSettings.mWifiPickerTracker = mMockWifiPickerTracker;
mWifiSettings.mWifiManager = mWifiManager; mWifiSettings.mWifiManager = mWifiManager;
FeatureFlagUtils.setEnabled(mContext, FeatureFlagUtils.SETTINGS_PROVIDER_MODEL, false); mWifiSettings.IS_ENABLED_PROVIDER_MODEL = false;
} }
@Test @Test