54a6c982df
merge in ics-release history after reset to master
2011-10-27 07:02:02 -07:00
f2e4df1eb4
merge in ics-mr1-release history after reset to ics-mr1
2011-10-27 06:47:54 -07:00
d862b93578
Cleanup unused function
...
Change-Id: Ic0895e1973b3879b2a63f7e0b888e9a0480be6f3
2011-10-27 19:58:46 +09:00
dd25e4fa2c
Cancel pending rotation when another rotation start
...
Bug: 5516802
Change-Id: Iccb0abeb94e6dc1322a98a0c744188bb74034c7f
2011-10-27 17:03:03 +09:00
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
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
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
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
166530b195
Removed lift-to-type from LatinIME accessibility.
...
Bug: 5522854
Change-Id: I32df86450fa0d5dd9606609ea693d0e331b64b19
2011-10-26 18:52:08 -07:00
a54c178ea7
Import revised translations. DO NOT MERGE
...
Change-Id: I85572da23cd451558d994d8ac36faf1902f07f0d
2011-10-26 17:41:00 -07:00
556a7147c1
Merge "Tweak more suggesitons modal tolerance a bit longer" into ics-mr1
2011-10-26 17:27:44 -07:00
a7c419964f
Merge "Preventing infinite call of dismissMoreKeysPanel" into ics-mr1
2011-10-26 17:27:35 -07:00
ba1c5d4434
Merge "Add a few Arabic symbols" into ics-mr1
2011-10-26 17:27:21 -07:00
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
d0405b0dd6
undo reset to ics-mr1 until we have a better method
2011-10-26 21:53:27 +00:00
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
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
1619e168f6
reset to ics-mr1, but keep history
2011-10-26 18:50:25 +00:00
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
531b5543fc
Import revised translations. DO NOT MERGE
...
Change-Id: Ie99d52a052033a4994b95b25209fade85d628736
2011-10-26 11:11:11 -07:00
b427b64d08
Import revised translations. DO NOT MERGE
...
Change-Id: Ie0d2eaf0ddd40a82b77de04d12a6cc23d0c6c720
2011-10-26 10:25:54 -07:00
963c3c8d4e
merge in ics-release history after reset to master
2011-10-26 09:54:05 -07:00
cab62d712c
am ef543c72: Merge "Use onCustomRequest to request haptick and audio feedback"
...
* commit 'ef543c725e0d5bc322adc40e364fbaedd1861e4b':
Use onCustomRequest to request haptick and audio feedback
2011-10-26 07:56:05 -07:00
ef543c725e
Merge "Use onCustomRequest to request haptick and audio feedback"
2011-10-26 07:54:23 -07:00
d999ea4480
Use onCustomRequest to request haptick and audio feedback
...
Change-Id: I958f274d8cfebb1551cdf08f1bada50c20fb9ca0
2011-10-26 23:32:38 +09:00
b6b6465e5f
am e648e839: Merge "Remove eventTime argument from PointerTracker.onShowMoreKeysPanel"
...
* commit 'e648e839395de48166c961e603f08423de93fe5e':
Remove eventTime argument from PointerTracker.onShowMoreKeysPanel
2011-10-26 07:30:56 -07:00
e648e83939
Merge "Remove eventTime argument from PointerTracker.onShowMoreKeysPanel"
2011-10-26 07:29:25 -07:00
0653f84fba
am 0f99bb08: am 720baf0c: Merge remote branch \'goog/ics-mr0\' into ics-mr1
...
* commit '0f99bb088856576b963d89242b2a66995ecce9d4':
2011-10-26 07:27:46 -07:00
34d9b5307f
am 44f4d77b: am cb8cb95d: Fix NPE
...
* commit '44f4d77b75a2a34077a558e6edf107cd31775cc8':
Fix NPE
2011-10-26 07:27:45 -07:00
0f99bb0888
am 720baf0c: Merge remote branch \'goog/ics-mr0\' into ics-mr1
...
* commit '720baf0cb3d6dcdf0b0024083824edaf905499ed':
2011-10-26 14:25:28 +00:00
44f4d77b75
am cb8cb95d: Fix NPE
...
* commit 'cb8cb95d0afd340de9f1a0e15948f0068d2450bc':
Fix NPE
2011-10-26 14:25:28 +00:00
5fcc33dac4
merge in ics-mr1-release history after reset to ics-mr1
2011-10-26 07:05:34 -07:00
e51d164482
Remove eventTime argument from PointerTracker.onShowMoreKeysPanel
...
Change-Id: Idbcd6e3047c6c0c407e3b347cf9f65951d43a312
2011-10-26 20:54:35 +09:00
c47743e7db
am 5a0b4881: Merge "Group special spaces and double/swapped spaces in undo mode"
...
* commit '5a0b4881f892bf9dd714d1741817095daffae695':
Group special spaces and double/swapped spaces in undo mode
2011-10-26 04:47:59 -07:00
b35f70acec
Tweak more suggesitons modal tolerance a bit longer
...
Bug: 5459166
Change-Id: I18f10f7d537a451462cf7874e525c5eba103fb9a
2011-10-26 19:33:28 +09:00
5a0b4881f8
Merge "Group special spaces and double/swapped spaces in undo mode"
2011-10-26 03:19:58 -07:00
120586c226
Group special spaces and double/swapped spaces in undo mode
...
This introduces an elementary undo facility that accounts
for magic space, strong space, double space and its cancelling,
and swapped punctuation and its cancelling.
The former three were existing behavior ; this change adds
the swapped punctuation cancelling behavior.
Bug: 5454442
Change-Id: I87af633f30caa2788e9af725e556a7f0746d9a14
2011-10-26 19:12:55 +09:00
dec6c0f929
DO NOT MERGE: Fix a bug where the sequence numbers would be wrong
...
The spell checker cannot afford to return static objects,
seeing as the framework will then use the same objects to
pair the cookie and sequence ids to the request.
This is a backport of Ia9c3a933
Bug: 5503243
Change-Id: Ia9c3a933bfb30cf5525418b240ef60632d72c9d0
2011-10-26 17:57:00 +09:00
0cf7a45ac5
Preventing infinite call of dismissMoreKeysPanel
...
Bug: 5514583
Change-Id: Idf8dd1ebba0afdb768e538c2626b60770421d4be
2011-10-26 17:03:41 +09:00
7fe66ea42e
Add a few Arabic symbols
...
Bug: 5458689
Change-Id: I61ce876606ce3fa620d606752c8e5442b8ad78d6
2011-10-26 14:25:11 +09:00
720baf0cb3
Merge remote branch 'goog/ics-mr0' into ics-mr1
2011-10-25 19:50:41 +00:00
b3cbe88f99
am d726d093: Merge "Import revised translations."
...
* commit 'd726d093892e33e242726bcb3f349e78647f8fab':
Import revised translations.
2011-10-25 11:49:50 -07:00
d726d09389
Merge "Import revised translations."
2011-10-25 11:47:24 -07:00
ace21e5b57
Import revised translations.
...
Change-Id: I45b2224d22ea73a50b7bfcc1a05b3ece25f402c5
2011-10-25 11:08:58 -07:00
cb8cb95d0a
Fix NPE
...
bug: 5512097
Change-Id: Id6752c95c9c4b39e7975daa187a2ab92b740060a
2011-10-26 02:35:44 +09:00
3648b48900
merge in ics-release history after reset to master
2011-10-25 07:16:47 -07:00
d7d5a8ce9b
am d0c5f939: Cleanup.
...
* commit 'd0c5f9395a1b94e8425982e353d090f972dc44f0':
Cleanup.
2011-10-25 06:11:00 -07:00
404be78490
am ce668e7a: Small clean up.
...
* commit 'ce668e7a0b6ae7046e1f22a162ad174d58dfe145':
Small clean up.
2011-10-25 06:03:08 -07:00
d0c5f9395a
Cleanup.
...
Remove a state that can never be reached, and ajust all the
callers that would always have received false.
Change-Id: Iac025568be11743428419e0772da306a4f0a0bf1
2011-10-25 21:57:30 +09:00
ce668e7a0b
Small clean up.
...
Remove unused methods and constants.
Change-Id: If72e04394a2943b416915217d22cb6e58a0508b3
2011-10-25 21:35:43 +09:00
The Android Automerger
Tadashi G. Takaoka
Ken Wakasa
Alan Viverette
Eric Fischer
Ed Heyl
Jean Chalard