Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am af7cf1c4: am 1601c604: am 14b50394: Reduce overly aggressive use of narrowAm / narrowPm.

Browse Source 
* commit 'af7cf1c495a660170c5907d7cc038fa2521f8d58':
  Reduce overly aggressive use of narrowAm / narrowPm.
This commit is contained in:
Narayan Kamath
2015-07-09 10:43:02 +00:00
committed by Android Git Automerger
parent 45e73d4238 af7cf1c495
commit 49df8dff5f
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/java/android/widget/TimePickerSpinnerDelegate.java
View File

@@ -592,8 +592,8 @@ class TimePickerSpinnerDelegate extends TimePicker.AbstractTimePickerDelegate {
public static String[] getAmPmStrings(Context context) {
String[] result = new String[2];
LocaleData d = LocaleData.get(context.getResources().getConfiguration().locale);
result[0] = d.amPm[0].length() > 2 ? d.narrowAm : d.amPm[0];
result[1] = d.amPm[1].length() > 2 ? d.narrowPm : d.amPm[1];
result[0] = d.amPm[0].length() > 4 ? d.narrowAm : d.amPm[0];
result[1] = d.amPm[1].length() > 4 ? d.narrowPm : d.amPm[1];
return result;
}
}