Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a1530043 authored by Android Build Prod User's avatar Android Build Prod User Committed by Automerger Merge Worker
Browse files

Merge "Revert^2 "Enable input window rotation flag"" into sc-v2-dev am: f459a9f2 am: 239e1dd1 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/15624996

Change-Id: I8f7ae55c0d92e802a8cdccce7ee9273fb7ac53f9
parents 3a7e8441 239e1dd1

libs/input/Input.cpp

+1 −1
Original line number Diff line number Diff line
@@ -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", false);

            base::GetBoolProperty("persist.debug.per_window_input_rotation", true);



    return PER_WINDOW_INPUT_ROTATION;

}

services/inputflinger/dispatcher/InputDispatcher.cpp

+1 −1
Original line number Diff line number Diff line
@@ -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(false);

            sysprop::InputFlingerProperties::per_window_input_rotation().value_or(true);



    return PER_WINDOW_INPUT_ROTATION;

}

services/inputflinger/reader/mapper/TouchCursorInputMapperCommon.h

+1 −1
Original line number Diff line number Diff line
@@ -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(false);

    return sysprop::InputFlingerProperties::per_window_input_rotation().value_or(true);

}



static int32_t getInverseRotation(int32_t orientation) {

services/surfaceflinger/SurfaceFlinger.cpp

+1 −1
Original line number Diff line number Diff line
@@ -3039,7 +3039,7 @@ void SurfaceFlinger::updateInputFlinger() { 


bool enablePerWindowInputRotation() {

    static bool value =

            android::base::GetBoolProperty("persist.debug.per_window_input_rotation", false);

            android::base::GetBoolProperty("persist.debug.per_window_input_rotation", true);

    return value;

}