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

Commit 6db5eb6c authored by Salvador Martinez's avatar Salvador Martinez
Browse files

Create preference to allow user to toggle sticky battery saver 

This adds the toggle that makes it so that battery saver turns
off automatically at high battery percentages or not.

Test: robotests
Bug: 112232746
Change-Id: I0df879a43e5390bc671c47e780bbbb466a3e9353
parent f9df7394

res/values/strings.xml

+9 −0
Original line number Diff line number Diff line
@@ -5583,6 +5583,12 @@ 
    <!-- Battery saver: Title for battery saver schedule screen [CHAR_LIMIT=40] -->

    <string name="battery_saver_schedule_settings_title">Set a schedule</string>









    <!-- Battery Saver: Title for sticky battery saver preference [CHAR_LIMIT=60] -->









    <string name="battery_saver_sticky_title">Keep battery saver on</string>

















    <!-- Battery Saver: Description for sticky battery saver preference [CHAR_LIMIT=NONE] -->









    <string name="battery_saver_sticky_description">Battery saver will stay on even after device is fully charged</string>

















    <!-- Battery saver: Label for seekbar to change battery saver threshold [CHAR_LIMIT=40] -->









    <string name="battery_saver_seekbar_title"><xliff:g id="percent">%1$s</xliff:g></string>
















@@ -7147,6 +7153,9 @@







    <string name="keywords_ring_vibration">haptics, vibrate, phone, call, sensitivity, ring</string>









    <!-- List of synonyms for notification vibration setting (changes whether your phone vibrates when it shows a notification), used to match in settings search [CHAR LIMIT=NONE] -->









    <string name="keywords_notification_vibration">haptics, vibrate, sensitivity</string>









    <!-- Battery Saver: Search terms for sticky battery saver preference [CHAR_LIMIT=NONE] -->









    <string name="keywords_battery_saver_sticky">battery saver, sticky, persist, power saver, battery</string>

























    <!-- NFC Wi-Fi pairing/setup strings-->

































res/xml/battery_saver_settings.xml



+7
−0






























Original line number
Diff line number
Diff line







@@ -26,6 +26,13 @@







        android:title="@string/battery_saver_schedule_settings_title"









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



















    <SwitchPreference









        android:key="battery_saver_sticky"









        android:title="@string/battery_saver_sticky_title"









        android:summary="@string/battery_saver_sticky_description"









        settings:keywords="@string/keywords_battery_saver_sticky"









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



















    <com.android.settings.widget.TwoStateButtonPreference









        android:key="battery_saver"









        android:title="@string/battery_saver"
































src/com/android/settings/fuelgauge/batterysaver/BatterySaverStickyPreferenceController.java
0 → 100644



+41
−0






























Original line number
Diff line number
Diff line









package com.android.settings.fuelgauge.batterysaver;



















import android.content.Context;









import android.provider.Settings;









import androidx.preference.Preference;









import androidx.preference.SwitchPreference;









import com.android.settings.core.BasePreferenceController;









import com.android.settings.core.PreferenceControllerMixin;



















public class BatterySaverStickyPreferenceController extends BasePreferenceController implements









        PreferenceControllerMixin, Preference.OnPreferenceChangeListener {



















    public static final String LOW_POWER_STICKY_AUTO_DISABLE_ENABLED =









            "low_power_sticky_auto_disable_enabled";



















    public BatterySaverStickyPreferenceController(Context context, String preferenceKey) {









        super(context, preferenceKey);









    }



















    @Override









    public void updateState(Preference preference) {









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









                LOW_POWER_STICKY_AUTO_DISABLE_ENABLED, 1);



















        ((SwitchPreference) preference).setChecked(setting == 0);









    }



















    @Override









    public boolean onPreferenceChange(Preference preference, Object newValue) {









        boolean keepActive = (Boolean) newValue;









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









                LOW_POWER_STICKY_AUTO_DISABLE_ENABLED,









                keepActive ? 0 : 1);









        return true;









    }



















    @Override









    public int getAvailabilityStatus() {









        return AVAILABLE;









    }









}
























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



+63
−0






























Original line number
Diff line number
Diff line









/*









 * Copyright (C) 2016 The Android Open Source Project









 *









 * Licensed under the Apache License, Version 2.0 (the "License");









 * you may not use this file except in compliance with the License.









 * You may obtain a copy of the License at









 *









 *      http://www.apache.org/licenses/LICENSE-2.0









 *









 * Unless required by applicable law or agreed to in writing, software









 * distributed under the License is distributed on an "AS IS" BASIS,









 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.









 * See the License for the specific language governing permissions and









 * limitations under the License.









 */



















package com.android.settings.fuelgauge.batterysaver;



















import static com.android.settings.fuelgauge.batterysaver.BatterySaverStickyPreferenceController.LOW_POWER_STICKY_AUTO_DISABLE_ENABLED;









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



















import android.content.Context;









import android.provider.Settings;









import org.junit.Before;









import org.junit.Test;









import org.junit.runner.RunWith;









import org.robolectric.RobolectricTestRunner;









import org.robolectric.RuntimeEnvironment;



















@RunWith(RobolectricTestRunner.class)









public class BatterySaverStickyPreferenceControllerTest {



















    private static final String PREF_KEY = "battery_saver_sticky";



















    private Context mContext;









    private BatterySaverStickyPreferenceController mController;



















    @Before









    public void setup() {









        mContext = RuntimeEnvironment.application;









        mController = new BatterySaverStickyPreferenceController(mContext, PREF_KEY);









    }



















    private int getAutoDisableSetting() {









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









                LOW_POWER_STICKY_AUTO_DISABLE_ENABLED,









                1);









    }



















    @Test









    public void testOnPreferenceChange_turnOnKeepActive_autoDisableOff() {









        mController.onPreferenceChange(null, true);









        final int isOn = getAutoDisableSetting();









        assertThat(isOn).isEqualTo(0);









    }



















    @Test









    public void testOnPreferenceChange_TurnOffKeepActive_autoDisableOff() {









        mController.onPreferenceChange(null, false);









        final int isOn = getAutoDisableSetting();









        assertThat(isOn).isEqualTo(1);









    }









}