e932a0ae78
Merge remote branch 'goog/master' into merge
...
Conflicts:
java/src/com/android/inputmethod/compat/InputMethodManagerCompatWrapper.java
java/src/com/android/inputmethod/compat/InputMethodSubtypeCompatWrapper.java
java/src/com/android/inputmethod/deprecated/voice/VoiceInputLogger.java
java/src/com/android/inputmethod/latin/SubtypeSwitcher.java
Change-Id: Ibcb1aa61cbab8ff1863260a579d26d065ee7bd40
2011-03-25 19:24:19 -07:00
829b97b28d
Fix lib and compat bugs.
...
Compat issues will be merged to master.
Change-Id: I3285606006483e247bea25ee77979cf71095b9c1
2011-03-25 18:42:23 -07:00
9115dd2723
Fix some compat bugs and add VoiceInputLoggerCompatUtils
...
Change-Id: I54ed0853ed4423704a300977d7880678e066a6fb
2011-03-25 18:38:20 -07:00
a511e0b432
Merge remote branch 'goog/master' into merge
...
Conflicts:
java/res/xml/method.xml
java/src/com/android/inputmethod/deprecated/VoiceProxy.java
java/src/com/android/inputmethod/keyboard/KeyboardId.java
java/src/com/android/inputmethod/latin/BinaryDictionary.java
java/src/com/android/inputmethod/latin/LatinIME.java
java/src/com/android/inputmethod/latin/Settings.java
java/src/com/android/inputmethod/latin/SubtypeSwitcher.java
java/src/com/android/inputmethod/latin/Utils.java
Change-Id: Ic102a0fbfc3b8f9dd65dd6eabb421f9211f5d9a5
2011-03-25 15:17:08 -07:00
65bae8ba84
merge in gingerbread-release history after reset to gingerbread
2011-03-25 14:32:09 -07:00
f1a81f5eb3
Move a debug utility function to EditorInfoCompatUtils
...
- imeOptionName
Change-Id: I7a7ea9bee410cedc0ef9b3d2aa4df8260d7f6a35
2011-03-25 12:56:57 -07:00
49cad5fd9d
merge in gingerbread-release history after reset to gingerbread
2011-03-25 06:04:37 -07:00
e9957752bc
Added InputTypeCompatUtils
...
Also Moved utilities related to InputType to InputTypeCompatUtils
Change-Id: Iab8ff5389f624f2abe627ece2acb156b0e1285ef
2011-03-25 00:46:40 -07:00
b2707856ab
Added InputConnectionCompatUtils and EditorInfoCompatUtils
...
Change-Id: Ie69d5e90c4ee978d3ecb40b68e6466082569ca7a
2011-03-24 22:57:58 -07:00
5a41db8814
Merge "Moved a functionality of setOverScrollMode to InputMethodServiceCompatWrapper"
2011-03-24 22:41:04 -07:00
a3ef6cde21
Moved a functionality of setOverScrollMode to InputMethodServiceCompatWrapper
...
Change-Id: Ie473c9fced9f0a8da5643390b44aa4b86128396d
2011-03-24 22:02:21 -07:00
01829b8847
Merge "Added VibratorCompatWrapper"
2011-03-24 21:49:00 -07:00
f000bdc696
Merge "Moved a functionality of setting touchableRegion to InputMethodServiceCompatWrapper."
2011-03-24 21:28:25 -07:00
699e429f19
Added VibratorCompatWrapper
...
Change-Id: I7640f051873f42aa15337edc718ac95ec1c51698
2011-03-24 21:25:22 -07:00
1ddf2a1808
Merge "Added InputMethodInfoCompatWrapper"
2011-03-24 21:03:17 -07:00
5cbc984ce1
Merge "Renamed Proxy classes"
2011-03-24 21:01:34 -07:00
b86905943c
Renamed Proxy classes
...
- VoiceConnector to VoiceProxy
- VoiceInputConnector to VoiceInputWrapper
- VoiceLoggerConnector to VoiceLoggerWrapper
Change-Id: I908ddc590c8846cf5cbd80b9c0257cb65c638bde
2011-03-24 17:50:19 -07:00
24119dfd41
Moved a functionality of setting touchableRegion to InputMethodServiceCompatWrapper.
...
Change-Id: I8b9fe507885ef5ae7cb09db93a977e23b1bbd0db
2011-03-24 13:27:45 -07:00
2e36fb68d0
Added InputMethodInfoCompatWrapper
...
Change-Id: I5f2970e986afbe3b0b24ccf819f57f524e83ef3f
2011-03-24 12:24:50 -07:00
40f1730888
merge in gingerbread-release history after reset to gingerbread
2011-03-24 08:49:04 -07:00
9107d98290
Add comments and basic reformatting for new files.
...
Ic4df2a9a introduced new keyboard layouts for Hebrew and Arabic.
This change adds a comment to them alongside with trailing
whitespace suppression.
This change explicitly limits its scope to files introduced by
Ic4df2a9a. It replaces I48927626 which has been deemed too reckless.
Change-Id: Id6b0e47f0623ead0b4e42e57dae359231a2b97fc
2011-03-24 00:32:10 -07:00
b916fab196
Merge "Add a first version of Hebrew and Arabic keyboard."
2011-03-23 22:36:42 -07:00
e50add1fbd
Add a first version of Hebrew and Arabic keyboard.
...
The Arabic keyboard is more or less based on PC keyboard and other
sources. It has no means to input diacritics at the moment.
Some data for the Hebrew keyboard was already there, but not used.
This change splits phone and tablet layout and consolidates the
tablet one to something that seems sensible. It can't input diacritics
either at the moment.
Other shortcomings affect those keyboards. For example, normal
Hebrew keyboards switch to capital QWERTY keyboard with shift on,
as there are no capital Hebrew characters, but this version does not
feature this.
It should be mostly possible already to enter Arabic or Hebrew with
these keyboards however.
Change-Id: Ic4df2a9a77ffd03c4f9ee2c47e03c0f43f8e48ae
2011-03-23 22:31:40 -07:00
525028c897
Merge "Remove a useless variable."
2011-03-23 22:14:19 -07:00
6dd7778d22
Fix a bug that Voice IME is not triggered properly.
...
Background:
Both SubtypeSwitcher and VoiceConnector have an instance of VoiceInput.
And VoiceConnector has a responsivity for setting VoiceInput to SubtypeSwitcher.
But in case that VoiceInputConnector already has an instance of VoiceInput
VoiceInputConnector doesn't set VoiceInput to SubtypeSwitcher.
Change-Id: I42d0220e7d84a08e03f143213cc6eff87e7e79a6
2011-03-23 13:05:06 -07:00
f8e67182f0
Merge "Add InputMethodServiceCompatWrapper for moving the callback from LatinIME."
2011-03-23 12:05:17 -07:00
4fc18095f5
Remove a useless variable.
...
Change-Id: Ifec283fcd397f7f42933220f19a807879ef6195e
2011-03-23 11:17:18 -07:00
a71146e38e
merge in gingerbread-release history after reset to gingerbread
2011-03-23 05:43:21 -07:00
10dd34de0f
Add InputMethodServiceCompatWrapper for moving the callback from LatinIME.
...
Change-Id: If6b0180c63738e5e78a20fe5b938ef50d62865d6
2011-03-23 01:12:27 -07:00
6a6308a3b9
am d22359e4: (-s ours) am f75f9c53: Import revised translations. DO NOT MERGE
...
* commit 'd22359e46beeb855da6cab21c5b51ec96f7ccb44':
Import revised translations. DO NOT MERGE
2011-03-22 14:08:24 -07:00
d22359e46b
am f75f9c53: Import revised translations. DO NOT MERGE
...
* commit 'f75f9c5303cf7f4e3254448c3430afb0075fd5be':
Import revised translations. DO NOT MERGE
2011-03-22 14:06:11 -07:00
f75f9c5303
Import revised translations. DO NOT MERGE
...
Change-Id: Icac4b15118a9a49cac6d0c70e5783e64fa430782
2011-03-22 13:40:31 -07:00
1689f4b284
merge in gingerbread-release history after reset to gingerbread
2011-03-22 13:10:29 -07:00
5dca37e20f
merge in gingerbread-release history after reset to gingerbread
2011-03-22 05:43:24 -07:00
e7e303fac2
merge in gingerbread-release history after reset to gingerbread
2011-03-21 05:42:27 -07:00
5862b4cb8a
Merge "Use reflections for classes related to InputMethodSubtype"
2011-03-19 13:25:50 -07:00
610f1dc855
Use reflections for classes related to InputMethodSubtype
...
Change-Id: Ica53ce879c2b4c5eb47f757fb788a795a881c30e
2011-03-18 22:49:57 -07:00
788c90daaa
Merge "Add -Werror flag to catch more warnings and errors"
2011-03-18 18:21:39 -07:00
de3070a71b
Add -Werror flag to catch more warnings and errors
...
Change-Id: I9c39ba24578931944aae8182918ed48a2e82eb39
2011-03-19 10:12:15 +09:00
4d68b86219
merge in gingerbread-release history after reset to gingerbread
2011-03-18 17:35:29 -07:00
bf9bc9900b
am 645f5e98: (-s ours) am f11c0a24: (-s ours) am e37ee542: Import revised translations. DO NOT MERGE
...
* commit '645f5e98ea44bee1d8e73801e1b0475b33db57b1':
Import revised translations. DO NOT MERGE
2011-03-18 17:05:43 -07:00
645f5e98ea
am f11c0a24: (-s ours) am e37ee542: Import revised translations. DO NOT MERGE
...
* commit 'f11c0a245694d8396405e9ee47172714282b176b':
Import revised translations. DO NOT MERGE
2011-03-18 17:02:42 -07:00
f11c0a2456
am e37ee542: Import revised translations. DO NOT MERGE
...
* commit 'e37ee542e688c6815e1640abf31dbe6e983dd825':
Import revised translations. DO NOT MERGE
2011-03-18 16:53:05 -07:00
e37ee542e6
Import revised translations. DO NOT MERGE
...
Change-Id: I09b8c4f7c9a0b89fe5c4da8202115dedaa237fc3
2011-03-18 15:17:46 -07:00
0a7cf81ca2
Merge "Add different ways of reading the dictionary file."
2011-03-18 12:19:00 -07:00
cba93f50c3
Add different ways of reading the dictionary file.
...
This change adds basic support for an external dictionary provider.
It adds methods for reading the dictionary itself from an asset in
the dictionary provider package directly, obtaining the file name
through the ContentProvider interface; it also adds a way of getting
the data through an InputStream and copying the file locally.
Incidentally this change also adds the code needed to listen for
updating the dictionary provider package and reloading it in time.
This change also goes hand-in-hand with Iab31db6e, which implements
the small closed part of this.
Issue: 3414944
Change-Id: I5e4fff99a59bb99dbdb002102db6c90e6cb41c8a
2011-03-18 12:16:50 -07:00
61bf22777c
merge in gingerbread-release history after reset to gingerbread
2011-03-18 10:41:43 -07:00
da4236fb51
Merge "Added CompatUtils for starting a language selector"
2011-03-17 20:36:42 -07:00
2cff4d7e4a
Added CompatUtils for starting a language selector
...
Change-Id: I158414efaff43d0c6abe1f9af83ed3425992dfb9
2011-03-18 12:33:04 +09:00
76c2ff2154
Import revised translations.
...
Change-Id: I02fb673c7b4f180fb60c5cb869c458b65820781a
2011-03-17 16:56:28 -07:00
satok
The Android Automerger
Jean Chalard
Eric Fischer
Ken Wakasa