From 7719c7d2437171385cd692338748af583b824565 Mon Sep 17 00:00:00 2001 From: Vadim Tryshev Date: Fri, 27 Aug 2021 17:28:43 +0000 Subject: Revert^3 "Enable input window rotation flag" 0743a594c240c8aae4ec6d925d04f53876ccd96a Reason for revert: b/197866364 Bug: 197866364 Change-Id: I2f10f1b05168a353115067a397798896950dc75f --- libs/input/Input.cpp | 2 +- services/inputflinger/dispatcher/InputDispatcher.cpp | 2 +- services/inputflinger/reader/mapper/TouchCursorInputMapperCommon.h | 2 +- services/surfaceflinger/SurfaceFlinger.cpp | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/libs/input/Input.cpp b/libs/input/Input.cpp index a9e891e445..35209f7a07 100644 --- a/libs/input/Input.cpp +++ b/libs/input/Input.cpp @@ -47,7 +47,7 @@ namespace { // coordinates and SurfaceFlinger includes the display rotation in the input window transforms. bool isPerWindowInputRotationEnabled() { static const bool PER_WINDOW_INPUT_ROTATION = - base::GetBoolProperty("persist.debug.per_window_input_rotation", true); + base::GetBoolProperty("persist.debug.per_window_input_rotation", false); return PER_WINDOW_INPUT_ROTATION; } diff --git a/services/inputflinger/dispatcher/InputDispatcher.cpp b/services/inputflinger/dispatcher/InputDispatcher.cpp index 4f9c2b4a45..d32d6f4246 100644 --- a/services/inputflinger/dispatcher/InputDispatcher.cpp +++ b/services/inputflinger/dispatcher/InputDispatcher.cpp @@ -98,7 +98,7 @@ namespace android::inputdispatcher { // coordinates and SurfaceFlinger includes the display rotation in the input window transforms. static bool isPerWindowInputRotationEnabled() { static const bool PER_WINDOW_INPUT_ROTATION = - sysprop::InputFlingerProperties::per_window_input_rotation().value_or(true); + sysprop::InputFlingerProperties::per_window_input_rotation().value_or(false); return PER_WINDOW_INPUT_ROTATION; } diff --git a/services/inputflinger/reader/mapper/TouchCursorInputMapperCommon.h b/services/inputflinger/reader/mapper/TouchCursorInputMapperCommon.h index 6188976c8c..7347b2cec4 100644 --- a/services/inputflinger/reader/mapper/TouchCursorInputMapperCommon.h +++ b/services/inputflinger/reader/mapper/TouchCursorInputMapperCommon.h @@ -33,7 +33,7 @@ namespace android { // projection are part of the input window's transform. This means InputReader should work in the // un-rotated coordinate space. static bool isPerWindowInputRotationEnabled() { - return sysprop::InputFlingerProperties::per_window_input_rotation().value_or(true); + return sysprop::InputFlingerProperties::per_window_input_rotation().value_or(false); } static int32_t getInverseRotation(int32_t orientation) { diff --git a/services/surfaceflinger/SurfaceFlinger.cpp b/services/surfaceflinger/SurfaceFlinger.cpp index 938252a454..395091bb7f 100644 --- a/services/surfaceflinger/SurfaceFlinger.cpp +++ b/services/surfaceflinger/SurfaceFlinger.cpp @@ -3055,7 +3055,7 @@ void SurfaceFlinger::updateInputFlinger() { bool enablePerWindowInputRotation() { static bool value = - android::base::GetBoolProperty("persist.debug.per_window_input_rotation", true); + android::base::GetBoolProperty("persist.debug.per_window_input_rotation", false); return value; } -- cgit v1.2.3-59-g8ed1b