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

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

Change-Id: I63dedfa49ec3d7c64c156d6a5da33772abfcc4b5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
William Xiao
2022-12-16 00:04:15 +00:00
committed by Automerger Merge Worker
3 changed files with 14 additions and 4 deletions

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;