diff options
| author | Jamie Gennis <jgennis@google.com> | 2011-10-10 15:48:06 -0700 |
|---|---|---|
| committer | Jamie Gennis <jgennis@google.com> | 2011-10-11 13:34:01 -0700 |
| commit | b8d69a55f1c187a35ac41e69de63251f5501b6f4 (patch) | |
| tree | bfb2ce9103bd0436b43a2d0db8f0ca8b856ab0af /include | |
| parent | 3829bc3c35750fed49b8700d84c7f6c0ec9e96af (diff) | |
| download | frameworks_native-b8d69a55f1c187a35ac41e69de63251f5501b6f4.zip frameworks_native-b8d69a55f1c187a35ac41e69de63251f5501b6f4.tar.gz frameworks_native-b8d69a55f1c187a35ac41e69de63251f5501b6f4.tar.bz2 | |
SurfaceFlinger: update orientation via transactions
This change merges the ISurfaceComposer::setOrientation functionality
into ISurfaceComposer::setTransactionState. It enables the window
manager to atomically update both the display orientation and the
position and size of the windows in a single transaction with
SurfaceFlinger.
Bug: 5439574
Change-Id: I18a8ccc564d7d760ef8afb2d015ccdb7a7963900
Diffstat (limited to 'include')
| -rw-r--r-- | include/surfaceflinger/ISurfaceComposer.h | 12 | ||||
| -rw-r--r-- | include/surfaceflinger/SurfaceComposerClient.h | 1 |
2 files changed, 3 insertions, 10 deletions
diff --git a/include/surfaceflinger/ISurfaceComposer.h b/include/surfaceflinger/ISurfaceComposer.h index e0f4cf9..ea022a6 100644 --- a/include/surfaceflinger/ISurfaceComposer.h +++ b/include/surfaceflinger/ISurfaceComposer.h @@ -80,6 +80,7 @@ public: eOrientation90 = 1, eOrientation180 = 2, eOrientation270 = 3, + eOrientationUnchanged = 4, eOrientationSwapMask = 0x01 }; @@ -101,15 +102,8 @@ public: virtual sp<IMemoryHeap> getCblk() const = 0; /* open/close transactions. requires ACCESS_SURFACE_FLINGER permission */ - virtual void setTransactionState(const Vector<ComposerState>& state) = 0; - - /* [un]freeze display. requires ACCESS_SURFACE_FLINGER permission */ - virtual status_t freezeDisplay(DisplayID dpy, uint32_t flags) = 0; - virtual status_t unfreezeDisplay(DisplayID dpy, uint32_t flags) = 0; - - /* Set display orientation. requires ACCESS_SURFACE_FLINGER permission - * No flags are currently defined. Set flags to 0. */ - virtual int setOrientation(DisplayID dpy, int orientation, uint32_t flags) = 0; + virtual void setTransactionState(const Vector<ComposerState>& state, + int orientation) = 0; /* signal that we're done booting. * Requires ACCESS_SURFACE_FLINGER permission diff --git a/include/surfaceflinger/SurfaceComposerClient.h b/include/surfaceflinger/SurfaceComposerClient.h index ace0735..14e5b23 100644 --- a/include/surfaceflinger/SurfaceComposerClient.h +++ b/include/surfaceflinger/SurfaceComposerClient.h @@ -195,4 +195,3 @@ public: }; // namespace android #endif // ANDROID_SF_SURFACE_COMPOSER_CLIENT_H - |