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

Commit 296c5c2e authored by Jayachandran C's avatar Jayachandran C Committed by Android (Google) Code Review
Browse files

Merge "Manual network selection handling when request satellite enable" into main

parents 980515dd 49686798
Loading
Loading
Loading
Loading
+8 −0
Original line number Diff line number Diff line
@@ -6510,6 +6510,14 @@ ul.</string>
    <string name="satellite_notification_open_message">Open Messages</string>
    <!-- Invoke Satellite setting activity of Settings -->
    <string name="satellite_notification_how_it_works">How it works</string>
    <!-- Popup title when satellite start with manual selection -->
    <string name="satellite_manual_selection_state_popup_title">Turn on \"Automatically select network\"</string>
    <!-- Popup message when satellite start with manual selection -->
    <string name="satellite_manual_selection_state_popup_message">Turn on \"Automatically select network\" in Settings so your phone can find a network that works with satellite</string>
    <!-- Popup button for set network selection automatic -->
    <string name="satellite_manual_selection_state_popup_ok">Turn on</string>
    <!-- Popup button for cancel satellite request -->
    <string name="satellite_manual_selection_state_popup_cancel">Go back</string>
    <!-- Initial/System provided label shown for an app which gets unarchived. [CHAR LIMIT=64]. -->
    <string name="unarchival_session_app_label">Pending...</string>

+4 −0
Original line number Diff line number Diff line
@@ -5543,6 +5543,10 @@
  <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="string" name="satellite_manual_selection_state_popup_title" />
  <java-symbol type="string" name="satellite_manual_selection_state_popup_message" />
  <java-symbol type="string" name="satellite_manual_selection_state_popup_ok" />
  <java-symbol type="string" name="satellite_manual_selection_state_popup_cancel" />
  <java-symbol type="drawable" name="ic_satellite_alt_24px" />
  <java-symbol type="drawable" name="ic_android_satellite_24px" />