Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 452830a3 authored by Oleg Blinnikov's avatar Oleg Blinnikov Committed by Android (Google) Code Review
Browse files

Merge "Unify the notification for the display errors" into main

parents fe447ce1 0261f532

core/res/res/values/strings.xml

+0 −5
Original line number Diff line number Diff line
@@ -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] -->

core/res/res/values/symbols.xml

+0 −2
Original line number Diff line number Diff line
@@ -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"/>

services/core/java/com/android/server/display/notifications/DisplayNotificationManager.java

+2 −2
Original line number Diff line number Diff line
@@ -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));

    }