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

Commit 3813eebf authored by Jeff Brown's avatar Jeff Brown Committed by Android (Google) Code Review
Browse files

Merge "Fix injection of specially intercepted keys like HOME." into gingerbread

parents 2b682a85 c393eb6c

include/ui/Input.h

+0 −3
Original line number Diff line number Diff line
@@ -87,9 +87,6 @@ enum { 
    // Indicates that the screen was dim when the event was received and the event

    // should brighten the device.

    POLICY_FLAG_BRIGHT_HERE = 0x20000000,



    // Indicates that the dispatcher should call back into the policy before dispatching. */

    POLICY_FLAG_INTERCEPT_DISPATCH = 0x40000000,

};



/*

include/ui/InputReader.h

+0 −4
Original line number Diff line number Diff line
@@ -371,10 +371,6 @@ public: 
        // The input dispatcher should add POLICY_FLAG_BRIGHT_HERE to the policy flags it

        // passes through the dispatch pipeline.

        ACTION_BRIGHT_HERE = 0x00000008,



        // The input dispatcher should add POLICY_FLAG_INTERCEPT_DISPATCH to the policy flags

        // it passed through the dispatch pipeline.

        ACTION_INTERCEPT_DISPATCH = 0x00000010

    };



    /* Describes a virtual key. */

libs/ui/InputReader.cpp

+0 −4
Original line number Diff line number Diff line
@@ -1639,10 +1639,6 @@ bool InputReader::applyStandardInputDispatchPolicyActions(nsecs_t when, 
        *policyFlags |= POLICY_FLAG_BRIGHT_HERE;

    }



    if (policyActions & InputReaderPolicyInterface::ACTION_INTERCEPT_DISPATCH) {

        *policyFlags |= POLICY_FLAG_INTERCEPT_DISPATCH;

    }



    return policyActions & InputReaderPolicyInterface::ACTION_DISPATCH;

}