Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Merge commit '043581382e43acbe29a8a62420bc765f49a9dd90' into gingerbread-plus-aosp

* commit '043581382e43acbe29a8a62420bc765f49a9dd90':
  [3095807] screen takes a long time to turn on
This commit is contained in:
Mathias Agopian
2010-10-14 16:51:05 -07:00
committed by Android Git Automerger
parent 9bb8e5cc3e 043581382e
commit 9f6d18cadf
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
services/surfaceflinger/SurfaceFlinger.cpp
View File

@@ -1839,8 +1839,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);
@@ -1858,6 +1858,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);