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

Commit e9ee5e2c authored by John Spurlock's avatar John Spurlock Committed by Android (Google) Code Review
Browse files

Merge "Settings: Battery saver settings sub-page." into lmp-preview-dev

parents 8da48ee8 c7f8e8ce

AndroidManifest.xml

+16 −0
Original line number Diff line number Diff line
@@ -1461,6 +1461,22 @@ 
                android:resource="@id/battery_settings" />

        </activity-alias>



        <activity android:name="Settings$BatterySaverSettingsActivity"

                android:label="@string/battery_saver"

                android:taskAffinity=""

                android:excludeFromRecents="true">

            <intent-filter>

                <action android:name="android.intent.action.MAIN" />

                <action android:name="android.settings.BATTERY_SAVER_SETTINGS" />

                <category android:name="android.intent.category.DEFAULT" />

                <category android:name="com.android.settings.SHORTCUT" />

            </intent-filter>

            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"

                android:value="com.android.settings.fuelgauge.BatterySaverSettings" />

            <meta-data android:name="com.android.settings.TOP_LEVEL_HEADER_ID"

                android:resource="@id/battery_settings" />

        </activity>



        <activity android:name="Settings$AccountSyncSettingsActivity"

            android:label="@string/account_sync_settings_title"

            android:taskAffinity=""

res/values/arrays.xml

+9 −0
Original line number Diff line number Diff line
@@ -1218,4 +1218,13 @@ 
        <item>1</item>

        <item>2</item>

    </string-array>



    <!-- Battery saver mode: allowable trigger threshold levels. -->

    <integer-array name="battery_saver_trigger_values" translatable="false" >

        <item>0</item>

        <item>5</item>

        <item>10</item>

        <item>15</item>

        <item>20</item>

    </integer-array>

</resources>

res/values/strings.xml

+15 −0
Original line number Diff line number Diff line
@@ -3732,6 +3732,21 @@ 
    <!-- Label for mediaserver process -->

    <string name="process_mediaserver_label">Mediaserver</string>



    <!-- [CHAR_LIMIT=40] Battery saver: Label for feature, title + menu item -->

    <string name="battery_saver">Battery saver</string>



    <!-- [CHAR_LIMIT=40] Battery saver: Title for automatic entry option -->

    <string name="battery_saver_turn_on_automatically_title">Turn on automatically</string>



    <!-- [CHAR_LIMIT=40] Battery saver: Value for automatic entry option: Never -->

    <string name="battery_saver_turn_on_automatically_never">Never</string>



    <!-- [CHAR_LIMIT=40] Battery saver: Value for automatic entry option: pct% battery -->

    <string name="battery_saver_turn_on_automatically_pct">at %1$d%% battery</string>



    <!-- [CHAR_LIMIT=NONE] Battery saver: Feature description -->

    <string name="battery_saver_description">To help improve battery life, Battery saver will reduce your device’s performance.\n\nBattery saver will turn off when your device is plugged in.</string>



    <!-- Process Stats strings -->

    <skip />

res/xml/battery_saver_settings.xml

0 → 100644
+34 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!-- Copyright (C) 2014 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.

-->



<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"

        android:title="@string/battery_saver"

        android:key="battery_saver">



    <!-- Turn on automatically -->

    <com.android.settings.notification.DropDownPreference

            android:key="turn_on_automatically"

            android:title="@string/battery_saver_turn_on_automatically_title"

            android:persistent="false" />



    <!-- Feature description text -->

    <Preference

            android:key="description"

            android:summary="@string/battery_saver_description"

            android:persistent="false"

            android:selectable="false" />



</PreferenceScreen>

src/com/android/settings/DevelopmentSettings.java

+0 −17
Original line number Diff line number Diff line
@@ -122,7 +122,6 @@ public class DevelopmentSettings extends SettingsPreferenceFragment 
    private static final String USE_NUPLAYER_KEY = "use_nuplayer";

    private static final String USE_NUPLAYER_PROPERTY = "persist.sys.media.use-nuplayer";

    private static final String SHOW_CPU_USAGE_KEY = "show_cpu_usage";

    private static final String LOW_POWER_MODE_KEY = "low_power_mode";

    private static final String FORCE_HARDWARE_UI_KEY = "force_hw_ui";

    private static final String FORCE_MSAA_KEY = "force_msaa";

    private static final String TRACK_FRAME_TIME_KEY = "track_frame_time";
@@ -196,7 +195,6 @@ public class DevelopmentSettings extends SettingsPreferenceFragment 
    private CheckBoxPreference mShowScreenUpdates;

    private CheckBoxPreference mDisableOverlays;

    private CheckBoxPreference mShowCpuUsage;

    private CheckBoxPreference mLowPowerMode;

    private CheckBoxPreference mForceHardwareUi;

    private CheckBoxPreference mForceMsaa;

    private CheckBoxPreference mShowHwScreenUpdates;
@@ -308,7 +306,6 @@ public class DevelopmentSettings extends SettingsPreferenceFragment 
        mShowScreenUpdates = findAndInitCheckboxPref(SHOW_SCREEN_UPDATES_KEY);

        mDisableOverlays = findAndInitCheckboxPref(DISABLE_OVERLAYS_KEY);

        mShowCpuUsage = findAndInitCheckboxPref(SHOW_CPU_USAGE_KEY);

        mLowPowerMode = findAndInitCheckboxPref(LOW_POWER_MODE_KEY);

        mForceHardwareUi = findAndInitCheckboxPref(FORCE_HARDWARE_UI_KEY);

        mForceMsaa = findAndInitCheckboxPref(FORCE_MSAA_KEY);

        mTrackFrameTime = addListPreference(TRACK_FRAME_TIME_KEY);
@@ -504,7 +501,6 @@ public class DevelopmentSettings extends SettingsPreferenceFragment 
        updateShowTouchesOptions();

        updateFlingerOptions();

        updateCpuUsageOptions();

        updateLowPowerModeOptions();

        updateHardwareUiOptions();

        updateMsaaOptions();

        updateTrackFrameTimeOptions();
@@ -1040,22 +1036,11 @@ public class DevelopmentSettings extends SettingsPreferenceFragment 
        mWifiManager.enableVerboseLogging(mWifiVerboseLogging.isChecked() ? 1 : 0);

    }



    private void updateLowPowerModeOptions() {

        updateCheckBox(mLowPowerMode, Settings.Global.getInt(getActivity().getContentResolver(),

                Settings.Global.LOW_POWER_MODE, 0) != 0);

    }



    private void updateCpuUsageOptions() {

        updateCheckBox(mShowCpuUsage, Settings.Global.getInt(getActivity().getContentResolver(),

                Settings.Global.SHOW_PROCESSES, 0) != 0);

    }



    private void writeLowPowerModeOptions() {

        boolean value = mLowPowerMode.isChecked();

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

                Settings.Global.LOW_POWER_MODE, value ? 1 : 0);

    }



    private void writeCpuUsageOptions() {

        boolean value = mShowCpuUsage.isChecked();

        Settings.Global.putInt(getActivity().getContentResolver(),
@@ -1330,8 +1315,6 @@ public class DevelopmentSettings extends SettingsPreferenceFragment 
            writeShowUpdatesOption();

        } else if (preference == mDisableOverlays) {

            writeDisableOverlaysOption();

        } else if (preference == mLowPowerMode) {

            writeLowPowerModeOptions();

        } else if (preference == mShowCpuUsage) {

            writeCpuUsageOptions();

        } else if (preference == mImmediatelyDestroyActivities) {