Commit ad3f4a45 authored May 05, 2010 by The Android Open Source Project Committed by Android Git Automerger May 05, 2010

am f7896449: merge from open-source master

Merge commit 'f78964490d8098387d51444c87bf520ad3f674e2' into kraken

* commit 'f78964490d8098387d51444c87bf520ad3f674e2':
  Add new keycodes for the convenience of Japanese IMEs
  Call register_localized_collators() with the current locale.
  Fixed deserialization problem in DatePicker.
  Fix for bug 2467152 files with spaces fail to open.
  Set alpha value for newly created dim surface.
  telephony: Fix CID when CID is unknown

parents b0151801 30f71ce5

include/ui/KeycodeLabels.h

100644 → 100755

+5 −1

Original line number	Diff line number	Diff line
		@@ -116,6 +116,8 @@ static const KeycodeLabel KEYCODES[] = {
		{ "MUTE", 91 },
		{ "PAGE_UP", 92 },
		{ "PAGE_DOWN", 93 },
		{ "PICTSYMBOLS", 94 },
		{ "SWITCH_CHARSET", 95 },

		// NOTE: If you add a new keycode here you must also add it to:
		// (enum KeyCode, in this file)
		@@ -222,7 +224,9 @@ typedef enum KeyCode {
		kKeyCodeForward = 90,
		kKeyCodeMute = 91,
		kKeyCodePageUp = 92,
		kKeyCodePageDown = 93
		kKeyCodePageDown = 93,
		kKeyCodePictSymbols = 94,
		kKeyCodeSwitchCharset = 95
		} KeyCode;

		static const KeycodeLabel FLAGS[] = {