diff options
author | Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de> | 2015-12-17 18:37:41 +0100 |
---|---|---|
committer | Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de> | 2015-12-17 18:37:41 +0100 |
commit | 48cbe74013f64ae5cd8d47ad56b8fc9e301cd6d3 (patch) | |
tree | 140491ed6e10eb1f61cad29c366ad9d7f2ccfbcd /usr | |
parent | 170e8cf8f0608848e2acb354faf0d2203fb2d08a (diff) | |
parent | 4ab492610e6f9654a4f51426d5e8f4871b338063 (diff) | |
download | device_samsung_i9300-48cbe74013f64ae5cd8d47ad56b8fc9e301cd6d3.zip device_samsung_i9300-48cbe74013f64ae5cd8d47ad56b8fc9e301cd6d3.tar.gz device_samsung_i9300-48cbe74013f64ae5cd8d47ad56b8fc9e301cd6d3.tar.bz2 |
Merge remote-tracking branch 'replicant/replicant-4.2' into replicant-6.0
ril and vibrator do not work
Signed-off-by: Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de>
Conflicts:
cm.mk
i9300.mk
include/telephony/ril.h
init.smdk4x12.rc
overlay/frameworks/base/core/res/res/values/config.xml
system.prop
Diffstat (limited to 'usr')
-rw-r--r-- | usr/idc/melfas_ts.idc | 24 | ||||
-rw-r--r-- | usr/idc/sec_touchscreen.idc | 26 | ||||
-rw-r--r-- | usr/keylayout/gpio-keys.kl | 4 | ||||
-rw-r--r-- | usr/keylayout/sec_touchkey.kl | 2 | ||||
-rw-r--r-- | usr/keylayout/sii9234_rcp.kl | 28 |
5 files changed, 84 insertions, 0 deletions
diff --git a/usr/idc/melfas_ts.idc b/usr/idc/melfas_ts.idc new file mode 100644 index 0000000..703e73b --- /dev/null +++ b/usr/idc/melfas_ts.idc @@ -0,0 +1,24 @@ +# 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. + +# +# Input Device Configuration File for the Atmel Maxtouch touch screen. +# +# These calibration values are derived from empirical measurements +# and may not be appropriate for use with other touch screens. +# Refer to the input device configuration documentation for more details. +# + +# Basic Parameters +touch.deviceType = touchScreen diff --git a/usr/idc/sec_touchscreen.idc b/usr/idc/sec_touchscreen.idc new file mode 100644 index 0000000..bf1f147 --- /dev/null +++ b/usr/idc/sec_touchscreen.idc @@ -0,0 +1,26 @@ +# 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. + +# +# Input Device Configuration File for the Atmel Maxtouch touch screen. +# +# These calibration values are derived from empirical measurements +# and may not be appropriate for use with other touch screens. +# Refer to the input device configuration documentation for more details. +# + +# Basic Parameters +touch.deviceType = touchScreen +touch.orientationAware = 1 + diff --git a/usr/keylayout/gpio-keys.kl b/usr/keylayout/gpio-keys.kl new file mode 100644 index 0000000..7014d5c --- /dev/null +++ b/usr/keylayout/gpio-keys.kl @@ -0,0 +1,4 @@ +key 115 VOLUME_UP WAKE +key 114 VOLUME_DOWN WAKE +key 116 POWER WAKE +key 172 HOME WAKE diff --git a/usr/keylayout/sec_touchkey.kl b/usr/keylayout/sec_touchkey.kl new file mode 100644 index 0000000..7d79415 --- /dev/null +++ b/usr/keylayout/sec_touchkey.kl @@ -0,0 +1,2 @@ +key 158 BACK VIRTUAL +key 139 MENU VIRTUAL diff --git a/usr/keylayout/sii9234_rcp.kl b/usr/keylayout/sii9234_rcp.kl new file mode 100644 index 0000000..ae6c6a2 --- /dev/null +++ b/usr/keylayout/sii9234_rcp.kl @@ -0,0 +1,28 @@ +key 1 ENTER WAKE_DROPPED +key 2 DPAD_UP WAKE_DROPPED +key 3 DPAD_DOWN WAKE_DROPPED +key 4 DPAD_LEFT WAKE_DROPPED +key 5 DPAD_RIGHT WAKE_DROPPED +key 10 MENU WAKE_DROPPED +key 14 BACK WAKE_DROPPED + +key 33 0 +key 34 1 +key 35 2 +key 36 3 +key 37 4 +key 38 5 +key 39 6 +key 40 7 +key 41 8 +key 42 9 + +key 45 DEL + +key 69 MEDIA_PLAY_PAUSE WAKE +key 70 MEDIA_STOP WAKE +key 71 MEDIA_PLAY_PAUSE WAKE +key 73 MEDIA_REWIND WAKE +key 74 MEDIA_FAST_FORWARD WAKE +key 76 MEDIA_NEXT WAKE +key 77 MEDIA_PREVIOUS WAKE |