summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJason Sams <rjsams@android.com>2010-06-01 15:54:10 -0700
committerJason Sams <rjsams@android.com>2010-06-01 15:54:10 -0700
commit98994c4a83e86e2444eb928a9bd3392f1f31f0cd (patch)
tree55afab772d868979b58dc1abf2f8ac577987befb /src
parent8cc4732448b0a8f5486f46ca754ee66df016a33d (diff)
downloadandroid_packages_apps_Trebuchet-98994c4a83e86e2444eb928a9bd3392f1f31f0cd.tar.gz
android_packages_apps_Trebuchet-98994c4a83e86e2444eb928a9bd3392f1f31f0cd.tar.bz2
android_packages_apps_Trebuchet-98994c4a83e86e2444eb928a9bd3392f1f31f0cd.zip
Remove RS_Kind info from element setup
Change-Id: Ia851229b6e107d4c19bd20c6acfef4f8fae280d1
Diffstat (limited to 'src')
-rw-r--r--src/com/android/launcher2/AllApps3D.java8
-rw-r--r--src/com/android/launcher2/ScriptField_VpConsts.java8
2 files changed, 8 insertions, 8 deletions
diff --git a/src/com/android/launcher2/AllApps3D.java b/src/com/android/launcher2/AllApps3D.java
index 6bbe0f7d0..36e19ceee 100644
--- a/src/com/android/launcher2/AllApps3D.java
+++ b/src/com/android/launcher2/AllApps3D.java
@@ -1220,11 +1220,11 @@ public class AllApps3D extends RSSurfaceView
mIcons = new Allocation[count];
mIconIds = new int[allocCount];
- mAllocIconIds = Allocation.createSized(sRS, Element.USER_I32(sRS), allocCount);
+ mAllocIconIds = Allocation.createSized(sRS, Element.I32(sRS), allocCount);
mLabels = new Allocation[count];
mLabelIds = new int[allocCount];
- mAllocLabelIds = Allocation.createSized(sRS, Element.USER_I32(sRS), allocCount);
+ mAllocLabelIds = Allocation.createSized(sRS, Element.I32(sRS), allocCount);
mScript.set_gIconCount(count);
for (int i=0; i < count; i++) {
@@ -1280,11 +1280,11 @@ public class AllApps3D extends RSSurfaceView
private void reallocAppsList(int count) {
Allocation[] icons = new Allocation[count];
int[] iconIds = new int[count];
- mAllocIconIds = Allocation.createSized(sRS, Element.USER_I32(sRS), count);
+ mAllocIconIds = Allocation.createSized(sRS, Element.I32(sRS), count);
Allocation[] labels = new Allocation[count];
int[] labelIds = new int[count];
- mAllocLabelIds = Allocation.createSized(sRS, Element.USER_I32(sRS), count);
+ mAllocLabelIds = Allocation.createSized(sRS, Element.I32(sRS), count);
final int oldCount = sRollo.mScript.get_gIconCount();
diff --git a/src/com/android/launcher2/ScriptField_VpConsts.java b/src/com/android/launcher2/ScriptField_VpConsts.java
index 1df75f862..c6411fe84 100644
--- a/src/com/android/launcher2/ScriptField_VpConsts.java
+++ b/src/com/android/launcher2/ScriptField_VpConsts.java
@@ -33,10 +33,10 @@ public class ScriptField_VpConsts
mItemArray = new Item[count];
Element.Builder eb = new Element.Builder(rs);
- eb.add(Element.createVector(rs, Element.DataType.FLOAT_32, 4), "Position");
- eb.add(Element.createVector(rs, Element.DataType.FLOAT_32, 4), "ScaleOffset");
- eb.add(Element.createVector(rs, Element.DataType.FLOAT_32, 2), "BendPos");
- eb.add(Element.createVector(rs, Element.DataType.FLOAT_32, 2), "ImgSize");
+ eb.add(Element.F32_4(rs), "Position");
+ eb.add(Element.F32_4(rs), "ScaleOffset");
+ eb.add(Element.F32_2(rs), "BendPos");
+ eb.add(Element.F32_2(rs), "ImgSize");
mElement = eb.create();
init(rs, count);