From 1cc51a6c6c656c6ef0a0e57f2acd6f6d82f17bd9 Mon Sep 17 00:00:00 2001 From: Elliott Hughes Date: Thu, 21 Aug 2014 16:21:30 -0700 Subject: Use CLDR narrow am/pm markers. Bug: 16938600 Bug: 16842390 Change-Id: Ia1c6470e233966c0d8c399d7c1a22c640fbc40e9 --- core/java/android/widget/TimePickerClockDelegate.java | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) (limited to 'core/java/android/widget/TimePickerClockDelegate.java') diff --git a/core/java/android/widget/TimePickerClockDelegate.java b/core/java/android/widget/TimePickerClockDelegate.java index 376e5b4..fd3f1da 100644 --- a/core/java/android/widget/TimePickerClockDelegate.java +++ b/core/java/android/widget/TimePickerClockDelegate.java @@ -37,6 +37,8 @@ import com.android.internal.R; import java.util.Calendar; import java.util.Locale; +import libcore.icu.LocaleData; + import static android.view.View.IMPORTANT_FOR_ACCESSIBILITY_AUTO; import static android.view.View.IMPORTANT_FOR_ACCESSIBILITY_YES; @@ -153,11 +155,8 @@ class TimePickerClockDelegate extends TimePicker.AbstractTimePickerDelegate { mMinuteSpinnerInput = (EditText) mMinuteSpinner.findViewById(R.id.numberpicker_input); mMinuteSpinnerInput.setImeOptions(EditorInfo.IME_ACTION_NEXT); - /* Get the localized am/pm strings and use them in the spinner */ - final Resources res = context.getResources(); - final String amText = res.getString(R.string.time_picker_am_label); - final String pmText = res.getString(R.string.time_picker_pm_label); - mAmPmStrings = new String[] {amText, pmText}; + // Get the localized am/pm strings and use them in the spinner. + mAmPmStrings = getAmPmStrings(context); // am/pm View amPmView = mDelegator.findViewById(R.id.amPm); @@ -613,5 +612,12 @@ class TimePickerClockDelegate 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]; + return result; + } +} -- cgit v1.1