The Android Automerger
|
08ffdeb534
|
merge in ics-mr1-release history after reset to ics-mr1
|
2012-02-14 14:17:15 -08:00 |
|
Ken Wakasa
|
cadce1f5a7
|
Merge "Use more standard Unicode notations in keyboard layout resource files."
|
2012-02-14 14:01:51 -08:00 |
|
Ken Wakasa
|
a56639613b
|
Use more standard Unicode notations in keyboard layout resource files.
bug: 5988656
Change-Id: Ie2416ccd790f29934a37e9dc77d7525e5113048a
|
2012-02-15 06:44:09 +09:00 |
|
Jean-Baptiste Queru
|
26e315785d
|
resolved conflicts for merge of 3ad1145a to master
Change-Id: I13159b95f90c5095373951bf9e91b7dbf8b14558
|
2012-02-14 13:09:49 -08:00 |
|
Jean-Baptiste Queru
|
3ad1145a8f
|
am ec4a8580: am e9768273: am efcb3b95: Merge "[MIPS] Remove reference to NDK"
* commit 'ec4a8580257fa78e761a44a68e7c028081c4f559':
[MIPS] Remove reference to NDK
|
2012-02-14 12:44:57 -08:00 |
|
Jean-Baptiste Queru
|
ec4a858025
|
am e9768273: am efcb3b95: Merge "[MIPS] Remove reference to NDK"
* commit 'e97682739712440d1025c53cd224253ef24f4dfe':
[MIPS] Remove reference to NDK
|
2012-02-14 12:42:55 -08:00 |
|
Jean-Baptiste Queru
|
e976827397
|
am efcb3b95: Merge "[MIPS] Remove reference to NDK"
* commit 'efcb3b95dff5494660bf34930cda10545d043297':
[MIPS] Remove reference to NDK
|
2012-02-14 12:39:12 -08:00 |
|
Jean-Baptiste Queru
|
efcb3b95df
|
Merge "[MIPS] Remove reference to NDK"
|
2012-02-14 07:55:49 -08:00 |
|
Eric Fischer
|
ad0987c33b
|
am 30056790: Import translations.
* commit '30056790ab1f37a0b92e3f7306402dacba100efa':
Import translations.
|
2012-02-13 16:47:47 -08:00 |
|
Eric Fischer
|
30056790ab
|
Import translations.
Change-Id: I20219089b9431b0b481b943a298b693e3060ba13
|
2012-02-13 15:21:40 -08:00 |
|
Eric Fischer
|
b396ea9ede
|
Import translations. DO NOT MERGE
Change-Id: I8be564ef6befc36c59caa155f4b9c6c74740d75b
|
2012-02-13 15:19:16 -08:00 |
|
Ken Wakasa
|
6a68ebe578
|
am f6f40539: Minor string updates in Android keyboard settings
* commit 'f6f40539aad882492f1773809db17535eb1aab02':
Minor string updates in Android keyboard settings
|
2012-02-13 10:37:31 -08:00 |
|
Ken Wakasa
|
f6f40539aa
|
Minor string updates in Android keyboard settings
bug: 5999345
Change-Id: I77560b02c71c3ba0c525572b7062ebbfd66b3b85
|
2012-02-14 03:32:39 +09:00 |
|
Ken Wakasa
|
401966da73
|
am 09c677f5: Replace UTF-8 string resources with their hex representations
* commit '09c677f56ac0f155c6ecce3776d8c93c20625562':
Replace UTF-8 string resources with their hex representations
|
2012-02-12 02:29:18 -08:00 |
|
Ken Wakasa
|
09c677f56a
|
Replace UTF-8 string resources with their hex representations
bug: 5988656
Change-Id: Ifc3c3a2eccfc23d75b4066c2c9c02c48dacda55b
|
2012-02-11 23:05:23 +09:00 |
|
Eric Fischer
|
816f51ba11
|
am 1bd181fe: Import translations.
* commit '1bd181fefa348650412b20f89ad683002c206405':
Import translations.
|
2012-02-10 15:30:37 -08:00 |
|
Eric Fischer
|
1bd181fefa
|
Import translations.
Change-Id: I126a880289de548e914ac442740e789e067e5124
|
2012-02-10 14:14:38 -08:00 |
|
Eric Fischer
|
3a4d6321aa
|
Import translations. DO NOT MERGE
Change-Id: I6a592e84d239cf9df93f01aa0c2815c8caba7b41
|
2012-02-10 14:12:06 -08:00 |
|
Eric Fischer
|
9b1cb6d560
|
am bf01b629: am 5d0aeda9: (-s ours) am f2cacdae: am c85dde47: Import translations. DO NOT MERGE
* commit 'bf01b62901cc6009d1284d3940a7a8b9e9a6e0d8':
|
2012-02-10 10:57:29 -08:00 |
|
Eric Fischer
|
bf01b62901
|
am 5d0aeda9: (-s ours) am f2cacdae: am c85dde47: Import translations. DO NOT MERGE
* commit '5d0aeda964e23e6b96a24539c6430146cc9426e9':
|
2012-02-10 10:54:05 -08:00 |
|
Eric Fischer
|
5d0aeda964
|
am f2cacdae: am c85dde47: Import translations. DO NOT MERGE
* commit 'f2cacdaeef4f5fd07a51ead76396dbbdad33187b':
|
2012-02-10 10:49:57 -08:00 |
|
Eric Fischer
|
81741a97c9
|
am 073ea09b: am cdca8c8e: (-s ours) am f9c3be4d: (-s ours) am c85dde47: Import translations. DO NOT MERGE
* commit '073ea09bbf41318a1b2a2b809cd4774a1988dc66':
Import translations. DO NOT MERGE
|
2012-02-10 10:25:01 -08:00 |
|
Eric Fischer
|
073ea09bbf
|
am cdca8c8e: (-s ours) am f9c3be4d: (-s ours) am c85dde47: Import translations. DO NOT MERGE
* commit 'cdca8c8e68a1a9e57060a5a37886505276bf8485':
Import translations. DO NOT MERGE
|
2012-02-10 10:20:17 -08:00 |
|
Eric Fischer
|
cdca8c8e68
|
am f9c3be4d: (-s ours) am c85dde47: Import translations. DO NOT MERGE
* commit 'f9c3be4d8b2016d50c080e23f8cd7d283409e669':
Import translations. DO NOT MERGE
|
2012-02-10 10:16:10 -08:00 |
|
Eric Fischer
|
f2cacdaeef
|
am c85dde47: Import translations. DO NOT MERGE
* commit 'c85dde47e89f19aad3a29de08c11ae97f79be618':
Import translations. DO NOT MERGE
|
2012-02-10 10:13:40 -08:00 |
|
Eric Fischer
|
f9c3be4d8b
|
am c85dde47: Import translations. DO NOT MERGE
* commit 'c85dde47e89f19aad3a29de08c11ae97f79be618':
Import translations. DO NOT MERGE
|
2012-02-10 10:12:36 -08:00 |
|
Tadashi G. Takaoka
|
b6ab6a0bfd
|
am 6213983f: Refactor MoreKeysKeyboard.Builder
* commit '6213983fa147d010ce30314f43b0a1800d2528ba':
Refactor MoreKeysKeyboard.Builder
|
2012-02-10 01:56:35 -08:00 |
|
Tadashi G. Takaoka
|
6213983fa1
|
Refactor MoreKeysKeyboard.Builder
Change-Id: Ib5f58b1143be60c748b81299ccc3b237d2587846
|
2012-02-10 18:53:54 +09:00 |
|
Tadashi G. Takaoka
|
e5637345af
|
am b9e10c31: Merge "Key should be distinguished also by moreKeys contents and etc."
* commit 'b9e10c318a073b671dc51271c1f966a7ed6f692a':
Key should be distinguished also by moreKeys contents and etc.
|
2012-02-09 23:52:55 -08:00 |
|
Tadashi G. Takaoka
|
b9e10c318a
|
Merge "Key should be distinguished also by moreKeys contents and etc."
|
2012-02-09 23:51:18 -08:00 |
|
Charles Chen
|
207b7cd6ba
|
am 4baf767f: Merge "Improved shift key and symbol/alpha switch key accessibility feedback."
* commit '4baf767facb885bdbd271624e1c9d8cccc553bb4':
Improved shift key and symbol/alpha switch key accessibility feedback.
|
2012-02-09 15:35:55 -08:00 |
|
Charles Chen
|
4baf767fac
|
Merge "Improved shift key and symbol/alpha switch key accessibility feedback."
|
2012-02-09 15:33:40 -08:00 |
|
Eric Fischer
|
150d0ec97b
|
am 0d1a5bad: Import translations. DO NOT MERGE
* commit '0d1a5bad54441b6b1fb417cc5776f60586b32324':
Import translations. DO NOT MERGE
|
2012-02-09 13:07:01 -08:00 |
|
Eric Fischer
|
0d1a5bad54
|
Import translations. DO NOT MERGE
Change-Id: I221670b8e4796346d13a44848f8958904e9bac80
|
2012-02-09 12:46:37 -08:00 |
|
Eric Fischer
|
0fda4848a1
|
Import translations. DO NOT MERGE
Change-Id: Ibbf47bac70a1c684a3b139f34291607bddbaa2ca
|
2012-02-09 12:44:33 -08:00 |
|
Tadashi G. Takaoka
|
fdb6999e55
|
Key should be distinguished also by moreKeys contents and etc.
Change-Id: Ib2caabee6af78153b5a7be0e4df522288f2a7d48
|
2012-02-10 03:17:39 +09:00 |
|
Eric Fischer
|
c85dde47e8
|
Import translations. DO NOT MERGE
Change-Id: Ia22dacfc8e78a6e4c78f24375c3ef96a01fd4321
|
2012-02-08 19:21:19 -08:00 |
|
Jean Chalard
|
f507c1624c
|
am accd2a9f: Merge "Add finals"
* commit 'accd2a9f61e3289fc66d2b79ef54e2e06c5ff43b':
Add finals
|
2012-02-08 19:09:41 -08:00 |
|
Jean Chalard
|
accd2a9f61
|
Merge "Add finals"
|
2012-02-08 19:08:09 -08:00 |
|
Jean Chalard
|
360a66cf75
|
am a828f613: Merge "Some more simplification"
* commit 'a828f613a8dfbeff6290f261bbbd5ff988fb99b6':
Some more simplification
|
2012-02-08 19:06:52 -08:00 |
|
Jean Chalard
|
64cd6204a9
|
am 4721427c: Allow revert swap punctuation again
* commit '4721427c7de3600f6fe7dfff16508a6a974fb3e4':
Allow revert swap punctuation again
|
2012-02-08 19:06:51 -08:00 |
|
Jean Chalard
|
a828f613a8
|
Merge "Some more simplification"
|
2012-02-08 19:05:46 -08:00 |
|
Jean Chalard
|
8ff0564f6a
|
Add finals
Change-Id: Ib81be9a0df34c5e9fc49d2b5d9bf02297ea2b499
|
2012-02-09 11:40:54 +09:00 |
|
Jean Chalard
|
6a800b253f
|
Some more simplification
Remove useless method calls, and ultimately remove useless
method.
Change-Id: I3f353b1b37460d5e9ceae5cb5dde3fff0da81c21
|
2012-02-09 11:38:03 +09:00 |
|
Jean Chalard
|
4721427c7d
|
Allow revert swap punctuation again
This may not be the best behavior, but it's the same as ICS.
Bug: 5981844
Change-Id: Ibb7798e2a315312310ed3be4e731d0fe1ac04456
|
2012-02-09 11:34:00 +09:00 |
|
Eric Fischer
|
9571e17b50
|
am 7ef97ea1: Import translations. DO NOT MERGE
* commit '7ef97ea1f916cb1e53ec0fcaa07da87258833712':
Import translations. DO NOT MERGE
|
2012-02-08 15:34:24 -08:00 |
|
Eric Fischer
|
7ef97ea1f9
|
Import translations. DO NOT MERGE
Change-Id: I02629c1f8dd311899b3aba89bfb1390150ace7ac
|
2012-02-08 13:56:30 -08:00 |
|
Eric Fischer
|
8de2bd1bc5
|
Import translations. DO NOT MERGE
Change-Id: I492ab5c1ef14e0d035323d4cbdeb56d6a0e8e31c
|
2012-02-08 13:55:24 -08:00 |
|
Tadashi G. Takaoka
|
69b81e3dd3
|
am 5962312b: Custom action label should be a part of keyboard identifier
* commit '5962312b0724d8546ef76e3cd065b7baf578822f':
Custom action label should be a part of keyboard identifier
|
2012-02-08 06:48:59 -08:00 |
|
Tadashi G. Takaoka
|
5962312b07
|
Custom action label should be a part of keyboard identifier
Change-Id: Ia14cabc3d49fbdcb11dd00225d225fbb91cc4012
|
2012-02-08 20:09:39 +09:00 |
|