diff options
| author | 2020-03-19 10:20:27 +0000 | |
|---|---|---|
| committer | 2020-03-19 10:20:27 +0000 | |
| commit | 2435a6539db89d1e71deb11cbf9d93561c097033 (patch) | |
| tree | 28014b0597dd3899ee5e4f8f38c85eb268c835fd | |
| parent | f5302ac9b5bc1d3bb814f3f38dd1e43eaf8994d3 (diff) | |
| parent | 3fa8b68b62530f183f89fd24e1766a648e918746 (diff) | |
Merge "[TNU1.2] Add string for client number notification"
4 files changed, 70 insertions, 1 deletions
diff --git a/packages/Tethering/res/values-mcc310-mnc120/strings.xml b/packages/Tethering/res/values-mcc310-mnc120/strings.xml new file mode 100644 index 000000000000..618df90c7105 --- /dev/null +++ b/packages/Tethering/res/values-mcc310-mnc120/strings.xml @@ -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>
\ No newline at end of file diff --git a/packages/Tethering/res/values-mcc311-mnc490/strings.xml b/packages/Tethering/res/values-mcc311-mnc490/strings.xml new file mode 100644 index 000000000000..618df90c7105 --- /dev/null +++ b/packages/Tethering/res/values-mcc311-mnc490/strings.xml @@ -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>
\ No newline at end of file diff --git a/packages/Tethering/res/values-mcc312-mnc530/strings.xml b/packages/Tethering/res/values-mcc312-mnc530/strings.xml new file mode 100644 index 000000000000..618df90c7105 --- /dev/null +++ b/packages/Tethering/res/values-mcc312-mnc530/strings.xml @@ -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>
\ No newline at end of file diff --git a/packages/Tethering/res/values/strings.xml b/packages/Tethering/res/values/strings.xml index d50884b2a7b0..981524e4daea 100644 --- a/packages/Tethering/res/values/strings.xml +++ b/packages/Tethering/res/values/strings.xml @@ -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 |