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

6
tests/robotests/src/com/android/settings/dashboard/DashboardFragmentTest.java
View File

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

4
tests/robotests/src/com/android/settings/development/WirelessDebuggingPreferenceControllerTest.java
View File

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

4
tests/robotests/src/com/android/settings/deviceinfo/storage/AutomaticStorageManagementSwitchPreferenceControllerTest.java
View File

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

4
tests/robotests/src/com/android/settings/network/AllInOneTetherPreferenceControllerTest.java
View File

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

4
tests/robotests/src/com/android/settings/network/TopLevelNetworkEntryPreferenceControllerTest.java
View File

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

6
tests/robotests/src/com/android/settings/widget/MasterSwitchPreferenceTest.java → tests/robotests/src/com/android/settings/widget/PrimarySwitchPreferenceTest.java
View File

@@ -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));

14
tests/robotests/src/com/android/settings/wifi/WifiMasterSwitchPreferenceControllerTest.java → tests/robotests/src/com/android/settings/wifi/WifiPrimarySwitchPreferenceControllerTest.java
View File

@@ -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();
}

6
tests/robotests/src/com/android/settings/wifi/tether/WifiTetherPreferenceControllerTest.java
View File

@@ -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);