am 2f5f3c1d: Merge "Issue #7341342 API request: way to determine current orientation..." into jb-mr2-dev

* commit '2f5f3c1d6302a11ad72f7a0229d1708d6c444ed3':
  Issue #7341342 API request: way to determine current orientation...
This commit is contained in:
Dianne Hackborn
2013-04-11 17:11:18 -07:00
committed by Android Git Automerger
2 changed files with 8 additions and 0 deletions

View File

@@ -121,6 +121,10 @@
<item>REVERSE_LANDSCAPE</item>
<item>REVERSE_PORTRAIT</item>
<item>FULL_SENSOR</item>
<item>USER_LANDSCAPE</item>
<item>USER_PORTRAIT</item>
<item>FULL_USER</item>
<item>LOCKED</item>
</string-array>
<!-- Used in view/Secure View examples -->

View File

@@ -46,6 +46,10 @@ public class ScreenOrientation extends Activity {
ActivityInfo.SCREEN_ORIENTATION_REVERSE_LANDSCAPE,
ActivityInfo.SCREEN_ORIENTATION_REVERSE_PORTRAIT,
ActivityInfo.SCREEN_ORIENTATION_FULL_SENSOR,
ActivityInfo.SCREEN_ORIENTATION_USER_LANDSCAPE,
ActivityInfo.SCREEN_ORIENTATION_USER_PORTRAIT,
ActivityInfo.SCREEN_ORIENTATION_FULL_USER,
ActivityInfo.SCREEN_ORIENTATION_LOCKED,
};
@Override