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

Commit 2b9f139a authored by Peter Kalauskas's avatar Peter Kalauskas Committed by Android (Google) Code Review
Browse files

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

Merge "Revert "Revert "Revert "Show "Add users from lock screen" dependent on secure lock screen."""" into sc-dev
parents 7fb3323b c08f49cc

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

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

        }

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

+0 −47
Original line number Diff line number Diff line
@@ -18,7 +18,6 @@ package com.android.settings.users; 
import static com.google.common.truth.Truth.assertThat;



import static org.mockito.Answers.RETURNS_DEEP_STUBS;

import static org.mockito.ArgumentMatchers.anyInt;

import static org.mockito.Mockito.mock;

import static org.mockito.Mockito.verify;

import static org.mockito.Mockito.when;
@@ -28,8 +27,6 @@ import android.provider.Settings.Global; 


import androidx.preference.PreferenceScreen;



import com.android.internal.widget.LockPatternUtils;

import com.android.settings.core.BasePreferenceController;

import com.android.settings.testutils.shadow.ShadowUserManager;

import com.android.settingslib.RestrictedSwitchPreference;
@@ -42,7 +39,6 @@ import org.mockito.MockitoAnnotations; 
import org.robolectric.RobolectricTestRunner;

import org.robolectric.RuntimeEnvironment;

import org.robolectric.annotation.Config;

import org.robolectric.util.ReflectionHelpers;



@RunWith(RobolectricTestRunner.class)

@Config(shadows = {ShadowUserManager.class})
@@ -55,16 +51,13 @@ public class AddUserWhenLockedPreferenceControllerTest { 
    private Context mContext;

    private ShadowUserManager mUserManager;

    private AddUserWhenLockedPreferenceController mController;

    private LockPatternUtils mLockPatternUtils;



    @Before

    public void setUp() {

        MockitoAnnotations.initMocks(this);

        mContext = RuntimeEnvironment.application;

        mLockPatternUtils = mock(LockPatternUtils.class);

        mUserManager = ShadowUserManager.getShadow();

        mController = new AddUserWhenLockedPreferenceController(mContext, "fake_key");

        ReflectionHelpers.setField(mController, "mLockPatternUtils", mLockPatternUtils);

        mUserManager.setSupportsMultipleUsers(true);

    }
@@ -76,7 +69,6 @@ public class AddUserWhenLockedPreferenceControllerTest { 
    @Test

    public void displayPref_NotAdmin_shouldNotDisplay() {

        mUserManager.setIsAdminUser(false);

        when(mLockPatternUtils.isSecure(anyInt())).thenReturn(true);

        final RestrictedSwitchPreference preference = mock(RestrictedSwitchPreference.class);

        when(preference.getKey()).thenReturn(mController.getPreferenceKey());

        when(mScreen.findPreference(preference.getKey())).thenReturn(preference);
@@ -89,7 +81,6 @@ public class AddUserWhenLockedPreferenceControllerTest { 
    @Test

    public void updateState_NotAdmin_shouldNotDisplayPreference() {

        mUserManager.setIsAdminUser(false);

        when(mLockPatternUtils.isSecure(anyInt())).thenReturn(true);

        final RestrictedSwitchPreference preference = mock(RestrictedSwitchPreference.class);



        mController.updateState(preference);
@@ -102,10 +93,8 @@ public class AddUserWhenLockedPreferenceControllerTest { 
        mUserManager.setIsAdminUser(true);

        mUserManager.setUserSwitcherEnabled(true);

        mUserManager.setSupportsMultipleUsers(true);

        when(mLockPatternUtils.isSecure(anyInt())).thenReturn(true);

        final AddUserWhenLockedPreferenceController controller =

                new AddUserWhenLockedPreferenceController(mContext, "fake_key");

        ReflectionHelpers.setField(controller, "mLockPatternUtils", mLockPatternUtils);

        final RestrictedSwitchPreference preference = mock(RestrictedSwitchPreference.class);



        controller.updateState(preference);
@@ -154,40 +143,4 @@ public class AddUserWhenLockedPreferenceControllerTest { 
        assertThat(Global.getInt(mContext.getContentResolver(), Global.ADD_USERS_WHEN_LOCKED, 0))

                .isEqualTo(0);

    }



    @Test

    public void updateState_insecureLockScreen_shouldNotDisplayPreference() {

        mUserManager.setIsAdminUser(true);

        mUserManager.setUserSwitcherEnabled(true);

        mUserManager.setSupportsMultipleUsers(true);

        when(mLockPatternUtils.isSecure(anyInt())).thenReturn(false);

        final AddUserWhenLockedPreferenceController controller =

                new AddUserWhenLockedPreferenceController(mContext, "fake_key");

        ReflectionHelpers.setField(controller, "mLockPatternUtils", mLockPatternUtils);

        final RestrictedSwitchPreference preference = mock(RestrictedSwitchPreference.class);



        controller.updateState(preference);



        verify(preference).setVisible(false);

        assertThat(controller.getAvailabilityStatus()).isEqualTo(

                BasePreferenceController.CONDITIONALLY_UNAVAILABLE);

    }



    @Test

    public void updateState_secureLockScreen_shouldDisplayPreference() {

        mUserManager.setIsAdminUser(true);

        mUserManager.setUserSwitcherEnabled(true);

        mUserManager.setSupportsMultipleUsers(true);

        when(mLockPatternUtils.isSecure(anyInt())).thenReturn(true);

        final AddUserWhenLockedPreferenceController controller =

                new AddUserWhenLockedPreferenceController(mContext, "fake_key");

        ReflectionHelpers.setField(controller, "mLockPatternUtils", mLockPatternUtils);

        final RestrictedSwitchPreference preference = mock(RestrictedSwitchPreference.class);



        controller.updateState(preference);



        verify(preference).setVisible(true);

        assertThat(controller.getAvailabilityStatus()).isEqualTo(

                BasePreferenceController.AVAILABLE);

    }

}