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

Commit dce2f1c0 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Update language to comply with Android’s inclusive language guidance"

parents da4dc882 f4756132
Loading
Loading
Loading
Loading
+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) {
+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);
+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 {