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

Merge "Update strings for privacy dialog" into sc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2021-04-20 15:18:40 +00:00
committed by Android (Google) Code Review
parent cecbd506d8 22c255d69c
commit 4f6232fa3c
3 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
packages/SystemUI/res/layout/privacy_dialog_item.xml
View File

@@ -31,7 +31,6 @@
android:layout_width="@dimen/ongoing_appops_dialog_circle_size"
android:layout_height="@dimen/ongoing_appops_dialog_circle_size"
android:layout_gravity="center_vertical"
android:importantForAccessibility="no"
/>
<TextView

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

@@ -2620,19 +2620,19 @@
<string name="ongoing_privacy_dialog_last_separator">\u0020and\u0020</string>
<!-- Text for privacy dialog, using sensitive app op (one of camera, location, microphone) right now [CHAR LIMIT=NONE] -->
<string name="ongoing_privacy_dialog_using_op"><xliff:g id="application_name" example="Photos">%1$s</xliff:g> is using the <xliff:g id="app_opp_name" example="camera">%2$s</xliff:g></string>
<string name="ongoing_privacy_dialog_using_op">Being used by <xliff:g id="application_name" example="Photos">%1$s</xliff:g></string>
<!-- Text for privacy dialog, recently used sensitive app op (one of camera, location, microphone) [CHAR LIMIT=NONE] -->
<string name="ongoing_privacy_dialog_recent_op"><xliff:g id="application_name" example="Photos">%1$s</xliff:g> used the <xliff:g id="app_opp_name" example="camera">%2$s</xliff:g> recently</string>
<string name="ongoing_privacy_dialog_recent_op">Recently used by <xliff:g id="application_name" example="Photos">%1$s</xliff:g></string>
<!-- Text for privacy dialog, indicating that the application is the enterprise version [CHAR LIMIT=NONE] -->
<string name="ongoing_privacy_dialog_enterprise">(enterprise)</string>
<string name="ongoing_privacy_dialog_enterprise">(work)</string>
<!-- Text for privacy dialog, identifying the phone call app [CHAR LIMIT=NONE]-->
<string name="ongoing_privacy_dialog_phonecall">Phone call</string>
<!-- Text for privacy dialog, indicating that an app is using an op on behalf of another [CHAR LIMIT=NONE] -->
<string name="ongoing_privacy_dialog_attribution_text">(through <xliff:g id="attribution" example="Special app">%s</xliff:g>)</string>
<!-- Text for privacy dialog, indicating that an app (or multiple) is using an op on behalf of another [CHAR LIMIT=NONE] -->
<string name="ongoing_privacy_dialog_attribution_text">(through <xliff:g id="application name(s)" example="Maps, and Assistant">%s</xliff:g>)</string>
<!-- Text for camera app op [CHAR LIMIT=20]-->
<string name="privacy_type_camera">camera</string>

2
packages/SystemUI/src/com/android/systemui/privacy/PrivacyDialog.kt
View File

@@ -119,7 +119,7 @@ class PrivacyDialog(
} else {
app
}
val firstLine = context.getString(stringId, appName, element.type.getName(context))
val firstLine = context.getString(stringId, appName)
val finalText = element.attribution?.let {
TextUtils.concat(
firstLine,