Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4335268c authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

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

parents 074eee33 edd19188

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

+1 −1
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ import com.android.settings.overlay.FeatureFactory; 
 */

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);

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

+1 −1
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ import com.android.settings.overlay.FeatureFactory; 
 */

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) {

tests/robotests/src/com/android/settings/display/ControlsPrivacyPreferenceControllerTest.java

+1 −1
Original line number Diff line number Diff line
@@ -50,7 +50,7 @@ import org.robolectric.shadows.ShadowPackageManager; 
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;

tests/robotests/src/com/android/settings/display/WalletPrivacyPreferenceControllerTest.java

+2 −2
Original line number Diff line number Diff line
@@ -48,7 +48,7 @@ import org.robolectric.RuntimeEnvironment; 
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 @@ public class WalletPrivacyPreferenceControllerTest { 
    }



    @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);