Loading services/inputflinger/InputReader.cpp +8 −0 Original line number Original line Diff line number Diff line Loading @@ -2853,6 +2853,8 @@ void TouchInputMapper::configureParameters() { mParameters.deviceType = Parameters::DEVICE_TYPE_TOUCH_NAVIGATION; mParameters.deviceType = Parameters::DEVICE_TYPE_TOUCH_NAVIGATION; } else if (deviceTypeString == "pointer") { } else if (deviceTypeString == "pointer") { mParameters.deviceType = Parameters::DEVICE_TYPE_POINTER; mParameters.deviceType = Parameters::DEVICE_TYPE_POINTER; } else if (deviceTypeString == "gesture") { mParameters.deviceType = Parameters::DEVICE_TYPE_GESTURE_SENSOR; } else if (deviceTypeString != "default") { } else if (deviceTypeString != "default") { ALOGW("Invalid value for touch.deviceType: '%s'", deviceTypeString.string()); ALOGW("Invalid value for touch.deviceType: '%s'", deviceTypeString.string()); } } Loading Loading @@ -2910,6 +2912,9 @@ void TouchInputMapper::dumpParameters(String8& dump) { case Parameters::DEVICE_TYPE_POINTER: case Parameters::DEVICE_TYPE_POINTER: dump.append(INDENT4 "DeviceType: pointer\n"); dump.append(INDENT4 "DeviceType: pointer\n"); break; break; case Parameters::DEVICE_TYPE_GESTURE_SENSOR: dump.append(INDENT4 "DeviceType: gesture\n"); break; default: default: ALOG_ASSERT(false); ALOG_ASSERT(false); } } Loading Loading @@ -2963,6 +2968,9 @@ void TouchInputMapper::configureSurface(nsecs_t when, bool* outResetNeeded) { } else if (mParameters.deviceType == Parameters::DEVICE_TYPE_TOUCH_NAVIGATION) { } else if (mParameters.deviceType == Parameters::DEVICE_TYPE_TOUCH_NAVIGATION) { mSource = AINPUT_SOURCE_TOUCH_NAVIGATION; mSource = AINPUT_SOURCE_TOUCH_NAVIGATION; mDeviceMode = DEVICE_MODE_NAVIGATION; mDeviceMode = DEVICE_MODE_NAVIGATION; } else if (mParameters.deviceType == Parameters::DEVICE_TYPE_GESTURE_SENSOR) { mSource = AINPUT_SOURCE_GESTURE_SENSOR; mDeviceMode = DEVICE_MODE_UNSCALED; } else { } else { mSource = AINPUT_SOURCE_TOUCHPAD; mSource = AINPUT_SOURCE_TOUCHPAD; mDeviceMode = DEVICE_MODE_UNSCALED; mDeviceMode = DEVICE_MODE_UNSCALED; Loading services/inputflinger/InputReader.h +1 −0 Original line number Original line Diff line number Diff line Loading @@ -1235,6 +1235,7 @@ protected: DEVICE_TYPE_TOUCH_SCREEN, DEVICE_TYPE_TOUCH_SCREEN, DEVICE_TYPE_TOUCH_PAD, DEVICE_TYPE_TOUCH_PAD, DEVICE_TYPE_TOUCH_NAVIGATION, DEVICE_TYPE_TOUCH_NAVIGATION, DEVICE_TYPE_GESTURE_SENSOR, DEVICE_TYPE_POINTER, DEVICE_TYPE_POINTER, }; }; Loading Loading
services/inputflinger/InputReader.cpp +8 −0 Original line number Original line Diff line number Diff line Loading @@ -2853,6 +2853,8 @@ void TouchInputMapper::configureParameters() { mParameters.deviceType = Parameters::DEVICE_TYPE_TOUCH_NAVIGATION; mParameters.deviceType = Parameters::DEVICE_TYPE_TOUCH_NAVIGATION; } else if (deviceTypeString == "pointer") { } else if (deviceTypeString == "pointer") { mParameters.deviceType = Parameters::DEVICE_TYPE_POINTER; mParameters.deviceType = Parameters::DEVICE_TYPE_POINTER; } else if (deviceTypeString == "gesture") { mParameters.deviceType = Parameters::DEVICE_TYPE_GESTURE_SENSOR; } else if (deviceTypeString != "default") { } else if (deviceTypeString != "default") { ALOGW("Invalid value for touch.deviceType: '%s'", deviceTypeString.string()); ALOGW("Invalid value for touch.deviceType: '%s'", deviceTypeString.string()); } } Loading Loading @@ -2910,6 +2912,9 @@ void TouchInputMapper::dumpParameters(String8& dump) { case Parameters::DEVICE_TYPE_POINTER: case Parameters::DEVICE_TYPE_POINTER: dump.append(INDENT4 "DeviceType: pointer\n"); dump.append(INDENT4 "DeviceType: pointer\n"); break; break; case Parameters::DEVICE_TYPE_GESTURE_SENSOR: dump.append(INDENT4 "DeviceType: gesture\n"); break; default: default: ALOG_ASSERT(false); ALOG_ASSERT(false); } } Loading Loading @@ -2963,6 +2968,9 @@ void TouchInputMapper::configureSurface(nsecs_t when, bool* outResetNeeded) { } else if (mParameters.deviceType == Parameters::DEVICE_TYPE_TOUCH_NAVIGATION) { } else if (mParameters.deviceType == Parameters::DEVICE_TYPE_TOUCH_NAVIGATION) { mSource = AINPUT_SOURCE_TOUCH_NAVIGATION; mSource = AINPUT_SOURCE_TOUCH_NAVIGATION; mDeviceMode = DEVICE_MODE_NAVIGATION; mDeviceMode = DEVICE_MODE_NAVIGATION; } else if (mParameters.deviceType == Parameters::DEVICE_TYPE_GESTURE_SENSOR) { mSource = AINPUT_SOURCE_GESTURE_SENSOR; mDeviceMode = DEVICE_MODE_UNSCALED; } else { } else { mSource = AINPUT_SOURCE_TOUCHPAD; mSource = AINPUT_SOURCE_TOUCHPAD; mDeviceMode = DEVICE_MODE_UNSCALED; mDeviceMode = DEVICE_MODE_UNSCALED; Loading
services/inputflinger/InputReader.h +1 −0 Original line number Original line Diff line number Diff line Loading @@ -1235,6 +1235,7 @@ protected: DEVICE_TYPE_TOUCH_SCREEN, DEVICE_TYPE_TOUCH_SCREEN, DEVICE_TYPE_TOUCH_PAD, DEVICE_TYPE_TOUCH_PAD, DEVICE_TYPE_TOUCH_NAVIGATION, DEVICE_TYPE_TOUCH_NAVIGATION, DEVICE_TYPE_GESTURE_SENSOR, DEVICE_TYPE_POINTER, DEVICE_TYPE_POINTER, }; }; Loading