summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorMathias Agopian <>2009-03-27 16:10:37 -0700
committerThe Android Open Source Project <initial-contribution@android.com>2009-03-27 16:10:37 -0700
commit66b8ec99c5fc505877b3711a52e284bbb451f836 (patch)
tree7551907d6083bcd455632f84f528cbd4d06ffd04 /include
parent1e880dba106b14619c3eaf94c5dc2d1a943645bc (diff)
downloadframeworks_base-66b8ec99c5fc505877b3711a52e284bbb451f836.zip
frameworks_base-66b8ec99c5fc505877b3711a52e284bbb451f836.tar.gz
frameworks_base-66b8ec99c5fc505877b3711a52e284bbb451f836.tar.bz2
AI 143171: am: CL 142873 fix [1732012] Only show screen rotation animation when triggered by sensor
Original author: mathias Merged from: //branches/cupcake/... Automated import of CL 143171
Diffstat (limited to 'include')
-rw-r--r--include/ui/ISurfaceComposer.h7
-rw-r--r--include/ui/SurfaceComposerClient.h2
2 files changed, 7 insertions, 2 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
diff --git a/include/ui/SurfaceComposerClient.h b/include/ui/SurfaceComposerClient.h
index 5d9222d..76a3b55 100644
--- a/include/ui/SurfaceComposerClient.h
+++ b/include/ui/SurfaceComposerClient.h
@@ -97,7 +97,7 @@ public:
static status_t unfreezeDisplay(DisplayID dpy, uint32_t flags = 0);
//! Set the orientation of the given display
- static int setOrientation(DisplayID dpy, int orientation);
+ static int setOrientation(DisplayID dpy, int orientation, uint32_t flags);
// Query the number of displays
static ssize_t getNumberOfDisplays();