Commit graph

514 commits

Author SHA1 Message Date
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
Tadashi G. Takaoka
681b102a49 Track all pointers events
Bug: 2910379
Change-Id: I179ae4359afb57c351d5fcc5f5453c30d3ef0c01
2010-09-01 22:37:37 +09:00
Ken Wakasa
40ac45ebdc Get rid of arrows in candidate view
bug: 2959293
Change-Id: Ia5dcb29397f608846f865fabb3c696866b3687aa
2010-09-01 17:59:12 +09:00
satok
d4f60bc8fc Merge "Fix new theme assets and resources" into gingerbread 2010-09-01 01:52:31 -07:00
satok
4de4d51dfa Merge "Remove old unused delete key assets" into gingerbread 2010-09-01 01:42:13 -07:00
satok
8d3ca2fc44 Fix new theme assets and resources
- Add a layout for popup for new theme
- Change the color of language bar
- Fix a drawable for settings feedback

Change-Id: I7c0c9e238c8223554a62f7b0c8092d074cf9743f
2010-09-01 17:38:50 +09:00
satok
186bb0b360 Remove old unused delete key assets
Change-Id: Id50b0f3069b37e6751a4cfbd374c22c13fb0f505
2010-09-01 16:36:30 +09:00
satok
a8d5e6d373 Remove duplicated assets
Change-Id: I4f8abf917ff9dfa3c5d31e441476e032fb4ce3a9
2010-09-01 16:26:08 +09:00
satok
31adfa78e2 Add a new theme for Gingerbread
bug: 2959293

Change-Id: I8aef19a7485ffd5639a177aee21103b3a1e04cf2
2010-09-01 16:18:01 +09:00
Tadashi G. Takaoka
c7c6203f33 Merge "Introduce multiple PointerTracker" into gingerbread 2010-09-01 00:01:22 -07:00
Tadashi G. Takaoka
a521b31d96 Introduce multiple PointerTracker
Bug: 2910379
Change-Id: Iefafa2d30ad16f898a00664e4bf3e3e88dcd2cb2
2010-09-01 15:59:54 +09:00
satok
d3e8308a17 am 3412a892: am d44b79eb: Merge "Add new assets" into gingerbread
Merge commit '3412a892dd21a3e9ad27ba11abe7125e88556c5b'

* commit '3412a892dd21a3e9ad27ba11abe7125e88556c5b':
  Add new assets
2010-08-31 23:05:09 -07:00
satok
d44b79eb5b Merge "Add new assets" into gingerbread 2010-08-31 21:42:50 -07:00
satok
d0ef2ae291 Add new assets
- drawable-hdpi/keyboard_popup_panel_background.9.png
- drawable-hdpi/voice_ime_background.9.png

Change-Id: Iac75c8d488454534a921c59267f2523e47bb5e11
2010-09-01 13:32:51 +09:00
satok
9a47419979 am 3fa7486c: am fd36a98d: Merge "Add new assets for LatinIME" into gingerbread
Merge commit '3fa7486c940e4b66ba23eadb2c5541f371ce31b1'

* commit '3fa7486c940e4b66ba23eadb2c5541f371ce31b1':
  Add new assets for LatinIME
2010-08-31 20:45:27 -07:00
Tadashi G. Takaoka
64f4915f46 am ad60fe2e: am 409731fb: Merge "Make KeyDebounce class a top-level class and rename it to PointerTracker" into gingerbread
Merge commit 'ad60fe2e80878e1b1caa2c9207d8f601e203560f'

* commit 'ad60fe2e80878e1b1caa2c9207d8f601e203560f':
  Make KeyDebounce class a top-level class and rename it to PointerTracker
2010-08-31 20:43:33 -07:00
Ken Wakasa
5d95dfc2cb am 7bb640c1: am 543dbdfd: Always present suggestion strip whenever in appropriate mode.
Merge commit '7bb640c1e06718936412af2c2198e09a57ce5124'

* commit '7bb640c1e06718936412af2c2198e09a57ce5124':
  Always present suggestion strip whenever in appropriate mode.
2010-08-31 20:43:31 -07:00
satok
fd36a98dac Merge "Add new assets for LatinIME" into gingerbread 2010-08-31 20:40:33 -07:00
Tadashi G. Takaoka
409731fb46 Merge "Make KeyDebounce class a top-level class and rename it to PointerTracker" into gingerbread 2010-08-31 20:26:58 -07:00
Tadashi G. Takaoka
6a1514a0de Make KeyDebounce class a top-level class and rename it to PointerTracker
Bug: 2910379
Change-Id: I9503b2211b272a4a2903d0732985e5ab8ee39440
2010-09-01 12:26:32 +09:00
satok
eee0a637b4 Add new assets for LatinIME
Change-Id: I62b544d6ed2d3ef7a5e37cdcedef7a60d09a1cb2
2010-09-01 12:00:05 +09:00
Ken Wakasa
543dbdfdbd Always present suggestion strip whenever in appropriate mode.
Some cleanups too.

bug: 2959293
Change-Id: Idf07fc25c5700b69b93ab4b09ce34941f0d9c157
2010-09-01 11:25:08 +09:00
Ken Wakasa
890c1d5fa3 am 5bb2e9a5: am b24cc640: Fix ArrayIndexOutOfBoundsException.
Merge commit '5bb2e9a55de237e1955ac1fd19eea3771e671afe'

* commit '5bb2e9a55de237e1955ac1fd19eea3771e671afe':
  Fix ArrayIndexOutOfBoundsException.
2010-08-31 17:22:49 -07:00
Ken Wakasa
b24cc640c1 Fix ArrayIndexOutOfBoundsException.
bug: 2964045
Change-Id: I97d95181e1a6838ace9c135aa92e7f20034e821f
2010-09-01 09:11:38 +09:00
Tadashi G. Takaoka
e202e5e298 am cc742449: am b57b4785: Refactor KeyDebounce class
Merge commit 'cc7424498f63712077e8e4009932b22fabdc1e38'

* commit 'cc7424498f63712077e8e4009932b22fabdc1e38':
  Refactor KeyDebounce class
2010-08-31 10:10:48 -07:00
Tadashi G. Takaoka
224453eea2 am f4230c49: am dc406a2d: Merge "Refactor key preview methods" into gingerbread
Merge commit 'f4230c498d2424e52170599da7cd231df5a9311e'

* commit 'f4230c498d2424e52170599da7cd231df5a9311e':
  Refactor key preview methods
2010-08-31 10:10:46 -07:00
satok
203629d649 am 86bbd685: am 4f3741d4: Merge "Add missing resources for LatinIME" into gingerbread
Merge commit '86bbd685f6d47574a0d9aeaf88fb5117fbbd611b'

* commit '86bbd685f6d47574a0d9aeaf88fb5117fbbd611b':
  Add missing resources for LatinIME
2010-08-31 10:10:31 -07:00
satok
981ddd228d am 28f6351d: am 673aed42: Add settings button
Merge commit '28f6351df341bd27c330b79f315e7419f2f35100'

* commit '28f6351df341bd27c330b79f315e7419f2f35100':
  Add settings button
2010-08-31 10:10:15 -07:00
Tadashi G. Takaoka
b57b478569 Refactor KeyDebounce class
This change moves the following methods into KeyDebounce class.
- MotionEvent handling methods (onDownEvent etc.).
- Keyboard action event generator method (detectAndSendKey).
- Multi-tap key support methods (resetMultiTap etc.).
- Key preview text generator method (getPreviewText).

The change that makes KeyDebounce a top-level class will follow.

Bug: 2910379
Change-Id: I1526c0461e247d97f0c4b3bd580330f137c787be
2010-09-01 00:18:49 +09:00
Maryam Garrett
32511ef6cb Merge "Logging for the VoiceSearch alternates" 2010-08-31 07:48:07 -07:00
Tadashi G. Takaoka
dc406a2db6 Merge "Refactor key preview methods" into gingerbread 2010-08-31 02:39:41 -07:00
Tadashi G. Takaoka
2ca84dacff Refactor key preview methods
Extract key press and release handling out of previewKey() to
KeyDebouncer class. And pass Key object as argument of previewKey()
instead of key index.

Bug: 2910379
Change-Id: Ifec39cfc4845bd92da2f62eba2b26ac6a5cbb341
2010-08-31 18:39:20 +09:00
satok
4f3741d4e9 Merge "Add missing resources for LatinIME" into gingerbread 2010-08-30 22:14:03 -07:00
satok
0ca1bf7158 Add missing resources for LatinIME
Change-Id: I470387ab9f9d867c1ac839b75fe18c1ce711083d
2010-08-31 14:12:54 +09:00
satok
673aed42c3 Add settings button
- delete unused keyboard layout

Change-Id: Iab39446653460797f1ca876a7d9a23190c3a8df6
2010-08-31 14:03:50 +09:00
Tadashi G. Takaoka
85c1c43540 am c4154ba8: am eeb77d4f: Merge "Remove mAbortKey flag completely" into gingerbread
Merge commit 'c4154ba8dec50eaf7f9d118067d3eb7d89701192'

* commit 'c4154ba8dec50eaf7f9d118067d3eb7d89701192':
  Remove mAbortKey flag completely
2010-08-30 18:29:01 -07:00
Tadashi G. Takaoka
eeb77d4f6a Merge "Remove mAbortKey flag completely" into gingerbread 2010-08-30 18:19:03 -07:00
Eric Fischer
c788e3c3c9 Import revised translations
Change-Id: I4de68ff4db492e7efbaafaf01c7d1b97110a948a
2010-08-30 13:40:34 -07:00
Maryam Garrett
7b9ed1aa76 Logging for the VoiceSearch alternates
Log which voice-based alternates were selected, and what
word in the recognition results were replaced.

Change-Id: I1527dc794902a18a226ca45e186ecf84841094c8

Conflicts:

	java/src/com/android/inputmethod/latin/LatinIME.java
2010-08-30 14:34:10 -04:00
Eric Fischer
164972b678 Merge "Import revised translations. DO NOT MERGE" into gingerbread 2010-08-30 10:30:21 -07:00
Tadashi G. Takaoka
ba9b24edff Remove mAbortKey flag completely
These three conditions assign true to the mAbortKey flag.
1. setKeyboard() sets the new keyboard layout.
2. long press shows the pop-up mini keyboard.
3. ACTION_CANCEL event is occurred.

In the case 1, in LatinIME so far, only "symbol key" and "language
switch" cause keyboard layout change.  In both cases, the event is
occurred in onUpEvent(), so we do not need to worry about aborting
event.

In the case 2, long press is used only to pop-up mini-keyboard and at that
time mMiniKeyboardOnScreen could be used as a flag.

In the case 3, though I'm not sure when this case occurs, in
onCancelEvent() all the things that should be canceled are canceled
in onCancelEvent().

Bug: 2910379
Change-Id: I12377c5f3e808f1c017ce980e12b1513895047bc
2010-08-31 00:43:40 +09:00
Tadashi G. Takaoka
a66ccc3e8d am 1cd7d96f: am ed5ce6c1: Merge "Remove extension keyboard" into gingerbread
Merge commit '1cd7d96fe42e63577d70e911c4b5dbfd8b50bba1'

* commit '1cd7d96fe42e63577d70e911c4b5dbfd8b50bba1':
  Remove extension keyboard
2010-08-30 08:34:08 -07:00
Tadashi G. Takaoka
205fb4b7f1 am 36007521: am 82798ac0: Disable long-press on symbol keys on international locale keyboards.
Merge commit '36007521cef25259150127c83ccba5fe38eda14c'

* commit '36007521cef25259150127c83ccba5fe38eda14c':
  Disable long-press on symbol keys on international locale keyboards.
2010-08-30 08:33:58 -07:00
Tadashi G. Takaoka
ed5ce6c1a3 Merge "Remove extension keyboard" into gingerbread 2010-08-30 07:32:21 -07:00
Tadashi G. Takaoka
82798ac066 Disable long-press on symbol keys on international locale keyboards.
This change is supplement of I27007b55a30a3699bf63fd8f64d58c4b23d97d9f

Bug: 2910379
Change-Id: I634226a503594e76cea9ca29e32db5801a05ae09
2010-08-30 21:40:23 +09:00
Tadashi G. Takaoka
d2a431efa7 Remove extension keyboard
Bug: 2959287
Change-Id: I344ac58b4119e96daf5928c784275ee0b7095958
2010-08-30 21:20:55 +09:00
satok
15078eb548 am ad0aac23: am 4fc6539b: Remove unused assets
Merge commit 'ad0aac23ab5882d88f532896c63d234a6cf62267'

* commit 'ad0aac23ab5882d88f532896c63d234a6cf62267':
  Remove unused assets
2010-08-30 02:23:23 -07:00
satok
8650230abc am e975c196: am 5d55cf6d: Remove Log functions from Gingerbread
Merge commit 'e975c196c5638ac7f5a61e45100a6eba49900412'

* commit 'e975c196c5638ac7f5a61e45100a6eba49900412':
  Remove Log functions from Gingerbread
2010-08-30 02:01:20 -07:00
satok
4fc6539bcb Remove unused assets
Change-Id: I65de6335b19dec03785df51ddd544b7e4d39c036
2010-08-30 17:14:10 +09:00
satok
5d55cf6dfc Remove Log functions from Gingerbread
Change-Id: I0ab19726a6bfaf14b42c05903f38dfb74cbd0d37
2010-08-30 16:32:50 +09:00
satok
cb6221257a DO NOT MERGE. Remove a preference for bigram suggestion
Change-Id: I1a9142d988352abf88da5eefe1d02596c7fc2beb
2010-08-30 14:56:49 +09:00
Eric Fischer
22708e6638 Import revised translations. DO NOT MERGE
Change-Id: I968a456446b782b1e20cad0b6d3c82a8aa9a663a
2010-08-27 17:18:02 -07:00
Tadashi G. Takaoka
c5f136465d am fd2ccb7d: am 06123e56: Don\'t re-allocate KeyDebouncer when keyboard is switched.
Merge commit 'fd2ccb7dd41d616255e2cc3d9aa3d01a8c40bfb8'

* commit 'fd2ccb7dd41d616255e2cc3d9aa3d01a8c40bfb8':
  Don't re-allocate KeyDebouncer when keyboard is switched.
2010-08-27 16:05:49 -07:00
Tadashi G. Takaoka
f0673a4c1d am 2603c979: am 00dda50e: Revert "Show key preview instantaneously"
Merge commit '2603c97979ce9658788e8aff33b282d4c30a0b9d'

* commit '2603c97979ce9658788e8aff33b282d4c30a0b9d':
  Revert "Show key preview instantaneously"
2010-08-27 16:04:34 -07:00
Tadashi G. Takaoka
2380f99973 am 44ecfdb6: am 09f530e2: Show key preview instantaneously
Merge commit '44ecfdb60b7473030fcf478412fb9cfd01ea2d01'

* commit '44ecfdb60b7473030fcf478412fb9cfd01ea2d01':
  Show key preview instantaneously
2010-08-27 16:04:29 -07:00
Tadashi G. Takaoka
3ee0f70c3e am 6ad0d15c: am 7986d783: Merge "Disable long-press on shift and symbol keys" into gingerbread
Merge commit '6ad0d15ca28aa23a85c2480966bc58b2f2d4694c'

* commit '6ad0d15ca28aa23a85c2480966bc58b2f2d4694c':
  Disable long-press on shift and symbol keys
2010-08-27 16:04:23 -07:00
satok
2878bb92ed am 6bd55470: am f17a50f5: Merge "Not to reset the ring buffer in LatinImeLogger" into gingerbread
Merge commit '6bd55470fd9378808ec3b7d3e6008b83d803267c'

* commit '6bd55470fd9378808ec3b7d3e6008b83d803267c':
  Not to reset the ring buffer in LatinImeLogger
2010-08-27 15:53:26 -07:00
Tadashi G. Takaoka
565a9ec8ac am 61f49165: am 830fd4af: Merge "Refactor onModifiedTouchEvent into several methods." into gingerbread
Merge commit '61f49165b579635cd10374276575cab1251f2198'

* commit '61f49165b579635cd10374276575cab1251f2198':
  Refactor onModifiedTouchEvent into several methods.
2010-08-27 15:53:11 -07:00
Tadashi G. Takaoka
12e2cdd9b3 am 01b25346: am bdd9c3dc: Remove unused import statement
Merge commit '01b25346c586ac4bbec1130565210eaa93fdee36'

* commit '01b25346c586ac4bbec1130565210eaa93fdee36':
  Remove unused import statement
2010-08-27 15:53:07 -07:00
Tadashi G. Takaoka
0974c94081 am 6c1644a7: am e83d7385: Refactor getKeyIndexAndNearbyCodes into independent class
Merge commit '6c1644a7ddc2d182bf7c63c7791b345b9187713f'

* commit '6c1644a7ddc2d182bf7c63c7791b345b9187713f':
  Refactor getKeyIndexAndNearbyCodes into independent class
2010-08-27 15:52:48 -07:00
Tadashi G. Takaoka
06123e5691 Don't re-allocate KeyDebouncer when keyboard is switched.
This change also re-orders instance variables and eliminates
unnecessary ones.

Bug: 2910379
Change-Id: I6b2217f75738fada32a33f59f0f7adba5e99dd6e
2010-08-28 01:23:01 +09:00
Tadashi G. Takaoka
00dda50efd Revert "Show key preview instantaneously"
This reverts commit 09f530e248.

Change-Id: I3106cd22cc1eac750f05bce26df6af3026dfaf86
2010-08-27 21:04:31 +09:00
Tadashi G. Takaoka
09f530e248 Show key preview instantaneously
This change will display the key board preview instantaneously when
the key is pressed.  Dismissing the key preview will be delayed
slightly after the key is released, as we do now.

Because in multi touch mode, we should instantaneously change keyboard
layout when modifier key, such as shit and symbol, is pressed.

Change-Id: I49348d563ca0f40f5a0a236bdcd0bb07eedd599b
2010-08-27 19:38:52 +09:00
Tadashi G. Takaoka
7986d78328 Merge "Disable long-press on shift and symbol keys" into gingerbread 2010-08-26 23:54:29 -07:00
Tadashi G. Takaoka
cec1495071 Disable long-press on shift and symbol keys
Long-press on shift and symbol keys will conflict with press-and-hold
these keys and press normal key (a.k.a. multi touch support).

Bug: 2910379

Change-Id: I27007b55a30a3699bf63fd8f64d58c4b23d97d9f
2010-08-27 15:47:35 +09:00
satok
f17a50f5a5 Merge "Not to reset the ring buffer in LatinImeLogger" into gingerbread 2010-08-26 22:42:07 -07:00
satok
975fc3cfd8 Not to reset the ring buffer in LatinImeLogger
Change-Id: I3286b2562e07d77a9dfd745ad6ec44aae4396e21
2010-08-27 14:26:58 +09:00
Tadashi G. Takaoka
830fd4af56 Merge "Refactor onModifiedTouchEvent into several methods." into gingerbread 2010-08-26 19:56:32 -07:00
Tadashi G. Takaoka
bdd9c3dc4f Remove unused import statement
Change-Id: I61890a702060650369c6edf70c3de823a0fc1bf1
2010-08-27 11:11:05 +09:00
Tadashi G. Takaoka
5b6fbf9a4f Refactor onModifiedTouchEvent into several methods.
This change eliminates the need of extra MotionEvent allocation.  Also
this will lead to the easy way to handle multi touch events.

Bug: 2910379
Change-Id: Ibcfcba554b732c13105f91877b41b553ee6928ba
2010-08-27 09:59:59 +09:00
Tadashi G. Takaoka
480f022f76 am 6056fee8: am dfbc5080: Refactor SwipeTracker class
Merge commit '6056fee826bbc011dd7742cb2e01fe4645e88c6f'

* commit '6056fee826bbc011dd7742cb2e01fe4645e88c6f':
  Refactor SwipeTracker class
2010-08-26 07:33:39 -07:00
Tadashi G. Takaoka
e83d7385ab Refactor getKeyIndexAndNearbyCodes into independent class
Bug: 2910379
Change-Id: Ib26a898ea108ee4292f9f91b6d7d10c1fc380fd1
2010-08-26 23:33:08 +09:00
Tadashi G. Takaoka
dfbc5080a1 Refactor SwipeTracker class
This change moves SwipeTracker out from LatinKeyboardBaseView.  Also
this introduces EventBuffer class for swipe tracking buffer.

Bug: 2910379

Change-Id: I48ff714226a248ca063cbaf9755cf45e458f7402
2010-08-26 23:28:52 +09:00
satok
c3da8084ea am 3a196bb9: am 542f057e: Add a log for getting coordinates of keys
Merge commit '3a196bb92846a44283be40170e4b97908ced3031'

* commit '3a196bb92846a44283be40170e4b97908ced3031':
  Add a log for getting coordinates of keys
2010-08-26 02:14:14 -07:00
satok
542f057ef6 Add a log for getting coordinates of keys
Change-Id: I57cc6fb6a9eeb65ce8c0c3c3262fd525726643e2
2010-08-26 18:08:12 +09:00
Tadashi G. Takaoka
0b60d0f619 am f6545f21: am 0c548098: Refactor gesture detector logic
Merge commit 'f6545f2138288f6cdc44c1690b24813a48173fc6'

* commit 'f6545f2138288f6cdc44c1690b24813a48173fc6':
  Refactor gesture detector logic
2010-08-26 00:03:29 -07:00
Tadashi G. Takaoka
0c54809891 Refactor gesture detector logic
GestureDetector listener's onFling method will not call detectAndSendKey
anymore.

Make gesture detector be ignoring multitouch.  Refactoring
GestureDetector out of LatinKeyboardBaseView class change will follow.

Bug: 2910379
Change-Id: I0b2a9c4cf7d432f89f9085f3c2bdf3a3757a8903
2010-08-26 15:54:50 +09:00
Tadashi G. Takaoka
04b5c5cd56 am 0a9ea46c: am 0d098c51: Fix bugs in key repeat logic
Merge commit '0a9ea46c2a8a438de13016d60ceccb96f81eb4d5'

* commit '0a9ea46c2a8a438de13016d60ceccb96f81eb4d5':
  Fix bugs in key repeat logic
2010-08-25 20:08:28 -07:00
Tadashi G. Takaoka
0d098c514e Fix bugs in key repeat logic
Bug: 2950714
Change-Id: I3110369c085f89ee1e8f7392a9a04a6b9e377ed4
2010-08-26 12:03:17 +09:00
Tadashi G. Takaoka
e724b4a62b am 47db8fe1: am d900867b: Change all-subdir-java-files to all-java-files-under,src
Merge commit '47db8fe121a3ba439bd192f6fb318792719e4a68'

* commit '47db8fe121a3ba439bd192f6fb318792719e4a68':
  Change all-subdir-java-files to all-java-files-under,src
2010-08-25 02:57:30 -07:00
Tadashi G. Takaoka
d900867b37 Change all-subdir-java-files to all-java-files-under,src
Change-Id: I3c15101a769f19b3f3696f315db47c929979b703
2010-08-25 18:12:18 +09:00
Tadashi G. Takaoka
95f59ed268 am cd163679: am 05d1904e: Refactor SwipeTracker to top level class
Merge commit 'cd1636790d550bc66331524282bc0a7ea085dfa1'

* commit 'cd1636790d550bc66331524282bc0a7ea085dfa1':
  Refactor SwipeTracker to top level class
2010-08-25 02:11:54 -07:00
Tadashi G. Takaoka
05d1904ed7 Refactor SwipeTracker to top level class
Bug: 2910379
Change-Id: If0ef09d8b0e7ca1c62b4c5a31bcaa620664868f2
2010-08-25 17:21:43 +09:00
Tadashi G. Takaoka
bd48619388 am f8737965: am f4271e51: Refactor key repeating related code
Merge commit 'f8737965be2039e4176db4b570d7f587e7ea2fcb'

* commit 'f8737965be2039e4176db4b570d7f587e7ea2fcb':
  Refactor key repeating related code
2010-08-24 23:17:51 -07:00
Tadashi G. Takaoka
f4271e51e7 Refactor key repeating related code
This change encapsulates mInKeyRepeat (former mRepeatKeyIndex) into
UIHandler class.  Also this eliminates mCurrentKey and mLastTapTime
dependency from repeatKey method.

Bug: 2910379
Change-Id: I9351a558be2ebc04de4ebb0d323af4be33bd470c
2010-08-25 12:33:46 +09:00
Tadashi G. Takaoka
d3bc51ccaf am ed99b8d9: am 8ee13212: Refactor long press related code
Merge commit 'ed99b8d9c12da744596c1ec42f8090a59927f142'

* commit 'ed99b8d9c12da744596c1ec42f8090a59927f142':
  Refactor long press related code
2010-08-24 20:25:47 -07:00
Tadashi G. Takaoka
8ee1321264 Refactor long press related code
This change eliminates mCurrentKey dependency from openPopupIfRequired
method.  Also slightly cleanup onModifiedTouchEvent.

Bug: 2910379
Change-Id: I90c9b39c46c0bb32ecc6588abfc49eb60315f54c
2010-08-25 12:08:20 +09:00
Tadashi G. Takaoka
d89ceafb6d am 4a2ad03a: am edadd266: Merge "Refactor onModifiedTouchEvent of LatinKeyboardBaseView" into gingerbread
Merge commit '4a2ad03a56de5cda14a8c7c3bd79e357c28efe07'

* commit '4a2ad03a56de5cda14a8c7c3bd79e357c28efe07':
  Refactor onModifiedTouchEvent of LatinKeyboardBaseView
2010-08-24 18:31:19 -07:00
Tadashi G. Takaoka
edadd2661b Merge "Refactor onModifiedTouchEvent of LatinKeyboardBaseView" into gingerbread 2010-08-24 18:27:47 -07:00
Tadashi G. Takaoka
8b0cb128be Refactor onModifiedTouchEvent of LatinKeyboardBaseView
This change simplifies onModifierTouchEvent to focus on handling
motion event related to a key event.

Other refactoring will follow in order to support multi touch.

Bug: 2910379

Change-Id: I036be64168d951a535600a7910b36bc109f88490
2010-08-25 10:17:14 +09:00
satok
287abe8f1b am d4f91263: am 525141a4: Clean up LatinIME java
Merge commit 'd4f9126336b16cf6aa2fb21ddcd654ebfc1f4af9'

* commit 'd4f9126336b16cf6aa2fb21ddcd654ebfc1f4af9':
  Clean up LatinIME java
2010-08-24 11:55:13 -07:00
Ken Wakasa
48852f33b3 am 6b6ae29b: am 78c46117: Fix LatinIME crashing due to crash in Contacts DB
Merge commit '6b6ae29b61acf1f8317f5dd261d5c74ec51b155e'

* commit '6b6ae29b61acf1f8317f5dd261d5c74ec51b155e':
  Fix LatinIME crashing due to crash in Contacts DB
2010-08-24 10:16:17 -07:00
satok
525141a402 Clean up LatinIME java
- remove unused code
- add @Override
- change the inappropriate cast

Change-Id: Ib25b4939e5b4273794ab0f6349776b5b62d89894
2010-08-24 12:40:00 +09:00
Ken Wakasa
159bc3cf43 am 3ecb4813: am 17dc363a: Fix an NPE found in KeyboardSwitcher.isAlphabetMode()
Merge commit '3ecb4813f1f77ce9330b08a1a2ab83d26df05e51'

* commit '3ecb4813f1f77ce9330b08a1a2ab83d26df05e51':
  Fix an NPE found in KeyboardSwitcher.isAlphabetMode()
2010-08-23 12:02:52 -07:00