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

Commit c686b1f2 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" am: dce2f1c0 

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

Change-Id: I0ed39f8348868e66a0b7e10c569dc61657a2c8aa
parents a97e560c dce2f1c0

core/java/android/text/Html.java

+1 −1
Original line number Diff line number Diff line
@@ -549,7 +549,7 @@ public class Html { 
                    out.append(((ImageSpan) style[j]).getSource());

                    out.append("\">");



                    // Don't output the dummy character underlying the image.

                    // Don't output the placeholder character underlying the image.

                    i = next;

                }

                if (style[j] instanceof AbsoluteSizeSpan) {

core/java/android/text/format/Time.java

+1 −1
Original line number Diff line number Diff line
@@ -361,7 +361,7 @@ public class Time { 
     */

    @Override

    public String toString() {

        // toString() uses its own TimeCalculator rather than the shared one. Otherwise crazy stuff

        // toString() uses its own TimeCalculator rather than the shared one. Otherwise weird stuff

        // happens during debugging when the debugger calls toString().

        TimeCalculator calculator = new TimeCalculator(this.timezone);

        calculator.copyFieldsFromTime(this);

core/java/android/widget/Magnifier.java

+1 −1
Original line number Diff line number Diff line
@@ -918,7 +918,7 @@ public final class Magnifier { 
            bitmapRenderNode.setOutline(outline);

            bitmapRenderNode.setClipToOutline(true);



            // Create a dummy draw, which will be replaced later with real drawing.

            // Create a placeholder draw, which will be replaced later with real drawing.

            final RecordingCanvas canvas = bitmapRenderNode.beginRecording(

                    mContentWidth, mContentHeight);

            try {