Merge "Start ICS header cleanup and finish type matrix." (64e00980) · Commits · e / os / android_frameworks_base

api/current.txt

+36 −0

Original line number	Diff line number	Diff line
		@@ -16245,12 +16245,14 @@ package android.renderscript {

		public class Byte2 {
		ctor public Byte2();
		ctor public Byte2(byte, byte);
		field public byte x;
		field public byte y;
		}

		public class Byte3 {
		ctor public Byte3();
		ctor public Byte3(byte, byte, byte);
		field public byte x;
		field public byte y;
		field public byte z;
		@@ -16258,12 +16260,37 @@ package android.renderscript {

		public class Byte4 {
		ctor public Byte4();
		ctor public Byte4(byte, byte, byte, byte);
		field public byte w;
		field public byte x;
		field public byte y;
		field public byte z;
		}

		public class Double2 {
		ctor public Double2();
		ctor public Double2(double, double);
		field public double x;
		field public double y;
		}

		public class Double3 {
		ctor public Double3();
		ctor public Double3(double, double, double);
		field public double x;
		field public double y;
		field public double z;
		}

		public class Double4 {
		ctor public Double4();
		ctor public Double4(double, double, double, double);
		field public double w;
		field public double x;
		field public double y;
		field public double z;
		}

		public class Element extends android.renderscript.BaseObj {
		method public static android.renderscript.Element ALLOCATION(android.renderscript.RenderScript);
		method public static android.renderscript.Element A_8(android.renderscript.RenderScript);
		@@ -16427,12 +16454,14 @@ package android.renderscript {

		public class Int2 {
		ctor public Int2();
		ctor public Int2(int, int);
		field public int x;
		field public int y;
		}

		public class Int3 {
		ctor public Int3();
		ctor public Int3(int, int, int);
		field public int x;
		field public int y;
		field public int z;
		@@ -16440,6 +16469,7 @@ package android.renderscript {

		public class Int4 {
		ctor public Int4();
		ctor public Int4(int, int, int, int);
		field public int w;
		field public int x;
		field public int y;
		@@ -16448,12 +16478,14 @@ package android.renderscript {

		public class Long2 {
		ctor public Long2();
		ctor public Long2(long, long);
		field public long x;
		field public long y;
		}

		public class Long3 {
		ctor public Long3();
		ctor public Long3(long, long, long);
		field public long x;
		field public long y;
		field public long z;
		@@ -16461,6 +16493,7 @@ package android.renderscript {

		public class Long4 {
		ctor public Long4();
		ctor public Long4(long, long, long, long);
		field public long w;
		field public long x;
		field public long y;
		@@ -16857,12 +16890,14 @@ package android.renderscript {

		public class Short2 {
		ctor public Short2();
		ctor public Short2(short, short);
		field public short x;
		field public short y;
		}

		public class Short3 {
		ctor public Short3();
		ctor public Short3(short, short, short);
		field public short x;
		field public short y;
		field public short z;
		@@ -16870,6 +16905,7 @@ package android.renderscript {

		public class Short4 {
		ctor public Short4();
		ctor public Short4(short, short, short, short);
		field public short w;
		field public short x;
		field public short y;

graphics/java/android/renderscript/Byte2.java

+5 −0

Original line number	Diff line number	Diff line
		@@ -28,6 +28,11 @@ public class Byte2 {
		public Byte2() {
		}

		public Byte2(byte initX, byte initY) {
		x = initX;
		y = initY;
		}

		public byte x;
		public byte y;
		}

graphics/java/android/renderscript/Byte3.java

+6 −0

Original line number	Diff line number	Diff line
		@@ -28,6 +28,12 @@ public class Byte3 {
		public Byte3() {
		}

		public Byte3(byte initX, byte initY, byte initZ) {
		x = initX;
		y = initY;
		z = initZ;
		}

		public byte x;
		public byte y;
		public byte z;

graphics/java/android/renderscript/Byte4.java

+7 −0

Original line number	Diff line number	Diff line
		@@ -28,6 +28,13 @@ public class Byte4 {
		public Byte4() {
		}

		public Byte4(byte initX, byte initY, byte initZ, byte initW) {
		x = initX;
		y = initY;
		z = initZ;
		w = initW;
		}

		public byte x;
		public byte y;
		public byte z;

graphics/java/android/renderscript/Double2.java

0 → 100644

+43 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2011 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/

		package android.renderscript;

		import java.lang.Math;
		import android.util.Log;


		/**
		* Class for exposing the native Renderscript double2 type back
		* to the Android system.
		*
		**/
		public class Double2 {
		public Double2() {
		}

		public Double2(double initX, double initY) {
		x = initX;
		y = initY;
		}

		public double x;
		public double y;
		}