aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Follow up to Ie2416ccdKen Wakasa2012-02-152-2/+2
| | | | | | space &#x0020 got lost in some parsing process Change-Id: I36f5a9ca7172013ce049041886b9cd98659d38f9
* Merge "Use more standard Unicode notations in keyboard layout resource files."Ken Wakasa2012-02-1467-2682/+2710
|\
| * Use more standard Unicode notations in keyboard layout resource files.Ken Wakasa2012-02-1567-2682/+2710
| | | | | | | | | | bug: 5988656 Change-Id: Ie2416ccd790f29934a37e9dc77d7525e5113048a
* | resolved conflicts for merge of 3ad1145a to masterJean-Baptiste Queru2012-02-141-0/+4
|\ \ | |/ |/| | | Change-Id: I13159b95f90c5095373951bf9e91b7dbf8b14558
| * am ec4a8580: am e9768273: am efcb3b95: Merge "[MIPS] Remove reference to NDK"Jean-Baptiste Queru2012-02-141-0/+4
| |\ | | | | | | | | | | | | * commit 'ec4a8580257fa78e761a44a68e7c028081c4f559': [MIPS] Remove reference to NDK
| | * am e9768273: am efcb3b95: Merge "[MIPS] Remove reference to NDK"Jean-Baptiste Queru2012-02-141-0/+4
| | |\ | | | | | | | | | | | | | | | | * commit 'e97682739712440d1025c53cd224253ef24f4dfe': [MIPS] Remove reference to NDK
| | | * am efcb3b95: Merge "[MIPS] Remove reference to NDK"Jean-Baptiste Queru2012-02-141-0/+4
| | | |\ | | | | | | | | | | | | | | | | | | | | * commit 'efcb3b95dff5494660bf34930cda10545d043297': [MIPS] Remove reference to NDK
| | | | * Merge "[MIPS] Remove reference to NDK"Jean-Baptiste Queru2012-02-141-0/+4
| | | | |\
| | | | | * [MIPS] Remove reference to NDKBhanu Chetlapalli2012-01-311-0/+4
| | | | |/ | | | | | | | | | | | | | | | | | | | | Change-Id: I6137c4a93b29a8906abb5bd0f320dd3f37fdea08 Signed-Off-By: Bhanu Chetlapalli <bhanu@mips.com>
* | | | | am 30056790: Import translations.Eric Fischer2012-02-130-0/+0
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * commit '30056790ab1f37a0b92e3f7306402dacba100efa': Import translations.
| * | | | | Import translations.Eric Fischer2012-02-1349-771/+458
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I20219089b9431b0b481b943a298b693e3060ba13
* | | | | | Import translations. DO NOT MERGEEric Fischer2012-02-1349-771/+458
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I8be564ef6befc36c59caa155f4b9c6c74740d75b
* | | | | | am f6f40539: Minor string updates in Android keyboard settingsKen Wakasa2012-02-132-2/+2
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'f6f40539aad882492f1773809db17535eb1aab02': Minor string updates in Android keyboard settings
| * | | | | Minor string updates in Android keyboard settingsKen Wakasa2012-02-142-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug: 5999345 Change-Id: I77560b02c71c3ba0c525572b7062ebbfd66b3b85
* | | | | | am 09c677f5: Replace UTF-8 string resources with their hex representationsKen Wakasa2012-02-1255-1086/+2546
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '09c677f56ac0f155c6ecce3776d8c93c20625562': Replace UTF-8 string resources with their hex representations
| * | | | | Replace UTF-8 string resources with their hex representationsKen Wakasa2012-02-1155-1086/+2546
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug: 5988656 Change-Id: Ifc3c3a2eccfc23d75b4066c2c9c02c48dacda55b
* | | | | | am 1bd181fe: Import translations.Eric Fischer2012-02-100-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '1bd181fefa348650412b20f89ad683002c206405': Import translations.
| * | | | | Import translations.Eric Fischer2012-02-1049-130/+896
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I126a880289de548e914ac442740e789e067e5124
* | | | | | Import translations. DO NOT MERGEEric Fischer2012-02-1049-130/+896
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I6a592e84d239cf9df93f01aa0c2815c8caba7b41
* | | | | | am bf01b629: am 5d0aeda9: (-s ours) am f2cacdae: am c85dde47: Import ↵Eric Fischer2012-02-100-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | translations. DO NOT MERGE * commit 'bf01b62901cc6009d1284d3940a7a8b9e9a6e0d8':
| * | | | | am 5d0aeda9: (-s ours) am f2cacdae: am c85dde47: Import translations. DO NOT ↵Eric Fischer2012-02-100-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MERGE * commit '5d0aeda964e23e6b96a24539c6430146cc9426e9':
| | * | | | am f2cacdae: am c85dde47: Import translations. DO NOT MERGEEric Fischer2012-02-100-0/+0
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | * commit 'f2cacdaeef4f5fd07a51ead76396dbbdad33187b':
| | | * \ \ \ am c85dde47: Import translations. DO NOT MERGEEric Fischer2012-02-108-26/+35
| | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'c85dde47e89f19aad3a29de08c11ae97f79be618': Import translations. DO NOT MERGE
* | | | | | | | am 073ea09b: am cdca8c8e: (-s ours) am f9c3be4d: (-s ours) am c85dde47: ↵Eric Fischer2012-02-100-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Import translations. DO NOT MERGE * commit '073ea09bbf41318a1b2a2b809cd4774a1988dc66': Import translations. DO NOT MERGE
| * | | | | | | am cdca8c8e: (-s ours) am f9c3be4d: (-s ours) am c85dde47: Import ↵Eric Fischer2012-02-100-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | translations. DO NOT MERGE * commit 'cdca8c8e68a1a9e57060a5a37886505276bf8485': Import translations. DO NOT MERGE
| | * | | | | | am f9c3be4d: (-s ours) am c85dde47: Import translations. DO NOT MERGEEric Fischer2012-02-100-0/+0
| | |\ \ \ \ \ \ | | | | |_|/ / / | | | |/| | | | | | | | | | | | | | | | | | | | * commit 'f9c3be4d8b2016d50c080e23f8cd7d283409e669': Import translations. DO NOT MERGE
| | | * | | | | am c85dde47: Import translations. DO NOT MERGEEric Fischer2012-02-108-26/+35
| | | |\ \ \ \ \ | | | | | |/ / / | | | | |/| / / | | | | |_|/ / | | | |/| | | * commit 'c85dde47e89f19aad3a29de08c11ae97f79be618': Import translations. DO NOT MERGE
| | | | * | | Import translations. DO NOT MERGEEric Fischer2012-02-088-26/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ia22dacfc8e78a6e4c78f24375c3ef96a01fd4321
* | | | | | | am 6213983f: Refactor MoreKeysKeyboard.BuilderTadashi G. Takaoka2012-02-102-1152/+1351
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '6213983fa147d010ce30314f43b0a1800d2528ba': Refactor MoreKeysKeyboard.Builder
| * | | | | | Refactor MoreKeysKeyboard.BuilderTadashi G. Takaoka2012-02-102-1152/+1351
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ib5f58b1143be60c748b81299ccc3b237d2587846
* | | | | | | am b9e10c31: Merge "Key should be distinguished also by moreKeys contents ↵Tadashi G. Takaoka2012-02-091-5/+9
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | and etc." * commit 'b9e10c318a073b671dc51271c1f966a7ed6f692a': Key should be distinguished also by moreKeys contents and etc.
| * | | | | | Merge "Key should be distinguished also by moreKeys contents and etc."Tadashi G. Takaoka2012-02-091-5/+9
| |\ \ \ \ \ \
| | * | | | | | Key should be distinguished also by moreKeys contents and etc.Tadashi G. Takaoka2012-02-101-5/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ib2caabee6af78153b5a7be0e4df522288f2a7d48
* | | | | | | | am 4baf767f: Merge "Improved shift key and symbol/alpha switch key ↵Charles Chen2012-02-094-19/+144
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | accessibility feedback." * commit '4baf767facb885bdbd271624e1c9d8cccc553bb4': Improved shift key and symbol/alpha switch key accessibility feedback.
| * | | | | | | Merge "Improved shift key and symbol/alpha switch key accessibility feedback."Charles Chen2012-02-094-19/+144
| |\ \ \ \ \ \ \
| | * | | | | | | Improved shift key and symbol/alpha switch key accessibility feedback.alanv2012-02-074-19/+144
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 5933165 Change-Id: Id71f38874640785b7ad43b7a70e27f40c13be748
* | | | | | | | | am 0d1a5bad: Import translations. DO NOT MERGEEric Fischer2012-02-090-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '0d1a5bad54441b6b1fb417cc5776f60586b32324': Import translations. DO NOT MERGE
| * | | | | | | | Import translations. DO NOT MERGEEric Fischer2012-02-094-8/+4
| | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | Change-Id: I221670b8e4796346d13a44848f8958904e9bac80
* | | | | | | | Import translations. DO NOT MERGEEric Fischer2012-02-094-8/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ibbf47bac70a1c684a3b139f34291607bddbaa2ca
* | | | | | | | am accd2a9f: Merge "Add finals"Jean Chalard2012-02-081-2/+3
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'accd2a9f61e3289fc66d2b79ef54e2e06c5ff43b': Add finals
| * | | | | | | Merge "Add finals"Jean Chalard2012-02-081-2/+3
| |\ \ \ \ \ \ \
| | * | | | | | | Add finalsJean Chalard2012-02-091-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ib81be9a0df34c5e9fc49d2b5d9bf02297ea2b499
* | | | | | | | | am a828f613: Merge "Some more simplification"Jean Chalard2012-02-082-8/+2
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'a828f613a8dfbeff6290f261bbbd5ff988fb99b6': Some more simplification
| * | | | | | | | Merge "Some more simplification"Jean Chalard2012-02-082-8/+2
| |\| | | | | | |
| | * | | | | | | Some more simplificationJean Chalard2012-02-092-8/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove useless method calls, and ultimately remove useless method. Change-Id: I3f353b1b37460d5e9ceae5cb5dde3fff0da81c21
* | | | | | | | | am 4721427c: Allow revert swap punctuation againJean Chalard2012-02-081-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '4721427c7de3600f6fe7dfff16508a6a974fb3e4': Allow revert swap punctuation again
| * | | | | | | | Allow revert swap punctuation againJean Chalard2012-02-091-1/+1
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This may not be the best behavior, but it's the same as ICS. Bug: 5981844 Change-Id: Ibb7798e2a315312310ed3be4e731d0fe1ac04456
* | | | | | | | am 7ef97ea1: Import translations. DO NOT MERGEEric Fischer2012-02-080-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '7ef97ea1f916cb1e53ec0fcaa07da87258833712': Import translations. DO NOT MERGE
| * | | | | | | Import translations. DO NOT MERGEEric Fischer2012-02-0849-0/+98
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I02629c1f8dd311899b3aba89bfb1390150ace7ac
* | | | | | | | Import translations. DO NOT MERGEEric Fischer2012-02-0849-0/+98
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I492ab5c1ef14e0d035323d4cbdeb56d6a0e8e31c