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

Commit 7870dfe3 authored by Alan Viverette's avatar Alan Viverette Committed by Android (Google) Code Review
Browse files

Merge "Use translatable strings for time picker AM/PM labels" into lmp-dev

parents 95202de0 271ed9ae

core/java/android/widget/TimePickerClockDelegate.java

+5 −1
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ package android.widget; 


import android.content.Context;

import android.content.res.Configuration;

import android.content.res.Resources;

import android.content.res.TypedArray;

import android.graphics.Color;

import android.os.Parcel;
@@ -171,7 +172,10 @@ class TimePickerClockDelegate extends TimePicker.AbstractTimePickerDelegate { 
        mMinuteSpinnerInput.setImeOptions(EditorInfo.IME_ACTION_NEXT);



            /* Get the localized am/pm strings and use them in the spinner */

        mAmPmStrings = new DateFormatSymbols().getAmPmStrings();

        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};



        // am/pm

        View amPmView = mDelegator.findViewById(R.id.amPm);

core/java/android/widget/TimePickerSpinnerDelegate.java

+2 −4
Original line number Diff line number Diff line
@@ -134,6 +134,8 @@ 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);



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

                R.layout.time_picker_holo);
@@ -182,10 +184,6 @@ class TimePickerSpinnerDelegate extends TimePicker.AbstractTimePickerDelegate im 
                R.id.radial_picker);

        mDoneButton = (Button) mainView.findViewById(R.id.done_button);



        String[] amPmTexts = new DateFormatSymbols().getAmPmStrings();

        mAmText = amPmTexts[0];

        mPmText = amPmTexts[1];



        setupListeners();



        mAllowAutoAdvance = true;

core/res/res/values/strings.xml

+4 −0
Original line number Diff line number Diff line
@@ -4134,6 +4134,10 @@ 
    <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

+2 −4
Original line number Diff line number Diff line
@@ -1969,9 +1969,7 @@ 
  <java-symbol type="array" name="config_cdma_home_system" />

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

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



  <!--From SmsMessage-->

  <!--Support decoding the user data payload as pack GSM 8-bit (a GSM alphabet

     string that's stored in 8-bit unpacked format) characters.-->

  <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" />

</resources>