Remove lockdown toggle (647b3ef0) · Commits · e / os / android_packages_apps_Settings

res/values/strings.xml

+0 −4

Original line number	Diff line number	Diff line
		@@ -646,10 +646,6 @@
		<string name="security_enable_widgets_title">Enable widgets</string>
		<!-- Summary for settings checkbox to disable widgets when the setting has been disabled by an installed device admin [CHAR LIMIT=50] -->
		<string name="security_enable_widgets_disabled_summary">Disabled by admin</string>
		<!-- Text shown for the title of the lockdown option -->
		<string name="lockdown_settings_title">Show lockdown option</string>
		<!-- Text shown for the description of the lockdown option -->
		<string name="lockdown_settings_summary">Display Power button option that turns off Smart Lock, Face Unlock, Fingerprint Unlock, and notifications on the lock screen</string>

		<!-- Text shown for the title of the lock when trust lost option [CHAR LIMIT=40] -->
		<string name="trust_lost_locks_screen_title">Lock screen when trust is lost</string>

res/xml/security_lockscreen_settings.xml

+0 −6

Original line number	Diff line number	Diff line
		@@ -45,12 +45,6 @@
		android:title="@string/owner_info_settings_title"
		android:summary="@string/owner_info_settings_summary" />

		<SwitchPreference
		android:key="security_setting_lockdown_enabled"
		android:title="@string/lockdown_settings_title"
		android:summary="@string/lockdown_settings_summary"
		settings:controller="com.android.settings.security.LockdownButtonPreferenceController" />

		<SwitchPreference
		android:key="lockscreen_privacy_wallet_switch"
		android:title="@string/lockscreen_privacy_wallet_setting_toggle"

res/xml/security_settings_combined_biometric.xml

+0 −6

Original line number	Diff line number	Diff line
		@@ -60,10 +60,4 @@

		</PreferenceCategory>

		<SwitchPreference
		android:key="biometric_setting_lockdown_enabled"
		android:title="@string/lockdown_settings_title"
		android:summary="@string/lockdown_settings_summary"
		settings:controller="com.android.settings.security.LockdownButtonPreferenceController" />

		</PreferenceScreen>
		No newline at end of file

src/com/android/settings/security/LockdownButtonPreferenceController.java

deleted100644 → 0

+0 −56

Original line number	Diff line number	Diff line
		/*
		* 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 com.android.internal.widget.LockPatternUtils;
		import com.android.settings.core.TogglePreferenceController;

		public class LockdownButtonPreferenceController extends TogglePreferenceController {

		private final LockPatternUtils mLockPatternUtils;

		public LockdownButtonPreferenceController(Context context, String key) {
		super(context, key);
		mLockPatternUtils = new LockPatternUtils(context);
		}

		@Override
		public int getAvailabilityStatus() {
		if (mLockPatternUtils.isSecure(UserHandle.myUserId())) {
		return AVAILABLE;
		} else {
		return 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;
		}
		}

tests/robotests/src/com/android/settings/security/LockdownButtonPreferenceControllerTest.java

deleted100644 → 0

+0 −94

Original line number	Diff line number	Diff line
		/*
		* 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.ArgumentMatchers.anyInt;
		import static org.mockito.Mockito.spy;
		import static org.mockito.Mockito.when;

		import android.content.Context;
		import android.provider.Settings;

		import androidx.preference.SwitchPreference;

		import com.android.internal.widget.LockPatternUtils;

		import org.junit.Before;
		import org.junit.Test;
		import org.junit.runner.RunWith;
		import org.mockito.Mock;
		import org.mockito.MockitoAnnotations;
		import org.robolectric.RobolectricTestRunner;
		import org.robolectric.RuntimeEnvironment;
		import org.robolectric.util.ReflectionHelpers;

		@RunWith(RobolectricTestRunner.class)
		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, "TestKey"));
		ReflectionHelpers.setField(mController, "mLockPatternUtils", mLockPatternUtils);
		}

		@Test
		public void isAvailable_lockSet_shouldReturnTrue() {
		when(mLockPatternUtils.isSecure(anyInt())).thenReturn(true);
		assertThat(mController.isAvailable()).isTrue();
		}

		@Test
		public void isAvailable_lockUnset_shouldReturnFalse() {
		when(mLockPatternUtils.isSecure(anyInt())).thenReturn(false);
		assertThat(mController.isAvailable()).isFalse();
		}

		@Test
		public void onPreferenceChange_settingIsUpdated() {
		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() {
		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);
		}
		}