Messaging: Fix wrong enum value

* Apparently in QPR2, Material Design specifies iconSize which is set
  as a dimension (18dp) and overwrites ours which is an enum
* Fix it by choosing a unique name for the styleable

Change-Id: I0e9f93dc5bf8d450ea987f3b1fde9641827f2f99

res/layout/add_contacts_confirmation_dialog_body.xml

@@ -28,7 +28,7 @@
         android:layout_width="@dimen/conversation_list_contact_icon_size"
         android:layout_height="@dimen/conversation_list_contact_icon_size"
         android:importantForAccessibility="no"
-        app:iconSize="large"
+        app:contactIconSize="large"
         android:layout_gravity="center_vertical"
         android:clickable="true" />
 

res/layout/blocked_participant_list_item_view.xml

@@ -26,7 +26,7 @@
         android:layout_width="@dimen/contact_list_icon_size"
         android:layout_height="@dimen/contact_list_icon_size"
         android:importantForAccessibility="no"
-        app:iconSize="normal"
+        app:contactIconSize="normal"
         android:layout_gravity="center_vertical"/>
     <TextView
         android:id="@+id/name"

res/layout/compose_message_view.xml

@@ -157,7 +157,7 @@
                         android:layout_width="@dimen/conversation_message_contact_icon_size"
                         android:layout_height="@dimen/conversation_message_contact_icon_size"
                         android:importantForAccessibility="no"
-                        app:iconSize="normal"
+                        app:contactIconSize="normal"
                         app:reveal="true"
                         android:clickable="true" />
                     <ImageButton

res/layout/contact_list_item_view.xml

@@ -44,7 +44,7 @@
             android:layout_width="@dimen/contact_list_icon_size"
             android:layout_height="@dimen/contact_list_icon_size"
             android:importantForAccessibility="no"
-            app:iconSize="normal"
+            app:contactIconSize="normal"
             android:clickable="true" />
 
         <ImageView

res/layout/conversation_list_item_view.xml

@@ -81,7 +81,7 @@
                     android:layout_height="@dimen/conversation_list_contact_icon_size"
                     android:importantForAccessibility="no"
                     android:contentDescription="@null"
-                    app:iconSize="large"
+                    app:contactIconSize="large"
                     android:clickable="true"
                     android:background="@android:color/transparent" />
                 <ImageView

res/layout/conversation_message_view.xml

@@ -25,7 +25,7 @@
         android:id="@+id/conversation_icon"
         android:layout_width="@dimen/conversation_message_contact_icon_size"
         android:layout_height="@dimen/conversation_message_contact_icon_size"
-        app:iconSize="normal"
+        app:contactIconSize="normal"
         android:clickable="true"
         android:layout_gravity="center_vertical"
         android:importantForAccessibility="no" />

res/layout/person_item_view.xml

@@ -26,7 +26,7 @@
         android:layout_width="@dimen/contact_list_icon_size"
         android:layout_height="@dimen/contact_list_icon_size"
         android:importantForAccessibility="no"
-        app:iconSize="normal"
+        app:contactIconSize="normal"
         android:layout_gravity="center_vertical" />
 
     <LinearLayout

res/layout/sim_selector_item_view.xml

@@ -60,6 +60,6 @@
         android:importantForAccessibility="no"
         android:layout_gravity="center_vertical"
         android:elevation="3dp"
-        app:iconSize="normal" />
+        app:contactIconSize="normal" />
 
 </com.android.messaging.ui.conversation.SimSelectorItemView>