7cbd0478cf
Merge "Do not display punctuation suggestions when bigrams are on." into jb-dev
2012-06-14 14:37:13 -07:00
002e43ead0
Merge "Remove irrelevant options." into jb-dev
2012-06-14 14:36:26 -07:00
d5b765b3bb
Do not display punctuation suggestions when bigrams are on.
...
Bug: 6310401
Change-Id: I9d31c48e287aceedaf2f4c5129031ddb31402451
2012-06-15 06:01:09 +09:00
78573f2e8a
Fix an NPE
...
This code is temporary until we get rid of this member.
Bug: 6662963
Bug: 6667091
Change-Id: I1d970d2a97992507e86c5b94978a2543fe42b375
2012-06-15 05:47:35 +09:00
15121cff37
Remove irrelevant options.
...
Bug: 6667355
Change-Id: I39b6db17fb52e80f510cf6462f41d9cb1f8e0341
2012-06-15 05:04:14 +09:00
32f4ceb243
Dismiss more suggestions panel when suggestions strip is closed
...
This change fixes possible NPE as well.
Bug: 6658028
Change-Id: I8706808d1002b7b0b95930fd9b08568f08645da6
2012-06-14 11:57:43 -07:00
d2f210dbe2
am d9c702d2: am 5caaf1b9: Merge "Do not add profanity to user history bigram dicitonary" into jb-dev
...
* commit 'd9c702d2ff017452f0264f2be12b6bffd6204e4a':
Do not add profanity to user history bigram dicitonary
2012-06-14 10:33:47 -07:00
c380959f48
am bbf18807: am 1db4f951: Fix the order of Persian diacritics
...
* commit 'bbf188075d5e14626c0609f4c3ee6031f6c6d5a6':
Fix the order of Persian diacritics
2012-06-14 10:33:46 -07:00
1738be868d
Merge "adjust string lengths for i18n"
2012-06-14 07:38:22 -07:00
dc5d28fcd7
merge in jb-release history after reset to jb-dev
2012-06-14 07:04:49 -07:00
d9c702d2ff
am 5caaf1b9: Merge "Do not add profanity to user history bigram dicitonary" into jb-dev
...
* commit '5caaf1b9e9720d0d3d461623a34dfe797a4095d0':
Do not add profanity to user history bigram dicitonary
2012-06-14 00:33:59 -07:00
5caaf1b9e9
Merge "Do not add profanity to user history bigram dicitonary" into jb-dev
2012-06-14 00:31:55 -07:00
bbf188075d
am 1db4f951: Fix the order of Persian diacritics
...
* commit '1db4f95105ba59651b074697ee01903af22b331f':
Fix the order of Persian diacritics
2012-06-14 00:30:08 -07:00
1db4f95105
Fix the order of Persian diacritics
...
The java source file KeyboardTextsSet.java has rather big change, but
this file is auto generated by "maketext" tool. The crucial part of
this change is in 5 XML resource files.
Bug: 6661783
Change-Id: I1d827ab0ebe6caa5ab73531682d6c32540b0d7aa
2012-06-14 15:18:25 +09:00
68c650fb2a
Do not add profanity to user history bigram dicitonary
...
Change-Id: I864c4206e3e6cde4d6ed687a9759e98901e16b9a
2012-06-14 15:15:08 +09:00
9c9802e647
Fix maketext tool to work correctly on darwin-x86
...
Bug: 6661783
Bug: 6662536
Change-Id: I5e657975098a0630ceb1821053cda68bf481d2e4
2012-06-13 22:32:28 -07:00
bd8a42f445
adjust string lengths for i18n
...
Bug: 6646837
Change-Id: Iecdc06f4fb0f651720ab188629e79f95f7c15ebb
2012-06-13 22:00:49 -07:00
9ada9f1bdd
Merge "Fix debug build"
2012-06-13 16:25:57 -07:00
1035bc990d
Fix debug build
...
Change-Id: I48a87967ac741455502ac1a18465ae6ed7ef0d12
2012-06-13 16:07:54 -07:00
6fa7ee3d3a
Merge "Import translations. DO NOT MERGE"
2012-06-13 15:36:56 -07:00
a4559dacb5
Import translations. DO NOT MERGE
...
Change-Id: Ic8c1aa9ddecf98077a6dfc5ebdee4b9ac0bf8c8c
2012-06-13 15:29:32 -07:00
14cecd5943
am efd308f5: am 3baa7767: Fix one letter suggestion text size on more suggestions panel
...
* commit 'efd308f5485b7459ab62e4e20fe95cf846ed6c47':
Fix one letter suggestion text size on more suggestions panel
2012-06-13 12:24:28 -07:00
efd308f548
am 3baa7767: Fix one letter suggestion text size on more suggestions panel
...
* commit '3baa7767e8e364364fb0a5b31cdf61b097dec799':
Fix one letter suggestion text size on more suggestions panel
2012-06-13 12:08:14 -07:00
3baa7767e8
Fix one letter suggestion text size on more suggestions panel
...
Bug: 6655216
Change-Id: Ie1fdd8e885a0fd95d3e811ab435ef3696b693d81
2012-06-13 10:44:47 -07:00
bbd7434229
Merge "Fix an occurrence of nested batch edits."
2012-06-13 10:37:12 -07:00
965e0c5531
merge in jb-release history after reset to jb-dev
2012-06-13 08:47:35 -07:00
687b662cf7
am 23e90f66: (-s ours) am 9ff5b647: Import translations. DO NOT MERGE
...
* commit '23e90f663d994e75743e4b6096b6622c2e5b1594':
Import translations. DO NOT MERGE
2012-06-12 16:38:34 -07:00
23e90f663d
am 9ff5b647: Import translations. DO NOT MERGE
...
* commit '9ff5b647a1e2a34fd295ac30637209db672b6a03':
Import translations. DO NOT MERGE
2012-06-12 16:35:55 -07:00
7b680585ae
Merge "Import translations. DO NOT MERGE"
2012-06-12 16:34:22 -07:00
b728947243
Import translations. DO NOT MERGE
...
Change-Id: Id7337defebfd196e839f37ce199c94c7df0ed949
2012-06-12 16:32:17 -07:00
9ff5b647a1
Import translations. DO NOT MERGE
...
Change-Id: Id2fa594ab5ed35119a1c924e8c97894fff4245bc
2012-06-12 16:28:01 -07:00
8fa20d6a36
Merge "Remove useless copy constructor of ProximityInfo"
2012-06-12 16:24:39 -07:00
9f42140ae2
Remove useless copy constructor of ProximityInfo
...
Change-Id: I56b4a99f670ad38708ad83d76b93a631295e3333
2012-06-12 15:13:07 -07:00
c7564a787e
Optimization
...
This is much faster. It doesn't create messages, it doesn't post
stuff in a queue, it doesn't delay execution of other messages.
Also, it decouples the timer from the functionality of the Handler
so this can be pulled up in another change to consolidate with
mLastKeyTime or so.
Change-Id: I9044fc031373e66b9b40eee8025633613d0945dc
2012-06-13 07:02:07 +09:00
9d71748ba4
Fix an occurrence of nested batch edits.
...
This is harmless, but against policy.
Also, rework the checking code to be more readable, give more
information, and be called for all relevant methods - and not
for informative methods, which are not required to be in a
batch edit.
Change-Id: I03fa8b2e7d68a6a133f86be8a214671750c29256
2012-06-13 07:02:07 +09:00
72b358aa90
Small optimization.
...
This will avoid some two-way IPC calls.
Change-Id: If9eb3e99b3d08346aadd4bbed2a1761f8c2527b9
2012-06-13 07:02:07 +09:00
32b56fd34d
am 3894e25f: (-s ours) am 62b1e672: Merge "Import translations. DO NOT MERGE" into jb-dev
...
* commit '3894e25f011595d550506edddd6d1f522f6ec90e':
Import translations. DO NOT MERGE
2012-06-12 14:52:26 -07:00
84bb18f4c9
resolved conflicts for merge of ee78e780 to master
...
Change-Id: I88a4996bdd17c5378a67781d8075eff311670c3b
2012-06-13 06:45:38 +09:00
3894e25f01
am 62b1e672: Merge "Import translations. DO NOT MERGE" into jb-dev
...
* commit '62b1e67215cef632b9447839ff5b1bd268dc3924':
Import translations. DO NOT MERGE
2012-06-12 12:43:45 -07:00
ee78e780fc
am 6a71f061: Fix UserHistoryBigram data contention in UserHistoryDictionary
...
* commit '6a71f0610c137c613a5fa44a658f31e9f4ec5525':
Fix UserHistoryBigram data contention in UserHistoryDictionary
2012-06-12 12:43:07 -07:00
58d9e46ce0
Merge "Consolidate a test."
2012-06-12 11:50:36 -07:00
4b3ae50eef
Merge "Use InstrumentationTestCase and get rid of AndroidTestCase.getTestContext call"
2012-06-12 11:49:55 -07:00
5e50eec570
Merge "Check inputs to ResearchLogger"
2012-06-12 11:39:11 -07:00
e86054e5c2
Consolidate a test.
...
Stop using the numerical value, use the actual method
Change-Id: Iffa7f2d21a0471c7862afd3234cc9c5dd86feb2e
2012-06-13 03:34:58 +09:00
53eedaea92
Merge "Consolidate auto-correction settings."
2012-06-12 11:29:21 -07:00
364d8f8fca
merge in jb-release history after reset to jb-dev
2012-06-12 11:25:15 -07:00
9a5bf1d12e
Use InstrumentationTestCase and get rid of AndroidTestCase.getTestContext call
...
Bug: 6202480
Change-Id: I19e04f17614e70867f8383d08667e350d753cde9
2012-06-12 11:23:56 -07:00
9224b437b0
Merge "Move two methods in a more appropriate place"
2012-06-12 11:23:22 -07:00
65fc909e13
Check inputs to ResearchLogger
...
to avoid NPEs.
Bug: 6188932
Change-Id: I377ceaac867df879dc7984dae44e96b369858cca
2012-06-12 10:56:03 -07:00
703eb8bf96
Fix UserHistoryBigram data contention in UserHistoryDictionary
...
Bug: 6637614
Change-Id: I34d26563e59d3b09bf35b8173dac5645ccb6a39f
2012-06-12 08:20:07 -07:00
Jean Chalard
Tadashi G. Takaoka
Satoshi Kataoka
Kurt Partridge
The Android Automerger
Eric Fischer
Ying Wang