Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit af7cf1c4 authored by Narayan Kamath's avatar Narayan Kamath Committed by Android Git Automerger
Browse files

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

* commit '1601c604':
  Reduce overly aggressive use of narrowAm / narrowPm.
parents 37df186a 1601c604

core/java/android/widget/TimePickerSpinnerDelegate.java

+2 −2
Original line number Diff line number Diff line
@@ -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;

    }

}