Skip to content

Commit

Permalink
[CrOS] Disable touchscreen logging
Browse files Browse the repository at this point in the history
This is in preparation for a redesign of the system in the coming
months.

Bug: 1196261, b:184385681
Test: use touchscreen, check no touches appear in system logs ZIP (even
Test: after opening and closing the virtual keyboard)
Change-Id: I49b717f1865d62053df2b415957426718951c008
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2818722
Reviewed-by: Michael Spang <spang@chromium.org>
Reviewed-by: Mitsuru Oshima <oshima@chromium.org>
Commit-Queue: Harry Cutts <hcutts@chromium.org>
Cr-Commit-Position: refs/heads/master@{#871098}
  • Loading branch information
HarryCutts authored and Chromium LUCI CQ committed Apr 9, 2021
1 parent a9d0965 commit 6235ede
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 14 deletions.
13 changes: 0 additions & 13 deletions ash/keyboard/ui/keyboard_ui_controller.cc
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,6 @@
#include "ui/events/gestures/gesture_recognizer.h"
#include "ui/gfx/geometry/rect.h"
#include "ui/gfx/geometry/vector2d.h"
#include "ui/ozone/public/input_controller.h"
#include "ui/ozone/public/ozone_platform.h"
#include "ui/wm/core/coordinate_conversion.h"
#include "ui/wm/core/window_animations.h"

Expand Down Expand Up @@ -72,13 +70,6 @@ constexpr base::TimeDelta kReportLingeringStateDelay =
constexpr base::TimeDelta kTransientBlurThreshold =
base::TimeDelta::FromMilliseconds(3500);

void SetTouchEventLogging(bool enable) {
ui::InputController* controller =
ui::OzonePlatform::GetInstance()->GetInputController();
if (controller)
controller->SetTouchEventLoggingEnabled(enable);
}

// An enumeration of different keyboard control events that should be logged.
// These values are persisted to logs. Entries should not be renumbered and
// numeric values should never be reused.
Expand Down Expand Up @@ -559,8 +550,6 @@ void KeyboardUIController::HideKeyboard(HideReason reason) {

case KeyboardUIState::kWillHide:
case KeyboardUIState::kShown: {
SetTouchEventLogging(true /* enable */);

// Log whether this was a user or system (automatic) action.
switch (reason) {
case HIDE_REASON_SYSTEM_EXPLICIT:
Expand Down Expand Up @@ -880,8 +869,6 @@ void KeyboardUIController::PopulateKeyboardContent(

ui_->ReloadKeyboardIfNeeded();

SetTouchEventLogging(false /* enable */);

switch (model_.state()) {
case KeyboardUIState::kWillHide:
ChangeState(KeyboardUIState::kShown);
Expand Down
2 changes: 1 addition & 1 deletion ui/events/ozone/evdev/input_device_settings_evdev.h
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ struct InputDeviceSettingsEvdev {
bool tap_dragging_enabled = false;
bool natural_scroll_enabled = false;
bool tap_to_click_paused = false;
bool touch_event_logging_enabled = true;
bool touch_event_logging_enabled = false;
bool mouse_reverse_scroll_enabled = false;
bool mouse_acceleration_enabled = true;
bool mouse_scroll_acceleration_enabled = true;
Expand Down

0 comments on commit 6235ede

Please sign in to comment.