aboutsummaryrefslogtreecommitdiffstats
path: root/java (follow)
Commit message (Collapse)AuthorAgeFilesLines
* am 266c8c5b: Merge "Some cosmetic fixes in LatinIME.java"Ken Wakasa2014-02-171-40/+38
|\ | | | | | | | | * commit '266c8c5b1dbccbc4252fb79f042a4a5660c62763': Some cosmetic fixes in LatinIME.java
| * Merge "Some cosmetic fixes in LatinIME.java"Ken Wakasa2014-02-181-40/+38
| |\
| | * Some cosmetic fixes in LatinIME.javaKen Wakasa2014-02-181-40/+38
| | | | | | | | | | | | Change-Id: Ia2d04ab992f5a0cc736150b2691b2f8ae8f0955d
* | | am db21fad1: Merge "Avoid crashing when the Content URL is not found."Jean Chalard2014-02-171-0/+10
|\| | | | | | | | | | | | | | * commit 'db21fad18f70eb4abaf60a8c0ae7f285682acf20': Avoid crashing when the Content URL is not found.
| * | Merge "Avoid crashing when the Content URL is not found."Jean Chalard2014-02-181-0/+10
| |\ \ | | |/ | |/|
| | * Avoid crashing when the Content URL is not found.Jean Chalard2014-02-181-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | I'm not sure when this can happen, but it seems it does at least on older versions of the platform. Let's avoid crashing. Bug: 11618402 Change-Id: If730b5bd8f20e0f60b884eab5900099116afc5f0
| * | Merge "Import translations. DO NOT MERGE"Baligh Uddin2014-02-1857-663/+453
| |\ \ | | |/ | |/|
| | * Import translations. DO NOT MERGEBaligh Uddin2014-02-1757-663/+453
| | | | | | | | | | | | | | | Change-Id: I2025fbb4b811c98f520ec048e4df4973da651709 Auto-generated-cl: translation import
* | | Merge "Import translations. DO NOT MERGE" into jb-ub-latinimegoogleBaligh Uddin2014-02-1857-663/+453
|\ \ \
| * | | Import translations. DO NOT MERGEBaligh Uddin2014-02-1757-663/+453
| | | | | | | | | | | | | | | | | | | | Change-Id: I7d2af0a3e69dd9f20369163141e9c71c8c6505e9 Auto-generated-cl: translation import
* | | | am 0d32643e: Merge "Cosmetic fixes"Ken Wakasa2014-02-171-23/+30
|\ \ \ \ | | |/ / | |/| | | | | | | | | | * commit '0d32643e69dd75ba55ccca3c08d1478afb395125': Cosmetic fixes
| * | | Merge "Cosmetic fixes"Ken Wakasa2014-02-181-23/+30
| |\ \ \
| | * | | Cosmetic fixesKen Wakasa2014-02-181-23/+30
| | | | | | | | | | | | | | | | | | | | Change-Id: I6c755565ba7689357d02d26cc0e92a93031953e8
* | | | | am cc05f468: Merge "Refactor InputAttributes a bit"Tadashi G. Takaoka2014-02-171-117/+155
|\| | | | | | | | | | | | | | | | | | | | | | | | * commit 'cc05f468ca2599e6efd7517f5f946152ed2ad3b7': Refactor InputAttributes a bit
| * | | | Merge "Refactor InputAttributes a bit"Tadashi G. Takaoka2014-02-181-117/+155
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Refactor InputAttributes a bitTadashi G. Takaoka2014-02-181-117/+155
| | | |/ | | |/| | | | | | | | | Change-Id: I43d65be6de64ba86f83e8528a138e20c4fa1e3ed
* | | | am affdd364: Set neutral suggestions should be called after load settingsTadashi G. Takaoka2014-02-173-41/+51
|\| | | | |_|/ |/| | | | | | | | * commit 'affdd364232549d2062fc180f924f5b6496c26fd': Set neutral suggestions should be called after load settings
| * | Set neutral suggestions should be called after load settingsTadashi G. Takaoka2014-02-183-41/+51
| |/ | | | | | | | | Bug: 13058751 Change-Id: Iba49e86b90d595473d91753827d499e551dad45c
* | am f0f4e9fc: Update important notice version even when user select SettingsTadashi G. Takaoka2014-02-171-1/+1
|\| | | | | | | | | * commit 'f0f4e9fc16f669f4499fb9de42362d8d52862ae2': Update important notice version even when user select Settings
| * Update important notice version even when user select SettingsTadashi G. Takaoka2014-02-181-1/+1
| | | | | | | | | | Bug: 13060852 Change-Id: I463fdf3d51cacf99693fcde2998ea751046d1cc5
* | am 782c9fee: Merge "Don\'t resume suggestion on links."Jean Chalard2014-02-174-3/+26
|\| | | | | | | | | * commit '782c9fee6bcb32d67c8ee9faa7e5c9dfb091afd3': Don't resume suggestion on links.
| * Merge "Don't resume suggestion on links."Jean Chalard2014-02-174-3/+26
| |\
| | * Don't resume suggestion on links.Jean Chalard2014-02-174-3/+26
| | | | | | | | | | | | | | | Bug: 11447084 Change-Id: I5bd558b9dd85d1505aa918f44e8ac3e52ec42d97
* | | am d91cd991: Merge "Catch exceptions we can\'t do anything about."Jean Chalard2014-02-174-44/+118
|\| | | | | | | | | | | | | | * commit 'd91cd9919e309e72f912f5cb135792351d7081ac': Catch exceptions we can't do anything about.
| * | Merge "Catch exceptions we can't do anything about."Jean Chalard2014-02-174-44/+118
| |\ \
| | * | Catch exceptions we can't do anything about.Jean Chalard2014-02-174-44/+118
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This also abstracts away the "package deactivated" case for simpler and safer code. Bug: 11072561 Change-Id: Idaaf2ae8d8d5b2c4a15de641bbf2f8c5c7cc9410
* | | | am da0edf86: Merge "Stop overriding InputView.dispatchTouchEvent"Tadashi G. Takaoka2014-02-171-56/+63
|\| | | | | | | | | | | | | | | | | | | * commit 'da0edf86c412194483ac84b9a0961573f8377583': Stop overriding InputView.dispatchTouchEvent
| * | | Merge "Stop overriding InputView.dispatchTouchEvent"Tadashi G. Takaoka2014-02-171-56/+63
| |\ \ \ | | |_|/ | |/| |
| | * | Stop overriding InputView.dispatchTouchEventTadashi G. Takaoka2014-02-171-56/+63
| | | | | | | | | | | | | | | | | | | | | | | | Bug: 11721001 Bug: 11976254 Change-Id: I950f13ec4084da7fd9c1c25fd7abed1e5d31ed4c
* | | | am 1e9897b0: Merge "Consider non-breaking spaces separators."Jean Chalard2014-02-174-4/+4
|\| | | | | | | | | | | | | | | | | | | * commit '1e9897b0c77b858ae479d531732b6795aaf0b2de': Consider non-breaking spaces separators.
| * | | Merge "Consider non-breaking spaces separators."Jean Chalard2014-02-174-4/+4
| |\ \ \ | | |/ / | |/| |
| | * | Consider non-breaking spaces separators.Jean Chalard2014-02-174-4/+4
| | |/ | | | | | | | | | | | | Bug: 13056209 Change-Id: I6100b3ee21cf143140398757d9f7e7445067877a
* | | 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 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