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

Merge "Introduce concept of DockUser" into tm-qpr-dev

Browse Source
This commit is contained in:
Adam Bookatz
2022-11-16 00:59:41 +00:00
committed by Android (Google) Code Review
parent e2e892d46c e5e232428d
commit 9703f6a154
11 changed files with 63 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
tests/robotests/src/com/android/settings/users/TimeoutToUserZeroPreferenceControllerTest.java → tests/robotests/src/com/android/settings/users/TimeoutToDockUserPreferenceControllerTest.java
View File

@@ -16,7 +16,7 @@
package com.android.settings.users;
import static android.provider.Settings.Secure.TIMEOUT_TO_USER_ZERO;
import static android.provider.Settings.Secure.TIMEOUT_TO_DOCK_USER;
import static com.google.common.truth.Truth.assertThat;
@@ -45,12 +45,12 @@ import org.robolectric.annotation.Config;
@RunWith(RobolectricTestRunner.class)
@Config(shadows = {ShadowSecureSettings.class, ShadowUserHandle.class})
public class TimeoutToUserZeroPreferenceControllerTest {
public class TimeoutToDockUserPreferenceControllerTest {
private Context mContext;
private Resources mResources;
private TimeoutToUserZeroPreferenceController mController;
private TimeoutToDockUserPreferenceController mController;
private static final String FAKE_PREFERENCE_KEY = "timeout_to_user_zero_preference";
private static final String FAKE_PREFERENCE_KEY = "timeout_to_dock_user_preference";
private String[] mEntries;
private String[] mValues;
@@ -62,15 +62,15 @@ public class TimeoutToUserZeroPreferenceControllerTest {
doReturn(mResources).when(mContext).getResources();
mEntries = mResources.getStringArray(
R.array.switch_to_user_zero_when_docked_timeout_entries);
R.array.switch_to_dock_user_when_docked_timeout_entries);
mValues = mResources.getStringArray(
R.array.switch_to_user_zero_when_docked_timeout_values);
R.array.switch_to_dock_user_when_docked_timeout_values);
mController = new TimeoutToUserZeroPreferenceController(mContext, FAKE_PREFERENCE_KEY);
mController = new TimeoutToDockUserPreferenceController(mContext, FAKE_PREFERENCE_KEY);
// Feature enabled.
when(mResources.getBoolean(
com.android.internal.R.bool.config_enableTimeoutToUserZeroWhenDocked)).thenReturn(
com.android.internal.R.bool.config_enableTimeoutToDockUserWhenDocked)).thenReturn(
true);
// Multi-user feature enabled.
@@ -89,7 +89,7 @@ public class TimeoutToUserZeroPreferenceControllerTest {
@Test
public void getAvailabilityStatus_featureFlagDisabled_returnUnsupportedOnDevice() {
when(mResources.getBoolean(
com.android.internal.R.bool.config_enableTimeoutToUserZeroWhenDocked)).thenReturn(
com.android.internal.R.bool.config_enableTimeoutToDockUserWhenDocked)).thenReturn(
false);
assertThat(mController.getAvailabilityStatus()).isEqualTo(
@@ -121,7 +121,7 @@ public class TimeoutToUserZeroPreferenceControllerTest {
@Test
public void getSummary_settingNotSet() {
Settings.Secure.putStringForUser(mContext.getContentResolver(), TIMEOUT_TO_USER_ZERO,
Settings.Secure.putStringForUser(mContext.getContentResolver(), TIMEOUT_TO_DOCK_USER,
null, UserHandle.myUserId());
assertThat(mController.getSummary().toString()).isEqualTo(mEntries[0]);
@@ -129,7 +129,7 @@ public class TimeoutToUserZeroPreferenceControllerTest {
@Test
public void getSummary_setToNever() {
Settings.Secure.putStringForUser(mContext.getContentResolver(), TIMEOUT_TO_USER_ZERO,
Settings.Secure.putStringForUser(mContext.getContentResolver(), TIMEOUT_TO_DOCK_USER,
mValues[0], UserHandle.myUserId());
assertThat(mController.getSummary().toString()).isEqualTo(mEntries[0]);
@@ -137,7 +137,7 @@ public class TimeoutToUserZeroPreferenceControllerTest {
@Test
public void getSummary_setToOneMinute() {
Settings.Secure.putStringForUser(mContext.getContentResolver(), TIMEOUT_TO_USER_ZERO,
Settings.Secure.putStringForUser(mContext.getContentResolver(), TIMEOUT_TO_DOCK_USER,
mValues[1], UserHandle.myUserId());
assertThat(mController.getSummary().toString()).isEqualTo(mEntries[1]);

10
tests/robotests/src/com/android/settings/users/TimeoutToUserZeroSettingsTest.java → tests/robotests/src/com/android/settings/users/TimeoutToDockUserSettingsTest.java
View File

@@ -42,11 +42,11 @@ import java.util.List;
@RunWith(RobolectricTestRunner.class)
@Config(shadows = {ShadowFragment.class})
public class TimeoutToUserZeroSettingsTest {
public class TimeoutToDockUserSettingsTest {
@Mock
private FragmentActivity mActivity;
private TimeoutToUserZeroSettings mSettings;
private TimeoutToDockUserSettings mSettings;
private String[] mEntries;
private String[] mValues;
@@ -57,10 +57,10 @@ public class TimeoutToUserZeroSettingsTest {
final Context context = spy(ApplicationProvider.getApplicationContext());
mEntries = context.getResources().getStringArray(
R.array.switch_to_user_zero_when_docked_timeout_entries);
R.array.switch_to_dock_user_when_docked_timeout_entries);
mValues = context.getResources().getStringArray(
R.array.switch_to_user_zero_when_docked_timeout_values);
mSettings = spy(new TimeoutToUserZeroSettings());
R.array.switch_to_dock_user_when_docked_timeout_values);
mSettings = spy(new TimeoutToDockUserSettings());
doReturn(context).when(mSettings).getContext();
doReturn(mActivity).when(mSettings).getActivity();

10
tests/unit/src/com/android/settings/display/ScreenSaverPreferenceControllerTest.java
View File

@@ -60,7 +60,7 @@ public class ScreenSaverPreferenceControllerTest {
when(mResources.getBoolean(
com.android.internal.R.bool.config_dreamsSupported)).thenReturn(true);
when(mResources.getBoolean(
com.android.internal.R.bool.config_dreamsOnlyEnabledForSystemUser))
com.android.internal.R.bool.config_dreamsOnlyEnabledForDockUser))
.thenReturn(false);
when(mUserManager.isSystemUser()).thenReturn(true);
assertTrue(mController.isAvailable());
@@ -71,7 +71,7 @@ public class ScreenSaverPreferenceControllerTest {
when(mResources.getBoolean(
com.android.internal.R.bool.config_dreamsSupported)).thenReturn(true);
when(mResources.getBoolean(
com.android.internal.R.bool.config_dreamsOnlyEnabledForSystemUser))
com.android.internal.R.bool.config_dreamsOnlyEnabledForDockUser))
.thenReturn(false);
when(mUserManager.isSystemUser()).thenReturn(false);
assertTrue(mController.isAvailable());
@@ -82,7 +82,7 @@ public class ScreenSaverPreferenceControllerTest {
when(mResources.getBoolean(
com.android.internal.R.bool.config_dreamsSupported)).thenReturn(false);
when(mResources.getBoolean(
com.android.internal.R.bool.config_dreamsOnlyEnabledForSystemUser))
com.android.internal.R.bool.config_dreamsOnlyEnabledForDockUser))
.thenReturn(false);
when(mUserManager.isSystemUser()).thenReturn(true);
assertFalse(mController.isAvailable());
@@ -93,7 +93,7 @@ public class ScreenSaverPreferenceControllerTest {
when(mResources.getBoolean(
com.android.internal.R.bool.config_dreamsSupported)).thenReturn(true);
when(mResources.getBoolean(
com.android.internal.R.bool.config_dreamsOnlyEnabledForSystemUser))
com.android.internal.R.bool.config_dreamsOnlyEnabledForDockUser))
.thenReturn(true);
when(mUserManager.isSystemUser()).thenReturn(true);
assertTrue(mController.isAvailable());
@@ -104,7 +104,7 @@ public class ScreenSaverPreferenceControllerTest {
when(mResources.getBoolean(
com.android.internal.R.bool.config_dreamsSupported)).thenReturn(true);
when(mResources.getBoolean(
com.android.internal.R.bool.config_dreamsOnlyEnabledForSystemUser))
com.android.internal.R.bool.config_dreamsOnlyEnabledForDockUser))
.thenReturn(true);
when(mUserManager.isSystemUser()).thenReturn(false);
assertFalse(mController.isAvailable());