Merge "Update input device calibration file." into gingerbread

3 files changed, 53 insertions, 54 deletions

diff --git a/device.mk b/device.mk
index 60990fc..ba67a80 100644
--- a/device.mk
+++ b/device.mk
@@ -121,7 +121,7 @@ PRODUCT_PACKAGES += \
 
 # Input device calibration files
 PRODUCT_COPY_FILES += \
-	device/samsung/crespo/qt602240_ts_input.idc:system/usr/idc/qt602240_ts_input.idc
+	device/samsung/crespo/mxt224_ts_input.idc:system/usr/idc/mxt224_ts_input.idc
 
 # These are the hardware-specific features
 PRODUCT_COPY_FILES += \
diff --git a/mxt224_ts_input.idc b/mxt224_ts_input.idc
new file mode 100644
index 0000000..f754999
--- /dev/null
+++ b/mxt224_ts_input.idc
@@ -0,0 +1,52 @@
+# 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 Calibration File for the Crespo 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 calibration documentation for more details.
+#
+
+# Touch Size
+touch.touchSize.calibration = pressure
+
+# Tool Size
+# Driver reports tool size as an area measurement.
+#
+# Based on empirical measurements, we estimate the size of the tool
+# using size = sqrt(22 * rawToolArea + 0) * 9.2 + 0.
+touch.toolSize.calibration = area
+touch.toolSize.areaScale = 22
+touch.toolSize.areaBias = 0
+touch.toolSize.linearScale = 9.2
+touch.toolSize.linearBias = 0
+touch.toolSize.isSummed = 0
+
+# Pressure
+# Driver reports signal strength as pressure.
+#
+# A normal thumb touch typically registers about 100 signal strength
+# units although we don't expect these values to be accurate.
+touch.pressure.calibration = amplitude
+touch.pressure.source = default
+touch.pressure.scale = 0.01
+
+# Size
+touch.size.calibration = normalized
+
+# Orientation
+touch.orientation.calibration = none
+
diff --git a/qt602240_ts_input.idc b/qt602240_ts_input.idc
deleted file mode 100644
index bed1e8a..0000000
--- a/qt602240_ts_input.idc
+++ /dev/null
@@ -1,53 +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.
-
-#
-# Input Device Calibration File
-#
-
-# Touch Area
-touch.touchArea.calibration = pressure
-
-# Tool Area
-#   Raw width field measures approx. 0.5 units per millimeter
-#   of tool area on the surface where a raw width of 15 corresponds
-#   to about 18mm of physical size.  Given that the display resolution
-#   is 9.6px per mm we obtain a scale factor of 4.8 pixels / unit and
-#   a bias of 100.8 pixels.  Each contact point is measured independently
-#   so the raw width is not a sum.
-touch.toolArea.calibration = linear
-touch.toolArea.linearScale = 4.8
-touch.toolArea.linearBias = 100.8
-touch.toolArea.isSummed = 0
-
-# Pressure
-#   Driver reports signal strength as pressure.
-#   A normal thumb touch while touching the back of the device
-#   typically registers about 40 signal strength units although
-#   this value is highly variable and is sensitive to contact area,
-#   manner of contact and environmental conditions.  We set the
-#   scale so that a normal touch with good signal strength will be
-#   reported as having a pressure somewhere in the vicinity of 1.0,
-#   a featherlight touch will be below 1.0 and a heavy or large touch
-#   will be above 1.0.  We don't expect these values to be accurate.
-touch.pressure.calibration = amplitude
-touch.pressure.source = default
-touch.pressure.scale = 0.025
-
-# Size
-touch.size.calibration = normalized
-
-# Orientation
-touch.orientation.calibration = none
-