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

Merge "Update language to comply with Android's inclusive language guidance" am: ec88a69b00 am: 2fe4f69ea3

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

Change-Id: If43a1f2c9030915ccadc6f4aaa4d031ce6eae32a
This commit is contained in:
Treehugger Robot
2020-07-29 20:38:47 +00:00
committed by Automerger Merge Worker
parent 8571084466 2fe4f69ea3
commit 3bb5a01e9c
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/SystemUI/src/com/android/systemui/statusbar/policy/Clock.java
View File

@@ -393,7 +393,7 @@ public class Clock extends TextView implements DemoMode, Tunable, CommandQueue.C
mContentDescriptionFormat = new SimpleDateFormat(format); mContentDescriptionFormat = new SimpleDateFormat(format);
/* /*
* Search for an unquoted "a" in the format string, so we can * Search for an unquoted "a" in the format string, so we can
* add dummy characters around it to let us find it again after * add marker characters around it to let us find it again after
* formatting and change its size. * formatting and change its size.
*/ */
if (mAmPmStyle != AM_PM_STYLE_NORMAL) { if (mAmPmStyle != AM_PM_STYLE_NORMAL) {