diff options
| author | Dianne Hackborn <hackbod@google.com> | 2011-06-14 12:17:35 -0700 |
|---|---|---|
| committer | Dianne Hackborn <hackbod@google.com> | 2011-06-14 12:17:35 -0700 |
| commit | 711516d140390aeec9e3eefb8fdb2681c3454980 (patch) | |
| tree | f73caa003154567d63dfa36089d443f51bed52df /core/java/android/content | |
| parent | f0b517d9d287e86e6e57a372ddcb070cec1fe1c0 (diff) | |
| parent | 77fc8b8066709a1d09a159901fd65c49b5e6eaa5 (diff) | |
| download | frameworks_base-711516d140390aeec9e3eefb8fdb2681c3454980.zip frameworks_base-711516d140390aeec9e3eefb8fdb2681c3454980.tar.gz frameworks_base-711516d140390aeec9e3eefb8fdb2681c3454980.tar.bz2 | |
resolved conflicts for merge of 77fc8b80 to master
Change-Id: I014f9a886d6f05607d2a5d101ad2052a6841ee8d
Diffstat (limited to 'core/java/android/content')
| -rw-r--r-- | core/java/android/content/pm/PackageManager.java | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/core/java/android/content/pm/PackageManager.java b/core/java/android/content/pm/PackageManager.java index 33c2937..1cd8ec0 100644 --- a/core/java/android/content/pm/PackageManager.java +++ b/core/java/android/content/pm/PackageManager.java @@ -925,6 +925,26 @@ public abstract class PackageManager { /** * Feature for {@link #getSystemAvailableFeatures} and + * {@link #hasSystemFeature}: The device supports portrait orientation + * screens. For backwards compatibility, you can assume that if neither + * this nor {@link #FEATURE_SCREEN_LANDSCAPE} is set then the device supports + * both portrait and landscape. + */ + @SdkConstant(SdkConstantType.FEATURE) + public static final String FEATURE_SCREEN_PORTRAIT = "android.hardware.screen.portrait"; + + /** + * Feature for {@link #getSystemAvailableFeatures} and + * {@link #hasSystemFeature}: The device supports landscape orientation + * screens. For backwards compatibility, you can assume that if neither + * this nor {@link #FEATURE_SCREEN_PORTRAIT} is set then the device supports + * both portrait and landscape. + */ + @SdkConstant(SdkConstantType.FEATURE) + public static final String FEATURE_SCREEN_LANDSCAPE = "android.hardware.screen.landscape"; + + /** + * Feature for {@link #getSystemAvailableFeatures} and * {@link #hasSystemFeature}: The device supports live wallpapers. */ @SdkConstant(SdkConstantType.FEATURE) |