aboutsummaryrefslogtreecommitdiffstats
path: root/java (follow)
Commit message (Collapse)AuthorAgeFilesLines
...
| * DO NOT MERGE. Fix a string for the sharedpreference for re-correctionsatok2010-09-081-1/+1
| | | | | | | | Change-Id: I0f8b45cf4604aeed31ecb53f60ff52e0f337bbdd
* | Fix a string for the preference for re-correctionsatok2010-09-081-1/+1
| | | | | | | | Change-Id: I1d0adcf72450441c3657995cc17550a078845f0e
* | am 663bc844: am 1e51430e: Merge "Update assets for LatinIME" into gingerbreadsatok2010-09-0754-0/+0
|\| | | | | | | | | | | | | Merge commit '663bc8440e02318718b9175c7da7700c6a434623' * commit '663bc8440e02318718b9175c7da7700c6a434623': Update assets for LatinIME
| * Merge "Update assets for LatinIME" into gingerbreadsatok2010-09-0754-0/+0
| |\
| | * Update assets for LatinIMEsatok2010-09-0754-0/+0
| | | | | | | | | | | | | | | | | | bug: 2974998 Change-Id: Ie98a023b65d34f08c9c66d04017e8877b31edb84
* | | am dacc927a: am c1ff2846: Update strings for the settings access - based on ↵Ken Wakasa2010-09-0724-31/+6
|\| | | | | | | | | | | | | | | | | | | | | | | | | | the latest GB IME spec (ver 03). Please refer to bug: 2979069 for the latest mock. Merge commit 'dacc927a57b0c7adfbdf244441b9b2495c959980' * commit 'dacc927a57b0c7adfbdf244441b9b2495c959980': Update strings for the settings access - based on the latest GB IME spec (ver 03).
| * | Update strings for the settings access - based on the latest GB IME spec ↵Ken Wakasa2010-09-0724-31/+6
| |/ | | | | | | | | | | | | | | | | | | (ver 03). Please refer to bug: 2979069 for the latest mock. Got rid of obsolete string too. Change-Id: Ic02d1651b288f24f9c3a9da5d0dcf09055256ab0
* | am e5abf25d: am 83e63ace: Dismiss mini keyboard when finger is released ↵Tadashi G. Takaoka2010-09-073-3/+20
|\| | | | | | | | | | | | | | | | | outside mini keyboard Merge commit 'e5abf25d4b57ecdfc01ca3ddf94753d5bcb07fea' * commit 'e5abf25d4b57ecdfc01ca3ddf94753d5bcb07fea': Dismiss mini keyboard when finger is released outside mini keyboard
| * Dismiss mini keyboard when finger is released outside mini keyboardTadashi G. Takaoka2010-09-073-3/+20
| | | | | | | | | | | | Bug: 2978975 Change-Id: Ie634e8ae827fe093c5c673b75d85835050b03794
* | am bc1a0354: am 26aff8c6: Merge "Fixed extra periods when chording with ↵Tadashi G. Takaoka2010-09-072-25/+25
|\| | | | | | | | | | | | | | | | | shift and space" into gingerbread Merge commit 'bc1a0354ef1cac0319cab63822c66203f1fa2c24' * commit 'bc1a0354ef1cac0319cab63822c66203f1fa2c24': Fixed extra periods when chording with shift and space
| * Merge "Fixed extra periods when chording with shift and space" into gingerbreadTadashi G. Takaoka2010-09-072-25/+25
| |\
| | * Fixed extra periods when chording with shift and spaceTadashi G. Takaoka2010-09-072-25/+25
| | | | | | | | | | | | | | | | | | | | | | | | Actually it was caused by canceling repeat key (space and delete) when multiple pointer are touching. Bug: 2975041 Change-Id: If82183b9225efdace7b5418860b9664f1705b7ec
* | | resolved conflicts for merge of 36d2d0e7 to mastersatok2010-09-074-15/+35
|\| | | | | | | | | | | Change-Id: Ib4b6ef593d7f4ce5b0666f2e0987ee8398cabe12
| * | Merge "Add shared preference for re-correction" into gingerbreadsatok2010-09-064-15/+35
| |\ \
| | * | Add shared preference for re-correctionsatok2010-09-074-15/+35
| | |/ | | | | | | | | | Change-Id: Ie5b2e0d2f9739dd33524c2688e172e77aac1f243
* | | am ed34cd19: am d27c7aea: Add isModifier to the buttons in the lowest linesatok2010-09-069-18/+18
|\| | | | | | | | | | | | | | | | | | | | Merge commit 'ed34cd19a93528c960380d57e024f49cb17d5e5f' * commit 'ed34cd19a93528c960380d57e024f49cb17d5e5f': Add isModifier to the buttons in the lowest line
| * | Add isModifier to the buttons in the lowest linesatok2010-09-079-18/+18
| |/ | | | | | | Change-Id: I2d5c9e753f0f6fa21fdcfa7b55e81e6a3e3ea64f
* | am 7bbea0dd: am 8d7ffcb2: Disable pop-up preview on mini keyboardTadashi G. Takaoka2010-09-062-19/+2
|\| | | | | | | | | | | | | Merge commit '7bbea0dd8fe04b378a9a7a161c2995998f4a8dcf' * commit '7bbea0dd8fe04b378a9a7a161c2995998f4a8dcf': Disable pop-up preview on mini keyboard
| * Disable pop-up preview on mini keyboardTadashi G. Takaoka2010-09-062-19/+2
| | | | | | | | | | | | | | | | | | | | | | This change also disable the special behavior of long press a key that has only one digit alternate. If the visual design of both the pop-up preview and the mini keyboard will look like same, I think that showing mini keyboard is enough for the key that has one digit alternate. Bug: 2973546 Change-Id: I04f138c120aa58526fe054626dac856171fb7a58
* | am efe7abe0: am 12659d4c: Fix ALT key light behaviorTadashi G. Takaoka2010-09-063-17/+20
|\| | | | | | | | | | | | | Merge commit 'efe7abe03dce1779ce76e175d0fe9422d2f8eaad' * commit 'efe7abe03dce1779ce76e175d0fe9422d2f8eaad': Fix ALT key light behavior
| * Fix ALT key light behaviorTadashi G. Takaoka2010-09-063-17/+20
| | | | | | | | | | | | | | This change also cleanups some imports, unnecessary cast and null check. Bug: 2977256 Change-Id: I81b9e539ff8a13ae0cc1eb5c4fb2246732cca3e9
* | am ef40dd52: am f02e4208: Merge "Fix an asset for the feedback of delete ↵satok2010-09-061-0/+0
|\| | | | | | | | | | | | | | | | | key" into gingerbread Merge commit 'ef40dd52aa8eef0366586f80cbfe5cb0b63ad4f2' * commit 'ef40dd52aa8eef0366586f80cbfe5cb0b63ad4f2': Fix an asset for the feedback of delete key
| * Merge "Fix an asset for the feedback of delete key" into gingerbreadsatok2010-09-061-0/+0
| |\
| | * Fix an asset for the feedback of delete keysatok2010-09-061-0/+0
| | | | | | | | | | | | | | | | | | bug: 2977026 Change-Id: I4cdaaf49644d214b03a514a9104144250a024574
* | | am d5bcbf81: am c8b9afe0: Support multi-touch only when device has distinct ↵Tadashi G. Takaoka2010-09-064-9/+90
|\| | | | | | | | | | | | | | | | | | | | | | | | | | multi-touch panel Merge commit 'd5bcbf8156fdba8199452b8f95ed1940b7e96d31' * commit 'd5bcbf8156fdba8199452b8f95ed1940b7e96d31': Support multi-touch only when device has distinct multi-touch panel
| * | Support multi-touch only when device has distinct multi-touch panelTadashi G. Takaoka2010-09-064-9/+90
| | | | | | | | | | | | | | | Bug: 2973373 Change-Id: I9871c09ec8c1c2aa945d97392e61ee1ec585baef
* | | am b6e3cb8f: am a8d9702f: Fix layout issue of the bottom row in web entry modeKen Wakasa2010-09-0518-54/+54
|\| | | | | | | | | | | | | | | | | | | | Merge commit 'b6e3cb8f8de487f537bf8522ed4d494798e03791' * commit 'b6e3cb8f8de487f537bf8522ed4d494798e03791': Fix layout issue of the bottom row in web entry mode
| * | Fix layout issue of the bottom row in web entry modeKen Wakasa2010-09-0518-54/+54
| |/ | | | | | | | | bug: 2977061 Change-Id: I76e0f4a21480d10f79fd5dcbe58c63cc3516d5d7
* | am 34830114: am 0a498cf8: Merge "Extend space LED for autocompletion" into ↵satok2010-09-032-33/+44
|\| | | | | | | | | | | | | | | | | gingerbread Merge commit '34830114e66882bf30505f1e538764c9abd3025b' * commit '34830114e66882bf30505f1e538764c9abd3025b': Extend space LED for autocompletion
| * Merge "Extend space LED for autocompletion" into gingerbreadsatok2010-09-032-33/+44
| |\
| | * Extend space LED for autocompletionsatok2010-09-032-33/+44
| | | | | | | | | | | | Change-Id: If59ea7c871ffc2af6fe2bfde72303f2612e43c3b
* | | am 232b0394: am e8f45ab5: One alternate is treated as key action, not open ↵Tadashi G. Takaoka2010-09-033-18/+47
|\| | | | | | | | | | | | | | | | | | | | | | | | | | mini keyboard Merge commit '232b039496ef95c543bac5128e6378b38760de21' * commit '232b039496ef95c543bac5128e6378b38760de21': One alternate is treated as key action, not open mini keyboard
| * | One alternate is treated as key action, not open mini keyboardTadashi G. Takaoka2010-09-033-18/+47
| | | | | | | | | | | | | | | | | | | | | | | | This change also fixes bug#2973683. Bug: 2973546 Bug: 2973683 Change-Id: I67573e5b7cad4af261591a4a608d0596dd7901f2
* | | am c93ac9db: am ffa88f0e: Merge "Move inflating mini keyboard code into ↵Tadashi G. Takaoka2010-09-031-82/+93
|\| | | | | | | | | | | | | | | | | | | | | | | | | | separate method" into gingerbread Merge commit 'c93ac9db7129f935425f79d5a460e7b926cb4a22' * commit 'c93ac9db7129f935425f79d5a460e7b926cb4a22': Move inflating mini keyboard code into separate method
| * | Merge "Move inflating mini keyboard code into separate method" into gingerbreadTadashi G. Takaoka2010-09-031-82/+93
| |\ \ | | |/ | |/|
| | * Move inflating mini keyboard code into separate methodTadashi G. Takaoka2010-09-031-82/+93
| | | | | | | | | | | | Change-Id: Iba8e43ba6125e559d4c7d9cadb6bcb13b8eefc83
* | | am e5ae8c62: am 1b09ac4f: Merge "Add a showing input method picker option by ↵satok2010-09-033-5/+51
|\| | | | | | | | | | | | | | | | | | | | | | | | | | longpressing setting key" into gingerbread Merge commit 'e5ae8c62c83ad29d623562a74355bc619c216742' * commit 'e5ae8c62c83ad29d623562a74355bc619c216742': Add a showing input method picker option by longpressing setting key
| * | Merge "Add a showing input method picker option by longpressing setting key" ↵satok2010-09-033-5/+51
| |\ \ | | |/ | |/| | | | into gingerbread
| | * Add a showing input method picker option by longpressing setting keysatok2010-09-033-5/+51
| | | | | | | | | | | | | | | | | | Bug: 2959271 Change-Id: I4b7e9a2de3cbe17b168ed8d0541a9b1cd9a9e107
* | | am 1274cd16: am 5583cb0a: Merge "Followup TBR in I87060049" into gingerbreadTadashi G. Takaoka2010-09-031-2/+33
|\| | | | | | | | | | | | | | | | | | | | Merge commit '1274cd160f81d7a59828e0dbe66d87dfbe87c544' * commit '1274cd160f81d7a59828e0dbe66d87dfbe87c544': Followup TBR in I87060049
| * | Merge "Followup TBR in I87060049" into gingerbreadTadashi G. Takaoka2010-09-031-2/+33
| |\ \ | | |/ | |/|
| | * Followup TBR in I87060049Tadashi G. Takaoka2010-09-031-2/+33
| | | | | | | | | | | | | | | | | | This change is followup TBR in I87060049cad6f9d6432b6c4a246c15587ae0d837 Change-Id: I02ee33da269162f5e95ce5b985dbf5094ba14c0d
* | | am 025bafb5: am 6f8ff3b9: Merge "Update delete key" into gingerbreadsatok2010-09-021-0/+0
|\| | | | | | | | | | | | | | | | | | | | Merge commit '025bafb5d4272323491eb90a845ead44de4d80b7' * commit '025bafb5d4272323491eb90a845ead44de4d80b7': Update delete key
| * | Merge "Update delete key" into gingerbreadsatok2010-09-021-0/+0
| |\ \
| | * | Update delete keysatok2010-09-031-0/+0
| | | | | | | | | | | | | | | | Change-Id: I0348e4846131f9913b4ab6c2c2a9427a9a53c74e
* | | | am 66546535: am c5841994: Merge "Change symbol on space bar when ↵satok2010-09-025-27/+68
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | autocompletion is activated" into gingerbread Merge commit '6654653562d0ec5d46a74f8c49eab2488e273cf2' * commit '6654653562d0ec5d46a74f8c49eab2488e273cf2': Change symbol on space bar when autocompletion is activated
| * | | Merge "Change symbol on space bar when autocompletion is activated" into ↵satok2010-09-025-27/+68
| |\ \ \ | | |_|/ | |/| | | | | | gingerbread
| | * | Change symbol on space bar when autocompletion is activatedsatok2010-09-035-27/+68
| | |/ | | | | | | | | | | | | | | | bug: 2959279 Change-Id: Icc70b7cce0c245ae2451d324debd346f226b8769
* | | am 22776af8: am c5d33b16: Fix NPE in LatinKeyboardBaseViewTadashi G. Takaoka2010-09-022-42/+39
|\| | | | | | | | | | | | | | | | | | | | Merge commit '22776af828c69db22d90b42d196f487095905c70' * commit '22776af828c69db22d90b42d196f487095905c70': Fix NPE in LatinKeyboardBaseView
| * | Fix NPE in LatinKeyboardBaseViewTadashi G. Takaoka2010-09-032-42/+39
| | | | | | | | | | | | | | | | | | | | | | | | This change also refactors some mini-keyboard related methods in LatinKeyboardBaseView and PointerTracker class. Bug: 2973236 Change-Id: I3190fe89ea3ac3c6d351ed4b6d77de98a0aa65db