ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

am 9f6d18ca: am 04358138: Merge "[3095807] screen takes a long time to turn on" into gingerbread

Browse Source 
Merge commit '9f6d18cadf9ac50062063f5f5ff5de7f6895696a'

* commit '9f6d18cadf9ac50062063f5f5ff5de7f6895696a':
  [3095807] screen takes a long time to turn on
This commit is contained in:
Mathias Agopian 2010-10-16 08:58:35 -07:00 committed by Android Git Automerger
commit 0a96e3c31f
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
services/surfaceflinger/SurfaceFlinger.cpp
View File

@ -1946,8 +1946,8 @@ status_t SurfaceFlinger::electronBeamOnAnimationImplLocked()
} }
}; };
// the full animation is 24 frames // the full animation is 12 frames
const int nbFrames = 12; int nbFrames = 8;
s_curve_interpolator itr(nbFrames, 7.5f); s_curve_interpolator itr(nbFrames, 7.5f);
s_curve_interpolator itg(nbFrames, 8.0f); s_curve_interpolator itg(nbFrames, 8.0f);
s_curve_interpolator itb(nbFrames, 8.5f); s_curve_interpolator itb(nbFrames, 8.5f);
@ -1965,6 +1965,7 @@ status_t SurfaceFlinger::electronBeamOnAnimationImplLocked()
hw.flip(screenBounds); hw.flip(screenBounds);
} }
nbFrames = 4;
v_stretch vverts(hw_w, hw_h); v_stretch vverts(hw_w, hw_h);
glEnable(GL_BLEND); glEnable(GL_BLEND);
glBlendFunc(GL_ONE, GL_ONE); glBlendFunc(GL_ONE, GL_ONE);