aboutsummaryrefslogtreecommitdiffstats
path: root/java (follow)
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | Merge "Revert "Revert "[ML1] Introduce RichInputMethodSubtype"""Jean Chalard2014-08-2514-112/+202
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | Revert "Revert "[ML1] Introduce RichInputMethodSubtype""Jean Chalard2014-08-2514-112/+202
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit a63d0a8ee6cb05bcddb69bf9a6018853d89d886a. This patch seems to be fine after all, but was submitted without its companion [ML1.1] patch causing a build breakage. Reverting the revert and submitting both at the same time seems like the right thing to do. Change-Id: Ib8fefa40b74dcee0edb025a52dac9b35c82d49df
| * | | | Merge "Import translations. DO NOT MERGE"Baligh Uddin2014-08-222-32/+32
| |\ \ \ \
| | * | | | Import translations. DO NOT MERGEBaligh Uddin2014-08-182-32/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I0b7fb1fc18139ff80343703ab7a6caa2166fa519 Auto-generated-cl: translation import
| * | | | | Merge "Import translations. DO NOT MERGE"Baligh Uddin2014-08-222-38/+38
| |\ \ \ \ \
| | * | | | | Import translations. DO NOT MERGEBaligh Uddin2014-08-182-38/+38
| | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ieef69130fa6f1f9c9f95a8f308175fbec470af86 Auto-generated-cl: translation import
| * | | | | Merge "Import translations. DO NOT MERGE"Baligh Uddin2014-08-221-1/+1
| |\ \ \ \ \
| | * | | | | Import translations. DO NOT MERGEBaligh Uddin2014-08-181-1/+1
| | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Iacc87d9f13f21de7584cd5028527ec59c7c12802 Auto-generated-cl: translation import
| * | | | | Merge "Import translations. DO NOT MERGE"Baligh Uddin2014-08-2258-133/+76
| |\ \ \ \ \
| | * | | | | Import translations. DO NOT MERGEBaligh Uddin2014-08-1858-133/+76
| | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I9d51675746cc1b3987f2c7a2469a3deced820e69 Auto-generated-cl: translation import
| * | | | | Merge "Import translations. DO NOT MERGE"Baligh Uddin2014-08-221-1/+1
| |\ \ \ \ \
| | * | | | | Import translations. DO NOT MERGEBaligh Uddin2014-08-181-1/+1
| | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I3cae3b62faf27fea8cc7c24051ac18f415934399 Auto-generated-cl: translation import
* | | | | | Merge "Import translations. DO NOT MERGE" into jb-ub-latinimegoogleBaligh Uddin2014-08-2242-93/+51
|\ \ \ \ \ \
| * | | | | | Import translations. DO NOT MERGEBaligh Uddin2014-08-1842-93/+51
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I454789b30f68eec6bb26550cd1aeae3d9195a20a Auto-generated-cl: translation import
* | | | | | | am 56087650: am cc4d21df: am 2637be27: Support Accept typed word UITadashi G. Takaoka2014-08-225-72/+157
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | * commit '560876508f7ad9ea618697268a8e8cb70ddf5e82': Support Accept typed word UI
| * | | | | | am cc4d21df: am 2637be27: Support Accept typed word UITadashi G. Takaoka2014-08-225-72/+157
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | / | | |_|_|_|/ | |/| | | | * commit 'cc4d21df7b08c3143dd1c4af786609a279a0bb79': Support Accept typed word UI
| | * | | | Support Accept typed word UITadashi G. Takaoka2014-08-225-72/+157
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I58e95b2791a45afdc7dae8e26dcfc200b3b4b854
* | | | | | am 6c638d1b: Merge "Revert "[ML1] Introduce RichInputMethodSubtype""Jean Chalard2014-08-2214-202/+112
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '6c638d1bbdd4b1b8d49531ef41d337bd3ccbec32': Revert "[ML1] Introduce RichInputMethodSubtype"
| * | | | | Merge "Revert "[ML1] Introduce RichInputMethodSubtype""Jean Chalard2014-08-2214-202/+112
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |
| | * | | | Revert "[ML1] Introduce RichInputMethodSubtype"Jean Chalard2014-08-2214-202/+112
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 8ffe4bc9321e582a4d882f21e465d5886616f489. Change-Id: I9d4c98b0adfdb78b0f4d376f7691e50d1bd2228f
* | | | | | am eb99b461: am 96db9222: am cabb66e9: follow-up to API change in ↵Yohei Yukawa2014-08-222-100/+20
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I4a577bfd02b37b * commit 'eb99b461f03a48317598289ab12ea30a617c537c': follow-up to API change in I4a577bfd02b37b
| * | | | | am 96db9222: am cabb66e9: follow-up to API change in I4a577bfd02b37bYohei Yukawa2014-08-222-100/+20
| |\ \ \ \ \ | | | |/ / / | | |/| | | | | | | | | | | | | | | * commit '96db9222c2c8c728498751221cc92664676dd4f0': follow-up to API change in I4a577bfd02b37b
| | * | | | follow-up to API change in I4a577bfd02b37bYohei Yukawa2014-08-212-100/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BUG: 17182367 BUG: 17185263 Change-Id: Id54ca29c191b9752fa82ffe5a960113b2e97e5c1
* | | | | | am e2ebd5d6: Merge "Add ExpandableBinaryDictionary#getDictionaryStats()."Keisuke Kuroyanagi2014-08-222-0/+46
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'e2ebd5d6211d9eecfc6a18505a5041f3c374bab7': Add ExpandableBinaryDictionary#getDictionaryStats().
| * | | | | Merge "Add ExpandableBinaryDictionary#getDictionaryStats()."Keisuke Kuroyanagi2014-08-222-0/+46
| |\ \ \ \ \
| | * | | | | Add ExpandableBinaryDictionary#getDictionaryStats().Keisuke Kuroyanagi2014-08-222-0/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 16553957 Change-Id: I05866624d0ba9f32ea7a71cb231ba501dde4376c
* | | | | | | am 395d7787: Merge "Revert "[HW17] Straighten the dead char implementation.""Jean Chalard2014-08-223-248/+24
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '395d7787396d80dd56934d0f4f85062b1a391e02': Revert "[HW17] Straighten the dead char implementation."
| * | | | | | Merge "Revert "[HW17] Straighten the dead char implementation.""Jean Chalard2014-08-223-248/+24
| |\ \ \ \ \ \
| | * | | | | | Revert "[HW17] Straighten the dead char implementation."Jean Chalard2014-08-223-248/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit c6612ff05185503bedc56dc610aa300d01be2e82. Change-Id: I750d9bff9cb89a6ab13af7a33567c3a0fe2af381
* | | | | | | | am f429d8f1: Merge "[ML1] Introduce RichInputMethodSubtype"Jean Chalard2014-08-2214-112/+202
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'f429d8f138d7e9aed8cdae774bfc8854025d3a40': [ML1] Introduce RichInputMethodSubtype
| * | | | | | | Merge "[ML1] Introduce RichInputMethodSubtype"Jean Chalard2014-08-2214-112/+202
| |\ \ \ \ \ \ \ | | | |_|_|/ / / | | |/| | | | |
| | * | | | | | [ML1] Introduce RichInputMethodSubtypeJean Chalard2014-08-2214-112/+202
| | | |/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | Bug: 11230254 Change-Id: Ic7a1bf938a5a186dcff527b556295aba2406e8b9
* | | | | | | am 1b34985d: Merge "[HW17] Straighten the dead char implementation."Jean Chalard2014-08-223-24/+248
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '1b34985dcfb118eb06f3e286e5a160cd4aaddd6c': [HW17] Straighten the dead char implementation.
| * | | | | | Merge "[HW17] Straighten the dead char implementation."Jean Chalard2014-08-223-24/+248
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | |
| | * | | | | [HW17] Straighten the dead char implementation.Jean Chalard2014-08-223-24/+248
| | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This now supports all cases, including cases not supported by the framework. Change-Id: I9dfbe2829c28c5bcb64b0b5a2551e7806990c00f
* | | | | | am 698b19ef: Pass a new argument to StatsUtils.Mohammadinamul Sheik2014-08-222-2/+3
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '698b19ef35d1d865943ec9d9ee05f8f0e66dc3f8': Pass a new argument to StatsUtils.
| * | | | | Pass a new argument to StatsUtils.Mohammadinamul Sheik2014-08-222-2/+3
| |/ / / / | | | | | | | | | | | | | | | | | | | | Change-Id: I61e32c7a455a273e8daf9a5487d7969923802488 Bug: 17013677
* | | | | am 5a96395b: am 8cbc37f2: am 8e2fcaa3: Merge "Use FrameLayout for the ↵Yohei Yukawa2014-08-211-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | backing view" into lmp-dev * commit '5a96395b78df7e201c580515ec9f54609a474a2d': Use FrameLayout for the backing view
| * | | | am 8cbc37f2: am 8e2fcaa3: Merge "Use FrameLayout for the backing view" into ↵Yohei Yukawa2014-08-211-1/+1
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | lmp-dev * commit '8cbc37f2c803fe5854237434742845a7b8ee32b9': Use FrameLayout for the backing view
| | * | | Merge "Use FrameLayout for the backing view" into lmp-devYohei Yukawa2014-08-211-1/+1
| | |\ \ \
| | | * | | Use FrameLayout for the backing viewYohei Yukawa2014-08-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If we render our UI around the composing text in the fullscreen mode, probably we need to have our views under android.R.id.extractArea, which is implemented as FrameLayout. Therefore, using FrameLayout for the backing view makes it easy to simplify the code between normal mode and full screen mode. Change-Id: I69533b22d9d1368ad906dc5ef7be1a1b674d10b8
* | | | | | am ebec5e13: Merge "Add Hinglish (hi_ZZ) subtype"Tadashi G. Takaoka2014-08-216-3/+54
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'ebec5e13383e4810b07e0cdbe10022e3ddb9c0d3': Add Hinglish (hi_ZZ) subtype
| * | | | | Merge "Add Hinglish (hi_ZZ) subtype"Tadashi G. Takaoka2014-08-216-3/+54
| |\ \ \ \ \
| | * | | | | Add Hinglish (hi_ZZ) subtypeTadashi G. Takaoka2014-08-216-3/+54
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 17169632 Change-Id: Ibee088d76c2b19f1d62a3c9c119452726e856ec8
* | | | | | | am 68a52c12: Merge "Update FormatSpec.java"Keisuke Kuroyanagi2014-08-211-83/+10
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '68a52c124579008ae7793eabb5644833203fa2ed': Update FormatSpec.java
| * | | | | | Merge "Update FormatSpec.java"Keisuke Kuroyanagi2014-08-211-83/+10
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | Update FormatSpec.javaKeisuke Kuroyanagi2014-08-211-83/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I27d14697f931c9511420a459c49312ea6e10c366
* | | | | | | am b8337e72: am 2834ddf1: am b9768702: Merge "Use #onStartInputInternal to ↵Yohei Yukawa2014-08-201-12/+12
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | initialize cursor rect retrieval" into lmp-dev * commit 'b8337e7232693b848fe7559050bf427f74b98fbe': Use #onStartInputInternal to initialize cursor rect retrieval
| * | | | | | am 2834ddf1: am b9768702: Merge "Use #onStartInputInternal to initialize ↵Yohei Yukawa2014-08-201-12/+12
| |\ \ \ \ \ \ | | |/ / / / / | |/| / / / / | | |/ / / / | | | | | | | | | | | | | | | | | | cursor rect retrieval" into lmp-dev * commit '2834ddf1a0c9bea38569429f90bdf7526ba8fa22': Use #onStartInputInternal to initialize cursor rect retrieval
| | * | | | Merge "Use #onStartInputInternal to initialize cursor rect retrieval" into ↵Yohei Yukawa2014-08-201-12/+12
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | lmp-dev