Merge "Controls/Wallet privacy settings" into sc-dev (67fd37c8) · Commits · e / os / android_packages_apps_Settings

src/com/android/settings/display/ControlsPrivacyPreferenceController.java

+3 −8

Original line number	Diff line number	Diff line
		@@ -52,13 +52,8 @@ public class ControlsPrivacyPreferenceController extends TogglePreferenceControl

		@Override
		public CharSequence getSummary() {
		boolean controlsAvailable = isControlsAvailable();
		final int res;
		if (!isSecure()) {
		res = R.string.lockscreen_privacy_not_secure;
		} else {
		res = R.string.lockscreen_privacy_controls_summary;
		}
		final int res = isSecure() ? R.string.lockscreen_privacy_controls_summary :
		R.string.lockscreen_privacy_not_secure;
		return mContext.getText(res);
		}

		@@ -83,7 +78,7 @@ public class ControlsPrivacyPreferenceController extends TogglePreferenceControl
		final LockPatternUtils utils = FeatureFactory.getFactory(mContext)
		.getSecurityFeatureProvider()
		.getLockPatternUtils(mContext);
		int userId = UserHandle.myUserId();
		final int userId = UserHandle.myUserId();
		return utils.isSecure(userId);
		}

+2 −6

Original line number	Diff line number	Diff line
		@@ -55,12 +55,8 @@ public class WalletPrivacyPreferenceController extends TogglePreferenceControlle

		@Override
		public CharSequence getSummary() {
		final int res;
		if (!isSecure()) {
		res = R.string.lockscreen_privacy_not_secure;
		} else {
		res = R.string.lockscreen_privacy_wallet_summary;
		}
		final int res = isSecure() ? R.string.lockscreen_privacy_wallet_summary :
		R.string.lockscreen_privacy_not_secure;
		return mContext.getText(res);
		}

+1 −1

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2020 The Android Open Source Project
		* 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.