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

Move lockscreen bypass setting to Settings > Security > Face unlock

Browse Source 
Fixes: 134700640

Test: atest FaceSettingsLockscreenBypassPreferenceControllerTest
Test: enabling/disabling setting through Settings > Security > Face unlock
      works as expected
Test: preference controller no longer seen in Settings > Display > Lock screen display

Change-Id: I54807ad92fac62398a2b9dab93dd638775a09c8d
This commit is contained in:
Kevin Chyn
2019-06-12 11:55:22 -07:00
parent a854373bee
commit 6a4a0e7396
5 changed files with 15 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
tests/robotests/src/com/android/settings/security/LockscreenBypassPreferenceControllerTest.java → tests/robotests/src/com/android/settings/biometrics/face/FaceSettingsLockscreenBypassPreferenceControllerTest.java
View File

@@ -14,7 +14,7 @@
* limitations under the License
*/
package com.android.settings.security;
package com.android.settings.biometrics.face;
import static com.google.common.truth.Truth.assertThat;
@@ -36,14 +36,14 @@ import org.robolectric.RuntimeEnvironment;
import org.robolectric.util.ReflectionHelpers;
@RunWith(RobolectricTestRunner.class)
public class LockscreenBypassPreferenceControllerTest {
public class FaceSettingsLockscreenBypassPreferenceControllerTest {
@Mock
private FaceManager mFaceManager;
private SwitchPreference mPreference;
private Context mContext;
private LockscreenBypassPreferenceController mController;
private FaceSettingsLockscreenBypassPreferenceController mController;
@Before
public void setUp() {
@@ -51,7 +51,7 @@ public class LockscreenBypassPreferenceControllerTest {
mContext = RuntimeEnvironment.application;
mPreference = new SwitchPreference(mContext);
mController = new LockscreenBypassPreferenceController(mContext, "TestKey");
mController = new FaceSettingsLockscreenBypassPreferenceController(mContext, "TestKey");
ReflectionHelpers.setField(mController, "mFaceManager", mFaceManager);
}