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

Commit bdf97469 authored by Ling Ma's avatar Ling Ma Committed by Android (Google) Code Review
Browse files

Merge "Add manual connect notification" into main

parents 9bfd6b06 a4727bc3

core/res/res/values/strings.xml

+6 −2
Original line number Diff line number Diff line
@@ -6496,10 +6496,14 @@ ul.</string> 
    <string name="screen_not_shared_sensitive_content">App content hidden from screen share for security</string>



    <!-- Satellite related messages -->

    <!-- Notification title when satellite service is connected. -->

    <!-- Notification title when satellite service is auto connected. -->

    <string name="satellite_notification_title">Auto connected to satellite</string>

    <!-- Notification summary when satellite service is connected. [CHAR LIMIT=NONE] -->

    <!-- Notification summary when satellite service is auto connected. [CHAR LIMIT=NONE] -->

    <string name="satellite_notification_summary">You can send and receive messages without a mobile or Wi-Fi network</string>

    <!-- Notification title when satellite service can be manually enabled. -->

    <string name="satellite_notification_manual_title">Use satellite messaging?</string>

    <!-- Notification summary when satellite service can be manually enabled. [CHAR LIMIT=NONE] -->

    <string name="satellite_notification_manual_summary">Send and receive messages without a mobile or Wi-Fi network</string>

    <!-- Invoke "What to expect" dialog of messaging application -->

    <string name="satellite_notification_open_message">Open Messages</string>

    <!-- Invoke Satellite setting activity of Settings -->

core/res/res/values/symbols.xml

+2 −0
Original line number Diff line number Diff line
@@ -5499,6 +5499,8 @@ 
  <!-- System notification for satellite service -->

  <java-symbol type="string" name="satellite_notification_title" />

  <java-symbol type="string" name="satellite_notification_summary" />

  <java-symbol type="string" name="satellite_notification_manual_title" />

  <java-symbol type="string" name="satellite_notification_manual_summary" />

  <java-symbol type="string" name="satellite_notification_open_message" />

  <java-symbol type="string" name="satellite_notification_how_it_works" />

  <java-symbol type="drawable" name="ic_satellite_alt_24px" />