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

Merge "Remove gendered language" am: 35616155b5

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

Change-Id: Id351aef2dc3869ab5fa0b4c909f367b64eead9b2
This commit is contained in:
Treehugger Robot
2020-07-27 13:29:07 +00:00
committed by Automerger Merge Worker
parent 5383e257e2 35616155b5
commit 5c018260e0
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

@@ -679,8 +679,8 @@ public class NotificationManager {
*
* <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
* named 'John Doe' that represents messages from a 'John Doe', and 'John Doe' changes his name
* to 'John Smith,' the channel can be renamed to match.
* named 'Messages' and the user changes their locale, this channel's name should be updated
* 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
* 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
* 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.
*/
public abstract void applyChangesLocked(NotificationRecord record);

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

@@ -214,20 +214,14 @@ public class NotificationShellCmdTest extends UiServiceTestCase {
"Charlotte"
};
static final String[] MESSAGES = {
"Shall I compare thee to a summer's day?",
"Thou art more lovely and more temperate:",
"Rough winds do shake the darling buds of May,",
"And summer's lease hath all too short a date;",
"Sometime too hot the eye of heaven shines,",
"And often is his gold complexion dimm'd;",
"And every fair from fair sometime declines,",
"By chance or nature's changing course untrimm'd;",
"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.",
"Who has seen the wind?",
"Neither I nor you.",
"But when the leaves hang trembling,",
"The wind is passing through.",
"Who has seen the wind?",
"Neither you nor I.",
"But when the trees bow down their heads,",
"The wind is passing by."
};
@Test