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

Commit cfbee530 authored by Siarhei Vishniakou's avatar Siarhei Vishniakou
Browse files

Move ADISPLAY_ID_ definitions into LogicalDisplayId 

These will eventually replace the existing definitions as follows:
     ADISPLAY_ID_NONE -->> LogicalDisplayId::INVALID
     ADISPLAY_ID_DEFAULT -->> LogicalDisplayId::DEFAULT

We are keeping the old definitions for now, to reduce the merge
conflicts. These will be removed in subsequent CLs, after the
frameworks/base and other repository patches go in.

The constant "NONE" was renamed to "INVALID" to make it consistent with
the Java definitions.

Bug: 339106983
Test: m checkinput
Change-Id: I0274be345159c85cb51fcea743d8acd3d298cd07
parent 278e699b

include/input/DisplayViewport.h

+3 −3
Original line number Diff line number Diff line
@@ -46,7 +46,7 @@ enum class ViewportType : int32_t { 
 * See com.android.server.display.DisplayViewport.

 */

struct DisplayViewport {

    ui::LogicalDisplayId displayId; // ADISPLAY_ID_NONE if invalid

    ui::LogicalDisplayId displayId;

    ui::Rotation orientation;

    int32_t logicalLeft;

    int32_t logicalTop;
@@ -66,7 +66,7 @@ struct DisplayViewport { 
    ViewportType type;



    DisplayViewport()

          : displayId(ui::ADISPLAY_ID_NONE),

          : displayId(ui::LogicalDisplayId::INVALID),

            orientation(ui::ROTATION_0),

            logicalLeft(0),

            logicalTop(0),
@@ -101,7 +101,7 @@ struct DisplayViewport { 
    inline bool isValid() const { return displayId.isValid(); }



    void setNonDisplayViewport(int32_t width, int32_t height) {

        displayId = ui::ADISPLAY_ID_NONE;

        displayId = ui::LogicalDisplayId::INVALID;

        orientation = ui::ROTATION_0;

        logicalLeft = 0;

        logicalTop = 0;

include/input/Input.h

+1 −1
Original line number Diff line number Diff line
@@ -553,7 +553,7 @@ protected: 
    int32_t mId;

    DeviceId mDeviceId;

    uint32_t mSource;

    ui::LogicalDisplayId mDisplayId{ui::ADISPLAY_ID_NONE};

    ui::LogicalDisplayId mDisplayId{ui::LogicalDisplayId::INVALID};

    std::array<uint8_t, 32> mHmac;

};

include/input/InputDevice.h

+1 −1
Original line number Diff line number Diff line
@@ -366,7 +366,7 @@ private: 
    int32_t mKeyboardType;

    std::shared_ptr<KeyCharacterMap> mKeyCharacterMap;

    std::optional<InputDeviceUsiVersion> mUsiVersion;

    ui::LogicalDisplayId mAssociatedDisplayId{ui::ADISPLAY_ID_NONE};

    ui::LogicalDisplayId mAssociatedDisplayId{ui::LogicalDisplayId::INVALID};

    bool mEnabled;



    bool mHasVibrator;

include/input/InputEventBuilders.h

+2 −2
Original line number Diff line number Diff line
@@ -158,7 +158,7 @@ private: 
    int32_t mSource;

    nsecs_t mDownTime;

    nsecs_t mEventTime;

    ui::LogicalDisplayId mDisplayId{ui::ADISPLAY_ID_DEFAULT};

    ui::LogicalDisplayId mDisplayId{ui::LogicalDisplayId::DEFAULT};

    int32_t mActionButton{0};

    int32_t mButtonState{0};

    int32_t mFlags{0};
@@ -247,7 +247,7 @@ private: 
    uint32_t mSource;

    nsecs_t mDownTime;

    nsecs_t mEventTime;

    ui::LogicalDisplayId mDisplayId{ui::ADISPLAY_ID_DEFAULT};

    ui::LogicalDisplayId mDisplayId{ui::LogicalDisplayId::DEFAULT};

    uint32_t mPolicyFlags = DEFAULT_POLICY_FLAGS;

    int32_t mFlags{0};

    int32_t mKeyCode{AKEYCODE_UNKNOWN};

libs/gui/include/gui/DisplayInfo.h

+1 −1
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ namespace android::gui { 
 * This should only be used by InputFlinger to support raw coordinates in logical display space.

 */

struct DisplayInfo : public Parcelable {

    ui::LogicalDisplayId displayId = ui::ADISPLAY_ID_NONE;

    ui::LogicalDisplayId displayId = ui::LogicalDisplayId::INVALID;



    // Logical display dimensions.

    int32_t logicalWidth = 0;