Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add Settings.Global configs to high temp warning.

Browse Source 
Test: manual
Bug: 34480261
Merged-In: Icfd08c1c7dae456920b3978918ee01469e1dec95
Change-Id: I9ed444dfb89f86d94f3a0db699324318f5bf78d0
This commit is contained in:
Andrew Sapperstein
2017-01-20 15:41:03 -08:00
parent c281fd12af
commit 63db9254cf
3 changed files with 20 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
core/java/android/provider/Settings.java
View File

@@ -9383,6 +9383,18 @@ public final class Settings {
* @hide * @hide
*/ */
public static final String CELL_ON = "cell_on"; 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";
} }
/** /**

2
packages/SystemUI/res/values/config.xml
View File

@@ -285,7 +285,7 @@
<bool name="quick_settings_show_full_alarm">false</bool> <bool name="quick_settings_show_full_alarm">false</bool>
<!-- Whether to show a warning notification when the device reaches a certain temperature. --> <!-- 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. <!-- Temp at which to show a warning notification if config_showTemperatureWarning is true.
If < 0, uses the value from HardwarePropertiesManager#getDeviceTemperatures. --> If < 0, uses the value from HardwarePropertiesManager#getDeviceTemperatures. -->

9
packages/SystemUI/src/com/android/systemui/power/PowerUI.java
View File

@@ -21,6 +21,7 @@ import android.content.ContentResolver;
import android.content.Context; import android.content.Context;
import android.content.Intent; import android.content.Intent;
import android.content.IntentFilter; import android.content.IntentFilter;
import android.content.res.Resources;
import android.database.ContentObserver; import android.database.ContentObserver;
import android.os.BatteryManager; import android.os.BatteryManager;
import android.os.Handler; import android.os.Handler;
@@ -220,11 +221,15 @@ public class PowerUI extends SystemUI {
}; };
private void initTemperatureWarning() { 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; 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) { if (mThrottlingTemp < 0f) {
// Get the throttling temperature. No need to check if we're not throttling. // Get the throttling temperature. No need to check if we're not throttling.