Adds 'options disabled by admin' icon in timeout settings.

Bug:171257091
Test: atest ScreenTimeoutSettingsTest

Change-Id: Id0411b009a2d4dc0e4f6abf2825580ca42ad8442
This commit is contained in:
Yi Jiang
2020-12-03 15:08:29 -08:00
parent 2441bfc019
commit aed7559a59
2 changed files with 52 additions and 3 deletions

View File

@@ -22,6 +22,7 @@ import static androidx.test.core.app.ApplicationProvider.getApplicationContext;
import static com.google.common.truth.Truth.assertThat;
import static org.mockito.Mockito.atLeast;
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.never;
import static org.mockito.Mockito.spy;
@@ -34,9 +35,11 @@ import android.content.res.Resources;
import android.provider.SearchIndexableResource;
import android.provider.Settings;
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
import com.android.settings.R;
import com.android.settingslib.RestrictedLockUtils;
import org.junit.Before;
import org.junit.Test;
@@ -68,6 +71,9 @@ public class ScreenTimeoutSettingsTest {
@Mock
AdaptiveSleepPreferenceController mAdaptiveSleepPreferenceController;
@Mock
Preference mDisableOptionsPreference;
@Before
public void setup() {
MockitoAnnotations.initMocks(this);
@@ -127,6 +133,16 @@ public class ScreenTimeoutSettingsTest {
verify(mSettings.mAdaptiveSleepController, never()).addToScreen(mPreferenceScreen);
}
@Test
public void updateCandidates_enforcedAdmin_showDisabledByAdminPreference() {
mSettings.mAdmin = new RestrictedLockUtils.EnforcedAdmin();
mSettings.mDisableOptionsPreference = mDisableOptionsPreference;
mSettings.updateCandidates();
verify(mPreferenceScreen, atLeast(1)).addPreference(mDisableOptionsPreference);
}
@Test
public void setDefaultKey_controlCurrentScreenTimeout() {
mSettings.setDefaultKey(TIMEOUT_VALUES[0]);