summaryrefslogtreecommitdiffstats
path: root/packages
diff options
context:
space:
mode:
authorJohn Spurlock <jspurlock@google.com>2013-05-10 16:16:34 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-05-10 16:16:34 -0700
commit1a41a44e2fd5e3b94f49088f75990ad9e25036a2 (patch)
treee76260129a49cdef8aea85f5a061d0b0c023783f /packages
parent1483631c2f1fdacafd5b1c5c8c73721e21e2174b (diff)
parentae925f62b9bb582384408c269427215e4cbeb531 (diff)
downloadframeworks_base-1a41a44e2fd5e3b94f49088f75990ad9e25036a2.zip
frameworks_base-1a41a44e2fd5e3b94f49088f75990ad9e25036a2.tar.gz
frameworks_base-1a41a44e2fd5e3b94f49088f75990ad9e25036a2.tar.bz2
am ae925f62: am 11184922: Merge "Fix battery level quick settings tile bug." into jb-mr2-dev
* commit 'ae925f62b9bb582384408c269427215e4cbeb531': Fix battery level quick settings tile bug.
Diffstat (limited to 'packages')
-rw-r--r--packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickSettings.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickSettings.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickSettings.java
index df1eb67..85bcd8b 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickSettings.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickSettings.java
@@ -507,8 +507,8 @@ class QuickSettings {
: mContext.getString(R.string.status_bar_settings_battery_meter_format,
batteryState.batteryLevel);
}
- d.setLevel(batteryState.batteryLevel);
batteryTile.setImageDrawable(d);
+ batteryTile.getImageView().setImageLevel(batteryState.batteryLevel);
batteryTile.setText(t);
batteryTile.setContentDescription(
mContext.getString(R.string.accessibility_quick_settings_battery, t));