diff options
| author | The Android Open Source Project <initial-contribution@android.com> | 2009-01-15 16:12:10 -0800 |
|---|---|---|
| committer | The Android Open Source Project <initial-contribution@android.com> | 2009-01-15 16:12:10 -0800 |
| commit | 9266c558bf1d21ff647525ff99f7dadbca417309 (patch) | |
| tree | 1630b1ba80f4793caf39d865528e662bdb1037fe /include/ui | |
| parent | b798689749c64baba81f02e10cf2157c747d6b46 (diff) | |
| download | frameworks_base-9266c558bf1d21ff647525ff99f7dadbca417309.zip frameworks_base-9266c558bf1d21ff647525ff99f7dadbca417309.tar.gz frameworks_base-9266c558bf1d21ff647525ff99f7dadbca417309.tar.bz2 | |
auto import from //branches/cupcake/...@126645
Diffstat (limited to 'include/ui')
| -rw-r--r-- | include/ui/EventHub.h | 5 | ||||
| -rw-r--r-- | include/ui/Overlay.h | 6 | ||||
| -rw-r--r-- | include/ui/Surface.h | 1 | ||||
| -rw-r--r-- | include/ui/SurfaceComposerClient.h | 2 |
4 files changed, 8 insertions, 6 deletions
diff --git a/include/ui/EventHub.h b/include/ui/EventHub.h index 101a920..017c145 100644 --- a/include/ui/EventHub.h +++ b/include/ui/EventHub.h @@ -50,8 +50,9 @@ public: // bit fields for classes of devices. enum { CLASS_KEYBOARD = 0x00000001, - CLASS_TOUCHSCREEN = 0x00000002, - CLASS_TRACKBALL = 0x00000004 + CLASS_ALPHAKEY = 0x00000002, + CLASS_TOUCHSCREEN = 0x00000004, + CLASS_TRACKBALL = 0x00000008 }; uint32_t getDeviceClasses(int32_t deviceId) const; diff --git a/include/ui/Overlay.h b/include/ui/Overlay.h index 23cdee8..9c7bc47 100644 --- a/include/ui/Overlay.h +++ b/include/ui/Overlay.h @@ -54,7 +54,7 @@ private: virtual ~OverlayRef(); overlay_handle_t const *mOverlayHandle; - sp<IOverlay> mOverlayChanel; + sp<IOverlay> mOverlayChannel; uint32_t mWidth; uint32_t mHeight; int32_t mFormat; @@ -77,10 +77,10 @@ public: overlay_handle_t const* getHandleRef() const; /* blocks until an overlay buffer is available and return that buffer. */ - overlay_buffer_t dequeueBuffer(); + status_t dequeueBuffer(overlay_buffer_t* buffer); /* release the overlay buffer and post it */ - int queueBuffer(overlay_buffer_t buffer); + status_t queueBuffer(overlay_buffer_t buffer); /* returns the address of a given buffer if supported, NULL otherwise. */ void* getBufferAddress(overlay_buffer_t buffer); diff --git a/include/ui/Surface.h b/include/ui/Surface.h index 2e24f86..33953a9 100644 --- a/include/ui/Surface.h +++ b/include/ui/Surface.h @@ -92,6 +92,7 @@ private: friend class MediaRecorder; // mediaplayer needs access to ISurface for display friend class MediaPlayer; + friend class Test; const sp<ISurface>& getISurface() const { return mSurface; } // can't be copied diff --git a/include/ui/SurfaceComposerClient.h b/include/ui/SurfaceComposerClient.h index 3b875be..5d9222d 100644 --- a/include/ui/SurfaceComposerClient.h +++ b/include/ui/SurfaceComposerClient.h @@ -72,7 +72,7 @@ public: ); // ------------------------------------------------------------------------ - // Composer paramters + // Composer parameters // All composer parameters must be changed within a transaction // several surfaces can be updated in one transaction, all changes are // committed at once when the transaction is closed. |