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

Merge "Default to timing out to dock user in 1 minute" into tm-qpr-dev am: 0be191aeb7

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20683709

Change-Id: I46a4c6300b2deb004417a78faaab25f10fd9ee50
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
William Xiao
2022-12-15 20:46:32 +00:00
committed by Automerger Merge Worker
parent de8a27b496 0be191aeb7
commit 26343e8926
3 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/com/android/settings/users/TimeoutToDockUserSettings.java
View File

@@ -37,7 +37,8 @@ import java.util.List;
*/
public class TimeoutToDockUserSettings extends RadioButtonPickerFragment {
// Index of the default key of the timeout setting if it hasn't been changed by the user.
public static final int DEFAULT_TIMEOUT_SETTING_VALUE_INDEX = 0;
// Default to the smallest non-zero option (which is currently 1 minute).
public static final int DEFAULT_TIMEOUT_SETTING_VALUE_INDEX = 1;
// Labels of the options, for example, "never", "after 5 minutes".
private String[] mEntries;

3
tests/robotests/src/com/android/settings/users/TimeoutToDockUserPreferenceControllerTest.java
View File

@@ -124,7 +124,8 @@ public class TimeoutToDockUserPreferenceControllerTest {
Settings.Secure.putStringForUser(mContext.getContentResolver(), TIMEOUT_TO_DOCK_USER,
null, UserHandle.myUserId());
assertThat(mController.getSummary().toString()).isEqualTo(mEntries[0]);
assertThat(mController.getSummary().toString()).isEqualTo(
mEntries[TimeoutToDockUserSettings.DEFAULT_TIMEOUT_SETTING_VALUE_INDEX]);
}
@Test

12
tests/robotests/src/com/android/settings/users/TimeoutToDockUserSettingsTest.java
View File

@@ -78,8 +78,9 @@ public class TimeoutToDockUserSettingsTest {
}
@Test
public void defaultKey_settingNotSet_shouldReturnFirstValueAsDefault() {
assertThat(mSettings.getDefaultKey()).isEqualTo(mValues[0]);
public void defaultKey_settingNotSet_shouldReturnSecondValueAsDefault() {
assertThat(mSettings.getDefaultKey()).isEqualTo(
mValues[TimeoutToDockUserSettings.DEFAULT_TIMEOUT_SETTING_VALUE_INDEX]);
}
@Test
@@ -95,4 +96,11 @@ public class TimeoutToDockUserSettingsTest {
mSettings.setDefaultKey(expectedKey);
assertThat(mSettings.getDefaultKey()).isEqualTo(expectedKey);
}
@Test
public void defaultKey_setToThirdValue_shouldSaveToSettings() {
final String expectedKey = mValues[2];
mSettings.setDefaultKey(expectedKey);
assertThat(mSettings.getDefaultKey()).isEqualTo(expectedKey);
}
}