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

Merge "Controls/Pay - Use new privacy setting" into sc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2021-05-18 23:55:18 +00:00
committed by Android (Google) Code Review
parent 074eee332a edd1918866
commit 4335268c81
4 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -33,7 +33,7 @@ import com.android.settings.overlay.FeatureFactory;
*/ */
public class ControlsPrivacyPreferenceController extends TogglePreferenceController { 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) { public ControlsPrivacyPreferenceController(Context context, String preferenceKey) {
super(context, preferenceKey); super(context, preferenceKey);

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

@@ -34,7 +34,7 @@ import com.android.settings.overlay.FeatureFactory;
*/ */
public class WalletPrivacyPreferenceController extends TogglePreferenceController { 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; private final QuickAccessWalletClient mClient;
public WalletPrivacyPreferenceController(Context context, String preferenceKey) { public WalletPrivacyPreferenceController(Context context, String preferenceKey) {

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

@@ -50,7 +50,7 @@ import org.robolectric.shadows.ShadowPackageManager;
public class ControlsPrivacyPreferenceControllerTest { public class ControlsPrivacyPreferenceControllerTest {
private static final String TEST_KEY = "test_key"; 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 Context mContext;
private ContentResolver mContentResolver; private ContentResolver mContentResolver;

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

@@ -48,7 +48,7 @@ import org.robolectric.RuntimeEnvironment;
public class WalletPrivacyPreferenceControllerTest { public class WalletPrivacyPreferenceControllerTest {
private static final String TEST_KEY = "test_key"; 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 Context mContext;
private ContentResolver mContentResolver; private ContentResolver mContentResolver;
@@ -110,7 +110,7 @@ public class WalletPrivacyPreferenceControllerTest {
} }
@Test @Test
public void setChecked_false_POWER_MENU_LOCKED_SHOW_CONTENTIs0() { public void setChecked_false_SettingIs0() {
mController.setChecked(false); mController.setChecked(false);
assertThat(Settings.Secure.getInt(mContentResolver, SETTING_KEY, 0)).isEqualTo(0); assertThat(Settings.Secure.getInt(mContentResolver, SETTING_KEY, 0)).isEqualTo(0);