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

Commit 33eb3bf5 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Remove the duplicated skip lock screen setting" into sc-dev am: b5b519dd 

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

Change-Id: I0feef8ebc111c93654cb621e78a59392028c2dae
parents b80251b7 b5b519dd

res/xml/security_settings_face.xml

+1 −1
Original line number Diff line number Diff line
@@ -63,7 +63,7 @@ 
            android:title="@string/lockscreen_bypass_title"

            android:summary="@string/lockscreen_bypass_summary"

            settings:keywords="@string/keywords_lockscreen_bypass"

            settings:controller="com.android.settings.biometrics.face.FaceSettingsLockscreenBypassPreferenceController" />

            settings:controller="com.android.settings.biometrics.face.BiometricLockscreenBypassPreferenceController" />

    </PreferenceCategory>



    <com.android.settingslib.widget.LayoutPreference

src/com/android/settings/biometrics/face/BiometricLockscreenBypassPreferenceController.java

0 → 100644
+41 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2021 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.biometrics.face;



import android.content.Context;



import com.android.settings.Utils;



/**

 * Preference controller that controls whether unlocking directly to home.

 */

public class BiometricLockscreenBypassPreferenceController extends

        FaceSettingsLockscreenBypassPreferenceController {

    public BiometricLockscreenBypassPreferenceController(Context context, String preferenceKey) {

        super(context, preferenceKey);

    }



    @Override

    public int getAvailabilityStatus() {

        // When the device supports multiple biometrics auth, this preference will be shown

        // in face unlock category.

        if (Utils.isMultipleBiometricsSupported(mContext)) {

            return AVAILABLE;

        }

        return UNSUPPORTED_ON_DEVICE;

    }

}

src/com/android/settings/biometrics/face/FaceSettingsLockscreenBypassPreferenceController.java

+2 −2
Original line number Diff line number Diff line
@@ -83,10 +83,10 @@ public class FaceSettingsLockscreenBypassPreferenceController 


    @Override

    public int getAvailabilityStatus() {

        // When the device supports multiple biometrics auth, this preference will be shown

        // When the device supports multiple biometrics auth, this preference won't be shown

        // in face unlock category.

        if (Utils.isMultipleBiometricsSupported(mContext)) {

            return AVAILABLE;

            return UNSUPPORTED_ON_DEVICE;

        }

        if (mUserManager.isManagedProfile(UserHandle.myUserId())) {

            return UNSUPPORTED_ON_DEVICE;

tests/robotests/src/com/android/settings/biometrics/face/BiometricLockscreenBypassPreferenceControllerTest.java

0 → 100644
+59 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2021 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.biometrics.face;



import static com.google.common.truth.Truth.assertThat;



import static org.mockito.Mockito.spy;



import android.content.Context;



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



import org.junit.After;

import org.junit.Before;

import org.junit.Test;

import org.junit.runner.RunWith;

import org.robolectric.RobolectricTestRunner;

import org.robolectric.RuntimeEnvironment;

import org.robolectric.annotation.Config;



@RunWith(RobolectricTestRunner.class)

@Config(shadows = {ShadowUtils.class})

public class BiometricLockscreenBypassPreferenceControllerTest {



    private Context mContext;

    private BiometricLockscreenBypassPreferenceController mController;



    @Before

    public void setUp() {

        mContext = spy(RuntimeEnvironment.application);

        mController = spy(new BiometricLockscreenBypassPreferenceController(mContext, "test_key"));

    }



    @After

    public void tearDown() {

        ShadowUtils.reset();

    }



    @Test

    public void isAvailable_multipleBiometricsSupported_shouldReturnAvailable() {

        ShadowUtils.setIsMultipleBiometricsSupported(true);



        assertThat(mController.isAvailable()).isTrue();

    }

}

tests/robotests/src/com/android/settings/biometrics/face/FaceSettingsLockscreenBypassPreferenceControllerTest.java

+15 −0
Original line number Diff line number Diff line
@@ -31,9 +31,11 @@ import android.hardware.face.FaceManager; 
import android.os.UserManager;

import android.provider.Settings;



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

import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;

import com.android.settingslib.RestrictedSwitchPreference;



import org.junit.After;

import org.junit.Before;

import org.junit.Test;

import org.junit.runner.RunWith;
@@ -41,9 +43,11 @@ import org.mockito.Mock; 
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 = {ShadowUtils.class})

public class FaceSettingsLockscreenBypassPreferenceControllerTest {



    @Mock
@@ -69,7 +73,11 @@ public class FaceSettingsLockscreenBypassPreferenceControllerTest { 
                "test_key"));

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

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

    }



    @After

    public void tearDown() {

        ShadowUtils.reset();

    }



    @Test
@@ -86,6 +94,13 @@ public class FaceSettingsLockscreenBypassPreferenceControllerTest { 
        assertThat(mController.isAvailable()).isFalse();

    }



    @Test

    public void isAvailable_multipleBiometricsSupported_shouldReturnUnsupported() {

        ShadowUtils.setIsMultipleBiometricsSupported(true);



        assertThat(mController.isAvailable()).isFalse();

    }



    @Test

    public void onPreferenceChange_settingIsUpdated() {

        boolean defaultValue = mContext.getResources().getBoolean(