Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 71ee3c3a authored by William Xiao's avatar William Xiao Committed by Automerger Merge Worker
Browse files

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

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

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



Change-Id: I63dedfa49ec3d7c64c156d6a5da33772abfcc4b5
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 5db22756 26343e89

src/com/android/settings/users/TimeoutToDockUserSettings.java

+2 −1
Original line number Diff line number Diff line
@@ -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;

tests/robotests/src/com/android/settings/users/TimeoutToDockUserPreferenceControllerTest.java

+2 −1
Original line number Diff line number Diff line
@@ -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

tests/robotests/src/com/android/settings/users/TimeoutToDockUserSettingsTest.java

+10 −2
Original line number Diff line number Diff line
@@ -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);

    }

}