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

Commit ed402566 authored by Elliott Hughes's avatar Elliott Hughes Committed by Android (Google) Code Review
Browse files

Merge "Use CLDR narrow am/pm markers." into lmp-dev

parents 7653a30e 1cc51a6c

core/java/android/widget/TimePickerClockDelegate.java

+12 −6
Original line number Diff line number Diff line
@@ -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;
@@ -143,11 +145,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);
@@ -601,5 +600,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;

    }

}

core/java/android/widget/TimePickerSpinnerDelegate.java

+4 −2
Original line number Diff line number Diff line
@@ -127,8 +127,10 @@ class TimePickerSpinnerDelegate extends TimePicker.AbstractTimePickerDelegate im 
        mSelectHours = res.getString(R.string.select_hours);

        mMinutePickerDescription = res.getString(R.string.minute_picker_description);

        mSelectMinutes = res.getString(R.string.select_minutes);

        mAmText = res.getString(R.string.time_picker_am_label);

        mPmText = res.getString(R.string.time_picker_pm_label);



        String[] amPmStrings = TimePickerClockDelegate.getAmPmStrings(context);

        mAmText = amPmStrings[0];

        mPmText = amPmStrings[1];



        final int layoutResourceId = a.getResourceId(R.styleable.TimePicker_internalLayout,

                R.layout.time_picker_holo);

core/res/res/values/strings.xml

+0 −4
Original line number Diff line number Diff line
@@ -4142,10 +4142,6 @@ 
    <string name="time_picker_increment_set_pm_button">Set PM</string>

    <!-- Description of the button to decrease the TimePicker's set AM value. [CHAR LIMIT=NONE] -->

    <string name="time_picker_decrement_set_am_button">Set AM</string>

    <!-- Label for the TimePicker's PM button. [CHAR LIMIT=2] -->

    <string name="time_picker_pm_label">PM</string>

    <!-- Label for the TimePicker's AM button. [CHAR LIMIT=2] -->

    <string name="time_picker_am_label">AM</string>



    <!-- DatePicker - accessibility support -->

    <!-- Description of the button to increase the DatePicker's month value. [CHAR LIMIT=NONE] -->

core/res/res/values/symbols.xml

+0 −2
Original line number Diff line number Diff line
@@ -1985,8 +1985,6 @@ 
  <java-symbol type="attr" name="headerSelectedTextColor" />

  <java-symbol type="attr" name="amPmSelectedBackgroundColor" />

  <java-symbol type="bool" name="config_sms_decode_gsm_8bit_data" />

  <java-symbol type="string" name="time_picker_am_label" />

  <java-symbol type="string" name="time_picker_pm_label" />

  <java-symbol type="dimen" name="text_size_small_material" />

  <java-symbol type="attr" name="checkMarkGravity" />

  <java-symbol type="layout" name="select_dialog_singlechoice_material" />