Commit graph

430 commits

Author SHA1 Message Date
Tadashi G. Takaoka
c4154ba8de am eeb77d4f: Merge "Remove mAbortKey flag completely" into gingerbread
Merge commit 'eeb77d4f6a56a140fd22c657074ad8de6676cb94' into gingerbread-plus-aosp

* commit 'eeb77d4f6a56a140fd22c657074ad8de6676cb94':
  Remove mAbortKey flag completely
2010-08-30 18:22:42 -07:00
Tadashi G. Takaoka
eeb77d4f6a Merge "Remove mAbortKey flag completely" into gingerbread 2010-08-30 18:19:03 -07:00
Eric Fischer
272a84b17a am 164972b6: Merge "Import revised translations. DO NOT MERGE" into gingerbread
Merge commit '164972b678b986aecdf96e239cd0bce838b2033d' into gingerbread-plus-aosp

* commit '164972b678b986aecdf96e239cd0bce838b2033d':
  Import revised translations.  DO NOT MERGE
2010-08-30 12:32:41 -07: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
1cd7d96fe4 am ed5ce6c1: Merge "Remove extension keyboard" into gingerbread
Merge commit 'ed5ce6c1a3d3a38a28cd2ed480a4d877160fa6ae' into gingerbread-plus-aosp

* commit 'ed5ce6c1a3d3a38a28cd2ed480a4d877160fa6ae':
  Remove extension keyboard
2010-08-30 08:05:42 -07:00
Tadashi G. Takaoka
36007521ce am 82798ac0: Disable long-press on symbol keys on international locale keyboards.
Merge commit '82798ac066c8ffc497a68a313aee17cc4ad56bbd' into gingerbread-plus-aosp

* commit '82798ac066c8ffc497a68a313aee17cc4ad56bbd':
  Disable long-press on symbol keys on international locale keyboards.
2010-08-30 08:05:39 -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
ad0aac23ab am 4fc6539b: Remove unused assets
Merge commit '4fc6539bcb8a99b489b5cb72bfc977b9829f5603' into gingerbread-plus-aosp

* commit '4fc6539bcb8a99b489b5cb72bfc977b9829f5603':
  Remove unused assets
2010-08-30 01:51:14 -07:00
satok
e975c196c5 am 5d55cf6d: Remove Log functions from Gingerbread
Merge commit '5d55cf6dfc64ff54766aadda8897532bec9abf45' into gingerbread-plus-aosp

* commit '5d55cf6dfc64ff54766aadda8897532bec9abf45':
  Remove Log functions from Gingerbread
2010-08-30 01:20:22 -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
65333e712b am cb622125: DO NOT MERGE. Remove a preference for bigram suggestion
Merge commit 'cb6221257a2f4025c91de4d65f5591e6563c54ce' into gingerbread-plus-aosp

* commit 'cb6221257a2f4025c91de4d65f5591e6563c54ce':
  DO NOT MERGE. Remove a preference for bigram suggestion
2010-08-29 23:30:51 -07: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
fd2ccb7dd4 am 06123e56: Don\'t re-allocate KeyDebouncer when keyboard is switched.
Merge commit '06123e56912b5dcd7aca3d0c18c7ceb1f1cde573' into gingerbread-plus-aosp

* commit '06123e56912b5dcd7aca3d0c18c7ceb1f1cde573':
  Don't re-allocate KeyDebouncer when keyboard is switched.
2010-08-27 09:31:10 -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
2603c97979 am 00dda50e: Revert "Show key preview instantaneously"
Merge commit '00dda50efda107daec8bfcafe2639603b655f183' into gingerbread-plus-aosp

* commit '00dda50efda107daec8bfcafe2639603b655f183':
  Revert "Show key preview instantaneously"
2010-08-27 05:07:39 -07: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
44ecfdb60b am 09f530e2: Show key preview instantaneously
Merge commit '09f530e248a3caf0037ca89aa79a836385a03fab' into gingerbread-plus-aosp

* commit '09f530e248a3caf0037ca89aa79a836385a03fab':
  Show key preview instantaneously
2010-08-27 04:14:14 -07: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
6ad0d15ca2 am 7986d783: Merge "Disable long-press on shift and symbol keys" into gingerbread
Merge commit '7986d78328e17bdbe7ec05558e93a2c6a25641c6' into gingerbread-plus-aosp

* commit '7986d78328e17bdbe7ec05558e93a2c6a25641c6':
  Disable long-press on shift and symbol keys
2010-08-26 23:56:00 -07: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
6bd55470fd am f17a50f5: Merge "Not to reset the ring buffer in LatinImeLogger" into gingerbread
Merge commit 'f17a50f5a5a6c185d3a223bea3a7475c8482a110' into gingerbread-plus-aosp

* commit 'f17a50f5a5a6c185d3a223bea3a7475c8482a110':
  Not to reset the ring buffer in LatinImeLogger
2010-08-26 22:46:10 -07: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
61f49165b5 am 830fd4af: Merge "Refactor onModifiedTouchEvent into several methods." into gingerbread
Merge commit '830fd4af566cf2545df5f45cd2f53d97c481e254' into gingerbread-plus-aosp

* commit '830fd4af566cf2545df5f45cd2f53d97c481e254':
  Refactor onModifiedTouchEvent into several methods.
2010-08-26 19:58:26 -07:00
Tadashi G. Takaoka
830fd4af56 Merge "Refactor onModifiedTouchEvent into several methods." into gingerbread 2010-08-26 19:56:32 -07:00
Tadashi G. Takaoka
01b25346c5 am bdd9c3dc: Remove unused import statement
Merge commit 'bdd9c3dc4fad8012ec18134d0db65c98b92dcbdf' into gingerbread-plus-aosp

* commit 'bdd9c3dc4fad8012ec18134d0db65c98b92dcbdf':
  Remove unused import statement
2010-08-26 19:13:04 -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
6c1644a7dd am e83d7385: Refactor getKeyIndexAndNearbyCodes into independent class
Merge commit 'e83d7385abbd0b58899b8190d644a0cb8e9f2774' into gingerbread-plus-aosp

* commit 'e83d7385abbd0b58899b8190d644a0cb8e9f2774':
  Refactor getKeyIndexAndNearbyCodes into independent class
2010-08-26 17:56:17 -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
6056fee826 am dfbc5080: Refactor SwipeTracker class
Merge commit 'dfbc5080a1b639fda448098ab080d632639591dc' into gingerbread-plus-aosp

* commit 'dfbc5080a1b639fda448098ab080d632639591dc':
  Refactor SwipeTracker class
2010-08-26 07:31:24 -07: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
3a196bb928 am 542f057e: Add a log for getting coordinates of keys
Merge commit '542f057ef64ae16cf2bc528880cf32bfd073edad' into gingerbread-plus-aosp

* commit '542f057ef64ae16cf2bc528880cf32bfd073edad':
  Add a log for getting coordinates of keys
2010-08-26 02:10:32 -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
f6545f2138 am 0c548098: Refactor gesture detector logic
Merge commit '0c5480989186c884a1a296ac2f46132235d02d45' into gingerbread-plus-aosp

* commit '0c5480989186c884a1a296ac2f46132235d02d45':
  Refactor gesture detector logic
2010-08-26 00:01:15 -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
0a9ea46c2a am 0d098c51: Fix bugs in key repeat logic
Merge commit '0d098c514eac2da144dcb856d9aa870bbe5be8c8' into gingerbread-plus-aosp

* commit '0d098c514eac2da144dcb856d9aa870bbe5be8c8':
  Fix bugs in key repeat logic
2010-08-25 20:06:37 -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
47db8fe121 am d900867b: Change all-subdir-java-files to all-java-files-under,src
Merge commit 'd900867b37844206d1221c69501ce3e92608f0d8' into gingerbread-plus-aosp

* commit 'd900867b37844206d1221c69501ce3e92608f0d8':
  Change all-subdir-java-files to all-java-files-under,src
2010-08-25 02:55:45 -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
cd1636790d am 05d1904e: Refactor SwipeTracker to top level class
Merge commit '05d1904ed703348df59f918486f2344dd2a92fec' into gingerbread-plus-aosp

* commit '05d1904ed703348df59f918486f2344dd2a92fec':
  Refactor SwipeTracker to top level class
2010-08-25 01:27:28 -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
Ken Wakasa
bf75bec7cd am 15d5dc53: Merge "Move ImeLoggerTests.java from package to vendor" into gingerbread
Merge commit '15d5dc532fc5460f103f8558f534e3c9e1bcdb97' into gingerbread-plus-aosp

* commit '15d5dc532fc5460f103f8558f534e3c9e1bcdb97':
  Move ImeLoggerTests.java from package to vendor
2010-08-25 00:24:46 -07:00
Ken Wakasa
15d5dc532f Merge "Move ImeLoggerTests.java from package to vendor" into gingerbread 2010-08-25 00:22:52 -07:00