diff options
| author | The Android Open Source Project <initial-contribution@android.com> | 2009-03-27 15:38:40 -0700 |
|---|---|---|
| committer | The Android Open Source Project <initial-contribution@android.com> | 2009-03-27 15:38:40 -0700 |
| commit | e1861133d51b9e6a6f658eb366630ad4f4d3ff8f (patch) | |
| tree | 046aaac6d455ccd57d38f3a13df44ecd13ac0322 /include/ui/ISurfaceComposer.h | |
| parent | d91450e1169b3a57b3507fe86d947de05549f4ed (diff) | |
| parent | 3f2fd987b230740e1b28ccb541d1181cb2187ae6 (diff) | |
| download | frameworks_base-e1861133d51b9e6a6f658eb366630ad4f4d3ff8f.zip frameworks_base-e1861133d51b9e6a6f658eb366630ad4f4d3ff8f.tar.gz frameworks_base-e1861133d51b9e6a6f658eb366630ad4f4d3ff8f.tar.bz2 | |
Merge commit 'korg/cupcake'
Conflicts:
core/java/android/webkit/WebView.java
core/java/android/widget/TwoLineListItem.java
preloaded-classes
Diffstat (limited to 'include/ui/ISurfaceComposer.h')
| -rw-r--r-- | include/ui/ISurfaceComposer.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/include/ui/ISurfaceComposer.h b/include/ui/ISurfaceComposer.h index f9eeb30..5c64b22 100644 --- a/include/ui/ISurfaceComposer.h +++ b/include/ui/ISurfaceComposer.h @@ -81,6 +81,11 @@ public: eOrientation270 = 3, eOrientationSwapMask = 0x01 }; + + // flags for setOrientation + enum { + eOrientationAnimationDisable = 0x00000001 + }; /* create connection with surface flinger, requires * ACCESS_SURFACE_FLINGER permission @@ -100,7 +105,7 @@ public: virtual status_t unfreezeDisplay(DisplayID dpy, uint32_t flags) = 0; /* Set display orientation. recquires ACCESS_SURFACE_FLINGER permission */ - virtual int setOrientation(DisplayID dpy, int orientation) = 0; + virtual int setOrientation(DisplayID dpy, int orientation, uint32_t flags) = 0; /* signal that we're done booting. * recquires ACCESS_SURFACE_FLINGER permission |