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

Merge "Controls/Wallet privacy settings" into sc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2021-05-08 02:46:54 +00:00
committed by Android (Google) Code Review
parent e49a0d1b4e a13e30c11a
commit 67fd37c837
3 changed files with 6 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/com/android/settings/display/ControlsPrivacyPreferenceController.java
View File

@@ -52,13 +52,8 @@ public class ControlsPrivacyPreferenceController extends TogglePreferenceControl
@Override @Override
public CharSequence getSummary() { public CharSequence getSummary() {
boolean controlsAvailable = isControlsAvailable(); final int res = isSecure() ? R.string.lockscreen_privacy_controls_summary :
final int res; R.string.lockscreen_privacy_not_secure;
if (!isSecure()) {
res = R.string.lockscreen_privacy_not_secure;
} else {
res = R.string.lockscreen_privacy_controls_summary;
}
return mContext.getText(res); return mContext.getText(res);
} }
@@ -83,7 +78,7 @@ public class ControlsPrivacyPreferenceController extends TogglePreferenceControl
final LockPatternUtils utils = FeatureFactory.getFactory(mContext) final LockPatternUtils utils = FeatureFactory.getFactory(mContext)
.getSecurityFeatureProvider() .getSecurityFeatureProvider()
.getLockPatternUtils(mContext); .getLockPatternUtils(mContext);
int userId = UserHandle.myUserId(); final int userId = UserHandle.myUserId();
return utils.isSecure(userId); return utils.isSecure(userId);
} }

8
src/com/android/settings/display/WalletPrivacyPreferenceController.java
View File

@@ -55,12 +55,8 @@ public class WalletPrivacyPreferenceController extends TogglePreferenceControlle
@Override @Override
public CharSequence getSummary() { public CharSequence getSummary() {
final int res; final int res = isSecure() ? R.string.lockscreen_privacy_wallet_summary :
if (!isSecure()) { R.string.lockscreen_privacy_not_secure;
res = R.string.lockscreen_privacy_not_secure;
} else {
res = R.string.lockscreen_privacy_wallet_summary;
}
return mContext.getText(res); return mContext.getText(res);
} }

2
tests/robotests/src/com/android/settings/display/WalletPrivacyPreferenceControllerTest.java
View File

@@ -1,5 +1,5 @@
/* /*
* 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"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.