aboutsummaryrefslogtreecommitdiffstats
path: root/java (follow)
Commit message (Collapse)AuthorAgeFilesLines
...
* | 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
| * | 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. DO NOT MERGE" into gingerbreadEric Fischer2010-08-3020-0/+80
| |\ \ \
| | * | | Import revised translations. DO NOT MERGEEric Fischer2010-08-2720-0/+80
| | |/ / | | | | | | | | | | | | Change-Id: I968a456446b782b1e20cad0b6d3c82a8aa9a663a
* | | / Import revised translationsEric Fischer2010-08-3021-21/+63
| |_|/ |/| | | | | | | | Change-Id: I4de68ff4db492e7efbaafaf01c7d1b97110a948a
* | | am 1cd7d96f: am ed5ce6c1: Merge "Remove extension keyboard" into gingerbreadTadashi G. Takaoka2010-08-304-254/+9
|\| | | | | | | | | | | | | | | | | | | | Merge commit '1cd7d96fe42e63577d70e911c4b5dbfd8b50bba1' * commit '1cd7d96fe42e63577d70e911c4b5dbfd8b50bba1': 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.
| * | | 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
| * | 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
| * | Remove Log functions from Gingerbreadsatok2010-08-305-873/+11
| | | | | | | | | | | | Change-Id: I0ab19726a6bfaf14b42c05903f38dfb74cbd0d37
| * | 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.
| * 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"
| * 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
| * 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
| * Merge "Disable long-press on shift and symbol keys" into gingerbreadTadashi G. Takaoka2010-08-2612-52/+1
| |\
| | * Disable long-press on shift and symbol keysTadashi G. Takaoka2010-08-2712-52/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | am 6bd55470: am f17a50f5: Merge "Not to reset the ring buffer in ↵satok2010-08-271-1/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | LatinImeLogger" into gingerbread Merge commit '6bd55470fd9378808ec3b7d3e6008b83d803267c' * commit '6bd55470fd9378808ec3b7d3e6008b83d803267c': Not to reset the ring buffer in LatinImeLogger
| * | Merge "Not to reset the ring buffer in LatinImeLogger" into gingerbreadsatok2010-08-261-1/+0
| |\ \ | | |/ | |/|
| | * Not to reset the ring buffer in LatinImeLoggersatok2010-08-271-1/+0
| | | | | | | | | | | | Change-Id: I3286b2562e07d77a9dfd745ad6ec44aae4396e21
* | | am 61f49165: am 830fd4af: Merge "Refactor onModifiedTouchEvent into several ↵Tadashi G. Takaoka2010-08-271-102/+115
|\| | | | | | | | | | | | | | | | | | | | | | | | | | methods." into gingerbread Merge commit '61f49165b579635cd10374276575cab1251f2198' * commit '61f49165b579635cd10374276575cab1251f2198': Refactor onModifiedTouchEvent into several methods.
| * | Merge "Refactor onModifiedTouchEvent into several methods." into gingerbreadTadashi G. Takaoka2010-08-261-102/+115
| |\ \ | | |/ | |/|
| | * Refactor onModifiedTouchEvent into several methods.Tadashi G. Takaoka2010-08-271-102/+115
| | | | | | | | | | | | | | | | | | | | | | | | 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
* | | am 01b25346: am bdd9c3dc: Remove unused import statementTadashi G. Takaoka2010-08-271-1/+0
|\| | | | | | | | | | | | | | | | | | | | Merge commit '01b25346c586ac4bbec1130565210eaa93fdee36' * commit '01b25346c586ac4bbec1130565210eaa93fdee36': Remove unused import statement
| * | Remove unused import statementTadashi G. Takaoka2010-08-271-1/+0
| |/ | | | | | | Change-Id: I61890a702060650369c6edf70c3de823a0fc1bf1
* | am 6c1644a7: am e83d7385: Refactor getKeyIndexAndNearbyCodes into ↵Tadashi G. Takaoka2010-08-272-66/+122
|\| | | | | | | | | | | | | | | | | independent class Merge commit '6c1644a7ddc2d182bf7c63c7791b345b9187713f' * commit '6c1644a7ddc2d182bf7c63c7791b345b9187713f': Refactor getKeyIndexAndNearbyCodes into independent class
| * Refactor getKeyIndexAndNearbyCodes into independent classTadashi G. Takaoka2010-08-262-66/+122
| | | | | | | | | | Bug: 2910379 Change-Id: Ib26a898ea108ee4292f9f91b6d7d10c1fc380fd1
* | am 6056fee8: am dfbc5080: Refactor SwipeTracker classTadashi G. Takaoka2010-08-262-67/+91
|\| | | | | | | | | | | | | Merge commit '6056fee826bbc011dd7742cb2e01fe4645e88c6f' * commit '6056fee826bbc011dd7742cb2e01fe4645e88c6f': Refactor SwipeTracker class
| * Refactor SwipeTracker classTadashi G. Takaoka2010-08-262-67/+91
| | | | | | | | | | | | | | | | | | This change moves SwipeTracker out from LatinKeyboardBaseView. Also this introduces EventBuffer class for swipe tracking buffer. Bug: 2910379 Change-Id: I48ff714226a248ca063cbaf9755cf45e458f7402
* | am 3a196bb9: am 542f057e: Add a log for getting coordinates of keyssatok2010-08-264-40/+136
|\| | | | | | | | | | | | | Merge commit '3a196bb92846a44283be40170e4b97908ced3031' * commit '3a196bb92846a44283be40170e4b97908ced3031': Add a log for getting coordinates of keys
| * Add a log for getting coordinates of keyssatok2010-08-264-40/+136
| | | | | | | | Change-Id: I57cc6fb6a9eeb65ce8c0c3c3262fd525726643e2
* | am f6545f21: am 0c548098: Refactor gesture detector logicTadashi G. Takaoka2010-08-261-23/+9
|\| | | | | | | | | | | | | Merge commit 'f6545f2138288f6cdc44c1690b24813a48173fc6' * commit 'f6545f2138288f6cdc44c1690b24813a48173fc6': Refactor gesture detector logic
| * Refactor gesture detector logicTadashi G. Takaoka2010-08-261-23/+9
| | | | | | | | | | | | | | | | | | | | | | 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
* | am 0a9ea46c: am 0d098c51: Fix bugs in key repeat logicTadashi G. Takaoka2010-08-251-6/+8
|\| | | | | | | | | | | | | Merge commit '0a9ea46c2a8a438de13016d60ceccb96f81eb4d5' * commit '0a9ea46c2a8a438de13016d60ceccb96f81eb4d5': Fix bugs in key repeat logic
| * Fix bugs in key repeat logicTadashi G. Takaoka2010-08-261-6/+8
| | | | | | | | | | Bug: 2950714 Change-Id: I3110369c085f89ee1e8f7392a9a04a6b9e377ed4
* | am 47db8fe1: am d900867b: Change all-subdir-java-files to ↵Tadashi G. Takaoka2010-08-251-1/+1
|\| | | | | | | | | | | | | | | | | all-java-files-under,src Merge commit '47db8fe121a3ba439bd192f6fb318792719e4a68' * commit '47db8fe121a3ba439bd192f6fb318792719e4a68': Change all-subdir-java-files to all-java-files-under,src
| * Change all-subdir-java-files to all-java-files-under,srcTadashi G. Takaoka2010-08-251-1/+1
| | | | | | | | Change-Id: I3c15101a769f19b3f3696f315db47c929979b703
* | am cd163679: am 05d1904e: Refactor SwipeTracker to top level classTadashi G. Takaoka2010-08-252-110/+133
|\| | | | | | | | | | | | | Merge commit 'cd1636790d550bc66331524282bc0a7ea085dfa1' * commit 'cd1636790d550bc66331524282bc0a7ea085dfa1': Refactor SwipeTracker to top level class
| * Refactor SwipeTracker to top level classTadashi G. Takaoka2010-08-252-110/+133
| | | | | | | | | | Bug: 2910379 Change-Id: If0ef09d8b0e7ca1c62b4c5a31bcaa620664868f2
* | am f8737965: am f4271e51: Refactor key repeating related codeTadashi G. Takaoka2010-08-241-35/+50
|\| | | | | | | | | | | | | Merge commit 'f8737965be2039e4176db4b570d7f587e7ea2fcb' * commit 'f8737965be2039e4176db4b570d7f587e7ea2fcb': Refactor key repeating related code