diff options
| author | Yen-Chao Chen <davidycchen@google.com> | 2022-03-24 07:30:25 +0000 |
|---|---|---|
| committer | Android Partner Code Review <android-gerrit-partner@google.com> | 2022-03-24 07:30:25 +0000 |
| commit | 4749c83fba4d226453bf0dcd846a30d8214f5bd4 (patch) | |
| tree | 083be1b061c5e0379ac365967efb2fec9bc558ea /ft3658 | |
| parent | 18ec7081acf4aead3b33708b00188fae2807b4b8 (diff) | |
| parent | 8a052d42fc7fa1ef3f9377f8f76fc3320332ab43 (diff) | |
| download | focaltech_touch-4749c83fba4d226453bf0dcd846a30d8214f5bd4.tar.gz | |
Merge "touch/focaltech: add palm tool type in offload_report." into android13-gs-pixel-5.10
Diffstat (limited to 'ft3658')
| -rw-r--r-- | ft3658/focaltech_core.c | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/ft3658/focaltech_core.c b/ft3658/focaltech_core.c index b0da047..45baae3 100644 --- a/ft3658/focaltech_core.c +++ b/ft3658/focaltech_core.c @@ -1485,19 +1485,31 @@ static void fts_offload_report(void *handle, bool touch_down = 0; int i; int touch_count = 0; + int tool_type; mutex_lock(&ts_data->report_mutex); input_set_timestamp(ts_data->input_dev, ts_data->coords_timestamp); for (i = 0; i < MAX_COORDS; i++) { - if (report->coords[i].status == COORD_STATUS_FINGER) { + if (report->coords[i].status != COORD_STATUS_INACTIVE) { input_mt_slot(ts_data->input_dev, i); touch_count++; touch_down = 1; input_report_key(ts_data->input_dev, BTN_TOUCH, touch_down); input_report_key(ts_data->input_dev, BTN_TOOL_FINGER, touch_down); - input_mt_report_slot_state(ts_data->input_dev, MT_TOOL_FINGER, 1); + switch (report->coords[i].status) { + case COORD_STATUS_EDGE: + case COORD_STATUS_PALM: + case COORD_STATUS_CANCEL: + tool_type = MT_TOOL_PALM; + break; + case COORD_STATUS_FINGER: + default: + tool_type = MT_TOOL_FINGER; + break; + } + input_mt_report_slot_state(ts_data->input_dev, tool_type, 1); input_report_abs(ts_data->input_dev, ABS_MT_POSITION_X, report->coords[i].x); input_report_abs(ts_data->input_dev, ABS_MT_POSITION_Y, |