aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | am f4230c49: am dc406a2d: Merge "Refactor key preview methods" into gingerbreadTadashi G. Takaoka2010-08-311-48/+75
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'f4230c498d2424e52170599da7cd231df5a9311e' * commit 'f4230c498d2424e52170599da7cd231df5a9311e': Refactor key preview methods
| * | | am dc406a2d: Merge "Refactor key preview methods" into gingerbreadTadashi G. Takaoka2010-08-311-48/+75
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'dc406a2db6d9820f2deb2cbd89f394a76b52dfd4' into gingerbread-plus-aosp * commit 'dc406a2db6d9820f2deb2cbd89f394a76b52dfd4': Refactor key preview methods
| | * | Merge "Refactor key preview methods" into gingerbreadTadashi G. Takaoka2010-08-311-48/+75
| | |\ \
| | | * | Refactor key preview methodsTadashi G. Takaoka2010-08-311-48/+75
| | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | am 86bbd685: am 4f3741d4: Merge "Add missing resources for LatinIME" into ↵satok2010-08-314-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | gingerbread Merge commit '86bbd685f6d47574a0d9aeaf88fb5117fbbd611b' * commit '86bbd685f6d47574a0d9aeaf88fb5117fbbd611b': Add missing resources for LatinIME
| * | | am 4f3741d4: Merge "Add missing resources for LatinIME" into gingerbreadsatok2010-08-304-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '4f3741d4e90d8cbea34cc2eaadb741fae3c9a034' into gingerbread-plus-aosp * commit '4f3741d4e90d8cbea34cc2eaadb741fae3c9a034': Add missing resources for LatinIME
| | * | Merge "Add missing resources for LatinIME" into gingerbreadsatok2010-08-304-0/+0
| | |\ \
| | | * | Add missing resources for LatinIMEsatok2010-08-314-0/+0
| | | |/ | | | | | | | | | | | | Change-Id: I470387ab9f9d867c1ac839b75fe18c1ce711083d
* | | | am 28f6351d: am 673aed42: Add settings buttonsatok2010-08-3114-293/+93
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '28f6351df341bd27c330b79f315e7419f2f35100' * commit '28f6351df341bd27c330b79f315e7419f2f35100': Add settings button
| * | | am 673aed42: Add settings buttonsatok2010-08-3014-293/+93
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '673aed42c3b291fc9f81ead58ca35a5d150f4dce' into gingerbread-plus-aosp * commit '673aed42c3b291fc9f81ead58ca35a5d150f4dce': Add settings button
| | * | Add settings buttonsatok2010-08-3114-293/+93
| | |/ | | | | | | | | | | | | | | | - delete unused keyboard layout Change-Id: Iab39446653460797f1ca876a7d9a23190c3a8df6
* | | Merge "Logging for the VoiceSearch alternates"Maryam Garrett2010-08-313-18/+21
|\ \ \
| * | | Logging for the VoiceSearch alternatesMaryam Garrett2010-08-303-18/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | am c4154ba8: am eeb77d4f: Merge "Remove mAbortKey flag completely" into ↵Tadashi G. Takaoka2010-08-301-22/+3
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | gingerbread Merge commit 'c4154ba8dec50eaf7f9d118067d3eb7d89701192' * commit 'c4154ba8dec50eaf7f9d118067d3eb7d89701192': Remove mAbortKey flag completely
| * | | am eeb77d4f: Merge "Remove mAbortKey flag completely" into gingerbreadTadashi G. Takaoka2010-08-301-22/+3
| |\ \ \ | | | |/ | | |/| | | | | | | | | | | | | | | | | Merge commit 'eeb77d4f6a56a140fd22c657074ad8de6676cb94' into gingerbread-plus-aosp * commit 'eeb77d4f6a56a140fd22c657074ad8de6676cb94': Remove mAbortKey flag completely
| | * | Merge "Remove mAbortKey flag completely" into gingerbreadTadashi G. Takaoka2010-08-301-22/+3
| | |\ \
| | | * | Remove mAbortKey flag completelyTadashi G. Takaoka2010-08-311-22/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | Merge "Import revised translations"Eric Fischer2010-08-3021-21/+63
|\ \ \ \ \
| * | | | | Import revised translationsEric Fischer2010-08-3021-21/+63
| | |_|_|/ | |/| | | | | | | | | | | | | Change-Id: I4de68ff4db492e7efbaafaf01c7d1b97110a948a
* | | | | am 272a84b1: (-s ours) am 164972b6: Merge "Import revised translations. DO ↵Eric Fischer2010-08-300-0/+0
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / / | | | | | | | | | | | | | | | | | | | | NOT MERGE" into gingerbread Merge commit '272a84b17ae599d8dd3054dad697cc53789be2f8' * commit '272a84b17ae599d8dd3054dad697cc53789be2f8': Import revised translations. DO NOT MERGE
| * | | am 164972b6: Merge "Import revised translations. DO NOT MERGE" into gingerbreadEric Fischer2010-08-3020-0/+80
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '164972b678b986aecdf96e239cd0bce838b2033d' into gingerbread-plus-aosp * commit '164972b678b986aecdf96e239cd0bce838b2033d': Import revised translations. DO NOT MERGE
| | * | Merge "Import revised translations. DO NOT MERGE" into gingerbreadEric Fischer2010-08-3020-0/+80
| | |\ \
| | | * | Import revised translations. DO NOT MERGEEric Fischer2010-08-2720-0/+80
| | | |/ | | | | | | | | | | | | Change-Id: I968a456446b782b1e20cad0b6d3c82a8aa9a663a
* | | | am 1cd7d96f: am ed5ce6c1: Merge "Remove extension keyboard" into gingerbreadTadashi G. Takaoka2010-08-304-254/+9
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '1cd7d96fe42e63577d70e911c4b5dbfd8b50bba1' * commit '1cd7d96fe42e63577d70e911c4b5dbfd8b50bba1': Remove extension keyboard
| * | | am ed5ce6c1: Merge "Remove extension keyboard" into gingerbreadTadashi G. Takaoka2010-08-304-254/+9
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'ed5ce6c1a3d3a38a28cd2ed480a4d877160fa6ae' into gingerbread-plus-aosp * commit 'ed5ce6c1a3d3a38a28cd2ed480a4d877160fa6ae': Remove extension keyboard
| | * | Merge "Remove extension keyboard" into gingerbreadTadashi G. Takaoka2010-08-304-254/+9
| | |\ \
| | | * | Remove extension keyboardTadashi G. Takaoka2010-08-304-254/+9
| | | | | | | | | | | | | | | | | | | | | | | | | Bug: 2959287 Change-Id: I344ac58b4119e96daf5928c784275ee0b7095958
* | | | | am 36007521: am 82798ac0: Disable long-press on symbol keys on international ↵Tadashi G. Takaoka2010-08-3016-160/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | locale keyboards. Merge commit '36007521cef25259150127c83ccba5fe38eda14c' * commit '36007521cef25259150127c83ccba5fe38eda14c': Disable long-press on symbol keys on international locale keyboards.
| * | | | am 82798ac0: Disable long-press on symbol keys on international locale ↵Tadashi G. Takaoka2010-08-3016-160/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | keyboards. Merge commit '82798ac066c8ffc497a68a313aee17cc4ad56bbd' into gingerbread-plus-aosp * commit '82798ac066c8ffc497a68a313aee17cc4ad56bbd': Disable long-press on symbol keys on international locale keyboards.
| | * | | Disable long-press on symbol keys on international locale keyboards.Tadashi G. Takaoka2010-08-3016-160/+0
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | This change is supplement of I27007b55a30a3699bf63fd8f64d58c4b23d97d9f Bug: 2910379 Change-Id: I634226a503594e76cea9ca29e32db5801a05ae09
* | | | am ad0aac23: am 4fc6539b: Remove unused assetssatok2010-08-3034-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'ad0aac23ab5882d88f532896c63d234a6cf62267' * commit 'ad0aac23ab5882d88f532896c63d234a6cf62267': Remove unused assets
| * | | am 4fc6539b: Remove unused assetssatok2010-08-3034-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '4fc6539bcb8a99b489b5cb72bfc977b9829f5603' into gingerbread-plus-aosp * commit '4fc6539bcb8a99b489b5cb72bfc977b9829f5603': Remove unused assets
| | * | Remove unused assetssatok2010-08-3034-0/+0
| | | | | | | | | | | | | | | | Change-Id: I65de6335b19dec03785df51ddd544b7e4d39c036
* | | | am e975c196: am 5d55cf6d: Remove Log functions from Gingerbreadsatok2010-08-305-873/+11
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'e975c196c5638ac7f5a61e45100a6eba49900412' * commit 'e975c196c5638ac7f5a61e45100a6eba49900412': Remove Log functions from Gingerbread
| * | | am 5d55cf6d: Remove Log functions from Gingerbreadsatok2010-08-305-873/+11
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '5d55cf6dfc64ff54766aadda8897532bec9abf45' into gingerbread-plus-aosp * commit '5d55cf6dfc64ff54766aadda8897532bec9abf45': Remove Log functions from Gingerbread
| | * | Remove Log functions from Gingerbreadsatok2010-08-305-873/+11
| | | | | | | | | | | | | | | | Change-Id: I0ab19726a6bfaf14b42c05903f38dfb74cbd0d37
* | | | am 65333e71: (-s ours) am cb622125: DO NOT MERGE. Remove a preference for ↵satok2010-08-300-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bigram suggestion Merge commit '65333e712b638cea6b990944ff255c7b834975c4' * commit '65333e712b638cea6b990944ff255c7b834975c4': DO NOT MERGE. Remove a preference for bigram suggestion
| * | | am cb622125: DO NOT MERGE. Remove a preference for bigram suggestionsatok2010-08-292-12/+5
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'cb6221257a2f4025c91de4d65f5591e6563c54ce' into gingerbread-plus-aosp * commit 'cb6221257a2f4025c91de4d65f5591e6563c54ce': DO NOT MERGE. Remove a preference for bigram suggestion
| | * | DO NOT MERGE. Remove a preference for bigram suggestionsatok2010-08-302-12/+5
| | |/ | | | | | | | | | Change-Id: I1a9142d988352abf88da5eefe1d02596c7fc2beb
* | | am fd2ccb7d: am 06123e56: Don\'t re-allocate KeyDebouncer when keyboard is ↵Tadashi G. Takaoka2010-08-271-94/+94
|\| | | | | | | | | | | | | | | | | | | | | | | | | | switched. Merge commit 'fd2ccb7dd41d616255e2cc3d9aa3d01a8c40bfb8' * commit 'fd2ccb7dd41d616255e2cc3d9aa3d01a8c40bfb8': Don't re-allocate KeyDebouncer when keyboard is switched.
| * | am 06123e56: Don\'t re-allocate KeyDebouncer when keyboard is switched.Tadashi G. Takaoka2010-08-271-94/+94
| |\| | | | | | | | | | | | | | | | | | | Merge commit '06123e56912b5dcd7aca3d0c18c7ceb1f1cde573' into gingerbread-plus-aosp * commit '06123e56912b5dcd7aca3d0c18c7ceb1f1cde573': Don't re-allocate KeyDebouncer when keyboard is switched.
| | * Don't re-allocate KeyDebouncer when keyboard is switched.Tadashi G. Takaoka2010-08-281-94/+94
| | | | | | | | | | | | | | | | | | | | | | | | This change also re-orders instance variables and eliminates unnecessary ones. Bug: 2910379 Change-Id: I6b2217f75738fada32a33f59f0f7adba5e99dd6e
* | | am 2603c979: am 00dda50e: Revert "Show key preview instantaneously"Tadashi G. Takaoka2010-08-271-4/+28
|\| | | | | | | | | | | | | | | | | | | | Merge commit '2603c97979ce9658788e8aff33b282d4c30a0b9d' * commit '2603c97979ce9658788e8aff33b282d4c30a0b9d': Revert "Show key preview instantaneously"
| * | am 00dda50e: Revert "Show key preview instantaneously"Tadashi G. Takaoka2010-08-271-4/+28
| |\| | | | | | | | | | | | | | | | | | | Merge commit '00dda50efda107daec8bfcafe2639603b655f183' into gingerbread-plus-aosp * commit '00dda50efda107daec8bfcafe2639603b655f183': Revert "Show key preview instantaneously"
| | * Revert "Show key preview instantaneously"Tadashi G. Takaoka2010-08-271-4/+28
| | | | | | | | | | | | | | | | | | This reverts commit 09f530e248a3caf0037ca89aa79a836385a03fab. Change-Id: I3106cd22cc1eac750f05bce26df6af3026dfaf86
* | | am 44ecfdb6: am 09f530e2: Show key preview instantaneouslyTadashi G. Takaoka2010-08-271-28/+4
|\| | | | | | | | | | | | | | | | | | | | Merge commit '44ecfdb60b7473030fcf478412fb9cfd01ea2d01' * commit '44ecfdb60b7473030fcf478412fb9cfd01ea2d01': Show key preview instantaneously
| * | am 09f530e2: Show key preview instantaneouslyTadashi G. Takaoka2010-08-271-28/+4
| |\| | | | | | | | | | | | | | | | | | | Merge commit '09f530e248a3caf0037ca89aa79a836385a03fab' into gingerbread-plus-aosp * commit '09f530e248a3caf0037ca89aa79a836385a03fab': Show key preview instantaneously
| | * Show key preview instantaneouslyTadashi G. Takaoka2010-08-271-28/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | am 6ad0d15c: am 7986d783: Merge "Disable long-press on shift and symbol ↵Tadashi G. Takaoka2010-08-2712-52/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | keys" into gingerbread Merge commit '6ad0d15ca28aa23a85c2480966bc58b2f2d4694c' * commit '6ad0d15ca28aa23a85c2480966bc58b2f2d4694c': Disable long-press on shift and symbol keys
| * | am 7986d783: Merge "Disable long-press on shift and symbol keys" into ↵Tadashi G. Takaoka2010-08-2612-52/+1
| |\| | | | | | | | | | | | | | | | | | | | | | | | | gingerbread Merge commit '7986d78328e17bdbe7ec05558e93a2c6a25641c6' into gingerbread-plus-aosp * commit '7986d78328e17bdbe7ec05558e93a2c6a25641c6': Disable long-press on shift and symbol keys
generated by cgit v1.2.3-83-g751a (git 2.47.1) at 2025-07-06 01:39:38 +0000