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

Messaging: Use Start and End instead of Left and Right

Browse Source 
That way we don't need a separate file for these styles anymore

Change-Id: If689fba727f9b678b628c7bfb51fa8e4474d68de
This commit is contained in:
Michael W
2025-04-12 13:26:33 +02:00
parent 2f9b1386f8
commit aad904a01b
15 changed files with 119 additions and 363 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
res/layout/enter_phone_number_view.xml
View File

@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
Copyright (C) 2015 The Android Open Source Project
Copyright (C) 2025 The LineageOS Project
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -20,8 +21,8 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingTop="16dp"
android:paddingLeft="24dp"
android:paddingRight="24dp"
android:paddingStart="24dp"
android:paddingEnd="24dp"
android:singleLine="true"
android:maxLines="1"
android:hint="@string/enter_phone_number_hint"

5
res/layout/fastscroll_preview.xml
View File

@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
Copyright (C) 2015 The Android Open Source Project
Copyright (C) 2025 The LineageOS Project
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -19,7 +20,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center"
android:paddingLeft="@dimen/fastscroll_preview_padding"
android:paddingRight="@dimen/fastscroll_preview_padding"
android:paddingStart="@dimen/fastscroll_preview_padding"
android:paddingEnd="@dimen/fastscroll_preview_padding"
android:textColor="@color/fastscroll_preview_text_color"
android:textSize="@dimen/fastscroll_preview_text_size" />

5
res/layout/list_empty_view.xml
View File

@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
Copyright (C) 2015 The Android Open Source Project
Copyright (C) 2025 The LineageOS Project
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -35,8 +36,8 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_marginLeft="@dimen/list_empty_text_left_right_margin"
android:layout_marginRight="@dimen/list_empty_text_left_right_margin"
android:layout_marginStart="@dimen/list_empty_text_left_right_margin"
android:layout_marginEnd="@dimen/list_empty_text_left_right_margin"
android:layout_marginTop="@dimen/list_empty_text_top_margin"
style="@style/ListEmptyText"/>
</com.android.messaging.ui.ListEmptyView>

5
res/layout/settings_item_view.xml
View File

@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
Copyright (C) 2015 The Android Open Source Project
Copyright (C) 2025 The LineageOS Project
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -20,8 +21,8 @@
android:layout_width="match_parent"
android:layout_height="@dimen/settings_list_item_height"
android:gravity="center_vertical"
android:paddingLeft="16dp"
android:paddingRight="16dp"
android:paddingStart="16dp"
android:paddingEnd="16dp"
android:background="?android:attr/selectableItemBackground" >
<TextView

7
res/layout/snack_bar.xml
View File

@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
Copyright (C) 2015 The Android Open Source Project
Copyright (C) 2025 The LineageOS Project
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -52,8 +53,8 @@
<TextView
android:id="@+id/snack_bar_action"
style="@style/SnackBarText"
android:paddingLeft="@dimen/snack_bar_left_right_margin"
android:paddingRight="@dimen/snack_bar_left_right_margin"
android:paddingStart="@dimen/snack_bar_left_right_margin"
android:paddingEnd="@dimen/snack_bar_left_right_margin"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:gravity="center_vertical"
@@ -61,4 +62,4 @@
android:textAllCaps="true" />
</LinearLayout>
</LinearLayout>
</LinearLayout>

10
res/layout/widget_conversation.xml
View File

@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
Copyright (C) 2015 The Android Open Source Project
Copyright (C) 2024 The LineageOS Project
Copyright (C) 2024-2025 The LineageOS Project
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -27,8 +27,8 @@
android:layout_width="match_parent"
android:layout_height="48dp"
android:orientation="horizontal"
android:paddingLeft="10dip"
android:paddingRight="10dip"
android:paddingStart="10dip"
android:paddingEnd="10dip"
android:layout_alignParentTop="true">
<TextView
android:id="@+id/widget_label"
@@ -82,8 +82,8 @@
android:gravity="center_vertical"
android:visibility="gone"
android:singleLine="false"
android:paddingRight="20dp"
android:paddingLeft="20dp"
android:paddingEnd="20dp"
android:paddingStart="20dp"
android:paddingBottom="20dp"
android:text="@string/tap_to_configure" />
<ImageView

5
res/layout/widget_conversation_list.xml
View File

@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
Copyright (C) 2015 The Android Open Source Project
Copyright (C) 2025 The LineageOS Project
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -26,7 +27,7 @@
android:layout_width="match_parent"
android:layout_height="@dimen/widget_header_height"
android:orientation="horizontal"
android:paddingLeft="8dip"
android:paddingStart="8dip"
android:background="@drawable/widget_top_background"
android:gravity="center_vertical">
<TextView
@@ -45,7 +46,7 @@
android:src="@drawable/ic_add_white"
android:background="?android:attr/selectableItemBackground"
android:contentDescription="@string/widget_new_conversation_content_description"
android:paddingRight="8dip"
android:paddingEnd="8dip"
android:paddingBottom="4dip" />
</LinearLayout>
<ImageView

6
res/layout/widget_conversation_list_item.xml
View File

@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
Copyright (C) 2015 The Android Open Source Project
Copyright (C) 2024 The LineageOS Project
Copyright (C) 2024-2025 The LineageOS Project
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -21,8 +21,8 @@
android:id="@+id/widget_conversation_list_item"
android:layout_width="match_parent"
style="@style/WidgetConversationListItemStyle"
android:paddingLeft="8dip"
android:paddingRight="8dip" >
android:paddingStart="8dip"
android:paddingEnd="8dip" >
<FrameLayout
android:id="@+id/avatarFrame"

14
res/layout/widget_message_item_incoming.xml
View File

@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
Copyright (C) 2015 The Android Open Source Project
Copyright (C) 2024 The LineageOS Project
Copyright (C) 2024-2025 The LineageOS Project
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -22,8 +22,8 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingBottom="8dp"
android:paddingLeft="8dip"
android:paddingRight="8dip" >
android:paddingStart="8dip"
android:paddingEnd="8dip" >
<FrameLayout
android:id="@+id/avatarFrame"
@@ -75,8 +75,8 @@
android:textAppearance="?android:attr/textAppearanceSmallInverse"
android:textSize="16sp"
android:paddingTop="6dp"
android:paddingLeft="6dp"
android:paddingRight="6dp"
android:paddingStart="6dp"
android:paddingEnd="6dp"
android:layout_marginBottom="3dip"
android:layout_alignParentBottom="true"
android:textColor="@color/widget_incoming_text_color"
@@ -84,8 +84,8 @@
<TextView android:id="@+id/date"
style="@style/WidgetConversationItemDate"
android:paddingLeft="6dp"
android:paddingRight="6dp"
android:paddingStart="6dp"
android:paddingEnd="6dp"
android:layout_marginBottom="9dip"
android:textSize="12sp"
android:layout_height="wrap_content"

14
res/layout/widget_message_item_outgoing.xml
View File

@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
Copyright (C) 2015 The Android Open Source Project
Copyright (C) 2024 The LineageOS Project
Copyright (C) 2024-2025 The LineageOS Project
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -22,8 +22,8 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingBottom="8dp"
android:paddingLeft="8dip"
android:paddingRight="8dip" >
android:paddingStart="8dip"
android:paddingEnd="8dip" >
<FrameLayout
android:id="@+id/avatarFrame"
@@ -75,8 +75,8 @@
android:textAppearance="?android:attr/textAppearanceSmallInverse"
android:textSize="16sp"
android:paddingTop="6dp"
android:paddingLeft="6dp"
android:paddingRight="6dp"
android:paddingStart="6dp"
android:paddingEnd="6dp"
android:layout_marginBottom="3dip"
android:layout_alignParentBottom="true"
android:textColor="@color/widget_outgoing_text_color"
@@ -84,8 +84,8 @@
<TextView android:id="@+id/date"
style="@style/WidgetConversationItemDate"
android:paddingLeft="6dp"
android:paddingRight="6dp"
android:paddingStart="6dp"
android:paddingEnd="6dp"
android:layout_marginBottom="9dip"
android:textSize="12sp"
android:layout_height="wrap_content"

252
res/values-ldrtl/styles.xml
View File

@@ -1,252 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
Copyright (C) 2015 The Android Open Source Project
Copyright (C) 2024-2025 The LineageOS 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.
-->
<resources>
<style name="AttachmentPreviewCloseButtonStyle">
<item name="android:gravity">start</item>
</style>
<style name="ComposeMessageViewAttachMediaButtonStyle">
<item name="android:paddingStart">@dimen/compose_message_attachment_padding_sides</item>
<item name="android:paddingEnd">@dimen/compose_message_attachment_padding_sides</item>
<item name="android:background">?android:attr/selectableItemBackgroundBorderless</item>
</style>
<style name="ConversationComposeSendText">
<item name="android:textColor">@color/compose_send_text_color</item>
<item name="android:singleLine">false</item>
<item name="android:textSize">@dimen/conversation_compose_send_text_size</item>
<item name="android:gravity">center_vertical</item>
<item name="android:fontFamily">sans-serif</item>
<item name="android:paddingStart">@dimen/compose_message_text_box_padding_side</item>
<item name="android:paddingEnd">@dimen/compose_message_text_box_padding_side</item>
<item name="android:minHeight">@dimen/conversation_message_contact_icon_size</item>
<item name="android:maxLines">4</item>
<item name="android:background">@null</item>
<item name="android:scrollHorizontally">false</item>
<item name="android:textCursorDrawable">@null</item>
<item name="android:inputType">textShortMessage|textAutoCorrect|textCapSentences|textMultiLine</item>
</style>
<style name="ConversationComposeSubjectText" parent="ConversationComposeSendText">
<item name="android:paddingStart">18dp</item>
<item name="android:gravity">start|center_vertical</item>
<item name="android:layout_marginStart">@dimen/compose_message_subject_cancel_left_margin</item>
</style>
<style name="ContactListItemViewStyle">
<item name="android:paddingStart">16dp</item>
</style>
<style name="ContactListItemLinearLayoutStyle">
<item name="android:paddingStart">12dp</item>
<item name="android:paddingEnd">24dp</item>
</style>
<style name="ConversationListItemViewPaddingStyle">
<item name="android:paddingStart">@dimen/conversation_list_item_view_padding</item>
<item name="android:paddingEnd">@dimen/conversation_list_item_view_padding</item>
</style>
<style name="ConversationListItemViewTextStyle">
<item name="android:includeFontPadding">false</item>
<item name="android:textSize">14sp</item>
<item name="android:background">@null</item>
<item name="android:textAlignment">viewStart</item>
<item name="android:textColor">@color/conversation_list_details</item>
</style>
<style name="ConversationListItemViewConversationNameStyle" parent="ConversationListItemViewTextStyle">
<item name="android:textSize">16sp</item>
<item name="android:textColor">@color/conversation_list_name</item>
</style>
<style name="ComposeMessageViewFrameLayoutStyle">
<item name="android:paddingEnd">@dimen/compose_message_send_button_padding_right</item>
</style>
<style name="BugleActionBarTitleTextStyle" parent="@style/TextAppearance.AppCompat.Widget.ActionBar.Title">
<item name="android:textColor">@color/action_bar_title_text_color</item>
<item name="android:textSize">@dimen/action_bar_text_size</item>
<item name="android:lines">1</item>
<item name="android:textAlignment">viewStart</item>
</style>
<style name="AttachmentPreviewAttachmentStyle">
<item name="android:layout_marginStart">10dp</item>
</style>
<style name="AudioAttachmentViewPlayPauseButtonStyle">
<item name="android:layout_marginEnd">16dp</item>
</style>
<style name="ComposeMessageViewDraftViewStyle">
<item name="android:layout_marginStart">53dp</item>
<item name="android:layout_marginEnd">63dp</item>
</style>
<style name="AudioAttachmentTimerText">
<item name="android:textSize">@dimen/audio_attachment_text_size</item>
<item name="android:textColor">@color/audio_attachment_timer_text_color</item>
<item name="android:layout_marginEnd">16dp</item>
</style>
<style name="ConversationMessageText">
<item name="android:background">@null</item>
<item name="android:textAlignment">viewStart</item>
</style>
<style name="ConversationMessageViewStyle">
<item name="android:paddingStart">12dp</item>
<item name="android:paddingEnd">12dp</item>
</style>
<style name="SnackBarMessageWrapper">
<item name="android:layout_marginStart">@dimen/snack_bar_left_right_margin</item>
<item name="android:layout_marginEnd">0dp</item>
</style>
<style name="SubjectViewStyle">
<item name="android:paddingStart">@dimen/compose_message_subject_left_padding</item>
<item name="android:paddingEnd">@dimen/compose_message_subject_right_padding</item>
</style>
<style name="SmsDeliverdBadge">
<item name="android:layout_marginStart">4dp</item>
</style>
<style name="ChipDeleteIconStyle">
<item name="android:paddingStart">8dp</item>
</style>
<style name="ChipIconStyle">
<item name="android:layout_marginEnd">12dp</item>
</style>
<style name="SimSelectorItem">
<item name="android:textSize">@dimen/sim_selector_text_size</item>
<item name="android:textColor">@color/sim_selector_text_primary</item>
<item name="android:background">@null</item>
<item name="android:layout_gravity">end</item>
</style>
<style name="SimSelectorItemDetail">
<item name="android:textSize">@dimen/sim_selector_detail_text_size</item>
<item name="android:textColor">@color/sim_selector_text_secondary</item>
<item name="android:background">@null</item>
<item name="android:layout_gravity">end</item>
</style>
<style name="SimSelectorItemLinearLayoutStyle">
<item name="android:paddingEnd">12dp</item>
</style>
<style name="MessageSimIndicator">
<item name="android:textSize">@dimen/conversation_status_text_size</item>
<item name="android:layout_marginStart">4dp</item>
</style>
<style name="ComposeMessageViewMessageBodySizeStyle">
<item name="android:textColor">@color/message_body_size_text_color</item>
<item name="android:textSize">@dimen/message_body_size_text_size</item>
<item name="android:fontFamily">sans-serif</item>
<item name="android:layout_gravity">end|center_vertical</item>
<item name="android:paddingEnd">@dimen/compose_message_text_box_padding_side</item>
</style>
<style name="MmsIndicatorStyle">
<item name="android:textColor">@color/mms_indicator_color</item>
<item name="android:textSize">@dimen/mms_indicator_size</item>
<item name="android:fontFamily">sans-serif</item>
<item name="android:background">@null</item>
<item name="android:paddingEnd">@dimen/compose_message_send_button_padding_right</item>
<item name="android:paddingTop">@dimen/compose_message_mms_indicator_padding_top</item>
<item name="android:layout_gravity">center_horizontal</item>
</style>
<style name="AttachmentGridItemViewCheckBoxStyle">
<item name="android:paddingEnd">4dp</item>
</style>
<style name="ParticipantListItem">
<item name="android:textSize">@dimen/participant_list_text_size</item>
<item name="android:textColor">@color/participant_list_text_primary</item>
<item name="android:background">@null</item>
<item name="android:layout_gravity">start|center_vertical</item>
</style>
<style name="WidgetConversationItemFailed">
<item name="android:layout_gravity">bottom|end</item>
</style>
<style name="WidgetConversationItemIncomingAvatarShadow">
<item name="android:layout_marginStart">4dp</item>
</style>
<style name="WidgetConversationItemOutgoingAvatarShadow">
<item name="android:layout_marginStart">-4dp</item>
</style>
<style name="WidgetConversationItemDate">
<item name="android:layout_marginEnd">8dp</item>
<item name="android:layout_marginStart">5dp</item>
<item name="android:layout_alignParentStart">true</item>
</style>
<style name="WidgetConversationItemWidget">
<item name="android:layout_marginEnd">8dp</item>
<item name="android:layout_marginStart">5dp</item>
<item name="android:layout_alignParentStart">true</item>
</style>
<style name="WidgetConversationListItemBody">
<item name="android:layout_toEndOf">@id/avatarFrame</item>
</style>
<style name="WidgetLoading">
<item name="android:layout_marginStart">16dp</item>
</style>
<style name="WidgetConversationItemBodyIncoming">
<item name="android:layout_toEndOf">@id/avatarFrame</item>
</style>
<style name="WidgetConversationItemBodyOutgoing">
<item name="android:layout_toStartOf">@id/avatarFrame</item>
</style>
<style name="WidgetConversationItemAttachment">
<item name="android:layout_gravity">bottom|end</item>
</style>
<style name="WidgetConversationItemAvatarOutgoing">
<item name="android:layout_marginEnd">8dp</item>
<item name="android:layout_alignParentEnd">true</item>
</style>
<style name="WidgetConversationListItemFrom">
<item name="android:layout_marginEnd">5dp</item>
<item name="android:layout_alignParentStart">true</item>
</style>
<style name="WidgetConversationListItemDate">
<item name="android:layout_marginEnd">8dp</item>
<item name="android:layout_marginStart">5dp</item>
<item name="android:layout_gravity">start</item>
</style>
</resources>

133
res/values/styles.xml
View File

@@ -95,6 +95,7 @@
<item name="android:textColor">@color/action_bar_title_text_color</item>
<item name="android:textSize">@dimen/action_bar_text_size</item>
<item name="android:lines">1</item>
<item name="android:textAlignment">viewStart</item>
</style>
<style name="ConversationActionBarTitleTextStyle" parent="BugleActionBarTitleTextStyle">
@@ -107,6 +108,7 @@
<style name="ConversationMessageText">
<item name="android:background">@null</item>
<item name="android:textAlignment">viewStart</item>
</style>
<style name="ConversationMessage" parent="ConversationMessageText">
@@ -135,9 +137,9 @@
<item name="android:textSize">@dimen/conversation_compose_send_text_size</item>
<item name="android:gravity">center_vertical</item>
<item name="android:fontFamily">sans-serif</item>
<item name="android:paddingLeft">@dimen/compose_message_text_box_padding_side</item>
<item name="android:paddingRight">@dimen/compose_message_text_box_padding_side</item>
<item name="android:layout_marginRight">8dp</item>
<item name="android:paddingStart">@dimen/compose_message_text_box_padding_side</item>
<item name="android:paddingEnd">@dimen/compose_message_text_box_padding_side</item>
<item name="android:layout_marginEnd">8dp</item>
<item name="android:minHeight">@dimen/conversation_message_contact_icon_size</item>
<item name="android:maxLines">4</item>
<item name="android:background">@null</item>
@@ -148,8 +150,9 @@
</style>
<style name="ConversationComposeSubjectText" parent="ConversationComposeSendText">
<item name="android:paddingLeft">18dp</item>
<item name="android:layout_marginLeft">@dimen/compose_message_subject_cancel_left_margin</item>
<item name="android:paddingStart">18dp</item>
<item name="android:gravity">start|center_vertical</item>
<item name="android:layout_marginStart">@dimen/compose_message_subject_cancel_left_margin</item>
</style>
<style name="ContactListItem">
@@ -173,8 +176,8 @@
<item name="android:textColor">@color/compose_contact_text</item>
<item name="android:textColorHint">@color/compose_contact_faint_text</item>
<item name="android:fontFamily">sans-serif</item>
<item name="android:paddingLeft">4dp</item>
<item name="android:paddingRight">4dp</item>
<item name="android:paddingStart">4dp</item>
<item name="android:paddingEnd">4dp</item>
</style>
<style name="PagerTabHeader">
@@ -208,7 +211,7 @@
<style name="AudioAttachmentTimerText">
<item name="android:textSize">@dimen/audio_attachment_text_size</item>
<item name="android:textColor">@color/audio_attachment_timer_text_color</item>
<item name="android:layout_marginRight">16dp</item>
<item name="android:layout_marginEnd">16dp</item>
</style>
<style name="AudioAttachmentViewStyle">
@@ -247,35 +250,35 @@
<item name="android:textColor">@color/notification_subject_color</item>
</style>
<!-- Styles to support RTL for pre API 17 -->
<style name="AttachmentPreviewCloseButtonStyle">
<item name="android:gravity">left</item>
<item name="android:gravity">start</item>
</style>
<style name="ComposeMessageViewAttachMediaButtonStyle">
<item name="android:paddingLeft">@dimen/compose_message_attachment_padding_sides</item>
<item name="android:paddingRight">@dimen/compose_message_attachment_padding_sides</item>
<item name="android:paddingStart">@dimen/compose_message_attachment_padding_sides</item>
<item name="android:paddingEnd">@dimen/compose_message_attachment_padding_sides</item>
<item name="android:background">?android:attr/selectableItemBackgroundBorderless</item>
</style>
<style name="ContactListItemViewStyle">
<item name="android:paddingLeft">16dp</item>
<item name="android:paddingStart">16dp</item>
</style>
<style name="ContactListItemLinearLayoutStyle">
<item name="android:paddingLeft">12dp</item>
<item name="android:paddingRight">24dp</item>
<item name="android:paddingStart">12dp</item>
<item name="android:paddingEnd">24dp</item>
</style>
<style name="ConversationListItemViewPaddingStyle">
<item name="android:paddingLeft">@dimen/conversation_list_item_view_padding</item>
<item name="android:paddingRight">@dimen/conversation_list_item_view_padding</item>
<item name="android:paddingStart">@dimen/conversation_list_item_view_padding</item>
<item name="android:paddingEnd">@dimen/conversation_list_item_view_padding</item>
</style>
<style name="ConversationListItemViewTextStyle">
<item name="android:includeFontPadding">false</item>
<item name="android:textSize">14sp</item>
<item name="android:background">@null</item>
<item name="android:textAlignment">viewStart</item>
<item name="android:textColor">@color/conversation_list_details</item>
</style>
@@ -285,37 +288,37 @@
</style>
<style name="ComposeMessageViewFrameLayoutStyle">
<item name="android:paddingRight">@dimen/compose_message_send_button_padding_right</item>
<item name="android:paddingEnd">@dimen/compose_message_send_button_padding_right</item>
</style>
<style name="AttachmentPreviewAttachmentStyle">
<item name="android:layout_marginLeft">10dp</item>
<item name="android:layout_marginStart">10dp</item>
</style>
<style name="AudioAttachmentViewPlayPauseButtonStyle">
<item name="android:layout_marginRight">16dp</item>
<item name="android:layout_marginEnd">16dp</item>
</style>
<style name="ComposeMessageViewDraftViewStyle">
<item name="android:layout_marginLeft">53dp</item>
<item name="android:layout_marginRight">63dp</item>
<item name="android:layout_marginStart">53dp</item>
<item name="android:layout_marginEnd">63dp</item>
</style>
<style name="ConversationMessageViewStyle">
<item name="android:paddingLeft">12dp</item>
<item name="android:paddingRight">12dp</item>
<item name="android:paddingStart">12dp</item>
<item name="android:paddingEnd">12dp</item>
</style>
<style name="SubjectViewStyle">
<item name="android:paddingLeft">@dimen/compose_message_subject_left_padding</item>
<item name="android:paddingRight">@dimen/compose_message_subject_right_padding</item>
<item name="android:paddingStart">@dimen/compose_message_subject_left_padding</item>
<item name="android:paddingEnd">@dimen/compose_message_subject_right_padding</item>
</style>
<style name="ParticipantListItem">
<item name="android:textSize">@dimen/participant_list_text_size</item>
<item name="android:textColor">@color/participant_list_text_primary</item>
<item name="android:background">@null</item>
<item name="android:layout_gravity">left|center_vertical</item>
<item name="android:layout_gravity">start|center_vertical</item>
</style>
<style name="AddContactConfirmationTextStyle">
@@ -351,8 +354,8 @@
<item name="android:textColor">@color/message_body_size_text_color</item>
<item name="android:textSize">@dimen/message_body_size_text_size</item>
<item name="android:fontFamily">sans-serif</item>
<item name="android:layout_gravity">right|center_vertical</item>
<item name="android:paddingRight">@dimen/compose_message_text_box_padding_side</item>
<item name="android:layout_gravity">end|center_vertical</item>
<item name="android:paddingEnd">@dimen/compose_message_text_box_padding_side</item>
</style>
<style name="MmsIndicatorStyle">
@@ -360,7 +363,7 @@
<item name="android:textSize">@dimen/mms_indicator_size</item>
<item name="android:fontFamily">sans-serif</item>
<item name="android:background">@null</item>
<item name="android:paddingRight">@dimen/compose_message_send_button_padding_right</item>
<item name="android:paddingEnd">@dimen/compose_message_send_button_padding_right</item>
<item name="android:paddingTop">@dimen/compose_message_mms_indicator_padding_top</item>
<item name="android:layout_gravity">center_horizontal</item>
</style>
@@ -371,8 +374,8 @@
</style>
<style name="SnackBarMessageWrapper">
<item name="android:layout_marginLeft">@dimen/snack_bar_left_right_margin</item>
<item name="android:layout_marginRight">0dp</item>
<item name="android:layout_marginStart">@dimen/snack_bar_left_right_margin</item>
<item name="android:layout_marginEnd">0dp</item>
</style>
<style name="SnackBarText">
@@ -382,38 +385,38 @@
</style>
<style name="SmsDeliverdBadge">
<item name="android:layout_marginLeft">4dp</item>
<item name="android:layout_marginStart">4dp</item>
</style>
<style name="ChipDeleteIconStyle">
<item name="android:paddingLeft">8dp</item>
<item name="android:paddingStart">8dp</item>
</style>
<style name="ChipIconStyle">
<item name="android:layout_marginRight">12dp</item>
<item name="android:layout_marginEnd">12dp</item>
</style>
<style name="SimSelectorItem">
<item name="android:textSize">@dimen/sim_selector_text_size</item>
<item name="android:textColor">@color/sim_selector_text_primary</item>
<item name="android:background">@null</item>
<item name="android:layout_gravity">right</item>
<item name="android:layout_gravity">end</item>
</style>
<style name="SimSelectorItemDetail">
<item name="android:textSize">@dimen/sim_selector_detail_text_size</item>
<item name="android:textColor">@color/sim_selector_text_secondary</item>
<item name="android:background">@null</item>
<item name="android:layout_gravity">right</item>
<item name="android:layout_gravity">end</item>
</style>
<style name="SimSelectorItemLinearLayoutStyle">
<item name="android:paddingRight">12dp</item>
<item name="android:paddingEnd">12dp</item>
</style>
<style name="MessageSimIndicator">
<item name="android:textSize">@dimen/conversation_status_text_size</item>
<item name="android:layout_marginLeft">4dp</item>
<item name="android:layout_marginStart">4dp</item>
</style>
<style name="ColorAccentBlueOverrideStyle">
@@ -442,8 +445,8 @@
<item name="android:layout_marginLeft">20dp</item>
<item name="android:layout_marginRight">20dp</item>
<item name="android:layout_marginTop">16dp</item>
<item name="android:paddingLeft">10dp</item>
<item name="android:paddingRight">10dp</item>
<item name="android:paddingStart">10dp</item>
<item name="android:paddingEnd">10dp</item>
<item name="android:background">?android:attr/selectableItemBackground</item>
</style>
@@ -480,63 +483,63 @@
</style>
<style name="WidgetConversationItemAvatarOutgoing">
<item name="android:layout_marginRight">8dp</item>
<item name="android:layout_alignParentRight">true</item>
<item name="android:layout_marginEnd">8dp</item>
<item name="android:layout_alignParentEnd">true</item>
</style>
<style name="WidgetConversationItemBodyIncoming">
<item name="android:layout_toRightOf">@id/avatarFrame</item>
<item name="android:layout_toEndOf">@id/avatarFrame</item>
</style>
<style name="WidgetConversationItemBodyOutgoing">
<item name="android:layout_toLeftOf">@id/avatarFrame</item>
<item name="android:layout_toStartOf">@id/avatarFrame</item>
</style>
<style name="WidgetConversationItemIncomingAvatarShadow">
<item name="android:layout_marginLeft">4dp</item>
<item name="android:layout_marginStart">4dp</item>
</style>
<style name="WidgetConversationItemOutgoingAvatarShadow">
<item name="android:layout_marginLeft">-4dp</item>
<item name="android:layout_marginStart">-4dp</item>
</style>
<style name="WidgetConversationItemDate">
<item name="android:layout_marginRight">8dp</item>
<item name="android:layout_marginLeft">5dp</item>
<item name="android:layout_alignParentLeft">true</item>
<item name="android:layout_marginEnd">8dp</item>
<item name="android:layout_marginStart">5dp</item>
<item name="android:layout_alignParentStart">true</item>
</style>
<style name="WidgetConversationItemFailed">
<item name="android:layout_gravity">bottom|right</item>
<item name="android:layout_gravity">bottom|end</item>
</style>
<style name="WidgetConversationItemAttachment">
<item name="android:layout_gravity">bottom|right</item>
<item name="android:layout_gravity">bottom|end</item>
</style>
<style name="WidgetConversationItemWidget">
<item name="android:layout_marginRight">8dp</item>
<item name="android:layout_marginLeft">5dp</item>
<item name="android:layout_alignParentLeft">true</item>
<item name="android:layout_marginEnd">8dp</item>
<item name="android:layout_marginStart">5dp</item>
<item name="android:layout_alignParentStart">true</item>
</style>
<style name="WidgetConversationListItemBody">
<item name="android:layout_toRightOf">@id/avatarFrame</item>
<item name="android:layout_toEndOf">@id/avatarFrame</item>
</style>
<style name="WidgetConversationListItemFrom">
<item name="android:layout_marginRight">5dp</item>
<item name="android:layout_alignParentLeft">true</item>
<item name="android:layout_marginEnd">5dp</item>
<item name="android:layout_alignParentStart">true</item>
</style>
<style name="WidgetConversationListItemDate">
<item name="android:layout_marginRight">8dp</item>
<item name="android:layout_marginLeft">5dp</item>
<item name="android:layout_gravity">right</item>
<item name="android:layout_marginEnd">8dp</item>
<item name="android:layout_marginStart">5dp</item>
<item name="android:layout_gravity">end</item>
</style>
<style name="WidgetLoading">
<item name="android:layout_marginLeft">16dp</item>
<item name="android:layout_marginStart">16dp</item>
</style>
<style name="WidgetConversationListItemStyle">
@@ -549,8 +552,8 @@
</style>
<style name="PromoScreenTextStyle">
<item name="android:paddingLeft">40dp</item>
<item name="android:paddingRight">40dp</item>
<item name="android:paddingStart">40dp</item>
<item name="android:paddingEnd">40dp</item>
<item name="android:textSize">16sp</item>
<item name="android:textColor">@android:color/white</item>
<item name="android:fontFamily">roboto-regular</item>
@@ -568,9 +571,7 @@
<item name="android:gravity">center</item>
</style>
<style name="DirectoryHeaderStyle">
<item name="android:paddingLeft">@dimen/directory_header_padding_start</item>
<item name="android:paddingStart">@dimen/directory_header_padding_start</item>
<item name="android:paddingRight">@dimen/directory_header_padding_end</item>
<item name="android:paddingEnd">@dimen/directory_header_padding_end</item>
<item name="android:paddingTop">@dimen/directory_header_padding_top</item>
<item name="android:paddingBottom">@dimen/directory_header_padding_bottom</item>

2
src/com/android/messaging/ui/conversation/ConversationFragment.java
View File

@@ -545,7 +545,7 @@ public class ConversationFragment extends Fragment implements ConversationDataLi
startRect.top -= view.getPaddingTop();
startRect.bottom =
composeBubbleRect.bottom;
startRect.left += view.getPaddingRight();
startRect.left += view.getPaddingEnd();
view.setAlpha(0);
mPopupTransitionAnimation = new PopupTransitionAnimation(startRect, view);

16
src/com/android/messaging/ui/conversation/ConversationMessageView.java
View File

@@ -1,6 +1,6 @@
/*
* Copyright (C) 2015 The Android Open Source Project
* Copyright (C) 2024 The LineageOS Project
* Copyright (C) 2024-2025 The LineageOS Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -175,7 +175,7 @@ public class ConversationMessageView extends FrameLayout implements View.OnClick
// the max leftover space because we want the message bubble to extend no further than the
// starting position of the message bubble in the opposite direction.
final int maxLeftoverSpace = horizontalSpace - mContactIconView.getMeasuredWidth() * 2
- arrowWidth - getPaddingLeft() - getPaddingRight();
- arrowWidth - getPaddingStart() - getPaddingEnd();
final int messageContentWidthMeasureSpec = MeasureSpec.makeMeasureSpec(maxLeftoverSpace,
MeasureSpec.AT_MOST);
@@ -194,7 +194,7 @@ public class ConversationMessageView extends FrameLayout implements View.OnClick
final int iconWidth = mContactIconView.getMeasuredWidth();
final int iconHeight = mContactIconView.getMeasuredHeight();
final int iconTop = getPaddingTop();
final int contentWidth = (right -left) - iconWidth - getPaddingLeft() - getPaddingRight();
final int contentWidth = (right -left) - iconWidth - getPaddingStart() - getPaddingEnd();
final int contentHeight = mMessageBubble.getMeasuredHeight();
final int contentTop = iconTop;
@@ -202,18 +202,18 @@ public class ConversationMessageView extends FrameLayout implements View.OnClick
final int contentLeft;
if (mData.getIsIncoming()) {
if (isRtl) {
iconLeft = (right - left) - getPaddingRight() - iconWidth;
iconLeft = (right - left) - getPaddingEnd() - iconWidth;
contentLeft = iconLeft - contentWidth;
} else {
iconLeft = getPaddingLeft();
iconLeft = getPaddingStart();
contentLeft = iconLeft + iconWidth;
}
} else {
if (isRtl) {
iconLeft = getPaddingLeft();
iconLeft = getPaddingStart();
contentLeft = iconLeft + iconWidth;
} else {
iconLeft = (right - left) - getPaddingRight() - iconWidth;
iconLeft = (right - left) - getPaddingEnd() - iconWidth;
contentLeft = iconLeft - contentWidth;
}
}
@@ -755,7 +755,7 @@ public class ConversationMessageView extends FrameLayout implements View.OnClick
}
// Update the message row and message bubble views
setPadding(getPaddingLeft(), messageTopPadding, getPaddingRight(), 0);
setPadding(getPaddingStart(), messageTopPadding, getPaddingEnd(), 0);
mMessageBubble.setGravity(gravity);
updateMessageAttachmentsAppearance(gravity);

3
src/com/android/messaging/ui/conversation/MessageBubbleBackground.java
View File

@@ -1,5 +1,6 @@
/*
* Copyright (C) 2015 The Android Open Source Project
* Copyright (C) 2025 The LineageOS Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -34,7 +35,7 @@ public class MessageBubbleBackground extends LinearLayout {
@Override
protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
super.onMeasure(widthMeasureSpec, heightMeasureSpec);
final int widthPadding = getPaddingLeft() + getPaddingRight();
final int widthPadding = getPaddingStart() + getPaddingEnd();
int bubbleWidth = getMeasuredWidth() - widthPadding;
final int maxWidth = MeasureSpec.getSize(widthMeasureSpec) - widthPadding;
// Round up to next snapWidthPixels