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

Commit ac18906a authored Jun 30, 2010 by Jeff Brown Committed by Android Git Automerger Jun 30, 2010

am 0c2df984: am d8ae2885: Merge "Fix injection of specially intercepted keys...

am 0c2df984: am d8ae2885: Merge "Fix injection of specially intercepted keys like HOME." into gingerbread

Merge commit '0c2df98425c8fa4ce092eebea80ae197547f6a86'

* commit '0c2df98425c8fa4ce092eebea80ae197547f6a86':
  Fix injection of specially intercepted keys like HOME.

parents b0760012 2427ff85

include/ui/Input.h

+0 −3

Original line number	Original line	Diff line number	Diff line
	@@ -87,9 +87,6 @@ enum {
	// Indicates that the screen was dim when the event was received and the event		// Indicates that the screen was dim when the event was received and the event
	// should brighten the device.		// should brighten the device.
	POLICY_FLAG_BRIGHT_HERE = 0x20000000,		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	Original line	Diff line number	Diff line
	@@ -371,10 +371,6 @@ public:
	// The input dispatcher should add POLICY_FLAG_BRIGHT_HERE to the policy flags it		// The input dispatcher should add POLICY_FLAG_BRIGHT_HERE to the policy flags it
	// passes through the dispatch pipeline.		// passes through the dispatch pipeline.
	ACTION_BRIGHT_HERE = 0x00000008,		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. */		/* Describes a virtual key. */

libs/ui/InputReader.cpp

+0 −4

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

	if (policyActions & InputReaderPolicyInterface::ACTION_INTERCEPT_DISPATCH) {
	*policyFlags \|= POLICY_FLAG_INTERCEPT_DISPATCH;
	}

	return policyActions & InputReaderPolicyInterface::ACTION_DISPATCH;		return policyActions & InputReaderPolicyInterface::ACTION_DISPATCH;
	}		}