Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "[TNU1.2] Add string for client number notification" am: 2435a6539d

Browse Source 
Change-Id: Ibbead3667ec87cae0f2cd8735dabf77d3d6dd07a
This commit is contained in:
Paul Hu
2020-03-19 10:45:24 +00:00
committed by Automerger Merge Worker
parent 8da40c00c7 2435a6539d
commit d596890446
4 changed files with 70 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
packages/Tethering/res/values-mcc310-mnc120/strings.xml Normal file
View File

@@ -0,0 +1,22 @@
<?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 xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<!-- String for tethered notification title with client number info. -->
<plurals name="tethered_notification_title_with_client_number">
<item quantity="one"><xliff:g>%1$d</xliff:g> device connected.</item>
<item quantity="other"><xliff:g>%1$d</xliff:g> devices connected.</item>
</plurals>
</resources>

22
packages/Tethering/res/values-mcc311-mnc490/strings.xml Normal file
View File

@@ -0,0 +1,22 @@
<?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 xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<!-- String for tethered notification title with client number info. -->
<plurals name="tethered_notification_title_with_client_number">
<item quantity="one"><xliff:g>%1$d</xliff:g> device connected.</item>
<item quantity="other"><xliff:g>%1$d</xliff:g> devices connected.</item>
</plurals>
</resources>

22
packages/Tethering/res/values-mcc312-mnc530/strings.xml Normal file
View File

@@ -0,0 +1,22 @@
<?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 xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<!-- String for tethered notification title with client number info. -->
<plurals name="tethered_notification_title_with_client_number">
<item quantity="one"><xliff:g>%1$d</xliff:g> device connected.</item>
<item quantity="other"><xliff:g>%1$d</xliff:g> devices connected.</item>
</plurals>
</resources>

5
packages/Tethering/res/values/strings.xml
View File

@@ -13,12 +13,15 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
<resources>
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<!-- Shown when the device is tethered -->
<!-- String for tethered notification title [CHAR LIMIT=200] -->
<string name="tethered_notification_title">Tethering or hotspot active</string>
<!-- String for tethered notification message [CHAR LIMIT=200] -->
<string name="tethered_notification_message">Tap to set up.</string>
<!-- String for tethered notification title with client number info. -->
<plurals name="tethered_notification_title_with_client_number">
</plurals>
<!-- This notification is shown when tethering has been disabled on a user's device.
The device is managed by the user's employer. Tethering can't be turned on unless the