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

Commit 1eae4e96 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Update strings for privacy dialog" into sc-dev am: 4f6232fa 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14127705

Change-Id: I8aeafbae0d7b9b125f49e0ad86c2f791274e764b
parents 7d016d76 4f6232fa

packages/SystemUI/res/layout/privacy_dialog_item.xml

+0 −1
Original line number Diff line number Diff line
@@ -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

packages/SystemUI/res/values/strings.xml

+5 −5
Original line number Diff line number Diff line
@@ -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>

packages/SystemUI/src/com/android/systemui/privacy/PrivacyDialog.kt

+1 −1
Original line number Diff line number Diff line
@@ -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,