Controls/Pay - Use new privacy setting
Refer to the now centralized Secure setting, instead of local strings
Bug: 188175341
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=com.android.settings.display
Change-Id: I5fff84347c369ae94d6c8359cc49dcbcf9b6ee72
diff --git a/src/com/android/settings/display/ControlsPrivacyPreferenceController.java b/src/com/android/settings/display/ControlsPrivacyPreferenceController.java
index ea19db0..65fd846 100644
--- a/src/com/android/settings/display/ControlsPrivacyPreferenceController.java
+++ b/src/com/android/settings/display/ControlsPrivacyPreferenceController.java
@@ -33,7 +33,7 @@
*/
public class ControlsPrivacyPreferenceController extends TogglePreferenceController {
- private static final String SETTING_KEY = "lockscreen_show_controls";
+ private static final String SETTING_KEY = Settings.Secure.LOCKSCREEN_SHOW_CONTROLS;
public ControlsPrivacyPreferenceController(Context context, String preferenceKey) {
super(context, preferenceKey);
diff --git a/src/com/android/settings/display/WalletPrivacyPreferenceController.java b/src/com/android/settings/display/WalletPrivacyPreferenceController.java
index 9a342ce..2e78fe3 100644
--- a/src/com/android/settings/display/WalletPrivacyPreferenceController.java
+++ b/src/com/android/settings/display/WalletPrivacyPreferenceController.java
@@ -34,7 +34,7 @@
*/
public class WalletPrivacyPreferenceController extends TogglePreferenceController {
- private static final String SETTING_KEY = "lockscreen_show_wallet";
+ private static final String SETTING_KEY = Settings.Secure.LOCKSCREEN_SHOW_WALLET;
private final QuickAccessWalletClient mClient;
public WalletPrivacyPreferenceController(Context context, String preferenceKey) {
diff --git a/tests/robotests/src/com/android/settings/display/ControlsPrivacyPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/display/ControlsPrivacyPreferenceControllerTest.java
index 42ec3d5..447ed2b 100644
--- a/tests/robotests/src/com/android/settings/display/ControlsPrivacyPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/display/ControlsPrivacyPreferenceControllerTest.java
@@ -50,7 +50,7 @@
public class ControlsPrivacyPreferenceControllerTest {
private static final String TEST_KEY = "test_key";
- private static final String SETTING_KEY = "lockscreen_show_controls";
+ private static final String SETTING_KEY = Settings.Secure.LOCKSCREEN_SHOW_CONTROLS;
private Context mContext;
private ContentResolver mContentResolver;
diff --git a/tests/robotests/src/com/android/settings/display/WalletPrivacyPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/display/WalletPrivacyPreferenceControllerTest.java
index 034d061..73f4946 100644
--- a/tests/robotests/src/com/android/settings/display/WalletPrivacyPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/display/WalletPrivacyPreferenceControllerTest.java
@@ -48,7 +48,7 @@
public class WalletPrivacyPreferenceControllerTest {
private static final String TEST_KEY = "test_key";
- private static final String SETTING_KEY = "lockscreen_show_wallet";
+ private static final String SETTING_KEY = Settings.Secure.LOCKSCREEN_SHOW_WALLET;
private Context mContext;
private ContentResolver mContentResolver;
@@ -110,7 +110,7 @@
}
@Test
- public void setChecked_false_POWER_MENU_LOCKED_SHOW_CONTENTIs0() {
+ public void setChecked_false_SettingIs0() {
mController.setChecked(false);
assertThat(Settings.Secure.getInt(mContentResolver, SETTING_KEY, 0)).isEqualTo(0);
