aboutsummaryrefslogtreecommitdiffstats
path: root/java/res (follow)
Commit message (Collapse)AuthorAgeFilesLines
* am fbb89492: am 196ed028: (-s ours) am e03b75c0: (-s ours) am bc83cd0f: (-s ↵Baligh Uddin2013-10-1012-0/+1614
|\ | | | | | | | | | | ours) am b3073240: (-s ours) am 96a52175: (-s ours) am a0f6da5a: (-s ours) am a6c16790: (-s ours) am d7346f18: (-s ours) am bda32836: (-s ours) am 8e26b9c0: (-s ours) Import translations. DO N * commit 'fbb89492a1839a49d6627820456c963436864709':
* | am 04931245: am a6d52095: (-s ours) am 09ff83d4: (-s ours) am 12a8e54e: (-s ↵Baligh Uddin2013-10-101-0/+27
|\| | | | | | | | | | | ours) am 07b83868: (-s ours) am 2159d77e: (-s ours) am 5a6bcbfb: (-s ours) am 3c6d5101: (-s ours) am 14a3c634: (-s ours) am 267928c9: (-s ours) am 981a1944: (-s ours) Merge "Import translation * commit '04931245183975bc3ff18b859252d6cb14f9454a':
* | am 9257c049: Merge "Revert "Add Swiss French and German keyboard layouts.""Ken Wakasa2013-10-097-265/+0
|\| | | | | | | | | * commit '9257c049672c278c08029d344c85baf183c6ff2e': Revert "Add Swiss French and German keyboard layouts."
| * Revert "Add Swiss French and German keyboard layouts."Ken Wakasa2013-10-107-265/+0
| | | | | | | | | | | | | | | | This reverts commit 220ce8f269e8d2507a2a57ec919e48ddb6f496f8. Sorry, but we are now in the week before the final cut for the next launch. We shouldn't be taking new features like this at this point. Let me revert this change for now. I'll re-revert this after the cut next week. Change-Id: Ia8b00680c992ec526e6a858945f2380cbcdfdd55
* | am 064661a3: Merge "Add Swiss French and German keyboard layouts."Ken Wakasa2013-10-097-0/+265
|\| | | | | | | | | * commit '064661a35cfb8223577d03e014f1ab61a5ba4575': Add Swiss French and German keyboard layouts.
| * Add Swiss French and German keyboard layouts.Fredrik Roubert2013-10-097-0/+265
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There used to be two "Swiss" keyboard layouts, labelled fr_CH and de_QY, available in LatinIME. They were, however, not actually Swiss layouts but instead work-arounds to be able to get French or German with qwertz or qwerty (instead of azerty and qwertz) layouts, respectively. These were thus removed by commit f6972561fcb45310f18230ce217f0c6bb57e7eee replacing them with the generic fr-qwertz and de-qwerty layouts instead. Here, now, is a proper Swiss keyboard layout, following Swiss standards for people accustomed to typing on Swiss keyboards, with the expected tailorings for French and German. Change-Id: I9feed752053ecc694c84db713284f69bc1daf155
* | am 9a802e0d: Merge "Support sw540 (ultra Z)"Satoshi Kataoka2013-10-095-0/+0
|\| | | | | | | | | * commit '9a802e0dba989f3fb8cb480355828531c8e1146d': Support sw540 (ultra Z)
| * Support sw540 (ultra Z)Satoshi Kataoka2013-10-095-0/+0
| | | | | | | | | | Bug: 11125351 Change-Id: Ib930ba810b25e28bcc36ea1647d46731816d9def
| * Merge "Import translations. DO NOT MERGE"Baligh Uddin2013-10-0831-118/+60
| |\
| | * Import translations. DO NOT MERGEBaligh Uddin2013-10-0731-118/+60
| | | | | | | | | | | | | | | Change-Id: If76652b1bdfc62f8c8d60ca8d5a8c3b7346e75a3 Auto-generated-cl: translation import
* | | Merge "Import translations. DO NOT MERGE" into jb-ub-latinimegoogleBaligh Uddin2013-10-0831-118/+60
|\ \ \
| * | | Import translations. DO NOT MERGEBaligh Uddin2013-10-0731-118/+60
| | | | | | | | | | | | | | | | | | | | Change-Id: I8dc4664964ed153fc79309d7e70f4a36bfacceb6 Auto-generated-cl: translation import
* | | | am 0152ff53: Merge "Update dictionaries"Jean Chalard2013-10-082-0/+0
|\ \ \ \ | | |/ / | |/| | | | | | | | | | * commit '0152ff53a261e1b8dd2a876120480cc103b7a799': Update dictionaries
| * | | Update dictionariesJean Chalard2013-10-082-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | >>> dictionaries/en_GB_wordlist.combined.gz Header : date : 1381130519 <=> 1381226409 version : 41 <=> 42 Body : Added: haha 45 >>> dictionaries/en_US_wordlist.combined.gz Header : date : 1380293342 <=> 1381226409 version : 40 <=> 42 Body : Added: haha 45 >>> dictionaries/en_wordlist.combined.gz Header : date : 1380293363 <=> 1381226429 version : 40 <=> 42 Body : Added: haha 45 >>> dictionaries/fr_wordlist.combined.gz Header : date : 1380519383 <=> 1381226409 version : 40 <=> 42 Body : Freq changed: haha 0 -> 30 >>> java/res/raw/main_en.dict Header : date : 1380293363 <=> 1381226429 version : 40 <=> 42 Body : Added: haha 45 >>> java/res/raw/main_fr.dict Header : date : 1380519383 <=> 1381226409 version : 40 <=> 42 Body : Freq changed: haha 0 -> 30 Bug: 11114205 Change-Id: I39d429d24d93ee07a70d8613ce0752432b26acc4
* | | | am 36c56cae: Merge "Make the sentence separator a resource."Jean Chalard2013-10-072-0/+6
|\| | | | |/ / |/| | | | | | | | * commit '36c56caee3049737a55e2421bf9e3727c4936f24': Make the sentence separator a resource.
| * | Make the sentence separator a resource.Jean Chalard2013-10-082-0/+6
| |/ | | | | | | | | | | | | This will help handing correctly the armenian full stop. Bug: 10082781 Change-Id: Id7bb219ebd89daba203216eab362d1cc26a65a36
* | am 47462172: Enter -> Alpha keyboard switcher in Emoji palette viewSatoshi Kataoka2013-10-071-2/+2
|\| | | | | | | | | * commit '4746217247d14f26249217aab28215e9c6867614': Enter -> Alpha keyboard switcher in Emoji palette view
| * Enter -> Alpha keyboard switcher in Emoji palette viewSatoshi Kataoka2013-10-071-2/+2
| | | | | | | | | | Bug: 11103091 Change-Id: I0c5384e9f148566d1ac1d178a8227eb913d59908
* | am 32cf6f85: Show Emoji key by longpressing the enter keySatoshi Kataoka2013-10-072-21/+86
|\| | | | | | | | | * commit '32cf6f85a2e166f8a43d9bccd4ddefa0b7167cd1': Show Emoji key by longpressing the enter key
| * Show Emoji key by longpressing the enter keySatoshi Kataoka2013-10-072-21/+86
| | | | | | | | | | Bug: 11074625 Change-Id: I5fc57a2b68d7dcfb8dbebf5821b76b0895a947f9
* | am 4deb824f: Add navigateEmojiSatoshi Kataoka2013-10-062-1/+96
|\| | | | | | | | | * commit '4deb824f3a91e2e157a3a0334e46b9bba394bc1a': Add navigateEmoji
| * Add navigateEmojiSatoshi Kataoka2013-10-072-1/+96
| | | | | | | | | | Bug: 11074625 Change-Id: I1ef6b81ef923684b502c24fddb4ced8fe1691733
* | am d76b5529: Rename EmojiKeyboardView -> EmojiPalettesViewSatoshi Kataoka2013-10-066-15/+15
|\| | | | | | | | | * commit 'd76b55297940a65bb9479020a9ed58aa978a0aea': Rename EmojiKeyboardView -> EmojiPalettesView
| * Rename EmojiKeyboardView -> EmojiPalettesViewSatoshi Kataoka2013-10-076-15/+15
| | | | | | | | Change-Id: I226bb8e21fd2b2b6639896a1cc433d19f3f431c2
| * Import translations. DO NOT MERGEBaligh Uddin2013-10-0457-118/+176
| | | | | | | | | | Change-Id: I15036545751abe751f2768daef7f3f1605a5457e Auto-generated-cl: translation import
* | Import translations. DO NOT MERGEBaligh Uddin2013-10-0426-104/+52
| | | | | | | | | | Change-Id: I04aed3599ff9570197b408a5d16ea48422294f97 Auto-generated-cl: translation import
* | Merge "Import translations. DO NOT MERGE" into jb-ub-latinimegoogleBaligh Uddin2013-10-0463-120/+1849
|\ \
| * | Import translations. DO NOT MERGEBaligh Uddin2013-10-0463-120/+1849
| | | | | | | | | | | | | | | Change-Id: I50e530351c75746759fefc4113c4f881755405ec Auto-generated-cl: translation import
* | | am 1d188a28: Merge "Fix emoji"Satoshi Kataoka2013-10-046-6/+6
|\ \ \ | | |/ | |/| | | | | | | * commit '1d188a28fb0930217098fef10937674e24ca5a49': Fix emoji
| * | Merge "Fix emoji"Satoshi Kataoka2013-10-046-6/+6
| |\ \
| | * | Fix emojiSatoshi Kataoka2013-10-046-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | Bug: 10538430 Change-Id: Ib11e29794216b54001806ab12fe440d157243dc1
* | | | am c01707db: Merge "Suppress exceptions that have always been happening."Ken Wakasa2013-10-041-1/+1
|\| | | | | | | | | | | | | | | | | | | * commit 'c01707db03c124ecab0c8ba14b4e4f2d24c973c9': Suppress exceptions that have always been happening.
| * | | Suppress exceptions that have always been happening.Ken Wakasa2013-10-041-1/+1
| | | | | | | | | | | | | | | | Change-Id: I5f85a7a0f94ea9ecbe0c4a8caebcf551fa9c9669
* | | | am 6ec0cf12: Merge "Tentatively revert assets"Satoshi Kataoka2013-10-044-0/+0
|\| | | | | | | | | | | | | | | | | | | * commit '6ec0cf12b8f3dab05c48c81b1c0aaf5430d58c44': Tentatively revert assets
| * | | Tentatively revert assetsSatoshi Kataoka2013-10-044-0/+0
| |/ / | | | | | | | | | Change-Id: I403fc24a407fdd3b433d5820f1b46e6985cbe83e
* | / am ef64676b: Merge "Revert emoji key position to JB-mr2"Satoshi Kataoka2013-10-034-4/+26
|\| | | |/ |/| | | | | * commit 'ef64676bf8e843e0f5c3b8ed1ad409219da3493a': Revert emoji key position to JB-mr2
| * Merge "Revert emoji key position to JB-mr2"Satoshi Kataoka2013-10-044-4/+26
| |\
| | * Revert emoji key position to JB-mr2Satoshi Kataoka2013-10-044-4/+26
| | | | | | | | | | | | | | | | | | Bug: 10538430 Change-Id: Ie2033b2f5253b2e2fc2229ba6c95568e7b2a58fa
* | | am afa56511: Merge "Update string comments for translation"Alan Viverette2013-10-031-3/+3
|\| | | | | | | | | | | | | | * commit 'afa565119cd3e8fd7f92ee22033932fc8e8d47d4': Update string comments for translation
| * | Merge "Update string comments for translation"Alan Viverette2013-10-031-3/+3
| |\ \ | | |/ | |/|
| | * Update string comments for translationAlan Viverette2013-10-021-3/+3
| | | | | | | | | | | | | | | BUG: 11042719,11021829 Change-Id: I27c80d1a2489843a16bd2b055d2ae81797492d1c
* | | am c7f8d54d: Merge "Prepare for changing text color for functional keys"Satoshi Kataoka2013-10-032-1/+51
|\| | | | | | | | | | | | | | * commit 'c7f8d54d6eaa0a0ebfe156ebe426eeab080a82dc': Prepare for changing text color for functional keys
| * | Merge "Prepare for changing text color for functional keys"Satoshi Kataoka2013-10-032-1/+51
| |\ \
| | * | Prepare for changing text color for functional keysSatoshi Kataoka2013-10-032-1/+51
| | |/ | | | | | | | | | | | | | | | Bug: 10786040 Change-Id: I0de7d4923ea13b44adcf1f4ea456796cd02ef27b
| * / Import translations. DO NOT MERGEBaligh Uddin2013-10-0255-220/+110
| |/ | | | | | | | | Change-Id: I4fe48281caf9d3cf83effb19933d8f168967f950 Auto-generated-cl: translation import
* | Import translations. DO NOT MERGEBaligh Uddin2013-10-0249-196/+98
| | | | | | | | | | Change-Id: Ifee5f65e8da896db6bce982db0c8cdcbb3f49902 Auto-generated-cl: translation import
* | am 9d763910: Merge "Unfortunately, hide some broken "emoji"s"Satoshi Kataoka2013-10-011-21/+21
|\| | | | | | | | | * commit '9d763910580379d3e68b4559f91e655cf05f02a3': Unfortunately, hide some broken "emoji"s
| * Merge "Unfortunately, hide some broken "emoji"s"Satoshi Kataoka2013-10-011-21/+21
| |\
| | * Unfortunately, hide some broken "emoji"sSatoshi Kataoka2013-10-011-21/+21
| | | | | | | | | | | | | | | Bug: 10923117 Change-Id: I27ba38e5f388cc15ae331fd05d63db4e4a41cbbf
* | | am 382094a7: Merge "Cleanup and remove redundant more keys on phones"Ken Wakasa2013-10-012-18/+105
|\| | | | | | | | | | | | | | * commit '382094a784efb32ef9308542ef2f8d2c88ac96b2': Cleanup and remove redundant more keys on phones