aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* am 891e4860: Merge "Stop overriding SuggestionStripView.dispatchTouchEvent"Tadashi G. Takaoka2014-02-171-24/+23
|\ | | | | | | | | * commit '891e4860f838d3dbe139542d4a1172b3de7a5225': Stop overriding SuggestionStripView.dispatchTouchEvent
| * Merge "Stop overriding SuggestionStripView.dispatchTouchEvent"Tadashi G. Takaoka2014-02-171-24/+23
| |\
| | * Stop overriding SuggestionStripView.dispatchTouchEventTadashi G. Takaoka2014-02-171-24/+23
| | | | | | | | | | | | | | | | | | Bug: 11721001 Bug: 11976254 Change-Id: Idfdeafe45abb16ca54be529b4f4b2c38c22a7fac
* | | am 1751615f: Merge "Remove unnecessary override of ↵Tadashi G. Takaoka2014-02-172-21/+0
|\| | | | | | | | | | | | | | | | | | | | MainKeyboardView.dispatchTouchEvent" * commit '1751615f7d6702c6f3438a402e0ce179aafd15cf': Remove unnecessary override of MainKeyboardView.dispatchTouchEvent
| * | Merge "Remove unnecessary override of MainKeyboardView.dispatchTouchEvent"Tadashi G. Takaoka2014-02-172-21/+0
| |\ \
| | * | Remove unnecessary override of MainKeyboardView.dispatchTouchEventTadashi G. Takaoka2014-02-172-21/+0
| | | | | | | | | | | | | | | | | | | | | | | | Bug: 11721001 Bug: 11976254 Change-Id: I762bd9e76ea31d67b3e31c3a0a19ee9f040015b8
* | | | am 3dd6bdf9: Merge "Add InputMethodSubtypeCompatUtils.isAsciiCapable()"Tadashi G. Takaoka2014-02-173-6/+20
|\| | | | | | | | | | | | | | | | | | | * commit '3dd6bdf9312007ed43827975d121e972b98ab5e3': Add InputMethodSubtypeCompatUtils.isAsciiCapable()
| * | | Merge "Add InputMethodSubtypeCompatUtils.isAsciiCapable()"Tadashi G. Takaoka2014-02-173-6/+20
| |\ \ \ | | |/ / | |/| |
| | * | Add InputMethodSubtypeCompatUtils.isAsciiCapable()Tadashi G. Takaoka2014-02-173-6/+20
| | |/ | | | | | | | | | Change-Id: I8145f090486f6fe30ef1e992db374cfba0c31012
* | | am 4c628b9d: Merge "Don\'t show important notice on password field"Tadashi G. Takaoka2014-02-174-12/+27
|\| | | | | | | | | | | | | | * commit '4c628b9d5b05045e9bbe5be7327e28aee2309e1d': Don't show important notice on password field
| * | Merge "Don't show important notice on password field"Tadashi G. Takaoka2014-02-174-12/+27
| |\ \
| | * | Don't show important notice on password fieldTadashi G. Takaoka2014-02-174-12/+27
| | | | | | | | | | | | | | | | | | | | Bug: 10587358 Change-Id: Ieff7960e5e2b8609fddeb173af578a5d9b2c4d98
* | | | am 48814037: Merge "Stop using deprecated InputMethodSubtype constructor"Yohei Yukawa2014-02-161-11/+20
|\| | | | | | | | | | | | | | | | | | | * commit '48814037484663faa0d2820b21baf9c3a1bf6bbf': Stop using deprecated InputMethodSubtype constructor
| * | | Merge "Stop using deprecated InputMethodSubtype constructor"Yohei Yukawa2014-02-171-11/+20
| |\ \ \ | | |_|/ | |/| |
| | * | Stop using deprecated InputMethodSubtype constructorYohei Yukawa2014-02-171-11/+20
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The constructors of InputMethodSubtype were deprecated in API level 19. However we cannot yet switch to a new InputMethodSubtypeBuilder style due to our minimum support API level. As an intermediate solution, this patch replaces the these API calls with InputMethodSubtypeCompatUtils.newInputMethodSubtype so that these legacy API call can be consolidated at the same place. BUG: 13030512 Change-Id: I561a585f5dbea56c337680b645be5ef07015a0b1
* | | am 4f4fb5ef: Merge "Use the same label of switch-to-alphabet key on Emoji ↵Tadashi G. Takaoka2014-02-164-26/+50
|\| | | | | | | | | | | | | | | | | | | | palette" * commit '4f4fb5ef345bebfed2c2d3fee5527a5f6b25a342': Use the same label of switch-to-alphabet key on Emoji palette
| * | Merge "Use the same label of switch-to-alphabet key on Emoji palette"Tadashi G. Takaoka2014-02-174-26/+50
| |\ \
| | * | Use the same label of switch-to-alphabet key on Emoji paletteTadashi G. Takaoka2014-02-174-26/+50
| | | | | | | | | | | | | | | | | | | | Bug: 12115967 Change-Id: I61cf80db933aa2ab220ddcaa88a4c9af7beeb35c
* | | | am 4c680e7b: Merge "Add go to "Settings" button to important notice dialog"Tadashi G. Takaoka2014-02-16127-76/+74
|\| | | | | | | | | | | | | | | | | | | * commit '4c680e7bcfe7737302f9900aea3f1d11f5e60b21': Add go to "Settings" button to important notice dialog
| * | | Merge "Add go to "Settings" button to important notice dialog"Tadashi G. Takaoka2014-02-17127-76/+74
| |\ \ \
| | * | | Add go to "Settings" button to important notice dialogTadashi G. Takaoka2014-02-17127-76/+74
| | | |/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This CL also - removes icons on important notice title. - changes the "Personalized suggestions" summary text. This change must be checked in together with Id115d89ba9. Bug: 10587358 Change-Id: I52ff26fa8ae12445e9014ba08253f69e1be609f4
* | | | am b092aef4: Merge "Remove key show up and dismiss animation"Tadashi G. Takaoka2014-02-166-4/+10
|\| | | | | | | | | | | | | | | | | | | * commit 'b092aef4a7034f5a4a50f0e50bf3b4ebb4e2a86c': Remove key show up and dismiss animation
| * | | Merge "Remove key show up and dismiss animation"Tadashi G. Takaoka2014-02-176-4/+10
| |\ \ \
| | * | | Remove key show up and dismiss animationTadashi G. Takaoka2014-02-176-4/+10
| | |/ / | | | | | | | | | | | | | | | | Bug: 11518021 Change-Id: I4a5eb0732f399612141f7c22d83e2210da612d7e
* | | | am ffde401b: Fix PC/QWERTY phone layoutTadashi G. Takaoka2014-02-161-0/+1
|\| | | | | | | | | | | | | | | | | | | * commit 'ffde401b656ba801b4187eeb61e41e0a00884a18': Fix PC/QWERTY phone layout
| * | | Fix PC/QWERTY phone layoutTadashi G. Takaoka2014-02-171-0/+1
| |/ / | | | | | | | | | | | | Bug: 13025426 Change-Id: I980832ccab7fb7700ca8b01d4f05e920b3f45582
* | | am 95d16561: Remove unused code.Keisuke Kuroyanagi2014-02-1512-593/+99
|\| | | | | | | | | | | | | | * commit '95d16561e0e6c38dbd99c893f09c5dbe9d4a465d': Remove unused code.
| * | Remove unused code.Keisuke Kuroyanagi2014-02-1512-593/+99
| | | | | | | | | | | | | | | Bug: 12810574 Change-Id: I9c7fff60ae0e94d52f3bd19c3e88de5a53b917d7
* | | am 0fc93fe4: Implement PatriciaTriePolicy::getNextWordAndNextToken().Keisuke Kuroyanagi2014-02-157-39/+212
|\| | | | | | | | | | | | | | * commit '0fc93fe4455f24809f6c9baf0d3b936519779cfb': Implement PatriciaTriePolicy::getNextWordAndNextToken().
| * | Implement PatriciaTriePolicy::getNextWordAndNextToken().Keisuke Kuroyanagi2014-02-157-39/+212
| | | | | | | | | | | | | | | Bug: 12810574 Change-Id: Id1d44f90de9455d9cbe7b6e0a161cae91d6d422c
* | | am 85fe06e7: Merge "Remove unused argument from readDictionaryBinary."Keisuke Kuroyanagi2014-02-149-50/+20
|\| | | | | | | | | | | | | | * commit '85fe06e759ab89c629caab5fb73de7ff0441d060': Remove unused argument from readDictionaryBinary.
| * | Merge "Remove unused argument from readDictionaryBinary."Keisuke Kuroyanagi2014-02-149-50/+20
| |\ \
| | * | Remove unused argument from readDictionaryBinary.Keisuke Kuroyanagi2014-02-149-50/+20
| | | | | | | | | | | | | | | | | | | | Bug: 12810574 Change-Id: Ice415ebd8d11162facca3fe8927ef8a616b11424
* | | | am 36d606fc: Use 16sp text to show important notice titleTadashi G. Takaoka2014-02-141-1/+1
|\| | | | | | | | | | | | | | | | | | | * commit '36d606fcbc666c331ffaba02fe6b55afa4509348': Use 16sp text to show important notice title
| * | | Use 16sp text to show important notice titleTadashi G. Takaoka2014-02-141-1/+1
| | |/ | |/| | | | | | | | | | Bug: 10587358 Change-Id: Ib840cb71d9e87282ea0d13839dbf2a2da2081d5f
* | | am b136b7dd: Merge "Add sanity check to KeybaordTextsTable for debugging"Tadashi G. Takaoka2014-02-143-16/+46
|\| | | | | | | | | | | | | | * commit 'b136b7dd6f0757e3988639b0794c04d50b4087da': Add sanity check to KeybaordTextsTable for debugging
| * | Merge "Add sanity check to KeybaordTextsTable for debugging"Tadashi G. Takaoka2014-02-143-16/+46
| |\ \
| | * | Add sanity check to KeybaordTextsTable for debuggingTadashi G. Takaoka2014-02-143-16/+46
| | | | | | | | | | | | | | | | | | | | Bug: 13007104 Change-Id: Id12f75da7a1c6a2a078d41721ee4016794e9dd2a
* | | | am fdc41732: Merge "Fix a view-related crash"Jean Chalard2014-02-142-5/+14
|\| | | | | | | | | | | | | | | | | | | * commit 'fdc417321345037fdcf31de95fbaf7cc195856b3': Fix a view-related crash
| * | | Merge "Fix a view-related crash"Jean Chalard2014-02-142-5/+14
| |\ \ \
| | * | | Fix a view-related crashJean Chalard2014-02-142-5/+14
| | | | | | | | | | | | | | | | | | | | | | | | | Bug: 12788164 Change-Id: If0d815518824a8e57b15e80111c5e6e08e93ba7e
* | | | | am 8fa7a09f: Merge "Implement PatriciaTriePolicy::getWordProperty()."Keisuke Kuroyanagi2014-02-143-4/+97
|\| | | | | | | | | | | | | | | | | | | | | | | | * commit '8fa7a09f1e7cd16a4fa1e4138078bd3984519630': Implement PatriciaTriePolicy::getWordProperty().
| * | | | Merge "Implement PatriciaTriePolicy::getWordProperty()."Keisuke Kuroyanagi2014-02-143-4/+97
| |\ \ \ \ | | | |_|/ | | |/| |
| | * | | Implement PatriciaTriePolicy::getWordProperty().Keisuke Kuroyanagi2014-02-143-4/+97
| | | | | | | | | | | | | | | | | | | | | | | | | Bug: 12810574 Change-Id: I7bcccfd3641ebbcf2b8d857d33bb4734c42af5eb
* | | | | am 954ba244: Merge "Fix SpacingAndPunctuationsTests due to I2219224840"Tadashi G. Takaoka2014-02-141-12/+28
|\| | | | | | | | | | | | | | | | | | | | | | | | * commit '954ba2445ffdbf6cca58ea0da4b4580d905dcd59': Fix SpacingAndPunctuationsTests due to I2219224840
| * | | | Merge "Fix SpacingAndPunctuationsTests due to I2219224840"Tadashi G. Takaoka2014-02-141-12/+28
| |\ \ \ \ | | |_|_|/ | |/| | |
| | * | | Fix SpacingAndPunctuationsTests due to I2219224840Tadashi G. Takaoka2014-02-141-12/+28
| | | | | | | | | | | | | | | | | | | | | | | | | Bug: 12640318 Change-Id: If0b0696b937c580d69cb909ddaf414d01ea2c01b
* | | | | am 3c4f05dd: Remove unused label_tab_keyTadashi G. Takaoka2014-02-142-30/+25
|\| | | | | | | | | | | | | | | | | | | | | | | | * commit '3c4f05dd66f8211508010e82b414d111037f35dd': Remove unused label_tab_key
| * | | | Remove unused label_tab_keyTadashi G. Takaoka2014-02-142-30/+25
| |/ / / | | | | | | | | | | | | Change-Id: Ic10b9678c9b0ebab977589aa0093740b9c9f2d90
* | | | am e422c946: Fix test resource declarations and parsing a bitTadashi G. Takaoka2014-02-1310-35/+20
|\| | | | | | | | | | | | | | | | | | | * commit 'e422c94634da4d0e61a9106addebf06cbcf70c2e': Fix test resource declarations and parsing a bit