diff options
author | Daniel Sandler <dsandler@android.com> | 2010-12-07 12:03:36 -0800 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-12-07 12:03:36 -0800 |
commit | f340d082b8488de6f131c1e5932cd3abc16b47c1 (patch) | |
tree | 48b1696a3bd19cea501da7274573cd323b0173fd | |
parent | 47e6ccb65ab0088cf04809c234cdb5f747579c8c (diff) | |
parent | 5ebb8507d5a1c593dbcd920e3a9876c0a4f85ea0 (diff) | |
download | frameworks_base-f340d082b8488de6f131c1e5932cd3abc16b47c1.zip frameworks_base-f340d082b8488de6f131c1e5932cd3abc16b47c1.tar.gz frameworks_base-f340d082b8488de6f131c1e5932cd3abc16b47c1.tar.bz2 |
Merge "More precise status bar battery icons." into gingerbread
57 files changed, 20 insertions, 6 deletions
diff --git a/core/res/res/drawable-hdpi/stat_sys_battery_0.png b/core/res/res/drawable-hdpi/stat_sys_battery_0.png Binary files differindex 82f2509..572e0d3 100644 --- a/core/res/res/drawable-hdpi/stat_sys_battery_0.png +++ b/core/res/res/drawable-hdpi/stat_sys_battery_0.png diff --git a/core/res/res/drawable-hdpi/stat_sys_battery_10.png b/core/res/res/drawable-hdpi/stat_sys_battery_10.png Binary files differindex 4486553..c9d9436 100755 --- a/core/res/res/drawable-hdpi/stat_sys_battery_10.png +++ b/core/res/res/drawable-hdpi/stat_sys_battery_10.png diff --git a/core/res/res/drawable-hdpi/stat_sys_battery_100.png b/core/res/res/drawable-hdpi/stat_sys_battery_100.png Binary files differindex e49448d..754cdf6 100755 --- a/core/res/res/drawable-hdpi/stat_sys_battery_100.png +++ b/core/res/res/drawable-hdpi/stat_sys_battery_100.png diff --git a/core/res/res/drawable-hdpi/stat_sys_battery_15.png b/core/res/res/drawable-hdpi/stat_sys_battery_15.png Binary files differnew file mode 100644 index 0000000..0b9bed8 --- /dev/null +++ b/core/res/res/drawable-hdpi/stat_sys_battery_15.png diff --git a/core/res/res/drawable-hdpi/stat_sys_battery_20.png b/core/res/res/drawable-hdpi/stat_sys_battery_20.png Binary files differindex c8f9c92..c22fead 100755 --- a/core/res/res/drawable-hdpi/stat_sys_battery_20.png +++ b/core/res/res/drawable-hdpi/stat_sys_battery_20.png diff --git a/core/res/res/drawable-hdpi/stat_sys_battery_25.png b/core/res/res/drawable-hdpi/stat_sys_battery_25.png Binary files differnew file mode 100644 index 0000000..7c7030a --- /dev/null +++ b/core/res/res/drawable-hdpi/stat_sys_battery_25.png diff --git a/core/res/res/drawable-hdpi/stat_sys_battery_30.png b/core/res/res/drawable-hdpi/stat_sys_battery_30.png Binary files differnew file mode 100644 index 0000000..d0342df --- /dev/null +++ b/core/res/res/drawable-hdpi/stat_sys_battery_30.png diff --git a/core/res/res/drawable-hdpi/stat_sys_battery_35.png b/core/res/res/drawable-hdpi/stat_sys_battery_35.png Binary files differnew file mode 100644 index 0000000..00190ab --- /dev/null +++ b/core/res/res/drawable-hdpi/stat_sys_battery_35.png diff --git a/core/res/res/drawable-hdpi/stat_sys_battery_40.png b/core/res/res/drawable-hdpi/stat_sys_battery_40.png Binary files differindex 441bbfb..ced08cd 100755 --- a/core/res/res/drawable-hdpi/stat_sys_battery_40.png +++ b/core/res/res/drawable-hdpi/stat_sys_battery_40.png diff --git a/core/res/res/drawable-hdpi/stat_sys_battery_45.png b/core/res/res/drawable-hdpi/stat_sys_battery_45.png Binary files differnew file mode 100644 index 0000000..8f60486 --- /dev/null +++ b/core/res/res/drawable-hdpi/stat_sys_battery_45.png diff --git a/core/res/res/drawable-hdpi/stat_sys_battery_5.png b/core/res/res/drawable-hdpi/stat_sys_battery_5.png Binary files differnew file mode 100644 index 0000000..d9c6135 --- /dev/null +++ b/core/res/res/drawable-hdpi/stat_sys_battery_5.png diff --git a/core/res/res/drawable-hdpi/stat_sys_battery_50.png b/core/res/res/drawable-hdpi/stat_sys_battery_50.png Binary files differnew file mode 100644 index 0000000..ff0ef0d --- /dev/null +++ b/core/res/res/drawable-hdpi/stat_sys_battery_50.png diff --git a/core/res/res/drawable-hdpi/stat_sys_battery_55.png b/core/res/res/drawable-hdpi/stat_sys_battery_55.png Binary files differnew file mode 100644 index 0000000..3f7581d --- /dev/null +++ b/core/res/res/drawable-hdpi/stat_sys_battery_55.png diff --git a/core/res/res/drawable-hdpi/stat_sys_battery_60.png b/core/res/res/drawable-hdpi/stat_sys_battery_60.png Binary files differindex d9467ed..359d65e 100755 --- a/core/res/res/drawable-hdpi/stat_sys_battery_60.png +++ b/core/res/res/drawable-hdpi/stat_sys_battery_60.png diff --git a/core/res/res/drawable-hdpi/stat_sys_battery_65.png b/core/res/res/drawable-hdpi/stat_sys_battery_65.png Binary files differnew file mode 100644 index 0000000..b3dc834 --- /dev/null +++ b/core/res/res/drawable-hdpi/stat_sys_battery_65.png diff --git a/core/res/res/drawable-hdpi/stat_sys_battery_70.png b/core/res/res/drawable-hdpi/stat_sys_battery_70.png Binary files differnew file mode 100644 index 0000000..4995289 --- /dev/null +++ b/core/res/res/drawable-hdpi/stat_sys_battery_70.png diff --git a/core/res/res/drawable-hdpi/stat_sys_battery_75.png b/core/res/res/drawable-hdpi/stat_sys_battery_75.png Binary files differnew file mode 100644 index 0000000..011f82e --- /dev/null +++ b/core/res/res/drawable-hdpi/stat_sys_battery_75.png diff --git a/core/res/res/drawable-hdpi/stat_sys_battery_80.png b/core/res/res/drawable-hdpi/stat_sys_battery_80.png Binary files differindex e3f4805..24b32c1 100755 --- a/core/res/res/drawable-hdpi/stat_sys_battery_80.png +++ b/core/res/res/drawable-hdpi/stat_sys_battery_80.png diff --git a/core/res/res/drawable-hdpi/stat_sys_battery_85.png b/core/res/res/drawable-hdpi/stat_sys_battery_85.png Binary files differnew file mode 100644 index 0000000..2be76e0 --- /dev/null +++ b/core/res/res/drawable-hdpi/stat_sys_battery_85.png diff --git a/core/res/res/drawable-hdpi/stat_sys_battery_90.png b/core/res/res/drawable-hdpi/stat_sys_battery_90.png Binary files differnew file mode 100644 index 0000000..74c3e49 --- /dev/null +++ b/core/res/res/drawable-hdpi/stat_sys_battery_90.png diff --git a/core/res/res/drawable-hdpi/stat_sys_battery_95.png b/core/res/res/drawable-hdpi/stat_sys_battery_95.png Binary files differnew file mode 100644 index 0000000..2cac442 --- /dev/null +++ b/core/res/res/drawable-hdpi/stat_sys_battery_95.png diff --git a/core/res/res/drawable-hdpi/stat_sys_battery_charge_anim0.png b/core/res/res/drawable-hdpi/stat_sys_battery_charge_anim0.png Binary files differindex c7464f7..061bd2a 100755 --- a/core/res/res/drawable-hdpi/stat_sys_battery_charge_anim0.png +++ b/core/res/res/drawable-hdpi/stat_sys_battery_charge_anim0.png diff --git a/core/res/res/drawable-hdpi/stat_sys_battery_charge_anim1.png b/core/res/res/drawable-hdpi/stat_sys_battery_charge_anim1.png Binary files differindex 997feb3..895ade2 100755 --- a/core/res/res/drawable-hdpi/stat_sys_battery_charge_anim1.png +++ b/core/res/res/drawable-hdpi/stat_sys_battery_charge_anim1.png diff --git a/core/res/res/drawable-hdpi/stat_sys_battery_charge_anim2.png b/core/res/res/drawable-hdpi/stat_sys_battery_charge_anim2.png Binary files differindex 426a66b..ba57679 100755 --- a/core/res/res/drawable-hdpi/stat_sys_battery_charge_anim2.png +++ b/core/res/res/drawable-hdpi/stat_sys_battery_charge_anim2.png diff --git a/core/res/res/drawable-hdpi/stat_sys_battery_charge_anim3.png b/core/res/res/drawable-hdpi/stat_sys_battery_charge_anim3.png Binary files differindex 21582ca..85f461a 100755 --- a/core/res/res/drawable-hdpi/stat_sys_battery_charge_anim3.png +++ b/core/res/res/drawable-hdpi/stat_sys_battery_charge_anim3.png diff --git a/core/res/res/drawable-hdpi/stat_sys_battery_charge_anim4.png b/core/res/res/drawable-hdpi/stat_sys_battery_charge_anim4.png Binary files differindex 8a94763..4766067 100755 --- a/core/res/res/drawable-hdpi/stat_sys_battery_charge_anim4.png +++ b/core/res/res/drawable-hdpi/stat_sys_battery_charge_anim4.png diff --git a/core/res/res/drawable-hdpi/stat_sys_battery_charge_anim5.png b/core/res/res/drawable-hdpi/stat_sys_battery_charge_anim5.png Binary files differindex fad0d65..8708473 100755 --- a/core/res/res/drawable-hdpi/stat_sys_battery_charge_anim5.png +++ b/core/res/res/drawable-hdpi/stat_sys_battery_charge_anim5.png diff --git a/core/res/res/drawable-hdpi/stat_sys_battery_unknown.png b/core/res/res/drawable-hdpi/stat_sys_battery_unknown.png Binary files differindex dadfe8d..9d65883 100755 --- a/core/res/res/drawable-hdpi/stat_sys_battery_unknown.png +++ b/core/res/res/drawable-hdpi/stat_sys_battery_unknown.png diff --git a/core/res/res/drawable-mdpi/stat_sys_battery_0.png b/core/res/res/drawable-mdpi/stat_sys_battery_0.png Binary files differindex a7068b2..aff0868 100644 --- a/core/res/res/drawable-mdpi/stat_sys_battery_0.png +++ b/core/res/res/drawable-mdpi/stat_sys_battery_0.png diff --git a/core/res/res/drawable-mdpi/stat_sys_battery_10.png b/core/res/res/drawable-mdpi/stat_sys_battery_10.png Binary files differindex 8fd88f3..eedc2b0 100644 --- a/core/res/res/drawable-mdpi/stat_sys_battery_10.png +++ b/core/res/res/drawable-mdpi/stat_sys_battery_10.png diff --git a/core/res/res/drawable-mdpi/stat_sys_battery_100.png b/core/res/res/drawable-mdpi/stat_sys_battery_100.png Binary files differindex 5267517..17a955d 100644 --- a/core/res/res/drawable-mdpi/stat_sys_battery_100.png +++ b/core/res/res/drawable-mdpi/stat_sys_battery_100.png diff --git a/core/res/res/drawable-mdpi/stat_sys_battery_15.png b/core/res/res/drawable-mdpi/stat_sys_battery_15.png Binary files differnew file mode 100644 index 0000000..eef8c92 --- /dev/null +++ b/core/res/res/drawable-mdpi/stat_sys_battery_15.png diff --git a/core/res/res/drawable-mdpi/stat_sys_battery_20.png b/core/res/res/drawable-mdpi/stat_sys_battery_20.png Binary files differindex 8bc41f0..999299f 100644 --- a/core/res/res/drawable-mdpi/stat_sys_battery_20.png +++ b/core/res/res/drawable-mdpi/stat_sys_battery_20.png diff --git a/core/res/res/drawable-mdpi/stat_sys_battery_25.png b/core/res/res/drawable-mdpi/stat_sys_battery_25.png Binary files differnew file mode 100644 index 0000000..9f5f68d --- /dev/null +++ b/core/res/res/drawable-mdpi/stat_sys_battery_25.png diff --git a/core/res/res/drawable-mdpi/stat_sys_battery_30.png b/core/res/res/drawable-mdpi/stat_sys_battery_30.png Binary files differnew file mode 100644 index 0000000..b77c5e3 --- /dev/null +++ b/core/res/res/drawable-mdpi/stat_sys_battery_30.png diff --git a/core/res/res/drawable-mdpi/stat_sys_battery_35.png b/core/res/res/drawable-mdpi/stat_sys_battery_35.png Binary files differnew file mode 100644 index 0000000..018f980 --- /dev/null +++ b/core/res/res/drawable-mdpi/stat_sys_battery_35.png diff --git a/core/res/res/drawable-mdpi/stat_sys_battery_40.png b/core/res/res/drawable-mdpi/stat_sys_battery_40.png Binary files differindex d827ce9..42e556d 100644 --- a/core/res/res/drawable-mdpi/stat_sys_battery_40.png +++ b/core/res/res/drawable-mdpi/stat_sys_battery_40.png diff --git a/core/res/res/drawable-mdpi/stat_sys_battery_45.png b/core/res/res/drawable-mdpi/stat_sys_battery_45.png Binary files differnew file mode 100644 index 0000000..e6b6a6c --- /dev/null +++ b/core/res/res/drawable-mdpi/stat_sys_battery_45.png diff --git a/core/res/res/drawable-mdpi/stat_sys_battery_5.png b/core/res/res/drawable-mdpi/stat_sys_battery_5.png Binary files differnew file mode 100644 index 0000000..60636a5 --- /dev/null +++ b/core/res/res/drawable-mdpi/stat_sys_battery_5.png diff --git a/core/res/res/drawable-mdpi/stat_sys_battery_50.png b/core/res/res/drawable-mdpi/stat_sys_battery_50.png Binary files differnew file mode 100644 index 0000000..eea9221 --- /dev/null +++ b/core/res/res/drawable-mdpi/stat_sys_battery_50.png diff --git a/core/res/res/drawable-mdpi/stat_sys_battery_55.png b/core/res/res/drawable-mdpi/stat_sys_battery_55.png Binary files differnew file mode 100644 index 0000000..067cbf1 --- /dev/null +++ b/core/res/res/drawable-mdpi/stat_sys_battery_55.png diff --git a/core/res/res/drawable-mdpi/stat_sys_battery_60.png b/core/res/res/drawable-mdpi/stat_sys_battery_60.png Binary files differindex 53399dc..0d4ea98 100644 --- a/core/res/res/drawable-mdpi/stat_sys_battery_60.png +++ b/core/res/res/drawable-mdpi/stat_sys_battery_60.png diff --git a/core/res/res/drawable-mdpi/stat_sys_battery_65.png b/core/res/res/drawable-mdpi/stat_sys_battery_65.png Binary files differnew file mode 100644 index 0000000..9e36b78 --- /dev/null +++ b/core/res/res/drawable-mdpi/stat_sys_battery_65.png diff --git a/core/res/res/drawable-mdpi/stat_sys_battery_70.png b/core/res/res/drawable-mdpi/stat_sys_battery_70.png Binary files differnew file mode 100644 index 0000000..0d22fbc --- /dev/null +++ b/core/res/res/drawable-mdpi/stat_sys_battery_70.png diff --git a/core/res/res/drawable-mdpi/stat_sys_battery_75.png b/core/res/res/drawable-mdpi/stat_sys_battery_75.png Binary files differnew file mode 100644 index 0000000..409127b --- /dev/null +++ b/core/res/res/drawable-mdpi/stat_sys_battery_75.png diff --git a/core/res/res/drawable-mdpi/stat_sys_battery_80.png b/core/res/res/drawable-mdpi/stat_sys_battery_80.png Binary files differindex f38af5d..9bb5a4d 100644 --- a/core/res/res/drawable-mdpi/stat_sys_battery_80.png +++ b/core/res/res/drawable-mdpi/stat_sys_battery_80.png diff --git a/core/res/res/drawable-mdpi/stat_sys_battery_85.png b/core/res/res/drawable-mdpi/stat_sys_battery_85.png Binary files differnew file mode 100644 index 0000000..5d832cf --- /dev/null +++ b/core/res/res/drawable-mdpi/stat_sys_battery_85.png diff --git a/core/res/res/drawable-mdpi/stat_sys_battery_90.png b/core/res/res/drawable-mdpi/stat_sys_battery_90.png Binary files differnew file mode 100644 index 0000000..5245336 --- /dev/null +++ b/core/res/res/drawable-mdpi/stat_sys_battery_90.png diff --git a/core/res/res/drawable-mdpi/stat_sys_battery_95.png b/core/res/res/drawable-mdpi/stat_sys_battery_95.png Binary files differnew file mode 100644 index 0000000..2e72e4e --- /dev/null +++ b/core/res/res/drawable-mdpi/stat_sys_battery_95.png diff --git a/core/res/res/drawable-mdpi/stat_sys_battery_charge_anim0.png b/core/res/res/drawable-mdpi/stat_sys_battery_charge_anim0.png Binary files differindex 9f3da11..59ee091 100644 --- a/core/res/res/drawable-mdpi/stat_sys_battery_charge_anim0.png +++ b/core/res/res/drawable-mdpi/stat_sys_battery_charge_anim0.png diff --git a/core/res/res/drawable-mdpi/stat_sys_battery_charge_anim1.png b/core/res/res/drawable-mdpi/stat_sys_battery_charge_anim1.png Binary files differindex 8f8c81e..5d9bd74 100644 --- a/core/res/res/drawable-mdpi/stat_sys_battery_charge_anim1.png +++ b/core/res/res/drawable-mdpi/stat_sys_battery_charge_anim1.png diff --git a/core/res/res/drawable-mdpi/stat_sys_battery_charge_anim2.png b/core/res/res/drawable-mdpi/stat_sys_battery_charge_anim2.png Binary files differindex 12fd03f..5f0e9bc 100644 --- a/core/res/res/drawable-mdpi/stat_sys_battery_charge_anim2.png +++ b/core/res/res/drawable-mdpi/stat_sys_battery_charge_anim2.png diff --git a/core/res/res/drawable-mdpi/stat_sys_battery_charge_anim3.png b/core/res/res/drawable-mdpi/stat_sys_battery_charge_anim3.png Binary files differindex 641896c..c0fd42c 100644 --- a/core/res/res/drawable-mdpi/stat_sys_battery_charge_anim3.png +++ b/core/res/res/drawable-mdpi/stat_sys_battery_charge_anim3.png diff --git a/core/res/res/drawable-mdpi/stat_sys_battery_charge_anim4.png b/core/res/res/drawable-mdpi/stat_sys_battery_charge_anim4.png Binary files differindex 6bd19b5..6d39d70 100644 --- a/core/res/res/drawable-mdpi/stat_sys_battery_charge_anim4.png +++ b/core/res/res/drawable-mdpi/stat_sys_battery_charge_anim4.png diff --git a/core/res/res/drawable-mdpi/stat_sys_battery_charge_anim5.png b/core/res/res/drawable-mdpi/stat_sys_battery_charge_anim5.png Binary files differindex f9353c0..e5e3ac5 100644 --- a/core/res/res/drawable-mdpi/stat_sys_battery_charge_anim5.png +++ b/core/res/res/drawable-mdpi/stat_sys_battery_charge_anim5.png diff --git a/core/res/res/drawable-mdpi/stat_sys_battery_unknown.png b/core/res/res/drawable-mdpi/stat_sys_battery_unknown.png Binary files differindex 506cb45..8c31cd1 100644 --- a/core/res/res/drawable-mdpi/stat_sys_battery_unknown.png +++ b/core/res/res/drawable-mdpi/stat_sys_battery_unknown.png diff --git a/core/res/res/drawable/stat_sys_battery.xml b/core/res/res/drawable/stat_sys_battery.xml index 968595d..8261243 100644 --- a/core/res/res/drawable/stat_sys_battery.xml +++ b/core/res/res/drawable/stat_sys_battery.xml @@ -19,12 +19,26 @@ --> <level-list xmlns:android="http://schemas.android.com/apk/res/android"> - <item android:maxLevel="4" android:drawable="@android:drawable/stat_sys_battery_0" /> - <item android:maxLevel="14" android:drawable="@android:drawable/stat_sys_battery_10" /> - <item android:maxLevel="29" android:drawable="@android:drawable/stat_sys_battery_20" /> - <item android:maxLevel="49" android:drawable="@android:drawable/stat_sys_battery_40" /> - <item android:maxLevel="69" android:drawable="@android:drawable/stat_sys_battery_60" /> - <item android:maxLevel="89" android:drawable="@android:drawable/stat_sys_battery_80" /> + <item android:maxLevel="2" android:drawable="@android:drawable/stat_sys_battery_0" /> + <item android:maxLevel="7" android:drawable="@android:drawable/stat_sys_battery_5" /> + <item android:maxLevel="12" android:drawable="@android:drawable/stat_sys_battery_10" /> + <item android:maxLevel="17" android:drawable="@android:drawable/stat_sys_battery_15" /> + <item android:maxLevel="22" android:drawable="@android:drawable/stat_sys_battery_20" /> + <item android:maxLevel="27" android:drawable="@android:drawable/stat_sys_battery_25" /> + <item android:maxLevel="32" android:drawable="@android:drawable/stat_sys_battery_30" /> + <item android:maxLevel="37" android:drawable="@android:drawable/stat_sys_battery_35" /> + <item android:maxLevel="42" android:drawable="@android:drawable/stat_sys_battery_40" /> + <item android:maxLevel="47" android:drawable="@android:drawable/stat_sys_battery_45" /> + <item android:maxLevel="52" android:drawable="@android:drawable/stat_sys_battery_50" /> + <item android:maxLevel="57" android:drawable="@android:drawable/stat_sys_battery_55" /> + <item android:maxLevel="62" android:drawable="@android:drawable/stat_sys_battery_60" /> + <item android:maxLevel="67" android:drawable="@android:drawable/stat_sys_battery_65" /> + <item android:maxLevel="72" android:drawable="@android:drawable/stat_sys_battery_70" /> + <item android:maxLevel="77" android:drawable="@android:drawable/stat_sys_battery_75" /> + <item android:maxLevel="82" android:drawable="@android:drawable/stat_sys_battery_80" /> + <item android:maxLevel="87" android:drawable="@android:drawable/stat_sys_battery_85" /> + <item android:maxLevel="92" android:drawable="@android:drawable/stat_sys_battery_90" /> + <item android:maxLevel="97" android:drawable="@android:drawable/stat_sys_battery_95" /> <item android:maxLevel="100" android:drawable="@android:drawable/stat_sys_battery_100" /> </level-list> |