diff options
| author | Mathias Agopian <mathias@google.com> | 2010-10-15 08:33:43 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-10-15 08:33:43 -0700 |
| commit | e33a35f02576b482a5ac4891a78f6e72fb4c0dea (patch) | |
| tree | 7e9ccef31a0f35a75e4e7b892a1ac363140f6acc /services/surfaceflinger/SurfaceFlinger.h | |
| parent | 2222fb317ada2df48e22da78f35f06a27d9255af (diff) | |
| parent | d91595b0004d24d0183fcbc594c693105b6c906b (diff) | |
| download | frameworks_native-e33a35f02576b482a5ac4891a78f6e72fb4c0dea.zip frameworks_native-e33a35f02576b482a5ac4891a78f6e72fb4c0dea.tar.gz frameworks_native-e33a35f02576b482a5ac4891a78f6e72fb4c0dea.tar.bz2 | |
am 5bfa3a34: am 011b5bcc: Merge "implement part of [3094280] New animation for screen on and screen off add support for screen on animation" into gingerbread
Merge commit '5bfa3a34eaef759c3ec4def76f646eb1c0bf997f'
* commit '5bfa3a34eaef759c3ec4def76f646eb1c0bf997f':
implement part of [3094280] New animation for screen on and screen off
Diffstat (limited to 'services/surfaceflinger/SurfaceFlinger.h')
| -rw-r--r-- | services/surfaceflinger/SurfaceFlinger.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/services/surfaceflinger/SurfaceFlinger.h b/services/surfaceflinger/SurfaceFlinger.h index 3470d87..2ebcc36 100644 --- a/services/surfaceflinger/SurfaceFlinger.h +++ b/services/surfaceflinger/SurfaceFlinger.h @@ -202,6 +202,7 @@ public: uint32_t reqWidth, uint32_t reqHeight); virtual status_t turnElectronBeamOff(int32_t mode); + virtual status_t turnElectronBeamOn(int32_t mode); void screenReleased(DisplayID dpy); void screenAcquired(DisplayID dpy); @@ -329,6 +330,11 @@ private: uint32_t reqWidth = 0, uint32_t reqHeight = 0); status_t turnElectronBeamOffImplLocked(); + status_t turnElectronBeamOnImplLocked(); + status_t electronBeamOffAnimationImplLocked(); + status_t electronBeamOnAnimationImplLocked(); + status_t renderScreenToTextureLocked(DisplayID dpy, + GLuint* textureName, GLfloat* uOut, GLfloat* vOut); friend class FreezeLock; sp<FreezeLock> getFreezeLock() const; @@ -391,6 +397,7 @@ private: bool mHwWorkListDirty; bool mDeferReleaseConsole; bool mFreezeDisplay; + bool mElectronBeamAnimation; int32_t mFreezeCount; nsecs_t mFreezeDisplayTime; Vector< sp<LayerBase> > mVisibleLayersSortedByZ; |