summaryrefslogtreecommitdiffstats
path: root/data/etc
diff options
context:
space:
mode:
authorDianne Hackborn <hackbod@google.com>2011-06-14 11:40:06 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2011-06-14 11:40:06 -0700
commit77fc8b8066709a1d09a159901fd65c49b5e6eaa5 (patch)
tree5a7b35359f2f30947331667e5acbddab9140d558 /data/etc
parentaabe5f46846a45163be874dca2d19910ce38c232 (diff)
parent6c0533f994e7991b3bd60cab48362e8e2e6d86f0 (diff)
downloadframeworks_base-77fc8b8066709a1d09a159901fd65c49b5e6eaa5.zip
frameworks_base-77fc8b8066709a1d09a159901fd65c49b5e6eaa5.tar.gz
frameworks_base-77fc8b8066709a1d09a159901fd65c49b5e6eaa5.tar.bz2
am 6c0533f9: am c5193c62: Merge "Add new landscape and portrait orientation features." into honeycomb-mr2
* commit '6c0533f994e7991b3bd60cab48362e8e2e6d86f0': Add new landscape and portrait orientation features.
Diffstat (limited to 'data/etc')
-rw-r--r--data/etc/handheld_core_hardware.xml2
-rw-r--r--data/etc/tablet_core_hardware.xml2
2 files changed, 4 insertions, 0 deletions
diff --git a/data/etc/handheld_core_hardware.xml b/data/etc/handheld_core_hardware.xml
index 7f87b79..9d2a0cb 100644
--- a/data/etc/handheld_core_hardware.xml
+++ b/data/etc/handheld_core_hardware.xml
@@ -31,6 +31,8 @@
<feature name="android.hardware.bluetooth" />
<feature name="android.hardware.touchscreen" />
<feature name="android.hardware.microphone" />
+ <feature name="android.hardware.screen.portrait" />
+ <feature name="android.hardware.screen.landscape" />
<!-- devices with GPS must include android.hardware.location.gps.xml -->
<!-- devices with an autofocus camera and/or flash must include either
android.hardware.camera.autofocus.xml or
diff --git a/data/etc/tablet_core_hardware.xml b/data/etc/tablet_core_hardware.xml
index 952d078..bf29fe4 100644
--- a/data/etc/tablet_core_hardware.xml
+++ b/data/etc/tablet_core_hardware.xml
@@ -32,6 +32,8 @@
<feature name="android.hardware.touchscreen.multitouch" />
<feature name="android.hardware.touchscreen.multitouch.distinct" />
<feature name="android.hardware.microphone" />
+ <feature name="android.hardware.screen.portrait" />
+ <feature name="android.hardware.screen.landscape" />
<!-- devices with GPS must include android.hardware.location.gps.xml -->
<!-- devices with a rear-facing camera must include one of these as appropriate:
android.hardware.camera.xml or