diff options
| -rwxr-xr-x | core/java/android/provider/Settings.java | 12 | ||||
| -rw-r--r-- | packages/SystemUI/res/values/config.xml | 2 | ||||
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/power/PowerUI.java | 9 |
3 files changed, 20 insertions, 3 deletions
diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java index eab7bc267283..ee79331a6588 100755 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -9383,6 +9383,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"; } /** diff --git a/packages/SystemUI/res/values/config.xml b/packages/SystemUI/res/values/config.xml index b89ce47ded02..0fa9a85f4123 100644 --- a/packages/SystemUI/res/values/config.xml +++ b/packages/SystemUI/res/values/config.xml @@ -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. --> diff --git a/packages/SystemUI/src/com/android/systemui/power/PowerUI.java b/packages/SystemUI/src/com/android/systemui/power/PowerUI.java index 60421a60b882..67798e9488b2 100644 --- a/packages/SystemUI/src/com/android/systemui/power/PowerUI.java +++ b/packages/SystemUI/src/com/android/systemui/power/PowerUI.java @@ -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. |