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 /include | |
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 'include')
-rw-r--r-- | include/surfaceflinger/ISurfaceComposer.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/include/surfaceflinger/ISurfaceComposer.h b/include/surfaceflinger/ISurfaceComposer.h index 1a1821c..de447be 100644 --- a/include/surfaceflinger/ISurfaceComposer.h +++ b/include/surfaceflinger/ISurfaceComposer.h @@ -119,6 +119,7 @@ public: uint32_t reqWidth, uint32_t reqHeight) = 0; virtual status_t turnElectronBeamOff(int32_t mode) = 0; + virtual status_t turnElectronBeamOn(int32_t mode) = 0; /* Signal surfaceflinger that there might be some work to do * This is an ASYNCHRONOUS call. @@ -145,7 +146,8 @@ public: UNFREEZE_DISPLAY, SIGNAL, CAPTURE_SCREEN, - TURN_ELECTRON_BEAM_OFF + TURN_ELECTRON_BEAM_OFF, + TURN_ELECTRON_BEAM_ON }; virtual status_t onTransact( uint32_t code, |