15078eb548
am ad0aac23: am 4fc6539b: Remove unused assets
...
Merge commit 'ad0aac23ab5882d88f532896c63d234a6cf62267'
* commit 'ad0aac23ab5882d88f532896c63d234a6cf62267':
Remove unused assets
2010-08-30 02:23:23 -07:00
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
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
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
4fc6539bcb
Remove unused assets
...
Change-Id: I65de6335b19dec03785df51ddd544b7e4d39c036
2010-08-30 17:14:10 +09:00
5d55cf6dfc
Remove Log functions from Gingerbread
...
Change-Id: I0ab19726a6bfaf14b42c05903f38dfb74cbd0d37
2010-08-30 16:32:50 +09:00
a8f4e3eaee
am 65333e71: (-s ours) am cb622125: DO NOT MERGE. Remove a preference for bigram suggestion
...
Merge commit '65333e712b638cea6b990944ff255c7b834975c4'
* commit '65333e712b638cea6b990944ff255c7b834975c4':
DO NOT MERGE. Remove a preference for bigram suggestion
2010-08-30 00:10:04 -07:00
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
cb6221257a
DO NOT MERGE. Remove a preference for bigram suggestion
...
Change-Id: I1a9142d988352abf88da5eefe1d02596c7fc2beb
2010-08-30 14:56:49 +09:00
22708e6638
Import revised translations. DO NOT MERGE
...
Change-Id: I968a456446b782b1e20cad0b6d3c82a8aa9a663a
2010-08-27 17:18:02 -07:00
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
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
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
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
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
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
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
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
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
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
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
00dda50efd
Revert "Show key preview instantaneously"
...
This reverts commit 09f530e248
2010-08-27 21:04:31 +09:00
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
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
17fe18350f
Delete version
...
Change-Id: Ie35004662f070a2284a0dbe2d20b9cfe4cc41602
2010-08-27 16:20:03 +09:00
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
7986d78328
Merge "Disable long-press on shift and symbol keys" into gingerbread
2010-08-26 23:54:29 -07:00
6fd90f55f4
Cherry pick Change I04497fa0: Merge from the private sandbox to the froyo-ub-latinimegoogle
...
Change-Id: I6c0304c6befc1b105d5dca7f96bb7532812c30f6
2010-08-27 15:54:02 +09:00
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
5ef4577156
Merge remote branch 'goog/froyo-ub-latinimegoogle' into merge-gingerbread-to-ub-latinimegoogle
2010-08-27 15:12:10 +09:00
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
f17a50f5a5
Merge "Not to reset the ring buffer in LatinImeLogger" into gingerbread
2010-08-26 22:42:07 -07:00
975fc3cfd8
Not to reset the ring buffer in LatinImeLogger
...
Change-Id: I3286b2562e07d77a9dfd745ad6ec44aae4396e21
2010-08-27 14:26:58 +09:00
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
830fd4af56
Merge "Refactor onModifiedTouchEvent into several methods." into gingerbread
2010-08-26 19:56:32 -07:00
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
bdd9c3dc4f
Remove unused import statement
...
Change-Id: I61890a702060650369c6edf70c3de823a0fc1bf1
2010-08-27 11:11:05 +09:00
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
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
480f022f76
am 6056fee8: am dfbc5080: Refactor SwipeTracker class
...
Merge commit '6056fee826bbc011dd7742cb2e01fe4645e88c6f'
* commit '6056fee826bbc011dd7742cb2e01fe4645e88c6f':
Refactor SwipeTracker class
2010-08-26 07:33:39 -07:00
e83d7385ab
Refactor getKeyIndexAndNearbyCodes into independent class
...
Bug: 2910379
Change-Id: Ib26a898ea108ee4292f9f91b6d7d10c1fc380fd1
2010-08-26 23:33:08 +09:00
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
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
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
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
542f057ef6
Add a log for getting coordinates of keys
...
Change-Id: I57cc6fb6a9eeb65ce8c0c3c3262fd525726643e2
2010-08-26 18:08:12 +09:00
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
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
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
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
satok
Eric Fischer
Tadashi G. Takaoka