Merge "Remove Smart Lock developer options" (14f1fc0e) · Commits · e / os / android_packages_apps_Settings

res/values/strings.xml

+0 −5

Original line number	Diff line number	Diff line
		@@ -810,11 +810,6 @@
		<!-- Text shown for the description of the lockdown option -->
		<string name="lockdown_settings_summary">Display power button option that turns off Smart Lock, fingerprint unlocking, and notifications on the lock screen</string>

		<!-- Text shown for the title of the extend unlock mode option for trust agents [CHAR LIMIT=40] -->
		<string name="trust_agents_extend_unlock_title">Trust agents only extend unlock</string>
		<!-- Text shown for the description of the extend unlock mode option [CHAR LIMIT=NONE] -->
		<string name="trust_agents_extend_unlock_summary">If enabled, trust agents will keep your device unlocked for longer, but can no longer unlock a locked device.</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>
		<!-- Text shown for the description of the lock when trust lost option [CHAR LIMIT=NONE -->

res/xml/development_settings.xml

+0 −11

Original line number	Diff line number	Diff line
		@@ -119,17 +119,6 @@
		android:title="@string/quick_settings_developer_tiles"
		android:fragment="com.android.settings.development.qstile.DevelopmentTileConfigFragment"
		settings:searchable="false" />

		<!-- Configure trust agent behavior -->
		<SwitchPreference
		android:key="security_setting_trust_agents_extend_unlock"
		android:title="@string/trust_agents_extend_unlock_title"
		android:summary="@string/trust_agents_extend_unlock_summary" />

		<SwitchPreference
		android:key="security_setting_trust_lost_locks_screen"
		android:title="@string/trust_lost_locks_screen_title"
		android:summary="@string/trust_lost_locks_screen_summary" />
		</PreferenceCategory>

		<PreferenceCategory

src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java

+0 −2

Original line number	Diff line number	Diff line
		@@ -510,8 +510,6 @@ public class DevelopmentSettingsDashboardFragment extends RestrictedDashboardFra
		controllers.add(new DefaultLaunchPreferenceController(context, "inactive_apps"));
		controllers.add(new AutofillLoggingLevelPreferenceController(context, lifecycle));
		controllers.add(new AutofillResetOptionsPreferenceController(context));
		controllers.add(new TrustAgentsExtendUnlockPreferenceController(context));
		controllers.add(new TrustLostLocksScreenPreferenceController(context));
		return controllers;
		}

src/com/android/settings/development/TrustAgentsExtendUnlockPreferenceController.java

deleted100644 → 0

+0 −58

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.development;

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

		import androidx.preference.Preference;
		import androidx.preference.SwitchPreference;

		import com.android.settings.core.PreferenceControllerMixin;
		import com.android.settingslib.development.DeveloperOptionsPreferenceController;

		public class TrustAgentsExtendUnlockPreferenceController extends
		DeveloperOptionsPreferenceController implements
		Preference.OnPreferenceChangeListener, PreferenceControllerMixin {

		private static final String KEY_TRUST_AGENTS_EXTEND_UNLOCK =
		"security_setting_trust_agents_extend_unlock";

		public TrustAgentsExtendUnlockPreferenceController(Context context) {
		super(context);
		}

		@Override
		public String getPreferenceKey() {
		return KEY_TRUST_AGENTS_EXTEND_UNLOCK;
		}

		@Override
		public boolean onPreferenceChange(Preference preference, Object newValue) {
		final boolean isEnabled = (Boolean) newValue;
		Settings.Secure.putInt(mContext.getContentResolver(),
		Settings.Secure.TRUST_AGENTS_EXTEND_UNLOCK, isEnabled ? 1 : 0);
		return true;
		}

		@Override
		public void updateState(Preference preference) {
		int trustAgentsExtendUnlock = Settings.Secure.getInt(mContext.getContentResolver(),
		Settings.Secure.TRUST_AGENTS_EXTEND_UNLOCK, 0);
		((SwitchPreference) mPreference).setChecked(trustAgentsExtendUnlock != 0);
		}
		}

src/com/android/settings/development/TrustLostLocksScreenPreferenceController.java

deleted100644 → 0

+0 −58

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.development;

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

		import androidx.preference.Preference;
		import androidx.preference.SwitchPreference;

		import com.android.settings.core.PreferenceControllerMixin;
		import com.android.settingslib.development.DeveloperOptionsPreferenceController;

		public class TrustLostLocksScreenPreferenceController
		extends DeveloperOptionsPreferenceController implements
		Preference.OnPreferenceChangeListener, PreferenceControllerMixin {

		private static final String KEY_TRUST_LOST_LOCKS_SCREEN =
		"security_setting_trust_lost_locks_screen";

		public TrustLostLocksScreenPreferenceController(Context context) {
		super(context);
		}

		@Override
		public String getPreferenceKey() {
		return KEY_TRUST_LOST_LOCKS_SCREEN;
		}

		@Override
		public boolean onPreferenceChange(Preference preference, Object newValue) {
		final boolean isEnabled = (Boolean) newValue;
		Settings.Secure.putInt(mContext.getContentResolver(),
		Settings.Secure.LOCK_SCREEN_WHEN_TRUST_LOST, isEnabled ? 1 : 0);
		return true;
		}

		@Override
		public void updateState(Preference preference) {
		int lockOnTrustLost = Settings.Secure.getInt(mContext.getContentResolver(),
		Settings.Secure.LOCK_SCREEN_WHEN_TRUST_LOST, 0);
		((SwitchPreference) mPreference).setChecked(lockOnTrustLost != 0);
		}
		}