Commit graph

807 commits

Author SHA1 Message Date
Eric Fischer
2245c3a5a9 Trim unwanted whitespace from translations. DO NOT MERGE
Change-Id: Ie380334bc725aa55beb8ec084d1ade881a50812c
2010-09-27 12:22:28 -07:00
Ken Wakasa
0517bffc06 am 7f2a6a05: am 0b4ae1f5: Capitalize the displayed text in the suggestion bar when all of the user typed chars are upper case
Merge commit '7f2a6a056b67efa2a1fb623ca4cf73f7fb6c7d8c'

* commit '7f2a6a056b67efa2a1fb623ca4cf73f7fb6c7d8c':
  Capitalize the displayed text in the suggestion bar when all of the user typed chars are upper case
2010-09-27 09:30:28 -07:00
Ken Wakasa
0b4ae1f578 Capitalize the displayed text in the suggestion bar when all of the user typed chars are upper case
bug:3014227
Change-Id: Ic453e2fde57ce51be00f3a506e1c9328103ca99a
2010-09-28 01:15:11 +09:00
Tadashi G. Takaoka
dc7097b4e7 Merge "Add xlarge keyboard layouts (tentative)" 2010-09-27 08:39:12 -07:00
Tadashi G. Takaoka
b1fcbec730 Add xlarge keyboard layouts (tentative)
This keyboard layout is tentative for UX study.

This change added xlarge keyboard layouts only for "regular text",
"symbol/number mode" and "symbol/number mode shifted".

TODO other text mode variants should have dedicated layout.

Change-Id: I36077efcec4b57c3b5cada0a851e1409a289eeb9
2010-09-28 00:17:53 +09:00
satok
a48d298d10 resolved conflicts for merge of b9c0ed59 to master
Change-Id: Ib42164a5889eb9792b5e94de1e0ffd4c1924e29d
2010-09-27 15:33:24 +09:00
satok
3a2b90357c Merge "Add Debug Settings Activity" into gingerbread 2010-09-26 22:15:57 -07:00
satok
bf96661d33 Add Debug Settings Activity
Bug:3033472

Change-Id: I311c66ac3c612a30d7da3be8ee35a352f49016ac
2010-09-27 14:07:10 +09:00
Eric Fischer
30dd9b5d48 Import revised translations.
Change-Id: I38532015c089c0a5c6c1b98fe44f282918aebe5e
2010-09-24 12:28:30 -07:00
Eric Fischer
89711080dc Merge "Import revised translations. DO NOT MERGE" into gingerbread 2010-09-24 10:39:07 -07:00
Eric Fischer
5deb1678b2 Import revised translations. DO NOT MERGE
Change-Id: I1bf6a9e39adbe7d8e938f6dd5fe12227f8da4053
2010-09-24 10:26:49 -07:00
Ken Wakasa
760e7b24ad am ca2fba71: am 6ee1bd42: Merge "Keep addWordToDictionary from doing disk I/O on main thread" into gingerbread
Merge commit 'ca2fba71086b3832998ee9039723b66cce3be300'

* commit 'ca2fba71086b3832998ee9039723b66cce3be300':
  Keep addWordToDictionary from doing disk I/O on main thread
2010-09-24 08:40:48 -07:00
Ken Wakasa
6ee1bd425b Merge "Keep addWordToDictionary from doing disk I/O on main thread" into gingerbread 2010-09-24 08:33:31 -07:00
Ken Wakasa
336bc6bfeb Keep addWordToDictionary from doing disk I/O on main thread
bug: 2999524

Change-Id: Id8b04d38079cfa1dadd5955eb7f83085e60eb8e2
2010-09-25 00:14:24 +09:00
Tadashi G. Takaoka
05ebb2e511 am bf03559f: am 64e5a194: Merge "Add enter/exit animation style to prevew and mini keyboard" into gingerbread
Merge commit 'bf03559f7e38cd51cb5fd6b0afa937982cbffc67'

* commit 'bf03559f7e38cd51cb5fd6b0afa937982cbffc67':
  Add enter/exit animation style to prevew and mini keyboard
2010-09-24 06:27:24 -07:00
Tadashi G. Takaoka
64e5a1940f Merge "Add enter/exit animation style to prevew and mini keyboard" into gingerbread 2010-09-24 06:07:23 -07:00
Tadashi G. Takaoka
0ae817c9ae Add enter/exit animation style to prevew and mini keyboard
TODO This animation style API of PopupWindow can be called only in
Gingrebread or later.  We should refactor this using reflection to be
able to be compatible with Froyo.

Bug: 3004787
Bug: 2973989
Change-Id: I2abfcc853b1a0af2bccee7bdf5fbd723456b7d34
2010-09-24 20:51:13 +09:00
satok
3da22f8146 am 27bddbe6: am 1bebdcb4: Move RingCharBuffer as a singleton in Util
Merge commit '27bddbe67f00953dc82a8543fe610c9010f7077c'

* commit '27bddbe67f00953dc82a8543fe610c9010f7077c':
  Move RingCharBuffer as a singleton in Util
2010-09-24 00:36:20 -07:00
satok
1bebdcb4e4 Move RingCharBuffer as a singleton in Util
Change-Id: I08d09555a99a64038374e62019777d331c48319b
2010-09-24 16:27:36 +09:00
Ken Wakasa
e76fad939b am 5521d06f: am 5339950b: Update mdpi visual assets of upper-right number hint
Merge commit '5521d06fe582c4b4b0d653544c0d0847029b5f1c'

* commit '5521d06fe582c4b4b0d653544c0d0847029b5f1c':
  Update mdpi visual assets of upper-right number hint
2010-09-23 23:44:07 -07:00
Ken Wakasa
5339950bbc Update mdpi visual assets of upper-right number hint
Change-Id: I77e2b70f4ec954ea2a0822f7bdb92d8a4d405f7f
2010-09-24 15:03:02 +09:00
Tadashi G. Takaoka
ae7e550662 am bc63621f: am 9d44411a: Fixed popup mini-keyboard position
Merge commit 'bc63621fcf1db2933f708bf3dd81b2b2f2211c5e'

* commit 'bc63621fcf1db2933f708bf3dd81b2b2f2211c5e':
  Fixed popup mini-keyboard position
2010-09-23 04:14:55 -07:00
Tadashi G. Takaoka
9d44411a82 Fixed popup mini-keyboard position
This change reverts I28bf3e4deb46a428dc8422a3a165183e00608604 partly

Bug: 3029284
Change-Id: I0701ab9dfa1cfddbecbef3d32e525c0a143fc297
2010-09-23 20:04:13 +09:00
Tadashi G. Takaoka
6721b98b5c am ec8b7360: am 77542988: Tune left and right padding of popup mini keyboard
Merge commit 'ec8b7360161f37d00d178bef37c30352982cd007'

* commit 'ec8b7360161f37d00d178bef37c30352982cd007':
  Tune left and right padding of popup mini keyboard
2010-09-23 00:13:48 -07:00
Tadashi G. Takaoka
77542988b8 Tune left and right padding of popup mini keyboard
This change also fix popup window display position calculation.

Bug: 3029284
Change-Id: I28bf3e4deb46a428dc8422a3a165183e00608604
2010-09-23 15:53:05 +09:00
Tadashi G. Takaoka
48ef8f4a25 am a8f77c36: am 23f7fb03: Merge "Disable invoking VoiceIME using swipe right action" into gingerbread
Merge commit 'a8f77c36ca985cb356b03b25f5cd30fd3b25dc9a'

* commit 'a8f77c36ca985cb356b03b25f5cd30fd3b25dc9a':
  Disable invoking VoiceIME using swipe right action
2010-09-22 22:57:15 -07:00
Tadashi G. Takaoka
fc66213d9e am 4fab9f2f: am b75dee4b: Merge "Fix ArrayIndexOutOfBoundsException in WordComposer" into gingerbread
Merge commit '4fab9f2fee9cfb1a67d805c1598deae02fa4d8cc'

* commit '4fab9f2fee9cfb1a67d805c1598deae02fa4d8cc':
  Fix ArrayIndexOutOfBoundsException in WordComposer
2010-09-22 22:57:13 -07:00
Tadashi G. Takaoka
23f7fb035d Merge "Disable invoking VoiceIME using swipe right action" into gingerbread 2010-09-22 22:51:11 -07:00
Tadashi G. Takaoka
b75dee4b00 Merge "Fix ArrayIndexOutOfBoundsException in WordComposer" into gingerbread 2010-09-22 22:50:36 -07:00
Tadashi G. Takaoka
d1a8e3088b Fix ArrayIndexOutOfBoundsException in WordComposer
Bug: 3028277
Change-Id: I1c4d8dca4db8a70f851589d1fbd45a16ea1bfc1b
2010-09-23 14:47:26 +09:00
Tadashi G. Takaoka
437cabe0df am 1241be7e: am a96d8a11: Use SystemClock.uptimeMillis() for event time
Merge commit '1241be7e8498b8cca348d74363ece68b3ade730c'

* commit '1241be7e8498b8cca348d74363ece68b3ade730c':
  Use SystemClock.uptimeMillis() for event time
2010-09-22 22:07:58 -07:00
Tadashi G. Takaoka
a96d8a11e8 Use SystemClock.uptimeMillis() for event time
Change-Id: If20f289992f829ae3a0a2a1eb60a4fc9b35c308a
2010-09-23 13:06:03 +09:00
Tadashi G. Takaoka
abd7bba981 Disable invoking VoiceIME using swipe right action
Bug: 3028268
Change-Id: I4bcf35051d5e82b60bb6a346a80ad6c3c03c31cb
2010-09-23 12:55:44 +09:00
Tadashi G. Takaoka
36f64d2bba am 84af4309: am 8493e431: Use constant for keycode.
Merge commit '84af4309f8a2d030bfd042d8363669cc477c676f'

* commit '84af4309f8a2d030bfd042d8363669cc477c676f':
  Use constant for keycode.
2010-09-22 02:42:59 -07:00
Tadashi G. Takaoka
8493e43148 Use constant for keycode.
This is follow up change of Idb3adcb6fac1a23836510912d35312fa11b4f259

Change-Id: I130e381b0d5ac01176a746a4a915e2fc9d54587b
2010-09-22 18:29:19 +09:00
Tadashi G. Takaoka
99d6a248ef am 8957296f: am 9d1cb899: Merge "Choose smaller or shorter language name for space bar" into gingerbread
Merge commit '8957296f066b1f624dc4fae71d3eeb5a0fec1b4f'

* commit '8957296f066b1f624dc4fae71d3eeb5a0fec1b4f':
  Choose smaller or shorter language name for space bar
2010-09-22 02:21:20 -07:00
Tadashi G. Takaoka
9d1cb89939 Merge "Choose smaller or shorter language name for space bar" into gingerbread 2010-09-22 02:17:06 -07:00
Tadashi G. Takaoka
8243c7a5e5 Choose smaller or shorter language name for space bar
To fit a language name to the space bar or the language switcher, this
change chooses smaller text size or shorter language name
appropriately.

This change also tunes the vertical position of a language name in the
space bar by parameter SPACEBAR_LANGUAGE_BASELINE.

Bug: 3004640
Bug: 3001021

Change-Id: Idb3adcb6fac1a23836510912d35312fa11b4f259
2010-09-22 18:03:46 +09:00
satok
a1f7df874b am b2570e76: am fd56a14c: Merge "Remove unnecessary assets for LatinIME in GingerBread" into gingerbread
Merge commit 'b2570e76efdb0362805798437dddcfc01b5fd00d'

* commit 'b2570e76efdb0362805798437dddcfc01b5fd00d':
  Remove unnecessary assets for LatinIME in GingerBread
2010-09-22 01:37:26 -07:00
satok
fd56a14c6b Merge "Remove unnecessary assets for LatinIME in GingerBread" into gingerbread 2010-09-22 01:30:14 -07:00
satok
824623a9ca Remove unnecessary assets for LatinIME in GingerBread
Change-Id: I6f690f261cdcad9aaf1dd4b0a13a7a9102b3dded
2010-09-22 17:22:40 +09:00
Tadashi G. Takaoka
db6b897118 am 7c120ce4: am 3a2896c8: Fix issue space key preview remains on screen and would not dismiss
Merge commit '7c120ce4872398ea4f61a67aba1d069e45f1c012'

* commit '7c120ce4872398ea4f61a67aba1d069e45f1c012':
  Fix issue space key preview remains on screen and would not dismiss
2010-09-22 00:10:16 -07:00
Tadashi G. Takaoka
3a2896c804 Fix issue space key preview remains on screen and would not dismiss
The space key preview should be displayed one of the following case.
- Popup preview is enabled
- Language switcher is in action, whether popup preview is enabled or
  not.

For phone number keyboard, popup preview is never displayed even if
popup preview is enabled.

Bug: 3006612
Bug: 3021091
Change-Id: I5385c776d0e8e3981fc8d8851db9140d92599ce5
2010-09-22 15:50:31 +09:00
Ken Wakasa
60f6e5d461 am 33c13c41: am 75c23ced: Add lightweight visual indication for numbers.
Merge commit '33c13c413ad7cf30d5a12e2ba6c463e01b47e92a'

* commit '33c13c413ad7cf30d5a12e2ba6c463e01b47e92a':
  Add lightweight visual indication for numbers.
2010-09-21 21:45:40 -07:00
Ken Wakasa
75c23ced94 Add lightweight visual indication for numbers.
This change adds lightweight visual hints of alternate numeric characters on the top row - e.g. having a light gray '1' on the upper right corner of letter 'q'

Note that MDPI resources are tentative (the same as HDPI for now, until we get fixed MDPI visual assets).

bug: 3004632
Change-Id: I7a25cf90b702433a844c88f5c47bf914706af9bc
2010-09-22 13:00:11 +09:00
Tadashi G. Takaoka
41acad294c am c01d978f: am a104575c: Merge "Draw language label on space key of symbol+alt mode" into gingerbread
Merge commit 'c01d978f56f90425f070d57a66968aa77ef69a7d'

* commit 'c01d978f56f90425f070d57a66968aa77ef69a7d':
  Draw language label on space key of symbol+alt mode
2010-09-21 10:44:29 -07:00
Tadashi G. Takaoka
75abaf5d8f am 9c822ec4: am 6b75eaa1: Fix mini keyboard display position when preview is disabled
Merge commit '9c822ec48de0e6839a861212d8b7143f70b29fd1'

* commit '9c822ec48de0e6839a861212d8b7143f70b29fd1':
  Fix mini keyboard display position when preview is disabled
2010-09-21 10:44:22 -07:00
Tadashi G. Takaoka
051511fa09 am 1d82ee9a: am 56cd6df9: Merge "Space key will no longer auto-repeat" into gingerbread
Merge commit '1d82ee9a13b1e57af80d2bd0e3f879305bda137d'

* commit '1d82ee9a13b1e57af80d2bd0e3f879305bda137d':
  Space key will no longer auto-repeat
2010-09-21 10:43:52 -07:00
Tadashi G. Takaoka
a104575c99 Merge "Draw language label on space key of symbol+alt mode" into gingerbread 2010-09-21 08:34:57 -07:00
Tadashi G. Takaoka
31ff846e8c Draw language label on space key of symbol+alt mode
Bug: 3003888
Change-Id: I0bafcd13f3e5e5c69c65ed72580d108f2745e004
2010-09-21 23:05:29 +09:00
Tadashi G. Takaoka
6b75eaa12d Fix mini keyboard display position when preview is disabled
Bug: 3021082
Change-Id: I2cfb462c89b222449ee2ba5559462a9f5d2306ed
2010-09-21 21:10:17 +09:00
Tadashi G. Takaoka
56cd6df95e Merge "Space key will no longer auto-repeat" into gingerbread 2010-09-20 22:46:10 -07:00
Tadashi G. Takaoka
a628e46c11 am 0ab6747d: am 4da43a25: Shorten popup preview residual time (100ms)
Merge commit '0ab6747d424f412a103a4092bc3fcb2e891994ad'

* commit '0ab6747d424f412a103a4092bc3fcb2e891994ad':
  Shorten popup preview residual time (100ms)
2010-09-20 21:07:12 -07:00
Tadashi G. Takaoka
aaa163b2b7 Space key will no longer auto-repeat
Bug: 3014225
Change-Id: I94d4904726985d5e17b665d4042c873ea07221f1
2010-09-21 13:00:13 +09:00
Tadashi G. Takaoka
4da43a25cb Shorten popup preview residual time (100ms)
The residual time was formerly 150ms by
Ia63662a549481d18046a46ef8292c0a4438b5588, and originally was 70ms.

Bug: 3004787
Change-Id: If60a74c51e9a68f008711cca2423094e8204755f
2010-09-21 12:00:55 +09:00
Tadashi G. Takaoka
3a997ae631 am 66774575: am 7763b36d: Align key preview and mini-keyboard positions
Merge commit '667745750735d7535a6e6e9580b7c762735fad12'

* commit '667745750735d7535a6e6e9580b7c762735fad12':
  Align key preview and mini-keyboard positions
2010-09-17 10:38:40 -07:00
Tadashi G. Takaoka
6f3d98f115 am 051d4f45: am 4a3ffcbf: Longer popup preview residual time (150ms)
Merge commit '051d4f459d35eac61772a0fe0f6487b8c34ec479'

* commit '051d4f459d35eac61772a0fe0f6487b8c34ec479':
  Longer popup preview residual time (150ms)
2010-09-17 10:38:37 -07:00
Tadashi G. Takaoka
7763b36d6d Align key preview and mini-keyboard positions
Bug: 3004793
Change-Id: I1839e6ff3c8c66a576bfb3db9391c146ed225451
2010-09-18 02:19:03 +09:00
Tadashi G. Takaoka
4a3ffcbf32 Longer popup preview residual time (150ms)
Bug: 3004787
Change-Id: Ia63662a549481d18046a46ef8292c0a4438b5588
2010-09-18 01:48:03 +09:00
satok
67ba0159b7 am 0222f08a: am 62955c79: Update mdpi assets
Merge commit '0222f08a79999767a2b6cbfeaa9d42c87546bb12'

* commit '0222f08a79999767a2b6cbfeaa9d42c87546bb12':
  Update mdpi assets
2010-09-17 03:39:04 -07:00
satok
62955c7951 Update mdpi assets
bug: 2973737

Change-Id: I2efc96886a3f5656ca3d9e799a4052f044e61e70
2010-09-17 19:23:03 +09:00
Ken Wakasa
86fa29ade9 DO NOT MERGE. Get rid of the user feedback preference from Gingerbread.
Change-Id: I2f0dc3b0cba78c85249cb6cecc9b5c588de4f26b
2010-09-17 18:12:03 +09:00
Ken Wakasa
ef5f2102c5 am 300362f2: am 29d8bde4: Merge "Use the phone keyboard for NUMBER and DATETIME until we get a dedicated number entry keypad." into gingerbread
Merge commit '300362f20982974d07876dee01b4550b8e54d449'

* commit '300362f20982974d07876dee01b4550b8e54d449':
  Use the phone keyboard for NUMBER and DATETIME until we get a dedicated number entry keypad.
2010-09-16 23:23:45 -07:00
Tadashi G. Takaoka
99a23923e6 am 8ef27577: am 1476988e: Default puctuation suggestions have same color
Merge commit '8ef27577da17f4203db00d5df96c3d2ed32ac713'

* commit '8ef27577da17f4203db00d5df96c3d2ed32ac713':
  Default puctuation suggestions have same color
2010-09-16 23:23:42 -07:00
Ken Wakasa
29d8bde4de Merge "Use the phone keyboard for NUMBER and DATETIME until we get a dedicated number entry keypad." into gingerbread 2010-09-16 20:03:35 -07:00
Ken Wakasa
08f664fa65 Use the phone keyboard for NUMBER and DATETIME until we get a dedicated number entry keypad.
bug: 2992459
Change-Id: Ie597a68aa394c48e08a5d3fda19a0b613795b47b
2010-09-17 11:47:37 +09:00
Tadashi G. Takaoka
1476988ebb Default puctuation suggestions have same color
Bug: 3000978
Change-Id: Iedb3d4619ada8bd3ccc301ca2a8fb16fba6580c0
2010-09-17 11:45:46 +09:00
Ken Wakasa
6fecf0796c am 37a8c654: am 809bef52: Merge "Increase gradient of suggestion bar" into gingerbread
Merge commit '37a8c654a0cb9728451623dc1eed13ec9767b889'

* commit '37a8c654a0cb9728451623dc1eed13ec9767b889':
  Increase gradient of suggestion bar
2010-09-16 04:45:56 -07:00
Ken Wakasa
809bef520b Merge "Increase gradient of suggestion bar" into gingerbread 2010-09-16 04:41:04 -07:00
Ken Wakasa
490da4301f am 37600e29: am 06ff4c21: Merge "Change suggestion & bold colors" into gingerbread
Merge commit '37600e29ab7cfe95a7c5c340e44ca9dbbee0adfb'

* commit '37600e29ab7cfe95a7c5c340e44ca9dbbee0adfb':
  Change suggestion & bold colors
2010-09-16 04:30:11 -07:00
Ken Wakasa
06ff4c2175 Merge "Change suggestion & bold colors" into gingerbread 2010-09-16 04:24:05 -07:00
Ken Wakasa
749b1eaaaa Increase gradient of suggestion bar
bug: 3001007
Change-Id: I0f05d62b2a6848f37975b7a15b3ba14a90776d24
2010-09-16 20:21:30 +09:00
Tadashi G. Takaoka
b40ca031b7 am 525776b6: am ed8eabcc: Cleanup keyboard layout files
Merge commit '525776b681a0548fa6f98ee22a74ae4225c7fa07'

* commit '525776b681a0548fa6f98ee22a74ae4225c7fa07':
  Cleanup keyboard layout files
2010-09-16 04:16:36 -07:00
Tadashi G. Takaoka
ed8eabcc39 Cleanup keyboard layout files
Change-Id: I095c1294b9e826b503ff741eeff9dc93ad39f060
2010-09-16 20:02:04 +09:00
Ken Wakasa
d98cd76896 Change suggestion & bold colors
bug: 3004846
Change-Id: Id6878ea0a5b1f67af68b4690fdc1527513c999ab
2010-09-16 16:36:41 +09:00
Tadashi G. Takaoka
5d007ef380 am 89e21ee1: am 08cfebda: Move comma as default position of mini keyboard
Merge commit '89e21ee1f5be55ac3db224ab54b27cc604087efa'

* commit '89e21ee1f5be55ac3db224ab54b27cc604087efa':
  Move comma as default position of mini keyboard
2010-09-15 21:43:19 -07:00
Tadashi G. Takaoka
08cfebda8b Move comma as default position of mini keyboard
Bug: 3000978
Change-Id: I0369b3dc6ae58b77e7af112e446ae8189f5bbfc9
2010-09-16 12:22:53 +09:00
Ken Wakasa
2b90a1adcb am 13a6c8c1: am 1508c0e8: Add a new preference item to show/hide the settings key.
Merge commit '13a6c8c1f8691b753cd1a6b7a77d99af4f7d78ac'

* commit '13a6c8c1f8691b753cd1a6b7a77d99af4f7d78ac':
  Add a new preference item to show/hide the settings key.
2010-09-15 16:49:53 -07:00
Amith Yamasani
9b2c10284b am d6210de7: am dd5d4e37: Merge "Fix : Bouncing Extract Text when correcting multiple lines of text." into gingerbread
Merge commit 'd6210de709a0ed724f355743f196e827ebd7df50'

* commit 'd6210de709a0ed724f355743f196e827ebd7df50':
  Fix : Bouncing Extract Text when correcting multiple lines of text.
2010-09-15 16:48:56 -07:00
Tadashi G. Takaoka
f027b1c5eb am b9705959: am bf1f16f3: Merge "All keys should be processed before processing modifier key" into gingerbread
Merge commit 'b9705959df5d7de38df5dea53270bf702b87716d'

* commit 'b9705959df5d7de38df5dea53270bf702b87716d':
  All keys should be processed before processing modifier key
2010-09-15 16:47:02 -07:00
Tadashi G. Takaoka
1e445ed2af am 4b813f56: am bd1cc1da: Fix bug that upper case mini-keyboard does not work
Merge commit '4b813f56bbe11210835a31de7fd73bfe5a566ead'

* commit '4b813f56bbe11210835a31de7fd73bfe5a566ead':
  Fix bug that upper case mini-keyboard does not work
2010-09-15 16:46:51 -07:00
Ken Wakasa
1508c0e84f Add a new preference item to show/hide the settings key.
bug: 2998722

Change-Id: Iac1641c338388fd8f85e0cf47e31afdaeb34c0c0
2010-09-16 02:48:10 +09:00
Amith Yamasani
dd5d4e378a Merge "Fix : Bouncing Extract Text when correcting multiple lines of text." into gingerbread 2010-09-15 09:55:02 -07:00
Amith Yamasani
c1020c3aa6 Fix : Bouncing Extract Text when correcting multiple lines of text.
Bug: 2996887

Override the methods in InputMethodService that hide the candidates view, since
it was just an optimization to show more lines of text when editing, which
conflicts with the re-correct feature.

Change-Id: Ibfed5ccd9efa048d0b69297a5cf8a638a0d00c72
2010-09-15 09:34:17 -07:00
Tadashi G. Takaoka
b0b9f3b830 am b36a653c: am 12a4e08a: Handling multi-character uppercase key input
Merge commit 'b36a653ca65f3c26ba070a73b9d43beb57f620ee'

* commit 'b36a653ca65f3c26ba070a73b9d43beb57f620ee':
  Handling multi-character uppercase key input
2010-09-15 07:07:04 -07:00
Tadashi G. Takaoka
53a68e7dcf am b2835ef2: am eb680367: Add keyHysteresisDistance xml attribute
Merge commit 'b2835ef2e506b7d1b3db1c810b7dae349d2461d2'

* commit 'b2835ef2e506b7d1b3db1c810b7dae349d2461d2':
  Add keyHysteresisDistance xml attribute
2010-09-15 07:07:01 -07:00
Ken Wakasa
22a2215c1e am 2c424922: am 9717d5b1: Get rid of execution bit
Merge commit '2c42492224a2c4d9533fe9a8f4b994bc3f3a90e0'

* commit '2c42492224a2c4d9533fe9a8f4b994bc3f3a90e0':
  Get rid of execution bit
2010-09-15 07:06:58 -07:00
Tadashi G. Takaoka
bf1f16f35f Merge "All keys should be processed before processing modifier key" into gingerbread 2010-09-15 02:54:43 -07:00
Tadashi G. Takaoka
bd1cc1da00 Fix bug that upper case mini-keyboard does not work
This issue is introduced by I1932b0a382e172cb77b9e098ae182049c834dfe0

Bug: 2993769
Change-Id: I344d21e046b58b3bb9831605a7425a94c97d8492
2010-09-15 18:46:24 +09:00
Tadashi G. Takaoka
2aa8078df8 All keys should be processed before processing modifier key
Bug: 2987077
Change-Id: I971c44be121d8780ec27aa1649fd0925e249fbbc
2010-09-15 18:41:54 +09:00
Tadashi G. Takaoka
12a4e08a64 Handling multi-character uppercase key input
Change-Id: Ie0820a2627e18109036d5f6f286d5a366c9b9f87
2010-09-14 17:20:48 +09:00
Tadashi G. Takaoka
eb68036798 Add keyHysteresisDistance xml attribute
This change also introduces MiniKeyboardKeyDetector and
mini_keyboad_slide_allowance parameter to tune the key detection
behavior.

Bug: 2993769
Change-Id: I1932b0a382e172cb77b9e098ae182049c834dfe0
2010-09-14 16:26:45 +09:00
Ken Wakasa
9717d5b1ee Get rid of execution bit
Change-Id: I25b530c2ab50c045da321e00d905cbec19188ea3
2010-09-14 11:51:58 +09:00
Eric Fischer
48e72c611a am f06a1bb2: am 0ca8cf67: Merge "Rename altchars.xml to keep translation imports from altering it." into gingerbread
Merge commit 'f06a1bb2947221109dac20bdbb93387ad34d347c'

* commit 'f06a1bb2947221109dac20bdbb93387ad34d347c':
  Rename altchars.xml to keep translation imports from altering it.
2010-09-13 14:42:21 -07:00
Eric Fischer
0ca8cf67a3 Merge "Rename altchars.xml to keep translation imports from altering it." into gingerbread 2010-09-13 10:04:49 -07:00
satok
3a6bb59ccb am 58e641c3: am 395d5012: Rename keyboard_popup_keyboard.xml keyboard_key_preview.xml
Merge commit '58e641c3fc8c13b6c88c806c5e47d9cf16311dd7'

* commit '58e641c3fc8c13b6c88c806c5e47d9cf16311dd7':
  Rename keyboard_popup_keyboard.xml keyboard_key_preview.xml
2010-09-13 07:19:11 -07:00
satok
395d501252 Rename keyboard_popup_keyboard.xml keyboard_key_preview.xml
Change-Id: I7c98a91c77f5ef46ee0b15783242024c0bd10503
2010-09-13 23:06:49 +09:00
satok
506b9e4ee6 am ca66f93f: am c706b1cf: Remove unused popup layout
Merge commit 'ca66f93f23414c2010181f34823c24870de82b86'

* commit 'ca66f93f23414c2010181f34823c24870de82b86':
  Remove unused popup layout
2010-09-13 04:35:09 -07:00
satok
c706b1cf75 Remove unused popup layout
Change-Id: I7009ec8cdb7977236d57b03c8603d0476186d885
2010-09-13 20:27:43 +09:00
satok
6871caa3e9 am 95cf87b8: am c931021d: Fix the gap of popup
Merge commit '95cf87b87c7b525ad60367a3bb250c0a5de96d89'

* commit '95cf87b87c7b525ad60367a3bb250c0a5de96d89':
  Fix the gap of popup
2010-09-13 03:10:11 -07:00
satok
606d69cc08 am 41970ca0: am 6d51f0ea: Merge "Add mdpi assets and fix mode" into gingerbread
Merge commit '41970ca085bb4814ec7a63060a94b83b8de030b8'

* commit '41970ca085bb4814ec7a63060a94b83b8de030b8':
  Add mdpi assets and fix mode
2010-09-13 03:02:17 -07:00
satok
c931021da0 Fix the gap of popup
Change-Id: I8b727fce857c1f943bd6f1eff6fa5d9b3c158a60
2010-09-13 18:59:48 +09:00
satok
6d51f0ea0c Merge "Add mdpi assets and fix mode" into gingerbread 2010-09-13 02:57:56 -07:00
satok
a56271976a Add mdpi assets and fix mode
Bug: 2973737
Change-Id: I3eb0bc2fb7701315dd9b646a2f204884134c54de
2010-09-13 18:57:16 +09:00
satok
7f546d8e28 am 4f73eaea: am fe5a49ed: Add popup layout for theme of gingerbread
Merge commit '4f73eaea3e83f87bda9f8569e5a3bab085bc7128'

* commit '4f73eaea3e83f87bda9f8569e5a3bab085bc7128':
  Add popup layout for theme of gingerbread
2010-09-13 02:01:40 -07:00
satok
fe5a49ed0d Add popup layout for theme of gingerbread
Change-Id: I464dc6cef4ca8cfd3c2fdb2fe99b2dc7d4e7988d
2010-09-13 17:42:48 +09:00
satok
4a000d8582 am 7f47fd22: am 0edddce0: Merge "Update working.png" into gingerbread
Merge commit '7f47fd224a38bd9af872296162c7791207604f15'

* commit '7f47fd224a38bd9af872296162c7791207604f15':
  Update working.png
2010-09-12 20:39:44 -07:00
satok
0edddce011 Merge "Update working.png" into gingerbread 2010-09-12 20:36:01 -07:00
Ken Wakasa
67ffd0b0ea am 45606d3c: am 0ea6270f: More commit -> apply changes with SharedPreferencesCompat.
Merge commit '45606d3c48c5f079673879add3e700ea571e2a93'

* commit '45606d3c48c5f079673879add3e700ea571e2a93':
  More commit -> apply changes with SharedPreferencesCompat.
2010-09-12 09:26:59 -07:00
Ken Wakasa
0ea6270ffb More commit -> apply changes with SharedPreferencesCompat.
The newly added SharedPreferencesCompat adapter class does apply() when available (Gingerbread+), else do commit().

This change incorporates I4eca20fb and I39f6aa04.

bug: 2983837
Change-Id: Iec4e8b69840ad71dbbd6098eeba349934d8248ff
2010-09-13 00:50:48 +09:00
Ken Wakasa
3e5ebd3d40 am 65dab907: am aed01227: Fix a bug in y-axis offset for sliding finger key detection for mini popup keyboard.
Merge commit '65dab9078dd0c77adcc49d08c46039dad2a950f6'

* commit '65dab9078dd0c77adcc49d08c46039dad2a950f6':
  Fix a bug in y-axis offset for sliding finger key detection for mini popup keyboard.
2010-09-12 06:07:55 -07:00
Ken Wakasa
aed0122734 Fix a bug in y-axis offset for sliding finger key detection for mini popup keyboard.
Also, tentatively added key detection allowance for below of the keys in mini popup keyboard.

bug: 2979407
Change-Id: I84794969facd929c84df23e0120d46dff71c6efb
2010-09-12 19:17:08 +09:00
Ken Wakasa
fcaca2121b am d73d267f: am f62166c1: Mini popup keyboard adjustment: Have the leftmost number right above the key.
Merge commit 'd73d267f34efb131467d9103bb9a56c18f9623b7'

* commit 'd73d267f34efb131467d9103bb9a56c18f9623b7':
  Mini popup keyboard adjustment: Have the leftmost number right above the key.
2010-09-11 22:27:11 -07:00
Ken Wakasa
f62166c13b Mini popup keyboard adjustment: Have the leftmost number right above the key.
Also fixed an issue when the mini popup keyboard hits the right edge of the view.

A few code cleanups as well.

bug: 2980864

Change-Id: I95f8392521e57560907d54b662e3483ebaf6f7ce
2010-09-12 04:09:36 +09:00
Eric Fischer
87d0dc827d Rename altchars.xml to keep translation imports from altering it.
It looks like these files are now being maintained in the source tree
instead of by the translators, so add a "donottranslate" prefix so that
reimporting translations will not overwrite the changes.

Change-Id: I471744ef7d5786ddb705cbda494bb1fbced3028b
2010-09-10 13:22:47 -07:00
satok
5c2e3ed20f Update working.png
Change-Id: I62f80b2d6e85ffa7bbf92992fe6942690163ef17
2010-09-11 04:57:54 +09:00
Tadashi G. Takaoka
1fd62cd8d2 am a8262575: am 6aa19395: Add Hawaiian, Maori, and other Polynesian macron
Merge commit 'a82625757f71fad5a52a2cd89d7d8c222b53bc51'

* commit 'a82625757f71fad5a52a2cd89d7d8c222b53bc51':
  Add Hawaiian, Maori, and other Polynesian macron
2010-09-09 23:36:52 -07:00
Tadashi G. Takaoka
6aa1939510 Add Hawaiian, Maori, and other Polynesian macron
Bug: 2862018
Change-Id: I32e1d2472abcc00f4d89a737593f7d0edcb49294
2010-09-10 15:26:31 +09:00
satok
582dc7f476 am aba73d55: am f9e0207a: Merge "Update assets for LatinIME" into gingerbread
Merge commit 'aba73d550e03135ed91c67b04b9075f09b080dfc'

* commit 'aba73d550e03135ed91c67b04b9075f09b080dfc':
  Update assets for LatinIME
2010-09-09 23:11:15 -07:00
Ken Wakasa
40cff6faa2 am 08a5ba3a: am 3de8f34b: Code cleanup
Merge commit '08a5ba3a69bef5182128f90e49eae4548795e9c9'

* commit '08a5ba3a69bef5182128f90e49eae4548795e9c9':
  Code cleanup
2010-09-09 23:11:12 -07:00
satok
f9e0207aac Merge "Update assets for LatinIME" into gingerbread 2010-09-09 21:34:58 -07:00
satok
64a3b589a8 Update assets for LatinIME
Change-Id: I75b28bbc17339d2ffc9c61521c9b1f0d90c34b77
2010-09-10 13:29:02 +09:00
Ken Wakasa
3de8f34b8c Code cleanup
Change-Id: I333693ab8e4088180cc25768d874ad7320d9da8b
2010-09-10 13:15:45 +09:00
Tadashi G. Takaoka
f888b99d36 am 94fe2b62: am efc4a437: Symbol key acts as modifier key
Merge commit '94fe2b626164f275a7f07f546ceca1b1f0d214a2'

* commit '94fe2b626164f275a7f07f546ceca1b1f0d214a2':
  Symbol key acts as modifier key
2010-09-09 04:51:41 -07:00
Tadashi G. Takaoka
efc4a43794 Symbol key acts as modifier key
On a device that has distinct multi-touch panel, pressing '123?' key
will change keyboard layout to symbol mode.  While pressing '123?'
key, you can press other symbol key to input.  Then releasing '123?'
key will change keyboard layout back to alphabet mode.

Bug: 2973383
Change-Id: I3b069fb19141820def8060db4766a08c7c0a6ff0
2010-09-09 20:43:13 +09:00
Tadashi G. Takaoka
2cfe3409bd am 72a66d3d: am 681b676b: Keep Keyboard in cache through SoftReference
Merge commit '72a66d3d860c92c1c05ba987a44b3811360f935d'

* commit '72a66d3d860c92c1c05ba987a44b3811360f935d':
  Keep Keyboard in cache through SoftReference
2010-09-08 22:49:54 -07:00
Tadashi G. Takaoka
e5875d6d7e am ad20a70b: am 3c559110: Merge "Add digit alternates" into gingerbread
Merge commit 'ad20a70bd9241eb435dd6b5b5b142746f675fd9e'

* commit 'ad20a70bd9241eb435dd6b5b5b142746f675fd9e':
  Add digit alternates
2010-09-08 21:36:40 -07:00
Tadashi G. Takaoka
681b676b0a Keep Keyboard in cache through SoftReference
This change also adds final to attributes

Change-Id: Ie2b9a1b1f83606b24ad4e35ad72a28d55ed0423e
2010-09-09 13:32:17 +09:00
Tadashi G. Takaoka
3c55911040 Merge "Add digit alternates" into gingerbread 2010-09-08 21:30:44 -07:00
Ken Wakasa
6fff167a8d am 38f6ff42: am 0e300c83: Avoid a disk write on UI thread
Merge commit '38f6ff4289933aaa54461f72ba14d33ad1d6c5d7'

* commit '38f6ff4289933aaa54461f72ba14d33ad1d6c5d7':
  Avoid a disk write on UI thread
2010-09-08 20:40:30 -07:00
Ken Wakasa
0e300c83a1 Avoid a disk write on UI thread
bug: 2983837
Change-Id: I4eca20fb4defcf149788032a98fe5894b57e1e19
2010-09-09 11:57:55 +09:00
Tadashi G. Takaoka
2fa36e4fab am 47385b0c: am 2dd905b3: Move alternate chars from keyboard layout to altchars.xml
Merge commit '47385b0ca55788d3455c4e72c52f585678c62045'

* commit '47385b0ca55788d3455c4e72c52f585678c62045':
  Move alternate chars from keyboard layout to altchars.xml
2010-09-08 10:38:05 -07:00
Tadashi G. Takaoka
62432ed453 am 42921b85: am c29ef3ec: Remove unnecessary android:codes attribute
Merge commit '42921b85d34985a7c819f3d4965f1819de2b2685'

* commit '42921b85d34985a7c819f3d4965f1819de2b2685':
  Remove unnecessary android:codes attribute
2010-09-08 10:38:03 -07:00
Tadashi G. Takaoka
8f8581e5c0 am aada63bd: am 12b6fef3: Merge "Extract alternates_for_X from strings.xml into altchars.xml" into gingerbread
Merge commit 'aada63bd751b061a03b7d9e8e9af7920e4ab3a90'

* commit 'aada63bd751b061a03b7d9e8e9af7920e4ab3a90':
  Extract alternates_for_X from strings.xml into altchars.xml
2010-09-08 10:37:59 -07:00
Tadashi G. Takaoka
cb8a8d327d am aabd5cdd: am 7372a977: Re-formatting \'de\' locale keyboard definition xml files
Merge commit 'aabd5cddfb0a2252411b9ecd69c7407ab70ce365'

* commit 'aabd5cddfb0a2252411b9ecd69c7407ab70ce365':
  Re-formatting 'de' locale keyboard definition xml files
2010-09-08 10:37:56 -07:00
satok
938ba36710 am 6ee4e439: am 31e2a94a: Merge "Fix the bacground color for "/" in URL mode" into gingerbread
Merge commit '6ee4e43929bd18b7d617d921f3ec259ff2b81592'

* commit '6ee4e43929bd18b7d617d921f3ec259ff2b81592':
  Fix the bacground color for "/" in URL mode
2010-09-08 10:37:53 -07:00
Tadashi G. Takaoka
163a5557ec am 2d5e34b7: am 3625c973: Remove unused azerty.xml keyboard layout
Merge commit '2d5e34b73095b724dab3ae8d1ef432c0779ca347'

* commit '2d5e34b73095b724dab3ae8d1ef432c0779ca347':
  Remove unused azerty.xml keyboard layout
2010-09-08 10:37:50 -07:00
Tadashi G. Takaoka
716fb24a67 am c20193cc: am 232863ac: Re-formatting keyboard definition xml files
Merge commit 'c20193cc8471ab8c772aed2cf5f36da47c13ad7a'

* commit 'c20193cc8471ab8c772aed2cf5f36da47c13ad7a':
  Re-formatting keyboard definition xml files
2010-09-08 10:34:52 -07:00
Tadashi G. Takaoka
012075a711 Add digit alternates
This also re-orders keyboard layout attribute and adds some
android:popupCharacters.

Bug: 2973749
Change-Id: I300fb4029a1844947731cb98a464d8d754cb03ef
2010-09-09 01:06:58 +09:00
Tadashi G. Takaoka
2dd905b3c7 Move alternate chars from keyboard layout to altchars.xml
Bug: 2973749
Change-Id: Ic6e5f986c32be07c1e1038594a0e420ba6902351
2010-09-08 19:47:09 +09:00
Tadashi G. Takaoka
c29ef3ec15 Remove unnecessary android:codes attribute
If there is no android:codes specified, the first character of
keyLabel's code point will be used instead.

Also introduce readable codes as @integer/key_XXX resources

Bug: 2973749
Change-Id: If9021ca35f9a7b922817e2099186fce0cd993652
2010-09-08 18:16:30 +09:00
Tadashi G. Takaoka
12b6fef349 Merge "Extract alternates_for_X from strings.xml into altchars.xml" into gingerbread 2010-09-08 02:15:54 -07:00
Tadashi G. Takaoka
5555f900b1 Extract alternates_for_X from strings.xml into altchars.xml
For some locales, donottranslate.xml were split or renamed.

Bug: 2973749
Change-Id: Ic7f9cebe70a116b735bebc988778104bb1a40954
2010-09-08 18:08:48 +09:00
Tadashi G. Takaoka
7372a9771f Re-formatting 'de' locale keyboard definition xml files
Just re-formating with eclipse editor.  This is supplement for
I18bc682c68df6239e54dd71ed3797d55fd5a1552.

Bug: 2973749
Change-Id: I4b03fa6d41808ce99ce4944ae742255bffc660b9
2010-09-08 17:47:24 +09:00
satok
31e2a94a09 Merge "Fix the bacground color for "/" in URL mode" into gingerbread 2010-09-08 01:36:24 -07:00
satok
007803c390 Fix the bacground color for "/" in URL mode
Change-Id: I832274244a9677ac98256ddfc4a25fdca517e228
2010-09-08 17:28:21 +09:00
Tadashi G. Takaoka
3625c97338 Remove unused azerty.xml keyboard layout
Change-Id: Ie94ee27bbfc0b894243063fced1e537aec3ed7ec
2010-09-08 16:02:07 +09:00
Tadashi G. Takaoka
232863ac1d Re-formatting keyboard definition xml files
Just re-formating with eclipse editor.

Bug: 2973749
Change-Id: I18bc682c68df6239e54dd71ed3797d55fd5a1552
2010-09-08 15:14:53 +09:00
satok
85d85c2026 DO NOT MERGE. Fix a string for the sharedpreference for re-correction
Change-Id: I0f8b45cf4604aeed31ecb53f60ff52e0f337bbdd
2010-09-08 00:45:32 +09:00
satok
7385b4af91 Fix a string for the preference for re-correction
Change-Id: I1d0adcf72450441c3657995cc17550a078845f0e
2010-09-08 00:24:09 +09:00
satok
c7e1642610 am 663bc844: am 1e51430e: Merge "Update assets for LatinIME" into gingerbread
Merge commit '663bc8440e02318718b9175c7da7700c6a434623'

* commit '663bc8440e02318718b9175c7da7700c6a434623':
  Update assets for LatinIME
2010-09-07 06:25:38 -07:00
satok
1e51430e66 Merge "Update assets for LatinIME" into gingerbread 2010-09-07 06:21:41 -07:00
satok
6627b95dde Update assets for LatinIME
bug: 2974998

Change-Id: Ie98a023b65d34f08c9c66d04017e8877b31edb84
2010-09-07 22:11:02 +09:00
Ken Wakasa
fa12d86cb5 am dacc927a: am c1ff2846: Update strings for the settings access - based on the latest GB IME spec (ver 03). Please refer to bug: 2979069 for the latest mock.
Merge commit 'dacc927a57b0c7adfbdf244441b9b2495c959980'

* commit 'dacc927a57b0c7adfbdf244441b9b2495c959980':
  Update strings for the settings access - based on the latest GB IME spec (ver 03).
2010-09-07 05:35:02 -07:00
Ken Wakasa
c1ff28462e Update strings for the settings access - based on the latest GB IME spec (ver 03).
Please refer to bug: 2979069 for the latest mock.

Got rid of obsolete string too.

Change-Id: Ic02d1651b288f24f9c3a9da5d0dcf09055256ab0
2010-09-07 21:28:44 +09:00
Tadashi G. Takaoka
ca43ce0588 am e5abf25d: am 83e63ace: Dismiss mini keyboard when finger is released outside mini keyboard
Merge commit 'e5abf25d4b57ecdfc01ca3ddf94753d5bcb07fea'

* commit 'e5abf25d4b57ecdfc01ca3ddf94753d5bcb07fea':
  Dismiss mini keyboard when finger is released outside mini keyboard
2010-09-07 01:49:04 -07:00
Tadashi G. Takaoka
83e63ace2a Dismiss mini keyboard when finger is released outside mini keyboard
Bug: 2978975

Change-Id: Ie634e8ae827fe093c5c673b75d85835050b03794
2010-09-07 17:44:31 +09:00
Tadashi G. Takaoka
0415ddde59 am bc1a0354: am 26aff8c6: Merge "Fixed extra periods when chording with shift and space" into gingerbread
Merge commit 'bc1a0354ef1cac0319cab63822c66203f1fa2c24'

* commit 'bc1a0354ef1cac0319cab63822c66203f1fa2c24':
  Fixed extra periods when chording with shift and space
2010-09-07 01:34:06 -07:00
Tadashi G. Takaoka
26aff8c62f Merge "Fixed extra periods when chording with shift and space" into gingerbread 2010-09-07 01:31:04 -07:00
Tadashi G. Takaoka
6252f468bc Fixed extra periods when chording with shift and space
Actually it was caused by canceling repeat key (space and delete) when
multiple pointer are touching.

Bug: 2975041
Change-Id: If82183b9225efdace7b5418860b9664f1705b7ec
2010-09-07 17:29:09 +09:00
satok
e1cb2e4977 resolved conflicts for merge of 36d2d0e7 to master
Change-Id: Ib4b6ef593d7f4ce5b0666f2e0987ee8398cabe12
2010-09-07 15:37:32 +09:00
satok
0723056043 Merge "Add shared preference for re-correction" into gingerbread 2010-09-06 23:23:40 -07:00
satok
66b42a1c2d Add shared preference for re-correction
Change-Id: Ie5b2e0d2f9739dd33524c2688e172e77aac1f243
2010-09-07 15:23:10 +09:00
satok
6a454a9fa0 am ed34cd19: am d27c7aea: Add isModifier to the buttons in the lowest line
Merge commit 'ed34cd19a93528c960380d57e024f49cb17d5e5f'

* commit 'ed34cd19a93528c960380d57e024f49cb17d5e5f':
  Add isModifier to the buttons in the lowest line
2010-09-06 23:08:23 -07:00
satok
d27c7aea7c Add isModifier to the buttons in the lowest line
Change-Id: I2d5c9e753f0f6fa21fdcfa7b55e81e6a3e3ea64f
2010-09-07 14:57:49 +09:00
Tadashi G. Takaoka
623818a8db am 7bbea0dd: am 8d7ffcb2: Disable pop-up preview on mini keyboard
Merge commit '7bbea0dd8fe04b378a9a7a161c2995998f4a8dcf'

* commit '7bbea0dd8fe04b378a9a7a161c2995998f4a8dcf':
  Disable pop-up preview on mini keyboard
2010-09-06 06:49:01 -07:00
Tadashi G. Takaoka
920c507cd3 am efe7abe0: am 12659d4c: Fix ALT key light behavior
Merge commit 'efe7abe03dce1779ce76e175d0fe9422d2f8eaad'

* commit 'efe7abe03dce1779ce76e175d0fe9422d2f8eaad':
  Fix ALT key light behavior
2010-09-06 06:47:03 -07:00
Tadashi G. Takaoka
8d7ffcb2ac Disable pop-up preview on mini keyboard
This change also disable the special behavior of long press a key that
has only one digit alternate.  If the visual design of both the pop-up
preview and the mini keyboard will look like same, I think that
showing mini keyboard is enough for the key that has one digit
alternate.

Bug: 2973546
Change-Id: I04f138c120aa58526fe054626dac856171fb7a58
2010-09-06 22:42:17 +09:00
Tadashi G. Takaoka
12659d4c0c Fix ALT key light behavior
This change also cleanups some imports, unnecessary cast and null check.

Bug: 2977256
Change-Id: I81b9e539ff8a13ae0cc1eb5c4fb2246732cca3e9
2010-09-06 22:25:49 +09:00
satok
470a0c9e71 am ef40dd52: am f02e4208: Merge "Fix an asset for the feedback of delete key" into gingerbread
Merge commit 'ef40dd52aa8eef0366586f80cbfe5cb0b63ad4f2'

* commit 'ef40dd52aa8eef0366586f80cbfe5cb0b63ad4f2':
  Fix an asset for the feedback of delete key
2010-09-06 04:10:34 -07:00
satok
f02e42080b Merge "Fix an asset for the feedback of delete key" into gingerbread 2010-09-06 04:07:04 -07:00
satok
532471e357 Fix an asset for the feedback of delete key
bug: 2977026

Change-Id: I4cdaaf49644d214b03a514a9104144250a024574
2010-09-06 19:20:49 +09:00
Tadashi G. Takaoka
cba7b0b6ab am d5bcbf81: am c8b9afe0: Support multi-touch only when device has distinct multi-touch panel
Merge commit 'd5bcbf8156fdba8199452b8f95ed1940b7e96d31'

* commit 'd5bcbf8156fdba8199452b8f95ed1940b7e96d31':
  Support multi-touch only when device has distinct multi-touch panel
2010-09-06 02:19:13 -07:00
Tadashi G. Takaoka
c8b9afe037 Support multi-touch only when device has distinct multi-touch panel
Bug: 2973373
Change-Id: I9871c09ec8c1c2aa945d97392e61ee1ec585baef
2010-09-06 17:57:13 +09:00
Ken Wakasa
7ec731a7ee am b6e3cb8f: am a8d9702f: Fix layout issue of the bottom row in web entry mode
Merge commit 'b6e3cb8f8de487f537bf8522ed4d494798e03791'

* commit 'b6e3cb8f8de487f537bf8522ed4d494798e03791':
  Fix layout issue of the bottom row in web entry mode
2010-09-05 06:46:35 -07:00
Ken Wakasa
a8d9702fc4 Fix layout issue of the bottom row in web entry mode
bug: 2977061
Change-Id: I76e0f4a21480d10f79fd5dcbe58c63cc3516d5d7
2010-09-05 22:26:55 +09:00
satok
ac021708ae am 34830114: am 0a498cf8: Merge "Extend space LED for autocompletion" into gingerbread
Merge commit '34830114e66882bf30505f1e538764c9abd3025b'

* commit '34830114e66882bf30505f1e538764c9abd3025b':
  Extend space LED for autocompletion
2010-09-03 04:27:20 -07:00
satok
0a498cf8d8 Merge "Extend space LED for autocompletion" into gingerbread 2010-09-03 04:24:01 -07:00
satok
1bf265d185 Extend space LED for autocompletion
Change-Id: If59ea7c871ffc2af6fe2bfde72303f2612e43c3b
2010-09-03 20:20:10 +09:00
Tadashi G. Takaoka
ab5653dce0 am 232b0394: am e8f45ab5: One alternate is treated as key action, not open mini keyboard
Merge commit '232b039496ef95c543bac5128e6378b38760de21'

* commit '232b039496ef95c543bac5128e6378b38760de21':
  One alternate is treated as key action, not open mini keyboard
2010-09-03 04:13:20 -07:00
Tadashi G. Takaoka
e8f45ab56f One alternate is treated as key action, not open mini keyboard
This change also fixes bug#2973683.

Bug: 2973546
Bug: 2973683
Change-Id: I67573e5b7cad4af261591a4a608d0596dd7901f2
2010-09-03 20:09:21 +09:00
Tadashi G. Takaoka
bf669e4379 am c93ac9db: am ffa88f0e: Merge "Move inflating mini keyboard code into separate method" into gingerbread
Merge commit 'c93ac9db7129f935425f79d5a460e7b926cb4a22'

* commit 'c93ac9db7129f935425f79d5a460e7b926cb4a22':
  Move inflating mini keyboard code into separate method
2010-09-03 02:59:42 -07:00
Tadashi G. Takaoka
ffa88f0ef5 Merge "Move inflating mini keyboard code into separate method" into gingerbread 2010-09-03 02:54:44 -07:00
satok
6a36764a8d am e5ae8c62: am 1b09ac4f: Merge "Add a showing input method picker option by longpressing setting key" into gingerbread
Merge commit 'e5ae8c62c83ad29d623562a74355bc619c216742'

* commit 'e5ae8c62c83ad29d623562a74355bc619c216742':
  Add a showing input method picker option by longpressing setting key
2010-09-03 01:55:37 -07:00
satok
1b09ac4f93 Merge "Add a showing input method picker option by longpressing setting key" into gingerbread 2010-09-03 01:51:38 -07:00
satok
9a6a4d3d5f Add a showing input method picker option by longpressing setting key
Bug: 2959271

Change-Id: I4b7e9a2de3cbe17b168ed8d0541a9b1cd9a9e107
2010-09-03 17:48:44 +09:00
Tadashi G. Takaoka
0b4734396f Move inflating mini keyboard code into separate method
Change-Id: Iba8e43ba6125e559d4c7d9cadb6bcb13b8eefc83
2010-09-03 17:35:54 +09:00
Tadashi G. Takaoka
80e518d36b am 1274cd16: am 5583cb0a: Merge "Followup TBR in I87060049" into gingerbread
Merge commit '1274cd160f81d7a59828e0dbe66d87dfbe87c544'

* commit '1274cd160f81d7a59828e0dbe66d87dfbe87c544':
  Followup TBR in I87060049
2010-09-03 00:41:48 -07:00
Tadashi G. Takaoka
5583cb0afc Merge "Followup TBR in I87060049" into gingerbread 2010-09-03 00:37:59 -07:00
Tadashi G. Takaoka
0529a04b6a Followup TBR in I87060049
This change is followup TBR in I87060049cad6f9d6432b6c4a246c15587ae0d837

Change-Id: I02ee33da269162f5e95ce5b985dbf5094ba14c0d
2010-09-03 15:55:18 +09:00
satok
133bad6b85 am 025bafb5: am 6f8ff3b9: Merge "Update delete key" into gingerbread
Merge commit '025bafb5d4272323491eb90a845ead44de4d80b7'

* commit '025bafb5d4272323491eb90a845ead44de4d80b7':
  Update delete key
2010-09-02 23:34:16 -07:00
satok
6f8ff3b971 Merge "Update delete key" into gingerbread 2010-09-02 23:30:40 -07:00
satok
ec8c4f0d37 am 66546535: am c5841994: Merge "Change symbol on space bar when autocompletion is activated" into gingerbread
Merge commit '6654653562d0ec5d46a74f8c49eab2488e273cf2'

* commit '6654653562d0ec5d46a74f8c49eab2488e273cf2':
  Change symbol on space bar when autocompletion is activated
2010-09-02 23:30:24 -07:00
satok
cf41bd392f Update delete key
Change-Id: I0348e4846131f9913b4ab6c2c2a9427a9a53c74e
2010-09-03 15:27:07 +09:00
satok
c5841994af Merge "Change symbol on space bar when autocompletion is activated" into gingerbread 2010-09-02 23:26:06 -07:00
satok
41feaaadb7 Change symbol on space bar when autocompletion is activated
bug: 2959279

Change-Id: Icc70b7cce0c245ae2451d324debd346f226b8769
2010-09-03 15:17:26 +09:00
Tadashi G. Takaoka
7d4833a8bf am 22776af8: am c5d33b16: Fix NPE in LatinKeyboardBaseView
Merge commit '22776af828c69db22d90b42d196f487095905c70'

* commit '22776af828c69db22d90b42d196f487095905c70':
  Fix NPE in LatinKeyboardBaseView
2010-09-02 22:23:09 -07:00
Tadashi G. Takaoka
c5d33b1652 Fix NPE in LatinKeyboardBaseView
This change also refactors some mini-keyboard related methods in
LatinKeyboardBaseView and PointerTracker class.

Bug: 2973236
Change-Id: I3190fe89ea3ac3c6d351ed4b6d77de98a0aa65db
2010-09-03 13:03:08 +09:00
Tadashi G. Takaoka
efabc4eb52 am 2fb112f1: am 7083b748: Propagate preview enable attribute to mini-keyboard
Merge commit '2fb112f142bdac2c7cb96da5f264b5575ce611e7'

* commit '2fb112f142bdac2c7cb96da5f264b5575ce611e7':
  Propagate preview enable attribute to mini-keyboard
2010-09-02 13:35:17 -07:00
Tadashi G. Takaoka
7083b7486e Propagate preview enable attribute to mini-keyboard
Bug: 2959169
Change-Id: Iea1bec44baf3344d9f91280bd2b8f28476cbcf51
2010-09-03 05:28:43 +09:00
Tadashi G. Takaoka
539fb1bc67 am 20052f34: am fe72f135: Remove close button from mini keyboard
Merge commit '20052f34f987ab946d54cc405fa42cd0510fb94f'

* commit '20052f34f987ab946d54cc405fa42cd0510fb94f':
  Remove close button from mini keyboard
2010-09-02 13:15:20 -07:00
Tadashi G. Takaoka
e46f44714d am cea6a25b: am 07221a4a: Support sliding pop-up mini-keyboard input
Merge commit 'cea6a25b904f536aff4efbf9eeb865bef8a3a4b4'

* commit 'cea6a25b904f536aff4efbf9eeb865bef8a3a4b4':
  Support sliding pop-up mini-keyboard input
2010-09-02 13:01:25 -07:00
Tadashi G. Takaoka
fe72f135b8 Remove close button from mini keyboard
Bug: 2959169
Change-Id: I9c78f9417aaa448b8b23596bc3e748fe99085393
2010-09-03 04:56:12 +09:00
Tadashi G. Takaoka
6c8109dc15 am a723409a: am f0fd5065: Merge "Add a number alternation to English popup mini keyboard" into gingerbread
Merge commit 'a723409acfe9a2c32be2c3a0d6e5be9a0dd82f00'

* commit 'a723409acfe9a2c32be2c3a0d6e5be9a0dd82f00':
  Add a number alternation to English popup mini keyboard
2010-09-02 12:56:00 -07:00
Tadashi G. Takaoka
a18e956f7a am 23eb4711: am 6bfb234f: Refactor KeyDetector to share more methods
Merge commit '23eb4711020f73ebb89a761a0c4ab917a94cfabe'

* commit '23eb4711020f73ebb89a761a0c4ab917a94cfabe':
  Refactor KeyDetector to share more methods
2010-09-02 12:54:02 -07:00
Tadashi G. Takaoka
07221a4ad1 Support sliding pop-up mini-keyboard input
TODO:
- Remove close button on mini-keyboard
- Dismiss mini-keyboard when finger leave the screen while no key is selected

This change also renames some instance variables to have more meaningful name.

Bug: 2959169
Change-Id: I9fd79116a647d7be82415c6e9e7cdaf6edcb2bf6
2010-09-03 04:51:37 +09:00
Tadashi G. Takaoka
f0fd506520 Merge "Add a number alternation to English popup mini keyboard" into gingerbread 2010-09-02 12:50:52 -07:00
Tadashi G. Takaoka
6bfb234f29 Refactor KeyDetector to share more methods
Bug: 2959169
Change-Id: I87060049cad6f9d6432b6c4a246c15587ae0d837
2010-09-03 00:46:19 +09:00
Tadashi G. Takaoka
ac64a5c3ed am b52edca1: am 83b3cf56: Merge "Corresponding to TBR of Id2b0b974" into gingerbread
Merge commit 'b52edca15df778372e52986bc4f379d1b625a14a'

* commit 'b52edca15df778372e52986bc4f379d1b625a14a':
  Corresponding to TBR of Id2b0b974
2010-09-02 07:26:55 -07:00
Tadashi G. Takaoka
83b3cf56cd Merge "Corresponding to TBR of Id2b0b974" into gingerbread 2010-09-02 07:22:50 -07:00
Tadashi G. Takaoka
2fb7e2ff4d am c98e7cb2: am 0fe4c9e1: Corresponding to TBR of Ie6cf6768
Merge commit 'c98e7cb28b4e05883531266c31ea4c09fca74edc'

* commit 'c98e7cb28b4e05883531266c31ea4c09fca74edc':
  Corresponding to TBR of Ie6cf6768
2010-09-02 06:44:13 -07:00
Tadashi G. Takaoka
72d98fab21 Corresponding to TBR of Id2b0b974
This is follow up change of Id2b0b974fffdf6f09ee1828e957b973d2ce1c315
Bug: 2959169

Change-Id: Ie47db5fce7937a4d70c432ab76510d0dc3f68401
2010-09-02 22:36:22 +09:00
Tadashi G. Takaoka
0fe4c9e1a7 Corresponding to TBR of Ie6cf6768
This is follow up change of Ie6cf67681180467bd8ba35d0205ce6727b7684a2

Bug: 2959169
Change-Id: I9e4cb0c9178856ddd6049f0b751b54f3ad26a266
2010-09-02 22:34:15 +09:00
Tadashi G. Takaoka
e9eda7ea94 am 7f67c211: am 400046d6: Encapsulate vertical and horizontal correction values into KeyDetector.
Merge commit '7f67c211e7ec4bdf148c9dd468cc8e73ffeb66e3'

* commit '7f67c211e7ec4bdf148c9dd468cc8e73ffeb66e3':
  Encapsulate vertical and horizontal correction values into KeyDetector.
2010-09-02 06:02:53 -07:00
Tadashi G. Takaoka
400046d62e Encapsulate vertical and horizontal correction values into KeyDetector.
Bug: 2959169
Change-Id: Id2b0b974fffdf6f09ee1828e957b973d2ce1c315
2010-09-02 21:54:26 +09:00
Tadashi G. Takaoka
3b4ecdeb05 Add a number alternation to English popup mini keyboard
This change is only for English locale.  For other locales we should
need specification because keyboard layout and alternations are
different by locale.

Bug: 2959169
Change-Id: Ib63f53ce6c30d75eff78777aa0049b05d58ce55f
2010-09-02 21:06:30 +09:00
Tadashi G. Takaoka
9b5867e3e6 am a4397ce3: am 6b4d521f: Merge "Add PointerTracker argument to long press related methods" into gingerbread
Merge commit 'a4397ce38af2e1ac3a8284bc078bd1e9cb4fecf4'

* commit 'a4397ce38af2e1ac3a8284bc078bd1e9cb4fecf4':
  Add PointerTracker argument to long press related methods
2010-09-02 04:35:57 -07:00
Tadashi G. Takaoka
6b4d521fb4 Merge "Add PointerTracker argument to long press related methods" into gingerbread 2010-09-02 04:31:57 -07:00
Tadashi G. Takaoka
3d4123fabb Add PointerTracker argument to long press related methods
This change also adds debugging log to PointerTracker class

Bug: 2959169
Change-Id: Ie6cf67681180467bd8ba35d0205ce6727b7684a2
2010-09-02 20:28:31 +09:00
Ken Wakasa
5cb51224b2 am 3e6bd26f: am 83c6069b: Decrease LatinKeyboardBaseView_keyPreviewOffset. Popup will be displayed closer to each key typed.
Merge commit '3e6bd26f7d2d78c3c2ae123d0f34682d374371f6'

* commit '3e6bd26f7d2d78c3c2ae123d0f34682d374371f6':
  Decrease LatinKeyboardBaseView_keyPreviewOffset.  Popup will be displayed closer to each key typed.
2010-09-02 02:18:05 -07:00
Ken Wakasa
83c6069b98 Decrease LatinKeyboardBaseView_keyPreviewOffset. Popup will be displayed closer to each key typed.
Change-Id: I863ade61cb4688214d90b24240743ee7fe16e491
2010-09-02 18:07:50 +09:00
Tadashi G. Takaoka
373656f09b am d0457eae: am 3491c877: Merge "Queuing PointerTracker to support n-key roll-over and shift modifier." into gingerbread
Merge commit 'd0457eae17d10535023a02579d16ede7bfcc6bec'

* commit 'd0457eae17d10535023a02579d16ede7bfcc6bec':
  Queuing PointerTracker to support n-key roll-over and shift modifier.
2010-09-02 01:21:36 -07:00
Tadashi G. Takaoka
3491c877dd Merge "Queuing PointerTracker to support n-key roll-over and shift modifier." into gingerbread 2010-09-02 01:17:56 -07:00
satok
0798443d3d am e66f3fbd: am 8f5b0ccc: Update assets for LatinIME
Merge commit 'e66f3fbdfec8ceee127c47654dfbe227577ab484'

* commit 'e66f3fbdfec8ceee127c47654dfbe227577ab484':
  Update assets for LatinIME
2010-09-02 00:17:10 -07:00
satok
8f5b0ccc50 Update assets for LatinIME
Change-Id: Ia3027b68abcc9a51bc6a21320926b9c8b5c5975a
2010-09-02 16:05:19 +09:00
Tadashi G. Takaoka
40a05f62ed Queuing PointerTracker to support n-key roll-over and shift modifier.
Bug: 2910379
Change-Id: I5cfae33e72a406585137842a2260310813cee07f
2010-09-02 16:03:46 +09:00
satok
d5180e0401 am 81f7989c: am c175e80d: Merge "Add modifiers to functional keys" into gingerbread
Merge commit '81f7989c1aa626f10e2ad8def6de7003b96dcef0'

* commit '81f7989c1aa626f10e2ad8def6de7003b96dcef0':
  Add modifiers to functional keys
2010-09-01 22:39:39 -07:00
satok
c175e80d57 Merge "Add modifiers to functional keys" into gingerbread 2010-09-01 22:36:06 -07:00
satok
d383364ee4 Add modifiers to functional keys
- update assets for language switcher

Change-Id: I8f29d3d38fb73ab5673f9e58cf28ed37cc8b4004
2010-09-02 14:18:46 +09:00
satok
11b448528b am c5363012: am a327485e: Change the preference name for a theme and remove a preference settings
Merge commit 'c5363012b846733e9a3b7ce7de5b04e58644bedc'

* commit 'c5363012b846733e9a3b7ce7de5b04e58644bedc':
  Change the preference name for a theme and remove a preference settings
2010-09-01 22:07:20 -07:00
satok
a327485e59 Change the preference name for a theme and remove a preference settings
Change-Id: I5ad980559477775eb44df022e54ce5ef32398601
2010-09-02 13:54:30 +09:00
satok
ee01bf1408 am 308acfa7: am ac4f8e46: Merge "Change background color for functional keys in LatinIME" into gingerbread
Merge commit '308acfa714a3a0aae073871e76e753b5a98096d1'

* commit '308acfa714a3a0aae073871e76e753b5a98096d1':
  Change background color for functional keys in LatinIME
2010-09-01 20:06:05 -07:00
satok
ac4f8e4629 Merge "Change background color for functional keys in LatinIME" into gingerbread 2010-09-01 19:52:46 -07:00
satok
dd8dd9fc1b Change background color for functional keys in LatinIME
Change-Id: I45f13c1fd139ce43478e5d0b2cdb62e56e9f77a8
2010-09-02 11:47:33 +09:00
Tadashi G. Takaoka
896aa23f06 am d8417f1c: am f7d71c33: Merge "Refactor PointerTracker to add isValidKeyIndex() predicate." into gingerbread
Merge commit 'd8417f1cfe0c5eaf7746ecd4f8e140c15624fedd'

* commit 'd8417f1cfe0c5eaf7746ecd4f8e140c15624fedd':
  Refactor PointerTracker to add isValidKeyIndex() predicate.
2010-09-01 17:34:29 -07:00
Tadashi G. Takaoka
f7d71c338f Merge "Refactor PointerTracker to add isValidKeyIndex() predicate." into gingerbread 2010-09-01 17:29:46 -07:00
Amith Yamasani
ec1f2486b0 am c354167c: am b00a1d0c: Correction improvements - use the new InputConnection APIs for underlining and fetching the selected text.
Merge commit 'c354167c84b06b572067efaddfbd3667ffdadb98'

* commit 'c354167c84b06b572067efaddfbd3667ffdadb98':
  Correction improvements - use the new InputConnection APIs for underlining and
2010-09-01 17:01:25 -07:00
Amith Yamasani
b00a1d0c0a Correction improvements - use the new InputConnection APIs for underlining and
fetching the selected text.

Bug: 2950652

Some refinements to correction behavior, such as retaining the tap-to-save
when in correction mode.

Use reflection to access the new InputConnection APIs with fallbacks, in case
we run on older OS versions.

Some refactoring to separate lookup for voice alternatives and typed alternatives.

Change-Id: I7c4178bf7e6b47ee274c49fa7a694f8c2d50cea7
2010-09-01 14:16:50 -07:00
Tadashi G. Takaoka
568743e182 am 2c7583f6: am c6cb2ec1: Add new public attribute mPointerId to PointerTracker
Merge commit '2c7583f6c3c24202492b9404955b1aee2dc5ce94'

* commit '2c7583f6c3c24202492b9404955b1aee2dc5ce94':
  Add new public attribute mPointerId to PointerTracker
2010-09-01 13:04:27 -07:00
Tadashi G. Takaoka
c6df09182c Refactor PointerTracker to add isValidKeyIndex() predicate.
Bug: 2910379
Change-Id: If2b28764dc777bb62949a95bc61c4a16ff152220
2010-09-02 02:49:52 +09:00
Tadashi G. Takaoka
c6cb2ec1f3 Add new public attribute mPointerId to PointerTracker
It is easier to track each pointer if a PointerTracker object keeps
its pointer id.

Bug: 2910379
Change-Id: If3e3b0cf3d834d22302598f4d85d54c9a4ce92ba
2010-09-02 02:21:17 +09:00
Tadashi G. Takaoka
a4c5745852 am 57a41d09: am 2085d43d: Make abstract KeyDetector class
Merge commit '57a41d09b6427a0d2c1e4884678a933753350a9c'

* commit '57a41d09b6427a0d2c1e4884678a933753350a9c':
  Make abstract KeyDetector class
2010-09-01 10:01:35 -07:00
Tadashi G. Takaoka
2085d43daf Make abstract KeyDetector class
The KeyDetector abstracts key detection algorithm. The
ProximityKeyDetector is one of its concrete implementations.  Another
one that might be called XAxisKeyDetector will follow to realize the
pop-up mini-keyboard behavior described in bug#2959169.

Bug: 2959169
Change-Id: Idd3fc53282e6b721ec7a4ce500af8aba21ce07a3
2010-09-02 01:53:26 +09:00
Tadashi G. Takaoka
1d3678ef2f am f3231f45: am 681b102a: Track all pointers events
Merge commit 'f3231f45310ae28b78662ae39b1961d80b3b01f8'

* commit 'f3231f45310ae28b78662ae39b1961d80b3b01f8':
  Track all pointers events
2010-09-01 08:31:14 -07:00
Ken Wakasa
d7dba7c33d am fb82afd4: am 40ac45eb: Get rid of arrows in candidate view
Merge commit 'fb82afd48b6882cbdbb6477dca9526cd22d69400'

* commit 'fb82afd48b6882cbdbb6477dca9526cd22d69400':
  Get rid of arrows in candidate view
2010-09-01 08:30:56 -07:00
satok
6f99ca9eaa am 103381eb: am d4f60bc8: Merge "Fix new theme assets and resources" into gingerbread
Merge commit '103381ebf1a833ec478dd1bac41e67cf7d538f67'

* commit '103381ebf1a833ec478dd1bac41e67cf7d538f67':
  Fix new theme assets and resources
2010-09-01 08:30:54 -07:00
satok
948ddac172 am fcba07ad: am 4de4d51d: Merge "Remove old unused delete key assets" into gingerbread
Merge commit 'fcba07adb72962029d6d046301d471fc471af352'

* commit 'fcba07adb72962029d6d046301d471fc471af352':
  Remove old unused delete key assets
2010-09-01 08:30:45 -07:00
satok
270db06604 am fbd2aaf5: am a8d5e6d3: Remove duplicated assets
Merge commit 'fbd2aaf5ffb98035f6ed85589effa7a73b85fa70'

* commit 'fbd2aaf5ffb98035f6ed85589effa7a73b85fa70':
  Remove duplicated assets
2010-09-01 08:30:36 -07:00
satok
132927f20e am 4d09b2e7: am 31adfa78: Add a new theme for Gingerbread
Merge commit '4d09b2e78e68ef0f1b713b10e280e56d91592717'

* commit '4d09b2e78e68ef0f1b713b10e280e56d91592717':
  Add a new theme for Gingerbread
2010-09-01 08:30:31 -07:00
Tadashi G. Takaoka
35682aff05 am c3b55809: am c7c6203f: Merge "Introduce multiple PointerTracker" into gingerbread
Merge commit 'c3b55809a5e650200a67c8f8164ba48db995c24c'

* commit 'c3b55809a5e650200a67c8f8164ba48db995c24c':
  Introduce multiple PointerTracker
2010-09-01 08:30:18 -07:00