aboutsummaryrefslogtreecommitdiffstats
path: root/java (follow)
Commit message (Collapse)AuthorAgeFilesLines
...
| * Merge "Fix new theme assets and resources" into gingerbreadsatok2010-09-014-4/+5
| |\
| | * Fix new theme assets and resourcessatok2010-09-014-4/+5
| | | | | | | | | | | | | | | | | | | | | | | | - Add a layout for popup for new theme - Change the color of language bar - Fix a drawable for settings feedback Change-Id: I7c0c9e238c8223554a62f7b0c8092d074cf9743f
* | | am fcba07ad: am 4de4d51d: Merge "Remove old unused delete key assets" into ↵satok2010-09-013-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | gingerbread Merge commit 'fcba07adb72962029d6d046301d471fc471af352' * commit 'fcba07adb72962029d6d046301d471fc471af352': Remove old unused delete key assets
| * | Merge "Remove old unused delete key assets" into gingerbreadsatok2010-09-013-0/+0
| |\ \
| | * | Remove old unused delete key assetssatok2010-09-013-0/+0
| | |/ | | | | | | | | | Change-Id: Id50b0f3069b37e6751a4cfbd374c22c13fb0f505
* | | am fbd2aaf5: am a8d5e6d3: Remove duplicated assetssatok2010-09-012-0/+0
|\| | | | | | | | | | | | | | | | | | | | Merge commit 'fbd2aaf5ffb98035f6ed85589effa7a73b85fa70' * commit 'fbd2aaf5ffb98035f6ed85589effa7a73b85fa70': Remove duplicated assets
| * | Remove duplicated assetssatok2010-09-012-0/+0
| |/ | | | | | | Change-Id: I4f8abf917ff9dfa3c5d31e441476e032fb4ce3a9
* | am 4d09b2e7: am 31adfa78: Add a new theme for Gingerbreadsatok2010-09-017-9/+130
|\| | | | | | | | | | | | | Merge commit '4d09b2e78e68ef0f1b713b10e280e56d91592717' * commit '4d09b2e78e68ef0f1b713b10e280e56d91592717': Add a new theme for Gingerbread
| * Add a new theme for Gingerbreadsatok2010-09-017-9/+130
| | | | | | | | | | | | bug: 2959293 Change-Id: I8aef19a7485ffd5639a177aee21103b3a1e04cf2
* | am c3b55809: am c7c6203f: Merge "Introduce multiple PointerTracker" into ↵Tadashi G. Takaoka2010-09-012-27/+55
|\| | | | | | | | | | | | | | | | | gingerbread Merge commit 'c3b55809a5e650200a67c8f8164ba48db995c24c' * commit 'c3b55809a5e650200a67c8f8164ba48db995c24c': Introduce multiple PointerTracker
| * Merge "Introduce multiple PointerTracker" into gingerbreadTadashi G. Takaoka2010-09-012-27/+55
| |\
| | * Introduce multiple PointerTrackerTadashi G. Takaoka2010-09-012-27/+55
| | | | | | | | | | | | | | | Bug: 2910379 Change-Id: Iefafa2d30ad16f898a00664e4bf3e3e88dcd2cb2
* | | am 3412a892: am d44b79eb: Merge "Add new assets" into gingerbreadsatok2010-08-312-0/+0
|\| | | | | | | | | | | | | | | | | | | | Merge commit '3412a892dd21a3e9ad27ba11abe7125e88556c5b' * commit '3412a892dd21a3e9ad27ba11abe7125e88556c5b': Add new assets
| * | Merge "Add new assets" into gingerbreadsatok2010-08-312-0/+0
| |\ \
| | * | Add new assetssatok2010-09-012-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | - drawable-hdpi/keyboard_popup_panel_background.9.png - drawable-hdpi/voice_ime_background.9.png Change-Id: Iac75c8d488454534a921c59267f2523e47bb5e11
* | | | am 3fa7486c: am fd36a98d: Merge "Add new assets for LatinIME" into gingerbreadsatok2010-08-3157-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '3fa7486c940e4b66ba23eadb2c5541f371ce31b1' * commit '3fa7486c940e4b66ba23eadb2c5541f371ce31b1': Add new assets for LatinIME
| * | | Merge "Add new assets for LatinIME" into gingerbreadsatok2010-08-3157-1/+1
| |\ \ \ | | |_|/ | |/| |
| | * | Add new assets for LatinIMEsatok2010-09-0157-1/+1
| | |/ | | | | | | | | | Change-Id: I62b544d6ed2d3ef7a5e37cdcedef7a60d09a1cb2
* | | am ad60fe2e: am 409731fb: Merge "Make KeyDebounce class a top-level class ↵Tadashi G. Takaoka2010-08-312-421/+440
|\| | | | | | | | | | | | | | | | | | | | | | | | | | and rename it to PointerTracker" into gingerbread Merge commit 'ad60fe2e80878e1b1caa2c9207d8f601e203560f' * commit 'ad60fe2e80878e1b1caa2c9207d8f601e203560f': Make KeyDebounce class a top-level class and rename it to PointerTracker
| * | Merge "Make KeyDebounce class a top-level class and rename it to ↵Tadashi G. Takaoka2010-08-312-421/+440
| |\ \ | | | | | | | | | | | | PointerTracker" into gingerbread
| | * | Make KeyDebounce class a top-level class and rename it to PointerTrackerTadashi G. Takaoka2010-09-012-421/+440
| | | | | | | | | | | | | | | | | | | | Bug: 2910379 Change-Id: I9503b2211b272a4a2903d0732985e5ab8ee39440
* | | | am 7bb640c1: am 543dbdfd: Always present suggestion strip whenever in ↵Ken Wakasa2010-08-311-13/+14
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | appropriate mode. Merge commit '7bb640c1e06718936412af2c2198e09a57ce5124' * commit '7bb640c1e06718936412af2c2198e09a57ce5124': Always present suggestion strip whenever in appropriate mode.
| * | | Always present suggestion strip whenever in appropriate mode.Ken Wakasa2010-09-011-13/+14
| |/ / | | | | | | | | | | | | | | | | | | Some cleanups too. bug: 2959293 Change-Id: Idf07fc25c5700b69b93ab4b09ce34941f0d9c157
* | | am 5bb2e9a5: am b24cc640: Fix ArrayIndexOutOfBoundsException.Ken Wakasa2010-08-311-3/+5
|\| | | | | | | | | | | | | | | | | | | | Merge commit '5bb2e9a55de237e1955ac1fd19eea3771e671afe' * commit '5bb2e9a55de237e1955ac1fd19eea3771e671afe': Fix ArrayIndexOutOfBoundsException.
| * | Fix ArrayIndexOutOfBoundsException.Ken Wakasa2010-09-011-3/+5
| | | | | | | | | | | | | | | bug: 2964045 Change-Id: I97d95181e1a6838ace9c135aa92e7f20034e821f
* | | am cc742449: am b57b4785: Refactor KeyDebounce classTadashi G. Takaoka2010-08-311-258/+304
|\| | | | | | | | | | | | | | | | | | | | Merge commit 'cc7424498f63712077e8e4009932b22fabdc1e38' * commit 'cc7424498f63712077e8e4009932b22fabdc1e38': Refactor KeyDebounce class
| * | Refactor KeyDebounce classTadashi G. Takaoka2010-09-011-258/+304
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | 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
| * | 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
| * | 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
| * | 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
| * | 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