Commit graph

3586 commits

Author SHA1 Message Date
Jean Chalard
ee34a9549e am 55072fef: Merge "Fix a bug where ampersands in XML would not work"
* commit '55072fefe601a08511df1b6387d918ca5831d2c7':
  Fix a bug where ampersands in XML would not work
2011-09-28 20:19:11 -07:00
Jean Chalard
55072fefe6 Merge "Fix a bug where ampersands in XML would not work" 2011-09-28 20:17:35 -07:00
satok
2258aa830e am 3da2b612: Merge "add vibration duration settings"
* commit '3da2b6128367498577fc4ac83cb07075c2904205':
  add vibration duration settings
2011-09-28 20:10:47 -07:00
satok
3da2b61283 Merge "add vibration duration settings" 2011-09-28 20:09:05 -07:00
satok
433965784d add vibration duration settings
Change-Id: I56a1a94df63160f367f866da759d7dd4fc428ed5
2011-09-29 11:46:20 +09:00
Eric Fischer
a2ee19e5df am 727672d3: (-s ours) am 4c5452c1: (-s ours) Import revised translations. DO NOT MERGE.
* commit '727672d3fc8038180cf5e193cda5c3574bfabdcd':
  Import revised translations.  DO NOT MERGE.
2011-09-28 17:02:50 -07:00
Eric Fischer
727672d3fc am 4c5452c1: (-s ours) Import revised translations. DO NOT MERGE.
* commit '4c5452c15ea301ce9b82b384a437a9868b1c9de1':
  Import revised translations.  DO NOT MERGE.
2011-09-28 17:01:10 -07:00
Eric Fischer
4c5452c15e Import revised translations. DO NOT MERGE.
Change-Id: I65bae1aaa5ed3371c3f9dc678080f1105015f5fa
2011-09-28 16:38:48 -07:00
Jean Chalard
e12e29ca7f Fix a bug where ampersands in XML would not work
Change-Id: Icc1bce28b78c4da2d529c308f251e298ea94539f
2011-09-28 20:58:59 +09:00
Jean Chalard
6238d1a3cd am 90086846: Merge "Change the logic of the LOOKS_LIKE_TYPO flag"
* commit '90086846dc9a677dafc1ea92138ac88f3f933046':
  Change the logic of the LOOKS_LIKE_TYPO flag
2011-09-28 04:03:15 -07:00
Jean Chalard
90086846dc Merge "Change the logic of the LOOKS_LIKE_TYPO flag" 2011-09-28 03:59:26 -07:00
Tadashi G. Takaoka
c4518d54ac am 2fc42487: Introduce hit box to Key and get rid of edge flags
* commit '2fc4248700023853980b0006c12425079e3f9257':
  Introduce hit box to Key and get rid of edge flags
2011-09-28 03:44:01 -07:00
Jean Chalard
647db70fec Change the logic of the LOOKS_LIKE_TYPO flag
It now follows the following logic:
- If the word should be filtered out => false
- Else => !IN_THE_DICTIONARY

This defines the behavior for ICS MR0, and prepares for addition
of a new HAS_LIKELY_SUGGESTIONS flag in MR1.

Bug: 5383800

Change-Id: I530b1404ae8cf3337ff68ef5ab0f4d95f2dad0e8
2011-09-28 19:42:43 +09:00
Tadashi G. Takaoka
2fc4248700 Introduce hit box to Key and get rid of edge flags
Change-Id: I2b78d2ca756223b5497d01127c3a0190dcc81e57
2011-09-28 19:31:37 +09:00
Yusuke Nojima
386489983d am a59f65ad: Merge "Extend JNI interface to pass the theme id of the keybaord to the native."
* commit 'a59f65ad0cadfd2e71ebbe7ca8b14285a4db6ae2':
  Extend JNI interface to pass the theme id of the keybaord to the native.
2011-09-27 20:36:29 -07:00
Tadashi G. Takaoka
cc4d71a062 am 63584323: Add themeId to Keyboard
* commit '63584323cab56c76debf6bb000621f2c605329a9':
  Add themeId to Keyboard
2011-09-27 20:36:29 -07:00
Yusuke Nojima
a59f65ad0c Merge "Extend JNI interface to pass the theme id of the keybaord to the native." 2011-09-27 20:27:17 -07:00
Tadashi G. Takaoka
63584323ca Add themeId to Keyboard
Change-Id: I6abdeaf41459406cf9021efdf5bb96232ba104c7
2011-09-28 12:08:48 +09:00
Yusuke Nojima
1c923d8581 Extend JNI interface to pass the theme id of the keybaord to the native.
Change-Id: I705ec2fa1d32a673a8d84bc9afc2a46208a414a1
2011-09-28 11:56:28 +09:00
Tadashi G. Takaoka
34e56f1a2e am ffd156c7: Postpone onDisplayCompletions until onStartInputView has been executed
* commit 'ffd156c77e93a54b704780b46886ba597d1c77cb':
  Postpone onDisplayCompletions until onStartInputView has been executed
2011-09-27 19:32:40 -07:00
Tadashi G. Takaoka
ffd156c77e Postpone onDisplayCompletions until onStartInputView has been executed
Bug: 5108267
Change-Id: I42d297ce4e4913e5dab5f5d647b1d13dc860b884
2011-09-28 09:36:40 +09:00
Tadashi G. Takaoka
8a89850dff am 5175f479: Merge "Forward touch events above the keyboard to the suggestions strip"
* commit '5175f4799ab0b5c8a0851861c43e92fc0daa32e2':
  Forward touch events above the keyboard to the suggestions strip
2011-09-27 03:25:23 -07:00
Tadashi G. Takaoka
5175f4799a Merge "Forward touch events above the keyboard to the suggestions strip" 2011-09-27 03:18:37 -07:00
Tadashi G. Takaoka
f451ed2012 Forward touch events above the keyboard to the suggestions strip
The gutter area between the suggestions strip and the top-row keys
looks like a part of the suggestions strip, and the touch events
landing on the area should be forwarded to the suggestions strip.

Bug: 5246673
Change-Id: I92af763be0feed21aa36ceffb5d575abe554f19e
2011-09-27 19:02:24 +09:00
Jean Chalard
78e0af9ddd am 091ee762: Merge "Fix a bug ending in a NPE in some rare cases."
* commit '091ee76285593d4c2a638d1927016e5bdfceccfd':
  Fix a bug ending in a NPE in some rare cases.
2011-09-27 02:33:27 -07:00
Jean Chalard
091ee76285 Merge "Fix a bug ending in a NPE in some rare cases." 2011-09-27 02:31:29 -07:00
Jean Chalard
cad25fc8a7 Fix a bug ending in a NPE in some rare cases.
Change-Id: If8109c6aa29d100eb745f17f0af756bcb6e3cabb
2011-09-27 18:03:42 +09:00
Tadashi G. Takaoka
d3fd8d2a6d am e4ff4d6b: Merge "Fix onDeatchedFromWindow to protected"
* commit 'e4ff4d6b1c14bb7ce20f8b93a90f9f80a3ea5fc3':
  Fix onDeatchedFromWindow to protected
2011-09-26 23:28:43 -07:00
Tadashi G. Takaoka
e4ff4d6b1c Merge "Fix onDeatchedFromWindow to protected" 2011-09-26 23:27:14 -07:00
Tadashi G. Takaoka
73cd4c1428 Fix onDeatchedFromWindow to protected
Change-Id: Ief666554ffd405a43363e66ea2bc2d87aa76a882
2011-09-27 15:18:02 +09:00
Yusuke Nojima
c9db25b0a5 am e76dbffe: Merge "Add explicit NULL check to latinime_Keyboard_setProximityInfo() and ProximityInfo::ProximityInfo()."
* commit 'e76dbffe002e37dee4d5cac25af06c63257632a2':
  Add explicit NULL check to latinime_Keyboard_setProximityInfo() and ProximityInfo::ProximityInfo().
2011-09-26 23:07:45 -07:00
Yusuke Nojima
e76dbffe00 Merge "Add explicit NULL check to latinime_Keyboard_setProximityInfo() and ProximityInfo::ProximityInfo()." 2011-09-26 23:06:19 -07:00
Yusuke Nojima
de2f8424ea Add explicit NULL check to latinime_Keyboard_setProximityInfo() and ProximityInfo::ProximityInfo().
Bug: 5375319
Change-Id: If3016ab56b6c62c8855b394f23e09e127a279be7
2011-09-27 14:51:41 +09:00
Ben Komalo
a9096d00d9 am 17fbdbc2: am 0b65f463: Merge "Mark IME as a core app" into ics-factoryrom
* commit '17fbdbc2614c8a1b56a05e93735d2f4ed85aa99e':
  Mark IME as a core app
2011-09-26 12:05:17 -07:00
Ben Komalo
17fbdbc261 am 0b65f463: Merge "Mark IME as a core app" into ics-factoryrom
* commit '0b65f463c3cb9437d185a4a6439463f85620a9ce':
  Mark IME as a core app
2011-09-26 12:02:20 -07:00
Ben Komalo
0b65f463c3 Merge "Mark IME as a core app" into ics-factoryrom 2011-09-26 12:00:55 -07:00
Jean Chalard
722636d9ba am b95f4540: Merge "Fix a possible deadlock."
* commit 'b95f4540180fe707c80dc987eaa965342623407b':
  Fix a possible deadlock.
2011-09-26 02:32:35 -07:00
Jean Chalard
b95f454018 Merge "Fix a possible deadlock." 2011-09-26 02:30:21 -07:00
Jean Chalard
a9876980c8 Fix a possible deadlock.
Bug: 5359873
Change-Id: I80ae901c43b6ae59879e3c8b1a9dd8a937d558c1
2011-09-26 18:16:24 +09:00
Tadashi G. Takaoka
fb34a903e0 am 049e49fb: Merge "Add horizontal edges paddings to phone/number layout"
* commit '049e49fb852f27880a1513481beb3aba792e4339':
  Add horizontal edges paddings to phone/number layout
2011-09-26 01:46:53 -07:00
Tadashi G. Takaoka
eeba16cec9 am 3829f363: Fix mini keyboard style on tablet device
* commit '3829f363dde72de570070020d7f2d1bace6b65e5':
  Fix mini keyboard style on tablet device
2011-09-26 01:46:52 -07:00
Tadashi G. Takaoka
049e49fb85 Merge "Add horizontal edges paddings to phone/number layout" 2011-09-26 01:44:07 -07:00
Tadashi G. Takaoka
287f4f83e9 Add horizontal edges paddings to phone/number layout
Bug: 4948171
Change-Id: I8a06a25ffcbd141c9418e77e982233166a347914
2011-09-26 17:11:01 +09:00
Tadashi G. Takaoka
3829f363dd Fix mini keyboard style on tablet device
Change-Id: Ib255697c606199e24e631ed886331d981c4dec38
2011-09-26 17:04:26 +09:00
Tadashi G. Takaoka
8d0b670434 am acf6b681: Merge "Fix keyboard row height calculation"
* commit 'acf6b6815a0cd474ef480537c0391b6851364916':
  Fix keyboard row height calculation
2011-09-25 19:27:13 -07:00
Tadashi G. Takaoka
acf6b6815a Merge "Fix keyboard row height calculation" 2011-09-25 19:25:28 -07:00
Tadashi G. Takaoka
8fbfac4ffb Fix keyboard row height calculation
The keyboard height will be distrubuted as:
  top_padding + (key_height + vertical_gap) * row_count - vertical_gap + bottom_padding

Change-Id: I841f356b9dbf8cfaf3756178bc9e4e6b2aa61364
2011-09-26 10:25:49 +09:00
Ken Wakasa
577d86d28c am c9f562a9: Partially revert I0fa5eefc
* commit 'c9f562a9a4c2b634eb43d1ddaef69068c0d93f6f':
  Partially revert I0fa5eefc
2011-09-23 18:07:11 -07:00
Ken Wakasa
c9f562a9a4 Partially revert I0fa5eefc
bug: 5344295
Change-Id: Idb10e37862773a62ff60afe874844e8968a58b5d
2011-09-24 09:38:45 +09:00
Eric Fischer
abab671de2 am 141c6219: (-s ours) am 3b2e030c: (-s ours) Import revised translations. DO NOT MERGE
* commit '141c62192b458f488810026103cec90a676e9044':
  Import revised translations.  DO NOT MERGE
2011-09-23 15:46:53 -07:00