From 1b982908b96e88b56c4bdd8bbb31bdade7571357 Mon Sep 17 00:00:00 2001 From: Ethan Chen Date: Thu, 24 Jul 2014 23:04:42 -0700 Subject: [PATCH] msm8974-common: Clean up Samsung device inheritance * Remove duplicate keylayouts * Move media_codecs to platform tree * Unconditionally build consumerir * Move postrecoveryboot to qcom-common * Move common msm8974 HAL/packages to platform tree * Move wifi config to device trees * Use nested cm.dependencies * Generate firmware symlinks at compile time * Move egl.cfg to msm8974-common * Move QCOM_BSP to platform repos * Move telephony permissions to device * Move reboot to download option to qcom-common * Move common overlay options to qcom-common Change-Id: I493dcf24269e852e7819c045dc3afc5c47da176a --- Android.mk | 190 +++++ BoardConfigCommon.mk | 150 ++-- cm.dependencies | 18 + configs/egl.cfg | 2 + configs/media_codecs.xml | 169 +++++ consumerir/Android.mk | 4 - keychars/Generic.kcm | 672 ------------------ keychars/Virtual.kcm | 544 -------------- keylayout/AVRCP.kl | 23 - keylayout/Generic.kl | 423 ----------- keylayout/Vendor_045e_Product_028e.kl | 46 -- keylayout/Vendor_046d_Product_c216.kl | 37 - keylayout/Vendor_046d_Product_c294.kl | 53 -- keylayout/Vendor_046d_Product_c299.kl | 62 -- keylayout/Vendor_046d_Product_c532.kl | 133 ---- keylayout/Vendor_054c_Product_0268.kl | 76 -- keylayout/Vendor_05ac_Product_0239.kl | 119 ---- keylayout/Vendor_22b8_Product_093d.kl | 105 --- msm8974.mk | 168 +++-- .../base/core/res/res/values/arrays.xml | 37 - .../base/core/res/res/values/config.xml | 31 - .../base/core/res/res/values/strings.xml | 25 - recovery/postrecoveryboot.sh | 11 - 23 files changed, 545 insertions(+), 2553 deletions(-) create mode 100644 cm.dependencies create mode 100644 configs/egl.cfg create mode 100644 configs/media_codecs.xml delete mode 100644 keychars/Generic.kcm delete mode 100644 keychars/Virtual.kcm delete mode 100644 keylayout/AVRCP.kl delete mode 100644 keylayout/Generic.kl delete mode 100644 keylayout/Vendor_045e_Product_028e.kl delete mode 100644 keylayout/Vendor_046d_Product_c216.kl delete mode 100644 keylayout/Vendor_046d_Product_c294.kl delete mode 100644 keylayout/Vendor_046d_Product_c299.kl delete mode 100644 keylayout/Vendor_046d_Product_c532.kl delete mode 100644 keylayout/Vendor_054c_Product_0268.kl delete mode 100644 keylayout/Vendor_05ac_Product_0239.kl delete mode 100644 keylayout/Vendor_22b8_Product_093d.kl delete mode 100644 overlay/frameworks/base/core/res/res/values/arrays.xml delete mode 100644 overlay/frameworks/base/core/res/res/values/config.xml delete mode 100644 overlay/frameworks/base/core/res/res/values/strings.xml delete mode 100644 recovery/postrecoveryboot.sh diff --git a/Android.mk b/Android.mk index 5672039..2dcafe7 100644 --- a/Android.mk +++ b/Android.mk @@ -25,5 +25,195 @@ LOCAL_PATH := $(call my-dir) ifeq ($(BOARD_VENDOR),samsung) ifeq ($(TARGET_BOARD_PLATFORM),msm8974) include $(call all-subdir-makefiles,$(LOCAL_PATH)) + +include $(CLEAR_VARS) + +ADSP_IMAGES := \ + adsp.b00 adsp.b01 adsp.b02 adsp.b03 adsp.b04 adsp.b05 adsp.b06 \ + adsp.b08 adsp.b09 adsp.b10 adsp.b11 adsp.b12 adsp.b13 adsp.mdt + +ADSP_SYMLINKS := $(addprefix $(TARGET_OUT_ETC)/firmware/,$(notdir $(ADSP_IMAGES))) +$(ADSP_SYMLINKS): $(LOCAL_INSTALLED_MODULE) + @echo "ADSP firmware link: $@" + @mkdir -p $(dir $@) + @rm -rf $@ + $(hide) ln -sf /firmware-modem/image/$(notdir $@) $@ + +ALL_DEFAULT_INSTALLED_MODULES += $(ADSP_SYMLINKS) + +DTCPIP_IMAGES := \ + dtcpip.b00 dtcpip.b01 dtcpip.b02 dtcpip.b03 dtcpip.mdt + +DTCPIP_SYMLINKS := $(addprefix $(TARGET_OUT_ETC)/firmware/,$(notdir $(DTCPIP_IMAGES))) +$(DTCPIP_SYMLINKS): $(LOCAL_INSTALLED_MODULE) + @echo "DTCPIP firmware link: $@" + @mkdir -p $(dir $@) + @rm -rf $@ + $(hide) ln -sf /firmware/image/$(notdir $@) $@ + +ALL_DEFAULT_INSTALLED_MODULES += $(DTCPIP_SYMLINKS) + +KM_IMAGES := \ + keymaste.b00 keymaste.b01 keymaste.b02 keymaste.b03 keymaste.mdt + +KM_SYMLINKS := $(addprefix $(TARGET_OUT_ETC)/firmware/,$(notdir $(KM_IMAGES))) +$(KM_SYMLINKS): $(LOCAL_INSTALLED_MODULE) + @echo "Keymaster firmware link: $@" + @mkdir -p $(dir $@) + @rm -rf $@ + $(hide) ln -sf /firmware/image/$(notdir $@) $@ + +ALL_DEFAULT_INSTALLED_MODULES += $(KM_SYMLINKS) + +MBA_IMAGES := \ + mba.b00 mba.mdt + +MBA_SYMLINKS := $(addprefix $(TARGET_OUT_ETC)/firmware/,$(notdir $(MBA_IMAGES))) +$(MBA_SYMLINKS): $(LOCAL_INSTALLED_MODULE) + @echo "MBA firmware link: $@" + @mkdir -p $(dir $@) + @rm -rf $@ + $(hide) ln -sf /firmware-modem/image/$(notdir $@) $@ + +ALL_DEFAULT_INSTALLED_MODULES += $(MBA_SYMLINKS) + +MC_IMAGES := \ + mc_v2.b00 mc_v2.b01 mc_v2.b02 mc_v2.b03 mc_v2.mdt + +MC_SYMLINKS := $(addprefix $(TARGET_OUT_ETC)/firmware/,$(notdir $(MC_IMAGES))) +$(MC_SYMLINKS): $(LOCAL_INSTALLED_MODULE) + @echo "Mobicore firmware link: $@" + @mkdir -p $(dir $@) + @rm -rf $@ + $(hide) ln -sf /firmware/image/$(notdir $@) $@ + +ALL_DEFAULT_INSTALLED_MODULES += $(MC_SYMLINKS) + +MODEM_IMAGES := \ + modem.b00 modem.b01 modem.b02 modem.b03 modem.b04 modem.b05 \ + modem.b08 modem.b10 modem.b11 modem.b13 modem.b14 modem.b15 \ + modem.b16 modem.b17 modem.b18 modem.b19 modem.b20 modem.b21 \ + modem.b22 modem.b25 modem.b26 modem.b27 modem.mdt + +MODEM_SYMLINKS := $(addprefix $(TARGET_OUT_ETC)/firmware/,$(notdir $(MODEM_IMAGES))) +$(MODEM_SYMLINKS): $(LOCAL_INSTALLED_MODULE) + @echo "Modem firmware link: $@" + @mkdir -p $(dir $@) + @rm -rf $@ + $(hide) ln -sf /firmware-modem/image/$(notdir $@) $@ + +ALL_DEFAULT_INSTALLED_MODULES += $(MODEM_SYMLINKS) + +PLAYREADY_IMAGES := \ + playread.b00 playread.b01 playread.b02 playread.b03 playread.mdt + +PLAYREADY_SYMLINKS := $(addprefix $(TARGET_OUT_ETC)/firmware/,$(notdir $(PLAYREADY_IMAGES))) +$(PLAYREADY_SYMLINKS): $(LOCAL_INSTALLED_MODULE) + @echo "Playready firmware link: $@" + @mkdir -p $(dir $@) + @rm -rf $@ + $(hide) ln -sf /firmware/image/$(notdir $@) $@ + +ALL_DEFAULT_INSTALLED_MODULES += $(PLAYREADY_SYMLINKS) + +SECSTOR_IMAGES := \ + sec_stor.b00 sec_stor.b01 sec_stor.b02 sec_stor.b03 sec_stor.mdt + +SECSTOR_SYMLINKS := $(addprefix $(TARGET_OUT_ETC)/firmware/,$(notdir $(SECSTOR_IMAGES))) +$(SECSTOR_SYMLINKS): $(LOCAL_INSTALLED_MODULE) + @echo "Secstor firmware link: $@" + @mkdir -p $(dir $@) + @rm -rf $@ + $(hide) ln -sf /firmware/image/$(notdir $@) $@ + +ALL_DEFAULT_INSTALLED_MODULES += $(SECSTOR_SYMLINKS) + +SKM_IMAGES := \ + skm.b00 skm.b01 skm.b02 skm.b03 skm.mdt + +SKM_SYMLINKS := $(addprefix $(TARGET_OUT_ETC)/firmware/,$(notdir $(SKM_IMAGES))) +$(SKM_SYMLINKS): $(LOCAL_INSTALLED_MODULE) + @echo "SKM firmware link: $@" + @mkdir -p $(dir $@) + @rm -rf $@ + $(hide) ln -sf /firmware/image/$(notdir $@) $@ + +ALL_DEFAULT_INSTALLED_MODULES += $(SKM_SYMLINKS) + +SKMM_TA_IMAGES := \ + skmm_ta.b00 skmm_ta.b01 skmm_ta.b02 skmm_ta.b03 skmm_ta.mdt + +SKMM_TA_SYMLINKS := $(addprefix $(TARGET_OUT_ETC)/firmware/,$(notdir $(SKMM_TA_IMAGES))) +$(SKMM_TA_SYMLINKS): $(LOCAL_INSTALLED_MODULE) + @echo "SKMM firmware link: $@" + @mkdir -p $(dir $@) + @rm -rf $@ + $(hide) ln -sf /firmware/image/$(notdir $@) $@ + +ALL_DEFAULT_INSTALLED_MODULES += $(SKMM_TA_SYMLINKS) + +SSHDCPAP_IMAGES := \ + sshdcpap.b00 sshdcpap.b01 sshdcpap.b02 sshdcpap.b03 sshdcpap.mdt + +SSHDCPAP_SYMLINKS := $(addprefix $(TARGET_OUT_ETC)/firmware/,$(notdir $(SSHDCPAP_IMAGES))) +$(SSHDCPAP_SYMLINKS): $(LOCAL_INSTALLED_MODULE) + @echo "SSHDCPAP firmware link: $@" + @mkdir -p $(dir $@) + @rm -rf $@ + $(hide) ln -sf /firmware/image/$(notdir $@) $@ + +ALL_DEFAULT_INSTALLED_MODULES += $(SSHDCPAP_SYMLINKS) + +TIMA_IMAGES := \ + tima_atn.b00 tima_atn.b01 tima_atn.b02 tima_atn.b03 tima_atn.mdt \ + tima_key.b00 tima_key.b01 tima_key.b02 tima_key.b03 tima_key.mdt \ + tima_lkm.b00 tima_lkm.b01 tima_lkm.b02 tima_lkm.b03 tima_lkm.mdt \ + tima_pkm.b00 tima_pkm.b01 tima_pkm.b02 tima_pkm.b03 tima_pkm.mdt + +TIMA_SYMLINKS := $(addprefix $(TARGET_OUT_ETC)/firmware/,$(notdir $(TIMA_IMAGES))) +$(TIMA_SYMLINKS): $(LOCAL_INSTALLED_MODULE) + @echo "Tima firmware link: $@" + @mkdir -p $(dir $@) + @rm -rf $@ + $(hide) ln -sf /firmware/image/$(notdir $@) $@ + +ALL_DEFAULT_INSTALLED_MODULES += $(TIMA_SYMLINKS) + +TZPR_IMAGES := \ + tzpr25.b00 tzpr25.b01 tzpr25.b02 tzpr25.b03 tzpr25.mdt + +TZPR_SYMLINKS := $(addprefix $(TARGET_OUT_ETC)/firmware/,$(notdir $(TZPR_IMAGES))) +$(TZPR_SYMLINKS): $(LOCAL_INSTALLED_MODULE) + @echo "TZPR firmware link: $@" + @mkdir -p $(dir $@) + @rm -rf $@ + $(hide) ln -sf /firmware/image/$(notdir $@) $@ + +ALL_DEFAULT_INSTALLED_MODULES += $(TZPR_SYMLINKS) + +VENUS_IMAGES := \ + venus.b00 venus.b01 venus.b02 venus.b03 venus.b04 venus.mdt + +VENUS_SYMLINKS := $(addprefix $(TARGET_OUT_ETC)/firmware/,$(notdir $(VENUS_IMAGES))) +$(VENUS_SYMLINKS): $(LOCAL_INSTALLED_MODULE) + @echo "Venus firmware link: $@" + @mkdir -p $(dir $@) + @rm -rf $@ + $(hide) ln -sf /firmware/image/$(notdir $@) $@ + +ALL_DEFAULT_INSTALLED_MODULES += $(VENUS_SYMLINKS) + +WV_IMAGES := \ + widevine.b00 widevine.b01 widevine.b02 widevine.b03 widevine.mdt + +WV_SYMLINKS := $(addprefix $(TARGET_OUT_ETC)/firmware/,$(notdir $(WV_IMAGES))) +$(WV_SYMLINKS): $(LOCAL_INSTALLED_MODULE) + @echo "Widevine firmware link: $@" + @mkdir -p $(dir $@) + @rm -rf $@ + $(hide) ln -sf /firmware/image/$(notdir $@) $@ + +ALL_DEFAULT_INSTALLED_MODULES += $(WV_SYMLINKS) + endif endif diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk index 0f9646a..9010110 100644 --- a/BoardConfigCommon.mk +++ b/BoardConfigCommon.mk @@ -12,118 +12,90 @@ # See the License for the specific language governing permissions and # limitations under the License. -BOARD_VENDOR := samsung +# inherit from qcom-common +-include device/samsung/qcom-common/BoardConfigCommon.mk # Platform TARGET_BOARD_PLATFORM := msm8974 TARGET_BOARD_PLATFORM_GPU := qcom-adreno330 -# inherit from qcom-common --include device/samsung/qcom-common/BoardConfigCommon.mk - # Architecture -TARGET_CPU_SMP := true - -TARGET_GLOBAL_CFLAGS += -mfpu=neon-vfpv4 -mfloat-abi=softfp -TARGET_GLOBAL_CPPFLAGS += -mfpu=neon-vfpv4 -mfloat-abi=softfp TARGET_CPU_VARIANT := krait -# Wifi related defines -WIFI_BAND := 802_11_ABG -WPA_SUPPLICANT_VERSION := VER_0_8_X -BOARD_WPA_SUPPLICANT_DRIVER := NL80211 -BOARD_HOSTAPD_DRIVER := NL80211 -BOARD_HAVE_SAMSUNG_WIFI := true - -ifeq ($(TARGET_MSM8974_COMMON_WLAN_VARIANT),prima) - BOARD_WLAN_DEVICE := qcwcn - BOARD_HAS_QCOM_WLAN := true - TARGET_USES_WCNSS_CTRL := true - WIFI_DRIVER_FW_PATH_STA := "sta" - WIFI_DRIVER_FW_PATH_AP := "ap" -else - BOARD_WLAN_DEVICE := bcmdhd - WIFI_DRIVER_MODULE_ARG := "firmware_path=/system/etc/wifi/bcmdhd_sta.bin nvram_path=/system/etc/wifi/nvram_net.txt" - WIFI_DRIVER_MODULE_AP_ARG := "firmware_path=/system/etc/wifi/bcmdhd_apsta.bin nvram_path=/system/etc/wifi/nvram_net.txt" - WIFI_DRIVER_FW_PATH_PARAM := "/sys/module/dhd/parameters/firmware_path" - WIFI_DRIVER_FW_PATH_STA := "/system/etc/wifi/bcmdhd_sta.bin" - WIFI_DRIVER_FW_PATH_AP := "/system/etc/wifi/bcmdhd_apsta.bin" -endif - -BOARD_WPA_SUPPLICANT_PRIVATE_LIB := lib_driver_cmd_$(BOARD_WLAN_DEVICE) -BOARD_HOSTAPD_PRIVATE_LIB := lib_driver_cmd_$(BOARD_WLAN_DEVICE) - +# Audio +BOARD_USES_ALSA_AUDIO := true +TARGET_QCOM_AUDIO_VARIANT := caf +TARGET_USES_QCOM_COMPRESSED_AUDIO := true # Bluetooth BOARD_HAVE_BLUETOOTH := true -ifeq ($(TARGET_MSM8974_COMMON_WLAN_VARIANT),prima) - BOARD_HAVE_BLUETOOTH_QCOM := true -else - BOARD_HAVE_BLUETOOTH_BCM := true -endif - -# NFC -BOARD_HAVE_NFC := true - -# Vold -BOARD_VOLD_EMMC_SHARES_DEV_MAJOR := true -BOARD_VOLD_MAX_PARTITIONS := 28 -TARGET_USE_CUSTOM_LUN_FILE_PATH := /sys/devices/platform/msm_hsusb/gadget/lun%d/file # Camera TARGET_PROVIDES_CAMERA_HAL := true USE_DEVICE_SPECIFIC_CAMERA := true COMMON_GLOBAL_CFLAGS += -DSAMSUNG_CAMERA_HARDWARE -# Workaround to avoid issues with legacy liblights on QCOM platforms -TARGET_PROVIDES_LIBLIGHT := true +# Charger +BOARD_BATTERY_DEVICE_NAME := "battery" +BOARD_CHARGING_CMDLINE_NAME := "androidboot.bootchg" +BOARD_CHARGING_CMDLINE_VALUE := "true" -# Charging Mode Override. -BOARD_CHARGING_MODE_BOOTING_LPM := - -# Audio -BOARD_HAVE_SAMSUNG_AUDIO := true -BOARD_USES_ALSA_AUDIO := true -BOARD_USES_FLUENCE_INCALL := true -BOARD_USES_FLUENCE_FOR_VOIP := true -BOARD_USES_SEPERATED_AUDIO_INPUT := true -TARGET_USES_QCOM_COMPRESSED_AUDIO := true - -# QCOM support -BOARD_USES_QCOM_HARDWARE := true -TARGET_QCOM_MEDIA_VARIANT := caf-new +# Display +BOARD_EGL_CFG := device/samsung/msm8974-common/configs/egl.cfg +TARGET_DISPLAY_USE_RETIRE_FENCE := true +TARGET_FORCE_HWC_FOR_VIRTUAL_DISPLAYS := true TARGET_QCOM_DISPLAY_VARIANT := caf-new -BOARD_USES_LEGACY_ALSA_AUDIO := -TARGET_QCOM_AUDIO_VARIANT := caf -TARGET_USES_QCOM_BSP := true +OVERRIDE_RS_DRIVER:= libRSDriver_adreno.so + +# Shader cache config options +# Maximum size of the GLES Shaders that can be cached for reuse. +# Increase the size if shaders of size greater than 12KB are used. +MAX_EGL_CACHE_KEY_SIZE := 12*1024 + +# Maximum GLES shader cache size for each app to store the compiled shader +# binaries. Decrease the size if RAM or Flash Storage size is a limitation +# of the device. +MAX_EGL_CACHE_SIZE := 2048*1024 + +# Media +TARGET_QCOM_MEDIA_VARIANT := caf-new TARGET_ENABLE_QC_AV_ENHANCEMENTS := true -# Use retire fence from MDP driver -TARGET_DISPLAY_USE_RETIRE_FENCE := true +# Qualcomm support +COMMON_GLOBAL_CFLAGS += -DQCOM_BSP +TARGET_USES_QCOM_BSP := true # SELinux BOARD_SEPOLICY_DIRS += \ - device/samsung/msm8974-common/sepolicy + device/samsung/msm8974-common/sepolicy BOARD_SEPOLICY_UNION += \ - file_contexts \ - app.te \ - bluetooth.te \ - device.te \ - domain.te \ - drmserver.te \ - file.te \ - hci_init.te \ - healthd.te \ - init.te \ - init_shell.te \ - keystore.te \ - kickstart.te \ - mediaserver.te \ - nfc.te \ - rild.te \ - surfaceflinger.te \ - system.te \ - ueventd.te \ - wpa.te \ - wpa_socket.te + file_contexts \ + app.te \ + bluetooth.te \ + device.te \ + domain.te \ + drmserver.te \ + file.te \ + hci_init.te \ + healthd.te \ + init.te \ + init_shell.te \ + keystore.te \ + kickstart.te \ + mediaserver.te \ + nfc.te \ + rild.te \ + surfaceflinger.te \ + system.te \ + ueventd.te \ + wpa.te \ + wpa_socket.te + +# Time services +BOARD_USES_QC_TIME_SERVICES := true + +# Vold +BOARD_VOLD_EMMC_SHARES_DEV_MAJOR := true +BOARD_VOLD_MAX_PARTITIONS := 28 +TARGET_USE_CUSTOM_LUN_FILE_PATH := /sys/devices/platform/msm_hsusb/gadget/lun%d/file diff --git a/cm.dependencies b/cm.dependencies new file mode 100644 index 0000000..933cf39 --- /dev/null +++ b/cm.dependencies @@ -0,0 +1,18 @@ +[ + { + "repository": "android_device_qcom_common", + "target_path": "device/qcom/common" + }, + { + "repository": "android_device_samsung_qcom-common", + "target_path": "device/samsung/qcom-common" + }, + { + "repository": "android_hardware_qcom_display-caf-new", + "target_path": "hardware/qcom/display-caf-new" + }, + { + "repository": "android_hardware_qcom_media-caf-new", + "target_path": "hardware/qcom/media-caf-new" + } +] diff --git a/configs/egl.cfg b/configs/egl.cfg new file mode 100644 index 0000000..2a11ba2 --- /dev/null +++ b/configs/egl.cfg @@ -0,0 +1,2 @@ +0 0 android +0 1 adreno diff --git a/configs/media_codecs.xml b/configs/media_codecs.xml new file mode 100644 index 0000000..24116a2 --- /dev/null +++ b/configs/media_codecs.xml @@ -0,0 +1,169 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/consumerir/Android.mk b/consumerir/Android.mk index 7a0f61c..0e096aa 100644 --- a/consumerir/Android.mk +++ b/consumerir/Android.mk @@ -15,8 +15,6 @@ # HAL module implementation stored in # hw/..so -ifeq ($(TARGET_PROVIDES_CONSUMERIR_HAL),true) - LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) @@ -28,5 +26,3 @@ LOCAL_SHARED_LIBRARIES := liblog libcutils LOCAL_MODULE_TAGS := optional include $(BUILD_SHARED_LIBRARY) - -endif diff --git a/keychars/Generic.kcm b/keychars/Generic.kcm deleted file mode 100644 index b5f6897..0000000 --- a/keychars/Generic.kcm +++ /dev/null @@ -1,672 +0,0 @@ -# Copyright (C) 2010 The Android Open Source Project -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -# -# Generic key character map for full alphabetic US English PC style external keyboards. -# -# This file is intentionally very generic and is intended to support a broad rang of keyboards. -# Do not edit the generic key character map to support a specific keyboard; instead, create -# a new key character map file with the required keyboard configuration. -# - -type FULL - -### Basic QWERTY keys ### - -key A { - label: 'A' - base: 'a' - shift, capslock: 'A' - ctrl, alt, meta: none -} - -key B { - label: 'B' - base: 'b' - shift, capslock: 'B' - ctrl, alt, meta: none -} - -key C { - label: 'C' - base: 'c' - shift, capslock: 'C' - alt: '\u00e7' - shift+alt: '\u00c7' - ctrl, meta: none -} - -key D { - label: 'D' - base: 'd' - shift, capslock: 'D' - ctrl, alt, meta: none -} - -key E { - label: 'E' - base: 'e' - shift, capslock: 'E' - alt: '\u0301' - ctrl, meta: none -} - -key F { - label: 'F' - base: 'f' - shift, capslock: 'F' - ctrl, alt, meta: none -} - -key G { - label: 'G' - base: 'g' - shift, capslock: 'G' - ctrl, alt, meta: none -} - -key H { - label: 'H' - base: 'h' - shift, capslock: 'H' - ctrl, alt, meta: none -} - -key I { - label: 'I' - base: 'i' - shift, capslock: 'I' - alt: '\u0302' - ctrl, meta: none -} - -key J { - label: 'J' - base: 'j' - shift, capslock: 'J' - ctrl, alt, meta: none -} - -key K { - label: 'K' - base: 'k' - shift, capslock: 'K' - ctrl, alt, meta: none -} - -key L { - label: 'L' - base: 'l' - shift, capslock: 'L' - ctrl, alt, meta: none -} - -key M { - label: 'M' - base: 'm' - shift, capslock: 'M' - ctrl, alt, meta: none -} - -key N { - label: 'N' - base: 'n' - shift, capslock: 'N' - alt: '\u0303' - ctrl, meta: none -} - -key O { - label: 'O' - base: 'o' - shift, capslock: 'O' - ctrl, alt, meta: none -} - -key P { - label: 'P' - base: 'p' - shift, capslock: 'P' - ctrl, alt, meta: none -} - -key Q { - label: 'Q' - base: 'q' - shift, capslock: 'Q' - ctrl, alt, meta: none -} - -key R { - label: 'R' - base: 'r' - shift, capslock: 'R' - ctrl, alt, meta: none -} - -key S { - label: 'S' - base: 's' - shift, capslock: 'S' - alt: '\u00df' - ctrl, meta: none -} - -key T { - label: 'T' - base: 't' - shift, capslock: 'T' - ctrl, alt, meta: none -} - -key U { - label: 'U' - base: 'u' - shift, capslock: 'U' - alt: '\u0308' - ctrl, meta: none -} - -key V { - label: 'V' - base: 'v' - shift, capslock: 'V' - ctrl, alt, meta: none -} - -key W { - label: 'W' - base: 'w' - shift, capslock: 'W' - ctrl, alt, meta: none -} - -key X { - label: 'X' - base: 'x' - shift, capslock: 'X' - ctrl, alt, meta: none -} - -key Y { - label: 'Y' - base: 'y' - shift, capslock: 'Y' - ctrl, alt, meta: none -} - -key Z { - label: 'Z' - base: 'z' - shift, capslock: 'Z' - ctrl, alt, meta: none -} - -key 0 { - label, number: '0' - base: '0' - shift: ')' - ctrl, alt, meta: none -} - -key 1 { - label, number: '1' - base: '1' - shift: '!' - ctrl, alt, meta: none -} - -key 2 { - label, number: '2' - base: '2' - shift: '@' - ctrl, alt, meta: none -} - -key 3 { - label, number: '3' - base: '3' - shift: '#' - ctrl, alt, meta: none -} - -key 4 { - label, number: '4' - base: '4' - shift: '$' - ctrl, alt, meta: none -} - -key 5 { - label, number: '5' - base: '5' - shift: '%' - ctrl, alt, meta: none -} - -key 6 { - label, number: '6' - base: '6' - shift: '^' - ctrl, alt, meta: none - alt+shift: '\u0302' -} - -key 7 { - label, number: '7' - base: '7' - shift: '&' - ctrl, alt, meta: none -} - -key 8 { - label, number: '8' - base: '8' - shift: '*' - ctrl, alt, meta: none -} - -key 9 { - label, number: '9' - base: '9' - shift: '(' - ctrl, alt, meta: none -} - -key SPACE { - label: ' ' - base: ' ' - ctrl: none - alt, meta: fallback SEARCH -} - -key ENTER { - label: '\n' - base: '\n' - ctrl, alt, meta: none -} - -key TAB { - label: '\t' - base: '\t' - ctrl, alt, meta: none -} - -key COMMA { - label, number: ',' - base: ',' - shift: '<' - ctrl, alt, meta: none -} - -key PERIOD { - label, number: '.' - base: '.' - shift: '>' - ctrl, alt, meta: none -} - -key SLASH { - label, number: '/' - base: '/' - shift: '?' - ctrl, alt, meta: none -} - -key GRAVE { - label, number: '`' - base: '`' - shift: '~' - alt: '\u0300' - alt+shift: '\u0303' - ctrl, meta: none -} - -key MINUS { - label, number: '-' - base: '-' - shift: '_' - ctrl, alt, meta: none -} - -key EQUALS { - label, number: '=' - base: '=' - shift: '+' - ctrl, alt, meta: none -} - -key LEFT_BRACKET { - label, number: '[' - base: '[' - shift: '{' - ctrl, alt, meta: none -} - -key RIGHT_BRACKET { - label, number: ']' - base: ']' - shift: '}' - ctrl, alt, meta: none -} - -key BACKSLASH { - label, number: '\\' - base: '\\' - shift: '|' - ctrl, alt, meta: none -} - -key SEMICOLON { - label, number: ';' - base: ';' - shift: ':' - ctrl, alt, meta: none -} - -key APOSTROPHE { - label, number: '\'' - base: '\'' - shift: '"' - ctrl, alt, meta: none -} - -### Numeric keypad ### - -key NUMPAD_0 { - label, number: '0' - base: fallback INSERT - numlock: '0' - ctrl, alt, meta: none -} - -key NUMPAD_1 { - label, number: '1' - base: fallback MOVE_END - numlock: '1' - ctrl, alt, meta: none -} - -key NUMPAD_2 { - label, number: '2' - base: fallback DPAD_DOWN - numlock: '2' - ctrl, alt, meta: none -} - -key NUMPAD_3 { - label, number: '3' - base: fallback PAGE_DOWN - numlock: '3' - ctrl, alt, meta: none -} - -key NUMPAD_4 { - label, number: '4' - base: fallback DPAD_LEFT - numlock: '4' - ctrl, alt, meta: none -} - -key NUMPAD_5 { - label, number: '5' - base: fallback DPAD_CENTER - numlock: '5' - ctrl, alt, meta: none -} - -key NUMPAD_6 { - label, number: '6' - base: fallback DPAD_RIGHT - numlock: '6' - ctrl, alt, meta: none -} - -key NUMPAD_7 { - label, number: '7' - base: fallback MOVE_HOME - numlock: '7' - ctrl, alt, meta: none -} - -key NUMPAD_8 { - label, number: '8' - base: fallback DPAD_UP - numlock: '8' - ctrl, alt, meta: none -} - -key NUMPAD_9 { - label, number: '9' - base: fallback PAGE_UP - numlock: '9' - ctrl, alt, meta: none -} - -key NUMPAD_LEFT_PAREN { - label, number: '(' - base: '(' - ctrl, alt, meta: none -} - -key NUMPAD_RIGHT_PAREN { - label, number: ')' - base: ')' - ctrl, alt, meta: none -} - -key NUMPAD_DIVIDE { - label, number: '/' - base: '/' - ctrl, alt, meta: none -} - -key NUMPAD_MULTIPLY { - label, number: '*' - base: '*' - ctrl, alt, meta: none -} - -key NUMPAD_SUBTRACT { - label, number: '-' - base: '-' - ctrl, alt, meta: none -} - -key NUMPAD_ADD { - label, number: '+' - base: '+' - ctrl, alt, meta: none -} - -key NUMPAD_DOT { - label, number: '.' - base: fallback FORWARD_DEL - numlock: '.' - ctrl, alt, meta: none -} - -key NUMPAD_COMMA { - label, number: ',' - base: ',' - ctrl, alt, meta: none -} - -key NUMPAD_EQUALS { - label, number: '=' - base: '=' - ctrl, alt, meta: none -} - -key NUMPAD_ENTER { - label: '\n' - base: '\n' fallback ENTER - ctrl, alt, meta: none fallback ENTER -} - -### Special keys on phones ### - -key AT { - label, number: '@' - base: '@' -} - -key STAR { - label, number: '*' - base: '*' -} - -key POUND { - label, number: '#' - base: '#' -} - -key PLUS { - label, number: '+' - base: '+' -} - -### Non-printing keys ### - -key ESCAPE { - base: fallback BACK - alt, meta: fallback HOME - ctrl: fallback MENU -} - -### Gamepad buttons ### - -key BUTTON_A { - base: fallback BACK -} - -key BUTTON_B { - base: fallback BACK -} - -key BUTTON_C { - base: fallback BACK -} - -key BUTTON_X { - base: fallback DPAD_CENTER -} - -key BUTTON_Y { - base: fallback DPAD_CENTER -} - -key BUTTON_Z { - base: fallback DPAD_CENTER -} - -key BUTTON_L1 { - base: none -} - -key BUTTON_R1 { - base: none -} - -key BUTTON_L2 { - base: none -} - -key BUTTON_R2 { - base: none -} - -key BUTTON_THUMBL { - base: fallback DPAD_CENTER -} - -key BUTTON_THUMBR { - base: fallback DPAD_CENTER -} - -key BUTTON_START { - base: fallback HOME -} - -key BUTTON_SELECT { - base: fallback MENU -} - -key BUTTON_MODE { - base: fallback MENU -} - -key BUTTON_1 { - base: fallback DPAD_CENTER -} - -key BUTTON_2 { - base: fallback DPAD_CENTER -} - -key BUTTON_3 { - base: fallback DPAD_CENTER -} - -key BUTTON_4 { - base: fallback DPAD_CENTER -} - -key BUTTON_5 { - base: fallback DPAD_CENTER -} - -key BUTTON_6 { - base: fallback DPAD_CENTER -} - -key BUTTON_7 { - base: fallback DPAD_CENTER -} - -key BUTTON_8 { - base: fallback DPAD_CENTER -} - -key BUTTON_9 { - base: fallback DPAD_CENTER -} - -key BUTTON_10 { - base: fallback DPAD_CENTER -} - -key BUTTON_11 { - base: fallback DPAD_CENTER -} - -key BUTTON_12 { - base: fallback DPAD_CENTER -} - -key BUTTON_13 { - base: fallback DPAD_CENTER -} - -key BUTTON_14 { - base: fallback DPAD_CENTER -} - -key BUTTON_15 { - base: fallback DPAD_CENTER -} - -key BUTTON_16 { - base: fallback DPAD_CENTER -} diff --git a/keychars/Virtual.kcm b/keychars/Virtual.kcm deleted file mode 100644 index 0ce4a68..0000000 --- a/keychars/Virtual.kcm +++ /dev/null @@ -1,544 +0,0 @@ -# Copyright (C) 2010 The Android Open Source Project -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -# -# Key character map for a built-in generic virtual keyboard primarily used -# for instrumentation and testing purposes. -# - -type FULL - -### Basic QWERTY keys ### - -key A { - label: 'A' - base: 'a' - shift, capslock: 'A' - ctrl, alt, meta: none -} - -key B { - label: 'B' - base: 'b' - shift, capslock: 'B' - ctrl, alt, meta: none -} - -key C { - label: 'C' - base: 'c' - shift, capslock: 'C' - alt: '\u00e7' - shift+alt: '\u00c7' - ctrl, meta: none -} - -key D { - label: 'D' - base: 'd' - shift, capslock: 'D' - ctrl, alt, meta: none -} - -key E { - label: 'E' - base: 'e' - shift, capslock: 'E' - alt: '\u0301' - ctrl, meta: none -} - -key F { - label: 'F' - base: 'f' - shift, capslock: 'F' - ctrl, alt, meta: none -} - -key G { - label: 'G' - base: 'g' - shift, capslock: 'G' - ctrl, alt, meta: none -} - -key H { - label: 'H' - base: 'h' - shift, capslock: 'H' - ctrl, alt, meta: none -} - -key I { - label: 'I' - base: 'i' - shift, capslock: 'I' - alt: '\u0302' - ctrl, meta: none -} - -key J { - label: 'J' - base: 'j' - shift, capslock: 'J' - ctrl, alt, meta: none -} - -key K { - label: 'K' - base: 'k' - shift, capslock: 'K' - ctrl, alt, meta: none -} - -key L { - label: 'L' - base: 'l' - shift, capslock: 'L' - ctrl, alt, meta: none -} - -key M { - label: 'M' - base: 'm' - shift, capslock: 'M' - ctrl, alt, meta: none -} - -key N { - label: 'N' - base: 'n' - shift, capslock: 'N' - alt: '\u0303' - ctrl, meta: none -} - -key O { - label: 'O' - base: 'o' - shift, capslock: 'O' - ctrl, alt, meta: none -} - -key P { - label: 'P' - base: 'p' - shift, capslock: 'P' - ctrl, alt, meta: none -} - -key Q { - label: 'Q' - base: 'q' - shift, capslock: 'Q' - ctrl, alt, meta: none -} - -key R { - label: 'R' - base: 'r' - shift, capslock: 'R' - ctrl, alt, meta: none -} - -key S { - label: 'S' - base: 's' - shift, capslock: 'S' - alt: '\u00df' - ctrl, meta: none -} - -key T { - label: 'T' - base: 't' - shift, capslock: 'T' - ctrl, alt, meta: none -} - -key U { - label: 'U' - base: 'u' - shift, capslock: 'U' - alt: '\u0308' - ctrl, meta: none -} - -key V { - label: 'V' - base: 'v' - shift, capslock: 'V' - ctrl, alt, meta: none -} - -key W { - label: 'W' - base: 'w' - shift, capslock: 'W' - ctrl, alt, meta: none -} - -key X { - label: 'X' - base: 'x' - shift, capslock: 'X' - ctrl, alt, meta: none -} - -key Y { - label: 'Y' - base: 'y' - shift, capslock: 'Y' - ctrl, alt, meta: none -} - -key Z { - label: 'Z' - base: 'z' - shift, capslock: 'Z' - ctrl, alt, meta: none -} - -key 0 { - label, number: '0' - base: '0' - shift: ')' - ctrl, alt, meta: none -} - -key 1 { - label, number: '1' - base: '1' - shift: '!' - ctrl, alt, meta: none -} - -key 2 { - label, number: '2' - base: '2' - shift: '@' - ctrl, alt, meta: none -} - -key 3 { - label, number: '3' - base: '3' - shift: '#' - ctrl, alt, meta: none -} - -key 4 { - label, number: '4' - base: '4' - shift: '$' - ctrl, alt, meta: none -} - -key 5 { - label, number: '5' - base: '5' - shift: '%' - ctrl, alt, meta: none -} - -key 6 { - label, number: '6' - base: '6' - shift: '^' - ctrl, alt, meta: none - alt+shift: '\u0302' -} - -key 7 { - label, number: '7' - base: '7' - shift: '&' - ctrl, alt, meta: none -} - -key 8 { - label, number: '8' - base: '8' - shift: '*' - ctrl, alt, meta: none -} - -key 9 { - label, number: '9' - base: '9' - shift: '(' - ctrl, alt, meta: none -} - -key SPACE { - label: ' ' - base: ' ' - ctrl, alt: none - meta: fallback SEARCH -} - -key ENTER { - label: '\n' - base: '\n' - ctrl, alt, meta: none -} - -key TAB { - label: '\t' - base: '\t' - ctrl, alt: none - meta: fallback APP_SWITCH -} - -key COMMA { - label, number: ',' - base: ',' - shift: '<' - ctrl, alt, meta: none -} - -key PERIOD { - label, number: '.' - base: '.' - shift: '>' - ctrl, alt, meta: none -} - -key SLASH { - label, number: '/' - base: '/' - shift: '?' - ctrl, alt, meta: none -} - -key GRAVE { - label, number: '`' - base: '`' - shift: '~' - alt: '\u0300' - alt+shift: '\u0303' - ctrl, meta: none -} - -key MINUS { - label, number: '-' - base: '-' - shift: '_' - ctrl, alt, meta: none -} - -key EQUALS { - label, number: '=' - base: '=' - shift: '+' - ctrl, alt, meta: none -} - -key LEFT_BRACKET { - label, number: '[' - base: '[' - shift: '{' - ctrl, alt, meta: none -} - -key RIGHT_BRACKET { - label, number: ']' - base: ']' - shift: '}' - ctrl, alt, meta: none -} - -key BACKSLASH { - label, number: '\\' - base: '\\' - shift: '|' - ctrl, alt, meta: none -} - -key SEMICOLON { - label, number: ';' - base: ';' - shift: ':' - ctrl, alt, meta: none -} - -key APOSTROPHE { - label, number: '\'' - base: '\'' - shift: '"' - ctrl, alt, meta: none -} - -### Numeric keypad ### - -key NUMPAD_0 { - label, number: '0' - base: fallback INSERT - numlock: '0' - ctrl, alt, meta: none -} - -key NUMPAD_1 { - label, number: '1' - base: fallback MOVE_END - numlock: '1' - ctrl, alt, meta: none -} - -key NUMPAD_2 { - label, number: '2' - base: fallback DPAD_DOWN - numlock: '2' - ctrl, alt, meta: none -} - -key NUMPAD_3 { - label, number: '3' - base: fallback PAGE_DOWN - numlock: '3' - ctrl, alt, meta: none -} - -key NUMPAD_4 { - label, number: '4' - base: fallback DPAD_LEFT - numlock: '4' - ctrl, alt, meta: none -} - -key NUMPAD_5 { - label, number: '5' - base: fallback DPAD_CENTER - numlock: '5' - ctrl, alt, meta: none -} - -key NUMPAD_6 { - label, number: '6' - base: fallback DPAD_RIGHT - numlock: '6' - ctrl, alt, meta: none -} - -key NUMPAD_7 { - label, number: '7' - base: fallback MOVE_HOME - numlock: '7' - ctrl, alt, meta: none -} - -key NUMPAD_8 { - label, number: '8' - base: fallback DPAD_UP - numlock: '8' - ctrl, alt, meta: none -} - -key NUMPAD_9 { - label, number: '9' - base: fallback PAGE_UP - numlock: '9' - ctrl, alt, meta: none -} - -key NUMPAD_LEFT_PAREN { - label, number: '(' - base: '(' - ctrl, alt, meta: none -} - -key NUMPAD_RIGHT_PAREN { - label, number: ')' - base: ')' - ctrl, alt, meta: none -} - -key NUMPAD_DIVIDE { - label, number: '/' - base: '/' - ctrl, alt, meta: none -} - -key NUMPAD_MULTIPLY { - label, number: '*' - base: '*' - ctrl, alt, meta: none -} - -key NUMPAD_SUBTRACT { - label, number: '-' - base: '-' - ctrl, alt, meta: none -} - -key NUMPAD_ADD { - label, number: '+' - base: '+' - ctrl, alt, meta: none -} - -key NUMPAD_DOT { - label, number: '.' - base: fallback FORWARD_DEL - numlock: '.' - ctrl, alt, meta: none -} - -key NUMPAD_COMMA { - label, number: ',' - base: ',' - ctrl, alt, meta: none -} - -key NUMPAD_EQUALS { - label, number: '=' - base: '=' - ctrl, alt, meta: none -} - -key NUMPAD_ENTER { - label: '\n' - base: '\n' fallback ENTER - ctrl, alt, meta: none fallback ENTER -} - -### Special keys on phones ### - -key AT { - label, number: '@' - base: '@' -} - -key STAR { - label, number: '*' - base: '*' -} - -key POUND { - label, number: '#' - base: '#' -} - -key PLUS { - label, number: '+' - base: '+' -} - -### Non-printing keys ### - -key ESCAPE { - base: fallback BACK - meta: fallback HOME - alt: fallback MENU -} diff --git a/keylayout/AVRCP.kl b/keylayout/AVRCP.kl deleted file mode 100644 index 736b43c..0000000 --- a/keylayout/AVRCP.kl +++ /dev/null @@ -1,23 +0,0 @@ -# Copyright (C) 2010 The Android Open Source Project -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -# Key layout used for Bluetooth AVRCP support. - -key 200 MEDIA_PLAY WAKE -key 201 MEDIA_PAUSE WAKE -key 166 MEDIA_STOP WAKE -key 163 MEDIA_NEXT WAKE -key 165 MEDIA_PREVIOUS WAKE -key 168 MEDIA_REWIND WAKE -key 208 MEDIA_FAST_FORWARD WAKE diff --git a/keylayout/Generic.kl b/keylayout/Generic.kl deleted file mode 100644 index 131258c..0000000 --- a/keylayout/Generic.kl +++ /dev/null @@ -1,423 +0,0 @@ -# Copyright (C) 2010 The Android Open Source Project -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -# -# Generic key layout file for full alphabetic US English PC style external keyboards. -# -# This file is intentionally very generic and is intended to support a broad rang of keyboards. -# Do not edit the generic key layout to support a specific keyboard; instead, create -# a new key layout file with the required keyboard configuration. -# - -key 1 ESCAPE -key 2 1 -key 3 2 -key 4 3 -key 5 4 -key 6 5 -key 7 6 -key 8 7 -key 9 8 -key 10 9 -key 11 0 -key 12 MINUS -key 13 EQUALS -key 14 DEL -key 15 TAB -key 16 Q -key 17 W -key 18 E -key 19 R -key 20 T -key 21 Y -key 22 U -key 23 I -key 24 O -key 25 P -key 26 LEFT_BRACKET -key 27 RIGHT_BRACKET -key 28 ENTER -key 29 CTRL_LEFT -key 30 A -key 31 S -key 32 D -key 33 F -key 34 G -key 35 H -key 36 J -key 37 K -key 38 L -key 39 SEMICOLON -key 40 APOSTROPHE -key 41 GRAVE -key 42 SHIFT_LEFT -key 43 BACKSLASH -key 44 Z -key 45 X -key 46 C -key 47 V -key 48 B -key 49 N -key 50 M -key 51 COMMA -key 52 PERIOD -key 53 SLASH -key 54 SHIFT_RIGHT -key 55 NUMPAD_MULTIPLY -key 56 ALT_LEFT -key 57 SPACE -key 58 CAPS_LOCK -key 59 F1 -key 60 F2 -key 61 F3 -key 62 F4 -key 63 F5 -key 64 F6 -key 65 F7 -key 66 F8 -key 67 F9 -key 68 F10 -key 69 NUM_LOCK -key 70 SCROLL_LOCK -key 71 NUMPAD_7 -key 72 NUMPAD_8 -key 73 NUMPAD_9 -key 74 NUMPAD_SUBTRACT -key 75 NUMPAD_4 -key 76 NUMPAD_5 -key 77 NUMPAD_6 -key 78 NUMPAD_ADD -key 79 NUMPAD_1 -key 80 NUMPAD_2 -key 81 NUMPAD_3 -key 82 NUMPAD_0 -key 83 NUMPAD_DOT -# key 84 (undefined) -# key 85 "KEY_ZENKAKUHANKAKU" -key 86 BACKSLASH -key 87 F11 -key 88 F12 -# key 89 "KEY_RO" -# key 90 "KEY_KATAKANA" -# key 91 "KEY_HIRAGANA" -# key 92 "KEY_HENKAN" -# key 93 "KEY_KATAKANAHIRAGANA" -# key 94 "KEY_MUHENKAN" -key 95 NUMPAD_COMMA -key 96 NUMPAD_ENTER -key 97 CTRL_RIGHT -key 98 NUMPAD_DIVIDE -key 99 SYSRQ -key 100 ALT_RIGHT -# key 101 "KEY_LINEFEED" -key 102 MOVE_HOME -key 103 DPAD_UP -key 104 PAGE_UP -key 105 DPAD_LEFT -key 106 DPAD_RIGHT -key 107 MOVE_END -key 108 DPAD_DOWN -key 109 PAGE_DOWN -key 110 INSERT -key 111 FORWARD_DEL -# key 112 "KEY_MACRO" -key 113 VOLUME_MUTE -key 114 VOLUME_DOWN -key 115 VOLUME_UP -key 116 POWER WAKE -key 117 NUMPAD_EQUALS -# key 118 "KEY_KPPLUSMINUS" -key 119 BREAK -# key 120 (undefined) -key 121 NUMPAD_COMMA -key 122 LANG -# key 122 "KEY_HANGEUL" -# key 123 "KEY_HANJA" -# key 124 "KEY_YEN" -key 125 META_LEFT -key 126 META_RIGHT -key 127 MENU WAKE_DROPPED -key 128 MEDIA_STOP -# key 129 "KEY_AGAIN" -# key 130 "KEY_PROPS" -# key 131 "KEY_UNDO" -# key 132 "KEY_FRONT" -# key 133 "KEY_COPY" -# key 134 "KEY_OPEN" -# key 135 "KEY_PASTE" -# key 136 "KEY_FIND" -# key 137 "KEY_CUT" -# key 138 "KEY_HELP" -key 139 MENU WAKE_DROPPED -key 140 CALCULATOR -# key 141 "KEY_SETUP" -key 142 POWER WAKE -key 143 POWER WAKE -# key 144 "KEY_FILE" -# key 145 "KEY_SENDFILE" -# key 146 "KEY_DELETEFILE" -# key 147 "KEY_XFER" -# key 148 "KEY_PROG1" -# key 149 "KEY_PROG2" -key 150 EXPLORER -# key 151 "KEY_MSDOS" -key 152 POWER WAKE -# key 153 "KEY_DIRECTION" -# key 154 "KEY_CYCLEWINDOWS" -key 155 ENVELOPE -key 156 BOOKMARK -# key 157 "KEY_COMPUTER" -key 158 BACK WAKE_DROPPED -key 159 FORWARD -key 160 MEDIA_CLOSE -key 161 MEDIA_EJECT -key 162 MEDIA_EJECT -key 163 MEDIA_NEXT -key 164 MEDIA_PLAY_PAUSE -key 165 MEDIA_PREVIOUS -key 166 MEDIA_STOP -key 167 MEDIA_RECORD -key 168 MEDIA_REWIND -key 169 CALL -# key 170 "KEY_ISO" -key 171 MUSIC -key 172 HOME -# key 173 "KEY_REFRESH" -# key 174 "KEY_EXIT" -# key 175 "KEY_MOVE" -# key 176 "KEY_EDIT" -key 177 PAGE_UP -key 178 PAGE_DOWN -key 179 NUMPAD_LEFT_PAREN -key 180 NUMPAD_RIGHT_PAREN -# key 181 "KEY_NEW" -# key 182 "KEY_REDO" -# key 183 F13 -# key 184 F14 -# key 185 F15 -# key 186 F16 -# key 187 F17 -# key 188 F18 -# key 189 F19 -# key 190 F20 -# key 191 F21 -# key 192 F22 -# key 193 F23 -# key 194 F24 -# key 195 (undefined) -# key 196 (undefined) -# key 197 (undefined) -# key 198 (undefined) -# key 199 (undefined) -key 200 MEDIA_PLAY -key 201 MEDIA_PAUSE -# key 202 "KEY_PROG3" -# key 203 "KEY_PROG4" -# key 204 (undefined) -# key 205 "KEY_SUSPEND" -# key 206 "KEY_CLOSE" -key 207 MEDIA_PLAY -key 208 MEDIA_FAST_FORWARD -# key 209 "KEY_BASSBOOST" -# key 210 "KEY_PRINT" -# key 211 "KEY_HP" -key 212 CAMERA -key 213 MUSIC -# key 214 "KEY_QUESTION" -key 215 ENVELOPE -# key 216 "KEY_CHAT" -key 217 SEARCH -# key 218 "KEY_CONNECT" -# key 219 "KEY_FINANCE" -# key 220 "KEY_SPORT" -# key 221 "KEY_SHOP" -# key 222 "KEY_ALTERASE" -# key 223 "KEY_CANCEL" -# key 224 "KEY_BRIGHTNESSDOWN" -# key 225 "KEY_BRIGHTNESSUP" -key 226 HEADSETHOOK - -key 256 BUTTON_1 -key 257 BUTTON_2 -key 258 BUTTON_3 -key 259 BUTTON_4 -key 260 BUTTON_5 -key 261 BUTTON_6 -key 262 BUTTON_7 -key 263 BUTTON_8 -key 264 BUTTON_9 -key 265 BUTTON_10 -key 266 BUTTON_11 -key 267 BUTTON_12 -key 268 BUTTON_13 -key 269 BUTTON_14 -key 270 BUTTON_15 -key 271 BUTTON_16 - -key 288 BUTTON_1 -key 289 BUTTON_2 -key 290 BUTTON_3 -key 291 BUTTON_4 -key 292 BUTTON_5 -key 293 BUTTON_6 -key 294 BUTTON_7 -key 295 BUTTON_8 -key 296 BUTTON_9 -key 297 BUTTON_10 -key 298 BUTTON_11 -key 299 BUTTON_12 -key 300 BUTTON_13 -key 301 BUTTON_14 -key 302 BUTTON_15 -key 303 BUTTON_16 - - -key 304 BUTTON_A -key 305 BUTTON_B -key 306 BUTTON_C -key 307 BUTTON_X -key 308 BUTTON_Y -key 309 BUTTON_Z -key 310 BUTTON_L1 -key 311 BUTTON_R1 -key 312 BUTTON_L2 -key 313 BUTTON_R2 -key 314 BUTTON_SELECT -key 315 BUTTON_START -key 316 BUTTON_MODE -key 317 BUTTON_THUMBL -key 318 BUTTON_THUMBR - - -# key 352 "KEY_OK" -# key 353 "KEY_SELECT" -# key 354 "KEY_GOTO" -# key 355 "KEY_CLEAR" -# key 356 "KEY_POWER2" -# key 357 "KEY_OPTION" -# key 358 "KEY_INFO" -# key 359 "KEY_TIME" -# key 360 "KEY_VENDOR" -# key 361 "KEY_ARCHIVE" -key 362 GUIDE -# key 363 "KEY_CHANNEL" -# key 364 "KEY_FAVORITES" -# key 365 "KEY_EPG" -key 366 DVR -# key 367 "KEY_MHP" -# key 368 "KEY_LANGUAGE" -# key 369 "KEY_TITLE" -# key 370 "KEY_SUBTITLE" -# key 371 "KEY_ANGLE" -# key 372 "KEY_ZOOM" -# key 373 "KEY_MODE" -# key 374 "KEY_KEYBOARD" -# key 375 "KEY_SCREEN" -# key 376 "KEY_PC" -key 377 TV -# key 378 "KEY_TV2" -# key 379 "KEY_VCR" -# key 380 "KEY_VCR2" -# key 381 "KEY_SAT" -# key 382 "KEY_SAT2" -# key 383 "KEY_CD" -# key 384 "KEY_TAPE" -# key 385 "KEY_RADIO" -# key 386 "KEY_TUNER" -# key 387 "KEY_PLAYER" -# key 388 "KEY_TEXT" -# key 389 "KEY_DVD" -# key 390 "KEY_AUX" -# key 391 "KEY_MP3" -# key 392 "KEY_AUDIO" -# key 393 "KEY_VIDEO" -# key 394 "KEY_DIRECTORY" -# key 395 "KEY_LIST" -# key 396 "KEY_MEMO" -key 397 CALENDAR -# key 398 "KEY_RED" -# key 399 "KEY_GREEN" -# key 400 "KEY_YELLOW" -# key 401 "KEY_BLUE" -key 402 CHANNEL_UP -key 403 CHANNEL_DOWN -# key 404 "KEY_FIRST" -# key 405 "KEY_LAST" -# key 406 "KEY_AB" -# key 407 "KEY_NEXT" -# key 408 "KEY_RESTART" -# key 409 "KEY_SLOW" -# key 410 "KEY_SHUFFLE" -# key 411 "KEY_BREAK" -# key 412 "KEY_PREVIOUS" -# key 413 "KEY_DIGITS" -# key 414 "KEY_TEEN" -# key 415 "KEY_TWEN" - -key 429 CONTACTS - -# key 448 "KEY_DEL_EOL" -# key 449 "KEY_DEL_EOS" -# key 450 "KEY_INS_LINE" -# key 451 "KEY_DEL_LINE" - - -key 464 FUNCTION -key 465 ESCAPE FUNCTION -key 466 F1 FUNCTION -key 467 F2 FUNCTION -key 468 F3 FUNCTION -key 469 F4 FUNCTION -key 470 F5 FUNCTION -key 471 F6 FUNCTION -key 472 F7 FUNCTION -key 473 F8 FUNCTION -key 474 F9 FUNCTION -key 475 F10 FUNCTION -key 476 F11 FUNCTION -key 477 F12 FUNCTION -key 478 1 FUNCTION -key 479 2 FUNCTION -key 480 D FUNCTION -key 481 E FUNCTION -key 482 F FUNCTION -key 483 S FUNCTION -key 484 B FUNCTION - - -# key 497 KEY_BRL_DOT1 -# key 498 KEY_BRL_DOT2 -# key 499 KEY_BRL_DOT3 -# key 500 KEY_BRL_DOT4 -# key 501 KEY_BRL_DOT5 -# key 502 KEY_BRL_DOT6 -# key 503 KEY_BRL_DOT7 -# key 504 KEY_BRL_DOT8 - - -# Joystick and game controller axes. -# Axes that are not mapped will be assigned generic axis numbers by the input subsystem. -axis 0x00 X -axis 0x01 Y -axis 0x02 Z -axis 0x03 RX -axis 0x04 RY -axis 0x05 RZ -axis 0x06 THROTTLE -axis 0x07 RUDDER -axis 0x08 WHEEL -axis 0x09 GAS -axis 0x0a BRAKE -axis 0x10 HAT_X -axis 0x11 HAT_Y diff --git a/keylayout/Vendor_045e_Product_028e.kl b/keylayout/Vendor_045e_Product_028e.kl deleted file mode 100644 index 99f046a..0000000 --- a/keylayout/Vendor_045e_Product_028e.kl +++ /dev/null @@ -1,46 +0,0 @@ -# Copyright (C) 2011 The Android Open Source Project -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -# -# XBox 360 USB Controller -# - -key 304 BUTTON_A -key 305 BUTTON_B -key 307 BUTTON_X -key 308 BUTTON_Y -key 310 BUTTON_L1 -key 311 BUTTON_R1 -key 314 BUTTON_SELECT -key 315 BUTTON_START -key 316 BUTTON_MODE -key 317 BUTTON_THUMBL -key 318 BUTTON_THUMBR - -# Left and right stick. -# The reported value for flat is 128 out of a range from -32767 to 32768, which is absurd. -# This confuses applications that rely on the flat value because the joystick actually -# settles in a flat range of +/- 4096 or so. -axis 0x00 X flat 4096 -axis 0x01 Y flat 4096 -axis 0x03 Z flat 4096 -axis 0x04 RZ flat 4096 - -# Triggers. -axis 0x02 LTRIGGER -axis 0x05 RTRIGGER - -# Hat. -axis 0x10 HAT_X -axis 0x11 HAT_Y diff --git a/keylayout/Vendor_046d_Product_c216.kl b/keylayout/Vendor_046d_Product_c216.kl deleted file mode 100644 index 6743323..0000000 --- a/keylayout/Vendor_046d_Product_c216.kl +++ /dev/null @@ -1,37 +0,0 @@ -# Copyright (C) 2011 The Android Open Source Project -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -# -# Logitech Dual Action Controller -# - -key 0x120 BUTTON_A -key 0x123 BUTTON_B -key 0x121 BUTTON_X -key 0x122 BUTTON_Y -key 0x124 BUTTON_L1 -key 0x125 BUTTON_R1 -key 0x126 BUTTON_L2 -key 0x127 BUTTON_R2 -key 0x128 BUTTON_SELECT -key 0x129 BUTTON_START -key 0x12a BUTTON_THUMBL -key 0x12b BUTTON_THUMBR - -axis 0x00 X -axis 0x01 Y -axis 0x02 Z -axis 0x05 RZ -axis 0x10 HAT_X -axis 0x11 HAT_Y diff --git a/keylayout/Vendor_046d_Product_c294.kl b/keylayout/Vendor_046d_Product_c294.kl deleted file mode 100644 index 5492f49..0000000 --- a/keylayout/Vendor_046d_Product_c294.kl +++ /dev/null @@ -1,53 +0,0 @@ -# Copyright (C) 2011 The Android Open Source Project -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -# -# Logitech G25 Racing Wheel (in Compatibility Mode) -# - -# 4 way buttons above hat -key 0x121 BUTTON_A -key 0x123 BUTTON_B -key 0x120 BUTTON_X -key 0x122 BUTTON_Y - -# Row of buttons under hat -key 0x12b BUTTON_1 -key 0x128 BUTTON_2 -key 0x129 BUTTON_3 -key 0x12a BUTTON_4 - -# Gear shift positions -# 0x12a top-left gear (aliased as BUTTON_4) -# 0x12b bottom-left gear (aliased as BUTTON_1) - -# Buttons on wheel -key 0x127 BUTTON_L1 -key 0x126 BUTTON_R1 - -# Toggles under wheel -key 0x125 BUTTON_L2 -key 0x124 BUTTON_R2 - -# Hat -axis 0x10 HAT_X -axis 0x11 HAT_Y - -# Steering Wheel -axis 0x00 WHEEL - -# Accelerator / Brake -# 00..7e : accelerator -# 80..ff : brake -axis 0x01 split 0x7f GAS BRAKE diff --git a/keylayout/Vendor_046d_Product_c299.kl b/keylayout/Vendor_046d_Product_c299.kl deleted file mode 100644 index d42963d..0000000 --- a/keylayout/Vendor_046d_Product_c299.kl +++ /dev/null @@ -1,62 +0,0 @@ -# Copyright (C) 2011 The Android Open Source Project -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -# -# Logitech G25 Racing Wheel (in Native Mode) -# - -# 4 way buttons above hat -key 0x121 BUTTON_A -key 0x123 BUTTON_B -key 0x120 BUTTON_X -key 0x122 BUTTON_Y - -# Row of buttons under hat -key 0x12b BUTTON_1 -key 0x128 BUTTON_2 -key 0x129 BUTTON_3 -key 0x12a BUTTON_4 - -# Gear shift positions -key 0x12c BUTTON_5 -key 0x12d BUTTON_6 -key 0x12e BUTTON_7 -key 0x12f BUTTON_8 -key 0x2d0 BUTTON_9 -key 0x2d1 BUTTON_10 -key 0x2d2 BUTTON_11 - -# Buttons on wheel -key 0x127 BUTTON_L1 -key 0x126 BUTTON_R1 - -# Toggles under wheel -key 0x125 BUTTON_L2 -key 0x124 BUTTON_R2 - -# Hat -axis 0x10 HAT_X -axis 0x11 HAT_Y - -# Steering Wheel -axis 0x00 WHEEL - -# Clutch -axis 0x01 invert GENERIC_1 - -# Accelerator -axis 0x02 invert GAS - -# Brake -axis 0x05 invert BRAKE diff --git a/keylayout/Vendor_046d_Product_c532.kl b/keylayout/Vendor_046d_Product_c532.kl deleted file mode 100644 index 741c2e1..0000000 --- a/keylayout/Vendor_046d_Product_c532.kl +++ /dev/null @@ -1,133 +0,0 @@ -# Copyright (C) 2010 The Android Open Source Project -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -# -# Logitech Revue Wireless keyboard -# -# Notes: -# - The GRAVE key is emulated by the keyboard. -# ALT + LEFT_BRACKET produces GRAVE. -# ALT + RIGHT_BRACKET produces SHIFT + GRAVE. -# - FORWARD_DEL is produced by fn + BACKSPACE -# - PAGE_UP / PAGE_DOWN is produced by fn + CHANNEL_UP / CHANNEL_DOWN -# - The AVR / STB / TV power and input buttons seem to be non-functional -# as well as several of the other fn buttons and the PIP button? - -key 1 ESCAPE -key 2 1 -key 3 2 -key 4 3 -key 5 4 -key 6 5 -key 7 6 -key 8 7 -key 9 8 -key 10 9 -key 11 0 -key 12 MINUS -key 13 EQUALS -key 14 DEL -key 15 TAB -key 16 Q -key 17 W -key 18 E -key 19 R -key 20 T -key 21 Y -key 22 U -key 23 I -key 24 O -key 25 P -key 26 LEFT_BRACKET -key 27 RIGHT_BRACKET -key 28 ENTER -key 29 CTRL_LEFT -key 30 A -key 31 S -key 32 D -key 33 F -key 34 G -key 35 H -key 36 J -key 37 K -key 38 L -key 39 SEMICOLON -key 40 APOSTROPHE -key 41 GRAVE -key 42 SHIFT_LEFT -key 43 BACKSLASH -key 44 Z -key 45 X -key 46 C -key 47 V -key 48 B -key 49 N -key 50 M -key 51 COMMA -key 52 PERIOD -key 53 SLASH -key 54 SHIFT_RIGHT -key 56 ALT_RIGHT -key 57 SPACE -key 58 CAPS_LOCK -key 59 F1 -key 60 F2 -key 61 F3 -key 62 F4 -key 63 F5 -key 64 F6 -key 65 F7 -key 66 F8 -key 67 F9 -key 68 F10 -key 87 F11 -key 88 F12 -key 96 DPAD_CENTER -key 97 CTRL_RIGHT -key 102 MOVE_HOME -key 103 DPAD_UP -key 104 PAGE_UP -key 105 DPAD_LEFT -key 106 DPAD_RIGHT -key 107 MOVE_END -key 108 DPAD_DOWN -key 109 PAGE_DOWN -key 110 NUMPAD_ENTER -key 111 FORWARD_DEL -key 113 VOLUME_MUTE -key 114 VOLUME_DOWN -key 115 VOLUME_UP -key 119 MEDIA_PAUSE -key 125 SEARCH -key 127 MENU -key 156 BOOKMARK -key 158 BACK -key 163 MEDIA_NEXT -key 165 MEDIA_PREVIOUS -key 166 MEDIA_STOP -key 167 MEDIA_RECORD -key 168 MEDIA_REWIND -key 172 HOME -key 207 MEDIA_PLAY -key 208 MEDIA_FAST_FORWARD -# key 288 left mouse button -# key 289 right mouse button (fn + button) -key 362 GUIDE -key 366 DVR -key 377 TV -key 402 CHANNEL_UP -key 403 CHANNEL_DOWN -key 418 ZOOM_IN -key 419 ZOOM_OUT - diff --git a/keylayout/Vendor_054c_Product_0268.kl b/keylayout/Vendor_054c_Product_0268.kl deleted file mode 100644 index f8ac6a3..0000000 --- a/keylayout/Vendor_054c_Product_0268.kl +++ /dev/null @@ -1,76 +0,0 @@ -# Copyright (C) 2011 The Android Open Source Project -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -# -# Sony Playstation(R)3 Controller -# - -key 0x124 DPAD_UP -key 0x125 DPAD_RIGHT -key 0x126 DPAD_DOWN -key 0x127 DPAD_LEFT - -key 0x120 BUTTON_SELECT -key 0x123 BUTTON_START -key 0x12f BUTTON_A -key 0x12c BUTTON_B -key 0x12e BUTTON_X -key 0x12d BUTTON_Y -key 0x12a BUTTON_L1 -key 0x12b BUTTON_R1 -key 0x128 BUTTON_L2 -key 0x129 BUTTON_R2 -key 0x121 BUTTON_THUMBL -key 0x122 BUTTON_THUMBR - -# PS key -key 0x2d0 BUTTON_1 - -# Left Analog Stick -axis 0x00 X -axis 0x01 Y - -# Right Analog Stick -axis 0x02 Z -axis 0x05 RZ - -# DPAD -# axis 0x2c -HAT_Y -# axis 0x2d +HAT_X -# axis 0x2e +HAT_Y -# axis 0x2f -HAT_X - -# L2 trigger -axis 0x30 LTRIGGER - -# R2 trigger -axis 0x31 RTRIGGER - -# L1 trigger -# axis 0x32 - -# R1 trigger -# axis 0x33 - -# Triangle -# axis 0x34 - -# Circle -# axis 0x35 - -# Cross -# axis 0x36 - -# Square -# axis 0x37 diff --git a/keylayout/Vendor_05ac_Product_0239.kl b/keylayout/Vendor_05ac_Product_0239.kl deleted file mode 100644 index 6bd3753..0000000 --- a/keylayout/Vendor_05ac_Product_0239.kl +++ /dev/null @@ -1,119 +0,0 @@ -# Copyright (C) 2010 The Android Open Source Project -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -# -# Apple Wireless Keyboard -# -# Notes: -# - Keys such as PAGE_UP and FORWARD_DEL are produced using the -# function key. -# - Special function keys for brightness control, etc. are not -# implemented here. - -key 1 ESCAPE -key 2 1 -key 3 2 -key 4 3 -key 5 4 -key 6 5 -key 7 6 -key 8 7 -key 9 8 -key 10 9 -key 11 0 -key 12 MINUS -key 13 EQUALS -key 14 DEL -key 15 TAB -key 16 Q -key 17 W -key 18 E -key 19 R -key 20 T -key 21 Y -key 22 U -key 23 I -key 24 O -key 25 P -key 26 LEFT_BRACKET -key 27 RIGHT_BRACKET -key 28 ENTER -key 29 CTRL_LEFT -key 30 A -key 31 S -key 32 D -key 33 F -key 34 G -key 35 H -key 36 J -key 37 K -key 38 L -key 39 SEMICOLON -key 40 APOSTROPHE -key 41 GRAVE -key 42 SHIFT_LEFT -key 43 BACKSLASH -key 44 Z -key 45 X -key 46 C -key 47 V -key 48 B -key 49 N -key 50 M -key 51 COMMA -key 52 PERIOD -key 53 SLASH -key 54 SHIFT_RIGHT -key 56 ALT_LEFT -key 57 SPACE -key 58 CAPS_LOCK -key 59 F1 -key 60 F2 -key 61 F3 -key 62 F4 -key 63 F5 -key 64 F6 -key 65 F7 -key 66 F8 -key 67 F9 -key 68 F10 -key 87 F11 -key 88 F12 -key 100 ALT_RIGHT -key 102 MOVE_HOME -key 103 DPAD_UP -key 104 PAGE_UP -key 105 DPAD_LEFT -key 106 DPAD_RIGHT -key 107 MOVE_END -key 108 DPAD_DOWN -key 109 PAGE_DOWN -key 110 NUMPAD_ENTER -key 111 FORWARD_DEL -key 113 VOLUME_MUTE -key 114 VOLUME_DOWN -key 115 VOLUME_UP -key 120 APP_SWITCH -key 125 META_LEFT -key 126 META_RIGHT -key 161 MEDIA_EJECT -key 163 MEDIA_NEXT -key 164 MEDIA_PLAY_PAUSE -key 165 MEDIA_PREVIOUS -# key 204 show gadgets -# key 224 reduce brightness -# key 225 increase brightness -# key 229 blank special function on F5 -# key 230 blank special function on F6 -key 464 FUNCTION diff --git a/keylayout/Vendor_22b8_Product_093d.kl b/keylayout/Vendor_22b8_Product_093d.kl deleted file mode 100644 index 2749c5b..0000000 --- a/keylayout/Vendor_22b8_Product_093d.kl +++ /dev/null @@ -1,105 +0,0 @@ -# Copyright (C) 2010 The Android Open Source Project -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -# -# Motorola Bluetooth Wireless Keyboard. -# - -key 1 BACK -key 2 1 -key 3 2 -key 4 3 -key 5 4 -key 6 5 -key 7 6 -key 8 7 -key 9 8 -key 10 9 -key 11 0 -key 12 MINUS -key 13 EQUALS -key 14 DEL -key 15 TAB -key 16 Q -key 17 W -key 18 E -key 19 R -key 20 T -key 21 Y -key 22 U -key 23 I -key 24 O -key 25 P -key 26 LEFT_BRACKET -key 27 RIGHT_BRACKET -key 28 ENTER -key 29 CTRL_LEFT -key 30 A -key 31 S -key 32 D -key 33 F -key 34 G -key 35 H -key 36 J -key 37 K -key 38 L -key 39 SEMICOLON -key 40 APOSTROPHE -key 41 GRAVE -key 42 SHIFT_LEFT -key 43 BACKSLASH -key 44 Z -key 45 X -key 46 C -key 47 V -key 48 B -key 49 N -key 50 M -key 51 COMMA -key 52 PERIOD -key 53 SLASH -key 54 SHIFT_RIGHT -key 56 ALT_LEFT -key 57 SPACE -key 58 CAPS_LOCK -key 59 F1 -key 60 F2 -key 61 F3 -key 62 F4 -key 63 F5 -key 64 F6 -key 65 F7 -key 66 F8 -key 67 F9 -key 68 F10 -key 87 F11 -key 88 F12 -key 97 CTRL_RIGHT -key 102 HOME -key 103 DPAD_UP -key 105 DPAD_LEFT -key 106 DPAD_RIGHT -key 107 MOVE_END -key 108 DPAD_DOWN -key 111 FORWARD_DEL -key 113 VOLUME_MUTE -key 114 VOLUME_DOWN -key 115 VOLUME_UP -key 125 MENU -key 127 SEARCH -key 163 MEDIA_NEXT -key 164 MEDIA_PLAY_PAUSE -key 165 MEDIA_PREVIOUS -key 166 MEDIA_STOP -# key 226 tbd reserved key diff --git a/msm8974.mk b/msm8974.mk index 8e8e839..82667db 100644 --- a/msm8974.mk +++ b/msm8974.mk @@ -12,94 +12,136 @@ # See the License for the specific language governing permissions and # limitations under the License. +# Overlays +DEVICE_PACKAGE_OVERLAYS += device/samsung/msm8974-common/overlay + # Permissions PRODUCT_COPY_FILES += \ - frameworks/native/data/etc/handheld_core_hardware.xml:system/etc/permissions/handheld_core_hardware.xml \ + frameworks/native/data/etc/android.hardware.audio.low_latency.xml:system/etc/permissions/android.hardware.audio.low_latency.xml \ + frameworks/native/data/etc/android.hardware.bluetooth_le.xml:system/etc/permissions/android.hardware.bluetooth_le.xml \ frameworks/native/data/etc/android.hardware.camera.flash-autofocus.xml:system/etc/permissions/android.hardware.camera.flash-autofocus.xml \ frameworks/native/data/etc/android.hardware.camera.front.xml:system/etc/permissions/android.hardware.camera.front.xml \ + frameworks/native/data/etc/android.hardware.consumerir.xml:system/etc/permissions/android.hardware.consumerir.xml \ frameworks/native/data/etc/android.hardware.location.gps.xml:system/etc/permissions/android.hardware.location.gps.xml \ - frameworks/native/data/etc/android.hardware.wifi.xml:system/etc/permissions/android.hardware.wifi.xml \ - frameworks/native/data/etc/android.hardware.wifi.direct.xml:system/etc/permissions/android.hardware.wifi.direct.xml \ - frameworks/native/data/etc/android.hardware.sensor.proximity.xml:system/etc/permissions/android.hardware.sensor.proximity.xml \ - frameworks/native/data/etc/android.hardware.sensor.light.xml:system/etc/permissions/android.hardware.sensor.light.xml \ - frameworks/native/data/etc/android.hardware.sensor.gyroscope.xml:system/etc/permissions/android.hardware.sensor.gyroscope.xml \ - frameworks/native/data/etc/android.hardware.touchscreen.multitouch.jazzhand.xml:system/etc/permissions/android.hardware.touchscreen.multitouch.jazzhand.xml \ frameworks/native/data/etc/android.hardware.sensor.barometer.xml:system/etc/permissions/android.hardware.sensor.barometer.xml \ + frameworks/native/data/etc/android.hardware.sensor.gyroscope.xml:system/etc/permissions/android.hardware.sensor.gyroscope.xml \ + frameworks/native/data/etc/android.hardware.sensor.light.xml:system/etc/permissions/android.hardware.sensor.light.xml \ + frameworks/native/data/etc/android.hardware.sensor.proximity.xml:system/etc/permissions/android.hardware.sensor.proximity.xml \ + frameworks/native/data/etc/android.hardware.touchscreen.multitouch.jazzhand.xml:system/etc/permissions/android.hardware.touchscreen.multitouch.jazzhand.xml \ frameworks/native/data/etc/android.hardware.usb.accessory.xml:system/etc/permissions/android.hardware.usb.accessory.xml \ frameworks/native/data/etc/android.hardware.usb.host.xml:system/etc/permissions/android.hardware.usb.host.xml \ - frameworks/native/data/etc/android.software.sip.voip.xml:system/etc/permissions/android.software.sip.voip.xml \ - frameworks/base/nfc-extras/com.android.nfc_extras.xml:system/etc/permissions/com.android.nfc_extras.xml \ - frameworks/native/data/etc/android.hardware.nfc.xml:system/etc/permissions/android.hardware.nfc.xml \ - frameworks/native/data/etc/android.hardware.nfc.hce.xml:system/etc/permissions/android.hardware.nfc.hce.xml \ - frameworks/native/data/etc/com.nxp.mifare.xml:system/etc/permissions/com.nxp.mifare.xml \ - frameworks/native/data/etc/android.hardware.telephony.gsm.xml:system/etc/permissions/android.hardware.telephony.gsm.xml \ - frameworks/native/data/etc/android.hardware.telephony.cdma.xml:system/etc/permissions/android.hardware.telephony.cdma.xml \ - frameworks/native/data/etc/android.hardware.bluetooth_le.xml:system/etc/permissions/android.hardware.bluetooth_le.xml \ - packages/wallpapers/LivePicker/android.software.live_wallpaper.xml:system/etc/permissions/android.software.live_wallpaper.xml + frameworks/native/data/etc/android.hardware.wifi.xml:system/etc/permissions/android.hardware.wifi.xml \ + frameworks/native/data/etc/android.hardware.wifi.direct.xml:system/etc/permissions/android.hardware.wifi.direct.xml \ + frameworks/native/data/etc/android.software.sip.voip.xml:system/etc/permissions/android.software.sip.voip.xml + +# System properties +PRODUCT_PROPERTY_OVERRIDES += \ + af.resampler.quality=4 \ + audio.offload.buffer.size.kb=32 \ + audio.offload.gapless.enabled=false \ + av.offload.enable=true \ + qcom.hw.aac.encoder=true + +PRODUCT_PROPERTY_OVERRIDES += \ + ro.opengles.version=196608 + +PRODUCT_PROPERTY_OVERRIDES += \ + persist.rild.nitz_plmn="" \ + persist.rild.nitz_long_ons_0="" \ + persist.rild.nitz_long_ons_1="" \ + persist.rild.nitz_long_ons_2="" \ + persist.rild.nitz_long_ons_3="" \ + persist.rild.nitz_short_ons_0="" \ + persist.rild.nitz_short_ons_1="" \ + persist.rild.nitz_short_ons_2="" \ + persist.rild.nitz_short_ons_3="" + +PRODUCT_PROPERTY_OVERRIDES += \ + ro.vendor.extension_library=/vendor/lib/libqc-opt.so + +PRODUCT_PROPERTY_OVERRIDES += \ + persist.timed.enable=true + +PRODUCT_DEFAULT_PROPERTY_OVERRIDES += \ + persist.sys.usb.config=mtp # Audio PRODUCT_PACKAGES += \ + audiod \ audio_policy.msm8974 \ - audio.primary.msm8974 \ audio.a2dp.default \ - audio.usb.default \ + audio.primary.msm8974 \ audio.r_submix.default \ - libaudio-resampler + audio.usb.default \ + libaudio-resampler \ + libqcomvisualizer \ + libqcomvoiceprocessing \ + tinymix -# Camera Wrapper +# Camera PRODUCT_PACKAGES += \ - camera.msm8974 + camera.msm8974 \ + libxml2 -# HAL +# CRDA +PRODUCT_PACKAGES += \ + crda \ + linville.key.pub.pem \ + regdbdump \ + regulatory.bin + +# Display PRODUCT_PACKAGES += \ copybit.msm8974 \ gralloc.msm8974 \ hwcomposer.msm8974 \ - power.msm8974 \ memtrack.msm8974 -# Misc +# IR +PRODUCT_PACKAGES += \ + consumerir.msm8974 + +# Keylayouts +PRODUCT_COPY_FILES += \ + device/samsung/msm8974-common/keylayout/cyttsp-i2c.kl:system/usr/keylayout/cyttsp-i2c.kl \ + device/samsung/msm8974-common/keylayout/keypad_8960.kl:system/usr/keylayout/keypad_8960.kl \ + device/samsung/msm8974-common/keylayout/Vendor_04e8_Product_7021.kl:system/usr/keylayout/Vendor_04e8_Product_7021.kl + +# Media +PRODUCT_COPY_FILES += \ + device/samsung/msm8974-common/configs/media_codecs.xml:system/etc/media_codecs.xml + +PRODUCT_PACKAGES += \ + qcmediaplayer + +PRODUCT_BOOT_JARS += \ + qcmediaplayer + +# OMX +PRODUCT_PACKAGES += \ + libdashplayer \ + libOmxCore \ + libOmxVdec \ + libOmxVdecHevc \ + libOmxVenc \ + libOmxAacEnc \ + libOmxAmrEnc \ + libOmxEvrcEnc \ + libOmxQcelp13Enc \ + libstagefrighthw + +# Power HAL +PRODUCT_PACKAGES += \ + power.msm8974 + +# QRNGD +PRODUCT_PACKAGES += \ + qrngd \ + qrngp + +# USB PRODUCT_PACKAGES += \ com.android.future.usb.accessory -# Live Wallpapers -PRODUCT_PACKAGES += \ - LiveWallpapers \ - LiveWallpapersPicker \ - VisualizationWallpapers \ - librs_jni - -# keylayouts -PRODUCT_COPY_FILES += \ - device/samsung/msm8974-common/keylayout/AVRCP.kl:system/usr/keylayout/AVRCP.kl \ - device/samsung/msm8974-common/keylayout/Generic.kl:system/usr/keylayout/Generic.kl \ - device/samsung/msm8974-common/keylayout/cyttsp-i2c.kl:system/usr/keylayout/cyttsp-i2c.kl \ - device/samsung/msm8974-common/keylayout/keypad_8960.kl:system/usr/keylayout/keypad_8960.kl \ - device/samsung/msm8974-common/keylayout/Vendor_045e_Product_028e.kl:system/usr/keylayout/Vendor_045e_Product_028e.kl \ - device/samsung/msm8974-common/keylayout/Vendor_046d_Product_c216.kl:system/usr/keylayout/Vendor_046d_Product_c216.kl \ - device/samsung/msm8974-common/keylayout/Vendor_046d_Product_c294.kl:system/usr/keylayout/Vendor_046d_Product_c294.kl \ - device/samsung/msm8974-common/keylayout/Vendor_046d_Product_c299.kl:system/usr/keylayout/Vendor_046d_Product_c299.kl \ - device/samsung/msm8974-common/keylayout/Vendor_046d_Product_c532.kl:system/usr/keylayout/Vendor_046d_Product_c532.kl \ - device/samsung/msm8974-common/keylayout/Vendor_04e8_Product_7021.kl:system/usr/keylayout/Vendor_04e8_Product_7021.kl \ - device/samsung/msm8974-common/keylayout/Vendor_054c_Product_0268.kl:system/usr/keylayout/Vendor_054c_Product_0268.kl \ - device/samsung/msm8974-common/keylayout/Vendor_05ac_Product_0239.kl:system/usr/keylayout/Vendor_05ac_Product_0239.kl \ - device/samsung/msm8974-common/keylayout/Vendor_22b8_Product_093d.kl:system/usr/keylayout/Vendor_22b8_Product_093d.kl - -# Keychars -PRODUCT_COPY_FILES += \ - device/samsung/msm8974-common/keychars/Generic.kcm:system/usr/keychars/Generic.kcm \ - device/samsung/msm8974-common/keychars/Virtual.kcm:system/usr/keychars/Virtual.kcm - -# Needed to reset bootmode when leaving recovery -PRODUCT_COPY_FILES += \ - $(LOCAL_PATH)/recovery/postrecoveryboot.sh:recovery/root/sbin/postrecoveryboot.sh \ - $(LOCAL_PATH)/recovery/postrecoveryboot.sh:recovery/system/bin/postrecoveryboot.sh - -# We have enough storage space to hold precise GC data -PRODUCT_TAGS += dalvik.gc.type-precise - -# Common overlay -DEVICE_PACKAGE_OVERLAYS += device/samsung/msm8974-common/overlay - # common msm8974 $(call inherit-product, device/samsung/qcom-common/qcom-common.mk) diff --git a/overlay/frameworks/base/core/res/res/values/arrays.xml b/overlay/frameworks/base/core/res/res/values/arrays.xml deleted file mode 100644 index 9f01c37..0000000 --- a/overlay/frameworks/base/core/res/res/values/arrays.xml +++ /dev/null @@ -1,37 +0,0 @@ - - - - - - - @string/reboot_reboot - @string/reboot_recovery - @string/reboot_download - - - - - - recovery - download - - - diff --git a/overlay/frameworks/base/core/res/res/values/config.xml b/overlay/frameworks/base/core/res/res/values/config.xml deleted file mode 100644 index 3aa63f9..0000000 --- a/overlay/frameworks/base/core/res/res/values/config.xml +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - false - - - true - - diff --git a/overlay/frameworks/base/core/res/res/values/strings.xml b/overlay/frameworks/base/core/res/res/values/strings.xml deleted file mode 100644 index ff4d559..0000000 --- a/overlay/frameworks/base/core/res/res/values/strings.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - Network Extender - diff --git a/recovery/postrecoveryboot.sh b/recovery/postrecoveryboot.sh deleted file mode 100644 index c6d88b8..0000000 --- a/recovery/postrecoveryboot.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/sbin/sh - -# The partition to use is named "PARAM" and can be found by dumping the PIT. - -# 0: charge -# 1: direct -# 2: recovery_enter -# 3: recovery_end -# 4: download_end - -echo -n -e '\x03\x00\x00\x00' > /dev/block/platform/msm_sdcc.1/by-name/param