Merge "Fixed a bunch of typos." into main (371c9f28) · Commits · e / os / android_frameworks_base

graphics/java/android/graphics/RenderNode.java

+4 −4

Original line number	Diff line number	Diff line
		@@ -765,12 +765,12 @@ public final class RenderNode {
		* Default value is false. See
		* {@link #setProjectBackwards(boolean)} for a description of what this entails.
		*
		* @param shouldRecieve True if this RenderNode is a projection receiver, false otherwise.
		* @param shouldReceive True if this RenderNode is a projection receiver, false otherwise.
		* Default is false.
		* @return True if the value changed, false if the new value was the same as the previous value.
		*/
		public boolean setProjectionReceiver(boolean shouldRecieve) {
		return nSetProjectionReceiver(mNativeRenderNode, shouldRecieve);
		public boolean setProjectionReceiver(boolean shouldReceive) {
		return nSetProjectionReceiver(mNativeRenderNode, shouldReceive);
		}

		/**
		@@ -1799,7 +1799,7 @@ public final class RenderNode {
		private static native boolean nSetProjectBackwards(long renderNode, boolean shouldProject);

		@CriticalNative
		private static native boolean nSetProjectionReceiver(long renderNode, boolean shouldRecieve);
		private static native boolean nSetProjectionReceiver(long renderNode, boolean shouldReceive);

		@CriticalNative
		private static native boolean nSetOutlineRoundRect(long renderNode, int left, int top,

graphics/java/android/graphics/SurfaceTexture.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -318,7 +318,7 @@ public class SurfaceTexture {
		}

		/**
		* Releases the the texture content. This is needed in single buffered mode to allow the image
		* Releases the texture content. This is needed in single buffered mode to allow the image
		* content producer to take ownership of the image buffer.
		* <p>
		* For more information see {@link #SurfaceTexture(int, boolean)}.
		@@ -431,7 +431,7 @@ public class SurfaceTexture {
		* error.
		* <p>
		* Note that while calling this method causes all the buffers to be freed
		* from the perspective of the the SurfaceTexture, if there are additional
		* from the perspective of the SurfaceTexture, if there are additional
		* references on the buffers (e.g. if a buffer is referenced by a client or
		* by OpenGL ES as a texture) then those buffer will remain allocated.
		* <p>

graphics/java/android/graphics/Typeface.java

+3 −3

Original line number	Diff line number	Diff line
		@@ -600,7 +600,7 @@ public class Typeface {
		* {@link #setWeight} and {@link #setItalic}.
		*
		* If {@link #setWeight} is not called, the fallback family keeps the default weight.
		* Similary, if {@link #setItalic} is not called, the fallback family keeps the default
		* Similarly, if {@link #setItalic} is not called, the fallback family keeps the default
		* italic information. For example, calling {@code builder.setFallback("sans-serif-light")}
		* is equivalent to calling {@code builder.setFallback("sans-serif").setWeight(300)} in
		* terms of fallback. The default weight and italic information are overridden by calling
		@@ -794,7 +794,7 @@ public class Typeface {
		/**
		* Returns the maximum capacity of custom fallback families.
		*
		* This includes the the first font family passed to the constructor.
		* This includes the first font family passed to the constructor.
		* It is guaranteed that the value will be greater than or equal to 64.
		*
		* @return the maximum number of font families for the custom fallback
		@@ -816,7 +816,7 @@ public class Typeface {
		/**
		* Sets a system fallback by name.
		*
		* You can specify generic font familiy names or OEM specific family names. If the system
		* You can specify generic font family names or OEM specific family names. If the system
		* don't have a specified fallback, the default fallback is used instead.
		* For more information about generic font families, see <a
		* href="https://www.w3.org/TR/css-fonts-4/#generic-font-families">CSS specification</a>

graphics/java/android/graphics/Xfermode.java

+3 −3

Original line number	Diff line number	Diff line
		@@ -17,7 +17,7 @@
		// This file was generated from the C++ include file: SkXfermode.h
		// Any changes made to this file will be discarded by the build.
		// To change this file, either edit the include, or device/tools/gluemaker/main.cpp,
		// or one of the auxilary file specifications in device/tools/gluemaker.
		// or one of the auxiliary file specifications in device/tools/gluemaker.

		package android.graphics;

		@@ -28,7 +28,7 @@ import android.os.Build;
		* Xfermode is the base class for objects that are called to implement custom
		* "transfer-modes" in the drawing pipeline. The static function Create(Modes)
		* can be called to return an instance of any of the predefined subclasses as
		* specified in the Modes enum. When an Xfermode is assigned to an Paint, then
		* specified in the Modes enum. When an Xfermode is assigned to a Paint, then
		* objects drawn with that paint have the xfermode applied.
		*/
		public class Xfermode {

graphics/java/android/graphics/YuvImage.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -63,7 +63,7 @@ public class YuvImage {
		private int mWidth;

		/**
		* The height of the the image.
		* The height of the image.
		*/
		private int mHeight;