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

Commit a081b8c4 authored by Prabir Pradhan's avatar Prabir Pradhan Committed by Automerger Merge Worker
Browse files

Merge "MotionEvent: Guard getRawX/Y compatibility logic using feature flag"... 

Merge "MotionEvent: Guard getRawX/Y compatibility logic using feature flag" into sc-dev am: 15c1c683 am: 921daeb4

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

Change-Id: Ie728df9c1a50cb3396b29b6295660aea0519338c
parents 40b946da 921daeb4

libs/input/Input.cpp

+12 −0
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ 
#include <limits.h>

#include <string.h>



#include <android-base/properties.h>

#include <android-base/stringprintf.h>

#include <gui/constants.h>

#include <input/Input.h>
@@ -42,6 +43,15 @@ namespace android { 


namespace {



// When per-window-input-rotation is enabled, InputFlinger works in the un-rotated display

// 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);



    return PER_WINDOW_INPUT_ROTATION;

}



float transformAngle(const ui::Transform& transform, float angleRadians) {

    // Construct and transform a vector oriented at the specified clockwise angle from vertical.

    // Coordinate system: down is increasing Y, right is increasing X.
@@ -530,6 +540,8 @@ float MotionEvent::getHistoricalRawAxisValue(int32_t axis, size_t pointerIndex, 
                                             size_t historicalIndex) const {

    const PointerCoords* coords = getHistoricalRawPointerCoords(pointerIndex, historicalIndex);



    if (!isPerWindowInputRotationEnabled()) return coords->getAxisValue(axis);



    if (axis == AMOTION_EVENT_AXIS_X || axis == AMOTION_EVENT_AXIS_Y) {

        // For compatibility, convert raw coordinates into "oriented screen space". Once app

        // developers are educated about getRaw, we can consider removing this.

libs/input/tests/InputEvent_test.cpp

+22 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
#include <array>

#include <math.h>



#include <android-base/properties.h>

#include <attestation/HmacKeyManager.h>

#include <binder/Parcel.h>

#include <gtest/gtest.h>
@@ -226,13 +227,34 @@ protected: 
    static constexpr float X_OFFSET = 1;

    static constexpr float Y_OFFSET = 1.1;



    static const std::optional<bool> INITIAL_PER_WINDOW_INPUT_ROTATION_FLAG_VALUE;



    int32_t mId;

    ui::Transform mTransform;



    void SetUp() override;

    void TearDown() override;



    void initializeEventWithHistory(MotionEvent* event);

    void assertEqualsEventWithHistory(const MotionEvent* event);

};



const std::optional<bool> MotionEventTest::INITIAL_PER_WINDOW_INPUT_ROTATION_FLAG_VALUE =

        !base::GetProperty("persist.debug.per_window_input_rotation", "").empty()

        ? std::optional(base::GetBoolProperty("persist.debug.per_window_input_rotation", false))

        : std::nullopt;



void MotionEventTest::SetUp() {

    // Ensure per_window_input_rotation is enabled.

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

}



void MotionEventTest::TearDown() {

    const auto val = INITIAL_PER_WINDOW_INPUT_ROTATION_FLAG_VALUE.has_value()

            ? (*INITIAL_PER_WINDOW_INPUT_ROTATION_FLAG_VALUE ? "true" : "false")

            : "";

    base::SetProperty("persist.debug.per_window_input_rotation", val);

}



void MotionEventTest::initializeEventWithHistory(MotionEvent* event) {

    mId = InputEvent::nextId();