diff options
| author | Stephen Hines <srhines@google.com> | 2010-10-09 00:23:45 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-10-09 00:23:45 -0700 |
| commit | b41dbd6d0c79868a5ae408e35bd48a0f9690463c (patch) | |
| tree | e1185ba7a25289b980a950ff3a5082b7612b0950 /src | |
| parent | 9987a5c45e7d01a780d73b269bdce8d8a5309219 (diff) | |
| parent | b02af3811045a8b5d43dc62b2a2f5f50c184fff2 (diff) | |
| download | android_packages_apps_Trebuchet-b41dbd6d0c79868a5ae408e35bd48a0f9690463c.tar.gz android_packages_apps_Trebuchet-b41dbd6d0c79868a5ae408e35bd48a0f9690463c.tar.bz2 android_packages_apps_Trebuchet-b41dbd6d0c79868a5ae408e35bd48a0f9690463c.zip | |
Merge "Remove now unnecessary pragma rs export_var()."
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/launcher2/allapps.rs | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/com/android/launcher2/allapps.rs b/src/com/android/launcher2/allapps.rs index acee82bf0..a9727fb95 100644 --- a/src/com/android/launcher2/allapps.rs +++ b/src/com/android/launcher2/allapps.rs @@ -37,7 +37,6 @@ typedef struct VpConsts { VpConsts_t *vpConstants; -#pragma rs export_var(COLUMNS_PER_PAGE_PORTRAIT, ROWS_PER_PAGE_PORTRAIT, COLUMNS_PER_PAGE_LANDSCAPE, ROWS_PER_PAGE_LANDSCAPE, gIconCount, gSelectedIconIndex, gSelectedIconTexture, gHomeButton, gTargetPos, gPFTexNearest, gPFTexMip, gPFTexMipAlpha, gPVCurve, gPS, gSMCell, gIconIDs, gLabelIDs, vpConstants) #pragma rs export_func(move, moveTo, setZoom, fling) @@ -47,7 +46,7 @@ static float g_FrictionTable[9] = {10.f, 10.f, 11.f, 15.f, 15.f, 11.f, 10.f, 10. static float g_PhysicsTableSize = 7; static float gZoomTarget; -static float gTargetPos; +float gTargetPos; static float g_PosPage = 0.f; static float g_PosVelocity = 0.f; static float g_LastPositionX = 0.f; |