diff --git a/res/values/strings.xml b/res/values/strings.xml index 39beccc0a7b..3650815cc58 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -1840,7 +1840,7 @@ Wi\u2011Fi - Use Wi\u2011Fi + Use Wi\u2011Fi Wi\u2011Fi settings diff --git a/res/xml/development_settings.xml b/res/xml/development_settings.xml index 0acfa40d675..6fa6160dba8 100644 --- a/res/xml/development_settings.xml +++ b/res/xml/development_settings.xml @@ -143,7 +143,7 @@ - - - + - - - + diff --git a/res/xml/storage_dashboard_fragment.xml b/res/xml/storage_dashboard_fragment.xml index 91634fcc2cc..bc58d7ea5d0 100644 --- a/res/xml/storage_dashboard_fragment.xml +++ b/res/xml/storage_dashboard_fragment.xml @@ -24,7 +24,7 @@ android:order="0" settings:searchable="false" settings:controller="com.android.settings.deviceinfo.storage.StorageSummaryDonutPreferenceController"/> - appPreferences = new ArrayMap<>(); + final Map appPreferences = new ArrayMap<>(); int prefCount = mCategory.getPreferenceCount(); for (int i = 0; i < prefCount; i++) { final Preference pref = mCategory.getPreference(i); final String key = pref.getKey(); if (!TextUtils.equals(key, KEY_SEE_ALL)) { - appPreferences.put(key, (MasterSwitchPreference) pref); + appPreferences.put(key, (PrimarySwitchPreference) pref); } } final int recentAppsCount = recentApps.size(); @@ -244,10 +244,10 @@ public class RecentNotifyingAppsPreferenceController extends AbstractPreferenceC } boolean rebindPref = true; - MasterSwitchPreference pref = appPreferences.remove(getKey(app.getUserId(), + PrimarySwitchPreference pref = appPreferences.remove(getKey(app.getUserId(), pkgName)); if (pref == null) { - pref = new MasterSwitchPreference(prefContext); + pref = new PrimarySwitchPreference(prefContext); rebindPref = false; } pref.setKey(getKey(app.getUserId(), pkgName)); diff --git a/src/com/android/settings/notification/app/AppChannelsBypassingDndPreferenceController.java b/src/com/android/settings/notification/app/AppChannelsBypassingDndPreferenceController.java index fa052999c99..684a27a8ae8 100644 --- a/src/com/android/settings/notification/app/AppChannelsBypassingDndPreferenceController.java +++ b/src/com/android/settings/notification/app/AppChannelsBypassingDndPreferenceController.java @@ -39,7 +39,7 @@ import com.android.settings.applications.AppInfoBase; import com.android.settings.core.PreferenceControllerMixin; import com.android.settings.core.SubSettingLauncher; import com.android.settings.notification.NotificationBackend; -import com.android.settings.widget.MasterSwitchPreference; +import com.android.settings.widget.PrimarySwitchPreference; import com.android.settingslib.RestrictedSwitchPreference; import java.util.ArrayList; @@ -92,8 +92,8 @@ public class AppChannelsBypassingDndPreferenceController extends NotificationPre // the 0th index is the mAllNotificationsToggle which allows users to // toggle all notifications from this app to bypass DND for (int i = 1; i < mPreferenceCategory.getPreferenceCount(); i++) { - MasterSwitchPreference childPreference = - (MasterSwitchPreference) mPreferenceCategory.getPreference(i); + PrimarySwitchPreference childPreference = + (PrimarySwitchPreference) mPreferenceCategory.getPreference(i); childPreference.setChecked(showNotificationInDnd(mChannels.get(i - 1))); } return true; @@ -158,7 +158,7 @@ public class AppChannelsBypassingDndPreferenceController extends NotificationPre mPreferenceCategory.removeAll(); mPreferenceCategory.addPreference(mAllNotificationsToggle); for (NotificationChannel channel : mChannels) { - MasterSwitchPreference channelPreference = new MasterSwitchPreference(mContext); + PrimarySwitchPreference channelPreference = new PrimarySwitchPreference(mContext); channelPreference.setDisabledByAdmin(mAdmin); channelPreference.setSwitchEnabled( (mAdmin == null || !channelPreference.isDisabledByAdmin()) diff --git a/src/com/android/settings/notification/app/ChannelListPreferenceController.java b/src/com/android/settings/notification/app/ChannelListPreferenceController.java index 8a34672eea1..a63fd7053f0 100644 --- a/src/com/android/settings/notification/app/ChannelListPreferenceController.java +++ b/src/com/android/settings/notification/app/ChannelListPreferenceController.java @@ -23,11 +23,7 @@ import android.app.NotificationChannel; import android.app.NotificationChannelGroup; import android.app.settings.SettingsEnums; import android.content.Context; -import android.graphics.BlendMode; -import android.graphics.BlendModeColorFilter; import android.graphics.drawable.Drawable; -import android.graphics.drawable.GradientDrawable; -import android.graphics.drawable.LayerDrawable; import android.os.AsyncTask; import android.os.Bundle; import android.provider.Settings; @@ -43,7 +39,7 @@ import com.android.settings.Utils; import com.android.settings.applications.AppInfoBase; import com.android.settings.core.SubSettingLauncher; import com.android.settings.notification.NotificationBackend; -import com.android.settings.widget.MasterSwitchPreference; +import com.android.settings.widget.PrimarySwitchPreference; import com.android.settingslib.RestrictedSwitchPreference; import java.util.ArrayList; @@ -177,7 +173,7 @@ public class ChannelListPreferenceController extends NotificationPreferenceContr protected Preference populateSingleChannelPrefs(PreferenceGroup parent, final NotificationChannel channel, final boolean groupBlocked) { - MasterSwitchPreference channelPref = new MasterSwitchPreference(mContext); + PrimarySwitchPreference channelPref = new PrimarySwitchPreference(mContext); channelPref.setSwitchEnabled(mAdmin == null && isChannelBlockable(channel) && isChannelConfigurable(channel) @@ -186,7 +182,7 @@ public class ChannelListPreferenceController extends NotificationPreferenceContr if (channel.getImportance() > IMPORTANCE_LOW) { channelPref.setIcon(getAlertingIcon()); } - channelPref.setIconSize(MasterSwitchPreference.ICON_SIZE_SMALL); + channelPref.setIconSize(PrimarySwitchPreference.ICON_SIZE_SMALL); channelPref.setKey(channel.getId()); channelPref.setTitle(channel.getName()); channelPref.setSummary(NotificationBackend.getSentSummary( @@ -210,7 +206,7 @@ public class ChannelListPreferenceController extends NotificationPreferenceContr int importance = value ? channel.getOriginalImportance() : IMPORTANCE_NONE; channel.setImportance(importance); channel.lockFields(NotificationChannel.USER_LOCKED_IMPORTANCE); - MasterSwitchPreference channelPref1 = (MasterSwitchPreference) preference; + PrimarySwitchPreference channelPref1 = (PrimarySwitchPreference) preference; channelPref1.setIcon(null); if (channel.getImportance() > IMPORTANCE_LOW) { channelPref1.setIcon(getAlertingIcon()); @@ -243,7 +239,7 @@ public class ChannelListPreferenceController extends NotificationPreferenceContr int childCount = groupGroup.getPreferenceCount(); for (int i = 0; i < childCount; i++) { Preference pref = groupGroup.getPreference(i); - if (pref instanceof MasterSwitchPreference) { + if (pref instanceof PrimarySwitchPreference) { toRemove.add(pref); } } diff --git a/src/com/android/settings/widget/MasterSwitchController.java b/src/com/android/settings/widget/PrimarySwitchController.java similarity index 89% rename from src/com/android/settings/widget/MasterSwitchController.java rename to src/com/android/settings/widget/PrimarySwitchController.java index 92e38847987..3718a89df79 100644 --- a/src/com/android/settings/widget/MasterSwitchController.java +++ b/src/com/android/settings/widget/PrimarySwitchController.java @@ -23,17 +23,17 @@ import com.android.settings.overlay.FeatureFactory; import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin; import com.android.settingslib.core.instrumentation.MetricsFeatureProvider; -/* - * The switch controller that is used to update the switch widget in the MasterSwitchPreference +/** + * The switch controller that is used to update the switch widget in the PrimarySwitchPreference * layout. */ -public class MasterSwitchController extends SwitchWidgetController implements - Preference.OnPreferenceChangeListener { +public class PrimarySwitchController extends SwitchWidgetController implements + Preference.OnPreferenceChangeListener { - private final MasterSwitchPreference mPreference; + private final PrimarySwitchPreference mPreference; private final MetricsFeatureProvider mMetricsFeatureProvider; - public MasterSwitchController(MasterSwitchPreference preference) { + public PrimarySwitchController(PrimarySwitchPreference preference) { mPreference = preference; mMetricsFeatureProvider = FeatureFactory.getFactory(preference.getContext()) .getMetricsFeatureProvider(); diff --git a/src/com/android/settings/widget/MasterSwitchPreference.java b/src/com/android/settings/widget/PrimarySwitchPreference.java similarity index 87% rename from src/com/android/settings/widget/MasterSwitchPreference.java rename to src/com/android/settings/widget/PrimarySwitchPreference.java index 9fe077e4496..e0c06836631 100644 --- a/src/com/android/settings/widget/MasterSwitchPreference.java +++ b/src/com/android/settings/widget/PrimarySwitchPreference.java @@ -33,27 +33,27 @@ import com.android.settingslib.RestrictedPreference; * A custom preference that provides inline switch toggle. It has a mandatory field for title, and * optional fields for icon and sub-text. And it can be restricted by admin state. */ -public class MasterSwitchPreference extends RestrictedPreference { +public class PrimarySwitchPreference extends RestrictedPreference { private Switch mSwitch; private boolean mChecked; private boolean mCheckedSet; private boolean mEnableSwitch = true; - public MasterSwitchPreference(Context context, AttributeSet attrs, + public PrimarySwitchPreference(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) { super(context, attrs, defStyleAttr, defStyleRes); } - public MasterSwitchPreference(Context context, AttributeSet attrs, int defStyleAttr) { + public PrimarySwitchPreference(Context context, AttributeSet attrs, int defStyleAttr) { super(context, attrs, defStyleAttr); } - public MasterSwitchPreference(Context context, AttributeSet attrs) { + public PrimarySwitchPreference(Context context, AttributeSet attrs) { super(context, attrs); } - public MasterSwitchPreference(Context context) { + public PrimarySwitchPreference(Context context) { super(context); } @@ -101,6 +101,11 @@ public class MasterSwitchPreference extends RestrictedPreference { return mSwitch != null && mChecked; } + /** + * Set the checked status to be {@code checked}. + * + * @param checked The new checked status + */ public void setChecked(boolean checked) { // Always set checked the first time; don't assume the field's default of false. final boolean changed = mChecked != checked; @@ -113,6 +118,11 @@ public class MasterSwitchPreference extends RestrictedPreference { } } + /** + * Set the Switch to be the status of {@code enabled}. + * + * @param enabled The new enabled status + */ public void setSwitchEnabled(boolean enabled) { mEnableSwitch = enabled; if (mSwitch != null) { diff --git a/src/com/android/settings/wifi/WifiMasterSwitchPreferenceController.java b/src/com/android/settings/wifi/WifiPrimarySwitchPreferenceController.java similarity index 83% rename from src/com/android/settings/wifi/WifiMasterSwitchPreferenceController.java rename to src/com/android/settings/wifi/WifiPrimarySwitchPreferenceController.java index 1e18c598d74..9356e6b800e 100644 --- a/src/com/android/settings/wifi/WifiMasterSwitchPreferenceController.java +++ b/src/com/android/settings/wifi/WifiPrimarySwitchPreferenceController.java @@ -21,8 +21,8 @@ import androidx.preference.PreferenceScreen; import com.android.settings.R; import com.android.settings.core.PreferenceControllerMixin; -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.settings.widget.SummaryUpdater; import com.android.settingslib.core.AbstractPreferenceController; import com.android.settingslib.core.instrumentation.MetricsFeatureProvider; @@ -32,19 +32,22 @@ import com.android.settingslib.core.lifecycle.events.OnResume; import com.android.settingslib.core.lifecycle.events.OnStart; import com.android.settingslib.core.lifecycle.events.OnStop; -// TODO(b/151133650): Replace AbstractPreferenceController with BasePreferenceController. -public class WifiMasterSwitchPreferenceController extends AbstractPreferenceController +/** + * PreferenceController to update the wifi state. + */ +public class WifiPrimarySwitchPreferenceController extends AbstractPreferenceController implements PreferenceControllerMixin, SummaryUpdater.OnSummaryChangeListener, LifecycleObserver, OnResume, OnPause, OnStart, OnStop { + //TODO(b/151133650): Replace AbstractPreferenceController with BasePreferenceController. public static final String KEY_TOGGLE_WIFI = "main_toggle_wifi"; - private MasterSwitchPreference mWifiPreference; + private PrimarySwitchPreference mWifiPreference; private WifiEnabler mWifiEnabler; private final WifiSummaryUpdater mSummaryHelper; private final MetricsFeatureProvider mMetricsFeatureProvider; - public WifiMasterSwitchPreferenceController(Context context, + public WifiPrimarySwitchPreferenceController(Context context, MetricsFeatureProvider metricsFeatureProvider) { super(context); mMetricsFeatureProvider = metricsFeatureProvider; @@ -85,8 +88,8 @@ public class WifiMasterSwitchPreferenceController extends AbstractPreferenceCont @Override public void onStart() { - mWifiEnabler = new WifiEnabler(mContext, new MasterSwitchController(mWifiPreference), - mMetricsFeatureProvider); + mWifiEnabler = new WifiEnabler(mContext, new PrimarySwitchController(mWifiPreference), + mMetricsFeatureProvider); } @Override diff --git a/src/com/android/settings/wifi/WifiSettings.java b/src/com/android/settings/wifi/WifiSettings.java index e3f8b53ee81..7bc40638312 100644 --- a/src/com/android/settings/wifi/WifiSettings.java +++ b/src/com/android/settings/wifi/WifiSettings.java @@ -220,8 +220,8 @@ public class WifiSettings extends RestrictedSettingsFragment setProgressBarVisible(false); } ((SettingsActivity) activity).getSwitchBar().setSwitchBarText( - R.string.wifi_settings_master_switch_title, - R.string.wifi_settings_master_switch_title); + R.string.wifi_settings_primary_switch_title, + R.string.wifi_settings_primary_switch_title); } @Override diff --git a/tests/robotests/src/com/android/settings/dashboard/DashboardFragmentTest.java b/tests/robotests/src/com/android/settings/dashboard/DashboardFragmentTest.java index e70578e60db..4b53ed1244e 100644 --- a/tests/robotests/src/com/android/settings/dashboard/DashboardFragmentTest.java +++ b/tests/robotests/src/com/android/settings/dashboard/DashboardFragmentTest.java @@ -50,7 +50,7 @@ import com.android.settings.core.FeatureFlags; import com.android.settings.core.PreferenceControllerMixin; import com.android.settings.slices.BlockingSlicePrefController; import com.android.settings.testutils.FakeFeatureFactory; -import com.android.settings.widget.MasterSwitchPreference; +import com.android.settings.widget.PrimarySwitchPreference; import com.android.settingslib.core.AbstractPreferenceController; import com.android.settingslib.core.instrumentation.MetricsFeatureProvider; import com.android.settingslib.core.instrumentation.VisibilityLoggerMixin; @@ -327,12 +327,12 @@ public class DashboardFragmentTest { } @Test - public void createPreference_isActivityTileAndHasSwitch_returnMasterSwitchPreference() { + public void createPreference_isActivityTileAndHasSwitch_returnPrimarySwitchPreference() { mActivityTile.getMetaData().putString(META_DATA_PREFERENCE_SWITCH_URI, "uri"); final Preference pref = mTestFragment.createPreference(mActivityTile); - assertThat(pref).isInstanceOf(MasterSwitchPreference.class); + assertThat(pref).isInstanceOf(PrimarySwitchPreference.class); } @Test diff --git a/tests/robotests/src/com/android/settings/development/WirelessDebuggingPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/WirelessDebuggingPreferenceControllerTest.java index da689b7b946..54bd54b65bf 100644 --- a/tests/robotests/src/com/android/settings/development/WirelessDebuggingPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/WirelessDebuggingPreferenceControllerTest.java @@ -33,7 +33,7 @@ import androidx.preference.PreferenceScreen; import com.android.settings.testutils.shadow.ShadowUtils; import com.android.settings.testutils.shadow.ShadowWirelessDebuggingPreferenceController; -import com.android.settings.widget.MasterSwitchPreference; +import com.android.settings.widget.PrimarySwitchPreference; import com.android.settingslib.core.lifecycle.Lifecycle; import org.junit.After; @@ -54,7 +54,7 @@ public class WirelessDebuggingPreferenceControllerTest { @Mock private PreferenceScreen mScreen; @Mock - private MasterSwitchPreference mPreference; + private PrimarySwitchPreference mPreference; @Mock private IAdbManager mAdbManager; @Mock diff --git a/tests/robotests/src/com/android/settings/deviceinfo/storage/AutomaticStorageManagementSwitchPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/storage/AutomaticStorageManagementSwitchPreferenceControllerTest.java index 70620bc3155..d1371a21320 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/storage/AutomaticStorageManagementSwitchPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/storage/AutomaticStorageManagementSwitchPreferenceControllerTest.java @@ -42,7 +42,7 @@ import com.android.settings.core.BasePreferenceController; import com.android.settings.deletionhelper.ActivationWarningFragment; import com.android.settings.overlay.FeatureFactory; import com.android.settings.testutils.FakeFeatureFactory; -import com.android.settings.widget.MasterSwitchPreference; +import com.android.settings.widget.PrimarySwitchPreference; import org.junit.Before; import org.junit.Test; @@ -60,7 +60,7 @@ public class AutomaticStorageManagementSwitchPreferenceControllerTest { @Mock private PreferenceScreen mScreen; @Mock - private MasterSwitchPreference mPreference; + private PrimarySwitchPreference mPreference; @Mock(answer = Answers.RETURNS_DEEP_STUBS) private Context mMockContext; @Mock(answer = Answers.RETURNS_DEEP_STUBS) diff --git a/tests/robotests/src/com/android/settings/network/AllInOneTetherPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/network/AllInOneTetherPreferenceControllerTest.java index f37b0e418cb..7dcd6d483aa 100644 --- a/tests/robotests/src/com/android/settings/network/AllInOneTetherPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/network/AllInOneTetherPreferenceControllerTest.java @@ -40,7 +40,7 @@ import androidx.preference.PreferenceScreen; import androidx.test.core.app.ApplicationProvider; import com.android.settings.R; -import com.android.settings.widget.MasterSwitchPreference; +import com.android.settings.widget.PrimarySwitchPreference; import org.junit.Before; import org.junit.Test; @@ -117,7 +117,7 @@ public class AllInOneTetherPreferenceControllerTest { @Mock private BluetoothAdapter mBluetoothAdapter; @Mock - private MasterSwitchPreference mPreference; + private PrimarySwitchPreference mPreference; private static final String PREF_KEY = "tether"; private AllInOneTetherPreferenceController mController; diff --git a/tests/robotests/src/com/android/settings/network/TopLevelNetworkEntryPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/network/TopLevelNetworkEntryPreferenceControllerTest.java index e04262fb205..a3f0c90c1a2 100644 --- a/tests/robotests/src/com/android/settings/network/TopLevelNetworkEntryPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/network/TopLevelNetworkEntryPreferenceControllerTest.java @@ -27,7 +27,7 @@ import android.os.UserManager; import com.android.settings.testutils.shadow.ShadowRestrictedLockUtilsInternal; import com.android.settings.testutils.shadow.ShadowUtils; -import com.android.settings.wifi.WifiMasterSwitchPreferenceController; +import com.android.settings.wifi.WifiPrimarySwitchPreferenceController; import org.junit.After; import org.junit.Before; @@ -47,7 +47,7 @@ import org.robolectric.util.ReflectionHelpers; public class TopLevelNetworkEntryPreferenceControllerTest { @Mock - private WifiMasterSwitchPreferenceController mWifiPreferenceController; + private WifiPrimarySwitchPreferenceController mWifiPreferenceController; @Mock private MobileNetworkPreferenceController mMobileNetworkPreferenceController; @Mock diff --git a/tests/robotests/src/com/android/settings/widget/MasterSwitchPreferenceTest.java b/tests/robotests/src/com/android/settings/widget/PrimarySwitchPreferenceTest.java similarity index 97% rename from tests/robotests/src/com/android/settings/widget/MasterSwitchPreferenceTest.java rename to tests/robotests/src/com/android/settings/widget/PrimarySwitchPreferenceTest.java index 8115a02c16e..a51035301e6 100644 --- a/tests/robotests/src/com/android/settings/widget/MasterSwitchPreferenceTest.java +++ b/tests/robotests/src/com/android/settings/widget/PrimarySwitchPreferenceTest.java @@ -39,17 +39,17 @@ import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; @RunWith(RobolectricTestRunner.class) -public class MasterSwitchPreferenceTest { +public class PrimarySwitchPreferenceTest { private Context mContext; - private MasterSwitchPreference mPreference; + private PrimarySwitchPreference mPreference; private PreferenceViewHolder mHolder; private LinearLayout mWidgetView; @Before public void setUp() { mContext = RuntimeEnvironment.application; - mPreference = new MasterSwitchPreference(mContext); + mPreference = new PrimarySwitchPreference(mContext); LayoutInflater inflater = LayoutInflater.from(mContext); mHolder = PreferenceViewHolder.createInstanceForTests(inflater.inflate( com.android.settingslib.R.layout.preference_two_target, null)); diff --git a/tests/robotests/src/com/android/settings/wifi/WifiMasterSwitchPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/wifi/WifiPrimarySwitchPreferenceControllerTest.java similarity index 90% rename from tests/robotests/src/com/android/settings/wifi/WifiMasterSwitchPreferenceControllerTest.java rename to tests/robotests/src/com/android/settings/wifi/WifiPrimarySwitchPreferenceControllerTest.java index 1d13232345e..b94df29401e 100644 --- a/tests/robotests/src/com/android/settings/wifi/WifiMasterSwitchPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/wifi/WifiPrimarySwitchPreferenceControllerTest.java @@ -38,7 +38,7 @@ import androidx.preference.PreferenceScreen; import com.android.settings.testutils.FakeFeatureFactory; import com.android.settings.testutils.shadow.ShadowRestrictedLockUtilsInternal; -import com.android.settings.widget.MasterSwitchPreference; +import com.android.settings.widget.PrimarySwitchPreference; import com.android.settingslib.core.instrumentation.MetricsFeatureProvider; import org.junit.Before; @@ -52,21 +52,21 @@ import org.robolectric.annotation.Config; @RunWith(RobolectricTestRunner.class) @Config(shadows = ShadowRestrictedLockUtilsInternal.class) -public class WifiMasterSwitchPreferenceControllerTest { +public class WifiPrimarySwitchPreferenceControllerTest { @Mock private WifiManager mWifiManager; @Mock private PreferenceScreen mScreen; @Mock - private MasterSwitchPreference mPreference; + private PrimarySwitchPreference mPreference; @Mock private ConnectivityManager mConnectivityManager; @Mock private NetworkScoreManager mNetworkScoreManager; private Context mContext; - private WifiMasterSwitchPreferenceController mController; + private WifiPrimarySwitchPreferenceController mController; private MetricsFeatureProvider mMetricsFeatureProvider; @Before @@ -76,20 +76,20 @@ public class WifiMasterSwitchPreferenceControllerTest { mContext = spy(RuntimeEnvironment.application.getApplicationContext()); when(mContext.getSystemService(ConnectivityManager.class)).thenReturn(mConnectivityManager); when(mContext.getSystemService(NetworkScoreManager.class)).thenReturn(mNetworkScoreManager); - mController = new WifiMasterSwitchPreferenceController(mContext, mMetricsFeatureProvider); + mController = new WifiPrimarySwitchPreferenceController(mContext, mMetricsFeatureProvider); when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mPreference); when(mContext.getSystemService(Context.WIFI_SERVICE)).thenReturn(mWifiManager); when(mWifiManager.getWifiState()).thenReturn(WifiManager.WIFI_STATE_DISABLED); } @Test - public void testWifiMasterSwitch_byDefault_shouldBeShown() { + public void testWifiPrimarySwitch_byDefault_shouldBeShown() { assertThat(mController.isAvailable()).isTrue(); } @Test @Config(qualifiers = "mcc999") - public void testWifiMasterSwitch_ifDisabled_shouldNotBeShown() { + public void testWifiPrimarySwitch_ifDisabled_shouldNotBeShown() { assertThat(mController.isAvailable()).isFalse(); } diff --git a/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherPreferenceControllerTest.java index b62f1baa930..920582f0754 100644 --- a/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherPreferenceControllerTest.java @@ -31,7 +31,7 @@ import androidx.lifecycle.LifecycleOwner; import androidx.preference.PreferenceScreen; import com.android.settings.testutils.FakeFeatureFactory; -import com.android.settings.widget.MasterSwitchPreference; +import com.android.settings.widget.PrimarySwitchPreference; import com.android.settingslib.core.lifecycle.Lifecycle; import org.junit.Before; @@ -66,7 +66,7 @@ public class WifiTetherPreferenceControllerTest { private WifiTetherPreferenceController mController; private Lifecycle mLifecycle; private LifecycleOwner mLifecycleOwner; - private MasterSwitchPreference mPreference; + private PrimarySwitchPreference mPreference; @Before public void setUp() { @@ -76,7 +76,7 @@ public class WifiTetherPreferenceControllerTest { mLifecycleOwner = () -> mLifecycle; mLifecycle = new Lifecycle(mLifecycleOwner); FakeFeatureFactory.setupForTest(); - mPreference = new MasterSwitchPreference(RuntimeEnvironment.application); + mPreference = new PrimarySwitchPreference(RuntimeEnvironment.application); when(mContext.getSystemService(Context.CONNECTIVITY_SERVICE)) .thenReturn(mConnectivityManager); when(mContext.getSystemService(Context.WIFI_SERVICE)).thenReturn(mWifiManager);