Tadashi G. Takaoka
bdfb751d59
Merge "Fix popup key preview on tablet"
2011-04-07 00:17:25 -07:00
Tadashi G. Takaoka
da4bfbbbb3
Fix popup key preview on tablet
...
This change temporally enable popup key preview option on
tablet. (config_enable_show_popup_on_keypress_option).
Bug: 3286117
Change-Id: Iabbac5a333460e1ed2f8d05ba82f4bae81854b85
2011-04-07 15:56:16 +09:00
satok
cc6131053f
Merge remote-tracking branch 'goog/master' into deldebug
...
Conflicts:
java/res/xml/prefs.xml
Change-Id: Id09bebfe996f0c6a4b906e7225a6d0ac0d01a9a1
2011-04-07 12:57:10 +09:00
Eric Fischer
61393bf01c
am 42c89522: (-s ours) am fa62894c: Import revised translations. DO NOT MERGE
...
* commit '42c895225352da324198af0a5b192b59d9207201':
Import revised translations. DO NOT MERGE
2011-04-06 14:25:49 -07:00
Eric Fischer
42c8952253
am fa62894c: Import revised translations. DO NOT MERGE
...
* commit 'fa62894c4b4b0a63553989c483cf2446641b9117':
Import revised translations. DO NOT MERGE
2011-04-06 14:22:00 -07:00
Eric Fischer
fa62894c4b
Import revised translations. DO NOT MERGE
...
Change-Id: Ica512df634b9152aac5bcd5f15d783110724fd7d
2011-04-06 13:51:45 -07:00
Jean Chalard
3e23682862
Reinforce user-history based bigram use.
...
- Have user-history based bigrams used as soon as they are entered,
not after 6 times.
- Limit bigram frequency to 255 (this limits the multiplier to 1.8, and
has no effect on main dict bigrams which already have this limit)
- Some TODO resolving
bug: 4192129
Change-Id: I4777f1a58c43dd55381c4b01252d722ab3a70547
2011-04-06 12:26:01 +09:00
Eric Fischer
3b24b2bde7
am d84a3249: (-s ours) am bc226ce9: (-s ours) am d060ed99: Import revised translations. DO NOT MERGE
...
* commit 'd84a3249735891f030440f17cf2ca30ea22f444a':
Import revised translations. DO NOT MERGE
2011-04-05 10:27:42 -07:00
Eric Fischer
d84a324973
am bc226ce9: (-s ours) am d060ed99: Import revised translations. DO NOT MERGE
...
* commit 'bc226ce9227ffb280ac12195c5c6fff377c466c1':
Import revised translations. DO NOT MERGE
2011-04-04 17:43:17 -07:00
Eric Fischer
bc226ce922
am d060ed99: Import revised translations. DO NOT MERGE
...
* commit 'd060ed99464e14e19dc07bc2f770e2b83cfd16bc':
Import revised translations. DO NOT MERGE
2011-04-04 12:21:31 -07:00
The Android Automerger
fa8d2e9b93
merge in gingerbread-release history after reset to gingerbread
2011-04-01 13:27:48 -07:00
satok
fd58877d4f
Merge "Add settings for theme, userfeedback and other settings (temporary)"
2011-04-01 03:53:26 -07:00
satok
8f9b86fec5
Add settings for theme, userfeedback and other settings (temporary)
...
Change-Id: I063c48dbf021f5608c241a3543aa2628b5faaa40
2011-04-01 19:48:17 +09:00
satok
cd11fd9713
Merge "Remove debug mode." into froyo-ub-latinimegoogle
2011-04-01 03:33:57 -07:00
satok
04ee714d75
Remove debug mode.
...
Change-Id: I4ce46afe5d2cc03ffec7fb542176fc092593cf70
2011-04-01 19:09:56 +09:00
satok
1846efb8d1
Merge remote-tracking branch 'goog/master' into merge
2011-04-01 18:14:26 +09:00
satok
bbd377628a
Merge "Revert all hdpi assets to gingerbread"
2011-04-01 01:45:24 -07:00
satok
eee03627ce
Revert all hdpi assets to gingerbread
...
Bug: 4196962
- all hdpi assets are blurred.
Change-Id: I4a589f99ead2b8db96f03c19771f083306276e61
2011-04-01 17:44:48 +09:00
satok
44783b6965
Merge "Enable VoiceInput even if there is no shortcut subtype supported"
2011-04-01 00:35:57 -07:00
satok
7429009838
Enable VoiceInput even if there is no shortcut subtype supported
...
Change-Id: I1d455348f56d73ecb942f22c2bbd03f240b489a6
2011-04-01 16:12:06 +09:00
satok
6f18a1fbcc
Disable Recorrection when APIs are not supported.
...
Change-Id: I3b8fdc149d350215fd4852a50456824fe3fabe0b
2011-04-01 16:09:06 +09:00
The Android Automerger
d2b9ff5a7a
merge in gingerbread-release history after reset to gingerbread
2011-03-30 18:32:55 -07:00
Eric Fischer
a1f9cdd6f5
am 3678ce5a: (-s ours) am 991e88c5: am 4bad47f9: (-s ours) Import revised translations. DO NOT MERGE
...
* commit '3678ce5a2513de3b7f617238d6d5549f2697d017':
Import revised translations. DO NOT MERGE
2011-03-29 16:59:46 -07:00
Eric Fischer
3678ce5a25
am 991e88c5: am 4bad47f9: (-s ours) Import revised translations. DO NOT MERGE
...
* commit '991e88c5b83a7ffb2e49252c55b4429d6f24c4a4':
Import revised translations. DO NOT MERGE
2011-03-29 14:20:04 -07:00
Eric Fischer
991e88c5b8
am 4bad47f9: (-s ours) Import revised translations. DO NOT MERGE
...
* commit '4bad47f93943eb8e4545934c9e1804e43b5d55e9':
Import revised translations. DO NOT MERGE
2011-03-29 14:07:25 -07:00
Eric Fischer
4bad47f939
Import revised translations. DO NOT MERGE
...
Change-Id: I33a83686f71aa49855d807d580648f50ac4513da
2011-03-29 13:33:50 -07:00
Eric Fischer
959e018527
am 2186d96b: (-s ours) am 97c916a6: Import revised translations. DO NOT MERGE
...
* commit '2186d96b62b705258dafbc454f02a02f5d9c6965':
Import revised translations. DO NOT MERGE
2011-03-29 12:28:17 -07:00
Eric Fischer
2186d96b62
am 97c916a6: Import revised translations. DO NOT MERGE
...
* commit '97c916a6841c50931a6e507e4a835b9a015d5f6e':
Import revised translations. DO NOT MERGE
2011-03-29 12:25:06 -07:00
Eric Fischer
97c916a684
Import revised translations. DO NOT MERGE
...
Change-Id: I9c0ccba49ec84860ad5390d4c5f878a48f873cfe
2011-03-29 12:01:28 -07:00
Eric Fischer
d060ed9946
Import revised translations. DO NOT MERGE
...
Change-Id: I19cdfdaf6a4139dcc4100650dd23ca12e26ede2b
2011-03-29 10:58:43 -07:00
The Android Automerger
52485a946f
merge in gingerbread-release history after reset to gingerbread
2011-03-28 16:31:15 -07:00
The Android Automerger
38a0c6e91d
merge in gingerbread-release history after reset to gingerbread
2011-03-28 05:43:56 -07:00
The Android Automerger
4f64908e4a
merge in gingerbread-release history after reset to gingerbread
2011-03-25 22:25:43 -07:00
satok
cb04314341
Merge remote branch 'goog/master' into merge
2011-03-25 20:20:32 -07:00
satok
cf383a8175
Fix a NPE in InputMethodManagerCompatWrapper
...
Change-Id: Ia7c9b7135ba38a8df29464f7776b51d412f71acb
2011-03-25 20:01:24 -07:00
satok
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
satok
829b97b28d
Fix lib and compat bugs.
...
Compat issues will be merged to master.
Change-Id: I3285606006483e247bea25ee77979cf71095b9c1
2011-03-25 18:42:23 -07:00
satok
9115dd2723
Fix some compat bugs and add VoiceInputLoggerCompatUtils
...
Change-Id: I54ed0853ed4423704a300977d7880678e066a6fb
2011-03-25 18:38:20 -07:00
satok
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
The Android Automerger
65bae8ba84
merge in gingerbread-release history after reset to gingerbread
2011-03-25 14:32:09 -07:00
satok
f1a81f5eb3
Move a debug utility function to EditorInfoCompatUtils
...
- imeOptionName
Change-Id: I7a7ea9bee410cedc0ef9b3d2aa4df8260d7f6a35
2011-03-25 12:56:57 -07:00
The Android Automerger
49cad5fd9d
merge in gingerbread-release history after reset to gingerbread
2011-03-25 06:04:37 -07:00
satok
e9957752bc
Added InputTypeCompatUtils
...
Also Moved utilities related to InputType to InputTypeCompatUtils
Change-Id: Iab8ff5389f624f2abe627ece2acb156b0e1285ef
2011-03-25 00:46:40 -07:00
satok
b2707856ab
Added InputConnectionCompatUtils and EditorInfoCompatUtils
...
Change-Id: Ie69d5e90c4ee978d3ecb40b68e6466082569ca7a
2011-03-24 22:57:58 -07:00
satok
5a41db8814
Merge "Moved a functionality of setOverScrollMode to InputMethodServiceCompatWrapper"
2011-03-24 22:41:04 -07:00
satok
a3ef6cde21
Moved a functionality of setOverScrollMode to InputMethodServiceCompatWrapper
...
Change-Id: Ie473c9fced9f0a8da5643390b44aa4b86128396d
2011-03-24 22:02:21 -07:00
satok
01829b8847
Merge "Added VibratorCompatWrapper"
2011-03-24 21:49:00 -07:00
satok
f000bdc696
Merge "Moved a functionality of setting touchableRegion to InputMethodServiceCompatWrapper."
2011-03-24 21:28:25 -07:00
satok
699e429f19
Added VibratorCompatWrapper
...
Change-Id: I7640f051873f42aa15337edc718ac95ec1c51698
2011-03-24 21:25:22 -07:00
satok
1ddf2a1808
Merge "Added InputMethodInfoCompatWrapper"
2011-03-24 21:03:17 -07:00