aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| | | * | | Merge "Restrict phantom sudden move event hack to specific device" into jb-devTadashi G. Takaoka2012-05-303-6/+40
| | | |\ \ \
| | | | * | | Restrict phantom sudden move event hack to specific deviceTadashi G. Takaoka2012-05-303-6/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 6571778 Change-Id: I4306af387074d34db68a9bb16ae41debcfc36bfd
| * | | | | | am 56d64b7c: am 38da968a: Merge "Cleanup keyboard-heights.xml resources" ↵Tadashi G. Takaoka2012-05-306-114/+8
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into jb-dev * commit '56d64b7c03d63a8347ed0f658307a75f2610d2a2': Cleanup keyboard-heights.xml resources
| | * | | | | am 38da968a: Merge "Cleanup keyboard-heights.xml resources" into jb-devTadashi G. Takaoka2012-05-306-114/+8
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '38da968a9aa4b7c46b441916555f657cf68dbb3f': Cleanup keyboard-heights.xml resources
| | | * | | | Merge "Cleanup keyboard-heights.xml resources" into jb-devTadashi G. Takaoka2012-05-306-114/+8
| | | |\ \ \ \
| | | | * | | | Cleanup keyboard-heights.xml resourcesTadashi G. Takaoka2012-05-306-114/+8
| | | | |/ / / | | | | | | | | | | | | | | | | | | | | | Change-Id: If33643045ad6ff7ea9fdf3f974564cb40f1db041
| * | | | | | am d8096b1a: am 6cbe204f: Fix the performance issue on suggesting ↵Satoshi Kataoka2012-05-305-15/+66
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa * commit 'd8096b1a12ce1f6f53a2b269956043d77276f007': Fix the performance issue on suggesting aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
| | * | | | | am 6cbe204f: Fix the performance issue on suggesting ↵Satoshi Kataoka2012-05-305-15/+66
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa * commit '6cbe204fce109fab652da15f4c8ea1ae35fca3e7': Fix the performance issue on suggesting aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
| | | * | | | Fix the performance issue on suggesting aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaSatoshi Kataoka2012-05-305-15/+66
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 6576793 Change-Id: I46f56654cd25dc28668ad75ac71e0e3beb8cdcf3
| * | | | | | am 40bab488: am 4f78f8cb: Merge "Remove a vibration-related option when ↵Jean Chalard2012-05-291-0/+5
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | there\'s no vibrator" into jb-dev * commit '40bab488cb70875f46e29f595d577cc6cc4a9264': Remove a vibration-related option when there's no vibrator
| | * | | | | am 4f78f8cb: Merge "Remove a vibration-related option when there\'s no ↵Jean Chalard2012-05-291-0/+5
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | vibrator" into jb-dev * commit '4f78f8cb795a754bbe36b3334cb77e2a5b59c278': Remove a vibration-related option when there's no vibrator
| | | * | | | Merge "Remove a vibration-related option when there's no vibrator" into jb-devJean Chalard2012-05-291-0/+5
| | | |\ \ \ \ | | | | |/ / / | | | |/| | |
| | | | * | | Remove a vibration-related option when there's no vibratorJean Chalard2012-05-301-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 6567160 Change-Id: I1b5d425ffb64b2d7390cd0b7be0825f6aca17f41
| * | | | | | am 987aa153: am 62cd919d: Remove a compiler warning.Jean Chalard2012-05-291-1/+1
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '987aa1536b762070138ba40485a10e4caac01c48': Remove a compiler warning.
| | * | | | | am 62cd919d: Remove a compiler warning.Jean Chalard2012-05-291-1/+1
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '62cd919dca9ef85cdd045b539b3ef85e921c6e4c': Remove a compiler warning.
| | | * | | | Remove a compiler warning.Jean Chalard2012-05-301-1/+1
| | | |/ / / | | | | | | | | | | | | | | | | | | Change-Id: Id2c949d03a2e38787cbf3c8f99313bcfe8610a1f
| * | | | | am 719badd1: (-s ours) am 902275cb: Import translations. DO NOT MERGEEric Fischer2012-05-290-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '719badd135bad4ea52d8c4336ba2bc4541693e5b': Import translations. DO NOT MERGE
| | * | | | am 902275cb: Import translations. DO NOT MERGEEric Fischer2012-05-298-9/+9
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '902275cb5d30afa6e31931b990666bf1fab79225': Import translations. DO NOT MERGE
| | | * | | Import translations. DO NOT MERGEEric Fischer2012-05-298-9/+9
| | | | |/ | | | |/| | | | | | | | | | | Change-Id: I50bf9fee5d80982699b696871987df047c569d18
| * | | | Merge "Fixes to json output"Kurt Partridge2012-05-293-115/+63
| |\ \ \ \
| | * | | | Fixes to json outputKurt Partridge2012-05-293-115/+63
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - booleans and numbers in SharedPreferences not quoted as strings - removed redundant logging from KeyboardState - json output for KeyboardId - remove unnecessary logging of LatinImeLogger.onStartView() and PointerTracker checking keyboardlayoutchange - fix to day-of-month part of uuid Multi-project commit with Idb8f190214f852ab2b58df49f9e514dc7fcbecbb Bug: 6188932 Change-Id: I67b4a0b34aa26c2804e2b3ee2136614f0ec8181a
| * | | | | am 126ed424: am 1ed017ef: Fix performance issue when there are no contacts ↵Tom Ouyang2012-05-292-12/+34
| |\ \ \ \ \ | | | |/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | in the dictionary dictionary. * commit '126ed42415a4dc3841e8981a23cbe8a22a9e2213': Fix performance issue when there are no contacts in the dictionary dictionary.
| | * | | | am 1ed017ef: Fix performance issue when there are no contacts in the ↵Tom Ouyang2012-05-292-12/+34
| | |\ \ \ \ | | | | |/ / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | dictionary dictionary. * commit '1ed017ef0e271ed3f3c212def6cc6ba95b14e780': Fix performance issue when there are no contacts in the dictionary dictionary.
| | | * | | Fix performance issue when there are no contacts in the dictionary dictionary.Tom Ouyang2012-05-292-12/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 6551480 Change-Id: I8681a1bd82423c612af2d012f9b872501d8c201d
| * | | | | am c0749033: Reconcile with jb-release nakasi-factoryrom-releaseThe Android Open Source Project2012-05-290-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | * commit 'c074903330415ce304177e9d6e062b43d337e232':
| | | \ \ \
| | | \ \ \
| | *-. \ \ \ Reconcile with jb-release nakasi-factoryrom-releaseThe Android Open Source Project2012-05-290-0/+0
| | |\ \ \ \ \ | | | | |_|_|/ | | | |/| | | | | | | | | | Change-Id: Ie760d80e44abe7a9de08f417ff107aa86b398e96
| | | | * | | merge in nakasi-factoryrom-release history after reset to jb-devThe Android Automerger2012-05-240-0/+0
| | | | |\ \ \
| | | * | \ \ \ merge in jb-release history after reset to jb-devThe Android Automerger2012-05-290-0/+0
| | | |\ \ \ \ \ | | | | |_|_|/ / | | | |/| | | |
| * | | | | | | am 408fa1ac: am 961e676b: Merge "Set level 1 as the initial value of the ↵Satoshi Kataoka2012-05-298-21/+77
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | valid words" into jb-dev * commit '408fa1ac48a3eb6f378274d5dd0e490da0f453ae': Set level 1 as the initial value of the valid words
| | * | | | | | am 961e676b: Merge "Set level 1 as the initial value of the valid words" ↵Satoshi Kataoka2012-05-298-21/+77
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into jb-dev * commit '961e676b9a6b8282b1049715523aa520d3b6a6e5': Set level 1 as the initial value of the valid words
| | | * | | | | Merge "Set level 1 as the initial value of the valid words" into jb-devSatoshi Kataoka2012-05-298-21/+77
| | | |\ \ \ \ \
| | | | * | | | | Set level 1 as the initial value of the valid wordsSatoshi Kataoka2012-05-298-21/+77
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 4192129 Change-Id: I867e78ce79c78977d08e8b66881a25b6fe5bf41f
| * | | | | | | | am 08c295c5: am 9a321180: Add unit tests for double tap shift keyTadashi G. Takaoka2012-05-292-1/+42
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '08c295c5bb8d48b26a4486ed42a32a955b39ddd3': Add unit tests for double tap shift key
| | * | | | | | | am 9a321180: Add unit tests for double tap shift keyTadashi G. Takaoka2012-05-292-1/+42
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '9a3211802baf11e5749a080e4f451ef7b795220b': Add unit tests for double tap shift key
| | | * | | | | | Add unit tests for double tap shift keyTadashi G. Takaoka2012-05-292-1/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 6568746 Change-Id: I84db31ce86e3e043ac9f9bb971663a629fa3d3c7
| * | | | | | | | am c79a7104: am 2959fc0f: Delay shift lock transient until long pressed ↵Tadashi G. Takaoka2012-05-293-76/+74
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | shift key is released * commit 'c79a710445cca2a69dca9600a2c06eadcb253b62': Delay shift lock transient until long pressed shift key is released
| | * | | | | | | am 2959fc0f: Delay shift lock transient until long pressed shift key is releasedTadashi G. Takaoka2012-05-293-76/+74
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '2959fc0f13ec29e05eda2c4a1e9a728350a80557': Delay shift lock transient until long pressed shift key is released
| | | * | | | | | Delay shift lock transient until long pressed shift key is releasedTadashi G. Takaoka2012-05-293-76/+74
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 5424586 Change-Id: Ib602af1b38b1b109bdac9cb0c53132169556db2f
| * | | | | | | | am 57da84da: am fb0a4ba8: Add unit tests for long press shift keyTadashi G. Takaoka2012-05-292-2/+49
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '57da84dac4618c0848af02509b42cf913376f382': Add unit tests for long press shift key
| | * | | | | | | am fb0a4ba8: Add unit tests for long press shift keyTadashi G. Takaoka2012-05-292-2/+49
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'fb0a4ba8fd7291e1bed0ec61bb7d2b5c8f93c1ad': Add unit tests for long press shift key
| | | * | | | | | Add unit tests for long press shift keyTadashi G. Takaoka2012-05-292-2/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 5424586 Change-Id: I8465b7e2cebb07a135e24ea33eb7b7fb6752f7a2
| * | | | | | | | am 7291fbce: am 16531ad5: Merge "More precise KeyboardState unit test" into ↵Tadashi G. Takaoka2012-05-293-39/+68
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | jb-dev * commit '7291fbce4776519f764a4a175951a9ae2a1c2a30': More precise KeyboardState unit test
| | * | | | | | | am 16531ad5: Merge "More precise KeyboardState unit test" into jb-devTadashi G. Takaoka2012-05-293-39/+68
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '16531ad52f08cffab05fb653c5bf31c48fffbc3e': More precise KeyboardState unit test
| | | * | | | | | Merge "More precise KeyboardState unit test" into jb-devTadashi G. Takaoka2012-05-293-39/+68
| | | |\ \ \ \ \ \ | | | | |/ / / / / | | | |/| | | | |
| | | | * | | | | More precise KeyboardState unit testTadashi G. Takaoka2012-05-293-39/+68
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 5424586 Change-Id: I838c82e3fe4629929cbd6e21111d139e7becab55
| * | | | | | | | am 40ab25ca: am 51705efc: Merge "Add a JNI to get the frequency" into jb-devSatoshi Kataoka2012-05-296-11/+25
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '40ab25cab0e723f34dc2f1442f414761149b2338': Add a JNI to get the frequency
| | * | | | | | | am 51705efc: Merge "Add a JNI to get the frequency" into jb-devSatoshi Kataoka2012-05-296-11/+25
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '51705efc96c1c555cf9e0f557ea8cdc1c1c97781': Add a JNI to get the frequency
| | | * | | | | | Merge "Add a JNI to get the frequency" into jb-devSatoshi Kataoka2012-05-296-11/+25
| | | |\ \ \ \ \ \
| | | | * | | | | | Add a JNI to get the frequencySatoshi Kataoka2012-05-296-11/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 4192129 Change-Id: I3f220f5a10114d4eb23956148076cf76220bda0f
| * | | | | | | | | am e3864d42: am b074dfea: Merge "Add a comment on a caveat for future ↵Jean Chalard2012-05-291-0/+5
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | reference." into jb-dev * commit 'e3864d429e699469644fa7ae867fd48e8206bd04': Add a comment on a caveat for future reference.