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

Commit 0be0c805 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "ColorSpace.java,cosmetics: fix some typos" am: 65240d6e am:... 

Merge "ColorSpace.java,cosmetics: fix some typos" am: 65240d6e am: cd3bbf1e am: 9b2f7df4 am: 6d46535c

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



Change-Id: I860fb8584929496adad4a44ecbb04d6b42ca532c
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 47bbbd75 6d46535c

graphics/java/android/graphics/ColorSpace.java

+5 −5
Original line number Diff line number Diff line
@@ -170,7 +170,7 @@ public abstract class ColorSpace { 
    /**

     * Standard CIE 1931 2° illuminant D65, encoded in xyY.

     * This illuminant has a color temperature of 6504K. This illuminant

     * is commonly used in RGB color spaces such as sRGB, BT.209, etc.

     * is commonly used in RGB color spaces such as sRGB, BT.709, etc.

     */

    public static final float[] ILLUMINANT_D65 = { 0.31271f, 0.32902f };

    /**
@@ -862,8 +862,8 @@ public abstract class ColorSpace { 
    public enum Model {

        /**

         * The RGB model is a color model with 3 components that

         * refer to the three additive primiaries: red, green

         * andd blue.

         * refer to the three additive primaries: red, green

         * and blue.

         */

        RGB(3),

        /**
@@ -2537,7 +2537,7 @@ public abstract class ColorSpace { 
         * does not need to be specified and is assumed to be 1.0. Only the xy components

         * are required.</p>

         *

         * <p class="note">The ID, areturned by {@link #getId()}, of an object created by

         * <p class="note">The ID, as returned by {@link #getId()}, of an object created by

         * this constructor is always {@link #MIN_ID}.</p>

         *

         * @param name Name of the color space, cannot be null, its length must be >= 1
@@ -3961,7 +3961,7 @@ public abstract class ColorSpace { 
             *

             * <p>We can only connect color spaces if they use the same profile

             * connection space. We assume the connection space is always

             * CIE XYZ but we maye need to perform a chromatic adaptation to

             * CIE XYZ but we maybe need to perform a chromatic adaptation to

             * match the white points. If an adaptation is needed, we use the

             * CIE standard illuminant D50. The unmatched color space is adapted

             * using the von Kries transform and the {@link Adaptation#BRADFORD}