Merge "Renaming NumberPicker resources to be consistent." into honeycomb

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) {

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>

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>

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>

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>

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>

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>

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>