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

Commit e4910cc7 authored by Andrew Sapperstein's avatar Andrew Sapperstein Committed by android-build-merger
Browse files

Add Settings.Global configs to high temp warning. 

am: 63db9254

Change-Id: I63de4c9648158d8b19ed5d7eac1e75ca9b68d355
parents 2ba1fda3 63db9254

core/java/android/provider/Settings.java

+12 −0
Original line number Diff line number Diff line
@@ -9461,6 +9461,18 @@ public final class Settings { 
         * @hide

         */

        public static final String CELL_ON = "cell_on";



        /**

         * Whether to show the high temperature warning notification.

         * @hide

         */

        public static final String SHOW_TEMPERATURE_WARNING = "show_temperature_warning";



        /**

         * Temperature at which the high temperature warning notification should be shown.

         * @hide

         */

        public static final String WARNING_TEMPERATURE = "warning_temperature";

    }



    /**

packages/SystemUI/res/values/config.xml

+1 −1
Original line number Diff line number Diff line
@@ -285,7 +285,7 @@ 
    <bool name="quick_settings_show_full_alarm">false</bool>



    <!-- Whether to show a warning notification when the device reaches a certain temperature. -->

    <bool name="config_showTemperatureWarning">false</bool>

    <integer name="config_showTemperatureWarning">0</integer>



    <!-- Temp at which to show a warning notification if config_showTemperatureWarning is true.

         If < 0, uses the value from HardwarePropertiesManager#getDeviceTemperatures. -->

packages/SystemUI/src/com/android/systemui/power/PowerUI.java

+7 −2
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ import android.content.ContentResolver; 
import android.content.Context;

import android.content.Intent;

import android.content.IntentFilter;

import android.content.res.Resources;

import android.database.ContentObserver;

import android.os.BatteryManager;

import android.os.Handler;
@@ -220,11 +221,15 @@ public class PowerUI extends SystemUI { 
    };



    private void initTemperatureWarning() {

        if (!mContext.getResources().getBoolean(R.bool.config_showTemperatureWarning)) {

        ContentResolver resolver = mContext.getContentResolver();

        Resources resources = mContext.getResources();

        if (Settings.Global.getInt(resolver, Settings.Global.SHOW_TEMPERATURE_WARNING,

                resources.getInteger(R.integer.config_showTemperatureWarning)) == 0) {

            return;

        }



        mThrottlingTemp = mContext.getResources().getInteger(R.integer.config_warningTemperature);

        mThrottlingTemp = Settings.Global.getFloat(resolver, Settings.Global.WARNING_TEMPERATURE,

                resources.getInteger(R.integer.config_warningTemperature));



        if (mThrottlingTemp < 0f) {

            // Get the throttling temperature. No need to check if we're not throttling.