diff options
| author | Mathias Agopian <mathias@google.com> | 2010-10-13 15:59:42 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-10-13 15:59:42 -0700 |
| commit | 5bfa3a34eaef759c3ec4def76f646eb1c0bf997f (patch) | |
| tree | db253b21d2e04cb6a1c74007eaf595d6edfbd864 /services/surfaceflinger/SurfaceFlinger.h | |
| parent | 27c7fb1a861776b4fdc2632697e4e25eee83617f (diff) | |
| parent | 011b5bcc0355338b7ff906656282a54ffaa04b5a (diff) | |
| download | frameworks_base-5bfa3a34eaef759c3ec4def76f646eb1c0bf997f.zip frameworks_base-5bfa3a34eaef759c3ec4def76f646eb1c0bf997f.tar.gz frameworks_base-5bfa3a34eaef759c3ec4def76f646eb1c0bf997f.tar.bz2 | |
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 '011b5bcc0355338b7ff906656282a54ffaa04b5a' into gingerbread-plus-aosp
* commit '011b5bcc0355338b7ff906656282a54ffaa04b5a':
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 f85a22b..d07a3ad 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); @@ -328,6 +329,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; @@ -389,6 +395,7 @@ private: bool mVisibleRegionsDirty; bool mDeferReleaseConsole; bool mFreezeDisplay; + bool mElectronBeamAnimation; int32_t mFreezeCount; nsecs_t mFreezeDisplayTime; Vector< sp<LayerBase> > mVisibleLayersSortedByZ; |