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
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
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
ed5ce6c1a3
Merge "Remove extension keyboard" into gingerbread
2010-08-30 07:32:21 -07:00
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
d2a431efa7
Remove extension keyboard
...
Bug: 2959287
Change-Id: I344ac58b4119e96daf5928c784275ee0b7095958
2010-08-30 21:20:55 +09:00
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
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
cb6221257a
DO NOT MERGE. Remove a preference for bigram suggestion
...
Change-Id: I1a9142d988352abf88da5eefe1d02596c7fc2beb
2010-08-30 14:56:49 +09: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
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
00dda50efd
Revert "Show key preview instantaneously"
...
This reverts commit 09f530e248
2010-08-27 21:04:31 +09: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
7986d78328
Merge "Disable long-press on shift and symbol keys" into gingerbread
2010-08-26 23:54:29 -07: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
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
830fd4af56
Merge "Refactor onModifiedTouchEvent into several methods." into gingerbread
2010-08-26 19:56:32 -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
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
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
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
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
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
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
05d1904ed7
Refactor SwipeTracker to top level class
...
Bug: 2910379
Change-Id: If0ef09d8b0e7ca1c62b4c5a31bcaa620664868f2
2010-08-25 17:21:43 +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
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
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
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
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
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
Maryam Garrett
Tadashi G. Takaoka
satok