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

Commit ec21d7d8 authored by Jing Ji's avatar Jing Ji Committed by Automerger Merge Worker
Browse files

Merge changes from topic "presubmit-am-b6516f7bf55346dda9194c8d19120348" into... 

Merge changes from topic "presubmit-am-b6516f7bf55346dda9194c8d19120348" into tm-mainline-prod am: 7c0c83ed

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



Change-Id: I9efbf90f8690583257d528c77a882c91ed460013
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 47580fc7 7c0c83ed

core/res/res/values/strings.xml

+2 −2
Original line number Diff line number Diff line
@@ -6292,12 +6292,12 @@ ul.</string> 
    <!-- Title for the notification channel notifying user of abusive background apps. [CHAR LIMIT=NONE] -->

    <string name="notification_channel_abusive_bg_apps">Background Activity</string>

    <!-- Title of notification indicating abusive background apps. [CHAR LIMIT=NONE] -->

    <string name="notification_title_abusive_bg_apps">An app is using battery</string>

    <string name="notification_title_abusive_bg_apps">An app is draining battery</string>

    <!-- Title of notification indicating long running foreground services. [CHAR LIMIT=NONE] -->

    <string name="notification_title_long_running_fgs">An app is still active</string>

    <!-- Content of notification indicating abusive background apps. [CHAR LIMIT=NONE] -->

    <string name="notification_content_abusive_bg_apps">

        <xliff:g id="app" example="Gmail">%1$s</xliff:g> is using battery in the background. Tap to review.

        <xliff:g id="app" example="Gmail">%1$s</xliff:g> is running in the background. Tap to manage battery usage.

    </string>

    <!-- Content of notification indicating long running foreground service. [CHAR LIMIT=NONE] -->

    <string name="notification_content_long_running_fgs">