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

Commit 5e4be733 authored by Stanley Wang's avatar Stanley Wang Committed by Android (Google) Code Review
Browse files

Merge "Fix the problem that voice search can not find the Use Battery Saver slice." into tm-dev

parents 7d26b627 21564efa

res/xml/battery_saver_settings.xml

+1 −0
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ 
    <com.android.settingslib.widget.MainSwitchPreference

        android:order="-100"

        android:key="battery_saver"

        android:title="@string/battery_saver_master_switch_title"

        settings:controller="com.android.settings.fuelgauge.batterysaver.BatterySaverButtonPreferenceController"/>



    <Preference

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

+0 −2
Original line number Diff line number Diff line
@@ -95,7 +95,6 @@ public class BatterySaverButtonPreferenceController extends 
    public void displayPreference(PreferenceScreen screen) {

        super.displayPreference(screen);

        mPreference = screen.findPreference(getPreferenceKey());

        mPreference.setTitle(mContext.getString(R.string.battery_saver_master_switch_title));

        mPreference.addOnSwitchChangeListener(this);

        mPreference.updateStatus(isChecked());

    }
@@ -113,7 +112,6 @@ public class BatterySaverButtonPreferenceController extends 
    @Override

    public boolean setChecked(boolean stateOn) {

        // This screen already shows a warning, so we don't need another warning.

        mPreference.updateStatus(isChecked());

        return BatterySaverUtils.setPowerSaveMode(mContext, stateOn,

                false /* needFirstTimeWarning */);

    }

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

+2 −2
Original line number Diff line number Diff line
@@ -75,7 +75,7 @@ public class BatterySaverButtonPreferenceControllerTest { 
    public void updateState_lowPowerOn_preferenceIsChecked() {

        when(mPowerManager.isPowerSaveMode()).thenReturn(true);



        mController.onSwitchChanged(null, mPowerManager.isPowerSaveMode());

        mPreference.updateStatus(mPowerManager.isPowerSaveMode());



        assertThat(mPreference.isChecked()).isTrue();

    }
@@ -84,7 +84,7 @@ public class BatterySaverButtonPreferenceControllerTest { 
    public void testUpdateState_lowPowerOff_preferenceIsUnchecked() {

        when(mPowerManager.isPowerSaveMode()).thenReturn(false);



        mController.onSwitchChanged(null, mPowerManager.isPowerSaveMode());

        mPreference.updateStatus(mPowerManager.isPowerSaveMode());



        assertThat(mPreference.isChecked()).isFalse();

    }