From ad53f0b936067dd9b3161b47abbfe5af6e87c4a1 Mon Sep 17 00:00:00 2001
From: Narayan Kamath <narayan@google.com>
Date: Tue, 18 Nov 2014 15:17:44 +0000
Subject: [PATCH] Use shortFormat instead of shortFormat4.

Won't make a difference since shortFormat4 is simply shortFormat
with the 'y' characters doubled.

bug: 18388178
Change-Id: I6177807430b295035092367553da5de3b942e2d6
---
 src/com/android/settings/fuelgauge/BatteryHistoryChart.java | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/com/android/settings/fuelgauge/BatteryHistoryChart.java b/src/com/android/settings/fuelgauge/BatteryHistoryChart.java
index 4f17a8706e5..be988f3ceb6 100644
--- a/src/com/android/settings/fuelgauge/BatteryHistoryChart.java
+++ b/src/com/android/settings/fuelgauge/BatteryHistoryChart.java
@@ -20,7 +20,6 @@ import android.content.Intent;
 import android.graphics.Bitmap;
 import android.graphics.DashPathEffect;
 import android.os.BatteryManager;
-import android.provider.Settings;
 import android.text.format.DateFormat;
 import android.text.format.Formatter;
 import android.util.Log;
@@ -666,8 +665,8 @@ public class BatteryHistoryChart extends View {
     }
 
     private boolean isDayFirst() {
-        LocaleData d = LocaleData.get(mContext.getResources().getConfiguration().locale);
-        String value = d.shortDateFormat4;
+        final String value = LocaleData.get(getResources().getConfiguration().locale)
+                .getDateFormat(java.text.DateFormat.SHORT);
         return value.indexOf('M') > value.indexOf('d');
     }