satok
eca9637390
Merge remote branch 'goog/master' into merge4
...
Conflicts:
java/res/values/strings.xml
Change-Id: Iee1abd3c11e07f681b9f7a280c3621a0c33ffc90
2010-09-07 22:37:39 +09:00
Ken Wakasa
fa12d86cb5
am dacc927a: am c1ff2846: Update strings for the settings access - based on the latest GB IME spec (ver 03). Please refer to bug: 2979069 for the latest mock.
...
Merge commit 'dacc927a57b0c7adfbdf244441b9b2495c959980'
* commit 'dacc927a57b0c7adfbdf244441b9b2495c959980':
Update strings for the settings access - based on the latest GB IME spec (ver 03).
2010-09-07 05:35:02 -07:00
Ken Wakasa
c1ff28462e
Update strings for the settings access - based on the latest GB IME spec (ver 03).
...
Please refer to bug: 2979069 for the latest mock.
Got rid of obsolete string too.
Change-Id: Ic02d1651b288f24f9c3a9da5d0dcf09055256ab0
2010-09-07 21:28:44 +09:00
satok
4d67480fe2
Merge remote branch 'goog/master' into mastermerge
...
Conflicts:
java/src/com/android/inputmethod/latin/LatinIME.java
Change-Id: I8fe443f434ced0cf18b1aa86e38fb8913a5b75c2
2010-09-03 22:57:28 +09:00
Eric Fischer
c788e3c3c9
Import revised translations
...
Change-Id: I4de68ff4db492e7efbaafaf01c7d1b97110a948a
2010-08-30 13:40:34 -07:00
Eric Fischer
22708e6638
Import revised translations. DO NOT MERGE
...
Change-Id: I968a456446b782b1e20cad0b6d3c82a8aa9a663a
2010-08-27 17:18:02 -07:00
satok
6fd90f55f4
Cherry pick Change I04497fa0: Merge from the private sandbox to the froyo-ub-latinimegoogle
...
Change-Id: I6c0304c6befc1b105d5dca7f96bb7532812c30f6
2010-08-27 15:54:02 +09:00
satok
979f869096
DO NOT MERGE. Backport LatinIME from master to Gingerbread
...
TODO: Cleanup will follow.
Change-Id: I4a68ba9f2f55760aa24187f1f13fdfa8a0b70963
2010-08-20 14:37:03 +09:00
Eric Fischer
1193da8ed2
Import revised translations.
...
Change-Id: I975bcb5cf09211c6379cc7e7ad89ea09d91e7ec1
2010-08-17 16:56:36 -07:00
Eric Fischer
15c37520c9
Import revised translations.
...
Change-Id: I5671feaa4760b2583052527f3026de9c4411c3a4
2010-08-05 16:10:04 -07:00
Eric Fischer
7faf89f801
Import revised translations. DO NOT MERGE
...
Change-Id: Ia4de960b5d1168d49b7a97b22751fde11047f5ea
2010-08-04 10:45:43 -07:00
satok
096b87a4b4
Fix a string for zh-rCN
...
Change-Id: I63d9c5254188a84c92cb4ff34988ebb5a2a034ae
2010-07-20 22:24:00 +09:00
satok
e04cc8b826
Change the name of the application to Latin Keyboard
...
Change-Id: I0ae02c61fae200672004028196d3e8d990b4c32c
2010-07-20 14:17:34 +09:00
satok
53393240e8
Merge commit 'goog/master'
...
Conflicts:
native/Android.mk
2010-05-07 19:57:51 +09:00
Kenny Root
0dfa3e6dad
Import revised translations
...
Change-Id: I1050cb361860cbea36bba762d37b4558dee8cecb
2010-04-27 14:30:47 -07:00
Ken Wakasa
1cf0ce74e8
Make this sandbox buildable under the froyo tree using symlink under vendor/google/apps.
...
Change-Id: Ia83a8e27d7a44a3a4dcf21b7a0bf0ab814f106ea
2010-04-07 18:58:46 +09:00
Kenny Root
1866d9ec83
Import revised translations
...
Change-Id: Id1db465dcf22f183bbf365f25905f408b51709f6
2010-03-17 22:16:48 -07:00
Amith Yamasani
07b1603a3f
Don't let the native code target be included twice when unbundling.
...
Move java code to a different directory so that the unbundled
version doesn't try to compile the native code again.
Change-Id: I05cf9e643824ddc448821f69805ccb0240c5b986
2010-03-09 15:01:09 -08:00
