filab/packages_apps_Messaging
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Messaging: Fix wrong enum value

Browse Source 
* 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
This commit is contained in:
Michael W
2025-03-06 20:40:00 +01:00
parent 53eb598b63
commit 37f7aaea87
10 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
res/layout/add_contacts_confirmation_dialog_body.xml
View File

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

2
res/layout/blocked_participant_list_item_view.xml
View File

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

2
res/layout/compose_message_view.xml
View File

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

2
res/layout/contact_list_item_view.xml
View File

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

2
res/layout/conversation_list_item_view.xml
View File

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

2
res/layout/conversation_message_view.xml
View File

@@ -25,7 +25,7 @@
android:id="@+id/conversation_icon" android:id="@+id/conversation_icon"
android:layout_width="@dimen/conversation_message_contact_icon_size" android:layout_width="@dimen/conversation_message_contact_icon_size"
android:layout_height="@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:clickable="true"
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"
android:importantForAccessibility="no" /> android:importantForAccessibility="no" />

2
res/layout/person_item_view.xml
View File

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

2
res/layout/sim_selector_item_view.xml
View File

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

2
res/values/attrs.xml
View File

@@ -17,7 +17,7 @@
--> -->
<resources> <resources>
<declare-styleable name="ContactIconView"> <declare-styleable name="ContactIconView">
<attr name="iconSize"> <attr name="contactIconSize">
<enum name="normal" value="0" /> <enum name="normal" value="0" />
<enum name="large" value="1" /> <enum name="large" value="1" />
<enum name="small" value="2" /> <enum name="small" value="2" />

2
src/com/android/messaging/ui/ContactIconView.java
View File

@@ -57,7 +57,7 @@ public class ContactIconView extends AsyncImageView {
final Resources resources = context.getResources(); final Resources resources = context.getResources();
final TypedArray a = context.obtainStyledAttributes(attrs, R.styleable.ContactIconView); final TypedArray a = context.obtainStyledAttributes(attrs, R.styleable.ContactIconView);
final int iconSizeId = a.getInt(R.styleable.ContactIconView_iconSize, 0); final int iconSizeId = a.getInt(R.styleable.ContactIconView_contactIconSize, 0);
switch (iconSizeId) { switch (iconSizeId) {
case NORMAL_ICON_SIZE_ID: case NORMAL_ICON_SIZE_ID:
mIconSize = (int) resources.getDimension( mIconSize = (int) resources.getDimension(