diff options
| author | Svetoslav Ganov <svetoslavganov@google.com> | 2012-03-19 20:03:45 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-03-19 20:03:45 -0700 |
| commit | 52c10554628079e38cde2e9b13bde5099deeca35 (patch) | |
| tree | 1abc4e4e799460feb870299867ce4197c9242eb6 /core/java/android/widget/TimePicker.java | |
| parent | 485932f6afa1541caa9429835ef44a928e7ddfb1 (diff) | |
| parent | efd1c6777929e5a81a030fc51145cd3064d3e979 (diff) | |
| download | frameworks_base-52c10554628079e38cde2e9b13bde5099deeca35.zip frameworks_base-52c10554628079e38cde2e9b13bde5099deeca35.tar.gz frameworks_base-52c10554628079e38cde2e9b13bde5099deeca35.tar.bz2 | |
Merge "Revert "Revamp of the NumberPicker widget.""
Diffstat (limited to 'core/java/android/widget/TimePicker.java')
| -rw-r--r-- | core/java/android/widget/TimePicker.java | 31 |
1 files changed, 12 insertions, 19 deletions
diff --git a/core/java/android/widget/TimePicker.java b/core/java/android/widget/TimePicker.java index bc88b62..7eff1aa 100644 --- a/core/java/android/widget/TimePicker.java +++ b/core/java/android/widget/TimePicker.java @@ -532,28 +532,21 @@ public class TimePicker extends FrameLayout { private void setContentDescriptions() { // Minute - trySetContentDescription(mMinuteSpinner, R.id.increment, - R.string.time_picker_increment_minute_button); - trySetContentDescription(mMinuteSpinner, R.id.decrement, - R.string.time_picker_decrement_minute_button); + String text = mContext.getString(R.string.time_picker_increment_minute_button); + mMinuteSpinner.findViewById(R.id.increment).setContentDescription(text); + text = mContext.getString(R.string.time_picker_decrement_minute_button); + mMinuteSpinner.findViewById(R.id.decrement).setContentDescription(text); // Hour - trySetContentDescription(mHourSpinner, R.id.increment, - R.string.time_picker_increment_hour_button); - trySetContentDescription(mHourSpinner, R.id.decrement, - R.string.time_picker_decrement_hour_button); + text = mContext.getString(R.string.time_picker_increment_hour_button); + mHourSpinner.findViewById(R.id.increment).setContentDescription(text); + text = mContext.getString(R.string.time_picker_decrement_hour_button); + mHourSpinner.findViewById(R.id.decrement).setContentDescription(text); // AM/PM if (mAmPmSpinner != null) { - trySetContentDescription(mAmPmSpinner, R.id.increment, - R.string.time_picker_increment_set_pm_button); - trySetContentDescription(mAmPmSpinner, R.id.decrement, - R.string.time_picker_decrement_set_am_button); - } - } - - private void trySetContentDescription(View root, int viewId, int contDescResId) { - View target = root.findViewById(viewId); - if (target != null) { - target.setContentDescription(mContext.getString(contDescResId)); + text = mContext.getString(R.string.time_picker_increment_set_pm_button); + mAmPmSpinner.findViewById(R.id.increment).setContentDescription(text); + text = mContext.getString(R.string.time_picker_decrement_set_am_button); + mAmPmSpinner.findViewById(R.id.decrement).setContentDescription(text); } } |