aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Don't assume a word has been added to the user dict•••The user may now cancel or edit a word upon adding to the user dictionary. We can no longer assume the word has been added as is and for the current locale. We should just rely on standard mechanisms that inform us of new insertions. Bug: 6015347 Change-Id: I069b19c0c844ca29d6de4c4d162306f9413adea8 Jean Chalard2012-02-161-5/+0
* am 90f2ee94: am 41f7d2d9: Reconcile with ics-mr1-release•••* commit '90f2ee948bd834ac27977b0d7196e725b5123750': The Android Open Source Project2012-02-160-0/+0
|\
| * am 41f7d2d9: Reconcile with ics-mr1-release•••* commit '41f7d2d9e48af6971e7346c69cbc00cea470f9d9': The Android Open Source Project2012-02-160-0/+0
| |\
| | * Reconcile with ics-mr1-release•••Change-Id: I6a64a0f1a121625160e099992ed69637781994d7 The Android Open Source Project2012-02-160-0/+0
| | |\
* | | | am 1a58855d: am caaac8fc: Reconcile with ics-mr1-release•••* commit '1a58855d5d60ed3237c78b3606aca88ed5e1d10b': The Android Open Source Project2012-02-160-0/+0
|\| | |
| * | | am caaac8fc: Reconcile with ics-mr1-release•••* commit 'caaac8fc842adb06759379438615f454d05f9553': The Android Open Source Project2012-02-160-0/+0
| |\ \ \
| | * \ \ Reconcile with ics-mr1-release•••Change-Id: Ie5b83f7f71c9407a451572d9ba0d4609e4bf597f The Android Open Source Project2012-02-160-0/+0
| | |\ \ \ | | | | |/ | | | |/|
| | | * | merge in ics-mr1-release history after reset to ics-mr1The Android Automerger2012-02-140-0/+0
| | | |\ \
* | | | \ \ Merge "Activate bigram predictions from the binary dictionary"Jean Chalard2012-02-152-10/+8
|\ \ \ \ \ \
| * | | | | | Activate bigram predictions from the binary dictionary•••Change-Id: If1cc50539d7677b854b1cd3bea3423c8c0865de5 Jean Chalard2012-02-152-10/+8
* | | | | | | Reactivate the bigram prediction option•••Change-Id: Ib4dcd05c4ecf38bdf3d28371fcd9e2259a59ec0c Jean Chalard2012-02-151-9/+7
|/ / / / / /
* | | | | | Merge "Import translations."Eric Fischer2012-02-1420-182/+92
|\ \ \ \ \ \
| * | | | | | Import translations.•••Change-Id: I9ee2da4706d6847b00f37766f79e73f83ea930d8 Eric Fischer2012-02-1420-182/+92
* | | | | | | Follow up to Ie2416ccd•••space &#x0020 got lost in some parsing process Change-Id: I36f5a9ca7172013ce049041886b9cd98659d38f9 Ken Wakasa2012-02-152-2/+2
* | | | | | | 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.•••bug: 5988656 Change-Id: Ie2416ccd790f29934a37e9dc77d7525e5113048a Ken Wakasa2012-02-1567-2682/+2710
* | | | | | | resolved conflicts for merge of 3ad1145a to master•••Change-Id: I13159b95f90c5095373951bf9e91b7dbf8b14558 Jean-Baptiste Queru2012-02-141-0/+4
|\ \ \ \ \ \ \ | |/ / / / / / |/| / / / / / | |/ / / / /
| * | | | | am ec4a8580: am e9768273: am efcb3b95: Merge "[MIPS] Remove reference to NDK"•••* commit 'ec4a8580257fa78e761a44a68e7c028081c4f559': [MIPS] Remove reference to NDK Jean-Baptiste Queru2012-02-141-0/+4
| |\| | | |
| | * | | | am e9768273: am efcb3b95: Merge "[MIPS] Remove reference to NDK"•••* commit 'e97682739712440d1025c53cd224253ef24f4dfe': [MIPS] Remove reference to NDK Jean-Baptiste Queru2012-02-141-0/+4
| | |\ \ \ \
| | | * \ \ \ am efcb3b95: Merge "[MIPS] Remove reference to NDK"•••* commit 'efcb3b95dff5494660bf34930cda10545d043297': [MIPS] Remove reference to NDK Jean-Baptiste Queru2012-02-141-0/+4
| | | |\ \ \ \
| | | | * \ \ \ Merge "[MIPS] Remove reference to NDK"Jean-Baptiste Queru2012-02-141-0/+4
| | | | |\ \ \ \
| | | | | * | | | [MIPS] Remove reference to NDK•••Change-Id: I6137c4a93b29a8906abb5bd0f320dd3f37fdea08 Signed-Off-By: Bhanu Chetlapalli <bhanu@mips.com> Bhanu Chetlapalli2012-01-311-0/+4
| | | | |/ / / /
* | | | | | | | am 30056790: Import translations.•••* commit '30056790ab1f37a0b92e3f7306402dacba100efa': Import translations. Eric Fischer2012-02-130-0/+0
|\ \ \ \ \ \ \ \
| * | | | | | | | Import translations.•••Change-Id: I20219089b9431b0b481b943a298b693e3060ba13 Eric Fischer2012-02-1349-771/+458
* | | | | | | | | Import translations. DO NOT MERGE•••Change-Id: I8be564ef6befc36c59caa155f4b9c6c74740d75b Eric Fischer2012-02-1349-771/+458
* | | | | | | | | am f6f40539: Minor string updates in Android keyboard settings•••* commit 'f6f40539aad882492f1773809db17535eb1aab02': Minor string updates in Android keyboard settings Ken Wakasa2012-02-132-2/+2
|\| | | | | | | |
| * | | | | | | | Minor string updates in Android keyboard settings•••bug: 5999345 Change-Id: I77560b02c71c3ba0c525572b7062ebbfd66b3b85 Ken Wakasa2012-02-142-2/+2
* | | | | | | | | am 09c677f5: Replace UTF-8 string resources with their hex representations•••* commit '09c677f56ac0f155c6ecce3776d8c93c20625562': Replace UTF-8 string resources with their hex representations Ken Wakasa2012-02-1255-1086/+2546
|\| | | | | | | |
| * | | | | | | | Replace UTF-8 string resources with their hex representations•••bug: 5988656 Change-Id: Ifc3c3a2eccfc23d75b4066c2c9c02c48dacda55b Ken Wakasa2012-02-1155-1086/+2546
* | | | | | | | | am 1bd181fe: Import translations.•••* commit '1bd181fefa348650412b20f89ad683002c206405': Import translations. Eric Fischer2012-02-100-0/+0
|\| | | | | | | |
| * | | | | | | | Import translations.•••Change-Id: I126a880289de548e914ac442740e789e067e5124 Eric Fischer2012-02-1049-130/+896
* | | | | | | | | Import translations. DO NOT MERGE•••Change-Id: I6a592e84d239cf9df93f01aa0c2815c8caba7b41 Eric Fischer2012-02-1049-130/+896
* | | | | | | | | am bf01b629: am 5d0aeda9: (-s ours) am f2cacdae: am c85dde47: Import translat...•••* commit 'bf01b62901cc6009d1284d3940a7a8b9e9a6e0d8': Eric Fischer2012-02-100-0/+0
|\| | | | | | | |
| * | | | | | | | am 5d0aeda9: (-s ours) am f2cacdae: am c85dde47: Import translations. DO NOT ...•••* commit '5d0aeda964e23e6b96a24539c6430146cc9426e9': Eric Fischer2012-02-100-0/+0
| |\| | | | | | |
| | * | | | | | | am f2cacdae: am c85dde47: Import translations. DO NOT MERGE•••* commit 'f2cacdaeef4f5fd07a51ead76396dbbdad33187b': Eric Fischer2012-02-100-0/+0
| | |\ \ \ \ \ \ \ | | | | |_|_|_|_|/ | | | |/| | | | |
| | | * | | | | | am c85dde47: Import translations. DO NOT MERGE•••* commit 'c85dde47e89f19aad3a29de08c11ae97f79be618': Import translations. DO NOT MERGE Eric Fischer2012-02-108-26/+35
| | | |\ \ \ \ \ \ | | | | | |_|_|/ / | | | | |/| | | |
* | | | | | | | | am 073ea09b: am cdca8c8e: (-s ours) am f9c3be4d: (-s ours) am c85dde47: Impor...•••* commit '073ea09bbf41318a1b2a2b809cd4774a1988dc66': Import translations. DO NOT MERGE Eric Fischer2012-02-100-0/+0
|\| | | | | | | |
| * | | | | | | | am cdca8c8e: (-s ours) am f9c3be4d: (-s ours) am c85dde47: Import translation...•••* commit 'cdca8c8e68a1a9e57060a5a37886505276bf8485': Import translations. DO NOT MERGE Eric Fischer2012-02-100-0/+0
| |\| | | | | | |
| | * | | | | | | am f9c3be4d: (-s ours) am c85dde47: Import translations. DO NOT MERGE•••* commit 'f9c3be4d8b2016d50c080e23f8cd7d283409e669': Import translations. DO NOT MERGE Eric Fischer2012-02-100-0/+0
| | |\ \ \ \ \ \ \ | | | | |_|/ / / / | | | |/| | | | |
| | | * | | | | | am c85dde47: Import translations. DO NOT MERGE•••* commit 'c85dde47e89f19aad3a29de08c11ae97f79be618': Import translations. DO NOT MERGE Eric Fischer2012-02-108-26/+35
| | | |\ \ \ \ \ \ | | | | | |/ / / / | | | | |/| / / / | | | | |_|/ / / | | | |/| | | |
| | | | * | | | Import translations. DO NOT MERGE•••Change-Id: Ia22dacfc8e78a6e4c78f24375c3ef96a01fd4321 Eric Fischer2012-02-088-26/+35
* | | | | | | | am 6213983f: Refactor MoreKeysKeyboard.Builder•••* commit '6213983fa147d010ce30314f43b0a1800d2528ba': Refactor MoreKeysKeyboard.Builder Tadashi G. Takaoka2012-02-102-1152/+1351
|\| | | | | | |
| * | | | | | | Refactor MoreKeysKeyboard.Builder•••Change-Id: Ib5f58b1143be60c748b81299ccc3b237d2587846 Tadashi G. Takaoka2012-02-102-1152/+1351
* | | | | | | | am b9e10c31: Merge "Key should be distinguished also by moreKeys contents and...•••* commit 'b9e10c318a073b671dc51271c1f966a7ed6f692a': Key should be distinguished also by moreKeys contents and etc. Tadashi G. Takaoka2012-02-091-5/+9
|\| | | | | | |
| * | | | | | | 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.•••Change-Id: Ib2caabee6af78153b5a7be0e4df522288f2a7d48 Tadashi G. Takaoka2012-02-101-5/+9
* | | | | | | | | am 4baf767f: Merge "Improved shift key and symbol/alpha switch key accessibil...•••* commit '4baf767facb885bdbd271624e1c9d8cccc553bb4': Improved shift key and symbol/alpha switch key accessibility feedback. Charles Chen2012-02-094-19/+144
|\| | | | | | | |
| * | | | | | | | 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.•••Bug: 5933165 Change-Id: Id71f38874640785b7ad43b7a70e27f40c13be748 alanv2012-02-074-19/+144
* | | | | | | | | | am 0d1a5bad: Import translations. DO NOT MERGE•••* commit '0d1a5bad54441b6b1fb417cc5776f60586b32324': Import translations. DO NOT MERGE Eric Fischer2012-02-090-0/+0
|\| | | | | | | | |