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

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

Merge "Update the bg app notification language per UX spec" into tm-dev am: f7260037 

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



Change-Id: I1a5cf08bc5741ea70d7430470b4522df2d65c220
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 7c4d055c f7260037

core/res/res/values/strings.xml

+5 −3
Original line number Diff line number Diff line
@@ -6265,14 +6265,16 @@ 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">Background Activity</string>

    <string name="notification_title_abusive_bg_apps">An app is using 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 running in the background and draining battery. Tap to review.

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

    </string>

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

    <string name="notification_content_long_running_fgs">

        <xliff:g id="app" example="Gmail">%1$s</xliff:g> is running in the background for a long time. Tap to review.

        <xliff:g id="app" example="Gmail">%1$s</xliff:g> might affect battery life. Tap to review active apps.

    </string>

    <!-- Action label of notification for user to check background apps. [CHAR LIMIT=NONE]  -->

    <string name="notification_action_check_bg_apps">Check active apps</string>

core/res/res/values/symbols.xml

+1 −0
Original line number Diff line number Diff line
@@ -4743,6 +4743,7 @@ 


  <java-symbol type="string" name="notification_channel_abusive_bg_apps"/>

  <java-symbol type="string" name="notification_title_abusive_bg_apps"/>

  <java-symbol type="string" name="notification_title_long_running_fgs"/>

  <java-symbol type="string" name="notification_content_abusive_bg_apps"/>

  <java-symbol type="string" name="notification_content_long_running_fgs"/>

  <java-symbol type="string" name="notification_action_check_bg_apps"/>

services/core/java/com/android/server/am/AppRestrictionController.java

+1 −1
Original line number Diff line number Diff line
@@ -1776,7 +1776,7 @@ public final class AppRestrictionController { 
            }



            postNotificationIfNecessary(NOTIFICATION_TYPE_LONG_RUNNING_FGS,

                    com.android.internal.R.string.notification_title_abusive_bg_apps,

                    com.android.internal.R.string.notification_title_long_running_fgs,

                    com.android.internal.R.string.notification_content_long_running_fgs,

                    pendingIntent, packageName, uid, null);

        }