aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | am 10dff768: Fix NPE introduced by I38b21d49Tadashi G. Takaoka2011-11-181-8/+11
| |\| | | | | | | | |_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | * commit '10dff76856a98b6eec86a53d3d07fdc9708037b7': Fix NPE introduced by I38b21d49
| | * | | | | Fix NPE introduced by I38b21d49Tadashi G. Takaoka2011-11-171-8/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 5560766 Change-Id: Ic5eaebe0ef893c69ad90a777ebfa07807535a0e3
* | | | | | | am 18630d5f: am 15a01d72: Merge "Do not show key preview of settings and ↵Tadashi G. Takaoka2011-11-1818-25/+6
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | shortcut key" into ics-mr1 * commit '18630d5fd681ab853befe7fffb67e3db9c9ea0f1': Do not show key preview of settings and shortcut key
| * | | | | | am 15a01d72: Merge "Do not show key preview of settings and shortcut key" ↵Tadashi G. Takaoka2011-11-1818-25/+6
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into ics-mr1 * commit '15a01d72724ce7f0a9a5814443a03b907962f3fd': Do not show key preview of settings and shortcut key
| | * | | | | Merge "Do not show key preview of settings and shortcut key" into ics-mr1Tadashi G. Takaoka2011-11-1718-25/+6
| | |\ \ \ \ \
| | | * | | | | Do not show key preview of settings and shortcut keyTadashi G. Takaoka2011-11-1718-25/+6
| | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 5560766 Change-Id: I580efaf4e33f7dfbaa591e2afae9c49547bf26fb
* | | | | | | am 49cc3beb: resolved conflicts for merge of 137667ed to masterTadashi G. Takaoka2011-11-183-43/+63
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '49cc3beb75e2916037a0f8ff2d2795f306918598': Ignore microphone and settings key while typing
| * | | | | | resolved conflicts for merge of 137667ed to masterTadashi G. Takaoka2011-11-183-43/+63
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I75fc5d278b002ab89dd2475d282d0ee4aede7817
| | * | | | | Merge "Ignore microphone and settings key while typing" into ics-mr1Tadashi G. Takaoka2011-11-173-43/+63
| | |\ \ \ \ \
| | | * | | | | Ignore microphone and settings key while typingTadashi G. Takaoka2011-11-173-43/+63
| | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 5560766 Change-Id: I38b21d49b7e803bf94805ba8e13849b3c734e010
* | | | | | | am a41fddc6: am 1fcdcc92: (-s ours) Merge "Skip loading keyboard when ↵Tadashi G. Takaoka2011-11-180-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | SoftInputWindow hasn\'t shown yet. (DO NOT MERGE)" into ics-mr1 * commit 'a41fddc67668ab85c83dbed40602d2b2a5bd47e5': Skip loading keyboard when SoftInputWindow hasn't shown yet. (DO NOT MERGE)
| * | | | | | am 1fcdcc92: (-s ours) Merge "Skip loading keyboard when SoftInputWindow ↵Tadashi G. Takaoka2011-11-180-0/+0
| |\| | | | | | | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | hasn\'t shown yet. (DO NOT MERGE)" into ics-mr1 * commit '1fcdcc928ba21a7a1a4d3a64c1d1f8fa399099ff': Skip loading keyboard when SoftInputWindow hasn't shown yet. (DO NOT MERGE)
| | * | | | Merge "Skip loading keyboard when SoftInputWindow hasn't shown yet. (DO NOT ↵Tadashi G. Takaoka2011-11-171-2/+6
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | MERGE)" into ics-mr1
| | | * | | | Skip loading keyboard when SoftInputWindow hasn't shown yet. (DO NOT MERGE)Tadashi G. Takaoka2011-11-171-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is cherry-pick of I003101b2 from Master for Bug: 5541192 Bug: 5636367 Change-Id: I560126d17be6a770b19c1f1347332ebdfde5d671
* | | | | | | am 7800a313: am b70841f3: am 4c1dfc62: Fix a critical underflow in the touch ↵satok2011-11-170-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | calibration. This is a cherry-pick of Iacc746e1cc97bf3 Bug: 5629373 Change-Id: Ia198fe5e82b9e7fb801d9bae65cf9c6bbbd1befa * commit '7800a313f10ebeba32864d66edd55e6a5db80114': Fix a critical underflow in the touch calibration. This is a cherry-pick of Iacc746e1cc97bf3 Bug: 5629373 Change-Id: Ia198fe5e82b9e7fb801d9bae65cf9c6bbbd1befa
| * | | | | | am b70841f3: am 4c1dfc62: Fix a critical underflow in the touch calibration. ↵satok2011-11-170-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a cherry-pick of Iacc746e1cc97bf3 Bug: 5629373 Change-Id: Ia198fe5e82b9e7fb801d9bae65cf9c6bbbd1befa * commit 'b70841f371e48731732044924b87cd824e327297': Fix a critical underflow in the touch calibration. This is a cherry-pick of Iacc746e1cc97bf3 Bug: 5629373 Change-Id: Ia198fe5e82b9e7fb801d9bae65cf9c6bbbd1befa
| | * | | | | am 4c1dfc62: Fix a critical underflow in the touch calibration. This is a ↵satok2011-11-170-0/+0
| | |\ \ \ \ \ | | | |/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cherry-pick of Iacc746e1cc97bf3 Bug: 5629373 Change-Id: Ia198fe5e82b9e7fb801d9bae65cf9c6bbbd1befa * commit '4c1dfc62c8d59c7503d3635c96a4c1582f9d9e8a': Fix a critical underflow in the touch calibration. This is a cherry-pick of Iacc746e1cc97bf3 Bug: 5629373 Change-Id: Ia198fe5e82b9e7fb801d9bae65cf9c6bbbd1befa
| | | * | | | Fix a critical underflow in the touch calibration. This is a cherry-pick of ↵satok2011-11-171-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Iacc746e1cc97bf3 Bug: 5629373 Change-Id: Ia198fe5e82b9e7fb801d9bae65cf9c6bbbd1befa
* | | | | | | am 66054717: am 875c16ad: (-s ours) Merge "Fix long press caps lock handling ↵Tadashi G. Takaoka2011-11-170-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (DO NOT MERGE)" into ics-mr1 * commit '660547172e46aa2fa59b22baee13dbddc0c84686': Fix long press caps lock handling (DO NOT MERGE)
| * | | | | | am 875c16ad: (-s ours) Merge "Fix long press caps lock handling (DO NOT ↵Tadashi G. Takaoka2011-11-170-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MERGE)" into ics-mr1 * commit '875c16adc3a42b156cc9f215fd6fbaa4e959a905': Fix long press caps lock handling (DO NOT MERGE)
| | * | | | | Merge "Fix long press caps lock handling (DO NOT MERGE)" into ics-mr1Tadashi G. Takaoka2011-11-174-7/+36
| | |\ \ \ \ \ | | | |_|/ / / | | |/| | | |
| | | * | | | Fix long press caps lock handling (DO NOT MERGE)Tadashi G. Takaoka2011-11-164-7/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is cherry-pick of I3850f283. Bug: 5627467 Change-Id: If46dcbe5bac42b975bd001fefb9f11520a0abb70
* | | | | | | am 0a663971: am 620b1faf: Merge "Fix the touch calibration bug" into ics-mr1satok2011-11-171-0/+3
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '0a66397106e57165ec8e27a6f868d275da9f3138': Fix the touch calibration bug
| * | | | | | am 620b1faf: Merge "Fix the touch calibration bug" into ics-mr1satok2011-11-171-0/+3
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '620b1faf126d4b5f7cb5c353cebd374d1347fdd4': Fix the touch calibration bug
| | * | | | | Merge "Fix the touch calibration bug" into ics-mr1satok2011-11-161-0/+3
| | |\ \ \ \ \
| | | * | | | | Fix the touch calibration bugsatok2011-11-171-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 5629373 Change-Id: Iacc746e1cc97bf305e1f287cf7431b7115607eeb
* | | | | | | | am ac4bd598: Merge "Fix long press caps lock handling"Tadashi G. Takaoka2011-11-174-6/+35
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'ac4bd598645ff0f12a59e225122ba5fc87e91e8c': Fix long press caps lock handling
| * | | | | | | Merge "Fix long press caps lock handling"Tadashi G. Takaoka2011-11-174-6/+35
| |\ \ \ \ \ \ \
| | * | | | | | | Fix long press caps lock handlingTadashi G. Takaoka2011-11-164-6/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 5627467 Change-Id: I3850f283d44da81ecb22fc4e6d8aa574f5fcf65f
* | | | | | | | | am 245a4d93: am d845c26b: Merge "Fix IndexOutOfBoundsException in monkey ↵Tadashi G. Takaoka2011-11-171-9/+12
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | test" into ics-mr1 * commit '245a4d930430abcc1a9ad4345ccea13c1ac697f2': Fix IndexOutOfBoundsException in monkey test
| * | | | | | | | am d845c26b: Merge "Fix IndexOutOfBoundsException in monkey test" into ics-mr1Tadashi G. Takaoka2011-11-171-9/+12
| |\ \ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | * commit 'd845c26b0e72e67aa14b5eac4616eb5ee7d81b33': Fix IndexOutOfBoundsException in monkey test
| | * | | | | | | Merge "Fix IndexOutOfBoundsException in monkey test" into ics-mr1Tadashi G. Takaoka2011-11-161-9/+12
| | |\ \ \ \ \ \ \
| | | * | | | | | | Fix IndexOutOfBoundsException in monkey testTadashi G. Takaoka2011-11-161-9/+12
| | | | |_|/ / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 5627027 Change-Id: I341cfa5c3d553a1c819d8455936b40a40ad30e87
* | | | | | | | | am e9984de1: am 6644ea82: (-s ours) Merge "Import revised translations. DO ↵Eric Fischer2011-11-170-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | NOT MERGE" into ics-mr1 * commit 'e9984de149a486ec722c4dae83bf67c0979abeff': Import revised translations. DO NOT MERGE
| * | | | | | | | am 6644ea82: (-s ours) Merge "Import revised translations. DO NOT MERGE" ↵Eric Fischer2011-11-170-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into ics-mr1 * commit '6644ea82970da35897b40ef524406b1e3b0d0a9d': Import revised translations. DO NOT MERGE
| | * | | | | | | Merge "Import revised translations. DO NOT MERGE" into ics-mr1Eric Fischer2011-11-163-5/+5
| | |\ \ \ \ \ \ \
| | | * | | | | | | Import revised translations. DO NOT MERGEEric Fischer2011-11-163-5/+5
| | | | |_|/ / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | Change-Id: I9e72643726caf00d8e1acd98d9843576c15f39be
* | | | | | | | | am 6e8f277a: am 0993a89b: am 1c0f94c5: Reconcile with ics-factoryrom-2-releaseThe Android Open Source Project2011-11-170-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '6e8f277aab617b849c49f39e8496f9bb34f5ec4a':
| * | | | | | | | am 0993a89b: am 1c0f94c5: Reconcile with ics-factoryrom-2-releaseThe Android Open Source Project2011-11-170-0/+0
| |\| | | | | | | | | |_|_|/ / / / | |/| | | | | | | | | | | | | | * commit '0993a89b31eea938b72b925d078f5c68322885f8':
| | * | | | | | am 1c0f94c5: Reconcile with ics-factoryrom-2-releaseThe Android Open Source Project2011-11-160-0/+0
| | |\ \ \ \ \ \ | | | |_|/ / / / | | |/| | / / / | | | | |/ / / | | | |/| | | * commit '1c0f94c5916921ee861933e080d7b0f711b019e1':
| | | * | | | Reconcile with ics-factoryrom-2-releaseThe Android Open Source Project2011-11-160-0/+0
| | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ie0c40f94cf560dbe14a334d2e177e4e4a9d32eb7
* | | | | | | | am 9b4d3cb3: am 25cbe892: Reconcile with ics-factoryrom-2-releaseThe Android Open Source Project2011-11-160-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '9b4d3cb3a47bcad973165fdd888306b3c80c66b0': Fix a bug that would end up in memory corruption
| * | | | | | | am 25cbe892: Reconcile with ics-factoryrom-2-releaseThe Android Open Source Project2011-11-160-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '25cbe8924a7ec5c45914c8818b5ad7b39e1f6103': Fix a bug that would end up in memory corruption
| | * | | | | | Reconcile with ics-factoryrom-2-releaseThe Android Open Source Project2011-11-160-0/+0
| | |\ \ \ \ \ \ | | | | |/ / / / | | | |/| | / / | | | |_|_|/ / | | |/| | | | Change-Id: I9bf189bb9a5349fe01657e1981f075370d6ed4e7
| | | * | | | Fix a bug that would end up in memory corruptionJean Chalard2011-11-101-6/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Square distances array was not the right size. Copying long words into it would result in fandango on core. Bug: 5508337 Bug: 5591925 Change-Id: I7598081b3cfcd1975b206dada1baf8da9be35641
* | | | | | | am eb520c56: am 549e295d: Fix updateFullscreenMode of LatinIMETadashi G. Takaoka2011-11-151-3/+3
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'eb520c568365d690da4347c787a8c44708b52e50': Fix updateFullscreenMode of LatinIME
| * | | | | | am 549e295d: Fix updateFullscreenMode of LatinIMETadashi G. Takaoka2011-11-151-3/+3
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '549e295dc113bff50077c3c355dcd94af09a1b2f': Fix updateFullscreenMode of LatinIME
| | * | | | | Fix updateFullscreenMode of LatinIMETadashi G. Takaoka2011-11-151-3/+3
| | | |_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | Bug: 5597608 Change-Id: If4b18dc933493bd74bc5506c028af86b0450df1f
* | | | | | am ed631627: Double space conversion should be enabled only when the 1st ↵Ken Wakasa2011-11-151-1/+8
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | space is "weak". * commit 'ed631627cb2337b025f0e80df6fecf1e6e511dc4': Double space conversion should be enabled only when the 1st space is "weak".
| * | | | | Double space conversion should be enabled only when the 1st space is "weak".Ken Wakasa2011-11-151-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug: 5608934 Change-Id: Ide7ca9d526620c4f225a6f5eb27dcd7df5b504bd