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

Merge "Remove gendered language" am: 35616155b5 am: 5c018260e0

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1371586

Change-Id: I04e61237104aca879ceed99f3d24cff76fe4570b
This commit is contained in:
Treehugger Robot
2020-07-27 13:43:16 +00:00
committed by Automerger Merge Worker
parent 9df4a45b87 5c018260e0
commit fc99d35ccf
3 changed files with 11 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/java/android/app/NotificationManager.java
View File

@@ -801,8 +801,8 @@ public class NotificationManager {
* *
* <p>The name and description should only be changed if the locale changes * <p>The name and description should only be changed if the locale changes
* or in response to the user renaming this channel. For example, if a user has a channel * or in response to the user renaming this channel. For example, if a user has a channel
* named 'John Doe' that represents messages from a 'John Doe', and 'John Doe' changes his name * named 'Messages' and the user changes their locale, this channel's name should be updated
* to 'John Smith,' the channel can be renamed to match. * with the translation of 'Messages' in the new locale.
* *
* <p>The importance of an existing channel will only be changed if the new importance is lower * <p>The importance of an existing channel will only be changed if the new importance is lower
* than the current value and the user has not altered any settings on this channel. * than the current value and the user has not altered any settings on this channel.

2
services/core/java/com/android/server/notification/RankingReconsideration.java
View File

@@ -90,7 +90,7 @@ public abstract class RankingReconsideration implements Runnable {
/** /**
* Apply any computed changes to the notification record. This method will be * Apply any computed changes to the notification record. This method will be
* called on the main service thread, synchronized on he mNotificationList. * called on the main service thread, synchronized on the mNotificationList.
* @param record The locked record to be updated. * @param record The locked record to be updated.
*/ */
public abstract void applyChangesLocked(NotificationRecord record); public abstract void applyChangesLocked(NotificationRecord record);

22
services/tests/uiservicestests/src/com/android/server/notification/NotificationShellCmdTest.java
View File

@@ -215,20 +215,14 @@ public class NotificationShellCmdTest extends UiServiceTestCase {
"Charlotte" "Charlotte"
}; };
static final String[] MESSAGES = { static final String[] MESSAGES = {
"Shall I compare thee to a summer's day?", "Who has seen the wind?",
"Thou art more lovely and more temperate:", "Neither I nor you.",
"Rough winds do shake the darling buds of May,", "But when the leaves hang trembling,",
"And summer's lease hath all too short a date;", "The wind is passing through.",
"Sometime too hot the eye of heaven shines,", "Who has seen the wind?",
"And often is his gold complexion dimm'd;", "Neither you nor I.",
"And every fair from fair sometime declines,", "But when the trees bow down their heads,",
"By chance or nature's changing course untrimm'd;", "The wind is passing by."
"But thy eternal summer shall not fade,",
"Nor lose possession of that fair thou ow'st;",
"Nor shall death brag thou wander'st in his shade,",
"When in eternal lines to time thou grow'st:",
" So long as men can breathe or eyes can see,",
" So long lives this, and this gives life to thee.",
}; };
@Test @Test