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

Switch auto time setting to use APIs

Browse Source 
Switch auto time setting to use TimeManager APIs instead of low-level
direct settings access.

This makes the AutoTimePreferenceController approach the same as
AutoTimeZonePreferenceController. Most of the logic about what to
display and whether toggles are enabled is moved to the service.

This change has the side effect of adding support in SettingsUI for
devices with no auto time detection mechanism configured at all, i.e.
the auto time toggle will stop being shown in SettingsUI. There are no
known devices that require this currently, but it is a theoretical
possibility if config.xml is configured in particular ways.

Bug: 172891783
Test: Manual testing with different settings for "time origin
priorities" (i.e. empty, non-empty)
Test: m ROBOTEST_FILTER=com.android.settings.datetime RunSettingsRoboTests -j40

Change-Id: I4112fb51adb0d06a1dbc39a44ea109d6df899153
This commit is contained in:
Neil Fuller
2022-05-30 15:43:17 +01:00
parent 25b832f061
commit 579a19a793
8 changed files with 244 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
tests/robotests/src/com/android/settings/datetime/TimePreferenceControllerTest.java
View File

@@ -41,7 +41,7 @@ public class TimePreferenceControllerTest {
@Mock
private TimePreferenceController.TimePreferenceHost mHost;
@Mock
private AutoTimePreferenceController mAutoTimePreferenceController;
private DatePreferenceController mDatePreferenceController;
private TimePreferenceController mController;
private RestrictedPreference mPreference;
@@ -50,7 +50,7 @@ public class TimePreferenceControllerTest {
public void setUp() {
MockitoAnnotations.initMocks(this);
mPreference = new RestrictedPreference(RuntimeEnvironment.application);
mController = new TimePreferenceController(mContext, mHost, mAutoTimePreferenceController);
mController = new TimePreferenceController(mContext, mHost, mDatePreferenceController);
}
@Test
@@ -59,22 +59,22 @@ public class TimePreferenceControllerTest {
}
@Test
public void updateState_autoTimeEnabled_shouldDisablePref() {
public void updateState_dateEntryDisabled_shouldDisablePref() {
// Make sure not disabled by admin.
mPreference.setDisabledByAdmin(null);
when(mAutoTimePreferenceController.isEnabled()).thenReturn(true);
when(mDatePreferenceController.isEnabled()).thenReturn(false);
mController.updateState(mPreference);
assertThat(mPreference.isEnabled()).isFalse();
}
@Test
public void updateState_autoTimeDisabled_shouldEnablePref() {
public void updateState_dateEntryEnabled_shouldEnablePref() {
// Make sure not disabled by admin.
mPreference.setDisabledByAdmin(null);
when(mAutoTimePreferenceController.isEnabled()).thenReturn(false);
when(mDatePreferenceController.isEnabled()).thenReturn(true);
mController.updateState(mPreference);
assertThat(mPreference.isEnabled()).isTrue();