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

Commit 7e23d032 authored by Vishnu Nair's avatar Vishnu Nair Committed by Android (Google) Code Review
Browse files

Merge "Rename InputWindowHandle hasFocus to focusable"

parents 327ce85a 47074b84

include/input/InputWindow.h

+1 −2
Original line number Diff line number Diff line
@@ -167,8 +167,7 @@ struct InputWindowInfo : public Parcelable { 
     */

    Region touchableRegion;

    bool visible = false;

    bool canReceiveKeys = false;

    bool hasFocus = false;

    bool focusable = false;

    bool hasWallpaper = false;

    bool paused = false;

    /* This flag is set when the window is of a trusted type that is allowed to silently

libs/gui/tests/EndToEndNativeInputTest.cpp

+1 −2
Original line number Diff line number Diff line
@@ -192,8 +192,7 @@ private: 
        mInputInfo.type = InputWindowInfo::Type::BASE_APPLICATION;

        mInputInfo.dispatchingTimeout = 5s;

        mInputInfo.globalScaleFactor = 1.0;

        mInputInfo.canReceiveKeys = true;

        mInputInfo.hasFocus = true;

        mInputInfo.focusable = true;

        mInputInfo.hasWallpaper = false;

        mInputInfo.paused = false;

libs/input/InputWindow.cpp

+9 −9
Original line number Diff line number Diff line
@@ -58,10 +58,9 @@ bool InputWindowInfo::operator==(const InputWindowInfo& info) const { 
            info.frameRight == frameRight && info.frameBottom == frameBottom &&

            info.surfaceInset == surfaceInset && info.globalScaleFactor == globalScaleFactor &&

            info.transform == transform && info.touchableRegion.hasSameRects(touchableRegion) &&

            info.visible == visible && info.canReceiveKeys == canReceiveKeys &&

            info.trustedOverlay == trustedOverlay && info.hasFocus == hasFocus &&

            info.hasWallpaper == hasWallpaper && info.paused == paused &&

            info.ownerPid == ownerPid && info.ownerUid == ownerUid &&

            info.visible == visible && info.trustedOverlay == trustedOverlay &&

            info.focusable == focusable && info.hasWallpaper == hasWallpaper &&

            info.paused == paused && info.ownerPid == ownerPid && info.ownerUid == ownerUid &&

            info.inputFeatures == inputFeatures && info.displayId == displayId &&

            info.portalToDisplayId == portalToDisplayId &&

            info.replaceTouchableRegionWithCrop == replaceTouchableRegionWithCrop &&
@@ -79,6 +78,7 @@ status_t InputWindowInfo::writeToParcel(android::Parcel* parcel) const { 
    }

    parcel->writeInt32(1);



    // clang-format off

    status_t status = parcel->writeStrongBinder(token) ?:

        parcel->writeInt64(dispatchingTimeout.count()) ?:

        parcel->writeInt32(id) ?:
@@ -98,8 +98,7 @@ status_t InputWindowInfo::writeToParcel(android::Parcel* parcel) const { 
        parcel->writeFloat(transform.dsdy()) ?:

        parcel->writeFloat(transform.ty()) ?:

        parcel->writeBool(visible) ?:

        parcel->writeBool(canReceiveKeys) ?:

        parcel->writeBool(hasFocus) ?:

        parcel->writeBool(focusable) ?:

        parcel->writeBool(hasWallpaper) ?:

        parcel->writeBool(paused) ?:

        parcel->writeBool(trustedOverlay) ?:
@@ -112,7 +111,7 @@ status_t InputWindowInfo::writeToParcel(android::Parcel* parcel) const { 
        parcel->write(touchableRegion) ?:

        parcel->writeBool(replaceTouchableRegionWithCrop) ?:

        parcel->writeStrongBinder(touchableRegionCropHandle.promote());



    // clang-format on

    return status;

}
@@ -135,6 +134,7 @@ status_t InputWindowInfo::readFromParcel(const android::Parcel* parcel) { 
    flags = Flags<Flag>(parcel->readInt32());

    type = static_cast<Type>(parcel->readInt32());

    float dsdx, dtdx, tx, dtdy, dsdy, ty;

    // clang-format off

    status = parcel->readInt32(&frameLeft) ?:

        parcel->readInt32(&frameTop) ?:

        parcel->readInt32(&frameRight) ?:
@@ -148,13 +148,13 @@ status_t InputWindowInfo::readFromParcel(const android::Parcel* parcel) { 
        parcel->readFloat(&dsdy) ?:

        parcel->readFloat(&ty) ?:

        parcel->readBool(&visible) ?:

        parcel->readBool(&canReceiveKeys) ?:

        parcel->readBool(&hasFocus) ?:

        parcel->readBool(&focusable) ?:

        parcel->readBool(&hasWallpaper) ?:

        parcel->readBool(&paused) ?:

        parcel->readBool(&trustedOverlay) ?:

        parcel->readInt32(&ownerPid) ?:

        parcel->readInt32(&ownerUid);

    // clang-format on



    if (status != OK) {

        return status;

libs/input/tests/InputWindow_test.cpp

+2 −4
Original line number Diff line number Diff line
@@ -55,8 +55,7 @@ TEST(InputWindowInfo, Parcelling) { 
    i.globalScaleFactor = 0.3;

    i.transform.set({0.4, -1, 100, 0.5, 0, 40, 0, 0, 1});

    i.visible = false;

    i.canReceiveKeys = false;

    i.hasFocus = false;

    i.focusable = false;

    i.hasWallpaper = false;

    i.paused = false;

    i.ownerPid = 19;
@@ -89,8 +88,7 @@ TEST(InputWindowInfo, Parcelling) { 
    ASSERT_EQ(i.globalScaleFactor, i2.globalScaleFactor);

    ASSERT_EQ(i.transform, i2.transform);

    ASSERT_EQ(i.visible, i2.visible);

    ASSERT_EQ(i.canReceiveKeys, i2.canReceiveKeys);

    ASSERT_EQ(i.hasFocus, i2.hasFocus);

    ASSERT_EQ(i.focusable, i2.focusable);

    ASSERT_EQ(i.hasWallpaper, i2.hasWallpaper);

    ASSERT_EQ(i.paused, i2.paused);

    ASSERT_EQ(i.ownerPid, i2.ownerPid);

services/inputflinger/benchmarks/InputDispatcher_benchmarks.cpp

+1 −2
Original line number Diff line number Diff line
@@ -171,8 +171,7 @@ public: 
        mInfo.touchableRegion.clear();

        mInfo.addTouchableRegion(mFrame);

        mInfo.visible = true;

        mInfo.canReceiveKeys = true;

        mInfo.hasFocus = true;

        mInfo.focusable = true;

        mInfo.hasWallpaper = false;

        mInfo.paused = false;

        mInfo.ownerPid = INJECTOR_PID;