am a312f7f8: Fix battery-history-chart large-mode labels in RTL layouts.

* commit 'a312f7f8044a07a2a41de477cc30bb34fc1df55f':
  Fix battery-history-chart large-mode labels in RTL layouts.
This commit is contained in:
John Spurlock
2014-10-13 22:03:54 +00:00
committed by Android Git Automerger

View File

@@ -1272,6 +1272,8 @@ public class BatteryHistoryChart extends View {
if (mLargeMode) { if (mLargeMode) {
if (DEBUG) Log.d(TAG, "Drawing large mode labels"); if (DEBUG) Log.d(TAG, "Drawing large mode labels");
Paint.Align align = mTextPaint.getTextAlign();
mTextPaint.setTextAlign(textAlignLeft); // large-mode labels always aligned to start
if (mHavePhoneSignal) { if (mHavePhoneSignal) {
canvas.drawText(mPhoneSignalLabel, textStartX, canvas.drawText(mPhoneSignalLabel, textStartX,
height - mPhoneSignalOffset - mTextDescent, mTextPaint); height - mPhoneSignalOffset - mTextDescent, mTextPaint);
@@ -1290,6 +1292,7 @@ public class BatteryHistoryChart extends View {
height - mChargingOffset - mTextDescent, mTextPaint); height - mChargingOffset - mTextDescent, mTextPaint);
canvas.drawText(mScreenOnLabel, textStartX, canvas.drawText(mScreenOnLabel, textStartX,
height - mScreenOnOffset - mTextDescent, mTextPaint); height - mScreenOnOffset - mTextDescent, mTextPaint);
mTextPaint.setTextAlign(align);
} }
canvas.drawLine(mLevelLeft-mThinLineWidth, mLevelTop, mLevelLeft-mThinLineWidth, canvas.drawLine(mLevelLeft-mThinLineWidth, mLevelTop, mLevelLeft-mThinLineWidth,