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
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
0d098c514e
Fix bugs in key repeat logic
...
Bug: 2950714
Change-Id: I3110369c085f89ee1e8f7392a9a04a6b9e377ed4
2010-08-26 12:03:17 +09:00
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
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
d900867b37
Change all-subdir-java-files to all-java-files-under,src
...
Change-Id: I3c15101a769f19b3f3696f315db47c929979b703
2010-08-25 18:12:18 +09:00
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
ff3bd6654e
am bf75bec7: am 15d5dc53: Merge "Move ImeLoggerTests.java from package to vendor" into gingerbread
...
Merge commit 'bf75bec7cd5ed50c1de447b27fe614321d044c1f'
* commit 'bf75bec7cd5ed50c1de447b27fe614321d044c1f':
Move ImeLoggerTests.java from package to vendor
2010-08-25 02:11:44 -07:00
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
05d1904ed7
Refactor SwipeTracker to top level class
...
Bug: 2910379
Change-Id: If0ef09d8b0e7ca1c62b4c5a31bcaa620664868f2
2010-08-25 17:21:43 +09:00
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
15d5dc532f
Merge "Move ImeLoggerTests.java from package to vendor" into gingerbread
2010-08-25 00:22:52 -07:00
b9792ab1c5
Move ImeLoggerTests.java from package to vendor
...
Change-Id: I002dcd43b91f9a7911b52ef1d5b7b16acb01209d
2010-08-25 16:15:38 +09:00
ac3cae616c
Merge from the private sandbox to the froyo-ub-latinimegoogle
...
Bumped up the version to 0.22.
Change-Id: I04497fa0a2acaa1b9632621c9d9f163cf40f6299
2010-08-25 15:55:17 +09:00
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
f8737965be
am f4271e51: Refactor key repeating related code
...
Merge commit 'f4271e51e713688a4e9f368956fb41aa45b76ff7' into gingerbread-plus-aosp
* commit 'f4271e51e713688a4e9f368956fb41aa45b76ff7':
Refactor key repeating related code
2010-08-24 23:14:00 -07:00
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
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
ed99b8d9c1
am 8ee13212: Refactor long press related code
...
Merge commit '8ee1321264a721a20fa2371d45bb14a07906f60c' into gingerbread-plus-aosp
* commit '8ee1321264a721a20fa2371d45bb14a07906f60c':
Refactor long press related code
2010-08-24 20:23:38 -07:00
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
f15a019cab
Make the unbundled LatinIME buildable.
...
Copied method.xml from Gingerbread.
Got rid of resources for xlarge.
bug: 2786392
Change-Id: I07ff874b39a4e1117c95062f2b8e3ae5acb1b8cf
2010-08-25 11:56:06 +09:00
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
4a2ad03a56
am edadd266: Merge "Refactor onModifiedTouchEvent of LatinKeyboardBaseView" into gingerbread
...
Merge commit 'edadd2661b40979dc79b659e38ffe30059192693' into gingerbread-plus-aosp
* commit 'edadd2661b40979dc79b659e38ffe30059192693':
Refactor onModifiedTouchEvent of LatinKeyboardBaseView
2010-08-24 18:29:22 -07:00
edadd2661b
Merge "Refactor onModifiedTouchEvent of LatinKeyboardBaseView" into gingerbread
2010-08-24 18:27:47 -07:00
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
f36477ed97
Change LOCAL_SDK_VERSION to 8 (from current) for unbundled branch
...
Change-Id: I5d9344aa7c14e545c6a3bd4aa00287becb13a545
2010-08-24 17:01:58 -04:00
Tadashi G. Takaoka
satok
Ken Wakasa
Sriram Raman