aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorXavier Ducrohet <xav@android.com>2011-10-04 10:41:26 -0700
committerXavier Ducrohet <xav@android.com>2011-10-04 10:43:10 -0700
commitfa0c8e25403290b545bb98735b1ece275c524361 (patch)
tree18e035859e7b1b4081d197d5ffbd4f10c5f966e7
parentee2e3ffc2d25f4491bf22f1c4483f919d5a61e4d (diff)
downloadexternal_qemu-fa0c8e25403290b545bb98735b1ece275c524361.zip
external_qemu-fa0c8e25403290b545bb98735b1ece275c524361.tar.gz
external_qemu-fa0c8e25403290b545bb98735b1ece275c524361.tar.bz2
New AVD property to control presence of hw main keys.
This allows injecting a new runtime property into the system running on the emulator to control whether to display the new software back/home keys. Change-Id: I2bf7cc5c291752090187463332219638e883d052
-rw-r--r--android/avd/hardware-properties.ini13
-rw-r--r--vl-android.c3
2 files changed, 12 insertions, 4 deletions
diff --git a/android/avd/hardware-properties.ini b/android/avd/hardware-properties.ini
index 8fb51b4..a2b05df 100644
--- a/android/avd/hardware-properties.ini
+++ b/android/avd/hardware-properties.ini
@@ -14,10 +14,8 @@
# - once to implement the hardware configuration loader
# (see android/avd/hw-config.h)
#
-# Hopefully, this file should also be read by a virtual device creation
-# tool/wizard to provide a nice user interface (hence the presence of
-# the 'abstract' and 'description' keys which are not currently used)
-#
+# It is also packaged by the SDK and parsed by tools to let the developers
+# create AVDs.
#
# NOTE: if you remove items from this file, be sure that you do not break
# the emulator build.
@@ -55,6 +53,13 @@ default = yes
abstract = Touch-screen support
description = Whether there is a touch screen or not on the device.
+# Hardware main keys (back/home)
+name = hw.mainKeys
+type = boolean
+default = yes
+abstract = Hardware Back/Home keys
+description = Whether there are hardware back/home keys on the device.
+
# Trackball support
name = hw.trackBall
type = boolean
diff --git a/vl-android.c b/vl-android.c
index a0041dc..322ddca 100644
--- a/vl-android.c
+++ b/vl-android.c
@@ -3689,6 +3689,9 @@ int main(int argc, char **argv, char **envp)
hwLcd_setBootProperty(density);
}
+ /* Initialize presence of hardware nav button */
+ boot_property_add("qemu.hw.mainkeys", android_hw->hw_mainKeys ? "1" : "0");
+
/* Initialize TCP dump */
if (android_op_tcpdump) {
if (qemu_tcpdump_start(android_op_tcpdump) < 0) {