update resources

res/stdres/btn_check.xml

@@ -1,65 +1,45 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2011 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
 
     <!-- Enabled states -->
         
-    <item android:state_checked="true" android:state_window_focused="false"
-          android:state_enabled="true"
-          android:drawable="@drawable/btn_check_on_holo_light" />
-    <item android:state_checked="false" android:state_window_focused="false"
-          android:state_enabled="true"
-          android:drawable="@drawable/btn_check_off_holo_light" />
-
     <item android:state_checked="true" android:state_pressed="true"
           android:state_enabled="true"
-          android:drawable="@drawable/btn_check_on_pressed_holo_light" />
+          android:drawable="@drawable/btn_check_on_pressed" />
     <item android:state_checked="false" android:state_pressed="true"
           android:state_enabled="true"
-          android:drawable="@drawable/btn_check_off_pressed_holo_light" />
+          android:drawable="@drawable/btn_check_off_pressed" />
 
     <item android:state_checked="true" android:state_focused="true"
           android:state_enabled="true"
-          android:drawable="@drawable/btn_check_on_focused_holo_light" />
+          android:drawable="@drawable/btn_check_on_focused" />
     <item android:state_checked="false" android:state_focused="true"
           android:state_enabled="true"
-          android:drawable="@drawable/btn_check_off_focused_holo_light" />
+          android:drawable="@drawable/btn_check_off_focused" />
+
+    <item android:state_checked="true" android:state_hovered="true"
+          android:state_enabled="true"
+          android:drawable="@drawable/btn_check_on_focused" />
+    <item android:state_checked="false" android:state_hovered="true"
+          android:state_enabled="true"
+          android:drawable="@drawable/btn_check_off_focused" />
 
     <item android:state_checked="false"
           android:state_enabled="true"
-          android:drawable="@drawable/btn_check_off_holo_light" />
+          android:drawable="@drawable/btn_check_off" />
     <item android:state_checked="true"
           android:state_enabled="true"
-          android:drawable="@drawable/btn_check_on_holo_light" />
+          android:drawable="@drawable/btn_check_on" />
 
 
     <!-- Disabled states -->
 
-    <item android:state_checked="true" android:state_window_focused="false"
-          android:drawable="@drawable/btn_check_on_disabled_holo_light" />
-    <item android:state_checked="false" android:state_window_focused="false"
-          android:drawable="@drawable/btn_check_off_disabled_holo_light" />
+    <item android:state_checked="true" 
+          android:drawable="@drawable/btn_check_on_disabled" />
+    <item android:state_checked="false"
+          android:drawable="@drawable/btn_check_off_disabled" />
 
-    <item android:state_checked="true" android:state_focused="true"
-          android:drawable="@drawable/btn_check_on_disabled_focused_holo_light" />
-    <item android:state_checked="false" android:state_focused="true"
-          android:drawable="@drawable/btn_check_off_disabled_focused_holo_light" />
-
-    <item android:state_checked="false" android:drawable="@drawable/btn_check_off_disabled_holo_light" />
-    <item android:state_checked="true" android:drawable="@drawable/btn_check_on_disabled_holo_light" />
+    <item android:state_checked="false" android:drawable="@drawable/btn_check_off" />
+    <item android:state_checked="true" android:drawable="@drawable/btn_check_on" />
 
 </selector>

res/stdres/btn_check_holo_light.xml

@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2011 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <!-- Enabled states -->
+        
+    <item android:state_checked="true" android:state_window_focused="false"
+          android:state_enabled="true"
+          android:drawable="@drawable/btn_check_on_holo_light" />
+    <item android:state_checked="false" android:state_window_focused="false"
+          android:state_enabled="true"
+          android:drawable="@drawable/btn_check_off_holo_light" />
+
+    <item android:state_checked="true" android:state_pressed="true"
+          android:state_enabled="true"
+          android:drawable="@drawable/btn_check_on_pressed_holo_light" />
+    <item android:state_checked="false" android:state_pressed="true"
+          android:state_enabled="true"
+          android:drawable="@drawable/btn_check_off_pressed_holo_light" />
+
+    <item android:state_checked="true" android:state_focused="true"
+          android:state_enabled="true"
+          android:drawable="@drawable/btn_check_on_focused_holo_light" />
+    <item android:state_checked="false" android:state_focused="true"
+          android:state_enabled="true"
+          android:drawable="@drawable/btn_check_off_focused_holo_light" />
+
+    <item android:state_checked="false"
+          android:state_enabled="true"
+          android:drawable="@drawable/btn_check_off_holo_light" />
+    <item android:state_checked="true"
+          android:state_enabled="true"
+          android:drawable="@drawable/btn_check_on_holo_light" />
+
+
+    <!-- Disabled states -->
+
+    <item android:state_checked="true" android:state_window_focused="false"
+          android:drawable="@drawable/btn_check_on_disabled_holo_light" />
+    <item android:state_checked="false" android:state_window_focused="false"
+          android:drawable="@drawable/btn_check_off_disabled_holo_light" />
+
+    <item android:state_checked="true" android:state_focused="true"
+          android:drawable="@drawable/btn_check_on_disabled_focused_holo_light" />
+    <item android:state_checked="false" android:state_focused="true"
+          android:drawable="@drawable/btn_check_off_disabled_focused_holo_light" />
+
+    <item android:state_checked="false" android:drawable="@drawable/btn_check_off_disabled_holo_light" />
+    <item android:state_checked="true" android:drawable="@drawable/btn_check_on_disabled_holo_light" />
+
+</selector>

res/stdres/btn_radio.xml

@@ -1,59 +1,34 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2011 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_checked="true" android:state_window_focused="false"
-          android:state_enabled="true"
-          android:drawable="@drawable/btn_radio_on_holo_light" />
-    <item android:state_checked="false" android:state_window_focused="false"
-          android:state_enabled="true"
-          android:drawable="@drawable/btn_radio_off_holo_light" />
-          
     <item android:state_checked="true" android:state_pressed="true"
           android:state_enabled="true"
-          android:drawable="@drawable/btn_radio_on_pressed_holo_light" />
+          android:drawable="@drawable/btn_radio_on_pressed" />
     <item android:state_checked="false" android:state_pressed="true"
           android:state_enabled="true"
-          android:drawable="@drawable/btn_radio_off_pressed_holo_light" />
+          android:drawable="@drawable/btn_radio_off_pressed" />
 
     <item android:state_checked="true" android:state_focused="true"
           android:state_enabled="true"
-          android:drawable="@drawable/btn_radio_on_focused_holo_light" />
+          android:drawable="@drawable/btn_radio_on_focused" />
     <item android:state_checked="false" android:state_focused="true"
           android:state_enabled="true"
-          android:drawable="@drawable/btn_radio_off_focused_holo_light" />
+          android:drawable="@drawable/btn_radio_off_focused" />
+
+    <item android:state_checked="true" android:state_hovered="true"
+          android:state_enabled="true"
+          android:drawable="@drawable/btn_radio_on_focused" />
+    <item android:state_checked="false" android:state_hovered="true"
+          android:state_enabled="true"
+          android:drawable="@drawable/btn_radio_off_focused" />
 
     <item android:state_checked="false" android:state_enabled="true"
-          android:drawable="@drawable/btn_radio_off_holo_light" />
+          android:drawable="@drawable/btn_radio_off" />
     <item android:state_checked="true" android:state_enabled="true"
-          android:drawable="@drawable/btn_radio_on_holo_light" />
+          android:drawable="@drawable/btn_radio_on" />
 
     <!-- Disabled states -->
 
-    <item android:state_checked="true" android:state_window_focused="false"
-          android:drawable="@drawable/btn_radio_on_disabled_holo_light" />
-    <item android:state_checked="false" android:state_window_focused="false"
-          android:drawable="@drawable/btn_radio_off_disabled_holo_light" />
-
-    <item android:state_checked="true" android:state_focused="true"
-          android:drawable="@drawable/btn_radio_on_disabled_focused_holo_light" />
-    <item android:state_checked="false" android:state_focused="true"
-          android:drawable="@drawable/btn_radio_off_disabled_focused_holo_light" />
-
-    <item android:state_checked="false" android:drawable="@drawable/btn_radio_off_disabled_holo_light" />
-    <item android:state_checked="true" android:drawable="@drawable/btn_radio_on_disabled_holo_light" />
+    <item android:state_checked="false" android:drawable="@drawable/btn_radio_off_disabled" />
+    <item android:state_checked="true" android:drawable="@drawable/btn_radio_on_disabled" />
 
 </selector>

res/stdres/btn_radio_holo_light.xml

@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2011 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_checked="true" android:state_window_focused="false"
+          android:state_enabled="true"
+          android:drawable="@drawable/btn_radio_on_holo_light" />
+    <item android:state_checked="false" android:state_window_focused="false"
+          android:state_enabled="true"
+          android:drawable="@drawable/btn_radio_off_holo_light" />
+          
+    <item android:state_checked="true" android:state_pressed="true"
+          android:state_enabled="true"
+          android:drawable="@drawable/btn_radio_on_pressed_holo_light" />
+    <item android:state_checked="false" android:state_pressed="true"
+          android:state_enabled="true"
+          android:drawable="@drawable/btn_radio_off_pressed_holo_light" />
+
+    <item android:state_checked="true" android:state_focused="true"
+          android:state_enabled="true"
+          android:drawable="@drawable/btn_radio_on_focused_holo_light" />
+    <item android:state_checked="false" android:state_focused="true"
+          android:state_enabled="true"
+          android:drawable="@drawable/btn_radio_off_focused_holo_light" />
+
+    <item android:state_checked="false" android:state_enabled="true"
+          android:drawable="@drawable/btn_radio_off_holo_light" />
+    <item android:state_checked="true" android:state_enabled="true"
+          android:drawable="@drawable/btn_radio_on_holo_light" />
+
+    <!-- Disabled states -->
+
+    <item android:state_checked="true" android:state_window_focused="false"
+          android:drawable="@drawable/btn_radio_on_disabled_holo_light" />
+    <item android:state_checked="false" android:state_window_focused="false"
+          android:drawable="@drawable/btn_radio_off_disabled_holo_light" />
+
+    <item android:state_checked="true" android:state_focused="true"
+          android:drawable="@drawable/btn_radio_on_disabled_focused_holo_light" />
+    <item android:state_checked="false" android:state_focused="true"
+          android:drawable="@drawable/btn_radio_off_disabled_focused_holo_light" />
+
+    <item android:state_checked="false" android:drawable="@drawable/btn_radio_off_disabled_holo_light" />
+    <item android:state_checked="true" android:drawable="@drawable/btn_radio_on_disabled_holo_light" />
+
+</selector>

res/stdres/theme_default.xml

@@ -143,6 +143,23 @@
         fontFamily="SansSerif"
         fontSize="16"
         />
+    <style id="COMBO_BOX"
+        backgroundImageId="editbox_background"
+        padding="2,2,2,2"
+        margins="2,2,2,2"
+        minWidth="40"
+        fontFace="Arial"
+        fontFamily="SansSerif"
+        fontSize="16"
+        />
+    <style id="COMBO_BOX_BODY"
+        padding="2,2,2,2"
+        minWidth="40"
+        fontFace="Arial"
+        fontFamily="SansSerif"
+        fontSize="16"
+        align="Left|VCenter"
+        />
     <style id="EDIT_BOX"
         backgroundImageId="editbox_background"
         padding="5,6,5,6"