diff options
| author | Dianne Hackborn <hackbod@google.com> | 2010-10-04 14:52:12 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-10-04 14:52:12 -0700 |
| commit | 458fc5f52e25d7a8b4e482010711aed66f0b4999 (patch) | |
| tree | 036fcf09abaff021cf10b4210d8495b4c5282d1a /core/res | |
| parent | 33a4c77218e4513268be8d5ce2af6f746976706b (diff) | |
| parent | e5439f228f603f60febe058f633d91d5af2fff76 (diff) | |
| download | frameworks_base-458fc5f52e25d7a8b4e482010711aed66f0b4999.zip frameworks_base-458fc5f52e25d7a8b4e482010711aed66f0b4999.tar.gz frameworks_base-458fc5f52e25d7a8b4e482010711aed66f0b4999.tar.bz2 | |
Merge "Fix issue #3041660: Camera image flips upside down when rotating device" into gingerbread
Diffstat (limited to 'core/res')
| -rw-r--r-- | core/res/res/values/attrs_manifest.xml | 22 |
1 files changed, 20 insertions, 2 deletions
diff --git a/core/res/res/values/attrs_manifest.xml b/core/res/res/values/attrs_manifest.xml index a8c00a6..298463a 100644 --- a/core/res/res/values/attrs_manifest.xml +++ b/core/res/res/values/attrs_manifest.xml @@ -495,10 +495,10 @@ orientation will changed based on how the user rotates the device --> <enum name="unspecified" value="-1" /> <!-- Would like to have the screen in a landscape orientation: that - is, with the display wider than it is tall. --> + is, with the display wider than it is tall, ignoring sensor data. --> <enum name="landscape" value="0" /> <!-- Would like to have the screen in a portrait orientation: that - is, with the display taller than it is wide. --> + is, with the display taller than it is wide, ignoring sensor data. --> <enum name="portrait" value="1" /> <!-- Use the user's current preferred orientation of the handset. --> <enum name="user" value="2" /> @@ -511,6 +511,24 @@ <!-- Always ignore orientation determined by orientation sensor: the display will not rotate when the user moves the device. --> <enum name="nosensor" value="5" /> + <!-- Would like to have the screen in landscape orientation, but can + use the sensor to change which direction the screen is facing. --> + <enum name="sensorLandscape" value="6" /> + <!-- Would like to have the screen in portrait orientation, but can + use the sensor to change which direction the screen is facing. --> + <enum name="sensorPortait" value="7" /> + <!-- Would like to have the screen in landscape orientation, turned in + the opposite direction from normal landscape. --> + <enum name="reverseLandscape" value="8" /> + <!-- Would like to have the screen in portrait orientation, turned in + the opposite direction from normal portrait. --> + <enum name="reversePortait" value="9" /> + <!-- Orientation is determined by a physical orientation sensor: + the display will rotate based on how the user moves the device. + This allows any of the 4 possible rotations, regardless of what + the device will normally do (for example some devices won't + normally use 180 degree rotation). --> + <enum name="fullSensor" value="10" /> </attr> <!-- Specify one or more configuration changes that the activity will |