提交: c3ce91ff8ab5294fb8c3878304ba055ac731a955 - frameworks-base (git)

frameworks/base

Commit MetaInfo

• 修订版: c3ce91ff8ab5294fb8c3878304ba055ac731a955 (tree)
• 时间: 2012-04-06 12:57:17
• 作者: Edward Peek <edwardpeek@gmai...>
• Commiter: Chih-Wei Huang

Log Message

Added option to disable touchscreen pressure sensitivity from idc files

更改概述

• modified: services/input/InputReader.cpp
• modified: services/input/InputReader.h

差异

--- a/services/input/InputReader.cpp
+++ b/services/input/InputReader.cpp
@@ -3081,6 +3081,8 @@ void TouchInputMapper::parseCalibration() {
             out.pressureCalibration = Calibration::PRESSURE_CALIBRATION_PHYSICAL;
         } else if (pressureCalibrationString == "amplitude") {
             out.pressureCalibration = Calibration::PRESSURE_CALIBRATION_AMPLITUDE;
+        } else if (pressureCalibrationString == "disable") {
+            out.pressureCalibration = Calibration::PRESSURE_CALIBRATION_DISABLE;
         } else if (pressureCalibrationString != "default") {
             LOGW("Invalid value for touch.pressure.calibration: '%s'",
                     pressureCalibrationString.string());
@@ -3148,6 +3150,9 @@ void TouchInputMapper::resolveCalibration() {
     if (mRawPointerAxes.pressure.valid) {
         if (mCalibration.pressureCalibration == Calibration::PRESSURE_CALIBRATION_DEFAULT) {
             mCalibration.pressureCalibration = Calibration::PRESSURE_CALIBRATION_PHYSICAL;
+        } else if (mCalibration.pressureCalibration == Calibration::PRESSURE_CALIBRATION_DISABLE) {
+            mRawPointerAxes.pressure.valid = false;
+            mCalibration.pressureCalibration = Calibration::PRESSURE_CALIBRATION_NONE;
         }
     } else {
         mCalibration.pressureCalibration = Calibration::PRESSURE_CALIBRATION_NONE;

--- a/services/input/InputReader.h
+++ b/services/input/InputReader.h
@@ -1099,6 +1099,7 @@ protected:
             PRESSURE_CALIBRATION_NONE,
             PRESSURE_CALIBRATION_PHYSICAL,
             PRESSURE_CALIBRATION_AMPLITUDE,
+            PRESSURE_CALIBRATION_DISABLE,
         };
 
         PressureCalibration pressureCalibration;