summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteve Kondik <shade@chemlab.org>2010-03-16 16:34:55 -0400
committerSteve Kondik <shade@chemlab.org>2010-04-11 21:27:26 -0400
commit62ef6d00f2c10c4738871fbd4377a35069ca28a4 (patch)
tree1c01cd7e57933e466d757bd94e2c93d5b76572f0
parent8a07feb618e6546ba6dd95583f4c7f23b74c8646 (diff)
downloadandroid_frameworks_base-62ef6d00f2c10c4738871fbd4377a35069ca28a4.tar.gz
android_frameworks_base-62ef6d00f2c10c4738871fbd4377a35069ca28a4.tar.bz2
android_frameworks_base-62ef6d00f2c10c4738871fbd4377a35069ca28a4.zip
Bigger font, dont display 100% on battery (from canadiancow)
-rw-r--r--services/java/com/android/server/status/StatusBarIcon.java1
-rw-r--r--services/java/com/android/server/status/StatusBarPolicy.java3
2 files changed, 3 insertions, 1 deletions
diff --git a/services/java/com/android/server/status/StatusBarIcon.java b/services/java/com/android/server/status/StatusBarIcon.java
index 0981c2f8669..37d7e28e7a2 100644
--- a/services/java/com/android/server/status/StatusBarIcon.java
+++ b/services/java/com/android/server/status/StatusBarIcon.java
@@ -103,6 +103,7 @@ class StatusBarIcon {
Gravity.CENTER_HORIZONTAL | Gravity.CENTER_VERTICAL));
mNumberView.setBackgroundDrawable(null);
mNumberView.setGravity(Gravity.CENTER_HORIZONTAL | Gravity.CENTER_VERTICAL);
+ mNumberView.setTextSize(12);
if (data.number > 0) {
nv.setText("" + data.number);
diff --git a/services/java/com/android/server/status/StatusBarPolicy.java b/services/java/com/android/server/status/StatusBarPolicy.java
index 5de89c4c5de..4cf7ecd1dea 100644
--- a/services/java/com/android/server/status/StatusBarPolicy.java
+++ b/services/java/com/android/server/status/StatusBarPolicy.java
@@ -600,7 +600,8 @@ public class StatusBarPolicy {
int level = intent.getIntExtra("level", -1);
//show battery percentage if not plugged in and status is enabled
- if (plugged || Settings.System.getInt(mContext.getContentResolver(),
+ if (plugged || level >= 100 ||
+ Settings.System.getInt(mContext.getContentResolver(),
Settings.System.BATTERY_PERCENTAGE_STATUS_ICON, 1) == 0) {
mBatteryData.number = -1;
} else {