Merge "Support showing "Cold" battery health."

This commit is contained in:
Jean-Baptiste Queru
2010-10-10 17:37:59 -07:00
committed by Android Code Review
2 changed files with 4 additions and 0 deletions

View File

@@ -171,6 +171,8 @@
<string name="battery_info_health_over_voltage">Over voltage</string> <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 --> <!-- 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> <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 --> <!-- Used as setting title (for checkbox) on second screen after selecting Bluetooth settings -->
<string name="bluetooth">Bluetooth</string> <string name="bluetooth">Bluetooth</string>

View File

@@ -142,6 +142,8 @@ public class BatteryInfo extends Activity {
healthString = getString(R.string.battery_info_health_over_voltage); healthString = getString(R.string.battery_info_health_over_voltage);
} else if (health == BatteryManager.BATTERY_HEALTH_UNSPECIFIED_FAILURE) { } else if (health == BatteryManager.BATTERY_HEALTH_UNSPECIFIED_FAILURE) {
healthString = getString(R.string.battery_info_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 { } else {
healthString = getString(R.string.battery_info_health_unknown); healthString = getString(R.string.battery_info_health_unknown);
} }