diff options
| author | 2021-08-27 21:14:00 +0000 | |
|---|---|---|
| committer | 2021-08-27 21:14:00 +0000 | |
| commit | e5eef8fe6a45db8a484d74f5fccdb92dcdec8b68 (patch) | |
| tree | 61907380ee98706aea31dbcece1ddb5dac21e2b5 /services | |
| parent | d7ae69a195c29ac2ca1303430011eb499349444b (diff) | |
| parent | d1d30934f4c83c6d544c47d7d153730c9c1ff696 (diff) | |
Merge "Revert^3 "Enable input window rotation flag"" into sc-v2-dev am: 3590b6c8a2 am: d1d30934f4
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/15694000
Change-Id: Idc8ba00c02d9ca2d18ef5d229f10b559080d245b
Diffstat (limited to 'services')
| -rw-r--r-- | services/inputflinger/dispatcher/InputDispatcher.cpp | 2 | ||||
| -rw-r--r-- | services/inputflinger/reader/mapper/TouchCursorInputMapperCommon.h | 2 | ||||
| -rw-r--r-- | services/surfaceflinger/SurfaceFlinger.cpp | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/services/inputflinger/dispatcher/InputDispatcher.cpp b/services/inputflinger/dispatcher/InputDispatcher.cpp index a938586941..59cb419d2b 100644 --- a/services/inputflinger/dispatcher/InputDispatcher.cpp +++ b/services/inputflinger/dispatcher/InputDispatcher.cpp @@ -111,7 +111,7 @@ private: // coordinates and SurfaceFlinger includes the display rotation in the input window transforms. 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 994b0f4ee3..38b8ef1034 100644 --- a/services/surfaceflinger/SurfaceFlinger.cpp +++ b/services/surfaceflinger/SurfaceFlinger.cpp @@ -3042,7 +3042,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; } |