Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 42e514b0 authored by Jeff Brown's avatar Jeff Brown Committed by Android (Google) Code Review
Browse files

Merge "Port Emulator keymaps."

parents 9123cbfe 061cf758
Loading
Loading
Loading
Loading
+19 −0
Original line number Diff line number Diff line
# 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.

# This makefile performs build time validation of framework keymap files.

LOCAL_PATH := $(call my-dir)

include $(LOCAL_PATH)/common.mk
+26 −0
Original line number Diff line number Diff line
@@ -22,6 +22,8 @@

type FULL

### Basic QWERTY keys ###

key A {
    label:                              'A'
    base:                               'a'
@@ -369,6 +371,8 @@ key APOSTROPHE {
    ctrl, alt, meta:                    none
}

### Numeric keypad ###

key NUMPAD_0 {
    label, number:                      '0'
    base:                               fallback INSERT
@@ -499,3 +503,25 @@ key NUMPAD_ENTER {
    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:                               '+'
}
+26 −0
Original line number Diff line number Diff line
@@ -19,6 +19,8 @@

type FULL

### Basic QWERTY keys ###

key A {
    label:                              'A'
    base:                               'a'
@@ -366,6 +368,8 @@ key APOSTROPHE {
    ctrl, alt, meta:                    none
}

### Numeric keypad ###

key NUMPAD_0 {
    label, number:                      '0'
    base:                               fallback INSERT
@@ -496,3 +500,25 @@ key NUMPAD_ENTER {
    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:                               '+'
}
+30 −0
Original line number Diff line number Diff line
# 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.

# This is the list of framework provided keylayouts and key character maps to include.
# Used by Android.mk and keyboards.mk.

keylayouts := \
    AVRCP.kl \
    Generic.kl \
    Motorola_Bluetooth_Wireless_Keyboard.kl \
    qwerty.kl \
    qwerty2.kl

keycharmaps := \
    Generic.kcm \
    Virtual.kcm \
    Motorola_Bluetooth_Wireless_Keyboard.kcm \
    qwerty.kcm \
    qwerty2.kcm
+2 −10
Original line number Diff line number Diff line
@@ -14,15 +14,7 @@

# Warning: this is actually a product definition, to be inherited from

keylayouts := \
    AVRCP.kl \
    Generic.kl \
    Motorola_Bluetooth_Wireless_Keyboard.kl

keycharmaps := \
    Generic.kcm \
    Virtual.kcm \
    Motorola_Bluetooth_Wireless_Keyboard.kcm
include $(LOCAL_PATH)/common.mk

PRODUCT_COPY_FILES := $(foreach file,$(keylayouts),\
    frameworks/base/data/keyboards/$(file):system/usr/keylayout/$(file))
@@ -30,4 +22,4 @@ PRODUCT_COPY_FILES := $(foreach file,$(keylayouts),\
PRODUCT_COPY_FILES += $(foreach file,$(keycharmaps),\
    frameworks/base/data/keyboards/$(file):system/usr/keychars/$(file))

PRODUCT_PACKAGES := $(keycharmaps)
PRODUCT_PACKAGES := $(keylayouts) $(keycharmaps)
Loading