diff --git a/res/values/strings.xml b/res/values/strings.xml index 74737ad05c7..4aefa7eec26 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -777,6 +777,10 @@ Enable widgets Disabled by admin + + Show lockdown option + + Display power button option that turns off extended access and fingerprint unlocking. None diff --git a/res/xml/security_lockscreen_settings.xml b/res/xml/security_lockscreen_settings.xml index 7a45bec59b0..6faedd72972 100644 --- a/res/xml/security_lockscreen_settings.xml +++ b/res/xml/security_lockscreen_settings.xml @@ -33,6 +33,11 @@ android:title="@string/owner_info_settings_title" android:summary="@string/owner_info_settings_summary" /> + + diff --git a/src/com/android/settings/security/LockdownButtonPreferenceController.java b/src/com/android/settings/security/LockdownButtonPreferenceController.java new file mode 100644 index 00000000000..89605020b39 --- /dev/null +++ b/src/com/android/settings/security/LockdownButtonPreferenceController.java @@ -0,0 +1,61 @@ +/* + * Copyright (C) 2018 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.security; + +import android.content.Context; +import android.os.UserHandle; +import android.provider.Settings; +import android.support.v7.preference.Preference; +import android.support.v7.preference.TwoStatePreference; + +import com.android.internal.widget.LockPatternUtils; +import com.android.settings.core.BasePreferenceController; +import com.android.settings.core.TogglePreferenceController; + +public class LockdownButtonPreferenceController extends TogglePreferenceController { + + private static final String KEY_LOCKDOWN_ENALBED = "security_setting_lockdown_enabled"; + + private final LockPatternUtils mLockPatternUtils; + + public LockdownButtonPreferenceController(Context context) { + super(context, KEY_LOCKDOWN_ENALBED); + mLockPatternUtils = new LockPatternUtils(context); + } + + @Override + public int getAvailabilityStatus() { + if (mLockPatternUtils.isSecure(UserHandle.myUserId())) { + return BasePreferenceController.AVAILABLE; + } else { + return BasePreferenceController.DISABLED_FOR_USER; + } + } + + @Override + public boolean isChecked() { + return Settings.Secure.getInt(mContext.getContentResolver(), + Settings.Secure.LOCKDOWN_IN_POWER_MENU, 0) != 0; + } + + @Override + public boolean setChecked(boolean isChecked) { + Settings.Secure.putInt(mContext.getContentResolver(), + Settings.Secure.LOCKDOWN_IN_POWER_MENU, isChecked ? 1 : 0); + return true; + } +} diff --git a/src/com/android/settings/security/LockscreenDashboardFragment.java b/src/com/android/settings/security/LockscreenDashboardFragment.java index df4ca30d995..7054181e431 100644 --- a/src/com/android/settings/security/LockscreenDashboardFragment.java +++ b/src/com/android/settings/security/LockscreenDashboardFragment.java @@ -93,6 +93,8 @@ public class LockscreenDashboardFragment extends DashboardFragment mOwnerInfoPreferenceController = new OwnerInfoPreferenceController(context, this, lifecycle); controllers.add(mOwnerInfoPreferenceController); + controllers.add(new LockdownButtonPreferenceController(context)); + return controllers; } @@ -122,6 +124,7 @@ public class LockscreenDashboardFragment extends DashboardFragment KEY_ADD_USER_FROM_LOCK_SCREEN)); controllers.add(new OwnerInfoPreferenceController( context, null /* fragment */, null /* lifecycle */)); + controllers.add(new LockdownButtonPreferenceController(context)); return controllers; } diff --git a/tests/robotests/src/com/android/settings/security/LockdownButtonPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/security/LockdownButtonPreferenceControllerTest.java new file mode 100644 index 00000000000..7738f863e62 --- /dev/null +++ b/tests/robotests/src/com/android/settings/security/LockdownButtonPreferenceControllerTest.java @@ -0,0 +1,98 @@ +/* + * Copyright (C) 2018 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.security; + +import static com.google.common.truth.Truth.assertThat; + +import static org.mockito.Matchers.any; +import static org.mockito.Matchers.anyInt; +import static org.mockito.Mockito.doReturn; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.spy; +import static org.mockito.Mockito.when; + +import android.content.Context; +import android.provider.Settings; +import android.support.v14.preference.SwitchPreference; + +import com.android.internal.widget.LockPatternUtils; +import com.android.settings.TestConfig; +import com.android.settings.testutils.SettingsRobolectricTestRunner; + +import org.junit.Before; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.mockito.Mock; +import org.mockito.MockitoAnnotations; +import org.robolectric.RuntimeEnvironment; +import org.robolectric.annotation.Config; +import org.robolectric.util.ReflectionHelpers; + +@RunWith(SettingsRobolectricTestRunner.class) +@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION) +public class LockdownButtonPreferenceControllerTest { + @Mock + private LockPatternUtils mLockPatternUtils; + private SwitchPreference mPreference; + + private Context mContext; + private LockdownButtonPreferenceController mController; + + @Before + public void setUp() { + MockitoAnnotations.initMocks(this); + mContext = RuntimeEnvironment.application; + mPreference = new SwitchPreference(mContext); + + mController = spy(new LockdownButtonPreferenceController(mContext)); + ReflectionHelpers.setField(mController, "mLockPatternUtils", mLockPatternUtils); + } + + @Test + public void isAvailable_lockSet_shouldReturnTrue() throws Exception { + when(mLockPatternUtils.isSecure(anyInt())).thenReturn(true); + assertThat(mController.isAvailable()).isTrue(); + } + + @Test + public void isAvailable_lockUnset_shouldReturnFalse() throws Exception { + when(mLockPatternUtils.isSecure(anyInt())).thenReturn(false); + assertThat(mController.isAvailable()).isFalse(); + } + + @Test + public void onPreferenceChange_settingIsUpdated() throws Exception { + boolean state = Settings.Secure.getInt(mContext.getContentResolver(), + Settings.Secure.LOCKDOWN_IN_POWER_MENU, 0) != 0; + assertThat(mController.onPreferenceChange(mPreference, !state)).isTrue(); + boolean newState = Settings.Secure.getInt(mContext.getContentResolver(), + Settings.Secure.LOCKDOWN_IN_POWER_MENU, 0) != 0; + assertThat(newState).isEqualTo(!state); + } + + @Test + public void onSettingChange_preferenceIsUpdated() throws Exception { + boolean state = Settings.Secure.getInt(mContext.getContentResolver(), + Settings.Secure.LOCKDOWN_IN_POWER_MENU, 0) != 0; + mController.updateState(mPreference); + assertThat(mPreference.isChecked()).isEqualTo(state); + Settings.Secure.putInt(mContext.getContentResolver(), + Settings.Secure.LOCKDOWN_IN_POWER_MENU, state ? 0 : 1); + + mController.updateState(mPreference); + assertThat(mPreference.isChecked()).isEqualTo(!state); + } +}