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

Commit e78ac20b 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: dce2f1c0 am: c686b1f2 am: 50015ad6 am: 7ee1dc73 am: 0ead0fc3

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

Change-Id: Ib0e78ce48eaa0be5cc8dc69d3e5674ac8722a287
parents e7274033 0ead0fc3

core/java/android/text/Html.java

+1 −1
Original line number Diff line number Diff line
@@ -551,7 +551,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
@@ -1142,7 +1142,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 {