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

Commit b26d99ac authored by Wesley Wang's avatar Wesley Wang
Browse files

Update battery saver schedule min trigger value 

 - Udpate the min value to 10%, also change related preference summary
   and seekbar value
 - Make battery saver main page's switch support first time trigger
   warning

Bug: 207470943
Test: make RunSettingsRoboTests
Change-Id: I120b9a6784ed90eacccb09bb11f079f12679e95c
parent 7cde68c7

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

+1 −2
Original line number Diff line number Diff line
@@ -111,9 +111,8 @@ public class BatterySaverButtonPreferenceController extends 


    @Override

    public boolean setChecked(boolean stateOn) {

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

        return BatterySaverUtils.setPowerSaveMode(mContext, stateOn,

                false /* needFirstTimeWarning */);

                true /* needFirstTimeWarning */);

    }



    @Override

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

+1 −1
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ public class BatterySaverScheduleRadioButtonsController { 
    public static final String KEY_NO_SCHEDULE = "key_battery_saver_no_schedule";

    public static final String KEY_ROUTINE = "key_battery_saver_routine";

    public static final String KEY_PERCENTAGE = "key_battery_saver_percentage";

    public static final int TRIGGER_LEVEL_MIN = 5;

    public static final int TRIGGER_LEVEL_MIN = 10;



    private Context mContext;

    private BatterySaverScheduleSeekBarController mSeekBarController;

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

+1 −1
Original line number Diff line number Diff line
@@ -45,7 +45,7 @@ public class BatterySaverScheduleSeekBarController implements 
        OnPreferenceChangeListener {



    public static final int MAX_SEEKBAR_VALUE = 15;

    public static final int MIN_SEEKBAR_VALUE = 1;

    public static final int MIN_SEEKBAR_VALUE = 2;

    public static final String KEY_BATTERY_SAVER_SEEK_BAR = "battery_saver_seek_bar";



    @VisibleForTesting

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

+7 −2
Original line number Diff line number Diff line
@@ -18,13 +18,17 @@ package com.android.settings.fuelgauge.batterysaver; 


import static com.google.common.truth.Truth.assertThat;



import static org.mockito.ArgumentMatchers.any;

import static org.mockito.ArgumentMatchers.anyBoolean;

import static org.mockito.ArgumentMatchers.anyString;

import static org.mockito.Mockito.doReturn;

import static org.mockito.Mockito.never;

import static org.mockito.Mockito.spy;

import static org.mockito.Mockito.verify;

import static org.mockito.Mockito.when;



import android.content.Context;

import android.content.Intent;

import android.os.PowerManager;

import android.provider.SettingsSlicesContract;
@@ -90,10 +94,11 @@ public class BatterySaverButtonPreferenceControllerTest { 
    }



    @Test

    public void setChecked_on_setPowerSaveMode() {

    public void setChecked_on_showWarningMessage() {

        mController.setChecked(true);



        verify(mPowerManager).setPowerSaveModeEnabled(true);

        verify(mContext).sendBroadcast(any(Intent.class));

        verify(mPowerManager, never()).setPowerSaveModeEnabled(anyBoolean());

    }



    @Test

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

+3 −3
Original line number Diff line number Diff line
@@ -3,8 +3,8 @@ package com.android.settings.fuelgauge.batterysaver; 
import static com.google.common.truth.Truth.assertThat;



import static org.mockito.ArgumentMatchers.any;

import static org.mockito.Mockito.spy;

import static org.mockito.Mockito.never;

import static org.mockito.Mockito.spy;

import static org.mockito.Mockito.verify;



import android.content.ContentResolver;
@@ -64,10 +64,10 @@ public class BatterySaverScheduleSeekBarControllerTest { 


    @Test

    public void updateSeekBar_percentageMode_hasCorrectProperties() {

        final CharSequence expectedTitle = "5%";

        final CharSequence expectedTitle = "10%";

        Settings.Global.putInt(mResolver, Global.AUTOMATIC_POWER_SAVE_MODE,

                PowerManager.POWER_SAVE_MODE_TRIGGER_PERCENTAGE);

        Settings.Global.putInt(mResolver, Global.LOW_POWER_MODE_TRIGGER_LEVEL, 5);

        Settings.Global.putInt(mResolver, Global.LOW_POWER_MODE_TRIGGER_LEVEL, 10);

        mController.updateSeekBar();



        assertThat(mController.mSeekBarPreference.isVisible()).isTrue();