PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 80455f36: am b84291bb: Merge "Support showing "Cold" battery health."

Browse Source 
Merge commit '80455f367f968f64037dd32b3857891c9681664b'

* commit '80455f367f968f64037dd32b3857891c9681664b':
  Support showing "Cold" battery health.
This commit is contained in:
Jean-Baptiste Queru
2010-10-11 17:49:52 -07:00
committed by Android Git Automerger
parent f0fa3dff71 80455f367f
commit ac3af83f69
2 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
res/values/strings.xml
View File

@@ -177,6 +177,8 @@
<string name="battery_info_health_over_voltage">Over voltage</string>
<!-- Battery Info screen. Value for a status item. Used for diagnostic info screens, precise translation isn't needed -->
<string name="battery_info_health_unspecified_failure">Unknown error</string>
<!-- Battery Info screen. Value for a status item. Used for diagnostic info screens, precise translation isn't needed -->
<string name="battery_info_health_cold">Cold</string>
<!-- Used as setting title (for checkbox) on second screen after selecting Bluetooth settings -->
<string name="bluetooth">Bluetooth</string>

2
src/com/android/settings/BatteryInfo.java
View File

@@ -142,6 +142,8 @@ public class BatteryInfo extends Activity {
healthString = getString(R.string.battery_info_health_over_voltage);
} else if (health == BatteryManager.BATTERY_HEALTH_UNSPECIFIED_FAILURE) {
healthString = getString(R.string.battery_info_health_unspecified_failure);
} else if (health == BatteryManager.BATTERY_HEALTH_COLD) {
healthString = getString(R.string.battery_info_health_cold);
} else {
healthString = getString(R.string.battery_info_health_unknown);
}