aboutsummaryrefslogtreecommitdiffstats
path: root/android/avd/hardware-properties.ini
diff options
context:
space:
mode:
authorDavid 'Digit' Turner <digit@android.com>2011-05-19 20:51:01 +0200
committerXavier Ducrohet <xav@android.com>2011-08-05 12:27:24 -0700
commitf490aee025b3bab5bcdb065e5fc1b1abecf16b97 (patch)
treeace0400c734e32b1516cad415be4aaa6b8f9880c /android/avd/hardware-properties.ini
parent97d15562536c28f5a8bb079994cc526412cf506e (diff)
downloadexternal_qemu-f490aee025b3bab5bcdb065e5fc1b1abecf16b97.zip
external_qemu-f490aee025b3bab5bcdb065e5fc1b1abecf16b97.tar.gz
external_qemu-f490aee025b3bab5bcdb065e5fc1b1abecf16b97.tar.bz2
Merge c80340 from master to r13: Move charmap to hardware properties
The name of the emulated charmap must be passed to the guest kernel because it is used by the guest input handling code to load the proper charmap files from the system partition. This mandates that the name becomes a hardware property for the sake of supporting proper snapshotting and ui/core separation. From now on, the charmap name found in a skin will be ignored completely. This shouldn't be a problem in practice because all skins used the default name (qwerty2) anyway. The only reason to change the default value would be if emulating a guest system image that depends on a different charmap during emulation. Change-Id: If571684000b159ae9e9849661c9ff18e19b4cc75
Diffstat (limited to 'android/avd/hardware-properties.ini')
-rw-r--r--android/avd/hardware-properties.ini12
1 files changed, 12 insertions, 0 deletions
diff --git a/android/avd/hardware-properties.ini b/android/avd/hardware-properties.ini
index dabf166..0e650bb 100644
--- a/android/avd/hardware-properties.ini
+++ b/android/avd/hardware-properties.ini
@@ -83,6 +83,18 @@ default = yes
abstract = Keyboard lid support
description = Whether the QWERTY keyboard can be opened/closed.
+# The name of the hardware charmap for this device.
+#
+# NOTE: This should always be the default 'qwerty2' unless you have
+# modified the system image accordingly. This name is sent to
+# the kernel at boot time. Using an incorrect name will result
+# in an unusable machine.
+name = hw.keyboard.charmap
+type = string
+default = qwerty2
+abstract = Keyboard charmap name
+description = Name of the system keyboard charmap file.
+
# DPad keys
name = hw.dPad
type = boolean