aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* am 2afdd4c4: (-s ours) Reconcile with jb-mr1-release - do not mergeThe Android Open Source Project2012-08-010-0/+0
|\ | | | | | | * commit '2afdd4c4273ba3c772da45478a79ee6b2fe1c9e0':
| * Reconcile with jb-mr1-release - do not mergeThe Android Open Source Project2012-08-010-0/+0
| |\ | | | | | | | | | Change-Id: I916d5d2df8ba081a431b8eb5a999e3e07f789e96
| | * merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-08-010-0/+0
| | |\
* | | | am bc892446: am 74fb957e: Header cleanupKen Wakasa2012-08-014-15/+6
|\| | | | | | | | | | | | | | | | | | | * commit 'bc8924467eae6cc5dc456cb1fbe4ec97b5b9cf9b': Header cleanup
| * | | am 74fb957e: Header cleanupKen Wakasa2012-08-014-15/+6
| |\ \ \ | | | | | | | | | | | | | | | | | | | | * commit '74fb957e49e7d9ff5af47f35d062aa7c7f97a8fc': Header cleanup
| | * | | Header cleanupKen Wakasa2012-08-014-15/+6
| | |/ / | | | | | | | | | | | | Change-Id: Idaf19de3dc75367d49bc01e84e5a9f057c1f8dba
* | | | am c2300d84: (-s ours) Reconcile with jb-mr1-release - do not mergeThe Android Open Source Project2012-07-310-0/+0
|\| | | | | | | | | | | | | | | * commit 'c2300d841afeb33f64cc9a3896bbbdf4bd39e62a':
| * | | Reconcile with jb-mr1-release - do not mergeThe Android Open Source Project2012-07-310-0/+0
| |\ \ \ | | | |/ | | |/| | | | | Change-Id: I759cbab32b17e45dd3d3e97ccf5e6039cfdff691
| | * | merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-07-310-0/+0
| | |\ \
* | | | | am 47e6cf36: am 19560508: Move flags belonging to BinaryFormat to the right ↵Jean Chalard2012-07-315-81/+80
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | place. * commit '47e6cf3695ab15b042d85f0d8b55d1eb58e14223': Move flags belonging to BinaryFormat to the right place.
| * | | | am 19560508: Move flags belonging to BinaryFormat to the right place.Jean Chalard2012-07-315-81/+80
| |\ \ \ \ | | | |_|/ | | |/| | | | | | | | | | | | * commit '195605084ed156b58f0bae002f121d98c1ace867': Move flags belonging to BinaryFormat to the right place.
| | * | | Move flags belonging to BinaryFormat to the right place.Jean Chalard2012-08-015-81/+80
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These masks and flags are constants that are an integral part of the format. They belong in BinaryFormat and have nothing to do in UnigramDictionary. This needs I6751dda4 to not break the build Bug: 6429243 Change-Id: Ic1c842b3245f7fdc25aa8d1459c5bb07b262e265
* | | | am df3f09c2: Sync with jb-mr1-devThe Android Open Source Project2012-07-3133-454/+528
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'df3f09c2e7fab17fe39b52fc9da99ac6da3647dc': Add <uses-sdk> in manifest files of test apks Cancel the while-typing timer when user hits the spacebar Cleanup headers Add language switch key to 10" tablet Add a <uses-sdk> element in the LatinIME's manifest Add android::supportsRtl="true" Fix east slavic keyboard layouts
| * | | Sync with jb-mr1-devThe Android Open Source Project2012-07-3133-454/+528
| |\| | | | | | | | | | | | | | Change-Id: I6bc4664468cb2f0b3c55e42859b5fe86231a1b2f
| | * | Merge "Cancel the while-typing timer when user hits the spacebar" into ↵Tadashi G. Takaoka2012-07-312-15/+31
| | |\ \ | | | | | | | | | | | | | | | jb-mr1-dev
| | | * | Cancel the while-typing timer when user hits the spacebarTadashi G. Takaoka2012-07-312-15/+31
| | | | | | | | | | | | | | | | | | | | | | | | | Bug: 6689079 Change-Id: I6b366acdcefb8b2c0d973a4f2a12329fc12eb5c5
| | * | | Add <uses-sdk> in manifest files of test apksKen Wakasa2012-07-311-0/+2
| | | | | | | | | | | | | | | | | | | | Change-Id: If5d0aeba8fadb25f67bcd9132dd6c56e5bf9899e
| | * | | Cleanup headersKen Wakasa2012-07-3118-40/+33
| | |/ / | | | | | | | | | | | | Change-Id: I9124366b2000cad54966fb6936bb4691bbf115a3
| | * | Merge "Add language switch key to 10" tablet" into jb-mr1-devTadashi G. Takaoka2012-07-312-3/+30
| | |\ \
| | | * | Add language switch key to 10" tabletTadashi G. Takaoka2012-07-312-3/+30
| | | | | | | | | | | | | | | | | | | | | | | | | Bug: 6637175 Change-Id: Ife9c9a6d35bd3cb4de406b388c504846b35059e7
| | * | | Merge "Add a <uses-sdk> element in the LatinIME's manifest" into jb-mr1-devKen Wakasa2012-07-311-0/+2
| | |\ \ \ | | | |/ / | | |/| |
| | | * | Add a <uses-sdk> element in the LatinIME's manifestKen Wakasa2012-07-311-0/+2
| | | | | | | | | | | | | | | | | | | | Change-Id: I8354677e271fc73865aabffe0df489e52c85c1eb
| | * | | Merge "Add android::supportsRtl="true"" into jb-mr1-devTadashi G. Takaoka2012-07-301-1/+2
| | |\ \ \ | | | |/ / | | |/| |
| | | * | Add android::supportsRtl="true"Tadashi G. Takaoka2012-07-311-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 6904817 Change-Id: I1176e239d001d8eb5ae79ed345660b22be68b137
| | * | | Fix east slavic keyboard layoutsTadashi G. Takaoka2012-07-319-395/+428
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change affects Ukrainian, Belarusian, Kyrgyz, and Russian keyboard. The followings are the layout changes for each language respectively. [Ukrainian] * Replace useless CYRILLIC LETTER E with CYRILLIC LETTER UKRAINIAN IE. * Replace useless CYRILLIC LETTER HARD SIGN with CYRILLIC LETTER YI on 10-inch tablet. * Add CYRILLIC LETTER GHE WITH UPTURN as more keys of CYRILLIC LETTER GHE. [Belarusian] * Add CYRILLIC LETTER IO as more keys of CYRILLIC LETTER IE. * Replace useless CYRILLIC LETTER HARD SIGN with CYRILLIC LETTER IE on 10-inch tablet. [Kyrgyz] * Add CYRILLIC LETTER IO as more keys of CYRILLIC LETTER IE. * Remove CYRILLIC LETTER HARD SIGN from more keys of CYRILLIC LETTER HA because CYRILLIC LETTER SOFT SIGN has it. [Russian] * Remove CYRILLIC LETTER HARD SIGN from more keys of CYRILLIC LETTER HA because CYRILLIC LETTER SOFT SIGN has it. This change also replace misspelled "more_keys_for_cyrillic_ye" text name with "more_keys_for_cyrillic_ie". Bug: 6881007 Change-Id: I9e88c4e27f66225e1676f2b286a7e55b9f2cbf5b
* | | | am be3eebf7: (-s ours) am ff2bec1c: Import translations. DO NOT MERGEYing Wang2012-07-300-0/+0
|\| | | | | | | | | | | | | | | | | | | * commit 'be3eebf774a9a443eb9dc895d26e3157c98b210e': Import translations. DO NOT MERGE
| * | | am ff2bec1c: Import translations. DO NOT MERGEYing Wang2012-07-3049-4/+448
| |\| | | | | | | | | | | | | | | | | | * commit 'ff2bec1ce668b743eef3e62a0728502698001022': Import translations. DO NOT MERGE
| | * | Import translations. DO NOT MERGEYing Wang2012-07-3049-4/+448
| | | | | | | | | | | | | | | | | | | | Change-Id: I4495669f10f41c2c7c3877c65b061df6a2c9f196 Auto-generated-cl: translation import
* | | | am 9047063f: (-s ours) Reconcile with jb-mr1-releaseThe Android Open Source Project2012-07-300-0/+0
|\| | | | | | | | | | | | | | | * commit '9047063fa7620b3a5c1993b7908bd6e4297fc00f':
| * | | Reconcile with jb-mr1-releaseThe Android Open Source Project2012-07-300-0/+0
| |\ \ \ | | |/ / | |/| / | | |/ Change-Id: I7a9dbdc939b8eb2cdae21553c4783ddafce88af6
| | * merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-07-300-0/+0
| | |\
* | | | Import translations. DO NOT MERGEYing Wang2012-07-3049-19/+304
| | | | | | | | | | | | | | | | | | | | Change-Id: I1ebb5a0f9873bab7c155dbdef9abe9a96e620d49 Auto-generated-cl: translation import
* | | | am f68fe7a9: Don\'t forward phantom space state on stripper inputJean Chalard2012-07-302-1/+19
|\| | | | | | | | | | | | | | | | | | | * commit 'f68fe7a9c9262a3591eeba61f34a91855a34c930': Don't forward phantom space state on stripper input
| * | | Don't forward phantom space state on stripper inputJean Chalard2012-07-312-1/+19
| |/ / | | | | | | | | | | | | Bug: 6890540 Change-Id: I923b24e3bc17e7b923be4940ad739b58dca24a1f
* | / am ca57f5ba: Move gesture preview parameters to KeyboardView attributesTadashi G. Takaoka2012-07-306-63/+91
|\| | | |/ |/| | | | | * commit 'ca57f5ba40b587a7a7f8a023aca65e1b2127b2a6': Move gesture preview parameters to KeyboardView attributes
| * Move gesture preview parameters to KeyboardView attributesTadashi G. Takaoka2012-07-306-63/+91
| | | | | | | | Change-Id: Iff9d6b485e202656fc869f3ff4d94575ad2c186f
* | am 6b9677d8: Merge "Small fix to KeyboardView" into jb-mr1-devTadashi G. Takaoka2012-07-301-6/+11
|\| | | | | | | | | * commit '6b9677d84ba199780b0e8282bf89b04cb618f868': Small fix to KeyboardView
| * Merge "Small fix to KeyboardView" into jb-mr1-devTadashi G. Takaoka2012-07-301-6/+11
| |\
| | * Small fix to KeyboardViewTadashi G. Takaoka2012-07-301-6/+11
| | | | | | | | | | | | Change-Id: Ifb7500ec2e55b50bb7951aa847fd4fbf49e32f4e
* | | am b9770cb7: Merge "Add device form factor to KeyboardId" into jb-mr1-devTadashi G. Takaoka2012-07-306-14/+42
|\| | | | | | | | | | | | | | * commit 'b9770cb7f7b6d51b651a60d753949208a9742974': Add device form factor to KeyboardId
| * | Merge "Add device form factor to KeyboardId" into jb-mr1-devTadashi G. Takaoka2012-07-306-14/+42
| |\ \
| | * | Add device form factor to KeyboardIdTadashi G. Takaoka2012-07-306-14/+42
| | |/ | | | | | | | | | | | | | | | | | | This is a groundword for optimizing keyboard parsing. Bug: 6860259 Change-Id: Ie65aa502b18c920e25cf2998b79120b3cc835952
* | | am f0211161: Merge "Misc cleanups" into jb-mr1-devKen Wakasa2012-07-3013-30/+17
|\| | | | | | | | | | | | | | * commit 'f0211161ab256c7340c3718e0bb437737ab3b72f': Misc cleanups
| * | Merge "Misc cleanups" into jb-mr1-devKen Wakasa2012-07-3013-30/+17
| |\ \
| | * | Misc cleanupsKen Wakasa2012-07-3013-30/+17
| | |/ | | | | | | | | | Change-Id: I28308f12c3064299acefc346b72279036c3726a7
* | | am 293f062c: Merge "Add advanced options to turn on/off the gesture trail ↵Tadashi G. Takaoka2012-07-308-42/+98
|\| | | | | | | | | | | | | | | | | | | | and text preview" into jb-mr1-dev * commit '293f062c264c1aff8b6ccaefe0c6fd8ff4608f0a': Add advanced options to turn on/off the gesture trail and text preview
| * | Merge "Add advanced options to turn on/off the gesture trail and text ↵Tadashi G. Takaoka2012-07-308-42/+98
| |\ \ | | | | | | | | | | | | preview" into jb-mr1-dev
| | * | Add advanced options to turn on/off the gesture trail and text previewTadashi G. Takaoka2012-07-308-42/+98
| | | | | | | | | | | | | | | | | | | | Bug: 6883053 Change-Id: I601718afb37289108b45ef68626c7c315edca35d
* | | | am 75fb3ce1: More readable Key.toString() and MoreKeySpec.toString()Tadashi G. Takaoka2012-07-302-4/+14
|\| | | | | | | | | | | | | | | | | | | * commit '75fb3ce1be3c879bb614097a2534f791c833dd7c': More readable Key.toString() and MoreKeySpec.toString()
| * | | More readable Key.toString() and MoreKeySpec.toString()Tadashi G. Takaoka2012-07-302-4/+14
| | |/ | |/| | | | | | | Change-Id: Iee3c33dedd0c00ba259aa55e8b0c1c57b84eccdd