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

Commit b14d1bd6 authored by Brad Nelson's avatar Brad Nelson Committed by Automerger Merge Worker
Browse files

Merge "Fix several typos." into main am: d0bcef25 am: 6d2281b3 

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



Change-Id: Ibe1c7b2f5225bfce2338e85137d82225d61f7a4e
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 9cca183f 6d2281b3

graphics/java/android/graphics/ComposePathEffect.java

+2 −2
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ public class ComposePathEffect extends PathEffect { 


    /**

     * Construct a PathEffect whose effect is to apply first the inner effect

     * and the the outer pathEffect (e.g. outer(inner(path))).

     * and the outer pathEffect (e.g. outer(inner(path))).

     */

    public ComposePathEffect(PathEffect outerpe, PathEffect innerpe) {

        native_instance = nativeCreate(outerpe.native_instance,

graphics/java/android/graphics/FontFamily.java

+1 −1
Original line number Diff line number Diff line
@@ -219,7 +219,7 @@ public class FontFamily { 


    @CriticalNative

    private static native long nGetFamilyReleaseFunc();

    // By passing -1 to weigth argument, the weight value is resolved by OS/2 table in the font.

    // By passing -1 to weight argument, the weight value is resolved by OS/2 table in the font.

    // By passing -1 to italic argument, the italic value is resolved by OS/2 table in the font.

    private static native boolean nAddFont(long builderPtr, ByteBuffer font, int ttcIndex,

            int weight, int isItalic);

graphics/java/android/graphics/FontListParser.java

+2 −2
Original line number Diff line number Diff line
@@ -127,7 +127,7 @@ public class FontListParser { 
            parser.setInput(is, null);

            parser.nextTag();

            return readFamilies(parser, systemFontDir, oemCustomization, updatableFontMap,

                    lastModifiedDate, configVersion, false /* filter out the non-exising files */);

                    lastModifiedDate, configVersion, false /* filter out the non-existing files */);

        }

    }
@@ -254,7 +254,7 @@ public class FontListParser { 
     * @param parser An XML parser.

     * @param fontDir a font directory name.

     * @param updatableFontMap a updated font file map.

     * @param allowNonExistingFile true to allow font file that doesn't exists

     * @param allowNonExistingFile true to allow font file that doesn't exist.

     * @return a FontFamily instance. null if no font files are available in this FontFamily.

     */

    public static @Nullable FontConfig.FontFamily readFamily(XmlPullParser parser, String fontDir,

graphics/java/android/graphics/FrameInfo.java

+1 −1
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ import java.lang.annotation.RetentionPolicy; 
/**

 * Class that contains all the timing information for the current frame. This

 * is used in conjunction with the hardware renderer to provide

 * continous-monitoring jank events

 * continuous-monitoring jank events

 *

 * All times in nanoseconds from CLOCK_MONOTONIC/System.nanoTime()

 *

graphics/java/android/graphics/Interpolator.java

+14 −14
Original line number Diff line number Diff line
@@ -65,7 +65,7 @@ public class Interpolator { 


    /**

     * Assign the keyFrame (specified by index) a time value and an array of key

     * values (with an implicity blend array of [0, 0, 1, 1] giving linear

     * values (with an implicitly blend array of [0, 0, 1, 1] giving linear

     * transition to the next set of key values).

     *

     * @param index The index of the key frame to assign