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

Commit 895d78d1 authored by Paul Hu's avatar Paul Hu Committed by Automerger Merge Worker
Browse files

Merge "[TNU1.1]Add tethering notification strings" am: 33cbb312 am:...

Merge "[TNU1.1]Add tethering notification strings" am: 33cbb312 am: 238b9e82 am: 103f4341 am: e5f02a24

Change-Id: I99bb9db506ed257d461867764541240ceef37acd
parents 4c58af8c e5f02a24
Loading
Loading
Loading
Loading
+26 −0
Original line number Diff line number Diff line
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (C) 2020 The Android Open Source Project

     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
     You may obtain a copy of the License at

          http://www.apache.org/licenses/LICENSE-2.0

     Unless required by applicable law or agreed to in writing, software
     distributed under the License is distributed on an "AS IS" BASIS,
     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
     See the License for the specific language governing permissions and
     limitations under the License.
-->
<resources>
    <!-- String for no upstream notification title [CHAR LIMIT=200] -->
    <string name="no_upstream_notification_title">Tethering &amp; Mobile Hotspot has no internet access</string>

    <!-- String for cellular roaming notification title [CHAR LIMIT=200]  -->
    <string name="upstream_roaming_notification_title">Roaming</string>
    <!-- String for cellular roaming notification message [CHAR LIMIT=500]  -->
    <string name="upstream_roaming_notification_message">You will be charged on a per MB basis for all data sent or received while using this service outside the Verizon Network. Please check our website for current international rates. To minimize charges, visit My Verizon periodically to monitor your usage, check your device settings to confirm which devices are connected, and consider using alternate data connections when available</string>
    <!-- String for cellular roaming notification continue button [CHAR LIMIT=200]  -->
    <string name="upstream_roaming_notification_continue_button">Continue</string>
</resources>
 No newline at end of file
+26 −0
Original line number Diff line number Diff line
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (C) 2020 The Android Open Source Project

     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
     You may obtain a copy of the License at

          http://www.apache.org/licenses/LICENSE-2.0

     Unless required by applicable law or agreed to in writing, software
     distributed under the License is distributed on an "AS IS" BASIS,
     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
     See the License for the specific language governing permissions and
     limitations under the License.
-->
<resources>
    <!-- String for no upstream notification title [CHAR LIMIT=200] -->
    <string name="no_upstream_notification_title">Tethering &amp; Mobile Hotspot has no internet access</string>

    <!-- String for cellular roaming notification title [CHAR LIMIT=200]  -->
    <string name="upstream_roaming_notification_title">Roaming</string>
    <!-- String for cellular roaming notification message [CHAR LIMIT=500]  -->
    <string name="upstream_roaming_notification_message">You will be charged on a per MB basis for all data sent or received while using this service outside the Verizon Network. Please check our website for current international rates. To minimize charges, visit My Verizon periodically to monitor your usage, check your device settings to confirm which devices are connected, and consider using alternate data connections when available</string>
    <!-- String for cellular roaming notification continue button [CHAR LIMIT=200]  -->
    <string name="upstream_roaming_notification_continue_button">Continue</string>
</resources>
 No newline at end of file
+26 −0
Original line number Diff line number Diff line
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (C) 2020 The Android Open Source Project

     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
     You may obtain a copy of the License at

          http://www.apache.org/licenses/LICENSE-2.0

     Unless required by applicable law or agreed to in writing, software
     distributed under the License is distributed on an "AS IS" BASIS,
     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
     See the License for the specific language governing permissions and
     limitations under the License.
-->
<resources>
    <!-- String for no upstream notification title [CHAR LIMIT=200] -->
    <string name="no_upstream_notification_title">Tethering &amp; Mobile Hotspot has no internet access</string>

    <!-- String for cellular roaming notification title [CHAR LIMIT=200]  -->
    <string name="upstream_roaming_notification_title">Roaming</string>
    <!-- String for cellular roaming notification message [CHAR LIMIT=500]  -->
    <string name="upstream_roaming_notification_message">You will be charged on a per MB basis for all data sent or received while using this service outside the Verizon Network. Please check our website for current international rates. To minimize charges, visit My Verizon periodically to monitor your usage, check your device settings to confirm which devices are connected, and consider using alternate data connections when available</string>
    <!-- String for cellular roaming notification continue button [CHAR LIMIT=200]  -->
    <string name="upstream_roaming_notification_continue_button">Continue</string>
</resources>
 No newline at end of file
+10 −0
Original line number Diff line number Diff line
@@ -32,4 +32,14 @@
    Internet" settings page. That is currently the tether_settings_title_all string. -->
    <!-- String for tether notification channel name [CHAR LIMIT=200] -->
    <string name="notification_channel_tethering_status">Hotspot &amp; tethering status</string>

    <!-- String for no upstream notification title [CHAR LIMIT=200] -->
    <string name="no_upstream_notification_title"></string>

    <!-- String for cellular roaming notification title [CHAR LIMIT=200]  -->
    <string name="upstream_roaming_notification_title"></string>
    <!-- String for cellular roaming notification message [CHAR LIMIT=500]  -->
    <string name="upstream_roaming_notification_message"></string>
    <!-- String for cellular roaming notification continue button [CHAR LIMIT=200]  -->
    <string name="upstream_roaming_notification_continue_button"></string>
</resources>
 No newline at end of file