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 /data/etc | |
| 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 'data/etc')
| -rw-r--r-- | data/etc/handheld_core_hardware.xml | 2 | ||||
| -rw-r--r-- | data/etc/tablet_core_hardware.xml | 2 |
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 |