From a312f7f8044a07a2a41de477cc30bb34fc1df55f Mon Sep 17 00:00:00 2001
From: John Spurlock <jspurlock@google.com>
Date: Mon, 13 Oct 2014 15:48:50 -0400
Subject: [PATCH] Fix battery-history-chart large-mode labels in RTL layouts.

Bug: 17425651
Change-Id: Iae53e111fa3c6bc822821a6a30bd34edb058c1a5
---
 src/com/android/settings/fuelgauge/BatteryHistoryChart.java | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/com/android/settings/fuelgauge/BatteryHistoryChart.java b/src/com/android/settings/fuelgauge/BatteryHistoryChart.java
index fbd0ea3edb1..765f101fc97 100644
--- a/src/com/android/settings/fuelgauge/BatteryHistoryChart.java
+++ b/src/com/android/settings/fuelgauge/BatteryHistoryChart.java
@@ -1272,6 +1272,8 @@ public class BatteryHistoryChart extends View {
 
         if (mLargeMode) {
             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) {
                 canvas.drawText(mPhoneSignalLabel, textStartX,
                         height - mPhoneSignalOffset - mTextDescent, mTextPaint);
@@ -1290,6 +1292,7 @@ public class BatteryHistoryChart extends View {
                     height - mChargingOffset - mTextDescent, mTextPaint);
             canvas.drawText(mScreenOnLabel, textStartX,
                     height - mScreenOnOffset - mTextDescent, mTextPaint);
+            mTextPaint.setTextAlign(align);
         }
 
         canvas.drawLine(mLevelLeft-mThinLineWidth, mLevelTop, mLevelLeft-mThinLineWidth,