Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "TimePicker CTS test failing."

Browse Source
This commit is contained in:
Svetoslav Ganov
2011-09-14 19:07:23 -07:00
committed by Android (Google) Code Review
parent b07f6e09ea 11c9132818
commit de16e00f6d
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
core/java/android/widget/TimePicker.java
View File

@@ -218,9 +218,9 @@ public class TimePicker extends FrameLayout {
updateAmPmControl(); updateAmPmControl();
} }
}); });
EditText amPmInput = (EditText) mAmPmSpinner.findViewById(R.id.numberpicker_input);
amPmInput.setImeOptions(EditorInfo.IME_ACTION_DONE);
} }
EditText amPmInput = (EditText) mAmPmSpinner.findViewById(R.id.numberpicker_input);
amPmInput.setImeOptions(EditorInfo.IME_ACTION_DONE);
// update controls to initial state // update controls to initial state
updateHourControl(); updateHourControl();
@@ -519,9 +519,11 @@ public class TimePicker extends FrameLayout {
text = mContext.getString(R.string.time_picker_decrement_hour_button); text = mContext.getString(R.string.time_picker_decrement_hour_button);
mHourSpinner.findViewById(R.id.decrement).setContentDescription(text); mHourSpinner.findViewById(R.id.decrement).setContentDescription(text);
// AM/PM // AM/PM
text = mContext.getString(R.string.time_picker_increment_set_pm_button); if (mAmPmSpinner != null) {
mAmPmSpinner.findViewById(R.id.increment).setContentDescription(text); text = mContext.getString(R.string.time_picker_increment_set_pm_button);
text = mContext.getString(R.string.time_picker_decrement_set_am_button); mAmPmSpinner.findViewById(R.id.increment).setContentDescription(text);
mAmPmSpinner.findViewById(R.id.decrement).setContentDescription(text); text = mContext.getString(R.string.time_picker_decrement_set_am_button);
mAmPmSpinner.findViewById(R.id.decrement).setContentDescription(text);
}
} }
} }