Loading res/xml/network_and_internet_v2.xml +1 −1 Original line number Diff line number Diff line Loading @@ -79,7 +79,7 @@ settings:useAdminDisabledSummary="true" /> <com.android.settings.datausage.DataSaverPreference android:key="restrict_background" android:key="restrict_backgroundz" android:title="@string/data_saver_title" android:icon="@drawable/ic_settings_data_usage" android:order="10" Loading src/com/android/settings/network/TopLevelNetworkEntryPreferenceController.java +2 −1 Original line number Diff line number Diff line Loading @@ -22,6 +22,7 @@ import android.text.BidiFormatter; 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; Loading @@ -45,7 +46,7 @@ public class TopLevelNetworkEntryPreferenceController extends BasePreferenceCont @Override public int getAvailabilityStatus() { return AVAILABLE_UNSEARCHABLE; return Utils.isDemoUser(mContext) ? UNSUPPORTED_ON_DEVICE : AVAILABLE_UNSEARCHABLE; } @Override Loading tests/robotests/src/com/android/settings/network/TopLevelNetworkEntryPreferenceControllerTest.java +16 −1 Original line number Diff line number Diff line Loading @@ -16,6 +16,8 @@ package com.android.settings.network; import static com.android.settings.core.BasePreferenceController.UNSUPPORTED_ON_DEVICE; import static com.google.common.truth.Truth.assertThat; import static org.mockito.Mockito.when; Loading @@ -24,8 +26,10 @@ import android.content.Context; 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 org.junit.After; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; Loading @@ -39,7 +43,7 @@ import org.robolectric.shadows.ShadowUserManager; import org.robolectric.util.ReflectionHelpers; @RunWith(RobolectricTestRunner.class) @Config(shadows = ShadowRestrictedLockUtilsInternal.class) @Config(shadows = {ShadowRestrictedLockUtilsInternal.class, ShadowUtils.class}) public class TopLevelNetworkEntryPreferenceControllerTest { @Mock Loading Loading @@ -70,6 +74,17 @@ public class TopLevelNetworkEntryPreferenceControllerTest { mTetherPreferenceController); } @After public void tearDown() { ShadowUtils.reset(); } @Test public void getAvailabilityStatus_demoUser_unsupported() { ShadowUtils.setIsDemoUser(true); assertThat(mController.getAvailabilityStatus()).isEqualTo(UNSUPPORTED_ON_DEVICE); } @Test public void getSummary_hasMobileAndHotspot_shouldReturnMobileSummary() { when(mWifiPreferenceController.isAvailable()).thenReturn(true); Loading Loading
res/xml/network_and_internet_v2.xml +1 −1 Original line number Diff line number Diff line Loading @@ -79,7 +79,7 @@ settings:useAdminDisabledSummary="true" /> <com.android.settings.datausage.DataSaverPreference android:key="restrict_background" android:key="restrict_backgroundz" android:title="@string/data_saver_title" android:icon="@drawable/ic_settings_data_usage" android:order="10" Loading
src/com/android/settings/network/TopLevelNetworkEntryPreferenceController.java +2 −1 Original line number Diff line number Diff line Loading @@ -22,6 +22,7 @@ import android.text.BidiFormatter; 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; Loading @@ -45,7 +46,7 @@ public class TopLevelNetworkEntryPreferenceController extends BasePreferenceCont @Override public int getAvailabilityStatus() { return AVAILABLE_UNSEARCHABLE; return Utils.isDemoUser(mContext) ? UNSUPPORTED_ON_DEVICE : AVAILABLE_UNSEARCHABLE; } @Override Loading
tests/robotests/src/com/android/settings/network/TopLevelNetworkEntryPreferenceControllerTest.java +16 −1 Original line number Diff line number Diff line Loading @@ -16,6 +16,8 @@ package com.android.settings.network; import static com.android.settings.core.BasePreferenceController.UNSUPPORTED_ON_DEVICE; import static com.google.common.truth.Truth.assertThat; import static org.mockito.Mockito.when; Loading @@ -24,8 +26,10 @@ import android.content.Context; 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 org.junit.After; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; Loading @@ -39,7 +43,7 @@ import org.robolectric.shadows.ShadowUserManager; import org.robolectric.util.ReflectionHelpers; @RunWith(RobolectricTestRunner.class) @Config(shadows = ShadowRestrictedLockUtilsInternal.class) @Config(shadows = {ShadowRestrictedLockUtilsInternal.class, ShadowUtils.class}) public class TopLevelNetworkEntryPreferenceControllerTest { @Mock Loading Loading @@ -70,6 +74,17 @@ public class TopLevelNetworkEntryPreferenceControllerTest { mTetherPreferenceController); } @After public void tearDown() { ShadowUtils.reset(); } @Test public void getAvailabilityStatus_demoUser_unsupported() { ShadowUtils.setIsDemoUser(true); assertThat(mController.getAvailabilityStatus()).isEqualTo(UNSUPPORTED_ON_DEVICE); } @Test public void getSummary_hasMobileAndHotspot_shouldReturnMobileSummary() { when(mWifiPreferenceController.isAvailable()).thenReturn(true); Loading