Use theme-specific image for 'add contact' button

res/layout/message_compose.xml

@@ -55,7 +55,7 @@
                     <ImageButton
                         android:id="@+id/add_to"
                         android:contentDescription="@string/message_compose_description_add_to"
-                        android:src="@drawable/ic_button_add_contact"
+                        android:src="?attr/messageComposeAddContactImage"
                         android:layout_height="wrap_content"
                         android:layout_width="wrap_content"
                         android:padding="8dip"
@@ -87,7 +87,7 @@
                     <ImageButton
                         android:id="@+id/add_cc"
                         android:contentDescription="@string/message_compose_description_add_cc"
-                        android:src="@drawable/ic_button_add_contact"
+                        android:src="?attr/messageComposeAddContactImage"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:padding="8dip"
@@ -123,7 +123,7 @@
                         android:layout_height="wrap_content"
                         android:layout_width="wrap_content"
                         android:padding="8dip"
-                        android:src="@drawable/ic_button_add_contact"/>
+                        android:src="?attr/messageComposeAddContactImage"/>
 
                 </LinearLayout>
 

res/values/attrs.xml

@@ -46,6 +46,7 @@
         <attr name="messageListDividerColor" format="reference|color"/>
         <attr name="messageViewHeaderBackgroundColor" format="reference|color"/>
         <attr name="messageViewAttachmentBackground" format="reference"/>
+        <attr name="messageComposeAddContactImage" format="reference"/>
         <attr name="composerBackgroundColor" format="color"/>
 
     </declare-styleable>

res/values/themes.xml

@@ -45,6 +45,7 @@
         <item name="messageListDividerColor">#ffcccccc</item>
         <item name="messageViewHeaderBackgroundColor">#ffffffff</item>
         <item name="messageViewAttachmentBackground">@drawable/attachment_text_box_light</item>
+        <item name="messageComposeAddContactImage">@drawable/ic_button_add_contact_light</item>
     </style>
 
     <style name="Theme.K9.Dark.Base" parent="Theme.Sherlock">
@@ -91,6 +92,7 @@
         <item name="messageListDividerColor">#ff333333</item>
         <item name="messageViewHeaderBackgroundColor">#000000</item>
         <item name="messageViewAttachmentBackground">@drawable/attachment_text_box_dark</item>
+        <item name="messageComposeAddContactImage">@drawable/ic_button_add_contact_dark</item>
     </style>
 
     <style name="Theme.K9.Light" parent="Theme.K9.Light.Base">