diff options
Diffstat (limited to 'res')
38 files changed, 17 insertions, 152 deletions
diff --git a/res/drawable-hdpi/ic_notifications_off_dark.png b/res/drawable-hdpi/ic_notifications_off_dark.png Binary files differdeleted file mode 100644 index 9bcdc62..0000000 --- a/res/drawable-hdpi/ic_notifications_off_dark.png +++ /dev/null diff --git a/res/drawable-hdpi/ic_notifications_off_light.png b/res/drawable-hdpi/ic_notifications_off_light.png Binary files differdeleted file mode 100644 index 433b6a9..0000000 --- a/res/drawable-hdpi/ic_notifications_off_light.png +++ /dev/null diff --git a/res/drawable-hdpi/ic_notifications_off_small_light.png b/res/drawable-hdpi/ic_notifications_off_small_light.png Binary files differdeleted file mode 100644 index fbd0ad5..0000000 --- a/res/drawable-hdpi/ic_notifications_off_small_light.png +++ /dev/null diff --git a/res/drawable-hdpi/ic_notifications_on_dark.png b/res/drawable-hdpi/ic_notifications_on_dark.png Binary files differdeleted file mode 100644 index 21e48a5..0000000 --- a/res/drawable-hdpi/ic_notifications_on_dark.png +++ /dev/null diff --git a/res/drawable-hdpi/ic_notifications_on_light.png b/res/drawable-hdpi/ic_notifications_on_light.png Binary files differdeleted file mode 100644 index 6b39fec..0000000 --- a/res/drawable-hdpi/ic_notifications_on_light.png +++ /dev/null diff --git a/res/drawable-mdpi/ic_notifications_off_dark.png b/res/drawable-mdpi/ic_notifications_off_dark.png Binary files differdeleted file mode 100644 index 4a5a7e9..0000000 --- a/res/drawable-mdpi/ic_notifications_off_dark.png +++ /dev/null diff --git a/res/drawable-mdpi/ic_notifications_off_light.png b/res/drawable-mdpi/ic_notifications_off_light.png Binary files differdeleted file mode 100644 index 33e0b4a..0000000 --- a/res/drawable-mdpi/ic_notifications_off_light.png +++ /dev/null diff --git a/res/drawable-mdpi/ic_notifications_off_small_light.png b/res/drawable-mdpi/ic_notifications_off_small_light.png Binary files differdeleted file mode 100644 index 4bd9563..0000000 --- a/res/drawable-mdpi/ic_notifications_off_small_light.png +++ /dev/null diff --git a/res/drawable-mdpi/ic_notifications_on_dark.png b/res/drawable-mdpi/ic_notifications_on_dark.png Binary files differdeleted file mode 100644 index 77a2a7d..0000000 --- a/res/drawable-mdpi/ic_notifications_on_dark.png +++ /dev/null diff --git a/res/drawable-mdpi/ic_notifications_on_light.png b/res/drawable-mdpi/ic_notifications_on_light.png Binary files differdeleted file mode 100644 index eae03a5..0000000 --- a/res/drawable-mdpi/ic_notifications_on_light.png +++ /dev/null diff --git a/res/drawable-xhdpi/ic_notifications_off_dark.png b/res/drawable-xhdpi/ic_notifications_off_dark.png Binary files differdeleted file mode 100644 index 4f3b924..0000000 --- a/res/drawable-xhdpi/ic_notifications_off_dark.png +++ /dev/null diff --git a/res/drawable-xhdpi/ic_notifications_off_light.png b/res/drawable-xhdpi/ic_notifications_off_light.png Binary files differdeleted file mode 100644 index 16ae132..0000000 --- a/res/drawable-xhdpi/ic_notifications_off_light.png +++ /dev/null diff --git a/res/drawable-xhdpi/ic_notifications_off_small_light.png b/res/drawable-xhdpi/ic_notifications_off_small_light.png Binary files differdeleted file mode 100644 index e54fc52..0000000 --- a/res/drawable-xhdpi/ic_notifications_off_small_light.png +++ /dev/null diff --git a/res/drawable-xhdpi/ic_notifications_on_dark.png b/res/drawable-xhdpi/ic_notifications_on_dark.png Binary files differdeleted file mode 100644 index 40f2909..0000000 --- a/res/drawable-xhdpi/ic_notifications_on_dark.png +++ /dev/null diff --git a/res/drawable-xhdpi/ic_notifications_on_light.png b/res/drawable-xhdpi/ic_notifications_on_light.png Binary files differdeleted file mode 100644 index 3c44f93..0000000 --- a/res/drawable-xhdpi/ic_notifications_on_light.png +++ /dev/null diff --git a/res/drawable-xxhdpi/ic_notifications_off_dark.png b/res/drawable-xxhdpi/ic_notifications_off_dark.png Binary files differdeleted file mode 100644 index 27d3754..0000000 --- a/res/drawable-xxhdpi/ic_notifications_off_dark.png +++ /dev/null diff --git a/res/drawable-xxhdpi/ic_notifications_off_light.png b/res/drawable-xxhdpi/ic_notifications_off_light.png Binary files differdeleted file mode 100644 index a2aedec..0000000 --- a/res/drawable-xxhdpi/ic_notifications_off_light.png +++ /dev/null diff --git a/res/drawable-xxhdpi/ic_notifications_off_small_light.png b/res/drawable-xxhdpi/ic_notifications_off_small_light.png Binary files differdeleted file mode 100644 index 2a90e07..0000000 --- a/res/drawable-xxhdpi/ic_notifications_off_small_light.png +++ /dev/null diff --git a/res/drawable-xxhdpi/ic_notifications_on_dark.png b/res/drawable-xxhdpi/ic_notifications_on_dark.png Binary files differdeleted file mode 100644 index e64da6b..0000000 --- a/res/drawable-xxhdpi/ic_notifications_on_dark.png +++ /dev/null diff --git a/res/drawable-xxhdpi/ic_notifications_on_light.png b/res/drawable-xxhdpi/ic_notifications_on_light.png Binary files differdeleted file mode 100644 index f8f7d15..0000000 --- a/res/drawable-xxhdpi/ic_notifications_on_light.png +++ /dev/null diff --git a/res/drawable-xxxhdpi/ic_notifications_off_dark.png b/res/drawable-xxxhdpi/ic_notifications_off_dark.png Binary files differdeleted file mode 100644 index 10ac318..0000000 --- a/res/drawable-xxxhdpi/ic_notifications_off_dark.png +++ /dev/null diff --git a/res/drawable-xxxhdpi/ic_notifications_off_light.png b/res/drawable-xxxhdpi/ic_notifications_off_light.png Binary files differdeleted file mode 100644 index 8eb5782..0000000 --- a/res/drawable-xxxhdpi/ic_notifications_off_light.png +++ /dev/null diff --git a/res/drawable-xxxhdpi/ic_notifications_off_small_light.png b/res/drawable-xxxhdpi/ic_notifications_off_small_light.png Binary files differdeleted file mode 100644 index 3756943..0000000 --- a/res/drawable-xxxhdpi/ic_notifications_off_small_light.png +++ /dev/null diff --git a/res/drawable-xxxhdpi/ic_notifications_on_dark.png b/res/drawable-xxxhdpi/ic_notifications_on_dark.png Binary files differdeleted file mode 100644 index 3896212..0000000 --- a/res/drawable-xxxhdpi/ic_notifications_on_dark.png +++ /dev/null diff --git a/res/drawable-xxxhdpi/ic_notifications_on_light.png b/res/drawable-xxxhdpi/ic_notifications_on_light.png Binary files differdeleted file mode 100644 index 47794fd..0000000 --- a/res/drawable-xxxhdpi/ic_notifications_on_light.png +++ /dev/null diff --git a/res/layout/conversation_list_item_view.xml b/res/layout/conversation_list_item_view.xml index 43cb3ee..c89e470 100644 --- a/res/layout/conversation_list_item_view.xml +++ b/res/layout/conversation_list_item_view.xml @@ -121,17 +121,6 @@ android:layout_height="wrap_content" android:layout_weight="1" android:background="@android:color/transparent"> - <ImageView - android:id="@+id/conversation_notification_bell" - style="@style/ConversationListNotificationBellPaddingStyle" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:src="@drawable/ic_notifications_off_small_light" - android:visibility="gone" - android:importantForAccessibility="no" - android:contentDescription="@null" - android:layout_gravity="center_vertical" - android:background="@android:color/transparent" /> <TextView android:id="@+id/conversation_name" style="@style/ConversationListItemViewConversationNameStyle" diff --git a/res/layout/people_options_item_view.xml b/res/layout/people_options_item_view.xml index 8821eec..8895037 100644 --- a/res/layout/people_options_item_view.xml +++ b/res/layout/people_options_item_view.xml @@ -40,25 +40,5 @@ android:ellipsize="end" style="@style/ParticipantListItem" android:layout_gravity="center_vertical" /> - - <TextView - android:id="@+id/subtitle" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:singleLine="true" - android:maxLines="1" - android:ellipsize="end" - style="@style/ParticipantListItemDetail" - android:layout_gravity="center_vertical" /> - </LinearLayout> - - <androidx.appcompat.widget.SwitchCompat - android:id="@+id/switch_button" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:focusable="false" - android:clickable="false" - android:visibility="gone" /> - </com.android.messaging.ui.conversationsettings.PeopleOptionsItemView> diff --git a/res/layout/widget_conversation_list_item.xml b/res/layout/widget_conversation_list_item.xml index e0115a2..c1a140a 100644 --- a/res/layout/widget_conversation_list_item.xml +++ b/res/layout/widget_conversation_list_item.xml @@ -67,18 +67,6 @@ android:layout_alignParentTop="true" android:gravity="center_vertical" android:background="@android:color/transparent"> - <ImageView - android:id="@+id/conversation_notification_bell" - style="@style/ConversationListNotificationBellPaddingStyle" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:src="@drawable/ic_notifications_off_small_light" - android:visibility="gone" - android:importantForAccessibility="no" - android:contentDescription="@null" - android:layout_gravity="center_vertical" - android:background="@android:color/transparent" /> - <TextView android:id="@+id/from" style="@style/WidgetConversationListItemFrom" android:layout_width="0dp" diff --git a/res/menu/conversation_list_fragment_select_menu.xml b/res/menu/conversation_list_fragment_select_menu.xml index 8704691..9247923 100644 --- a/res/menu/conversation_list_fragment_select_menu.xml +++ b/res/menu/conversation_list_fragment_select_menu.xml @@ -37,18 +37,6 @@ android:title="@string/action_delete" appcompat:showAsAction="collapseActionView|always"/> <item - android:id="@+id/action_notification_off" - android:icon="@drawable/ic_notifications_off_dark" - android:orderInCategory="70" - android:title="@string/action_notification_off" - appcompat:showAsAction="collapseActionView|always"/> - <item - android:id="@+id/action_notification_on" - android:icon="@drawable/ic_notifications_on_dark" - android:orderInCategory="80" - android:title="@string/action_notification_on" - appcompat:showAsAction="collapseActionView|always"/> - <item android:id="@+id/action_add_contact" android:icon="@drawable/ic_person_add_dark" android:orderInCategory="90" diff --git a/res/values-ldrtl/styles.xml b/res/values-ldrtl/styles.xml index abfd16c..f106ce0 100644 --- a/res/values-ldrtl/styles.xml +++ b/res/values-ldrtl/styles.xml @@ -74,10 +74,6 @@ <item name="android:textColor">@color/conversation_list_name</item> </style> - <style name="ConversationListNotificationBellPaddingStyle"> - <item name="android:paddingEnd">@dimen/conversation_list_notification_bell_padding</item> - </style> - <style name="ComposeMessageViewFrameLayoutStyle"> <item name="android:paddingEnd">@dimen/compose_message_send_button_padding_right</item> </style> diff --git a/res/values/colors.xml b/res/values/colors.xml index 3f9288b..e55ad8e 100644 --- a/res/values/colors.xml +++ b/res/values/colors.xml @@ -120,7 +120,6 @@ <color name="notification_subject_color">#99aaaaaa</color> <color name="participant_list_text_primary">#4d4d4d</color> - <color name="participant_list_text_secondary">#6d6d6d</color> <color name="people_and_options_header_text">#6d6d6d</color> <color name="people_and_options_list_divider">#cccccc</color> diff --git a/res/values/constants.xml b/res/values/constants.xml index 8985fd1..cd77e0e 100644 --- a/res/values/constants.xml +++ b/res/values/constants.xml @@ -21,8 +21,7 @@ <string name="notifications_category_pref_key" translatable="false">notifications_category</string> <string name="mms_messaging_category_pref_key" translatable="false">mms_messaging_category</string> <string name="advanced_category_pref_key" translatable="false">advanced_category</string> - <string name="notifications_enabled_pref_key" translatable="false">notifications_enabled</string> - <bool name="notifications_enabled_pref_default" translatable="false">true</bool> + <string name="notifications_pref_key" translatable="false">notifications_enabled</string> <string name="notification_sound_pref_key" translatable="false">notification_sound</string> <string name="notification_vibration_pref_key" translatable="false">notification_vibration</string> <bool name="notification_vibration_pref_default" translatable="false">true</bool> diff --git a/res/values/dimens.xml b/res/values/dimens.xml index 5ff0eb7..ff966d5 100644 --- a/res/values/dimens.xml +++ b/res/values/dimens.xml @@ -34,7 +34,6 @@ <dimen name="conversation_list_contact_icon_size">56dp</dimen> <dimen name="conversation_message_contact_icon_size">42dp</dimen> <dimen name="conversation_message_photo_min_size">96dp</dimen> - <dimen name="conversation_list_notification_bell_padding">4dp</dimen> <dimen name="conversation_list_empty_text_bottom_margin">30dp</dimen> <dimen name="blocked_participant_list_item_view_padding">16dp</dimen> @@ -105,7 +104,6 @@ <dimen name="progress_indicator_default_stroke_width">2dp</dimen> <dimen name="progress_indicator_default_radius">12dp</dimen> <dimen name="participant_list_text_size">18sp</dimen> - <dimen name="participant_list_detail_text_size">14sp</dimen> <dimen name="people_and_options_header_text_size">16sp</dimen> <dimen name="image_attachment_fallback_width">240dp</dimen> <dimen name="image_attachment_fallback_height">240dp</dimen> diff --git a/res/values/strings.xml b/res/values/strings.xml index 0e91156..dd23405 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -253,10 +253,6 @@ <string name="action_archive">Archive</string> <!-- Action menu title for unarchiving selected conversations in conversation list --> <string name="action_unarchive">Unarchive</string> - <!-- Action menu title for turning off notification for the selected conversations in conversation list --> - <string name="action_notification_off">Turn off notifications</string> - <!-- Action menu title for turning on notification for the selected conversations in conversation list --> - <string name="action_notification_on">Turn on notifications</string> <!-- Action menu title for adding the contacts for the selected conversations in conversation list --> <string name="action_add_contact">Add contact</string> <!-- Action menu title for downloading failed message selected in conversation --> @@ -436,13 +432,9 @@ <!-- Preference category: Debug --> <string name="debug_category_pref_title">Debug</string> <!-- Title for the preference for whether or to notify the user of new messages --> - <string name="notifications_enabled_pref_title">Notifications</string> + <string name="notifications_pref_title">Notifications</string> <!-- Title for the notification sound preference --> - <string name="notification_sound_pref_title">Sound</string> - <!-- What to display in the settings screen for Ringtone when the user chooses "silent" [CHAR LIMIT=100]--> <string name="silent_ringtone">Silent</string> - <!-- Title for the preference for whether or not to vibrate with notifications --> - <string name="notification_vibrate_pref_title">Vibrate</string> <string name="blocked_pref_title">Blocked</string> <!-- Title for the preference for whether or not to request/show delivery reports for SMS --> <string name="delivery_reports_pref_title">SMS delivery reports</string> @@ -975,4 +967,7 @@ <string name="selected_sim_content_message"><xliff:g id="selected_sim">%s</xliff:g> selected</string> <string name="work_directory_display_name">Work Profile contacts</string> + + <!-- Notification channel --> + <string name="notification_channel_messages_title">Messages</string> </resources> diff --git a/res/values/styles.xml b/res/values/styles.xml index 5762d4d..26a8020 100644 --- a/res/values/styles.xml +++ b/res/values/styles.xml @@ -286,10 +286,6 @@ <item name="android:textColor">@color/conversation_list_name</item> </style> - <style name="ConversationListNotificationBellPaddingStyle"> - <item name="android:paddingRight">@dimen/conversation_list_notification_bell_padding</item> - </style> - <style name="ComposeMessageViewFrameLayoutStyle"> <item name="android:paddingRight">@dimen/compose_message_send_button_padding_right</item> </style> @@ -342,12 +338,6 @@ <item name="android:paddingRight">@dimen/copy_contact_dialog_right_padding</item> </style> - <style name="ParticipantListItemDetail"> - <item name="android:textSize">@dimen/participant_list_detail_text_size</item> - <item name="android:textColor">@color/participant_list_text_secondary</item> - <item name="android:background">@null</item> - </style> - <style name="PeopleListItemViewStyle"> <item name="android:paddingLeft">16dp</item> </style> diff --git a/res/xml-v21/preferences_application.xml b/res/xml-v21/preferences_application.xml index c403c06..3b2d453 100644 --- a/res/xml-v21/preferences_application.xml +++ b/res/xml-v21/preferences_application.xml @@ -42,29 +42,10 @@ android:defaultValue="@bool/send_sound_pref_default" android:persistent="true" /> - <SwitchPreference - android:key="@string/notifications_enabled_pref_key" - android:title="@string/notifications_enabled_pref_title" - android:defaultValue="@bool/notifications_enabled_pref_default" - android:persistent="true" - android:disableDependentsState="false" /> - - <RingtonePreference - android:key="@string/notification_sound_pref_key" - android:title="@string/notification_sound_pref_title" - android:ringtoneType="notification" - android:showSilent="true" - android:showDefault="true" - android:persistent="true" - android:defaultValue="" - android:dependency="@string/notifications_enabled_pref_key" /> - - <SwitchPreference - android:key="@string/notification_vibration_pref_key" - android:title="@string/notification_vibrate_pref_title" - android:defaultValue="@bool/notification_vibration_pref_default" - android:persistent="true" - android:dependency="@string/notifications_enabled_pref_key" /> + <Preference + android:key="@string/notifications_pref_key" + android:title="@string/notifications_pref_title" + android:persistent="true" /> <SwitchPreference android:key="pref_show_emoticons" diff --git a/res/xml-v23/preferences_application.xml b/res/xml-v23/preferences_application.xml index d9cc151..3f6ab72 100644 --- a/res/xml-v23/preferences_application.xml +++ b/res/xml-v23/preferences_application.xml @@ -43,29 +43,10 @@ android:defaultValue="@bool/send_sound_pref_default" android:persistent="true" /> - <SwitchPreference - android:key="@string/notifications_enabled_pref_key" - android:title="@string/notifications_enabled_pref_title" - android:defaultValue="@bool/notifications_enabled_pref_default" - android:persistent="true" - android:disableDependentsState="false" /> - - <RingtonePreference - android:key="@string/notification_sound_pref_key" - android:title="@string/notification_sound_pref_title" - android:ringtoneType="notification" - android:showSilent="true" - android:showDefault="true" - android:persistent="true" - android:defaultValue="" - android:dependency="@string/notifications_enabled_pref_key" /> - - <SwitchPreference - android:key="@string/notification_vibration_pref_key" - android:title="@string/notification_vibrate_pref_title" - android:defaultValue="@bool/notification_vibration_pref_default" - android:persistent="true" - android:dependency="@string/notifications_enabled_pref_key" /> + <Preference + android:key="@string/notifications_pref_key" + android:title="@string/notifications_pref_title" + android:persistent="true" /> <SwitchPreference android:key="pref_show_emoticons" diff --git a/res/xml/preferences_application.xml b/res/xml/preferences_application.xml index 03b868b..2c3d6cb 100644 --- a/res/xml/preferences_application.xml +++ b/res/xml/preferences_application.xml @@ -42,29 +42,10 @@ android:defaultValue="@bool/send_sound_pref_default" android:persistent="true" /> - <CheckBoxPreference - android:key="@string/notifications_enabled_pref_key" - android:title="@string/notifications_enabled_pref_title" - android:defaultValue="@bool/notifications_enabled_pref_default" - android:persistent="true" - android:disableDependentsState="false" /> - - <RingtonePreference - android:key="@string/notification_sound_pref_key" - android:title="@string/notification_sound_pref_title" - android:ringtoneType="notification" - android:showSilent="true" - android:showDefault="true" - android:persistent="true" - android:defaultValue="" - android:dependency="@string/notifications_enabled_pref_key" /> - - <CheckBoxPreference - android:key="@string/notification_vibration_pref_key" - android:title="@string/notification_vibrate_pref_title" - android:defaultValue="@bool/notification_vibration_pref_default" - android:persistent="true" - android:dependency="@string/notifications_enabled_pref_key" /> + <Preference + android:key="@string/notifications_pref_key" + android:title="@string/notifications_pref_title" + android:persistent="true" /> <CheckBoxPreference android:key="pref_show_emoticons" |
