Settings for timeout to user 0 when docked.
Test: atest SettingsRoboTests:TimeoutToUserZeroSettingsTest Test: atest SettingsRoboTests:TimeoutToUserZeroPreferenceControllerTest Test: manually on device, video: http://shortn/_elZS1CdDtE Bug: 213906356 Change-Id: I519345cdf44eaf452e092adee78ccf9d79130d33
This commit is contained in:
@@ -0,0 +1,87 @@
|
||||
/*
|
||||
* Copyright (C) 2022 The Android Open Source Project
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package com.android.settings.users;
|
||||
|
||||
import static android.provider.Settings.Secure.TIMEOUT_TO_USER_ZERO;
|
||||
|
||||
import android.content.Context;
|
||||
import android.os.UserHandle;
|
||||
import android.provider.Settings;
|
||||
|
||||
import androidx.preference.PreferenceScreen;
|
||||
|
||||
import com.android.settings.core.BasePreferenceController;
|
||||
|
||||
import java.util.Arrays;
|
||||
|
||||
/**
|
||||
* Controls the preference which launches a settings screen for user to configure whether to
|
||||
* automatically switch to the admin user when the device is docked.
|
||||
*/
|
||||
public class TimeoutToUserZeroPreferenceController extends BasePreferenceController {
|
||||
private final String[] mEntries;
|
||||
private final String[] mValues;
|
||||
|
||||
public TimeoutToUserZeroPreferenceController(Context context,
|
||||
String preferenceKey) {
|
||||
super(context, preferenceKey);
|
||||
|
||||
mEntries = mContext.getResources().getStringArray(
|
||||
com.android.settings.R.array.switch_to_user_zero_when_docked_timeout_entries);
|
||||
mValues = mContext.getResources().getStringArray(
|
||||
com.android.settings.R.array.switch_to_user_zero_when_docked_timeout_values);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void displayPreference(PreferenceScreen screen) {
|
||||
super.displayPreference(screen);
|
||||
|
||||
updateState(screen.findPreference(getPreferenceKey()));
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getAvailabilityStatus() {
|
||||
// Feature not available on device.
|
||||
if (!mContext.getResources().getBoolean(
|
||||
com.android.internal.R.bool.config_enableTimeoutToUserZeroWhenDocked)) {
|
||||
return UNSUPPORTED_ON_DEVICE;
|
||||
}
|
||||
|
||||
// Multi-user feature disabled by user.
|
||||
if (Settings.Global.getInt(mContext.getContentResolver(),
|
||||
Settings.Global.USER_SWITCHER_ENABLED, 0) != 1) {
|
||||
return CONDITIONALLY_UNAVAILABLE;
|
||||
}
|
||||
|
||||
// Is currently user zero. Only non user zero can have this setting.
|
||||
if (UserHandle.myUserId() == UserHandle.USER_SYSTEM) {
|
||||
return DISABLED_FOR_USER;
|
||||
}
|
||||
|
||||
return AVAILABLE;
|
||||
}
|
||||
|
||||
@Override
|
||||
public CharSequence getSummary() {
|
||||
final String key = Settings.Secure.getStringForUser(mContext.getContentResolver(),
|
||||
TIMEOUT_TO_USER_ZERO, UserHandle.myUserId());
|
||||
final int index = Arrays.asList(mValues).indexOf(key != null ? key :
|
||||
mValues[TimeoutToUserZeroSettings.DEFAULT_TIMEOUT_SETTING_VALUE_INDEX]);
|
||||
|
||||
return mEntries[index];
|
||||
}
|
||||
}
|
122
src/com/android/settings/users/TimeoutToUserZeroSettings.java
Normal file
122
src/com/android/settings/users/TimeoutToUserZeroSettings.java
Normal file
@@ -0,0 +1,122 @@
|
||||
/*
|
||||
* Copyright (C) 2022 The Android Open Source Project
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package com.android.settings.users;
|
||||
|
||||
import static android.provider.Settings.Secure.TIMEOUT_TO_USER_ZERO;
|
||||
|
||||
import android.app.settings.SettingsEnums;
|
||||
import android.content.Context;
|
||||
import android.graphics.drawable.Drawable;
|
||||
import android.os.UserHandle;
|
||||
import android.provider.Settings;
|
||||
|
||||
import com.android.settings.R;
|
||||
import com.android.settings.widget.RadioButtonPickerFragment;
|
||||
import com.android.settingslib.widget.CandidateInfo;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* Setting screen that lists options for users to configure whether to automatically switch to the
|
||||
* admin user when the device is docked, and if so duration of the timeout.
|
||||
*/
|
||||
public class TimeoutToUserZeroSettings 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;
|
||||
|
||||
// Labels of the options, for example, "never", "after 5 minutes".
|
||||
private String[] mEntries;
|
||||
|
||||
// Values and keys of the options.
|
||||
private String[] mValues;
|
||||
|
||||
@Override
|
||||
public int getMetricsCategory() {
|
||||
return SettingsEnums.TIMEOUT_TO_USER_ZERO;
|
||||
}
|
||||
|
||||
@Override
|
||||
protected int getPreferenceScreenResId() {
|
||||
return R.xml.user_timeout_to_user_zero_settings;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onAttach(Context context) {
|
||||
super.onAttach(context);
|
||||
|
||||
mEntries = getContext().getResources().getStringArray(
|
||||
R.array.switch_to_user_zero_when_docked_timeout_entries);
|
||||
mValues = getContext().getResources().getStringArray(
|
||||
R.array.switch_to_user_zero_when_docked_timeout_values);
|
||||
}
|
||||
|
||||
@Override
|
||||
protected List<? extends CandidateInfo> getCandidates() {
|
||||
final List<CandidateInfo> candidates = new ArrayList<>();
|
||||
|
||||
if (mEntries == null || mValues == null) {
|
||||
return candidates;
|
||||
}
|
||||
|
||||
for (int i = 0; i < mValues.length; i++) {
|
||||
candidates.add(new TimeoutCandidateInfo(mEntries[i], mValues[i], true));
|
||||
}
|
||||
|
||||
return candidates;
|
||||
}
|
||||
|
||||
@Override
|
||||
protected String getDefaultKey() {
|
||||
final String defaultKey = Settings.Secure.getStringForUser(
|
||||
getContext().getContentResolver(), TIMEOUT_TO_USER_ZERO, UserHandle.myUserId());
|
||||
return defaultKey != null ? defaultKey : mValues[DEFAULT_TIMEOUT_SETTING_VALUE_INDEX];
|
||||
}
|
||||
|
||||
@Override
|
||||
protected boolean setDefaultKey(String key) {
|
||||
Settings.Secure.putStringForUser(getContext().getContentResolver(), TIMEOUT_TO_USER_ZERO,
|
||||
key, UserHandle.myUserId());
|
||||
return true;
|
||||
}
|
||||
|
||||
private static class TimeoutCandidateInfo extends CandidateInfo {
|
||||
private final CharSequence mLabel;
|
||||
private final String mKey;
|
||||
|
||||
TimeoutCandidateInfo(CharSequence label, String key, boolean enabled) {
|
||||
super(enabled);
|
||||
mLabel = label;
|
||||
mKey = key;
|
||||
}
|
||||
|
||||
@Override
|
||||
public CharSequence loadLabel() {
|
||||
return mLabel;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Drawable loadIcon() {
|
||||
return null;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getKey() {
|
||||
return mKey;
|
||||
}
|
||||
}
|
||||
}
|
@@ -118,6 +118,7 @@ public class UserSettings extends SettingsPreferenceFragment
|
||||
private static final String KEY_ADD_SUPERVISED_USER = "supervised_user_add";
|
||||
private static final String KEY_ADD_USER_WHEN_LOCKED = "user_settings_add_users_when_locked";
|
||||
private static final String KEY_MULTIUSER_TOP_INTRO = "multiuser_top_intro";
|
||||
private static final String KEY_TIMEOUT_TO_USER_ZERO = "timeout_to_user_zero_preference";
|
||||
|
||||
private static final int MENU_REMOVE_USER = Menu.FIRST;
|
||||
|
||||
@@ -185,6 +186,7 @@ public class UserSettings extends SettingsPreferenceFragment
|
||||
new EditUserInfoController(Utils.FILE_PROVIDER_AUTHORITY);
|
||||
private AddUserWhenLockedPreferenceController mAddUserWhenLockedPreferenceController;
|
||||
private MultiUserTopIntroPreferenceController mMultiUserTopIntroPreferenceController;
|
||||
private TimeoutToUserZeroPreferenceController mTimeoutToUserZeroPreferenceController;
|
||||
private UserCreatingDialog mUserCreatingDialog;
|
||||
private final AtomicBoolean mGuestCreationScheduled = new AtomicBoolean();
|
||||
private final ExecutorService mExecutor = Executors.newSingleThreadExecutor();
|
||||
@@ -264,9 +266,13 @@ public class UserSettings extends SettingsPreferenceFragment
|
||||
mMultiUserTopIntroPreferenceController = new MultiUserTopIntroPreferenceController(activity,
|
||||
KEY_MULTIUSER_TOP_INTRO);
|
||||
|
||||
mTimeoutToUserZeroPreferenceController = new TimeoutToUserZeroPreferenceController(activity,
|
||||
KEY_TIMEOUT_TO_USER_ZERO);
|
||||
|
||||
final PreferenceScreen screen = getPreferenceScreen();
|
||||
mAddUserWhenLockedPreferenceController.displayPreference(screen);
|
||||
mMultiUserTopIntroPreferenceController.displayPreference(screen);
|
||||
mTimeoutToUserZeroPreferenceController.displayPreference(screen);
|
||||
|
||||
screen.findPreference(mAddUserWhenLockedPreferenceController.getPreferenceKey())
|
||||
.setOnPreferenceChangeListener(mAddUserWhenLockedPreferenceController);
|
||||
@@ -327,6 +333,8 @@ public class UserSettings extends SettingsPreferenceFragment
|
||||
|
||||
mAddUserWhenLockedPreferenceController.updateState(screen.findPreference(
|
||||
mAddUserWhenLockedPreferenceController.getPreferenceKey()));
|
||||
mTimeoutToUserZeroPreferenceController.updateState(screen.findPreference(
|
||||
mTimeoutToUserZeroPreferenceController.getPreferenceKey()));
|
||||
|
||||
if (mShouldUpdateUserList) {
|
||||
updateUI();
|
||||
|
Reference in New Issue
Block a user