am 169b9c1e: am bfa62339: Merge "Removing things that shouldn\'t be public" into honeycomb

* commit '169b9c1e31f04d4b45e164920d1cd414425be2e7':
  Removing things that shouldn't be public
This commit is contained in:
Alex Sakhartchouk
2011-01-14 14:23:59 -08:00
committed by Android Git Automerger
3 changed files with 4 additions and 92 deletions

View File

@@ -171131,50 +171131,6 @@
<exception name="IllegalArgumentException" type="java.lang.IllegalArgumentException">
</exception>
</method>
<field name="MAX_CONSTANT"
type="int"
transient="false"
volatile="false"
value="8"
static="true"
final="true"
deprecated="not deprecated"
visibility="public"
>
</field>
<field name="MAX_INPUT"
type="int"
transient="false"
volatile="false"
value="8"
static="true"
final="true"
deprecated="not deprecated"
visibility="public"
>
</field>
<field name="MAX_OUTPUT"
type="int"
transient="false"
volatile="false"
value="8"
static="true"
final="true"
deprecated="not deprecated"
visibility="public"
>
</field>
<field name="MAX_TEXTURE"
type="int"
transient="false"
volatile="false"
value="8"
static="true"
final="true"
deprecated="not deprecated"
visibility="public"
>
</field>
</class>
<class name="Program.BaseProgramBuilder"
extends="java.lang.Object"

View File

@@ -172622,50 +172622,6 @@
<exception name="IllegalArgumentException" type="java.lang.IllegalArgumentException">
</exception>
</method>
<field name="MAX_CONSTANT"
type="int"
transient="false"
volatile="false"
value="8"
static="true"
final="true"
deprecated="not deprecated"
visibility="public"
>
</field>
<field name="MAX_INPUT"
type="int"
transient="false"
volatile="false"
value="8"
static="true"
final="true"
deprecated="not deprecated"
visibility="public"
>
</field>
<field name="MAX_OUTPUT"
type="int"
transient="false"
volatile="false"
value="8"
static="true"
final="true"
deprecated="not deprecated"
visibility="public"
>
</field>
<field name="MAX_TEXTURE"
type="int"
transient="false"
volatile="false"
value="8"
static="true"
final="true"
deprecated="not deprecated"
visibility="public"
>
</field>
</class>
<class name="Program.BaseProgramBuilder"
extends="java.lang.Object"

View File

@@ -33,10 +33,10 @@ import android.util.Log;
*
**/
public class Program extends BaseObj {
public static final int MAX_INPUT = 8;
public static final int MAX_OUTPUT = 8;
public static final int MAX_CONSTANT = 8;
public static final int MAX_TEXTURE = 8;
static final int MAX_INPUT = 8;
static final int MAX_OUTPUT = 8;
static final int MAX_CONSTANT = 8;
static final int MAX_TEXTURE = 8;
/**
*