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

Merge "Hide timeout to user0 pref when switching blocked." into udc-dev am: 7242e7bb86 am: b3b0ec6811

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

Change-Id: Ic87f0a316ddf494b6b470153b5ba7dba5c52d4ad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Darrell Shi
2023-04-06 16:16:00 +00:00
committed by Automerger Merge Worker
parent 5feb03d1fb b3b0ec6811
commit ed05a003f2
2 changed files with 28 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/com/android/settings/users/TimeoutToDockUserPreferenceController.java
View File

@@ -20,6 +20,7 @@ import static android.provider.Settings.Secure.TIMEOUT_TO_DOCK_USER;
import android.content.Context;
import android.os.UserHandle;
import android.os.UserManager;
import android.provider.Settings;
import androidx.preference.PreferenceScreen;
@@ -34,6 +35,8 @@ import java.util.Arrays;
* automatically switch to the designated Dock User when the device is docked.
*/
public class TimeoutToDockUserPreferenceController extends BasePreferenceController {
private final UserManager mUserManager;
private final String[] mEntries;
private final String[] mValues;
@@ -41,6 +44,8 @@ public class TimeoutToDockUserPreferenceController extends BasePreferenceControl
String preferenceKey) {
super(context, preferenceKey);
mUserManager = context.getSystemService(UserManager.class);
mEntries = mContext.getResources().getStringArray(
com.android.settings.R.array.switch_to_dock_user_when_docked_timeout_entries);
mValues = mContext.getResources().getStringArray(
@@ -62,9 +67,10 @@ public class TimeoutToDockUserPreferenceController extends BasePreferenceControl
return UNSUPPORTED_ON_DEVICE;
}
// Multi-user feature disabled by user.
// Multi-user feature disabled by user, or user switching blocked on the user.
if (Settings.Global.getInt(mContext.getContentResolver(),
Settings.Global.USER_SWITCHER_ENABLED, 0) != 1) {
Settings.Global.USER_SWITCHER_ENABLED, 0) != 1
|| mUserManager.hasUserRestriction(UserManager.DISALLOW_USER_SWITCH)) {
return CONDITIONALLY_UNAVAILABLE;
}