am 0d9fece9: am eb7795ed: Merge "Use shortFormat instead of shortFormat4."

* commit '0d9fece9e82f92e45c118c4b89d02517c05221d8':
  Use shortFormat instead of shortFormat4.
This commit is contained in:
Narayan Kamath
2014-11-24 16:11:43 +00:00
committed by Android Git Automerger

View File

@@ -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;
@@ -667,8 +666,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');
}