Interface Settings: battery display

Patch Set 4: Adjusted battery graphics as requested
Patch Set 5: Decreased font size for tablets

Change-Id: Icc27099206b0296f79d61fa0bcf33fc8d4e10060

105 files changed, 182 insertions, 6 deletions

diff --git a/packages/SystemUI/res/drawable-hdpi/stat_sys_battery_charge_min_anim0.png b/packages/SystemUI/res/drawable-hdpi/stat_sys_battery_charge_min_anim0.png
new file mode 100755
index 0000000..a9dc546
--- /dev/null
+++ b/packages/SystemUI/res/drawable-hdpi/stat_sys_battery_charge_min_anim0.png
diff --git a/packages/SystemUI/res/drawable-hdpi/stat_sys_battery_charge_min_anim100.png b/packages/SystemUI/res/drawable-hdpi/stat_sys_battery_charge_min_anim100.png
new file mode 100755
index 0000000..ea49dd7
--- /dev/null
+++ b/packages/SystemUI/res/drawable-hdpi/stat_sys_battery_charge_min_anim100.png
diff --git a/packages/SystemUI/res/drawable-hdpi/stat_sys_battery_charge_min_anim15.png b/packages/SystemUI/res/drawable-hdpi/stat_sys_battery_charge_min_anim15.png
new file mode 100755
index 0000000..f1b97e1
--- /dev/null
+++ b/packages/SystemUI/res/drawable-hdpi/stat_sys_battery_charge_min_anim15.png
diff --git a/packages/SystemUI/res/drawable-hdpi/stat_sys_battery_charge_min_anim28.png b/packages/SystemUI/res/drawable-hdpi/stat_sys_battery_charge_min_anim28.png
new file mode 100755
index 0000000..7a9123e
--- /dev/null
+++ b/packages/SystemUI/res/drawable-hdpi/stat_sys_battery_charge_min_anim28.png
diff --git a/packages/SystemUI/res/drawable-hdpi/stat_sys_battery_charge_min_anim43.png b/packages/SystemUI/res/drawable-hdpi/stat_sys_battery_charge_min_anim43.png
new file mode 100755
index 0000000..1b2d22c
--- /dev/null
+++ b/packages/SystemUI/res/drawable-hdpi/stat_sys_battery_charge_min_anim43.png
diff --git a/packages/SystemUI/res/drawable-hdpi/stat_sys_battery_charge_min_anim57.png b/packages/SystemUI/res/drawable-hdpi/stat_sys_battery_charge_min_anim57.png
new file mode 100755
index 0000000..e4a3457
--- /dev/null
+++ b/packages/SystemUI/res/drawable-hdpi/stat_sys_battery_charge_min_anim57.png
diff --git a/packages/SystemUI/res/drawable-hdpi/stat_sys_battery_charge_min_anim71.png b/packages/SystemUI/res/drawable-hdpi/stat_sys_battery_charge_min_anim71.png
new file mode 100755
index 0000000..6ce4554
--- /dev/null
+++ b/packages/SystemUI/res/drawable-hdpi/stat_sys_battery_charge_min_anim71.png
diff --git a/packages/SystemUI/res/drawable-hdpi/stat_sys_battery_charge_min_anim85.png b/packages/SystemUI/res/drawable-hdpi/stat_sys_battery_charge_min_anim85.png
new file mode 100755
index 0000000..5685685
--- /dev/null
+++ b/packages/SystemUI/res/drawable-hdpi/stat_sys_battery_charge_min_anim85.png
diff --git a/packages/SystemUI/res/drawable-hdpi/stat_sys_battery_min_0.png b/packages/SystemUI/res/drawable-hdpi/stat_sys_battery_min_0.png
new file mode 100755
index 0000000..bdfe108
--- /dev/null
+++ b/packages/SystemUI/res/drawable-hdpi/stat_sys_battery_min_0.png
diff --git a/packages/SystemUI/res/drawable-hdpi/stat_sys_battery_min_100.png b/packages/SystemUI/res/drawable-hdpi/stat_sys_battery_min_100.png
new file mode 100755
index 0000000..9fdaf23
--- /dev/null
+++ b/packages/SystemUI/res/drawable-hdpi/stat_sys_battery_min_100.png
diff --git a/packages/SystemUI/res/drawable-hdpi/stat_sys_battery_min_15.png b/packages/SystemUI/res/drawable-hdpi/stat_sys_battery_min_15.png
new file mode 100755
index 0000000..f424636
--- /dev/null
+++ b/packages/SystemUI/res/drawable-hdpi/stat_sys_battery_min_15.png
diff --git a/packages/SystemUI/res/drawable-hdpi/stat_sys_battery_min_28.png b/packages/SystemUI/res/drawable-hdpi/stat_sys_battery_min_28.png
new file mode 100755
index 0000000..3237b05
--- /dev/null
+++ b/packages/SystemUI/res/drawable-hdpi/stat_sys_battery_min_28.png
diff --git a/packages/SystemUI/res/drawable-hdpi/stat_sys_battery_min_43.png b/packages/SystemUI/res/drawable-hdpi/stat_sys_battery_min_43.png
new file mode 100755
index 0000000..6d72129
--- /dev/null
+++ b/packages/SystemUI/res/drawable-hdpi/stat_sys_battery_min_43.png
diff --git a/packages/SystemUI/res/drawable-hdpi/stat_sys_battery_min_57.png b/packages/SystemUI/res/drawable-hdpi/stat_sys_battery_min_57.png
new file mode 100755
index 0000000..6e10476
--- /dev/null
+++ b/packages/SystemUI/res/drawable-hdpi/stat_sys_battery_min_57.png
diff --git a/packages/SystemUI/res/drawable-hdpi/stat_sys_battery_min_71.png b/packages/SystemUI/res/drawable-hdpi/stat_sys_battery_min_71.png
new file mode 100755
index 0000000..fe0c8b3
--- /dev/null
+++ b/packages/SystemUI/res/drawable-hdpi/stat_sys_battery_min_71.png
diff --git a/packages/SystemUI/res/drawable-hdpi/stat_sys_battery_min_85.png b/packages/SystemUI/res/drawable-hdpi/stat_sys_battery_min_85.png
new file mode 100755
index 0000000..172e00c
--- /dev/null
+++ b/packages/SystemUI/res/drawable-hdpi/stat_sys_battery_min_85.png
diff --git a/packages/SystemUI/res/drawable-mdpi/stat_sys_battery_charge_min_anim0.png b/packages/SystemUI/res/drawable-mdpi/stat_sys_battery_charge_min_anim0.png
new file mode 100755
index 0000000..78d2384
--- /dev/null
+++ b/packages/SystemUI/res/drawable-mdpi/stat_sys_battery_charge_min_anim0.png
diff --git a/packages/SystemUI/res/drawable-mdpi/stat_sys_battery_charge_min_anim100.png b/packages/SystemUI/res/drawable-mdpi/stat_sys_battery_charge_min_anim100.png
new file mode 100755
index 0000000..5aca171
--- /dev/null
+++ b/packages/SystemUI/res/drawable-mdpi/stat_sys_battery_charge_min_anim100.png
diff --git a/packages/SystemUI/res/drawable-mdpi/stat_sys_battery_charge_min_anim15.png b/packages/SystemUI/res/drawable-mdpi/stat_sys_battery_charge_min_anim15.png
new file mode 100755
index 0000000..7c06ef7
--- /dev/null
+++ b/packages/SystemUI/res/drawable-mdpi/stat_sys_battery_charge_min_anim15.png
diff --git a/packages/SystemUI/res/drawable-mdpi/stat_sys_battery_charge_min_anim28.png b/packages/SystemUI/res/drawable-mdpi/stat_sys_battery_charge_min_anim28.png
new file mode 100755
index 0000000..1fce2fc
--- /dev/null
+++ b/packages/SystemUI/res/drawable-mdpi/stat_sys_battery_charge_min_anim28.png
diff --git a/packages/SystemUI/res/drawable-mdpi/stat_sys_battery_charge_min_anim43.png b/packages/SystemUI/res/drawable-mdpi/stat_sys_battery_charge_min_anim43.png
new file mode 100755
index 0000000..28294dd
--- /dev/null
+++ b/packages/SystemUI/res/drawable-mdpi/stat_sys_battery_charge_min_anim43.png
diff --git a/packages/SystemUI/res/drawable-mdpi/stat_sys_battery_charge_min_anim57.png b/packages/SystemUI/res/drawable-mdpi/stat_sys_battery_charge_min_anim57.png
new file mode 100755
index 0000000..c905ddc
--- /dev/null
+++ b/packages/SystemUI/res/drawable-mdpi/stat_sys_battery_charge_min_anim57.png
diff --git a/packages/SystemUI/res/drawable-mdpi/stat_sys_battery_charge_min_anim71.png b/packages/SystemUI/res/drawable-mdpi/stat_sys_battery_charge_min_anim71.png
new file mode 100755
index 0000000..dc5184b
--- /dev/null
+++ b/packages/SystemUI/res/drawable-mdpi/stat_sys_battery_charge_min_anim71.png
diff --git a/packages/SystemUI/res/drawable-mdpi/stat_sys_battery_charge_min_anim85.png b/packages/SystemUI/res/drawable-mdpi/stat_sys_battery_charge_min_anim85.png
new file mode 100755
index 0000000..3af272c
--- /dev/null
+++ b/packages/SystemUI/res/drawable-mdpi/stat_sys_battery_charge_min_anim85.png
diff --git a/packages/SystemUI/res/drawable-mdpi/stat_sys_battery_min_0.png b/packages/SystemUI/res/drawable-mdpi/stat_sys_battery_min_0.png
new file mode 100755
index 0000000..cd042a7
--- /dev/null
+++ b/packages/SystemUI/res/drawable-mdpi/stat_sys_battery_min_0.png
diff --git a/packages/SystemUI/res/drawable-mdpi/stat_sys_battery_min_100.png b/packages/SystemUI/res/drawable-mdpi/stat_sys_battery_min_100.png
new file mode 100755
index 0000000..1d506b2
--- /dev/null
+++ b/packages/SystemUI/res/drawable-mdpi/stat_sys_battery_min_100.png
diff --git a/packages/SystemUI/res/drawable-mdpi/stat_sys_battery_min_15.png b/packages/SystemUI/res/drawable-mdpi/stat_sys_battery_min_15.png
new file mode 100755
index 0000000..cc3a01a
--- /dev/null
+++ b/packages/SystemUI/res/drawable-mdpi/stat_sys_battery_min_15.png
diff --git a/packages/SystemUI/res/drawable-mdpi/stat_sys_battery_min_28.png b/packages/SystemUI/res/drawable-mdpi/stat_sys_battery_min_28.png
new file mode 100755
index 0000000..937e384
--- /dev/null
+++ b/packages/SystemUI/res/drawable-mdpi/stat_sys_battery_min_28.png
diff --git a/packages/SystemUI/res/drawable-mdpi/stat_sys_battery_min_43.png b/packages/SystemUI/res/drawable-mdpi/stat_sys_battery_min_43.png
new file mode 100755
index 0000000..41d02db
--- /dev/null
+++ b/packages/SystemUI/res/drawable-mdpi/stat_sys_battery_min_43.png
diff --git a/packages/SystemUI/res/drawable-mdpi/stat_sys_battery_min_57.png b/packages/SystemUI/res/drawable-mdpi/stat_sys_battery_min_57.png
new file mode 100755
index 0000000..ed90158
--- /dev/null
+++ b/packages/SystemUI/res/drawable-mdpi/stat_sys_battery_min_57.png
diff --git a/packages/SystemUI/res/drawable-mdpi/stat_sys_battery_min_71.png b/packages/SystemUI/res/drawable-mdpi/stat_sys_battery_min_71.png
new file mode 100755
index 0000000..a195b26
--- /dev/null
+++ b/packages/SystemUI/res/drawable-mdpi/stat_sys_battery_min_71.png
diff --git a/packages/SystemUI/res/drawable-mdpi/stat_sys_battery_min_85.png b/packages/SystemUI/res/drawable-mdpi/stat_sys_battery_min_85.png
new file mode 100755
index 0000000..690979d
--- /dev/null
+++ b/packages/SystemUI/res/drawable-mdpi/stat_sys_battery_min_85.png
diff --git a/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_battery_charge_min_anim0.png b/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_battery_charge_min_anim0.png
new file mode 100755
index 0000000..979b733
--- /dev/null
+++ b/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_battery_charge_min_anim0.png
diff --git a/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_battery_charge_min_anim100.png b/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_battery_charge_min_anim100.png
new file mode 100755
index 0000000..599bd42
--- /dev/null
+++ b/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_battery_charge_min_anim100.png
diff --git a/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_battery_charge_min_anim15.png b/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_battery_charge_min_anim15.png
new file mode 100755
index 0000000..ed4dd8a
--- /dev/null
+++ b/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_battery_charge_min_anim15.png
diff --git a/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_battery_charge_min_anim28.png b/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_battery_charge_min_anim28.png
new file mode 100755
index 0000000..d4e1b5d
--- /dev/null
+++ b/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_battery_charge_min_anim28.png
diff --git a/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_battery_charge_min_anim43.png b/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_battery_charge_min_anim43.png
new file mode 100755
index 0000000..763eb3f
--- /dev/null
+++ b/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_battery_charge_min_anim43.png
diff --git a/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_battery_charge_min_anim57.png b/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_battery_charge_min_anim57.png
new file mode 100755
index 0000000..f2294d4
--- /dev/null
+++ b/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_battery_charge_min_anim57.png
diff --git a/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_battery_charge_min_anim71.png b/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_battery_charge_min_anim71.png
new file mode 100755
index 0000000..4fa3cea
--- /dev/null
+++ b/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_battery_charge_min_anim71.png
diff --git a/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_battery_charge_min_anim85.png b/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_battery_charge_min_anim85.png
new file mode 100755
index 0000000..1ed832f
--- /dev/null
+++ b/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_battery_charge_min_anim85.png
diff --git a/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_battery_min_0.png b/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_battery_min_0.png
new file mode 100755
index 0000000..1b3d49e
--- /dev/null
+++ b/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_battery_min_0.png
diff --git a/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_battery_min_100.png b/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_battery_min_100.png
new file mode 100755
index 0000000..a73398a
--- /dev/null
+++ b/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_battery_min_100.png
diff --git a/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_battery_min_15.png b/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_battery_min_15.png
new file mode 100755
index 0000000..37cc5a2
--- /dev/null
+++ b/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_battery_min_15.png
diff --git a/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_battery_min_28.png b/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_battery_min_28.png
new file mode 100755
index 0000000..f3b35d8
--- /dev/null
+++ b/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_battery_min_28.png
diff --git a/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_battery_min_43.png b/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_battery_min_43.png
new file mode 100755
index 0000000..abdbec2
--- /dev/null
+++ b/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_battery_min_43.png
diff --git a/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_battery_min_57.png b/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_battery_min_57.png
new file mode 100755
index 0000000..68da4b7
--- /dev/null
+++ b/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_battery_min_57.png
diff --git a/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_battery_min_71.png b/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_battery_min_71.png
new file mode 100755
index 0000000..c0d35cb
--- /dev/null
+++ b/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_battery_min_71.png
diff --git a/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_battery_min_85.png b/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_battery_min_85.png
new file mode 100755
index 0000000..72976dd
--- /dev/null
+++ b/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_battery_min_85.png
diff --git a/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_battery_charge_min_anim0.png b/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_battery_charge_min_anim0.png
new file mode 100755
index 0000000..24bb1e0
--- /dev/null
+++ b/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_battery_charge_min_anim0.png
diff --git a/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_battery_charge_min_anim100.png b/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_battery_charge_min_anim100.png
new file mode 100755
index 0000000..8115db1
--- /dev/null
+++ b/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_battery_charge_min_anim100.png
diff --git a/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_battery_charge_min_anim15.png b/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_battery_charge_min_anim15.png
new file mode 100755
index 0000000..b90f5e3
--- /dev/null
+++ b/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_battery_charge_min_anim15.png
diff --git a/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_battery_charge_min_anim28.png b/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_battery_charge_min_anim28.png
new file mode 100755
index 0000000..c0d3204
--- /dev/null
+++ b/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_battery_charge_min_anim28.png
diff --git a/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_battery_charge_min_anim43.png b/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_battery_charge_min_anim43.png
new file mode 100755
index 0000000..adc37d3
--- /dev/null
+++ b/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_battery_charge_min_anim43.png
diff --git a/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_battery_charge_min_anim57.png b/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_battery_charge_min_anim57.png
new file mode 100755
index 0000000..7c771c4
--- /dev/null
+++ b/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_battery_charge_min_anim57.png
diff --git a/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_battery_charge_min_anim71.png b/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_battery_charge_min_anim71.png
new file mode 100755
index 0000000..8f32043
--- /dev/null
+++ b/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_battery_charge_min_anim71.png
diff --git a/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_battery_charge_min_anim85.png b/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_battery_charge_min_anim85.png
new file mode 100755
index 0000000..42b71b2
--- /dev/null
+++ b/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_battery_charge_min_anim85.png
diff --git a/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_battery_min_0.png b/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_battery_min_0.png
new file mode 100755
index 0000000..f3f1a19
--- /dev/null
+++ b/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_battery_min_0.png
diff --git a/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_battery_min_100.png b/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_battery_min_100.png
new file mode 100755
index 0000000..23be933
--- /dev/null
+++ b/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_battery_min_100.png
diff --git a/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_battery_min_15.png b/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_battery_min_15.png
new file mode 100755
index 0000000..9cb4909
--- /dev/null
+++ b/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_battery_min_15.png
diff --git a/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_battery_min_28.png b/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_battery_min_28.png
new file mode 100755
index 0000000..80ec7c7
--- /dev/null
+++ b/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_battery_min_28.png
diff --git a/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_battery_min_43.png b/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_battery_min_43.png
new file mode 100755
index 0000000..c892bd3
--- /dev/null
+++ b/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_battery_min_43.png
diff --git a/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_battery_min_57.png b/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_battery_min_57.png
new file mode 100755
index 0000000..45822b0
--- /dev/null
+++ b/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_battery_min_57.png
diff --git a/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_battery_min_71.png b/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_battery_min_71.png
new file mode 100755
index 0000000..465db1e
--- /dev/null
+++ b/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_battery_min_71.png
diff --git a/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_battery_min_85.png b/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_battery_min_85.png
new file mode 100755
index 0000000..b3f08d4
--- /dev/null
+++ b/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_battery_min_85.png
diff --git a/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_battery_charge_min_anim0.png b/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_battery_charge_min_anim0.png
new file mode 100755
index 0000000..5aebefc
--- /dev/null
+++ b/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_battery_charge_min_anim0.png
diff --git a/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_battery_charge_min_anim100.png b/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_battery_charge_min_anim100.png
new file mode 100755
index 0000000..1f556ab
--- /dev/null
+++ b/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_battery_charge_min_anim100.png
diff --git a/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_battery_charge_min_anim15.png b/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_battery_charge_min_anim15.png
new file mode 100755
index 0000000..7522d25
--- /dev/null
+++ b/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_battery_charge_min_anim15.png
diff --git a/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_battery_charge_min_anim28.png b/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_battery_charge_min_anim28.png
new file mode 100755
index 0000000..189305e
--- /dev/null
+++ b/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_battery_charge_min_anim28.png
diff --git a/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_battery_charge_min_anim43.png b/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_battery_charge_min_anim43.png
new file mode 100755
index 0000000..6cb2b3d
--- /dev/null
+++ b/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_battery_charge_min_anim43.png
diff --git a/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_battery_charge_min_anim57.png b/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_battery_charge_min_anim57.png
new file mode 100755
index 0000000..ac79f19
--- /dev/null
+++ b/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_battery_charge_min_anim57.png
diff --git a/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_battery_charge_min_anim71.png b/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_battery_charge_min_anim71.png
new file mode 100755
index 0000000..4073111
--- /dev/null
+++ b/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_battery_charge_min_anim71.png
diff --git a/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_battery_charge_min_anim85.png b/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_battery_charge_min_anim85.png
new file mode 100755
index 0000000..83f36cb
--- /dev/null
+++ b/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_battery_charge_min_anim85.png
diff --git a/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_battery_min_0.png b/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_battery_min_0.png
new file mode 100755
index 0000000..7cf1065
--- /dev/null
+++ b/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_battery_min_0.png
diff --git a/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_battery_min_100.png b/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_battery_min_100.png
new file mode 100755
index 0000000..041000b
--- /dev/null
+++ b/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_battery_min_100.png
diff --git a/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_battery_min_15.png b/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_battery_min_15.png
new file mode 100755
index 0000000..7625a1a
--- /dev/null
+++ b/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_battery_min_15.png
diff --git a/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_battery_min_28.png b/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_battery_min_28.png
new file mode 100755
index 0000000..122e4d5
--- /dev/null
+++ b/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_battery_min_28.png
diff --git a/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_battery_min_43.png b/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_battery_min_43.png
new file mode 100755
index 0000000..761c280
--- /dev/null
+++ b/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_battery_min_43.png
diff --git a/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_battery_min_57.png b/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_battery_min_57.png
new file mode 100755
index 0000000..58ed133
--- /dev/null
+++ b/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_battery_min_57.png
diff --git a/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_battery_min_71.png b/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_battery_min_71.png
new file mode 100755
index 0000000..0423f11
--- /dev/null
+++ b/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_battery_min_71.png
diff --git a/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_battery_min_85.png b/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_battery_min_85.png
new file mode 100755
index 0000000..fd41402
--- /dev/null
+++ b/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_battery_min_85.png
diff --git a/packages/SystemUI/res/drawable-xhdpi/stat_sys_battery_charge_min_anim0.png b/packages/SystemUI/res/drawable-xhdpi/stat_sys_battery_charge_min_anim0.png
new file mode 100755
index 0000000..223c4d3
--- /dev/null
+++ b/packages/SystemUI/res/drawable-xhdpi/stat_sys_battery_charge_min_anim0.png
diff --git a/packages/SystemUI/res/drawable-xhdpi/stat_sys_battery_charge_min_anim100.png b/packages/SystemUI/res/drawable-xhdpi/stat_sys_battery_charge_min_anim100.png
new file mode 100755
index 0000000..1a518c4
--- /dev/null
+++ b/packages/SystemUI/res/drawable-xhdpi/stat_sys_battery_charge_min_anim100.png
diff --git a/packages/SystemUI/res/drawable-xhdpi/stat_sys_battery_charge_min_anim15.png b/packages/SystemUI/res/drawable-xhdpi/stat_sys_battery_charge_min_anim15.png
new file mode 100755
index 0000000..e32069a
--- /dev/null
+++ b/packages/SystemUI/res/drawable-xhdpi/stat_sys_battery_charge_min_anim15.png
diff --git a/packages/SystemUI/res/drawable-xhdpi/stat_sys_battery_charge_min_anim28.png b/packages/SystemUI/res/drawable-xhdpi/stat_sys_battery_charge_min_anim28.png
new file mode 100755
index 0000000..7eef777
--- /dev/null
+++ b/packages/SystemUI/res/drawable-xhdpi/stat_sys_battery_charge_min_anim28.png
diff --git a/packages/SystemUI/res/drawable-xhdpi/stat_sys_battery_charge_min_anim43.png b/packages/SystemUI/res/drawable-xhdpi/stat_sys_battery_charge_min_anim43.png
new file mode 100755
index 0000000..359a020
--- /dev/null
+++ b/packages/SystemUI/res/drawable-xhdpi/stat_sys_battery_charge_min_anim43.png
diff --git a/packages/SystemUI/res/drawable-xhdpi/stat_sys_battery_charge_min_anim57.png b/packages/SystemUI/res/drawable-xhdpi/stat_sys_battery_charge_min_anim57.png
new file mode 100755
index 0000000..15225e2
--- /dev/null
+++ b/packages/SystemUI/res/drawable-xhdpi/stat_sys_battery_charge_min_anim57.png
diff --git a/packages/SystemUI/res/drawable-xhdpi/stat_sys_battery_charge_min_anim71.png b/packages/SystemUI/res/drawable-xhdpi/stat_sys_battery_charge_min_anim71.png
new file mode 100755
index 0000000..e401d01
--- /dev/null
+++ b/packages/SystemUI/res/drawable-xhdpi/stat_sys_battery_charge_min_anim71.png
diff --git a/packages/SystemUI/res/drawable-xhdpi/stat_sys_battery_charge_min_anim85.png b/packages/SystemUI/res/drawable-xhdpi/stat_sys_battery_charge_min_anim85.png
new file mode 100755
index 0000000..147c51c
--- /dev/null
+++ b/packages/SystemUI/res/drawable-xhdpi/stat_sys_battery_charge_min_anim85.png
diff --git a/packages/SystemUI/res/drawable-xhdpi/stat_sys_battery_min_0.png b/packages/SystemUI/res/drawable-xhdpi/stat_sys_battery_min_0.png
new file mode 100755
index 0000000..3389306
--- /dev/null
+++ b/packages/SystemUI/res/drawable-xhdpi/stat_sys_battery_min_0.png
diff --git a/packages/SystemUI/res/drawable-xhdpi/stat_sys_battery_min_100.png b/packages/SystemUI/res/drawable-xhdpi/stat_sys_battery_min_100.png
new file mode 100755
index 0000000..2176d9b
--- /dev/null
+++ b/packages/SystemUI/res/drawable-xhdpi/stat_sys_battery_min_100.png
diff --git a/packages/SystemUI/res/drawable-xhdpi/stat_sys_battery_min_15.png b/packages/SystemUI/res/drawable-xhdpi/stat_sys_battery_min_15.png
new file mode 100755
index 0000000..f34033d
--- /dev/null
+++ b/packages/SystemUI/res/drawable-xhdpi/stat_sys_battery_min_15.png
diff --git a/packages/SystemUI/res/drawable-xhdpi/stat_sys_battery_min_28.png b/packages/SystemUI/res/drawable-xhdpi/stat_sys_battery_min_28.png
new file mode 100755
index 0000000..fff6b28
--- /dev/null
+++ b/packages/SystemUI/res/drawable-xhdpi/stat_sys_battery_min_28.png
diff --git a/packages/SystemUI/res/drawable-xhdpi/stat_sys_battery_min_43.png b/packages/SystemUI/res/drawable-xhdpi/stat_sys_battery_min_43.png
new file mode 100755
index 0000000..17e4937
--- /dev/null
+++ b/packages/SystemUI/res/drawable-xhdpi/stat_sys_battery_min_43.png
diff --git a/packages/SystemUI/res/drawable-xhdpi/stat_sys_battery_min_57.png b/packages/SystemUI/res/drawable-xhdpi/stat_sys_battery_min_57.png
new file mode 100755
index 0000000..acc555f
--- /dev/null
+++ b/packages/SystemUI/res/drawable-xhdpi/stat_sys_battery_min_57.png
diff --git a/packages/SystemUI/res/drawable-xhdpi/stat_sys_battery_min_71.png b/packages/SystemUI/res/drawable-xhdpi/stat_sys_battery_min_71.png
new file mode 100755
index 0000000..82127eb
--- /dev/null
+++ b/packages/SystemUI/res/drawable-xhdpi/stat_sys_battery_min_71.png
diff --git a/packages/SystemUI/res/drawable-xhdpi/stat_sys_battery_min_85.png b/packages/SystemUI/res/drawable-xhdpi/stat_sys_battery_min_85.png
new file mode 100755
index 0000000..2ccba10
--- /dev/null
+++ b/packages/SystemUI/res/drawable-xhdpi/stat_sys_battery_min_85.png
diff --git a/packages/SystemUI/res/drawable/stat_sys_battery_charge_min.xml b/packages/SystemUI/res/drawable/stat_sys_battery_charge_min.xml
new file mode 100644
index 0000000..3ee6b7c
--- /dev/null
+++ b/packages/SystemUI/res/drawable/stat_sys_battery_charge_min.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+** Copyright 2011, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License"); 
+** you may not use this file except in compliance with the License. 
+** You may obtain a copy of the License at 
+**
+**     http://www.apache.org/licenses/LICENSE-2.0 
+**
+** Unless required by applicable law or agreed to in writing, software 
+** distributed under the License is distributed on an "AS IS" BASIS, 
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
+** See the License for the specific language governing permissions and 
+** limitations under the License.
+*/
+-->
+
+<level-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:maxLevel="4" android:drawable="@drawable/stat_sys_battery_charge_min_anim0" />
+    <item android:maxLevel="15" android:drawable="@drawable/stat_sys_battery_charge_min_anim15" />
+    <item android:maxLevel="35" android:drawable="@drawable/stat_sys_battery_charge_min_anim28" />
+    <item android:maxLevel="49" android:drawable="@drawable/stat_sys_battery_charge_min_anim43" />
+    <item android:maxLevel="60" android:drawable="@drawable/stat_sys_battery_charge_min_anim57" />
+    <item android:maxLevel="75" android:drawable="@drawable/stat_sys_battery_charge_min_anim71" />
+    <item android:maxLevel="90" android:drawable="@drawable/stat_sys_battery_charge_min_anim85" />
+    <item android:maxLevel="100" android:drawable="@drawable/stat_sys_battery_charge_min_anim100" />
+</level-list>
+
diff --git a/packages/SystemUI/res/drawable/stat_sys_battery_min.xml b/packages/SystemUI/res/drawable/stat_sys_battery_min.xml
new file mode 100644
index 0000000..d7daea0
--- /dev/null
+++ b/packages/SystemUI/res/drawable/stat_sys_battery_min.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/* //device/apps/common/res/drawable/stat_sys_battery.xml
+**
+** Copyright 2007, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License"); 
+** you may not use this file except in compliance with the License. 
+** You may obtain a copy of the License at 
+**
+**     http://www.apache.org/licenses/LICENSE-2.0 
+**
+** Unless required by applicable law or agreed to in writing, software 
+** distributed under the License is distributed on an "AS IS" BASIS, 
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
+** See the License for the specific language governing permissions and 
+** limitations under the License.
+*/
+-->
+
+<level-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:maxLevel="4" android:drawable="@drawable/stat_sys_battery_min_0" />
+    <item android:maxLevel="15" android:drawable="@drawable/stat_sys_battery_min_15" />
+    <item android:maxLevel="35" android:drawable="@drawable/stat_sys_battery_min_28" />
+    <item android:maxLevel="49" android:drawable="@drawable/stat_sys_battery_min_43" />
+    <item android:maxLevel="60" android:drawable="@drawable/stat_sys_battery_min_57" />
+    <item android:maxLevel="75" android:drawable="@drawable/stat_sys_battery_min_71" />
+    <item android:maxLevel="90" android:drawable="@drawable/stat_sys_battery_min_85" />
+    <item android:maxLevel="100" android:drawable="@drawable/stat_sys_battery_min_100" />
+</level-list>
+
diff --git a/packages/SystemUI/res/layout-sw600dp/status_bar_notification_area.xml b/packages/SystemUI/res/layout-sw600dp/status_bar_notification_area.xml
index 739f3aa..a19be0b 100644
--- a/packages/SystemUI/res/layout-sw600dp/status_bar_notification_area.xml
+++ b/packages/SystemUI/res/layout-sw600dp/status_bar_notification_area.xml
@@ -128,6 +128,17 @@
                 android:paddingLeft="4dip"
                 android:visibility="gone"
                 />
+            <TextView
+                android:id="@+id/battery_text"
+                android:textAppearance="@style/TextAppearance.StatusBar.Battery"
+                android:layout_width="wrap_content"
+                android:layout_height="match_parent"
+                android:singleLine="true"
+                android:textSize="20sp"
+                android:paddingLeft="4dip"
+                android:layout_marginRight="-3dip"
+                android:gravity="center_vertical|left"
+                />
             <ImageView
                 android:id="@+id/battery"
                 android:layout_height="wrap_content"
diff --git a/packages/SystemUI/res/layout/status_bar.xml b/packages/SystemUI/res/layout/status_bar.xml
index b1aaade..5af56ef 100644
--- a/packages/SystemUI/res/layout/status_bar.xml
+++ b/packages/SystemUI/res/layout/status_bar.xml
@@ -76,6 +76,16 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 />
+            <TextView
+                android:id="@+id/battery_text"
+                android:textAppearance="@style/TextAppearance.StatusBar.Battery"
+                android:layout_width="wrap_content"
+                android:layout_height="match_parent"
+                android:singleLine="true"
+                android:paddingLeft="4dip"
+                android:layout_marginRight="-3dip"
+                android:gravity="center_vertical|left"
+                />
             <ImageView
                 android:id="@+id/battery"
                 android:layout_height="wrap_content"
diff --git a/packages/SystemUI/res/values/strings.xml b/packages/SystemUI/res/values/strings.xml
index 28e5ca0..7861775 100644
--- a/packages/SystemUI/res/values/strings.xml
+++ b/packages/SystemUI/res/values/strings.xml
@@ -126,6 +126,11 @@
         <xliff:g id="number">%d</xliff:g><xliff:g id="percent">%%</xliff:g>
     </string>
 
+    <!-- Text to display next to the minimal graphical battery meter.  [CHAR LIMIT=3] -->
+    <string name="status_bar_settings_battery_meter_min_format" translatable="false">
+        <xliff:g id="number">%d</xliff:g>
+    </string>
+
     <!-- Separator for PLMN and SPN in network name. -->
     <string name="status_bar_network_name_separator" translatable="false">"\n"</string>
 
diff --git a/packages/SystemUI/res/values/styles.xml b/packages/SystemUI/res/values/styles.xml
index dc5c540..ebe8e70 100644
--- a/packages/SystemUI/res/values/styles.xml
+++ b/packages/SystemUI/res/values/styles.xml
@@ -40,6 +40,13 @@
         <item name="android:textColor">#FFFFFFFF</item>
     </style>
 
+    <style name="TextAppearance.StatusBar.Battery" parent="@*android:style/TextAppearance.StatusBar.Icon">
+        <!-- Note: must be dp to fit in status bar -->
+        <item name="android:textSize">12dp</item>
+        <item name="android:textStyle">normal</item>
+        <item name="android:textColor">@android:color/holo_blue_light</item>
+    </style>
+
     <style name="TextAppearance.StatusBar.Clock" parent="@*android:style/TextAppearance.StatusBar.Icon">
         <!-- Note: must be dp to fit in status bar -->
         <item name="android:textSize">16dp</item>
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
index 0175f13..01e52a9 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
@@ -383,6 +383,7 @@ public class PhoneStatusBar extends StatusBar {
         mLocationController = new LocationController(mContext); // will post a notification
         mBatteryController = new BatteryController(mContext);
         mBatteryController.addIconView((ImageView)sb.findViewById(R.id.battery));
+        mBatteryController.addLabelView((TextView)sb.findViewById(R.id.battery_text));
         mNetworkController = new NetworkController(mContext);
         final SignalClusterView signalCluster =
                 (SignalClusterView)sb.findViewById(R.id.signal_cluster);
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/BatteryController.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/BatteryController.java
index ff418c4..ed91d47 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/BatteryController.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/BatteryController.java
@@ -19,11 +19,15 @@ package com.android.systemui.statusbar.policy;
 import java.util.ArrayList;
 
 import android.content.BroadcastReceiver;
+import android.content.ContentResolver;
 import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
+import android.database.ContentObserver;
 import android.os.BatteryManager;
-import android.util.Slog;
+import android.os.Handler;
+import android.provider.Settings;
+import android.view.View;
 import android.widget.ImageView;
 import android.widget.TextView;
 
@@ -36,8 +40,47 @@ public class BatteryController extends BroadcastReceiver {
     private ArrayList<ImageView> mIconViews = new ArrayList<ImageView>();
     private ArrayList<TextView> mLabelViews = new ArrayList<TextView>();
 
+    private static final int BATTERY_STYLE_NORMAL  = 0;
+    private static final int BATTERY_STYLE_TEXT    = 1;
+    private static final int BATTERY_STYLE_GONE    = 2;
+
+    private static final int BATTERY_ICON_STYLE_NORMAL      = R.drawable.stat_sys_battery;
+    private static final int BATTERY_ICON_STYLE_CHARGE      = R.drawable.stat_sys_battery_charge;
+    private static final int BATTERY_ICON_STYLE_NORMAL_MIN  = R.drawable.stat_sys_battery_min;
+    private static final int BATTERY_ICON_STYLE_CHARGE_MIN  = R.drawable.stat_sys_battery_charge_min;
+
+    private static final int BATTERY_TEXT_STYLE_NORMAL  = R.string.status_bar_settings_battery_meter_format;
+    private static final int BATTERY_TEXT_STYLE_MIN     = R.string.status_bar_settings_battery_meter_min_format;
+
+    private boolean mBatteryPlugged = false;
+    private int mBatteryStyle;
+    private int mBatteryIcon = BATTERY_ICON_STYLE_NORMAL;
+
+    Handler mHandler;
+
+    class SettingsObserver extends ContentObserver {
+        SettingsObserver(Handler handler) {
+            super(handler);
+        }
+
+        void observe() {
+            ContentResolver resolver = mContext.getContentResolver();
+            resolver.registerContentObserver(Settings.System.getUriFor(
+                    Settings.System.STATUS_BAR_BATTERY), false, this);
+        }
+
+        @Override public void onChange(boolean selfChange) {
+            updateSettings();
+        }
+    }
+
     public BatteryController(Context context) {
         mContext = context;
+        mHandler = new Handler();
+
+        SettingsObserver settingsObserver = new SettingsObserver(mHandler);
+        settingsObserver.observe();
+        updateSettings();
 
         IntentFilter filter = new IntentFilter();
         filter.addAction(Intent.ACTION_BATTERY_CHANGED);
@@ -56,13 +99,11 @@ public class BatteryController extends BroadcastReceiver {
         final String action = intent.getAction();
         if (action.equals(Intent.ACTION_BATTERY_CHANGED)) {
             final int level = intent.getIntExtra(BatteryManager.EXTRA_LEVEL, 0);
-            final boolean plugged = intent.getIntExtra(BatteryManager.EXTRA_PLUGGED, 0) != 0;
-            final int icon = plugged ? R.drawable.stat_sys_battery_charge 
-                                     : R.drawable.stat_sys_battery;
+            mBatteryPlugged = intent.getIntExtra(BatteryManager.EXTRA_PLUGGED, 0) != 0;
+
             int N = mIconViews.size();
             for (int i=0; i<N; i++) {
                 ImageView v = mIconViews.get(i);
-                v.setImageResource(icon);
                 v.setImageLevel(level);
                 v.setContentDescription(mContext.getString(R.string.accessibility_battery_level,
                         level));
@@ -70,9 +111,47 @@ public class BatteryController extends BroadcastReceiver {
             N = mLabelViews.size();
             for (int i=0; i<N; i++) {
                 TextView v = mLabelViews.get(i);
-                v.setText(mContext.getString(R.string.status_bar_settings_battery_meter_format,
+                v.setText(mContext.getString(BATTERY_TEXT_STYLE_MIN,
                         level));
             }
+            updateBattery();
+        }
+    }
+
+    private void updateBattery() {
+        int mIcon = View.GONE;
+        int mText = View.GONE;
+        int mIconStyle = BATTERY_ICON_STYLE_NORMAL;
+
+        if (mBatteryStyle == 0) {
+            mIcon = (View.VISIBLE);
+            mIconStyle = mBatteryPlugged ? BATTERY_ICON_STYLE_CHARGE
+                    : BATTERY_ICON_STYLE_NORMAL;
+        } else if (mBatteryStyle == 1) {
+            mIcon = (View.VISIBLE);
+            mText = (View.VISIBLE);
+            mIconStyle = mBatteryPlugged ? BATTERY_ICON_STYLE_CHARGE_MIN
+                    : BATTERY_ICON_STYLE_NORMAL_MIN;
         }
+
+        int N = mIconViews.size();
+        for (int i=0; i<N; i++) {
+            ImageView v = mIconViews.get(i);
+            v.setVisibility(mIcon);
+            v.setImageResource(mIconStyle);
+        }
+        N = mLabelViews.size();
+        for (int i=0; i<N; i++) {
+            TextView v = mLabelViews.get(i);
+            v.setVisibility(mText);
+        }
+    }
+
+    private void updateSettings() {
+        ContentResolver resolver = mContext.getContentResolver();
+
+        mBatteryStyle = (Settings.System.getInt(resolver,
+                Settings.System.STATUS_BAR_BATTERY, 0));
+        updateBattery();
     }
 }
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/tablet/TabletStatusBar.java b/packages/SystemUI/src/com/android/systemui/statusbar/tablet/TabletStatusBar.java
index de16604..3fe486b 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/tablet/TabletStatusBar.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/tablet/TabletStatusBar.java
@@ -505,6 +505,8 @@ public class TabletStatusBar extends StatusBar implements
 
         mBatteryController = new BatteryController(mContext);
         mBatteryController.addIconView((ImageView)sb.findViewById(R.id.battery));
+        mBatteryController.addLabelView(
+                (TextView)sb.findViewById(R.id.battery_text));
         mBluetoothController = new BluetoothController(mContext);
         mBluetoothController.addIconView((ImageView)sb.findViewById(R.id.bluetooth));