aboutsummaryrefslogtreecommitdiffstats
path: root/java (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Replace variables which are not exist in froyo-framework to stringssatok2010-09-031-3/+3
| | | | Change-Id: Ic11dec2ea1f5c5474085c50dddd1b73666480d1a
* Merge remote branch 'goog/master' into mastermergesatok2010-09-03203-3346/+2649
|\ | | | | | | | | | | | | Conflicts: java/src/com/android/inputmethod/latin/LatinIME.java Change-Id: I8fe443f434ced0cf18b1aa86e38fb8913a5b75c2
| * 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
| * | | am 2fb112f1: am 7083b748: Propagate preview enable attribute to mini-keyboardTadashi G. Takaoka2010-09-021-0/+1
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '2fb112f142bdac2c7cb96da5f264b5575ce611e7' * commit '2fb112f142bdac2c7cb96da5f264b5575ce611e7': Propagate preview enable attribute to mini-keyboard
| | * | Propagate preview enable attribute to mini-keyboardTadashi G. Takaoka2010-09-031-0/+1
| | | | | | | | | | | | | | | | | | | | Bug: 2959169 Change-Id: Iea1bec44baf3344d9f91280bd2b8f28476cbcf51
| * | | am 20052f34: am fe72f135: Remove close button from mini keyboardTadashi G. Takaoka2010-09-0211-66/+1
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '20052f34f987ab946d54cc405fa42cd0510fb94f' * commit '20052f34f987ab946d54cc405fa42cd0510fb94f': Remove close button from mini keyboard
| | * | Remove close button from mini keyboardTadashi G. Takaoka2010-09-0311-66/+1
| | | | | | | | | | | | | | | | | | | | Bug: 2959169 Change-Id: I9c78f9417aaa448b8b23596bc3e748fe99085393
| * | | am cea6a25b: am 07221a4a: Support sliding pop-up mini-keyboard inputTadashi G. Takaoka2010-09-022-30/+74
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'cea6a25b904f536aff4efbf9eeb865bef8a3a4b4' * commit 'cea6a25b904f536aff4efbf9eeb865bef8a3a4b4': Support sliding pop-up mini-keyboard input
| | * | Support sliding pop-up mini-keyboard inputTadashi G. Takaoka2010-09-032-30/+74
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | TODO: - Remove close button on mini-keyboard - Dismiss mini-keyboard when finger leave the screen while no key is selected This change also renames some instance variables to have more meaningful name. Bug: 2959169 Change-Id: I9fd79116a647d7be82415c6e9e7cdaf6edcb2bf6
| * | | am a723409a: am f0fd5065: Merge "Add a number alternation to English popup ↵Tadashi G. Takaoka2010-09-024-12/+71
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mini keyboard" into gingerbread Merge commit 'a723409acfe9a2c32be2c3a0d6e5be9a0dd82f00' * commit 'a723409acfe9a2c32be2c3a0d6e5be9a0dd82f00': Add a number alternation to English popup mini keyboard
| | * | Merge "Add a number alternation to English popup mini keyboard" into gingerbreadTadashi G. Takaoka2010-09-024-12/+71
| | |\ \
| | | * | Add a number alternation to English popup mini keyboardTadashi G. Takaoka2010-09-024-12/+71
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change is only for English locale. For other locales we should need specification because keyboard layout and alternations are different by locale. Bug: 2959169 Change-Id: Ib63f53ce6c30d75eff78777aa0049b05d58ce55f
| * | | | am 23eb4711: am 6bfb234f: Refactor KeyDetector to share more methodsTadashi G. Takaoka2010-09-022-10/+19
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '23eb4711020f73ebb89a761a0c4ab917a94cfabe' * commit '23eb4711020f73ebb89a761a0c4ab917a94cfabe': Refactor KeyDetector to share more methods
| | * | | Refactor KeyDetector to share more methodsTadashi G. Takaoka2010-09-032-10/+19
| | | | | | | | | | | | | | | | | | | | | | | | | Bug: 2959169 Change-Id: I87060049cad6f9d6432b6c4a246c15587ae0d837
| * | | | am b52edca1: am 83b3cf56: Merge "Corresponding to TBR of Id2b0b974" into ↵Tadashi G. Takaoka2010-09-021-2/+2
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | gingerbread Merge commit 'b52edca15df778372e52986bc4f379d1b625a14a' * commit 'b52edca15df778372e52986bc4f379d1b625a14a': Corresponding to TBR of Id2b0b974
| | * | | Merge "Corresponding to TBR of Id2b0b974" into gingerbreadTadashi G. Takaoka2010-09-021-2/+2
| | |\ \ \
| | | * | | Corresponding to TBR of Id2b0b974Tadashi G. Takaoka2010-09-021-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is follow up change of Id2b0b974fffdf6f09ee1828e957b973d2ce1c315 Bug: 2959169 Change-Id: Ie47db5fce7937a4d70c432ab76510d0dc3f68401
| * | | | | am c98e7cb2: am 0fe4c9e1: Corresponding to TBR of Ie6cf6768Tadashi G. Takaoka2010-09-021-4/+3
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'c98e7cb28b4e05883531266c31ea4c09fca74edc' * commit 'c98e7cb28b4e05883531266c31ea4c09fca74edc': Corresponding to TBR of Ie6cf6768
| | * | | | Corresponding to TBR of Ie6cf6768Tadashi G. Takaoka2010-09-021-4/+3
| | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is follow up change of Ie6cf67681180467bd8ba35d0205ce6727b7684a2 Bug: 2959169 Change-Id: I9e4cb0c9178856ddd6049f0b751b54f3ad26a266
| * | | | am 7f67c211: am 400046d6: Encapsulate vertical and horizontal correction ↵Tadashi G. Takaoka2010-09-024-61/+65
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | values into KeyDetector. Merge commit '7f67c211e7ec4bdf148c9dd468cc8e73ffeb66e3' * commit '7f67c211e7ec4bdf148c9dd468cc8e73ffeb66e3': Encapsulate vertical and horizontal correction values into KeyDetector.
| | * | | Encapsulate vertical and horizontal correction values into KeyDetector.Tadashi G. Takaoka2010-09-024-61/+65
| | |/ / | | | | | | | | | | | | | | | | Bug: 2959169 Change-Id: Id2b0b974fffdf6f09ee1828e957b973d2ce1c315
| * | | am a4397ce3: am 6b4d521f: Merge "Add PointerTracker argument to long press ↵Tadashi G. Takaoka2010-09-022-15/+33
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | related methods" into gingerbread Merge commit 'a4397ce38af2e1ac3a8284bc078bd1e9cb4fecf4' * commit 'a4397ce38af2e1ac3a8284bc078bd1e9cb4fecf4': Add PointerTracker argument to long press related methods
| | * | Merge "Add PointerTracker argument to long press related methods" into ↵Tadashi G. Takaoka2010-09-022-15/+33
| | |\ \ | | | | | | | | | | | | | | | gingerbread
| | | * | Add PointerTracker argument to long press related methodsTadashi G. Takaoka2010-09-022-15/+33
| | | |/ | | | | | | | | | | | | | | | | | | | | | | | | This change also adds debugging log to PointerTracker class Bug: 2959169 Change-Id: Ie6cf67681180467bd8ba35d0205ce6727b7684a2
| * | | am 3e6bd26f: am 83c6069b: Decrease LatinKeyboardBaseView_keyPreviewOffset. ↵Ken Wakasa2010-09-021-1/+1
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Popup will be displayed closer to each key typed. Merge commit '3e6bd26f7d2d78c3c2ae123d0f34682d374371f6' * commit '3e6bd26f7d2d78c3c2ae123d0f34682d374371f6': Decrease LatinKeyboardBaseView_keyPreviewOffset. Popup will be displayed closer to each key typed.
| | * | Decrease LatinKeyboardBaseView_keyPreviewOffset. Popup will be displayed ↵Ken Wakasa2010-09-021-1/+1
| | |/ | | | | | | | | | | | | | | | closer to each key typed. Change-Id: I863ade61cb4688214d90b24240743ee7fe16e491
| * | am d0457eae: am 3491c877: Merge "Queuing PointerTracker to support n-key ↵Tadashi G. Takaoka2010-09-024-7/+153
| |\| | | | | | | | | | | | | | | | | | | | | | | | | roll-over and shift modifier." into gingerbread Merge commit 'd0457eae17d10535023a02579d16ede7bfcc6bec' * commit 'd0457eae17d10535023a02579d16ede7bfcc6bec': Queuing PointerTracker to support n-key roll-over and shift modifier.
| | * Merge "Queuing PointerTracker to support n-key roll-over and shift ↵Tadashi G. Takaoka2010-09-024-7/+153
| | |\ | | | | | | | | | | | | modifier." into gingerbread
| | | * Queuing PointerTracker to support n-key roll-over and shift modifier.Tadashi G. Takaoka2010-09-024-7/+153
| | | | | | | | | | | | | | | | | | | | Bug: 2910379 Change-Id: I5cfae33e72a406585137842a2260310813cee07f