From a13e30c11aa6fc7d329ae3305428fbcae13986ae Mon Sep 17 00:00:00 2001
From: Matt Pietal <mpietal@google.com>
Date: Fri, 7 May 2021 14:54:54 -0400
Subject: [PATCH] Controls/Wallet privacy settings

Addressing feedback from ag/14353975

Fixes: 185597511
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=com.android.settings.display
Change-Id: I4de5b7f94d4be44820b1fa463d97f4f098f64bff
---
 .../display/ControlsPrivacyPreferenceController.java  | 11 +++--------
 .../display/WalletPrivacyPreferenceController.java    |  8 ++------
 .../WalletPrivacyPreferenceControllerTest.java        |  2 +-
 3 files changed, 6 insertions(+), 15 deletions(-)

diff --git a/src/com/android/settings/display/ControlsPrivacyPreferenceController.java b/src/com/android/settings/display/ControlsPrivacyPreferenceController.java
index 6e97c9e500b..ea19db0dab7 100644
--- a/src/com/android/settings/display/ControlsPrivacyPreferenceController.java
+++ b/src/com/android/settings/display/ControlsPrivacyPreferenceController.java
@@ -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);
     }
 
diff --git a/src/com/android/settings/display/WalletPrivacyPreferenceController.java b/src/com/android/settings/display/WalletPrivacyPreferenceController.java
index beb86486eff..9a342ceda35 100644
--- a/src/com/android/settings/display/WalletPrivacyPreferenceController.java
+++ b/src/com/android/settings/display/WalletPrivacyPreferenceController.java
@@ -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);
     }
 
diff --git a/tests/robotests/src/com/android/settings/display/WalletPrivacyPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/display/WalletPrivacyPreferenceControllerTest.java
index a37f72f3644..034d06118c7 100644
--- a/tests/robotests/src/com/android/settings/display/WalletPrivacyPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/display/WalletPrivacyPreferenceControllerTest.java
@@ -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");
  * you may not use this file except in compliance with the License.