diff options
| author | Dianne Hackborn <hackbod@google.com> | 2013-04-12 00:08:12 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-04-12 00:08:13 +0000 |
| commit | 77216642884d5131290803776b0fce4d68128e97 (patch) | |
| tree | 11c8e971e1ad79d88b4e3c72db1596dfd9384d4a /core/java/android/content/pm | |
| parent | b7e6a4433bda6c59540ffc51061aff5cc3d10166 (diff) | |
| parent | b9ec1ac51b631c4efc9b7a7e7a2b28882105ffa3 (diff) | |
| download | frameworks_base-77216642884d5131290803776b0fce4d68128e97.zip frameworks_base-77216642884d5131290803776b0fce4d68128e97.tar.gz frameworks_base-77216642884d5131290803776b0fce4d68128e97.tar.bz2 | |
Merge "Implement #7341342 API request: way to determine current orientation..." into jb-mr2-dev
Diffstat (limited to 'core/java/android/content/pm')
| -rw-r--r-- | core/java/android/content/pm/ActivityInfo.java | 30 |
1 files changed, 29 insertions, 1 deletions
diff --git a/core/java/android/content/pm/ActivityInfo.java b/core/java/android/content/pm/ActivityInfo.java index 8f3b62d..7ccae76 100644 --- a/core/java/android/content/pm/ActivityInfo.java +++ b/core/java/android/content/pm/ActivityInfo.java @@ -279,6 +279,30 @@ public class ActivityInfo extends ComponentInfo public static final int SCREEN_ORIENTATION_FULL_SENSOR = 10; /** + * Constant corresponding to <code>userLandscape</code> in + * the {@link android.R.attr#screenOrientation} attribute. + */ + public static final int SCREEN_ORIENTATION_USER_LANDSCAPE = 11; + + /** + * Constant corresponding to <code>userPortrait</code> in + * the {@link android.R.attr#screenOrientation} attribute. + */ + public static final int SCREEN_ORIENTATION_USER_PORTRAIT = 12; + + /** + * Constant corresponding to <code>fullUser</code> in + * the {@link android.R.attr#screenOrientation} attribute. + */ + public static final int SCREEN_ORIENTATION_FULL_USER = 13; + + /** + * Constant corresponding to <code>locked</code> in + * the {@link android.R.attr#screenOrientation} attribute. + */ + public static final int SCREEN_ORIENTATION_LOCKED = 14; + + /** * The preferred screen orientation this activity would like to run in. * From the {@link android.R.attr#screenOrientation} attribute, one of * {@link #SCREEN_ORIENTATION_UNSPECIFIED}, @@ -292,7 +316,11 @@ public class ActivityInfo extends ComponentInfo * {@link #SCREEN_ORIENTATION_SENSOR_PORTRAIT}, * {@link #SCREEN_ORIENTATION_REVERSE_LANDSCAPE}, * {@link #SCREEN_ORIENTATION_REVERSE_PORTRAIT}, - * {@link #SCREEN_ORIENTATION_FULL_SENSOR}. + * {@link #SCREEN_ORIENTATION_FULL_SENSOR}, + * {@link #SCREEN_ORIENTATION_USER_LANDSCAPE}, + * {@link #SCREEN_ORIENTATION_USER_PORTRAIT}, + * {@link #SCREEN_ORIENTATION_FULL_USER}, + * {@link #SCREEN_ORIENTATION_LOCKED}, */ public int screenOrientation = SCREEN_ORIENTATION_UNSPECIFIED; |