diff --git a/core/java/android/widget/NumberPicker.java b/core/java/android/widget/NumberPicker.java index 69bc4792c2efc..ba46a3f3b9ffa 100644 --- a/core/java/android/widget/NumberPicker.java +++ b/core/java/android/widget/NumberPicker.java @@ -478,7 +478,7 @@ public class NumberPicker extends LinearLayout { mDecrementButton.setOnLongClickListener(onLongClickListener); // input text - mInputText = (EditText) findViewById(R.id.timepicker_input); + mInputText = (EditText) findViewById(R.id.numberpicker_input); mInputText.setOnFocusChangeListener(new OnFocusChangeListener() { public void onFocusChange(View v, boolean hasFocus) { if (!hasFocus) { diff --git a/core/res/res/drawable-hdpi/timepicker_down_disabled.9.png b/core/res/res/drawable-hdpi/numberpicker_down_disabled.9.png similarity index 100% rename from core/res/res/drawable-hdpi/timepicker_down_disabled.9.png rename to core/res/res/drawable-hdpi/numberpicker_down_disabled.9.png diff --git a/core/res/res/drawable-hdpi/timepicker_down_disabled_focused.9.png b/core/res/res/drawable-hdpi/numberpicker_down_disabled_focused.9.png similarity index 100% rename from core/res/res/drawable-hdpi/timepicker_down_disabled_focused.9.png rename to core/res/res/drawable-hdpi/numberpicker_down_disabled_focused.9.png diff --git a/core/res/res/drawable-hdpi/timepicker_down_disabled_focused_holo_dark.png b/core/res/res/drawable-hdpi/numberpicker_down_disabled_focused_holo_dark.png similarity index 100% rename from core/res/res/drawable-hdpi/timepicker_down_disabled_focused_holo_dark.png rename to core/res/res/drawable-hdpi/numberpicker_down_disabled_focused_holo_dark.png diff --git a/core/res/res/drawable-hdpi/timepicker_down_disabled_focused_holo_light.png b/core/res/res/drawable-hdpi/numberpicker_down_disabled_focused_holo_light.png similarity index 100% rename from core/res/res/drawable-hdpi/timepicker_down_disabled_focused_holo_light.png rename to core/res/res/drawable-hdpi/numberpicker_down_disabled_focused_holo_light.png diff --git a/core/res/res/drawable-hdpi/timepicker_down_disabled_holo_dark.png b/core/res/res/drawable-hdpi/numberpicker_down_disabled_holo_dark.png similarity index 100% rename from core/res/res/drawable-hdpi/timepicker_down_disabled_holo_dark.png rename to core/res/res/drawable-hdpi/numberpicker_down_disabled_holo_dark.png diff --git a/core/res/res/drawable-hdpi/timepicker_down_disabled_holo_light.png b/core/res/res/drawable-hdpi/numberpicker_down_disabled_holo_light.png similarity index 100% rename from core/res/res/drawable-hdpi/timepicker_down_disabled_holo_light.png rename to core/res/res/drawable-hdpi/numberpicker_down_disabled_holo_light.png diff --git a/core/res/res/drawable-hdpi/timepicker_down_focused_holo_dark.png b/core/res/res/drawable-hdpi/numberpicker_down_focused_holo_dark.png similarity index 100% rename from core/res/res/drawable-hdpi/timepicker_down_focused_holo_dark.png rename to core/res/res/drawable-hdpi/numberpicker_down_focused_holo_dark.png diff --git a/core/res/res/drawable-hdpi/timepicker_down_focused_holo_light.png b/core/res/res/drawable-hdpi/numberpicker_down_focused_holo_light.png similarity index 100% rename from core/res/res/drawable-hdpi/timepicker_down_focused_holo_light.png rename to core/res/res/drawable-hdpi/numberpicker_down_focused_holo_light.png diff --git a/core/res/res/drawable-hdpi/timepicker_down_longpressed_holo_dark.png b/core/res/res/drawable-hdpi/numberpicker_down_longpressed_holo_dark.png similarity index 100% rename from core/res/res/drawable-hdpi/timepicker_down_longpressed_holo_dark.png rename to core/res/res/drawable-hdpi/numberpicker_down_longpressed_holo_dark.png diff --git a/core/res/res/drawable-hdpi/timepicker_down_longpressed_holo_light.png b/core/res/res/drawable-hdpi/numberpicker_down_longpressed_holo_light.png similarity index 100% rename from core/res/res/drawable-hdpi/timepicker_down_longpressed_holo_light.png rename to core/res/res/drawable-hdpi/numberpicker_down_longpressed_holo_light.png diff --git a/core/res/res/drawable-hdpi/timepicker_down_normal.9.png b/core/res/res/drawable-hdpi/numberpicker_down_normal.9.png similarity index 100% rename from core/res/res/drawable-hdpi/timepicker_down_normal.9.png rename to core/res/res/drawable-hdpi/numberpicker_down_normal.9.png diff --git a/core/res/res/drawable-hdpi/timepicker_down_normal_holo_dark.png b/core/res/res/drawable-hdpi/numberpicker_down_normal_holo_dark.png similarity index 100% rename from core/res/res/drawable-hdpi/timepicker_down_normal_holo_dark.png rename to core/res/res/drawable-hdpi/numberpicker_down_normal_holo_dark.png diff --git a/core/res/res/drawable-hdpi/timepicker_down_normal_holo_light.png b/core/res/res/drawable-hdpi/numberpicker_down_normal_holo_light.png similarity index 100% rename from core/res/res/drawable-hdpi/timepicker_down_normal_holo_light.png rename to core/res/res/drawable-hdpi/numberpicker_down_normal_holo_light.png diff --git a/core/res/res/drawable-hdpi/timepicker_down_pressed.9.png b/core/res/res/drawable-hdpi/numberpicker_down_pressed.9.png similarity index 100% rename from core/res/res/drawable-hdpi/timepicker_down_pressed.9.png rename to core/res/res/drawable-hdpi/numberpicker_down_pressed.9.png diff --git a/core/res/res/drawable-hdpi/timepicker_down_pressed_holo_dark.png b/core/res/res/drawable-hdpi/numberpicker_down_pressed_holo_dark.png similarity index 100% rename from core/res/res/drawable-hdpi/timepicker_down_pressed_holo_dark.png rename to core/res/res/drawable-hdpi/numberpicker_down_pressed_holo_dark.png diff --git a/core/res/res/drawable-hdpi/timepicker_down_pressed_holo_light.png b/core/res/res/drawable-hdpi/numberpicker_down_pressed_holo_light.png similarity index 100% rename from core/res/res/drawable-hdpi/timepicker_down_pressed_holo_light.png rename to core/res/res/drawable-hdpi/numberpicker_down_pressed_holo_light.png diff --git a/core/res/res/drawable-hdpi/timepicker_down_selected.9.png b/core/res/res/drawable-hdpi/numberpicker_down_selected.9.png similarity index 100% rename from core/res/res/drawable-hdpi/timepicker_down_selected.9.png rename to core/res/res/drawable-hdpi/numberpicker_down_selected.9.png diff --git a/core/res/res/drawable-hdpi/timepicker_input_disabled.9.png b/core/res/res/drawable-hdpi/numberpicker_input_disabled.9.png similarity index 100% rename from core/res/res/drawable-hdpi/timepicker_input_disabled.9.png rename to core/res/res/drawable-hdpi/numberpicker_input_disabled.9.png diff --git a/core/res/res/drawable-hdpi/timepicker_input_normal.9.png b/core/res/res/drawable-hdpi/numberpicker_input_normal.9.png similarity index 100% rename from core/res/res/drawable-hdpi/timepicker_input_normal.9.png rename to core/res/res/drawable-hdpi/numberpicker_input_normal.9.png diff --git a/core/res/res/drawable-hdpi/timepicker_input_pressed.9.png b/core/res/res/drawable-hdpi/numberpicker_input_pressed.9.png similarity index 100% rename from core/res/res/drawable-hdpi/timepicker_input_pressed.9.png rename to core/res/res/drawable-hdpi/numberpicker_input_pressed.9.png diff --git a/core/res/res/drawable-hdpi/timepicker_input_selected.9.png b/core/res/res/drawable-hdpi/numberpicker_input_selected.9.png similarity index 100% rename from core/res/res/drawable-hdpi/timepicker_input_selected.9.png rename to core/res/res/drawable-hdpi/numberpicker_input_selected.9.png diff --git a/core/res/res/drawable-hdpi/timepicker_up_disabled.9.png b/core/res/res/drawable-hdpi/numberpicker_up_disabled.9.png similarity index 100% rename from core/res/res/drawable-hdpi/timepicker_up_disabled.9.png rename to core/res/res/drawable-hdpi/numberpicker_up_disabled.9.png diff --git a/core/res/res/drawable-hdpi/timepicker_up_disabled_focused.9.png b/core/res/res/drawable-hdpi/numberpicker_up_disabled_focused.9.png similarity index 100% rename from core/res/res/drawable-hdpi/timepicker_up_disabled_focused.9.png rename to core/res/res/drawable-hdpi/numberpicker_up_disabled_focused.9.png diff --git a/core/res/res/drawable-hdpi/timepicker_up_disabled_focused_holo_dark.png b/core/res/res/drawable-hdpi/numberpicker_up_disabled_focused_holo_dark.png similarity index 100% rename from core/res/res/drawable-hdpi/timepicker_up_disabled_focused_holo_dark.png rename to core/res/res/drawable-hdpi/numberpicker_up_disabled_focused_holo_dark.png diff --git a/core/res/res/drawable-hdpi/timepicker_up_disabled_focused_holo_light.png b/core/res/res/drawable-hdpi/numberpicker_up_disabled_focused_holo_light.png similarity index 100% rename from core/res/res/drawable-hdpi/timepicker_up_disabled_focused_holo_light.png rename to core/res/res/drawable-hdpi/numberpicker_up_disabled_focused_holo_light.png diff --git a/core/res/res/drawable-hdpi/timepicker_up_disabled_holo_dark.png b/core/res/res/drawable-hdpi/numberpicker_up_disabled_holo_dark.png similarity index 100% rename from core/res/res/drawable-hdpi/timepicker_up_disabled_holo_dark.png rename to core/res/res/drawable-hdpi/numberpicker_up_disabled_holo_dark.png diff --git a/core/res/res/drawable-hdpi/timepicker_up_disabled_holo_light.png b/core/res/res/drawable-hdpi/numberpicker_up_disabled_holo_light.png similarity index 100% rename from core/res/res/drawable-hdpi/timepicker_up_disabled_holo_light.png rename to core/res/res/drawable-hdpi/numberpicker_up_disabled_holo_light.png diff --git a/core/res/res/drawable-hdpi/timepicker_up_focused_holo_dark.png b/core/res/res/drawable-hdpi/numberpicker_up_focused_holo_dark.png similarity index 100% rename from core/res/res/drawable-hdpi/timepicker_up_focused_holo_dark.png rename to core/res/res/drawable-hdpi/numberpicker_up_focused_holo_dark.png diff --git a/core/res/res/drawable-hdpi/timepicker_up_focused_holo_light.png b/core/res/res/drawable-hdpi/numberpicker_up_focused_holo_light.png similarity index 100% rename from core/res/res/drawable-hdpi/timepicker_up_focused_holo_light.png rename to core/res/res/drawable-hdpi/numberpicker_up_focused_holo_light.png diff --git a/core/res/res/drawable-hdpi/timepicker_up_longpressed_holo_dark.png b/core/res/res/drawable-hdpi/numberpicker_up_longpressed_holo_dark.png similarity index 100% rename from core/res/res/drawable-hdpi/timepicker_up_longpressed_holo_dark.png rename to core/res/res/drawable-hdpi/numberpicker_up_longpressed_holo_dark.png diff --git a/core/res/res/drawable-hdpi/timepicker_up_longpressed_holo_light.png b/core/res/res/drawable-hdpi/numberpicker_up_longpressed_holo_light.png similarity index 100% rename from core/res/res/drawable-hdpi/timepicker_up_longpressed_holo_light.png rename to core/res/res/drawable-hdpi/numberpicker_up_longpressed_holo_light.png diff --git a/core/res/res/drawable-hdpi/timepicker_up_normal.9.png b/core/res/res/drawable-hdpi/numberpicker_up_normal.9.png similarity index 100% rename from core/res/res/drawable-hdpi/timepicker_up_normal.9.png rename to core/res/res/drawable-hdpi/numberpicker_up_normal.9.png diff --git a/core/res/res/drawable-hdpi/timepicker_up_normal_holo_dark.png b/core/res/res/drawable-hdpi/numberpicker_up_normal_holo_dark.png similarity index 100% rename from core/res/res/drawable-hdpi/timepicker_up_normal_holo_dark.png rename to core/res/res/drawable-hdpi/numberpicker_up_normal_holo_dark.png diff --git a/core/res/res/drawable-hdpi/timepicker_up_normal_holo_light.png b/core/res/res/drawable-hdpi/numberpicker_up_normal_holo_light.png similarity index 100% rename from core/res/res/drawable-hdpi/timepicker_up_normal_holo_light.png rename to core/res/res/drawable-hdpi/numberpicker_up_normal_holo_light.png diff --git a/core/res/res/drawable-hdpi/timepicker_up_pressed.9.png b/core/res/res/drawable-hdpi/numberpicker_up_pressed.9.png similarity index 100% rename from core/res/res/drawable-hdpi/timepicker_up_pressed.9.png rename to core/res/res/drawable-hdpi/numberpicker_up_pressed.9.png diff --git a/core/res/res/drawable-hdpi/timepicker_up_pressed_holo_dark.png b/core/res/res/drawable-hdpi/numberpicker_up_pressed_holo_dark.png similarity index 100% rename from core/res/res/drawable-hdpi/timepicker_up_pressed_holo_dark.png rename to core/res/res/drawable-hdpi/numberpicker_up_pressed_holo_dark.png diff --git a/core/res/res/drawable-hdpi/timepicker_up_pressed_holo_light.png b/core/res/res/drawable-hdpi/numberpicker_up_pressed_holo_light.png similarity index 100% rename from core/res/res/drawable-hdpi/timepicker_up_pressed_holo_light.png rename to core/res/res/drawable-hdpi/numberpicker_up_pressed_holo_light.png diff --git a/core/res/res/drawable-hdpi/timepicker_up_selected.9.png b/core/res/res/drawable-hdpi/numberpicker_up_selected.9.png similarity index 100% rename from core/res/res/drawable-hdpi/timepicker_up_selected.9.png rename to core/res/res/drawable-hdpi/numberpicker_up_selected.9.png diff --git a/core/res/res/drawable-hdpi/simple_week_dayline_holo_light.9.png b/core/res/res/drawable-hdpi/simple_week_dayline_holo_light.9.png deleted file mode 100644 index ed1a5e94c8fd5..0000000000000 Binary files a/core/res/res/drawable-hdpi/simple_week_dayline_holo_light.9.png and /dev/null differ diff --git a/core/res/res/drawable-ldpi/timepicker_down_disabled.9.png b/core/res/res/drawable-ldpi/numberpicker_down_disabled.9.png similarity index 100% rename from core/res/res/drawable-ldpi/timepicker_down_disabled.9.png rename to core/res/res/drawable-ldpi/numberpicker_down_disabled.9.png diff --git a/core/res/res/drawable-ldpi/timepicker_down_disabled_focused.9.png b/core/res/res/drawable-ldpi/numberpicker_down_disabled_focused.9.png similarity index 100% rename from core/res/res/drawable-ldpi/timepicker_down_disabled_focused.9.png rename to core/res/res/drawable-ldpi/numberpicker_down_disabled_focused.9.png diff --git a/core/res/res/drawable-ldpi/timepicker_down_normal.9.png b/core/res/res/drawable-ldpi/numberpicker_down_normal.9.png similarity index 100% rename from core/res/res/drawable-ldpi/timepicker_down_normal.9.png rename to core/res/res/drawable-ldpi/numberpicker_down_normal.9.png diff --git a/core/res/res/drawable-ldpi/timepicker_down_pressed.9.png b/core/res/res/drawable-ldpi/numberpicker_down_pressed.9.png similarity index 100% rename from core/res/res/drawable-ldpi/timepicker_down_pressed.9.png rename to core/res/res/drawable-ldpi/numberpicker_down_pressed.9.png diff --git a/core/res/res/drawable-ldpi/timepicker_down_selected.9.png b/core/res/res/drawable-ldpi/numberpicker_down_selected.9.png similarity index 100% rename from core/res/res/drawable-ldpi/timepicker_down_selected.9.png rename to core/res/res/drawable-ldpi/numberpicker_down_selected.9.png diff --git a/core/res/res/drawable-ldpi/timepicker_input_disabled.9.png b/core/res/res/drawable-ldpi/numberpicker_input_disabled.9.png similarity index 100% rename from core/res/res/drawable-ldpi/timepicker_input_disabled.9.png rename to core/res/res/drawable-ldpi/numberpicker_input_disabled.9.png diff --git a/core/res/res/drawable-ldpi/timepicker_input_normal.9.png b/core/res/res/drawable-ldpi/numberpicker_input_normal.9.png similarity index 100% rename from core/res/res/drawable-ldpi/timepicker_input_normal.9.png rename to core/res/res/drawable-ldpi/numberpicker_input_normal.9.png diff --git a/core/res/res/drawable-ldpi/timepicker_input_pressed.9.png b/core/res/res/drawable-ldpi/numberpicker_input_pressed.9.png similarity index 100% rename from core/res/res/drawable-ldpi/timepicker_input_pressed.9.png rename to core/res/res/drawable-ldpi/numberpicker_input_pressed.9.png diff --git a/core/res/res/drawable-ldpi/timepicker_input_selected.9.png b/core/res/res/drawable-ldpi/numberpicker_input_selected.9.png similarity index 100% rename from core/res/res/drawable-ldpi/timepicker_input_selected.9.png rename to core/res/res/drawable-ldpi/numberpicker_input_selected.9.png diff --git a/core/res/res/drawable-ldpi/timepicker_up_disabled.9.png b/core/res/res/drawable-ldpi/numberpicker_up_disabled.9.png similarity index 100% rename from core/res/res/drawable-ldpi/timepicker_up_disabled.9.png rename to core/res/res/drawable-ldpi/numberpicker_up_disabled.9.png diff --git a/core/res/res/drawable-ldpi/timepicker_up_disabled_focused.9.png b/core/res/res/drawable-ldpi/numberpicker_up_disabled_focused.9.png similarity index 100% rename from core/res/res/drawable-ldpi/timepicker_up_disabled_focused.9.png rename to core/res/res/drawable-ldpi/numberpicker_up_disabled_focused.9.png diff --git a/core/res/res/drawable-ldpi/timepicker_up_normal.9.png b/core/res/res/drawable-ldpi/numberpicker_up_normal.9.png similarity index 100% rename from core/res/res/drawable-ldpi/timepicker_up_normal.9.png rename to core/res/res/drawable-ldpi/numberpicker_up_normal.9.png diff --git a/core/res/res/drawable-ldpi/timepicker_up_pressed.9.png b/core/res/res/drawable-ldpi/numberpicker_up_pressed.9.png similarity index 100% rename from core/res/res/drawable-ldpi/timepicker_up_pressed.9.png rename to core/res/res/drawable-ldpi/numberpicker_up_pressed.9.png diff --git a/core/res/res/drawable-ldpi/timepicker_up_selected.9.png b/core/res/res/drawable-ldpi/numberpicker_up_selected.9.png similarity index 100% rename from core/res/res/drawable-ldpi/timepicker_up_selected.9.png rename to core/res/res/drawable-ldpi/numberpicker_up_selected.9.png diff --git a/core/res/res/drawable-mdpi/timepicker_down_disabled.9.png b/core/res/res/drawable-mdpi/numberpicker_down_disabled.9.png similarity index 100% rename from core/res/res/drawable-mdpi/timepicker_down_disabled.9.png rename to core/res/res/drawable-mdpi/numberpicker_down_disabled.9.png diff --git a/core/res/res/drawable-mdpi/timepicker_down_disabled_focused.9.png b/core/res/res/drawable-mdpi/numberpicker_down_disabled_focused.9.png similarity index 100% rename from core/res/res/drawable-mdpi/timepicker_down_disabled_focused.9.png rename to core/res/res/drawable-mdpi/numberpicker_down_disabled_focused.9.png diff --git a/core/res/res/drawable-mdpi/timepicker_down_disabled_focused_holo_dark.png b/core/res/res/drawable-mdpi/numberpicker_down_disabled_focused_holo_dark.png similarity index 100% rename from core/res/res/drawable-mdpi/timepicker_down_disabled_focused_holo_dark.png rename to core/res/res/drawable-mdpi/numberpicker_down_disabled_focused_holo_dark.png diff --git a/core/res/res/drawable-mdpi/timepicker_down_disabled_focused_holo_light.png b/core/res/res/drawable-mdpi/numberpicker_down_disabled_focused_holo_light.png similarity index 100% rename from core/res/res/drawable-mdpi/timepicker_down_disabled_focused_holo_light.png rename to core/res/res/drawable-mdpi/numberpicker_down_disabled_focused_holo_light.png diff --git a/core/res/res/drawable-mdpi/timepicker_down_disabled_holo_dark.png b/core/res/res/drawable-mdpi/numberpicker_down_disabled_holo_dark.png similarity index 100% rename from core/res/res/drawable-mdpi/timepicker_down_disabled_holo_dark.png rename to core/res/res/drawable-mdpi/numberpicker_down_disabled_holo_dark.png diff --git a/core/res/res/drawable-mdpi/timepicker_down_disabled_holo_light.png b/core/res/res/drawable-mdpi/numberpicker_down_disabled_holo_light.png similarity index 100% rename from core/res/res/drawable-mdpi/timepicker_down_disabled_holo_light.png rename to core/res/res/drawable-mdpi/numberpicker_down_disabled_holo_light.png diff --git a/core/res/res/drawable-mdpi/timepicker_down_focused_holo_dark.png b/core/res/res/drawable-mdpi/numberpicker_down_focused_holo_dark.png similarity index 100% rename from core/res/res/drawable-mdpi/timepicker_down_focused_holo_dark.png rename to core/res/res/drawable-mdpi/numberpicker_down_focused_holo_dark.png diff --git a/core/res/res/drawable-mdpi/timepicker_down_focused_holo_light.png b/core/res/res/drawable-mdpi/numberpicker_down_focused_holo_light.png similarity index 100% rename from core/res/res/drawable-mdpi/timepicker_down_focused_holo_light.png rename to core/res/res/drawable-mdpi/numberpicker_down_focused_holo_light.png diff --git a/core/res/res/drawable-mdpi/timepicker_down_longpressed_holo_dark.png b/core/res/res/drawable-mdpi/numberpicker_down_longpressed_holo_dark.png similarity index 100% rename from core/res/res/drawable-mdpi/timepicker_down_longpressed_holo_dark.png rename to core/res/res/drawable-mdpi/numberpicker_down_longpressed_holo_dark.png diff --git a/core/res/res/drawable-mdpi/timepicker_down_longpressed_holo_light.png b/core/res/res/drawable-mdpi/numberpicker_down_longpressed_holo_light.png similarity index 100% rename from core/res/res/drawable-mdpi/timepicker_down_longpressed_holo_light.png rename to core/res/res/drawable-mdpi/numberpicker_down_longpressed_holo_light.png diff --git a/core/res/res/drawable-mdpi/timepicker_down_normal.9.png b/core/res/res/drawable-mdpi/numberpicker_down_normal.9.png similarity index 100% rename from core/res/res/drawable-mdpi/timepicker_down_normal.9.png rename to core/res/res/drawable-mdpi/numberpicker_down_normal.9.png diff --git a/core/res/res/drawable-mdpi/timepicker_down_normal_holo_dark.png b/core/res/res/drawable-mdpi/numberpicker_down_normal_holo_dark.png similarity index 100% rename from core/res/res/drawable-mdpi/timepicker_down_normal_holo_dark.png rename to core/res/res/drawable-mdpi/numberpicker_down_normal_holo_dark.png diff --git a/core/res/res/drawable-mdpi/timepicker_down_normal_holo_light.png b/core/res/res/drawable-mdpi/numberpicker_down_normal_holo_light.png similarity index 100% rename from core/res/res/drawable-mdpi/timepicker_down_normal_holo_light.png rename to core/res/res/drawable-mdpi/numberpicker_down_normal_holo_light.png diff --git a/core/res/res/drawable-mdpi/timepicker_down_pressed.9.png b/core/res/res/drawable-mdpi/numberpicker_down_pressed.9.png similarity index 100% rename from core/res/res/drawable-mdpi/timepicker_down_pressed.9.png rename to core/res/res/drawable-mdpi/numberpicker_down_pressed.9.png diff --git a/core/res/res/drawable-mdpi/timepicker_down_pressed_holo_dark.png b/core/res/res/drawable-mdpi/numberpicker_down_pressed_holo_dark.png similarity index 100% rename from core/res/res/drawable-mdpi/timepicker_down_pressed_holo_dark.png rename to core/res/res/drawable-mdpi/numberpicker_down_pressed_holo_dark.png diff --git a/core/res/res/drawable-mdpi/timepicker_down_pressed_holo_light.png b/core/res/res/drawable-mdpi/numberpicker_down_pressed_holo_light.png similarity index 100% rename from core/res/res/drawable-mdpi/timepicker_down_pressed_holo_light.png rename to core/res/res/drawable-mdpi/numberpicker_down_pressed_holo_light.png diff --git a/core/res/res/drawable-mdpi/timepicker_down_selected.9.png b/core/res/res/drawable-mdpi/numberpicker_down_selected.9.png similarity index 100% rename from core/res/res/drawable-mdpi/timepicker_down_selected.9.png rename to core/res/res/drawable-mdpi/numberpicker_down_selected.9.png diff --git a/core/res/res/drawable-mdpi/timepicker_input_disabled.9.png b/core/res/res/drawable-mdpi/numberpicker_input_disabled.9.png similarity index 100% rename from core/res/res/drawable-mdpi/timepicker_input_disabled.9.png rename to core/res/res/drawable-mdpi/numberpicker_input_disabled.9.png diff --git a/core/res/res/drawable-mdpi/timepicker_input_normal.9.png b/core/res/res/drawable-mdpi/numberpicker_input_normal.9.png similarity index 100% rename from core/res/res/drawable-mdpi/timepicker_input_normal.9.png rename to core/res/res/drawable-mdpi/numberpicker_input_normal.9.png diff --git a/core/res/res/drawable-mdpi/timepicker_input_pressed.9.png b/core/res/res/drawable-mdpi/numberpicker_input_pressed.9.png similarity index 100% rename from core/res/res/drawable-mdpi/timepicker_input_pressed.9.png rename to core/res/res/drawable-mdpi/numberpicker_input_pressed.9.png diff --git a/core/res/res/drawable-mdpi/timepicker_input_selected.9.png b/core/res/res/drawable-mdpi/numberpicker_input_selected.9.png similarity index 100% rename from core/res/res/drawable-mdpi/timepicker_input_selected.9.png rename to core/res/res/drawable-mdpi/numberpicker_input_selected.9.png diff --git a/core/res/res/drawable-mdpi/timepicker_up_disabled.9.png b/core/res/res/drawable-mdpi/numberpicker_up_disabled.9.png similarity index 100% rename from core/res/res/drawable-mdpi/timepicker_up_disabled.9.png rename to core/res/res/drawable-mdpi/numberpicker_up_disabled.9.png diff --git a/core/res/res/drawable-mdpi/timepicker_up_disabled_focused.9.png b/core/res/res/drawable-mdpi/numberpicker_up_disabled_focused.9.png similarity index 100% rename from core/res/res/drawable-mdpi/timepicker_up_disabled_focused.9.png rename to core/res/res/drawable-mdpi/numberpicker_up_disabled_focused.9.png diff --git a/core/res/res/drawable-mdpi/timepicker_up_disabled_focused_holo_dark.png b/core/res/res/drawable-mdpi/numberpicker_up_disabled_focused_holo_dark.png similarity index 100% rename from core/res/res/drawable-mdpi/timepicker_up_disabled_focused_holo_dark.png rename to core/res/res/drawable-mdpi/numberpicker_up_disabled_focused_holo_dark.png diff --git a/core/res/res/drawable-mdpi/timepicker_up_disabled_focused_holo_light.png b/core/res/res/drawable-mdpi/numberpicker_up_disabled_focused_holo_light.png similarity index 100% rename from core/res/res/drawable-mdpi/timepicker_up_disabled_focused_holo_light.png rename to core/res/res/drawable-mdpi/numberpicker_up_disabled_focused_holo_light.png diff --git a/core/res/res/drawable-mdpi/timepicker_up_disabled_holo_dark.png b/core/res/res/drawable-mdpi/numberpicker_up_disabled_holo_dark.png similarity index 100% rename from core/res/res/drawable-mdpi/timepicker_up_disabled_holo_dark.png rename to core/res/res/drawable-mdpi/numberpicker_up_disabled_holo_dark.png diff --git a/core/res/res/drawable-mdpi/timepicker_up_disabled_holo_light.png b/core/res/res/drawable-mdpi/numberpicker_up_disabled_holo_light.png similarity index 100% rename from core/res/res/drawable-mdpi/timepicker_up_disabled_holo_light.png rename to core/res/res/drawable-mdpi/numberpicker_up_disabled_holo_light.png diff --git a/core/res/res/drawable-mdpi/timepicker_up_focused_holo_dark.png b/core/res/res/drawable-mdpi/numberpicker_up_focused_holo_dark.png similarity index 100% rename from core/res/res/drawable-mdpi/timepicker_up_focused_holo_dark.png rename to core/res/res/drawable-mdpi/numberpicker_up_focused_holo_dark.png diff --git a/core/res/res/drawable-mdpi/timepicker_up_focused_holo_light.png b/core/res/res/drawable-mdpi/numberpicker_up_focused_holo_light.png similarity index 100% rename from core/res/res/drawable-mdpi/timepicker_up_focused_holo_light.png rename to core/res/res/drawable-mdpi/numberpicker_up_focused_holo_light.png diff --git a/core/res/res/drawable-mdpi/timepicker_up_longpressed_holo_dark.png b/core/res/res/drawable-mdpi/numberpicker_up_longpressed_holo_dark.png similarity index 100% rename from core/res/res/drawable-mdpi/timepicker_up_longpressed_holo_dark.png rename to core/res/res/drawable-mdpi/numberpicker_up_longpressed_holo_dark.png diff --git a/core/res/res/drawable-mdpi/timepicker_up_longpressed_holo_light.png b/core/res/res/drawable-mdpi/numberpicker_up_longpressed_holo_light.png similarity index 100% rename from core/res/res/drawable-mdpi/timepicker_up_longpressed_holo_light.png rename to core/res/res/drawable-mdpi/numberpicker_up_longpressed_holo_light.png diff --git a/core/res/res/drawable-mdpi/timepicker_up_normal.9.png b/core/res/res/drawable-mdpi/numberpicker_up_normal.9.png similarity index 100% rename from core/res/res/drawable-mdpi/timepicker_up_normal.9.png rename to core/res/res/drawable-mdpi/numberpicker_up_normal.9.png diff --git a/core/res/res/drawable-mdpi/timepicker_up_normal_holo_dark.png b/core/res/res/drawable-mdpi/numberpicker_up_normal_holo_dark.png similarity index 100% rename from core/res/res/drawable-mdpi/timepicker_up_normal_holo_dark.png rename to core/res/res/drawable-mdpi/numberpicker_up_normal_holo_dark.png diff --git a/core/res/res/drawable-mdpi/timepicker_up_normal_holo_light.png b/core/res/res/drawable-mdpi/numberpicker_up_normal_holo_light.png similarity index 100% rename from core/res/res/drawable-mdpi/timepicker_up_normal_holo_light.png rename to core/res/res/drawable-mdpi/numberpicker_up_normal_holo_light.png diff --git a/core/res/res/drawable-mdpi/timepicker_up_pressed.9.png b/core/res/res/drawable-mdpi/numberpicker_up_pressed.9.png similarity index 100% rename from core/res/res/drawable-mdpi/timepicker_up_pressed.9.png rename to core/res/res/drawable-mdpi/numberpicker_up_pressed.9.png diff --git a/core/res/res/drawable-mdpi/timepicker_up_pressed_holo_dark.png b/core/res/res/drawable-mdpi/numberpicker_up_pressed_holo_dark.png similarity index 100% rename from core/res/res/drawable-mdpi/timepicker_up_pressed_holo_dark.png rename to core/res/res/drawable-mdpi/numberpicker_up_pressed_holo_dark.png diff --git a/core/res/res/drawable-mdpi/timepicker_up_pressed_holo_light.png b/core/res/res/drawable-mdpi/numberpicker_up_pressed_holo_light.png similarity index 100% rename from core/res/res/drawable-mdpi/timepicker_up_pressed_holo_light.png rename to core/res/res/drawable-mdpi/numberpicker_up_pressed_holo_light.png diff --git a/core/res/res/drawable-mdpi/timepicker_up_selected.9.png b/core/res/res/drawable-mdpi/numberpicker_up_selected.9.png similarity index 100% rename from core/res/res/drawable-mdpi/timepicker_up_selected.9.png rename to core/res/res/drawable-mdpi/numberpicker_up_selected.9.png diff --git a/core/res/res/drawable-mdpi/simple_week_dayline_holo_light.9.png b/core/res/res/drawable-mdpi/simple_week_dayline_holo_light.9.png deleted file mode 100644 index f264cb6e584d6..0000000000000 Binary files a/core/res/res/drawable-mdpi/simple_week_dayline_holo_light.9.png and /dev/null differ diff --git a/core/res/res/drawable/timepicker_up_btn.xml b/core/res/res/drawable/numberpicker_down_btn.xml similarity index 78% rename from core/res/res/drawable/timepicker_up_btn.xml rename to core/res/res/drawable/numberpicker_down_btn.xml index fbaed088555b7..0046df5229686 100644 --- a/core/res/res/drawable/timepicker_up_btn.xml +++ b/core/res/res/drawable/numberpicker_down_btn.xml @@ -19,25 +19,25 @@ + android:drawable="@drawable/numberpicker_down_normal" /> + android:drawable="@drawable/numberpicker_down_pressed" /> + android:drawable="@drawable/numberpicker_down_selected" /> + android:drawable="@drawable/numberpicker_down_disabled" /> + android:drawable="@drawable/numberpicker_down_disabled_focused" /> diff --git a/core/res/res/drawable/timepicker_up_btn_holo_dark.xml b/core/res/res/drawable/numberpicker_down_btn_holo_dark.xml similarity index 76% rename from core/res/res/drawable/timepicker_up_btn_holo_dark.xml rename to core/res/res/drawable/numberpicker_down_btn_holo_dark.xml index af5f6eb1ba481..dd6332db56856 100644 --- a/core/res/res/drawable/timepicker_up_btn_holo_dark.xml +++ b/core/res/res/drawable/numberpicker_down_btn_holo_dark.xml @@ -19,25 +19,25 @@ + android:drawable="@drawable/numberpicker_down_normal_holo_dark" /> + android:drawable="@drawable/numberpicker_down_pressed_holo_dark" /> + android:drawable="@drawable/numberpicker_down_focused_holo_dark" /> + android:drawable="@drawable/numberpicker_down_disabled_holo_dark" /> + android:drawable="@drawable/numberpicker_down_disabled_focused_holo_dark" /> diff --git a/core/res/res/drawable/timepicker_up_btn_holo_light.xml b/core/res/res/drawable/numberpicker_down_btn_holo_light.xml similarity index 76% rename from core/res/res/drawable/timepicker_up_btn_holo_light.xml rename to core/res/res/drawable/numberpicker_down_btn_holo_light.xml index 6025d3ad8b2cd..565fd868bfb27 100644 --- a/core/res/res/drawable/timepicker_up_btn_holo_light.xml +++ b/core/res/res/drawable/numberpicker_down_btn_holo_light.xml @@ -19,25 +19,25 @@ + android:drawable="@drawable/numberpicker_down_normal_holo_light" /> + android:drawable="@drawable/numberpicker_down_pressed_holo_light" /> + android:drawable="@drawable/numberpicker_down_focused_holo_light" /> + android:drawable="@drawable/numberpicker_down_disabled_holo_light" /> + android:drawable="@drawable/numberpicker_down_disabled_focused_holo_light" /> diff --git a/core/res/res/drawable/timepicker_input.xml b/core/res/res/drawable/numberpicker_input.xml similarity index 79% rename from core/res/res/drawable/timepicker_input.xml rename to core/res/res/drawable/numberpicker_input.xml index 17686738c7eeb..e4ebde2664dea 100644 --- a/core/res/res/drawable/timepicker_input.xml +++ b/core/res/res/drawable/numberpicker_input.xml @@ -19,25 +19,25 @@ + android:drawable="@drawable/numberpicker_input_normal" /> + android:drawable="@drawable/numberpicker_input_pressed" /> + android:drawable="@drawable/numberpicker_input_selected" /> + android:drawable="@drawable/numberpicker_input_disabled" /> + android:drawable="@drawable/numberpicker_input_normal" /> diff --git a/core/res/res/drawable/timepicker_down_btn.xml b/core/res/res/drawable/numberpicker_up_btn.xml similarity index 80% rename from core/res/res/drawable/timepicker_down_btn.xml rename to core/res/res/drawable/numberpicker_up_btn.xml index d4908cb26f0c7..6ea1a3326dfc8 100644 --- a/core/res/res/drawable/timepicker_down_btn.xml +++ b/core/res/res/drawable/numberpicker_up_btn.xml @@ -19,25 +19,25 @@ + android:drawable="@drawable/numberpicker_up_normal" /> + android:drawable="@drawable/numberpicker_up_pressed" /> + android:drawable="@drawable/numberpicker_up_selected" /> + android:drawable="@drawable/numberpicker_up_disabled" /> + android:drawable="@drawable/numberpicker_up_disabled_focused" /> diff --git a/core/res/res/drawable/timepicker_down_btn_holo_dark.xml b/core/res/res/drawable/numberpicker_up_btn_holo_dark.xml similarity index 81% rename from core/res/res/drawable/timepicker_down_btn_holo_dark.xml rename to core/res/res/drawable/numberpicker_up_btn_holo_dark.xml index b4b824dd78fb1..7af3ee42df3c7 100644 --- a/core/res/res/drawable/timepicker_down_btn_holo_dark.xml +++ b/core/res/res/drawable/numberpicker_up_btn_holo_dark.xml @@ -19,25 +19,25 @@ + android:drawable="@drawable/numberpicker_up_normal_holo_dark" /> + android:drawable="@drawable/numberpicker_up_pressed_holo_dark" /> + android:drawable="@drawable/numberpicker_up_focused_holo_dark" /> + android:drawable="@drawable/numberpicker_up_disabled_holo_dark" /> + android:drawable="@drawable/numberpicker_up_disabled_focused_holo_dark" /> diff --git a/core/res/res/drawable/timepicker_down_btn_holo_light.xml b/core/res/res/drawable/numberpicker_up_btn_holo_light.xml similarity index 80% rename from core/res/res/drawable/timepicker_down_btn_holo_light.xml rename to core/res/res/drawable/numberpicker_up_btn_holo_light.xml index 7ae5e53c0ee3d..cbcbb07704ee5 100644 --- a/core/res/res/drawable/timepicker_down_btn_holo_light.xml +++ b/core/res/res/drawable/numberpicker_up_btn_holo_light.xml @@ -19,25 +19,25 @@ + android:drawable="@drawable/numberpicker_up_normal_holo_light" /> + android:drawable="@drawable/numberpicker_up_pressed_holo_light" /> + android:drawable="@drawable/numberpicker_up_focused_holo_light" /> + android:drawable="@drawable/numberpicker_up_focused_holo_light" /> + android:drawable="@drawable/numberpicker_up_disabled_focused_holo_light" /> diff --git a/core/res/res/layout/number_picker.xml b/core/res/res/layout/number_picker.xml index 44c99cf2c79ad..f92c1bcba659e 100644 --- a/core/res/res/layout/number_picker.xml +++ b/core/res/res/layout/number_picker.xml @@ -24,7 +24,7 @@ android:layout_height="wrap_content" style="?android:attr/numberPickerUpButtonStyle" /> - diff --git a/core/res/res/values/styles.xml b/core/res/res/values/styles.xml index 5709f58a9129d..b8beda6bfeca5 100644 --- a/core/res/res/values/styles.xml +++ b/core/res/res/values/styles.xml @@ -495,18 +495,18 @@ @@ -1833,11 +1833,11 @@