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
3412a892dd
am d44b79eb
: Merge "Add new assets" into gingerbread
...
Merge commit 'd44b79eb5bdaaa74bac482df4ddab44aa260d711' into gingerbread-plus-aosp
* commit 'd44b79eb5bdaaa74bac482df4ddab44aa260d711':
Add new assets
2010-08-31 22:52:50 -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
3fa7486c94
am fd36a98d
: Merge "Add new assets for LatinIME" into gingerbread
...
Merge commit 'fd36a98dacaaa2ddf57abe6bfa140dea060f9b5d' into gingerbread-plus-aosp
* commit 'fd36a98dacaaa2ddf57abe6bfa140dea060f9b5d':
Add new assets for LatinIME
2010-08-31 20:43:26 -07:00
satok
fd36a98dac
Merge "Add new assets for LatinIME" into gingerbread
2010-08-31 20:40:33 -07:00
Tadashi G. Takaoka
ad60fe2e80
am 409731fb
: Merge "Make KeyDebounce class a top-level class and rename it to PointerTracker" into gingerbread
...
Merge commit '409731fb46f5a7298005f3d6dbdd0bf4ee435236' into gingerbread-plus-aosp
* commit '409731fb46f5a7298005f3d6dbdd0bf4ee435236':
Make KeyDebounce class a top-level class and rename it to PointerTracker
2010-08-31 20:28:59 -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
7bb640c1e0
am 543dbdfd
: Always present suggestion strip whenever in appropriate mode.
...
Merge commit '543dbdfdbda259aa56be9670480c7d802beba332' into gingerbread-plus-aosp
* commit '543dbdfdbda259aa56be9670480c7d802beba332':
Always present suggestion strip whenever in appropriate mode.
2010-08-31 19:49:26 -07: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
5bb2e9a55d
am b24cc640
: Fix ArrayIndexOutOfBoundsException.
...
Merge commit 'b24cc640c1485590b1e9912397ea9acd68b43d99' into gingerbread-plus-aosp
* commit 'b24cc640c1485590b1e9912397ea9acd68b43d99':
Fix ArrayIndexOutOfBoundsException.
2010-08-31 17:21:01 -07:00
Ken Wakasa
b24cc640c1
Fix ArrayIndexOutOfBoundsException.
...
bug: 2964045
Change-Id: I97d95181e1a6838ace9c135aa92e7f20034e821f
2010-09-01 09:11:38 +09:00
Amith Yamasani
b9568a089e
am 725e9448
: am ca4e4278
: Fix UnsatisfiedLinkError for Latin IME. Don\'t use old NDK version in a platform build.
...
Merge commit '725e94482d52e76aa4d9a9720a55289b528b47d8'
* commit '725e94482d52e76aa4d9a9720a55289b528b47d8':
Fix UnsatisfiedLinkError for Latin IME. Don't use old NDK version in a platform build.
2010-08-31 12:19:02 -07:00
Amith Yamasani
725e94482d
am ca4e4278
: Fix UnsatisfiedLinkError for Latin IME. Don\'t use old NDK version in a platform build.
...
Merge commit 'ca4e42785f598af9f24a9e3e2ae644ffa83c77ed' into gingerbread-plus-aosp
* commit 'ca4e42785f598af9f24a9e3e2ae644ffa83c77ed':
Fix UnsatisfiedLinkError for Latin IME. Don't use old NDK version in a platform build.
2010-08-31 12:14:53 -07:00
Amith Yamasani
ca4e42785f
Fix UnsatisfiedLinkError for Latin IME. Don't use old NDK version in a platform build.
...
Also added a clean step, since it's only a Makefile change.
Change-Id: Ide1684a5f34e99496e969edb8443dc4545b57306
2010-08-31 12:04:30 -07: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
cc7424498f
am b57b4785
: Refactor KeyDebounce class
...
Merge commit 'b57b47856930ca4b7a5391f92947ab2ce9de9c59' into gingerbread-plus-aosp
* commit 'b57b47856930ca4b7a5391f92947ab2ce9de9c59':
Refactor KeyDebounce class
2010-08-31 08:26:41 -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
f4230c498d
am dc406a2d
: Merge "Refactor key preview methods" into gingerbread
...
Merge commit 'dc406a2db6d9820f2deb2cbd89f394a76b52dfd4' into gingerbread-plus-aosp
* commit 'dc406a2db6d9820f2deb2cbd89f394a76b52dfd4':
Refactor key preview methods
2010-08-31 02:41:05 -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
86bbd685f6
am 4f3741d4
: Merge "Add missing resources for LatinIME" into gingerbread
...
Merge commit '4f3741d4e90d8cbea34cc2eaadb741fae3c9a034' into gingerbread-plus-aosp
* commit '4f3741d4e90d8cbea34cc2eaadb741fae3c9a034':
Add missing resources for LatinIME
2010-08-30 22:15:56 -07: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
28f6351df3
am 673aed42
: Add settings button
...
Merge commit '673aed42c3b291fc9f81ead58ca35a5d150f4dce' into gingerbread-plus-aosp
* commit '673aed42c3b291fc9f81ead58ca35a5d150f4dce':
Add settings button
2010-08-30 22:06:33 -07: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
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
690bea3421
Merge "Import revised translations"
2010-08-30 14:22:17 -07:00
Eric Fischer
c788e3c3c9
Import revised translations
...
Change-Id: I4de68ff4db492e7efbaafaf01c7d1b97110a948a
2010-08-30 13:40:34 -07:00
Eric Fischer
6452478d37
am 272a84b1
: (-s ours) am 164972b6
: Merge "Import revised translations. DO NOT MERGE" into gingerbread
...
Merge commit '272a84b17ae599d8dd3054dad697cc53789be2f8'
* commit '272a84b17ae599d8dd3054dad697cc53789be2f8':
Import revised translations. DO NOT MERGE
2010-08-30 13:29:04 -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
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
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