summaryrefslogtreecommitdiffstats
path: root/carousel/java
diff options
context:
space:
mode:
authorStephen Hines <srhines@google.com>2010-11-17 17:27:16 -0800
committerStephen Hines <srhines@google.com>2010-11-18 14:11:48 -0800
commit370b177eb74cd8a7d9a2ab06a5ee8bb3ed25f74f (patch)
tree89cc1a39a029b5d2a086d2671d0d3b33932d62a9 /carousel/java
parent14d2c1ec52bb04b5120c2bfdd1a8811a238573ce (diff)
downloadandroid_frameworks_ex-370b177eb74cd8a7d9a2ab06a5ee8bb3ed25f74f.tar.gz
android_frameworks_ex-370b177eb74cd8a7d9a2ab06a5ee8bb3ed25f74f.tar.bz2
android_frameworks_ex-370b177eb74cd8a7d9a2ab06a5ee8bb3ed25f74f.zip
Mark non-exported functions as static.
Change-Id: I99ab499fa1208cb322ce2dffecd909f01693c158
Diffstat (limited to 'carousel/java')
-rw-r--r--carousel/java/com/android/ex/carousel/carousel.rs10
1 files changed, 5 insertions, 5 deletions
diff --git a/carousel/java/com/android/ex/carousel/carousel.rs b/carousel/java/com/android/ex/carousel/carousel.rs
index 73d6bc6..5f33bc9 100644
--- a/carousel/java/com/android/ex/carousel/carousel.rs
+++ b/carousel/java/com/android/ex/carousel/carousel.rs
@@ -297,7 +297,7 @@ void setRadius(float rad)
radius = carouselCylinder.radius = rad;
}
-void initCard(Card_t* card)
+static void initCard(Card_t* card)
{
// Object refs are always initilized cleared.
static const float2 zero = {0.0f, 0.0f};
@@ -327,7 +327,7 @@ void createCards(int start, int total)
}
// Computes an alpha value for a card using elapsed time and constant fadeInDuration
-float getAnimatedAlpha(int64_t startTime, int64_t currentTime)
+static float getAnimatedAlpha(int64_t startTime, int64_t currentTime)
{
double timeElapsed = (double) (currentTime - startTime); // in ms
double alpha = (double) timeElapsed / fadeInDuration;
@@ -950,7 +950,7 @@ static float deltaTimeInSeconds(int64_t current)
return (lastTime > 0L) ? (float) (current - lastTime) / 1000.0f : 0.0f;
}
-int doSelection(float x, float y)
+static int doSelection(float x, float y)
{
Ray ray;
if (makeRayForPixelAt(&ray, &camera, x, y)) {
@@ -960,11 +960,11 @@ int doSelection(float x, float y)
return -1;
}
-void sendAnimationStarted() {
+static void sendAnimationStarted() {
rsSendToClient(CMD_ANIMATION_STARTED);
}
-void sendAnimationFinished() {
+static void sendAnimationFinished() {
float data[1];
data[0] = radiansToCarouselRotationAngle(bias);
rsSendToClient(CMD_ANIMATION_FINISHED, (int*) data, sizeof(data));