satok
a7ea6cad82
Merge remote branch 'goog/master' into merge
...
Conflicts:
java/res/xml/method.xml
java/src/com/android/inputmethod/latin/LatinIME.java
java/src/com/android/inputmethod/latin/SubtypeSwitcher.java
java/src/com/android/inputmethod/voice/VoiceIMEConnector.java
Change-Id: I9b62da120dcc08327fde92459ee5c7564a5eb6b8
2011-02-10 17:31:37 +09:00
Tadashi G. Takaoka
5cd87e1b1c
Disable shortcut key when network is not available
...
Bug: 3345931
Change-Id: I1deef774598b8e78da4404535b6d3814464a9d2d
2011-01-26 17:07:55 +09:00
satok
d12def6dc8
Merge remote branch 'goog/master' into merge
...
Conflicts:
java/res/values-cs/strings.xml
java/res/values-da/strings.xml
java/res/values-de/strings.xml
java/res/values-el/strings.xml
java/res/values-es-rUS/strings.xml
java/res/values-es/strings.xml
java/res/values-fr/strings.xml
java/res/values-it/strings.xml
java/res/values-ja/strings.xml
java/res/values-ko/strings.xml
java/res/values-nb/strings.xml
java/res/values-nl/strings.xml
java/res/values-pl/strings.xml
java/res/values-pt-rPT/strings.xml
java/res/values-pt/strings.xml
java/res/values-ru/strings.xml
java/res/values-sv/strings.xml
java/res/values-tr/strings.xml
java/res/values-xlarge/dimens.xml
java/res/values-zh-rCN/strings.xml
java/res/values-zh-rTW/strings.xml
java/res/values/bools.xml
java/res/xml/kbd_qwerty_rows.xml
java/res/xml/method.xml
java/res/xml/prefs.xml
Change-Id: I8768d16965e6e82c14ee742b9ada56438497eb86
2010-12-27 20:13:16 +09:00
Tadashi G. Takaoka
9502cc177c
Remove LatinIME prefix from classes
...
This change also cleanups preference key string constants
Change-Id: I58510f220a90d00d71a935731abeab87384675bb
2010-12-09 21:54:51 +09:00
Tadashi G. Takaoka
fa086c9076
Cleanup unused Java import
...
This change also fixes wrong file mode.
Change-Id: Ifcf4c9444ddcdc62d2e4b394891d6eee135c1e8f
2010-11-29 17:57:48 +09:00
satok
bf96661d33
Add Debug Settings Activity
...
Bug:3033472
Change-Id: I311c66ac3c612a30d7da3be8ee35a352f49016ac
2010-09-27 14:07:10 +09:00
satok
17fe18350f
Delete version
...
Change-Id: Ie35004662f070a2284a0dbe2d20b9cfe4cc41602
2010-08-27 16:20:03 +09: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
Amith Yamasani
b248c2f7bf
Remove the shared uid for LatinIME
...
Bug: 2512241
Since we cannot market update apps with shared uid, had to be removed.
Added READ_CONTACTS permission, now that it has a non-shared uid.
2010-03-16 14:01:52 -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
