Commit graph

4505 commits

Author SHA1 Message Date
The Android Open Source Project
d4eaa1bc32 Reconcile with ics-mr1-release
Change-Id: I4ad3da51622d4d250e96cb19c63ad2da723d9e82
2011-10-31 13:19:31 -07:00
Tadashi G. Takaoka
824876ebbb Merge "Fix JNI as 64bit ready" 2011-10-31 05:49:39 -07:00
satok
cbd8ece513 am 352b9310: Merge "Use reflection to get field values of SuggestionSpan" into ics-mr1
* commit '352b93104afa73fd53a04c4414bf382fcf477f04':
  Use reflection to get field values of SuggestionSpan
2011-10-31 12:26:22 +00:00
Tadashi G. Takaoka
5fdcd7d5cd Fix JNI as 64bit ready
Change-Id: I7a3ed2cee3b20744869aa5cf89ff9fd95f5ab8fe
2011-10-31 20:44:01 +09:00
The Android Automerger
b450b39a47 merge in ics-mr1-release history after reset to ics-mr1 2011-10-30 06:48:06 -07:00
satok
352b93104a Merge "Use reflection to get field values of SuggestionSpan" into ics-mr1 2011-10-28 18:26:11 -07:00
Svetoslav Ganov
adc5e6f12c am f2c57551: Merge "Removed lift-to-type from LatinIME accessibility." into ics-mr1
* commit 'f2c57551a70de651dc34bd2d73f5e622ba3887db':
  Removed lift-to-type from LatinIME accessibility.
2011-10-28 22:27:19 +00:00
Eric Fischer
653dda2865 Merge "Import revised translations." 2011-10-28 12:16:15 -07:00
Eric Fischer
f1a44148d1 Import revised translations.
Change-Id: I980a04f15289bc1af6b150e4329795865686de63
2011-10-28 11:39:17 -07:00
Svetoslav Ganov
f2c57551a7 Merge "Removed lift-to-type from LatinIME accessibility." into ics-mr1 2011-10-28 11:13:15 -07:00
satok
68ef7b77ed Use reflection to get field values of SuggestionSpan
Bug: 5440299
Change-Id: I5e40edf6f790c078c4a05d0d347a89d63f7c042a
2011-10-28 19:03:49 +09:00
Tadashi G. Takaoka
7e8cf3c093 Merge "Remove NULL from native/jni" 2011-10-28 01:14:47 -07:00
Tadashi G. Takaoka
94810dec21 Remove NULL from native/jni
Change-Id: I7c4e32d0d69876c7ea85d6997c9a40fa362152eb
2011-10-28 17:06:58 +09:00
Tadashi G. Takaoka
0e97148f6d Remove NULL from native/src
Change-Id: I5299af7773d28fd12faebbfe644829a401ae5644
2011-10-28 17:02:09 +09:00
Tadashi G. Takaoka
5049f5bbb4 Fix trivial compile issue
Change-Id: I9dbc51496dbdb2195bbe589b0c3b2cd7e3d2f1fc
2011-10-28 16:24:31 +09:00
Tadashi G. Takaoka
6f811bd13f Merge "Make some private method static" 2011-10-27 22:57:58 -07:00
Tadashi G. Takaoka
8fbf29e2d5 Make some private method static
Change-Id: Ia23765268be0ef89d7fe7c3f5372ed32d6615765
2011-10-28 13:31:31 +09:00
Tadashi G. Takaoka
3122cf8daa am 07a44557: Merge "Cancel pending rotation when another rotation start" into ics-mr1
* commit '07a445572f7fa21c0e24f5cdb0f0b88ff2adc672':
  Cancel pending rotation when another rotation start
2011-10-27 22:59:14 +00:00
Tadashi G. Takaoka
07a445572f Merge "Cancel pending rotation when another rotation start" into ics-mr1 2011-10-27 15:55:41 -07:00
Eric Fischer
69c81ff941 am 2e5e173a: (-s ours) am f4c1cd77: (-s ours) Import revised translations. DO NOT MERGE
* commit '2e5e173a85c157ea087fca01c5b09faa4f57211c':
  Import revised translations.  DO NOT MERGE
2011-10-27 21:54:20 +00:00
Eric Fischer
2e5e173a85 am f4c1cd77: (-s ours) Import revised translations. DO NOT MERGE
* commit 'f4c1cd7729eea7a48e084eaea0cb28013d9131ae':
  Import revised translations.  DO NOT MERGE
2011-10-27 21:46:49 +00:00
Ken Wakasa
24ddc12eb7 Merge "Display "Touch again to save" in the keyboard locale" 2011-10-27 09:58:08 -07:00
Eric Fischer
f4c1cd7729 Import revised translations. DO NOT MERGE
Change-Id: I10bc743f4d9c8c53beab37a5135e634ddf8bb99e
2011-10-27 09:54:05 -07:00
Eric Fischer
79fb53a83a am d36f3f83: (-s ours) Merge "Import revised translations. DO NOT MERGE" into ics-mr1
* commit 'd36f3f8393704b2d5a82d52f8df3a1db398c2853':
  Import revised translations.  DO NOT MERGE
2011-10-27 16:51:09 +00:00
Eric Fischer
d36f3f8393 Merge "Import revised translations. DO NOT MERGE" into ics-mr1 2011-10-27 09:46:05 -07:00
Ken Wakasa
644d33d60e Display "Touch again to save" in the keyboard locale
bug: 524239
Change-Id: I227c193ba149f9296f8b1cf40aa3d9cf4e6ae2ab
2011-10-28 00:33:15 +09:00
The Android Automerger
f2e4df1eb4 merge in ics-mr1-release history after reset to ics-mr1 2011-10-27 06:47:54 -07:00
Tadashi G. Takaoka
d862b93578 Cleanup unused function
Change-Id: Ic0895e1973b3879b2a63f7e0b888e9a0480be6f3
2011-10-27 19:58:46 +09:00
Tadashi G. Takaoka
dd25e4fa2c Cancel pending rotation when another rotation start
Bug: 5516802
Change-Id: Iccb0abeb94e6dc1322a98a0c744188bb74034c7f
2011-10-27 17:03:03 +09:00
Tadashi G. Takaoka
49998fc7d3 am 556a7147: Merge "Tweak more suggesitons modal tolerance a bit longer" into ics-mr1
* commit '556a7147c124d389da963ebda09410bfd61f5b18':
  Tweak more suggesitons modal tolerance a bit longer
2011-10-27 02:35:12 +00:00
Tadashi G. Takaoka
37c6bbb675 am a7c41996: Merge "Preventing infinite call of dismissMoreKeysPanel" into ics-mr1
* commit 'a7c419964f46d1c354e81c5688f5da6b43428c9a':
  Preventing infinite call of dismissMoreKeysPanel
2011-10-27 02:35:12 +00:00
Tadashi G. Takaoka
ab617c0745 am ba1c5d44: Merge "Add a few Arabic symbols" into ics-mr1
* commit 'ba1c5d44346eef1a6c05cdd11d504e9ebce3610f':
  Add a few Arabic symbols
2011-10-27 02:35:11 +00:00
Ken Wakasa
fc519eaaf6 am 2be38a0f: (-s ours) Merge "DO NOT MERGE: Fix a bug where the sequence numbers would be wrong" into ics-mr1
* commit '2be38a0faf23cd06f36d2be21feb72a30f23ff97':
  DO NOT MERGE: Fix a bug where the sequence numbers would be wrong
2011-10-27 02:35:11 +00:00
Alan Viverette
166530b195 Removed lift-to-type from LatinIME accessibility.
Bug: 5522854
Change-Id: I32df86450fa0d5dd9606609ea693d0e331b64b19
2011-10-26 18:52:08 -07:00
Eric Fischer
a54c178ea7 Import revised translations. DO NOT MERGE
Change-Id: I85572da23cd451558d994d8ac36faf1902f07f0d
2011-10-26 17:41:00 -07:00
Tadashi G. Takaoka
556a7147c1 Merge "Tweak more suggesitons modal tolerance a bit longer" into ics-mr1 2011-10-26 17:27:44 -07:00
Tadashi G. Takaoka
a7c419964f Merge "Preventing infinite call of dismissMoreKeysPanel" into ics-mr1 2011-10-26 17:27:35 -07:00
Tadashi G. Takaoka
ba1c5d4434 Merge "Add a few Arabic symbols" into ics-mr1 2011-10-26 17:27:21 -07:00
Ken Wakasa
2be38a0faf Merge "DO NOT MERGE: Fix a bug where the sequence numbers would be wrong" into ics-mr1 2011-10-26 16:21:11 -07:00
Eric Fischer
493d7d70c3 am 67095cf9: (-s ours) am b427b64d: (-s ours) Import revised translations. DO NOT MERGE
* commit '67095cf94359b5fa361aac5db926bdc871d0f6e1':
  Import revised translations.  DO NOT MERGE
2011-10-26 21:14:58 +00:00
Eric Fischer
67095cf943 am b427b64d: (-s ours) Import revised translations. DO NOT MERGE
* commit 'b427b64d08fa376929ff8bfcdb19ed49e6866b18':
  Import revised translations.  DO NOT MERGE
2011-10-26 21:09:01 +00:00
Eric Fischer
f1bf992270 am 531b5543: (-s ours) Import revised translations. DO NOT MERGE
* commit '531b5543fcf1582acd3a5038ec99b7b5cebfacd0':
  Import revised translations.  DO NOT MERGE
2011-10-26 18:32:18 +00:00
Eric Fischer
531b5543fc Import revised translations. DO NOT MERGE
Change-Id: Ie99d52a052033a4994b95b25209fade85d628736
2011-10-26 11:11:11 -07:00
Eric Fischer
b427b64d08 Import revised translations. DO NOT MERGE
Change-Id: Ie0d2eaf0ddd40a82b77de04d12a6cc23d0c6c720
2011-10-26 10:25:54 -07:00
Tadashi G. Takaoka
ef543c725e Merge "Use onCustomRequest to request haptick and audio feedback" 2011-10-26 07:54:23 -07:00
Tadashi G. Takaoka
d999ea4480 Use onCustomRequest to request haptick and audio feedback
Change-Id: I958f274d8cfebb1551cdf08f1bada50c20fb9ca0
2011-10-26 23:32:38 +09:00
Tadashi G. Takaoka
e648e83939 Merge "Remove eventTime argument from PointerTracker.onShowMoreKeysPanel" 2011-10-26 07:29:25 -07:00
Ed Heyl
0f99bb0888 am 720baf0c: Merge remote branch \'goog/ics-mr0\' into ics-mr1
* commit '720baf0cb3d6dcdf0b0024083824edaf905499ed':
2011-10-26 14:25:28 +00:00
Ken Wakasa
44f4d77b75 am cb8cb95d: Fix NPE
* commit 'cb8cb95d0afd340de9f1a0e15948f0068d2450bc':
  Fix NPE
2011-10-26 14:25:28 +00:00
The Android Automerger
5fcc33dac4 merge in ics-mr1-release history after reset to ics-mr1 2011-10-26 07:05:34 -07:00