aboutsummaryrefslogtreecommitdiffstats
path: root/java/src/com/android/inputmethod (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge "Follow up change of I4c6df819"Tadashi G. Takaoka2010-10-121-24/+14
|\
| * Follow up change of I4c6df819Tadashi G. Takaoka2010-10-131-24/+14
| | | | | | | | | | | | This change is follow up of I4c6df8197b734feb998da78478a4d9a41f6d92b2 Change-Id: I3b8a82dd71305f34afb2e8b6a705efabdc2bc0cf
* | Follow up change of If9472a2aTadashi G. Takaoka2010-10-131-4/+3
|/ | | | | | This change is follow up of If9472a2acb029e56790dc4d19ab62e608c970175 Change-Id: I0a474a130f49e2acccbb5a164bdf2984a5bd9042
* Add text variation keyboard layoutTadashi G. Takaoka2010-10-121-14/+6
| | | | Change-Id: I4c6df8197b734feb998da78478a4d9a41f6d92b2
* resolved conflicts for merge of fd64e47c to masterKen Wakasa2010-10-121-6/+16
|\ | | | | | | Change-Id: I07434c251fafa5eee548a54dae30d91df3a24085
| * Tweak key width for 'o'-popup chars.Ken Wakasa2010-10-111-6/+16
| | | | | | | | | | | | | | We'll merge this to master for now, but we should have new attr (such as popupCharWidth) to handle this reasonably in the newly created BaseKeyboard class. bug: 3082178 Change-Id: I024b946aafbbeb07b865a09f489dacb56f0478d0
* | am 938c0a37: am 364da8c6: Fix - "Touch again to save" not working for ↵Ken Wakasa2010-10-111-2/+5
|\| | | | | | | | | | | | | | | | | manually picked suggestion when re-correction is enabled. Merge commit '938c0a3722a9c597931e6f75408dc7ab636d7052' * commit '938c0a3722a9c597931e6f75408dc7ab636d7052': Fix - "Touch again to save" not working for manually picked suggestion when re-correction is enabled.
| * Fix - "Touch again to save" not working for manually picked suggestion when ↵Ken Wakasa2010-10-111-2/+5
| | | | | | | | | | | | | | re-correction is enabled. bug: 3082806 Change-Id: I64e652b0ad1d496e102a7cc2cf9a5615df423192
* | Merge "Fix merge that should have been manually merged"Kenny Root2010-10-101-2/+1
|\ \
| * | Fix merge that should have been manually mergedKenny Root2010-10-101-2/+1
| | | | | | | | | | | | | | | | | | | | | master was still using the deleted constants in different places and Java 6 didn't like the imports. Change-Id: If9472a2acb029e56790dc4d19ab62e608c970175
* | | am 02b8d91b: am 7e1f5a2d: Make sure to set symbol keyboard shiftedTadashi G. Takaoka2010-10-103-23/+27
|\ \ \ | |/ / |/| / | |/ | | | | | | Merge commit '02b8d91b2dbe4290d4b09d93a22efbc5552326db' * commit '02b8d91b2dbe4290d4b09d93a22efbc5552326db': Make sure to set symbol keyboard shifted
| * Make sure to set symbol keyboard shiftedTadashi G. Takaoka2010-10-093-23/+27
| | | | | | | | | | | | | | | | | | | | | | To avoid a corner case of bug#3070963, in toggleShift() method of KeyboardSwitcher, the shifted symbol keyboard will be set if current keyboard is symbol keyboard or is not shifted symbol keyboard. This change also implements mini keyboard cache with WeakHashMap. Bug: 3070963 Change-Id: I868fc072e2f21bddded1622b800a53b9a6a43e91
* | resolved conflicts for merge of 23d50bfb to masterKenny Root2010-10-102-15/+21
|\| | | | | | | Change-Id: Ia3fd85bd0c231f7b910b14caad38fa453a2336f6
| * Reduce delay before mini popup keyboard is shownTadashi G. Takaoka2010-10-082-15/+19
| | | | | | | | | | | | | | | | | | Before this change, the delay was 500 ms that came from ViewConfiguration.getLongPressTimeout(). This change reduces the delay to 400 ms. Bug: 3074984 Change-Id: Ia5af5e877a3c4bb29211ef4040c728ac09a9fe85
* | am 018afe8c: am 6495bfc7: Follow-up to I36faf679 Cancel pending messages ↵Ken Wakasa2010-10-081-0/+8
|\| | | | | | | | | | | | | | | | | related to suggestion updates. Merge commit '018afe8c7e90b8dd0fde4f22873ecdf38086358e' * commit '018afe8c7e90b8dd0fde4f22873ecdf38086358e': Follow-up to I36faf679 Cancel pending messages related to suggestion updates.
| * Follow-up to I36faf679 Cancel pending messages related to suggestion updates.Ken Wakasa2010-10-061-0/+8
| | | | | | | | | | bug: 3058217 Change-Id: I54e29bf051b76ad27e6d653adbf14892083ad7eb
* | am 64444586: am 55b10796: Addressed bug: 3058217 "-" key not working at ↵Ken Wakasa2010-10-081-8/+17
|\| | | | | | | | | | | | | | | | | beginning of line Merge commit '644445868f1023b3263a149f2faf617b88341d20' * commit '644445868f1023b3263a149f2faf617b88341d20': Addressed bug: 3058217 "-" key not working at beginning of line
| * Addressed bug: 3058217 "-" key not working at beginning of lineKen Wakasa2010-10-061-8/+17
| | | | | | | | | | | | | | | | Also fixed related issues below: * Punc suggestions list was sometimes not displayed after cursor move which follows re-correction * Punc suggestions list was disappearing with words which contains certain punc chars (but not word separator) such as ' and - Change-Id: I36faf679321782fa8eaf318411308a4a6b89cc25
* | Call InputMethodSubtypePicker instead of InputMethodPickersatok2010-10-081-5/+4
| | | | | | | | Change-Id: I7c29285f4fd304d08bfd8f5f72df3fc421090681
* | Keyboard XML file supports include and merge tagTadashi G. Takaoka2010-10-071-71/+156
| | | | | | | | | | | | | | | | Keyboard XML file can include other keyboard XML file using directive <include keyboardLayout="@xml/...">. The keyboard XML file which is included must have <merge> tag as root element. Change-Id: I06c35fe7b3db5232acdb33f73a79f38d31261b32
* | Add keyHintIcon attribute to BaseKeyboard.Key classTadashi G. Takaoka2010-10-055-132/+105
| | | | | | | | | | | | | | This keyHintIcon attribute is used to specify hint icon drawable at top right corner of Key. Change-Id: Icaa91e63c4473b2513396bd3fbeb8ed6fd73586c
* | Add an auto complete's threshold option.Mitsuhiro Shimoda2010-10-054-6/+147
| | | | | | | | Change-Id: I3a6821ced8642ab8f954e79a25e31766e4a18eb8
* | Modify BaseKeyboard to be able to handle multiple shift keysTadashi G. Takaoka2010-10-022-32/+17
| | | | | | | | Change-Id: Ie840ae113ee6bd5b629a90959d7f955a5ceba95a
* | Unbundle Keyboard.java to BaseKeyboard.javasatok2010-10-0211-49/+850
| | | | | | | | Change-Id: I8b310c2c0cae1a151e53c22001c586697346982c
* | am c0fc4bf9: am 8e1f1be0: Long press mic/comma key bring mini keyboard with ↵Tadashi G. Takaoka2010-10-012-10/+2
|\| | | | | | | | | | | | | | | | | settings Merge commit 'c0fc4bf9932caf536af5d5d86bb61ec6d8a44a99' * commit 'c0fc4bf9932caf536af5d5d86bb61ec6d8a44a99': Long press mic/comma key bring mini keyboard with settings
| * Long press mic/comma key bring mini keyboard with settingsTadashi G. Takaoka2010-10-012-10/+2
| | | | | | | | | | | | Bug: 3050703 Change-Id: I090b2bfebfb48e5ec461615d4c911024ea6d130a
* | am 8e6a9270: am 18d536f6: Merge "Dismiss orange highlight after suggestion ↵Tadashi G. Takaoka2010-09-301-7/+9
|\| | | | | | | | | | | | | | | | | has been selected" into gingerbread Merge commit '8e6a92703d1bdf530d32c8cdf90deefc6bc3a878' * commit '8e6a92703d1bdf530d32c8cdf90deefc6bc3a878': Dismiss orange highlight after suggestion has been selected
| * Dismiss orange highlight after suggestion has been selectedTadashi G. Takaoka2010-10-011-7/+9
| | | | | | | | | | Bug: 3051311 Change-Id: Ia32cd8748a0afade07a9896ad77400cf42aed0f5
* | am 105f7c36: am 3297ee80: Merge "Long pressing mic/comma key will show ↵Tadashi G. Takaoka2010-09-301-10/+20
|\| | | | | | | | | | | | | | | | | settings menue" into gingerbread Merge commit '105f7c36b7fa1845b9edbf47ca55b4a6660303b6' * commit '105f7c36b7fa1845b9edbf47ca55b4a6660303b6': Long pressing mic/comma key will show settings menue
| * Merge "Long pressing mic/comma key will show settings menue" into gingerbreadTadashi G. Takaoka2010-09-301-10/+20
| |\
| | * Long pressing mic/comma key will show settings menueTadashi G. Takaoka2010-09-301-10/+20
| | | | | | | | | | | | | | | Bug: 3050703 Change-Id: I62773c10f435d13174f6ff6574912cb99303e83c
* | | am 93176d86: am 77c9f2d3: Merge "Display feedback popup for saving word ↵Tadashi G. Takaoka2010-09-301-37/+3
|\| | | | | | | | | | | | | | | | | | | | | | | | | | while the word is pressing." into gingerbread Merge commit '93176d869a496051344d80ef03573bc6bb99035a' * commit '93176d869a496051344d80ef03573bc6bb99035a': Display feedback popup for saving word while the word is pressing.
| * | Display feedback popup for saving word while the word is pressing.Tadashi G. Takaoka2010-09-301-37/+3
| |/ | | | | | | | | Bug: 3004696 Change-Id: Icc5bdd6945f3bf79f7234a0227d8036d6f6d4c1d
* | am e6e45510: am 11a578f4: Disable suggestion bar before invoke Voice inputTadashi G. Takaoka2010-09-301-0/+3
|\| | | | | | | | | | | | | Merge commit 'e6e45510674b31d0c82fa5f8a7943668d7e8503a' * commit 'e6e45510674b31d0c82fa5f8a7943668d7e8503a': Disable suggestion bar before invoke Voice input
| * Disable suggestion bar before invoke Voice inputTadashi G. Takaoka2010-09-301-0/+3
| | | | | | | | | | Bug: 3002817 Change-Id: I099dd63e58d5159a609c1d934dbb6f5aab914305
* | am 48ef72ac: am 8ff96805: Merge "Eliminate compiler warning" into gingerbreadTadashi G. Takaoka2010-09-301-2/+1
|\| | | | | | | | | | | | | Merge commit '48ef72acef92bb774bad84d647427eaab0acc83b' * commit '48ef72acef92bb774bad84d647427eaab0acc83b': Eliminate compiler warning
| * Merge "Eliminate compiler warning" into gingerbreadTadashi G. Takaoka2010-09-291-2/+1
| |\
| | * Eliminate compiler warningTadashi G. Takaoka2010-09-301-2/+1
| | | | | | | | | | | | Change-Id: Ib3effaa6f4e8cfc3951ab5d5d099335fd3856a2f
* | | am 259778c3: am eebe37e8: Merge "Disable suggestion selection preview popup" ↵Tadashi G. Takaoka2010-09-301-49/+56
|\| | | | | | | | | | | | | | | | | | | | | | | | | | into gingerbread Merge commit '259778c3a18246b3117c2874b87f1adaf2d9fb81' * commit '259778c3a18246b3117c2874b87f1adaf2d9fb81': Disable suggestion selection preview popup
| * | Merge "Disable suggestion selection preview popup" into gingerbreadTadashi G. Takaoka2010-09-291-49/+56
| |\ \ | | |/ | |/|
| | * Disable suggestion selection preview popupTadashi G. Takaoka2010-09-301-49/+56
| | | | | | | | | | | | | | | | | | Bug: 3048642 Bug: 3004920 Change-Id: Ibfb495a246c9e2da6ebf3c03d10ed8acff00f54b
* | | am 4d158dc2: am 15b840cd: Merge "Check recorrection on focusing into a text ↵Amith Yamasani2010-09-301-0/+23
|\| | | | | | | | | | | | | | | | | | | | | | | | | | field that has text already." into gingerbread Merge commit '4d158dc2779ffff8c92a41f32e6885bd0f155fc3' * commit '4d158dc2779ffff8c92a41f32e6885bd0f155fc3': Check recorrection on focusing into a text field that has text already.
| * | Merge "Check recorrection on focusing into a text field that has text ↵Amith Yamasani2010-09-291-0/+23
| |\ \ | | |/ | |/| | | | already." into gingerbread
| | * Check recorrection on focusing into a text field that has text already.Amith Yamasani2010-09-291-0/+23
| | | | | | | | | | | | | | | Bug: 3004827 Change-Id: I00e9d925fcf17fa9f7a9aefe6572a648e023be11
* | | resolved conflicts for merge of ab1348e8 to masterTadashi G. Takaoka2010-09-301-110/+76
|\| | | | | | | | | | | Change-Id: Ica94a5f9ac4feae477297f14fc1bc21d02efb6a4
| * | Refactor CandidateView touch event handlingTadashi G. Takaoka2010-09-291-110/+76
| | | | | | | | | | | | | | | | | | | | | | | | This change also fixes tha the touch slop value is applyed only for initial movement of scrolling suggestion bar. Bug: 3004920 Change-Id: I62afdedc210156e41e8c84c48cade442f9d5a1aa
* | | am fcd5f2b9: am c2c9cd82: Merge "Mini keyboard works even while shift is ↵Tadashi G. Takaoka2010-09-282-5/+14
|\| | | | | | | | | | | | | | | | | | | | | | | | | | being pressed" into gingerbread Merge commit 'fcd5f2b9b4229c00a6589aad1fda9b727759d343' * commit 'fcd5f2b9b4229c00a6589aad1fda9b727759d343': Mini keyboard works even while shift is being pressed
| * | Mini keyboard works even while shift is being pressedTadashi G. Takaoka2010-09-292-5/+14
| |/ | | | | | | | | Bug: 3038861 Change-Id: I94011ca80710ff6eb24e940104f7d9d3bb86840a
* | am 0ea7e504: am 6e5a3986: Fixed key code and key coordinates when move ↵Tadashi G. Takaoka2010-09-281-119/+129
|\| | | | | | | | | | | | | | | | | debounce has been in action Merge commit '0ea7e504887702bace7b2e765704d08e737ab1b5' * commit '0ea7e504887702bace7b2e765704d08e737ab1b5': Fixed key code and key coordinates when move debounce has been in action
| * Fixed key code and key coordinates when move debounce has been in actionTadashi G. Takaoka2010-09-281-119/+129
| | | | | | | | | | | | | | | | | | This change refactors a key index and pointer position variables into a separate static inner class KeyState . This change also disables time debouncing. Bug: 3033737 Change-Id: Ie4fc37316c260330d8f0861e0771ea903a99cfce