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

Revert "Revert "Revert "Show "Add users from lock screen" dependent on secure lock screen."""

Browse Source 
This reverts commit fa92269759.

Reason for revert: b/152587665 - Toggle should always be visible

Bug: 152587665
Test: m RunSettingsRoboTests ROBOTEST_FILTER=AddUserWhenLockedPreferenceControllerTest
Change-Id: I93e58b36965387187b4d1ed03ca2f572728157b9
This commit is contained in:
Peter Kalauskas
2021-02-06 03:52:41 +00:00
parent 2eca234af7
commit c08f49cc3a
2 changed files with 0 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/com/android/settings/users/AddUserWhenLockedPreferenceController.java
View File

@@ -16,24 +16,20 @@
package com.android.settings.users;
import android.content.Context;
import android.os.UserHandle;
import android.provider.Settings;
import androidx.preference.Preference;
import com.android.internal.widget.LockPatternUtils;
import com.android.settings.core.TogglePreferenceController;
import com.android.settingslib.RestrictedSwitchPreference;
public class AddUserWhenLockedPreferenceController extends TogglePreferenceController {
private final UserCapabilities mUserCaps;
private final LockPatternUtils mLockPatternUtils;
public AddUserWhenLockedPreferenceController(Context context, String key) {
super(context, key);
mUserCaps = UserCapabilities.create(context);
mLockPatternUtils = new LockPatternUtils(context);
}
@Override
@@ -57,8 +53,6 @@ public class AddUserWhenLockedPreferenceController extends TogglePreferenceContr
return DISABLED_FOR_USER;
} else if (mUserCaps.disallowAddUser() || mUserCaps.disallowAddUserSetByAdmin()) {
return DISABLED_FOR_USER;
} else if (!mLockPatternUtils.isSecure(UserHandle.myUserId())) {
return CONDITIONALLY_UNAVAILABLE;
} else {
return mUserCaps.mUserSwitcherEnabled ? AVAILABLE : CONDITIONALLY_UNAVAILABLE;
}