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

Commit 3bb5a01e authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Update language to comply with Android's inclusive language guidance"... 

Merge "Update language to comply with Android's inclusive language guidance" am: ec88a69b am: 2fe4f69e

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

Change-Id: If43a1f2c9030915ccadc6f4aaa4d031ce6eae32a
parents 85710844 2fe4f69e

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

+1 −1
Original line number Diff line number Diff line
@@ -393,7 +393,7 @@ public class Clock extends TextView implements DemoMode, Tunable, CommandQueue.C 
            mContentDescriptionFormat = new SimpleDateFormat(format);

            /*

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

             */

            if (mAmPmStyle != AM_PM_STYLE_NORMAL) {