Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9f6d18ca authored by Mathias Agopian's avatar Mathias Agopian Committed by Android Git Automerger
Browse files

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

Merge commit '04358138' into gingerbread-plus-aosp

* commit '04358138':
  [3095807] screen takes a long time to turn on
parents 9bb8e5cc 04358138

services/surfaceflinger/SurfaceFlinger.cpp

+3 −2
Original line number Diff line number Diff line
@@ -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);