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

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

Browse Source
This commit is contained in:
Jing Ji
2022-03-31 07:13:25 +00:00
committed by Android (Google) Code Review
parent 97c8cee1a3 5fbb214338
commit f7260037b7
3 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/res/res/values/strings.xml
View File

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

1
core/res/res/values/symbols.xml
View File

@@ -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"/>

2
services/core/java/com/android/server/am/AppRestrictionController.java
View File

@@ -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);
} }