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

Merge "Fixes strings"

Browse Source
This commit is contained in:
Fabian Kozynski
2018-11-27 15:53:20 +00:00
committed by Android (Google) Code Review
parent a789183401 5d44a4f426
commit 2c80342081
2 changed files with 15 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
packages/SystemUI/res/values/strings.xml
View File

@@ -2254,7 +2254,10 @@
<string name="heap_dump_tile_name">Dump SysUI Heap</string>
<!-- Text on chip for multiple apps using a single app op [CHAR LIMIT=10] -->
<string name="ongoing_privacy_chip_multiple_apps"><xliff:g id="num_apps" example="3">%d</xliff:g> apps</string>
<plurals name="ongoing_privacy_chip_multiple_apps">
<item quantity="few"><xliff:g id="num_apps" example="3">%d</xliff:g> apps</item>
<item quantity="other"><xliff:g id="num_apps" example="3">%d</xliff:g> apps</item>
</plurals>
<!-- Content description for ongoing privacy chip. Use with a single app [CHAR LIMIT=NONE]-->
<string name="ongoing_privacy_chip_content_single_app"><xliff:g id="app" example="Example App">%1$s</xliff:g> is using your <xliff:g id="types_list" example="camera, location">%2$s</xliff:g>.</string>
@@ -2263,12 +2266,15 @@
<string name="ongoing_privacy_chip_content_multiple_apps">Applications are using your <xliff:g id="types_list" example="camera, location">%s</xliff:g>.</string>
<!-- Content description for ongoing privacy chip. Use with multiple apps using same app op[CHAR LIMIT=NONE]-->
<string name="ongoing_privacy_chip_content_multiple_apps_single_op"><xliff:g id="num_apps" example="3">%1$d</xliff:g> applications are using your <xliff:g id="type" example="camera">%2$s</xliff:g>.</string>
<plurals name="ongoing_privacy_chip_content_multiple_apps_single_op">
<item quantity="few"><xliff:g id="num_apps" example="3">%1$d</xliff:g> applications are using your <xliff:g id="type" example="camera">%2$s</xliff:g>.</item>
<item quantity="other"><xliff:g id="num_apps" example="3">%1$d</xliff:g> applications are using your <xliff:g id="type" example="camera">%2$s</xliff:g>.</item>
</plurals>
<!-- Action on Ongoing Privacy Dialog to dismiss [CHAR LIMIT=10]-->
<string name="ongoing_privacy_dialog_cancel">Cancel</string>
<!-- Action on Ongoing Privacy Dialog to open privacy hub [CHAR LIMIT=15]-->
<!-- Action on Ongoing Privacy Dialog to open privacy hub [CHAR LIMIT=20]-->
<string name="ongoing_privacy_dialog_open_settings">View details</string>
<!-- Text for item in Ongoing Privacy Dialog title when only one app is using app ops [CHAR LIMIT=NONE] -->

11
packages/SystemUI/src/com/android/systemui/privacy/OngoingPrivacyChip.kt
View File

@@ -78,8 +78,9 @@ class OngoingPrivacyChip @JvmOverloads constructor(
if (builder.app != null) {
text.setText(builder.app?.applicationName)
} else {
text.text = context.getString(R.string.ongoing_privacy_chip_multiple_apps,
builder.appsAndTypes.size)
text.text = context.resources.getQuantityString(
R.plurals.ongoing_privacy_chip_multiple_apps,
builder.appsAndTypes.size, builder.appsAndTypes.size)
}
}
} else {
@@ -100,9 +101,9 @@ class OngoingPrivacyChip @JvmOverloads constructor(
context.getString(R.string.ongoing_privacy_chip_content_single_app,
builder.app?.applicationName, typesText)
} else {
contentDescription = context.getString(
R.string.ongoing_privacy_chip_content_multiple_apps_single_op,
builder.appsAndTypes.size, typesText)
contentDescription = context.resources.getQuantityString(
R.plurals.ongoing_privacy_chip_content_multiple_apps_single_op,
builder.appsAndTypes.size, builder.appsAndTypes.size, typesText)
}
}
}