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

Merge "[Wi-Fi] WiFi Settings inclusive language fix plan phase 1"

Browse Source
This commit is contained in:
Goven Liu
2020-07-22 11:06:29 +00:00
committed by Android (Google) Code Review
parent 6bbeb49a0b b70ddb9df7
commit ac26cd541c
29 changed files with 119 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/com/android/settings/network/AllInOneTetherPreferenceController.java
View File

@@ -42,8 +42,8 @@ import androidx.preference.PreferenceScreen;
import com.android.settings.R;
import com.android.settings.core.BasePreferenceController;
import com.android.settings.core.FeatureFlags;
import com.android.settings.widget.MasterSwitchController;
import com.android.settings.widget.MasterSwitchPreference;
import com.android.settings.widget.PrimarySwitchController;
import com.android.settings.widget.PrimarySwitchPreference;
import com.android.settingslib.TetherUtil;
import java.util.concurrent.atomic.AtomicReference;
@@ -75,7 +75,7 @@ public class AllInOneTetherPreferenceController extends BasePreferenceController
}
};
private MasterSwitchPreference mPreference;
private PrimarySwitchPreference mPreference;
private TetherEnabler mTetherEnabler;
@VisibleForTesting(otherwise = VisibleForTesting.NONE)
@@ -191,7 +191,7 @@ public class AllInOneTetherPreferenceController extends BasePreferenceController
void initEnabler(Lifecycle lifecycle) {
if (mPreference != null) {
mTetherEnabler = new TetherEnabler(
mContext, new MasterSwitchController(mPreference), mBluetoothPan);
mContext, new PrimarySwitchController(mPreference), mBluetoothPan);
if (lifecycle != null) {
lifecycle.addObserver(mTetherEnabler);
}

6
src/com/android/settings/network/NetworkDashboardFragment.java
View File

@@ -30,7 +30,7 @@ import com.android.settings.R;
import com.android.settings.dashboard.DashboardFragment;
import com.android.settings.network.MobilePlanPreferenceController.MobilePlanPreferenceHost;
import com.android.settings.search.BaseSearchIndexProvider;
import com.android.settings.wifi.WifiMasterSwitchPreferenceController;
import com.android.settings.wifi.WifiPrimarySwitchPreferenceController;
import com.android.settingslib.core.AbstractPreferenceController;
import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
import com.android.settingslib.core.lifecycle.Lifecycle;
@@ -96,8 +96,8 @@ public class NetworkDashboardFragment extends DashboardFragment implements
MobilePlanPreferenceHost mobilePlanHost) {
final MobilePlanPreferenceController mobilePlanPreferenceController =
new MobilePlanPreferenceController(context, mobilePlanHost);
final WifiMasterSwitchPreferenceController wifiPreferenceController =
new WifiMasterSwitchPreferenceController(context, metricsFeatureProvider);
final WifiPrimarySwitchPreferenceController wifiPreferenceController =
new WifiPrimarySwitchPreferenceController(context, metricsFeatureProvider);
final VpnPreferenceController vpnPreferenceController =
new VpnPreferenceController(context);

6
src/com/android/settings/network/TopLevelNetworkEntryPreferenceController.java
View File

@@ -24,14 +24,14 @@ import android.text.TextUtils;
import com.android.settings.R;
import com.android.settings.Utils;
import com.android.settings.core.BasePreferenceController;
import com.android.settings.wifi.WifiMasterSwitchPreferenceController;
import com.android.settings.wifi.WifiPrimarySwitchPreferenceController;
import java.util.ArrayList;
import java.util.List;
public class TopLevelNetworkEntryPreferenceController extends BasePreferenceController {
private final WifiMasterSwitchPreferenceController mWifiPreferenceController;
private final WifiPrimarySwitchPreferenceController mWifiPreferenceController;
private final MobileNetworkPreferenceController mMobileNetworkPreferenceController;
private final TetherPreferenceController mTetherPreferenceController;
@@ -40,7 +40,7 @@ public class TopLevelNetworkEntryPreferenceController extends BasePreferenceCont
mMobileNetworkPreferenceController = new MobileNetworkPreferenceController(mContext);
mTetherPreferenceController = new TetherPreferenceController(
mContext, null /* lifecycle */);
mWifiPreferenceController = new WifiMasterSwitchPreferenceController(
mWifiPreferenceController = new WifiPrimarySwitchPreferenceController(
mContext, null /* metrics */);
}