Merge "More auto-doc work." into oc-dev am: 6bc03748a7

am: f25b285706

Change-Id: Ic6b7c359259b6fd809b1a01ba249a7b44e15a29f
This commit is contained in:
Jeff Sharkey
2017-04-24 18:37:08 +00:00
committed by android-build-merger
22 changed files with 111 additions and 134 deletions

View File

@@ -24,7 +24,7 @@ import android.annotation.IntRange;
import android.annotation.NonNull;
import android.annotation.Nullable;
import android.annotation.Size;
import android.annotation.SuppressAutoDoc;
import android.util.Half;
import com.android.internal.util.XmlUtils;
@@ -289,6 +289,7 @@ import java.util.function.DoubleUnaryOperator;
* and <code>(1.0, 0.0, 0.0, 0.5)</code>.</p>
*/
@AnyThread
@SuppressAutoDoc
public class Color {
@ColorInt public static final int BLACK = 0xFF000000;
@ColorInt public static final int DKGRAY = 0xFF444444;

View File

@@ -22,6 +22,7 @@ import android.annotation.IntRange;
import android.annotation.NonNull;
import android.annotation.Nullable;
import android.annotation.Size;
import android.annotation.SuppressAutoDoc;
import android.util.Pair;
import java.util.ArrayList;
@@ -131,6 +132,7 @@ import java.util.function.DoubleUnaryOperator;
*/
@AnyThread
@SuppressWarnings("StaticInitializerReferencesSubClass")
@SuppressAutoDoc
public abstract class ColorSpace {
/**
* Standard CIE 1931 2° illuminant A, encoded in xyY.