diff options
| author | 2023-12-07 13:45:02 +0000 | |
|---|---|---|
| committer | 2023-12-07 13:45:02 +0000 | |
| commit | 452830a3900f4daa9b95c021ffa375bd345ec15f (patch) | |
| tree | ff57a4ef9ac7600789577e94cb7f856b7a762ff3 | |
| parent | fe447ce1d98bc2bac15d7438250e39932bf09a51 (diff) | |
| parent | 0261f532cb124fc9308386abf03c5a384f6bf962 (diff) | |
Merge "Unify the notification for the display errors" into main
| -rw-r--r-- | core/res/res/values/strings.xml | 5 | ||||
| -rw-r--r-- | core/res/res/values/symbols.xml | 2 | ||||
| -rw-r--r-- | services/core/java/com/android/server/display/notifications/DisplayNotificationManager.java | 4 |
3 files changed, 2 insertions, 9 deletions
diff --git a/core/res/res/values/strings.xml b/core/res/res/values/strings.xml index 73a7e4296a57..1f6ac80a133c 100644 --- a/core/res/res/values/strings.xml +++ b/core/res/res/values/strings.xml @@ -6312,11 +6312,6 @@ ul.</string> <!-- Content of connected display unavailable due to thermals notification. [CHAR LIMIT=NONE] --> <string name="connected_display_thermally_unavailable_notification_content">Your device is too warm and can\'t mirror to the display until it cools down</string> - <!-- Title of cable don't support displays notifications. [CHAR LIMIT=NONE] --> - <string name="connected_display_cable_dont_support_displays_notification_title">Cable may not support displays</string> - <!-- Content of cable don't support displays notification. [CHAR LIMIT=NONE] --> - <string name="connected_display_cable_dont_support_displays_notification_content">Your USB-C cable may not connect to displays properly</string> - <!-- Name of concurrent display notifications. [CHAR LIMIT=NONE] --> <string name="concurrent_display_notification_name">Dual screen</string> <!-- Title of concurrent display active notification. [CHAR LIMIT=NONE] --> diff --git a/core/res/res/values/symbols.xml b/core/res/res/values/symbols.xml index 0ddb05e79e1b..a5b102836816 100644 --- a/core/res/res/values/symbols.xml +++ b/core/res/res/values/symbols.xml @@ -5107,8 +5107,6 @@ <java-symbol type="string" name="connected_display_unavailable_notification_title"/> <java-symbol type="string" name="connected_display_unavailable_notification_content"/> <java-symbol type="string" name="connected_display_thermally_unavailable_notification_content"/> - <java-symbol type="string" name="connected_display_cable_dont_support_displays_notification_title"/> - <java-symbol type="string" name="connected_display_cable_dont_support_displays_notification_content"/> <java-symbol type="string" name="concurrent_display_notification_name"/> <java-symbol type="string" name="concurrent_display_notification_active_title"/> <java-symbol type="string" name="concurrent_display_notification_active_content"/> diff --git a/services/core/java/com/android/server/display/notifications/DisplayNotificationManager.java b/services/core/java/com/android/server/display/notifications/DisplayNotificationManager.java index f57bf295a34e..405c14941442 100644 --- a/services/core/java/com/android/server/display/notifications/DisplayNotificationManager.java +++ b/services/core/java/com/android/server/display/notifications/DisplayNotificationManager.java @@ -130,8 +130,8 @@ public class DisplayNotificationManager implements ConnectedDisplayUsbErrorsDete } sendErrorNotification(createErrorNotification( - R.string.connected_display_cable_dont_support_displays_notification_title, - R.string.connected_display_cable_dont_support_displays_notification_content, + R.string.connected_display_unavailable_notification_title, + R.string.connected_display_unavailable_notification_content, R.drawable.usb_cable_unknown_issue)); } |