Snap for 11566466 from 5e2b15c9278d962f91ad425771fed7ec242ec760 to car-apps-aosp-releaseub-automotive-master-20240314mirror-car-apps-aosp-release

Change-Id: Ibd9d14239be6bb94c2c312631e30e39690a14af4

6 files changed, 13 insertions, 9 deletions

diff --git a/res/layout/conversation_list_item.xml b/res/layout/conversation_list_item.xml
index 3c3093e..ec6fd16 100644
--- a/res/layout/conversation_list_item.xml
+++ b/res/layout/conversation_list_item.xml
@@ -27,6 +27,7 @@ limitations under the License.
         android:layout_height="@dimen/avatar_icon_size"
         android:layout_marginStart="@dimen/message_history_item_padding"
         android:contentDescription="@string/cd_conversation_icon"
+        android:background="@color/hero_button_background_color"
         android:scaleType="centerCrop"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintStart_toStartOf="parent"
diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index 721b506..4e58bc2 100755
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml
@@ -22,8 +22,8 @@
     <string name="connect_bluetooth_button_text" msgid="1879858507749591260">"Koppel aan Bluetooth"</string>
     <string name="replied" msgid="4048102393748554631">"Het geantwoord"</string>
     <string name="tap_to_read_aloud" msgid="7309530473789467365">"Tik om hardop te lees"</string>
-    <string name="time_desync_error_title" msgid="7903285178550986965">"Stel jou motor se datum en tyd op"</string>
-    <string name="time_desync_error_text" msgid="1537219557576885842">"Maak asseblief seker dat jou motor en foon se datum en tyd reg gestel is. Onverwagte optrede met boodskappe kan voorkom."</string>
+    <string name="time_desync_error_title" msgid="7903285178550986965">"Stel jou motor se datum en tyd"</string>
+    <string name="time_desync_error_text" msgid="1537219557576885842">"Maak asseblief seker dat jou motor en foon se datum en tyd reg gestel is. Onverwagte boodskapgedrag kan voorkom."</string>
     <string name="action_reply" msgid="8404237041838225390">"Antwoord"</string>
     <string name="action_mute" msgid="7982388368125401058">"Demp"</string>
     <string name="action_mark_as_read" msgid="2872221687403147551">"Merk as gelees"</string>
diff --git a/res/values-et/strings.xml b/res/values-et/strings.xml
index 7c87349..325923c 100644
--- a/res/values-et/strings.xml
+++ b/res/values-et/strings.xml
@@ -31,7 +31,7 @@
     <string name="app_running_msg_notification_content" msgid="7088111523632559583">"Sõnumeid võetakse vastu autos"</string>
     <string name="message_channel_name" msgid="8568703344795660393">"Sõnumikanal"</string>
     <string name="message_channel_description" msgid="4316796171238519904">"Telefoni sõnumite vastuvõtuteenus"</string>
-    <string name="error_channel_description" msgid="2727225157700797643">"Vigane kanal"</string>
+    <string name="error_channel_description" msgid="2727225157700797643">"Veateadete kanal"</string>
     <string name="new_message" msgid="8983092328255956122">"Uus sõnum"</string>
     <string name="cd_unread" msgid="8970475932047388299">"Lugemata"</string>
     <string name="cd_conversation_icon" msgid="2600955838672124935">"Vestluse ikoon"</string>
diff --git a/res/values-ne/strings.xml b/res/values-ne/strings.xml
index 9d77b1c..11e3eac 100755
--- a/res/values-ne/strings.xml
+++ b/res/values-ne/strings.xml
@@ -23,7 +23,7 @@
     <string name="replied" msgid="4048102393748554631">"जवाफ पठाइएको"</string>
     <string name="tap_to_read_aloud" msgid="7309530473789467365">"\"पढेर सुनाइयोस्\" बटनमा ट्याप गर्नुहोस्"</string>
     <string name="time_desync_error_title" msgid="7903285178550986965">"आफ्नो कारको मिति र समय सेटअप गर्नुहोस्"</string>
-    <string name="time_desync_error_text" msgid="1537219557576885842">"तपाईंको कार र फोनमा सही मिति र समय सेट गरिएको छ भन्ने कुरा सुनिश्चित गर्नुहोस्। म्यासेज पठाउँदा अनपेक्षित समस्या आउन सक्छ।"</string>
+    <string name="time_desync_error_text" msgid="1537219557576885842">"तपाईंको कार र फोनमा सही मिति र समय सेट गरिएको छ भन्ने कुरा सुनिश्चित गर्नुहोस्। म्यासेज पठाउँदा वा प्राप्त गर्दा अनपेक्षित समस्या आउन सक्छ।"</string>
     <string name="action_reply" msgid="8404237041838225390">"जवाफ पठाउनुहोस्"</string>
     <string name="action_mute" msgid="7982388368125401058">"म्युट गर्नुहोस्"</string>
     <string name="action_mark_as_read" msgid="2872221687403147551">"पढिसकिएको म्यासेजका रूपमा चिन्ह लगाउनु"</string>
@@ -31,7 +31,7 @@
     <string name="app_running_msg_notification_content" msgid="7088111523632559583">"कारमा म्यासेजहरू प्राप्त गरिँदै छ"</string>
     <string name="message_channel_name" msgid="8568703344795660393">"म्यासेज च्यानल"</string>
     <string name="message_channel_description" msgid="4316796171238519904">"फोनमा म्यासेज प्राप्त गर्ने सेवा"</string>
-    <string name="error_channel_description" msgid="2727225157700797643">"त्रुटिसम्बन्धी च्यानल"</string>
+    <string name="error_channel_description" msgid="2727225157700797643">"त्रुटि च्यानल"</string>
     <string name="new_message" msgid="8983092328255956122">"नयाँ म्यासेज"</string>
     <string name="cd_unread" msgid="8970475932047388299">"नपढिएको"</string>
     <string name="cd_conversation_icon" msgid="2600955838672124935">"कुराकानी जनाउने आइकन"</string>
diff --git a/src/com/android/car/messenger/ui/conversationlist/ConversationItemViewHolder.java b/src/com/android/car/messenger/ui/conversationlist/ConversationItemViewHolder.java
index 87e9653..715ac0b 100644
--- a/src/com/android/car/messenger/ui/conversationlist/ConversationItemViewHolder.java
+++ b/src/com/android/car/messenger/ui/conversationlist/ConversationItemViewHolder.java
@@ -87,7 +87,10 @@ public class ConversationItemViewHolder extends RecyclerView.ViewHolder {
         mPreviewTextView.setText(uiData.getTextPreview());
         mUnreadBadge.setText(uiData.getUnreadCountText());
         mDateTimeView.setTime(uiData.mLastMessageTimestamp);
-        mAvatarView.setImageDrawable(uiData.getAvatar());
+        if (uiData.getAvatar() != null) {
+            mAvatarView.setBackgroundColor(0);
+            mAvatarView.setImageDrawable(uiData.getAvatar());
+        }
         mPlayMessageTouchView.setOnClickListener(null);
         mSubtitleIconView.setImageDrawable(uiData.getSubtitleIcon());
         boolean showPreviewSeparator = !uiData.getTextPreview().isEmpty();
diff --git a/src/com/android/car/messenger/ui/utils/AvatarUtil.java b/src/com/android/car/messenger/ui/utils/AvatarUtil.java
index fc353b8..8b5f634 100644
--- a/src/com/android/car/messenger/ui/utils/AvatarUtil.java
+++ b/src/com/android/car/messenger/ui/utils/AvatarUtil.java
@@ -160,12 +160,12 @@ public final class AvatarUtil {
         float cornerRadius = groupAvatarConfigs.mCornerRadius;
 
         final Path path = new Path();
-        float widthHeight = (float) min(width, (height / 2));
+        float widthHeight = (float) min(width / 2, height / 2);
         float x = (float) (width / 2);
         float y = (float) (height / 2);
         path.addRoundRect(
-                x,
-                y,
+                x - widthHeight,
+                y - widthHeight,
                 x + widthHeight,
                 y + widthHeight,
                 cornerRadius * widthHeight / 2f,