From 012dd5a461f18a2e5dad38c60282fac1c21ff7fe Mon Sep 17 00:00:00 2001
From: Svetoslav Ganov <svetoslavganov@google.com>
Date: Tue, 11 Jan 2011 16:54:01 -0800
Subject: [PATCH] Renaming NumberPicker resources to be consistent.

1. The resources for the NumberPicker now start with 'numberpicker_' instead of the legacy 'timepicker_'

2. Removed unused resources.

Change-Id: Ide7c61df1936f174b6fffc778cba3a58b324556a
---
 core/java/android/widget/NumberPicker.java        |   2 +-
 ...led.9.png => numberpicker_down_disabled.9.png} | Bin
 ...g => numberpicker_down_disabled_focused.9.png} | Bin
 ...berpicker_down_disabled_focused_holo_dark.png} | Bin
 ...erpicker_down_disabled_focused_holo_light.png} | Bin
 ...g => numberpicker_down_disabled_holo_dark.png} | Bin
 ... => numberpicker_down_disabled_holo_light.png} | Bin
 ...ng => numberpicker_down_focused_holo_dark.png} | Bin
 ...g => numberpicker_down_focused_holo_light.png} | Bin
 ...> numberpicker_down_longpressed_holo_dark.png} | Bin
 ... numberpicker_down_longpressed_holo_light.png} | Bin
 ...ormal.9.png => numberpicker_down_normal.9.png} | Bin
 ...png => numberpicker_down_normal_holo_dark.png} | Bin
 ...ng => numberpicker_down_normal_holo_light.png} | Bin
 ...ssed.9.png => numberpicker_down_pressed.9.png} | Bin
 ...ng => numberpicker_down_pressed_holo_dark.png} | Bin
 ...g => numberpicker_down_pressed_holo_light.png} | Bin
 ...ted.9.png => numberpicker_down_selected.9.png} | Bin
 ...ed.9.png => numberpicker_input_disabled.9.png} | Bin
 ...rmal.9.png => numberpicker_input_normal.9.png} | Bin
 ...sed.9.png => numberpicker_input_pressed.9.png} | Bin
 ...ed.9.png => numberpicker_input_selected.9.png} | Bin
 ...abled.9.png => numberpicker_up_disabled.9.png} | Bin
 ...png => numberpicker_up_disabled_focused.9.png} | Bin
 ...umberpicker_up_disabled_focused_holo_dark.png} | Bin
 ...mberpicker_up_disabled_focused_holo_light.png} | Bin
 ...png => numberpicker_up_disabled_holo_dark.png} | Bin
 ...ng => numberpicker_up_disabled_holo_light.png} | Bin
 ....png => numberpicker_up_focused_holo_dark.png} | Bin
 ...png => numberpicker_up_focused_holo_light.png} | Bin
 ... => numberpicker_up_longpressed_holo_dark.png} | Bin
 ...=> numberpicker_up_longpressed_holo_light.png} | Bin
 ..._normal.9.png => numberpicker_up_normal.9.png} | Bin
 ...k.png => numberpicker_up_normal_holo_dark.png} | Bin
 ....png => numberpicker_up_normal_holo_light.png} | Bin
 ...ressed.9.png => numberpicker_up_pressed.9.png} | Bin
 ....png => numberpicker_up_pressed_holo_dark.png} | Bin
 ...png => numberpicker_up_pressed_holo_light.png} | Bin
 ...ected.9.png => numberpicker_up_selected.9.png} | Bin
 .../simple_week_dayline_holo_light.9.png          | Bin 285 -> 0 bytes
 ...led.9.png => numberpicker_down_disabled.9.png} | Bin
 ...g => numberpicker_down_disabled_focused.9.png} | Bin
 ...ormal.9.png => numberpicker_down_normal.9.png} | Bin
 ...ssed.9.png => numberpicker_down_pressed.9.png} | Bin
 ...ted.9.png => numberpicker_down_selected.9.png} | Bin
 ...ed.9.png => numberpicker_input_disabled.9.png} | Bin
 ...rmal.9.png => numberpicker_input_normal.9.png} | Bin
 ...sed.9.png => numberpicker_input_pressed.9.png} | Bin
 ...ed.9.png => numberpicker_input_selected.9.png} | Bin
 ...abled.9.png => numberpicker_up_disabled.9.png} | Bin
 ...png => numberpicker_up_disabled_focused.9.png} | Bin
 ..._normal.9.png => numberpicker_up_normal.9.png} | Bin
 ...ressed.9.png => numberpicker_up_pressed.9.png} | Bin
 ...ected.9.png => numberpicker_up_selected.9.png} | Bin
 ...led.9.png => numberpicker_down_disabled.9.png} | Bin
 ...g => numberpicker_down_disabled_focused.9.png} | Bin
 ...berpicker_down_disabled_focused_holo_dark.png} | Bin
 ...erpicker_down_disabled_focused_holo_light.png} | Bin
 ...g => numberpicker_down_disabled_holo_dark.png} | Bin
 ... => numberpicker_down_disabled_holo_light.png} | Bin
 ...ng => numberpicker_down_focused_holo_dark.png} | Bin
 ...g => numberpicker_down_focused_holo_light.png} | Bin
 ...> numberpicker_down_longpressed_holo_dark.png} | Bin
 ... numberpicker_down_longpressed_holo_light.png} | Bin
 ...ormal.9.png => numberpicker_down_normal.9.png} | Bin
 ...png => numberpicker_down_normal_holo_dark.png} | Bin
 ...ng => numberpicker_down_normal_holo_light.png} | Bin
 ...ssed.9.png => numberpicker_down_pressed.9.png} | Bin
 ...ng => numberpicker_down_pressed_holo_dark.png} | Bin
 ...g => numberpicker_down_pressed_holo_light.png} | Bin
 ...ted.9.png => numberpicker_down_selected.9.png} | Bin
 ...ed.9.png => numberpicker_input_disabled.9.png} | Bin
 ...rmal.9.png => numberpicker_input_normal.9.png} | Bin
 ...sed.9.png => numberpicker_input_pressed.9.png} | Bin
 ...ed.9.png => numberpicker_input_selected.9.png} | Bin
 ...abled.9.png => numberpicker_up_disabled.9.png} | Bin
 ...png => numberpicker_up_disabled_focused.9.png} | Bin
 ...umberpicker_up_disabled_focused_holo_dark.png} | Bin
 ...mberpicker_up_disabled_focused_holo_light.png} | Bin
 ...png => numberpicker_up_disabled_holo_dark.png} | Bin
 ...ng => numberpicker_up_disabled_holo_light.png} | Bin
 ....png => numberpicker_up_focused_holo_dark.png} | Bin
 ...png => numberpicker_up_focused_holo_light.png} | Bin
 ... => numberpicker_up_longpressed_holo_dark.png} | Bin
 ...=> numberpicker_up_longpressed_holo_light.png} | Bin
 ..._normal.9.png => numberpicker_up_normal.9.png} | Bin
 ...k.png => numberpicker_up_normal_holo_dark.png} | Bin
 ....png => numberpicker_up_normal_holo_light.png} | Bin
 ...ressed.9.png => numberpicker_up_pressed.9.png} | Bin
 ....png => numberpicker_up_pressed_holo_dark.png} | Bin
 ...png => numberpicker_up_pressed_holo_light.png} | Bin
 ...ected.9.png => numberpicker_up_selected.9.png} | Bin
 .../simple_week_dayline_holo_light.9.png          | Bin 258 -> 0 bytes
 ...icker_up_btn.xml => numberpicker_down_btn.xml} |  10 +++++-----
 ...rk.xml => numberpicker_down_btn_holo_dark.xml} |  10 +++++-----
 ...t.xml => numberpicker_down_btn_holo_light.xml} |  10 +++++-----
 ...imepicker_input.xml => numberpicker_input.xml} |  10 +++++-----
 ...icker_down_btn.xml => numberpicker_up_btn.xml} |  10 +++++-----
 ...dark.xml => numberpicker_up_btn_holo_dark.xml} |  10 +++++-----
 ...ght.xml => numberpicker_up_btn_holo_light.xml} |  10 +++++-----
 core/res/res/layout/number_picker.xml             |   2 +-
 core/res/res/values/styles.xml                    |  14 +++++++-------
 102 files changed, 44 insertions(+), 44 deletions(-)
 rename core/res/res/drawable-hdpi/{timepicker_down_disabled.9.png => numberpicker_down_disabled.9.png} (100%)
 rename core/res/res/drawable-hdpi/{timepicker_down_disabled_focused.9.png => numberpicker_down_disabled_focused.9.png} (100%)
 rename core/res/res/drawable-hdpi/{timepicker_down_disabled_focused_holo_dark.png => numberpicker_down_disabled_focused_holo_dark.png} (100%)
 rename core/res/res/drawable-hdpi/{timepicker_down_disabled_focused_holo_light.png => numberpicker_down_disabled_focused_holo_light.png} (100%)
 rename core/res/res/drawable-hdpi/{timepicker_down_disabled_holo_dark.png => numberpicker_down_disabled_holo_dark.png} (100%)
 rename core/res/res/drawable-hdpi/{timepicker_down_disabled_holo_light.png => numberpicker_down_disabled_holo_light.png} (100%)
 rename core/res/res/drawable-hdpi/{timepicker_down_focused_holo_dark.png => numberpicker_down_focused_holo_dark.png} (100%)
 rename core/res/res/drawable-hdpi/{timepicker_down_focused_holo_light.png => numberpicker_down_focused_holo_light.png} (100%)
 rename core/res/res/drawable-hdpi/{timepicker_down_longpressed_holo_dark.png => numberpicker_down_longpressed_holo_dark.png} (100%)
 rename core/res/res/drawable-hdpi/{timepicker_down_longpressed_holo_light.png => numberpicker_down_longpressed_holo_light.png} (100%)
 rename core/res/res/drawable-hdpi/{timepicker_down_normal.9.png => numberpicker_down_normal.9.png} (100%)
 rename core/res/res/drawable-hdpi/{timepicker_down_normal_holo_dark.png => numberpicker_down_normal_holo_dark.png} (100%)
 rename core/res/res/drawable-hdpi/{timepicker_down_normal_holo_light.png => numberpicker_down_normal_holo_light.png} (100%)
 rename core/res/res/drawable-hdpi/{timepicker_down_pressed.9.png => numberpicker_down_pressed.9.png} (100%)
 rename core/res/res/drawable-hdpi/{timepicker_down_pressed_holo_dark.png => numberpicker_down_pressed_holo_dark.png} (100%)
 rename core/res/res/drawable-hdpi/{timepicker_down_pressed_holo_light.png => numberpicker_down_pressed_holo_light.png} (100%)
 rename core/res/res/drawable-hdpi/{timepicker_down_selected.9.png => numberpicker_down_selected.9.png} (100%)
 rename core/res/res/drawable-hdpi/{timepicker_input_disabled.9.png => numberpicker_input_disabled.9.png} (100%)
 rename core/res/res/drawable-hdpi/{timepicker_input_normal.9.png => numberpicker_input_normal.9.png} (100%)
 rename core/res/res/drawable-hdpi/{timepicker_input_pressed.9.png => numberpicker_input_pressed.9.png} (100%)
 rename core/res/res/drawable-hdpi/{timepicker_input_selected.9.png => numberpicker_input_selected.9.png} (100%)
 rename core/res/res/drawable-hdpi/{timepicker_up_disabled.9.png => numberpicker_up_disabled.9.png} (100%)
 rename core/res/res/drawable-hdpi/{timepicker_up_disabled_focused.9.png => numberpicker_up_disabled_focused.9.png} (100%)
 rename core/res/res/drawable-hdpi/{timepicker_up_disabled_focused_holo_dark.png => numberpicker_up_disabled_focused_holo_dark.png} (100%)
 rename core/res/res/drawable-hdpi/{timepicker_up_disabled_focused_holo_light.png => numberpicker_up_disabled_focused_holo_light.png} (100%)
 rename core/res/res/drawable-hdpi/{timepicker_up_disabled_holo_dark.png => numberpicker_up_disabled_holo_dark.png} (100%)
 rename core/res/res/drawable-hdpi/{timepicker_up_disabled_holo_light.png => numberpicker_up_disabled_holo_light.png} (100%)
 rename core/res/res/drawable-hdpi/{timepicker_up_focused_holo_dark.png => numberpicker_up_focused_holo_dark.png} (100%)
 rename core/res/res/drawable-hdpi/{timepicker_up_focused_holo_light.png => numberpicker_up_focused_holo_light.png} (100%)
 rename core/res/res/drawable-hdpi/{timepicker_up_longpressed_holo_dark.png => numberpicker_up_longpressed_holo_dark.png} (100%)
 rename core/res/res/drawable-hdpi/{timepicker_up_longpressed_holo_light.png => numberpicker_up_longpressed_holo_light.png} (100%)
 rename core/res/res/drawable-hdpi/{timepicker_up_normal.9.png => numberpicker_up_normal.9.png} (100%)
 rename core/res/res/drawable-hdpi/{timepicker_up_normal_holo_dark.png => numberpicker_up_normal_holo_dark.png} (100%)
 rename core/res/res/drawable-hdpi/{timepicker_up_normal_holo_light.png => numberpicker_up_normal_holo_light.png} (100%)
 rename core/res/res/drawable-hdpi/{timepicker_up_pressed.9.png => numberpicker_up_pressed.9.png} (100%)
 rename core/res/res/drawable-hdpi/{timepicker_up_pressed_holo_dark.png => numberpicker_up_pressed_holo_dark.png} (100%)
 rename core/res/res/drawable-hdpi/{timepicker_up_pressed_holo_light.png => numberpicker_up_pressed_holo_light.png} (100%)
 rename core/res/res/drawable-hdpi/{timepicker_up_selected.9.png => numberpicker_up_selected.9.png} (100%)
 delete mode 100644 core/res/res/drawable-hdpi/simple_week_dayline_holo_light.9.png
 rename core/res/res/drawable-ldpi/{timepicker_down_disabled.9.png => numberpicker_down_disabled.9.png} (100%)
 rename core/res/res/drawable-ldpi/{timepicker_down_disabled_focused.9.png => numberpicker_down_disabled_focused.9.png} (100%)
 rename core/res/res/drawable-ldpi/{timepicker_down_normal.9.png => numberpicker_down_normal.9.png} (100%)
 rename core/res/res/drawable-ldpi/{timepicker_down_pressed.9.png => numberpicker_down_pressed.9.png} (100%)
 rename core/res/res/drawable-ldpi/{timepicker_down_selected.9.png => numberpicker_down_selected.9.png} (100%)
 rename core/res/res/drawable-ldpi/{timepicker_input_disabled.9.png => numberpicker_input_disabled.9.png} (100%)
 rename core/res/res/drawable-ldpi/{timepicker_input_normal.9.png => numberpicker_input_normal.9.png} (100%)
 rename core/res/res/drawable-ldpi/{timepicker_input_pressed.9.png => numberpicker_input_pressed.9.png} (100%)
 rename core/res/res/drawable-ldpi/{timepicker_input_selected.9.png => numberpicker_input_selected.9.png} (100%)
 rename core/res/res/drawable-ldpi/{timepicker_up_disabled.9.png => numberpicker_up_disabled.9.png} (100%)
 rename core/res/res/drawable-ldpi/{timepicker_up_disabled_focused.9.png => numberpicker_up_disabled_focused.9.png} (100%)
 rename core/res/res/drawable-ldpi/{timepicker_up_normal.9.png => numberpicker_up_normal.9.png} (100%)
 rename core/res/res/drawable-ldpi/{timepicker_up_pressed.9.png => numberpicker_up_pressed.9.png} (100%)
 rename core/res/res/drawable-ldpi/{timepicker_up_selected.9.png => numberpicker_up_selected.9.png} (100%)
 rename core/res/res/drawable-mdpi/{timepicker_down_disabled.9.png => numberpicker_down_disabled.9.png} (100%)
 rename core/res/res/drawable-mdpi/{timepicker_down_disabled_focused.9.png => numberpicker_down_disabled_focused.9.png} (100%)
 rename core/res/res/drawable-mdpi/{timepicker_down_disabled_focused_holo_dark.png => numberpicker_down_disabled_focused_holo_dark.png} (100%)
 rename core/res/res/drawable-mdpi/{timepicker_down_disabled_focused_holo_light.png => numberpicker_down_disabled_focused_holo_light.png} (100%)
 rename core/res/res/drawable-mdpi/{timepicker_down_disabled_holo_dark.png => numberpicker_down_disabled_holo_dark.png} (100%)
 rename core/res/res/drawable-mdpi/{timepicker_down_disabled_holo_light.png => numberpicker_down_disabled_holo_light.png} (100%)
 rename core/res/res/drawable-mdpi/{timepicker_down_focused_holo_dark.png => numberpicker_down_focused_holo_dark.png} (100%)
 rename core/res/res/drawable-mdpi/{timepicker_down_focused_holo_light.png => numberpicker_down_focused_holo_light.png} (100%)
 rename core/res/res/drawable-mdpi/{timepicker_down_longpressed_holo_dark.png => numberpicker_down_longpressed_holo_dark.png} (100%)
 rename core/res/res/drawable-mdpi/{timepicker_down_longpressed_holo_light.png => numberpicker_down_longpressed_holo_light.png} (100%)
 rename core/res/res/drawable-mdpi/{timepicker_down_normal.9.png => numberpicker_down_normal.9.png} (100%)
 rename core/res/res/drawable-mdpi/{timepicker_down_normal_holo_dark.png => numberpicker_down_normal_holo_dark.png} (100%)
 rename core/res/res/drawable-mdpi/{timepicker_down_normal_holo_light.png => numberpicker_down_normal_holo_light.png} (100%)
 rename core/res/res/drawable-mdpi/{timepicker_down_pressed.9.png => numberpicker_down_pressed.9.png} (100%)
 rename core/res/res/drawable-mdpi/{timepicker_down_pressed_holo_dark.png => numberpicker_down_pressed_holo_dark.png} (100%)
 rename core/res/res/drawable-mdpi/{timepicker_down_pressed_holo_light.png => numberpicker_down_pressed_holo_light.png} (100%)
 rename core/res/res/drawable-mdpi/{timepicker_down_selected.9.png => numberpicker_down_selected.9.png} (100%)
 rename core/res/res/drawable-mdpi/{timepicker_input_disabled.9.png => numberpicker_input_disabled.9.png} (100%)
 rename core/res/res/drawable-mdpi/{timepicker_input_normal.9.png => numberpicker_input_normal.9.png} (100%)
 rename core/res/res/drawable-mdpi/{timepicker_input_pressed.9.png => numberpicker_input_pressed.9.png} (100%)
 rename core/res/res/drawable-mdpi/{timepicker_input_selected.9.png => numberpicker_input_selected.9.png} (100%)
 rename core/res/res/drawable-mdpi/{timepicker_up_disabled.9.png => numberpicker_up_disabled.9.png} (100%)
 rename core/res/res/drawable-mdpi/{timepicker_up_disabled_focused.9.png => numberpicker_up_disabled_focused.9.png} (100%)
 rename core/res/res/drawable-mdpi/{timepicker_up_disabled_focused_holo_dark.png => numberpicker_up_disabled_focused_holo_dark.png} (100%)
 rename core/res/res/drawable-mdpi/{timepicker_up_disabled_focused_holo_light.png => numberpicker_up_disabled_focused_holo_light.png} (100%)
 rename core/res/res/drawable-mdpi/{timepicker_up_disabled_holo_dark.png => numberpicker_up_disabled_holo_dark.png} (100%)
 rename core/res/res/drawable-mdpi/{timepicker_up_disabled_holo_light.png => numberpicker_up_disabled_holo_light.png} (100%)
 rename core/res/res/drawable-mdpi/{timepicker_up_focused_holo_dark.png => numberpicker_up_focused_holo_dark.png} (100%)
 rename core/res/res/drawable-mdpi/{timepicker_up_focused_holo_light.png => numberpicker_up_focused_holo_light.png} (100%)
 rename core/res/res/drawable-mdpi/{timepicker_up_longpressed_holo_dark.png => numberpicker_up_longpressed_holo_dark.png} (100%)
 rename core/res/res/drawable-mdpi/{timepicker_up_longpressed_holo_light.png => numberpicker_up_longpressed_holo_light.png} (100%)
 rename core/res/res/drawable-mdpi/{timepicker_up_normal.9.png => numberpicker_up_normal.9.png} (100%)
 rename core/res/res/drawable-mdpi/{timepicker_up_normal_holo_dark.png => numberpicker_up_normal_holo_dark.png} (100%)
 rename core/res/res/drawable-mdpi/{timepicker_up_normal_holo_light.png => numberpicker_up_normal_holo_light.png} (100%)
 rename core/res/res/drawable-mdpi/{timepicker_up_pressed.9.png => numberpicker_up_pressed.9.png} (100%)
 rename core/res/res/drawable-mdpi/{timepicker_up_pressed_holo_dark.png => numberpicker_up_pressed_holo_dark.png} (100%)
 rename core/res/res/drawable-mdpi/{timepicker_up_pressed_holo_light.png => numberpicker_up_pressed_holo_light.png} (100%)
 rename core/res/res/drawable-mdpi/{timepicker_up_selected.9.png => numberpicker_up_selected.9.png} (100%)
 delete mode 100644 core/res/res/drawable-mdpi/simple_week_dayline_holo_light.9.png
 rename core/res/res/drawable/{timepicker_up_btn.xml => numberpicker_down_btn.xml} (78%)
 rename core/res/res/drawable/{timepicker_up_btn_holo_dark.xml => numberpicker_down_btn_holo_dark.xml} (76%)
 rename core/res/res/drawable/{timepicker_up_btn_holo_light.xml => numberpicker_down_btn_holo_light.xml} (76%)
 rename core/res/res/drawable/{timepicker_input.xml => numberpicker_input.xml} (79%)
 rename core/res/res/drawable/{timepicker_down_btn.xml => numberpicker_up_btn.xml} (80%)
 rename core/res/res/drawable/{timepicker_down_btn_holo_dark.xml => numberpicker_up_btn_holo_dark.xml} (81%)
 rename core/res/res/drawable/{timepicker_down_btn_holo_light.xml => numberpicker_up_btn_holo_light.xml} (80%)

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 ed1a5e94c8fd510bf25df259781d4878bf35e75b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 285
zcmeAS@N?(olHy`uVBq!ia0vp@KrG0?1|-@3tIYvYEX7WqAsj$Z!;#Vf<Z~8yL>4nJ
zaCd?*qxs3xYk`9MJzX3_G$ziS?8tS<K)^M=i9<<jdQ(a8i*42VDdBPln{VuO7knS!
zD89Gx!rI4+I(ZZ~F0B{-Q6FcdBJ9%AvZ%2mVN2m24_1)_L5=wjZeDrz@O2LppTj&W
zu@|#$-C<nAd`gf(p}ds&Nz|-GPR@}6?;3?7SnHN43b&{~;0bBWXV`dTYwC`JzB*e}
z?meELvt+AhfY1Ddt47@{CCp_9w8g4cuwOg1U(M`wX?5-*jga5XcMQsu9iF$BU7KS3
c+`g8PYqHrt?U3c0fnH(oboFyt=akR{02xGSiU0rr

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 f264cb6e584d62cede5151c49995894cf1091c21..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 258
zcmeAS@N?(olHy`uVBq!ia0vp^oIuRO!3HEZ#7tidq*#ibJVQ8upoSx*1Eiq9BeIx*
zfx8og8O=|gUJDdl;_2cTA~Ch}qHWe8M*-Fk_t({5<`7e2;f#pLR*b0RJ1BkQiHl{B
z$K+F9-di_p2)nSgp!KYm9M9(WhMPaDE?sg+UUBIXPQ{4YrFv;E5<6M>esC(rB>Bx)
z(68SA<3NNW-=_NGGIP(kukxAkNcgam|HiB>j@)lI{p<+n4_6NR)1m9vDmLrSjt9K=
zZ_cxrZvXcG$}O7BbsG=se$M8Lc)al&mwx(A=Ja}1-i>PaegNIe;OXk;vd$@?2>@$)
BVLbo<

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 @@
     <item android:state_pressed="false"
           android:state_enabled="true"
           android:state_focused="false"
-          android:drawable="@drawable/timepicker_up_normal" />
+          android:drawable="@drawable/numberpicker_down_normal" />
 
     <item android:state_pressed="true"
           android:state_enabled="true"
-          android:drawable="@drawable/timepicker_up_pressed" />
+          android:drawable="@drawable/numberpicker_down_pressed" />
 
     <item android:state_pressed="false"
           android:state_enabled="true"
           android:state_focused="true"
-          android:drawable="@drawable/timepicker_up_selected" />
+          android:drawable="@drawable/numberpicker_down_selected" />
 
     <item android:state_pressed="false"
           android:state_enabled="false"
           android:state_focused="false"
-          android:drawable="@drawable/timepicker_up_disabled" />
+          android:drawable="@drawable/numberpicker_down_disabled" />
 
     <item android:state_pressed="false"
           android:state_enabled="false"
           android:state_focused="true"
-          android:drawable="@drawable/timepicker_up_disabled_focused" />
+          android:drawable="@drawable/numberpicker_down_disabled_focused" />
 
 </selector>
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 @@
     <item android:state_pressed="false"
           android:state_enabled="true"
           android:state_focused="false"
-          android:drawable="@drawable/timepicker_up_normal_holo_dark" />
+          android:drawable="@drawable/numberpicker_down_normal_holo_dark" />
 
     <item android:state_pressed="true"
           android:state_enabled="true"
-          android:drawable="@drawable/timepicker_up_pressed_holo_dark" />
+          android:drawable="@drawable/numberpicker_down_pressed_holo_dark" />
 
     <item android:state_pressed="false"
           android:state_enabled="true"
           android:state_focused="true"
-          android:drawable="@drawable/timepicker_up_focused_holo_dark" />
+          android:drawable="@drawable/numberpicker_down_focused_holo_dark" />
 
     <item android:state_pressed="false"
           android:state_enabled="false"
           android:state_focused="false"
-          android:drawable="@drawable/timepicker_up_disabled_holo_dark" />
+          android:drawable="@drawable/numberpicker_down_disabled_holo_dark" />
 
     <item android:state_pressed="false"
           android:state_enabled="false"
           android:state_focused="true"
-          android:drawable="@drawable/timepicker_up_disabled_focused_holo_dark" />
+          android:drawable="@drawable/numberpicker_down_disabled_focused_holo_dark" />
 
 </selector>
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 @@
     <item android:state_pressed="false"
           android:state_enabled="true"
           android:state_focused="false"
-          android:drawable="@drawable/timepicker_up_normal_holo_light" />
+          android:drawable="@drawable/numberpicker_down_normal_holo_light" />
 
     <item android:state_pressed="true"
           android:state_enabled="true"
-          android:drawable="@drawable/timepicker_up_pressed_holo_light" />
+          android:drawable="@drawable/numberpicker_down_pressed_holo_light" />
 
     <item android:state_pressed="false"
           android:state_enabled="true"
           android:state_focused="true"
-          android:drawable="@drawable/timepicker_up_focused_holo_light" />
+          android:drawable="@drawable/numberpicker_down_focused_holo_light" />
 
     <item android:state_pressed="false"
           android:state_enabled="false"
           android:state_focused="false"
-          android:drawable="@drawable/timepicker_up_focused_holo_light" />
+          android:drawable="@drawable/numberpicker_down_disabled_holo_light" />
 
     <item android:state_pressed="false"
           android:state_enabled="false"
           android:state_focused="true"
-          android:drawable="@drawable/timepicker_up_disabled_focused_holo_light" />
+          android:drawable="@drawable/numberpicker_down_disabled_focused_holo_light" />
 
 </selector>
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 @@
     <item android:state_pressed="false"
           android:state_enabled="true"
           android:state_focused="false"
-          android:drawable="@drawable/timepicker_input_normal" />
+          android:drawable="@drawable/numberpicker_input_normal" />
 
     <item android:state_pressed="true"
           android:state_enabled="true"
-          android:drawable="@drawable/timepicker_input_pressed" />
+          android:drawable="@drawable/numberpicker_input_pressed" />
 
     <item android:state_pressed="false"
           android:state_enabled="true"
           android:state_focused="true"
-          android:drawable="@drawable/timepicker_input_selected" />
+          android:drawable="@drawable/numberpicker_input_selected" />
 
     <item android:state_pressed="false"
           android:state_enabled="false"
           android:state_focused="false"
-          android:drawable="@drawable/timepicker_input_disabled" />
+          android:drawable="@drawable/numberpicker_input_disabled" />
 
     <item android:state_pressed="false"
           android:state_enabled="false"
           android:state_focused="true"
-          android:drawable="@drawable/timepicker_input_normal" />
+          android:drawable="@drawable/numberpicker_input_normal" />
 
 </selector>
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 @@
     <item android:state_pressed="false"
           android:state_enabled="true"
           android:state_focused="false"
-          android:drawable="@drawable/timepicker_down_normal" />
+          android:drawable="@drawable/numberpicker_up_normal" />
 
     <item android:state_pressed="true"
           android:state_enabled="true"
-          android:drawable="@drawable/timepicker_down_pressed" />
+          android:drawable="@drawable/numberpicker_up_pressed" />
 
     <item android:state_pressed="false"
           android:state_enabled="true"
           android:state_focused="true"
-          android:drawable="@drawable/timepicker_down_selected" />
+          android:drawable="@drawable/numberpicker_up_selected" />
 
     <item android:state_pressed="false"
           android:state_enabled="false"
           android:state_focused="false"
-          android:drawable="@drawable/timepicker_down_disabled" />
+          android:drawable="@drawable/numberpicker_up_disabled" />
 
     <item android:state_pressed="false"
           android:state_enabled="false"
           android:state_focused="true"
-          android:drawable="@drawable/timepicker_down_disabled_focused" />
+          android:drawable="@drawable/numberpicker_up_disabled_focused" />
 
 </selector>
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 @@
     <item android:state_pressed="false"
           android:state_enabled="true"
           android:state_focused="false"
-          android:drawable="@drawable/timepicker_down_normal_holo_dark" />
+          android:drawable="@drawable/numberpicker_up_normal_holo_dark" />
 
     <item android:state_pressed="true"
           android:state_enabled="true"
-          android:drawable="@drawable/timepicker_down_pressed_holo_dark" />
+          android:drawable="@drawable/numberpicker_up_pressed_holo_dark" />
 
     <item android:state_pressed="false"
           android:state_enabled="true"
           android:state_focused="true"
-          android:drawable="@drawable/timepicker_down_focused_holo_dark" />
+          android:drawable="@drawable/numberpicker_up_focused_holo_dark" />
 
     <item android:state_pressed="false"
           android:state_enabled="false"
           android:state_focused="false"
-          android:drawable="@drawable/timepicker_down_disabled_holo_dark" />
+          android:drawable="@drawable/numberpicker_up_disabled_holo_dark" />
 
     <item android:state_pressed="false"
           android:state_enabled="false"
           android:state_focused="true"
-          android:drawable="@drawable/timepicker_down_disabled_focused_holo_dark" />
+          android:drawable="@drawable/numberpicker_up_disabled_focused_holo_dark" />
 
 </selector>
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 @@
     <item android:state_pressed="false"
           android:state_enabled="true"
           android:state_focused="false"
-          android:drawable="@drawable/timepicker_down_normal_holo_light" />
+          android:drawable="@drawable/numberpicker_up_normal_holo_light" />
 
     <item android:state_pressed="true"
           android:state_enabled="true"
-          android:drawable="@drawable/timepicker_down_pressed_holo_light" />
+          android:drawable="@drawable/numberpicker_up_pressed_holo_light" />
 
     <item android:state_pressed="false"
           android:state_enabled="true"
           android:state_focused="true"
-          android:drawable="@drawable/timepicker_down_focused_holo_light" />
+          android:drawable="@drawable/numberpicker_up_focused_holo_light" />
 
     <item android:state_pressed="false"
           android:state_enabled="false"
           android:state_focused="false"
-          android:drawable="@drawable/timepicker_down_disabled_holo_light" />
+          android:drawable="@drawable/numberpicker_up_focused_holo_light" />
 
     <item android:state_pressed="false"
           android:state_enabled="false"
           android:state_focused="true"
-          android:drawable="@drawable/timepicker_down_disabled_focused_holo_light" />
+          android:drawable="@drawable/numberpicker_up_disabled_focused_holo_light" />
 
 </selector>
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" />
 
-    <EditText android:id="@+id/timepicker_input"
+    <EditText android:id="@+id/numberpicker_input"
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
         style="?android:attr/numberPickerInputTextStyle" />
diff --git a/core/res/res/values/styles.xml b/core/res/res/values/styles.xml
index 96e60f29f1912..775468b16fe56 100644
--- a/core/res/res/values/styles.xml
+++ b/core/res/res/values/styles.xml
@@ -495,18 +495,18 @@
     </style>
 
     <style name="Widget.ImageButton.NumberPickerUpButton">
-        <item name="android:background">@android:drawable/timepicker_up_btn</item>
+        <item name="android:background">@android:drawable/numberpicker_up_btn</item>
     </style>
 
     <style name="Widget.ImageButton.NumberPickerDownButton">
-        <item name="android:background">@android:drawable/timepicker_down_btn</item>
+        <item name="android:background">@android:drawable/numberpicker_down_btn</item>
     </style>
 
     <style name="Widget.EditText.NumberPickerInputText">
         <item name="android:textAppearance">@style/TextAppearance.Large.Inverse.NumberPickerInputText</item>
         <item name="android:gravity">center</item>
         <item name="android:singleLine">true</item>
-        <item name="android:background">@drawable/timepicker_input</item>
+        <item name="android:background">@drawable/numberpicker_input</item>
     </style>
 
     <style name="Widget.AutoCompleteTextView" parent="Widget.EditText">
@@ -1464,14 +1464,14 @@
 
     <style name="Widget.Holo.ImageButton.NumberPickerUpButton">
         <item name="android:background">@null</item>
-        <item name="android:src">@android:drawable/timepicker_up_btn_holo_dark</item>
+        <item name="android:src">@android:drawable/numberpicker_up_btn_holo_dark</item>
         <item name="android:paddingTop">26dip</item>
         <item name="android:paddingBottom">26dip</item>
     </style>
 
     <style name="Widget.Holo.ImageButton.NumberPickerDownButton">
         <item name="android:background">@null</item>
-        <item name="android:src">@android:drawable/timepicker_down_btn_holo_dark</item>
+        <item name="android:src">@android:drawable/numberpicker_down_btn_holo_dark</item>
         <item name="android:paddingTop">26dip</item>
         <item name="android:paddingBottom">26dip</item>
     </style>
@@ -1833,11 +1833,11 @@
     </style>
 
     <style name="Widget.Holo.Light.ImageButton.NumberPickerUpButton" parent="Widget.Holo.ImageButton.NumberPickerUpButton">
-        <item name="android:src">@android:drawable/timepicker_up_btn_holo_light</item>
+        <item name="android:src">@android:drawable/numberpicker_up_btn_holo_light</item>
     </style>
 
     <style name="Widget.Holo.Light.ImageButton.NumberPickerDownButton" parent="Widget.Holo.ImageButton.NumberPickerDownButton">
-        <item name="android:src">@android:drawable/timepicker_down_btn_holo_light</item>
+        <item name="android:src">@android:drawable/numberpicker_down_btn_holo_light</item>
     </style>
 
     <style name="Widget.Holo.Light.EditText.NumberPickerInputText" parent="Widget.Holo.EditText.NumberPickerInputText">