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

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

Merge "Fix sticky battery saver toggle"

parents 88dd3128 cbd35ab0

src/com/android/settings/fuelgauge/batterysaver/BatterySaverStickyPreferenceController.java

+2 −2
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ public class BatterySaverStickyPreferenceController extends BasePreferenceContro 


    @Override

    public void updateState(Preference preference) {

        int setting = Settings.System.getInt(mContext.getContentResolver(),

        int setting = Settings.Global.getInt(mContext.getContentResolver(),

                LOW_POWER_STICKY_AUTO_DISABLE_ENABLED, 1);



        ((SwitchPreference) preference).setChecked(setting == 0);
@@ -28,7 +28,7 @@ public class BatterySaverStickyPreferenceController extends BasePreferenceContro 
    @Override

    public boolean onPreferenceChange(Preference preference, Object newValue) {

        boolean keepActive = (Boolean) newValue;

        Settings.System.putInt(mContext.getContentResolver(),

        Settings.Global.putInt(mContext.getContentResolver(),

                LOW_POWER_STICKY_AUTO_DISABLE_ENABLED,

                keepActive ? 0 : 1);

        return true;

tests/robotests/src/com/android/settings/fuelgauge/batterysaver/BatterySaverStickyPreferenceControllerTest.java

+1 −1
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ public class BatterySaverStickyPreferenceControllerTest { 
    }



    private int getAutoDisableSetting() {

        return Settings.System.getInt(mContext.getContentResolver(),

        return Settings.Global.getInt(mContext.getContentResolver(),

                LOW_POWER_STICKY_AUTO_DISABLE_ENABLED,

                1);

    }