Merge "Fix tinting of battery percentage" into qt-dev
am: c34f078f61
Change-Id: I1e1778605b7415e2360d80d51c09f3d7faa8a664
This commit is contained in:
@@ -401,10 +401,10 @@ public class BatteryMeterView extends LinearLayout implements
|
|||||||
|| mShowPercentMode == MODE_ON || mShowPercentMode == MODE_ESTIMATE) {
|
|| mShowPercentMode == MODE_ON || mShowPercentMode == MODE_ESTIMATE) {
|
||||||
if (!showing) {
|
if (!showing) {
|
||||||
mBatteryPercentView = loadPercentView();
|
mBatteryPercentView = loadPercentView();
|
||||||
if (mTextColor != 0) mBatteryPercentView.setTextColor(mTextColor);
|
|
||||||
if (mPercentageStyleId != 0) { // Only set if specified as attribute
|
if (mPercentageStyleId != 0) { // Only set if specified as attribute
|
||||||
mBatteryPercentView.setTextAppearance(mPercentageStyleId);
|
mBatteryPercentView.setTextAppearance(mPercentageStyleId);
|
||||||
}
|
}
|
||||||
|
if (mTextColor != 0) mBatteryPercentView.setTextColor(mTextColor);
|
||||||
updatePercentText();
|
updatePercentText();
|
||||||
addView(mBatteryPercentView,
|
addView(mBatteryPercentView,
|
||||||
new ViewGroup.LayoutParams(
|
new ViewGroup.LayoutParams(
|
||||||
|
|||||||
Reference in New Issue
Block a user