summaryrefslogtreecommitdiff
path: root/services/surfaceflinger/SurfaceFlinger.cpp
diff options
context:
space:
mode:
author Mathias Agopian <mathias@google.com> 2010-10-14 16:49:05 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 2010-10-14 16:49:05 -0700
commit17b47c4fe6619f20f40bf01df9cffe82c0fb998d (patch)
tree6e3fe9a1d54c3154c11a1dcd40974f89a3ddd18f /services/surfaceflinger/SurfaceFlinger.cpp
parent1c6c04a1a65934eda17cdfe71cdcbb2efb2fe2b6 (diff)
parenta6546e5af4ce0cff01cd13605fc3eb16325feac3 (diff)
Merge "[3095807] screen takes a long time to turn on" into gingerbread
Diffstat (limited to 'services/surfaceflinger/SurfaceFlinger.cpp')
-rw-r--r--services/surfaceflinger/SurfaceFlinger.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/services/surfaceflinger/SurfaceFlinger.cpp b/services/surfaceflinger/SurfaceFlinger.cpp
index e37e446d58..a9b39659f6 100644
--- a/services/surfaceflinger/SurfaceFlinger.cpp
+++ b/services/surfaceflinger/SurfaceFlinger.cpp
@@ -1839,8 +1839,8 @@ status_t SurfaceFlinger::electronBeamOnAnimationImplLocked()
}
};
- // the full animation is 24 frames
- const int nbFrames = 12;
+ // the full animation is 12 frames
+ int nbFrames = 8;
s_curve_interpolator itr(nbFrames, 7.5f);
s_curve_interpolator itg(nbFrames, 8.0f);
s_curve_interpolator itb(nbFrames, 8.5f);
@@ -1858,6 +1858,7 @@ status_t SurfaceFlinger::electronBeamOnAnimationImplLocked()
hw.flip(screenBounds);
}
+ nbFrames = 4;
v_stretch vverts(hw_w, hw_h);
glEnable(GL_BLEND);
glBlendFunc(GL_ONE, GL_ONE);