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

Commit f7260037 authored by Jing Ji's avatar Jing Ji Committed by Android (Google) Code Review
Browse files

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

parents 97c8cee1 5fbb2143

core/res/res/values/strings.xml

+5 −3
Original line number Original line 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] -->

    <!-- Title for the notification channel notifying user of abusive background apps. [CHAR LIMIT=NONE] -->

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

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

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

    <!-- 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] -->

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

    <string name="notification_content_abusive_bg_apps">

    <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>

    </string>

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

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

    <string name="notification_content_long_running_fgs">

    <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>

    </string>

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

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

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

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

core/res/res/values/symbols.xml

+1 −0
Original line number Original line 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_channel_abusive_bg_apps"/>

  <java-symbol type="string" name="notification_title_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_abusive_bg_apps"/>

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

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

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

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

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

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

            }





            postNotificationIfNecessary(NOTIFICATION_TYPE_LONG_RUNNING_FGS,

            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,

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

                    pendingIntent, packageName, uid, null);

                    pendingIntent, packageName, uid, null);

        }

        }