diff options
| author | Amith Yamasani <yamasani@google.com> | 2011-07-22 10:34:58 -0700 |
|---|---|---|
| committer | Amith Yamasani <yamasani@google.com> | 2011-07-25 14:09:57 -0700 |
| commit | a4379d6b38e568fcb60831d6f2fa349ba20f9b82 (patch) | |
| tree | c864ae3fb36b7da46c80e8a2639dc63c2352aace /src/com/android/settings/BatteryInfo.java | |
| parent | 8374a2db64f772c5e934ccd2e47f0df4b5928012 (diff) | |
| download | packages_apps_settings-a4379d6b38e568fcb60831d6f2fa349ba20f9b82.zip packages_apps_settings-a4379d6b38e568fcb60831d6f2fa349ba20f9b82.tar.gz packages_apps_settings-a4379d6b38e568fcb60831d6f2fa349ba20f9b82.tar.bz2 | |
Use a different wallpaper fragment title from the preference item.
Change wallpaper list ordering to alphabetic.
Display battery level and charging status in Battery settings.
Change-Id: I8ead0fb0f018c79ed258bd1c1ca3f8ecaf32da83
Diffstat (limited to 'src/com/android/settings/BatteryInfo.java')
| -rw-r--r-- | src/com/android/settings/BatteryInfo.java | 21 |
1 files changed, 1 insertions, 20 deletions
diff --git a/src/com/android/settings/BatteryInfo.java b/src/com/android/settings/BatteryInfo.java index 3e037cf..d8046cf 100644 --- a/src/com/android/settings/BatteryInfo.java +++ b/src/com/android/settings/BatteryInfo.java @@ -90,26 +90,7 @@ public class BatteryInfo extends Activity { + getString(R.string.battery_info_temperature_units)); mTechnology.setText("" + intent.getStringExtra("technology")); - int status = intent.getIntExtra("status", BatteryManager.BATTERY_STATUS_UNKNOWN); - String statusString; - if (status == BatteryManager.BATTERY_STATUS_CHARGING) { - statusString = getString(R.string.battery_info_status_charging); - if (plugType > 0) { - statusString = statusString + " " + getString( - (plugType == BatteryManager.BATTERY_PLUGGED_AC) - ? R.string.battery_info_status_charging_ac - : R.string.battery_info_status_charging_usb); - } - } else if (status == BatteryManager.BATTERY_STATUS_DISCHARGING) { - statusString = getString(R.string.battery_info_status_discharging); - } else if (status == BatteryManager.BATTERY_STATUS_NOT_CHARGING) { - statusString = getString(R.string.battery_info_status_not_charging); - } else if (status == BatteryManager.BATTERY_STATUS_FULL) { - statusString = getString(R.string.battery_info_status_full); - } else { - statusString = getString(R.string.battery_info_status_unknown); - } - mStatus.setText(statusString); + mStatus.setText(Utils.getBatteryStatus(getResources(), intent)); switch (plugType) { case 0: |