summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--cm.mk3
-rw-r--r--libsensors/LightSensor.cpp2
-rw-r--r--libsensors/ProximitySensor.cpp2
-rw-r--r--libsensors/sensors.cpp12
-rw-r--r--overlay/frameworks/base/core/res/res/values/config.xml20
-rw-r--r--usr/keylayout/gpio-keys.kl8
-rw-r--r--usr/keylayout/max8997-muic.kl12
-rw-r--r--usr/keylayout/samsung-keypad.kl20
-rw-r--r--usr/keylayout/sec_key.kl22
-rw-r--r--usr/keylayout/sii9234_rcp.kl28
10 files changed, 69 insertions, 60 deletions
diff --git a/cm.mk b/cm.mk
index 1f58b3f..1bc516a 100644
--- a/cm.mk
+++ b/cm.mk
@@ -14,9 +14,6 @@
# limitations under the License.
#
-# Specify phone tech before including full_phone
-$(call inherit-product, vendor/cm/config/gsm.mk)
-
# Release name
PRODUCT_RELEASE_NAME := GT-I9100
diff --git a/libsensors/LightSensor.cpp b/libsensors/LightSensor.cpp
index 2320053..cab4fba 100644
--- a/libsensors/LightSensor.cpp
+++ b/libsensors/LightSensor.cpp
@@ -22,8 +22,6 @@
#include <dirent.h>
#include <sys/select.h>
-#include <linux/lightsensor.h>
-
#include <cutils/log.h>
#include "LightSensor.h"
diff --git a/libsensors/ProximitySensor.cpp b/libsensors/ProximitySensor.cpp
index 5ebaabc..9614f20 100644
--- a/libsensors/ProximitySensor.cpp
+++ b/libsensors/ProximitySensor.cpp
@@ -22,8 +22,6 @@
#include <dirent.h>
#include <sys/select.h>
-#include <linux/capella_cm3602.h>
-
#include <cutils/log.h>
#include "ProximitySensor.h"
diff --git a/libsensors/sensors.cpp b/libsensors/sensors.cpp
index e393cd5..806d66b 100644
--- a/libsensors/sensors.cpp
+++ b/libsensors/sensors.cpp
@@ -69,27 +69,27 @@ static const struct sensor_t sSensorList[] = {
{ "KR3DM 3-axis Accelerometer",
"STMicroelectronics",
1, SENSORS_ACCELERATION_HANDLE,
- SENSOR_TYPE_ACCELEROMETER, RANGE_A, CONVERT_A, 0.23f, 20000, 0, 0, { } },
+ SENSOR_TYPE_ACCELEROMETER, RANGE_A, CONVERT_A, 0.23f, 20000, 0, 0,},
{ "AK8975 3-axis Magnetic field sensor",
"Asahi Kasei Microdevices",
1, SENSORS_MAGNETIC_FIELD_HANDLE,
- SENSOR_TYPE_MAGNETIC_FIELD, 2000.0f, CONVERT_M, 6.8f, 16667, 0, 0, { } },
+ SENSOR_TYPE_MAGNETIC_FIELD, 2000.0f, CONVERT_M, 6.8f, 16667, 0, 0,},
{ "AK8973 Orientation sensor",
"Asahi Kasei Microdevices",
1, SENSORS_ORIENTATION_HANDLE,
- SENSOR_TYPE_ORIENTATION, 360.0f, CONVERT_O, 7.8f, 16667, 0, 0, { } },
+ SENSOR_TYPE_ORIENTATION, 360.0f, CONVERT_O, 7.8f, 16667, 0, 0,},
{ "CM3663 Light sensor",
"Capella Microsystems",
1, SENSORS_LIGHT_HANDLE,
- SENSOR_TYPE_LIGHT, 10240.0f, 1.0f, 0.75f, 0, 0, 0, { } },
+ SENSOR_TYPE_LIGHT, 10240.0f, 1.0f, 0.75f, 0, 0, 0,},
{ "CM3663 Proximity sensor",
"Capella Microsystems",
1, SENSORS_PROXIMITY_HANDLE,
- SENSOR_TYPE_PROXIMITY, 5.0f, 5.0f, 0.75f, 0, 0, 0, { } },
+ SENSOR_TYPE_PROXIMITY, 5.0f, 5.0f, 0.75f, 0, 0, 0,},
{ "K3G Gyroscope sensor",
"STMicroelectronics",
1, SENSORS_GYROSCOPE_HANDLE,
- SENSOR_TYPE_GYROSCOPE, RANGE_GYRO, CONVERT_GYRO, 6.1f, 1190, 0, 0, { } },
+ SENSOR_TYPE_GYROSCOPE, RANGE_GYRO, CONVERT_GYRO, 6.1f, 1190, 0, 0,},
};
diff --git a/overlay/frameworks/base/core/res/res/values/config.xml b/overlay/frameworks/base/core/res/res/values/config.xml
index 1430277..fb27d76 100644
--- a/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/overlay/frameworks/base/core/res/res/values/config.xml
@@ -142,7 +142,7 @@
<!-- Minimum screen brightness allowed by the power manager. -->
<integer name="config_screenBrightnessDim">29</integer>
- <!-- Hardware 'face' keys present on the device, stored as a bit field.
+ <!-- Hardware keys present on the device, stored as a bit field.
This integer should equal the sum of the corresponding value for each
of the following keys present:
1 - Home
@@ -150,9 +150,25 @@
4 - Menu
8 - Assistant (search)
16 - App switch
+ 32 - Camera
+ 64 - Volume rocker
For example, a device with Home, Back and Menu keys would set this
config to 7. -->
- <integer name="config_deviceHardwareKeys">7</integer>
+ <integer name="config_deviceHardwareKeys">71</integer>
+
+ <!-- Hardware keys present on the device with the ability to wake, stored as a bit field.
+ This integer should equal the sum of the corresponding value for each
+ of the following keys present:
+ 1 - Home
+ 2 - Back
+ 4 - Menu
+ 8 - Assistant (search)
+ 16 - App switch
+ 32 - Camera
+ 64 - Volume rocker
+ For example, a device with Home, Back and Menu keys would set this
+ config to 7. -->
+ <integer name="config_deviceHardwareWakeKeys">65</integer>
<!-- Disable the home key unlock setting -->
<!-- <bool name="config_disableHomeUnlockSetting">false</bool> -->
diff --git a/usr/keylayout/gpio-keys.kl b/usr/keylayout/gpio-keys.kl
index e7413fe..7524e02 100644
--- a/usr/keylayout/gpio-keys.kl
+++ b/usr/keylayout/gpio-keys.kl
@@ -1,4 +1,4 @@
-key 115 VOLUME_UP WAKE
-key 114 VOLUME_DOWN WAKE
-key 116 POWER WAKE
-key 102 HOME WAKE
+key 115 VOLUME_UP
+key 114 VOLUME_DOWN
+key 116 POWER
+key 102 HOME
diff --git a/usr/keylayout/max8997-muic.kl b/usr/keylayout/max8997-muic.kl
index 3357004..1589c37 100644
--- a/usr/keylayout/max8997-muic.kl
+++ b/usr/keylayout/max8997-muic.kl
@@ -1,6 +1,6 @@
-key 115 VOLUME_UP WAKE
-key 114 VOLUME_DOWN WAKE
-key 164 MEDIA_PLAY_PAUSE WAKE
-key 163 MEDIA_NEXT WAKE
-key 165 MEDIA_PREVIOUS WAKE
-key 226 HEADSETHOOK WAKE
+key 115 VOLUME_UP
+key 114 VOLUME_DOWN
+key 164 MEDIA_PLAY_PAUSE
+key 163 MEDIA_NEXT
+key 165 MEDIA_PREVIOUS
+key 226 HEADSETHOOK
diff --git a/usr/keylayout/samsung-keypad.kl b/usr/keylayout/samsung-keypad.kl
index 36fad0e..722a97a 100644
--- a/usr/keylayout/samsung-keypad.kl
+++ b/usr/keylayout/samsung-keypad.kl
@@ -1,10 +1,10 @@
-key 2 DPAD_UP WAKE_DROPPED
-key 3 DPAD_CENTER WAKE_DROPPED
-key 4 DPAD_DOWN WAKE_DROPPED
-key 5 DPAD_RIGHT WAKE_DROPPED
-key 6 DPAD_LEFT WAKE_DROPPED
-key 18 VOLUME_DOWN WAKE
-key 30 SEARCH WAKE_DROPPED
-key 32 MENU WAKE_DROPPED
-key 46 VOLUME_UP WAKE
-key 48 BACK WAKE_DROPPED
+key 2 DPAD_UP
+key 3 DPAD_CENTER
+key 4 DPAD_DOWN
+key 5 DPAD_RIGHT
+key 6 DPAD_LEFT
+key 18 VOLUME_DOWN
+key 30 SEARCH
+key 32 MENU
+key 46 VOLUME_UP
+key 48 BACK
diff --git a/usr/keylayout/sec_key.kl b/usr/keylayout/sec_key.kl
index b7abd0b..a3a38fc 100644
--- a/usr/keylayout/sec_key.kl
+++ b/usr/keylayout/sec_key.kl
@@ -1,11 +1,11 @@
-key 115 VOLUME_UP WAKE
-key 114 VOLUME_DOWN WAKE
-key 102 HOME WAKE
-key 107 ENDCALL
-key 105 DPAD_LEFT
-key 106 DPAD_RIGHT
-key 103 DPAD_UP
-key 108 DPAD_DOWN
-key 232 DPAD_CENTER
-key 116 POWER WAKE
-key 212 CAMERA WAKE
+key 115 VOLUME_UP
+key 114 VOLUME_DOWN
+key 102 HOME
+key 107 ENDCALL
+key 105 DPAD_LEFT
+key 106 DPAD_RIGHT
+key 103 DPAD_UP
+key 108 DPAD_DOWN
+key 232 DPAD_CENTER
+key 116 POWER
+key 212 CAMERA
diff --git a/usr/keylayout/sii9234_rcp.kl b/usr/keylayout/sii9234_rcp.kl
index ae6c6a2..16685cc 100644
--- a/usr/keylayout/sii9234_rcp.kl
+++ b/usr/keylayout/sii9234_rcp.kl
@@ -1,10 +1,10 @@
-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 1 ENTER
+key 2 DPAD_UP
+key 3 DPAD_DOWN
+key 4 DPAD_LEFT
+key 5 DPAD_RIGHT
+key 10 MENU
+key 14 BACK
key 33 0
key 34 1
@@ -19,10 +19,10 @@ 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
+key 69 MEDIA_PLAY_PAUSE
+key 70 MEDIA_STOP
+key 71 MEDIA_PLAY_PAUSE
+key 73 MEDIA_REWIND
+key 74 MEDIA_FAST_FORWARD
+key 76 MEDIA_NEXT
+key 77 MEDIA_PREVIOUS
generated by cgit v1.1 at 2024-12-22 09:34:00 +0000