2f387da0ac
Reconcile with jb-mr2-release jb-mr2-zeroday-release - do not merge
...
Change-Id: I974082d633cb4b996ec0fb718be4f487f42bf0fc
2013-06-10 08:14:13 -07:00
a063ccb00e
merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev
2013-06-09 05:55:55 -07:00
8ea77542f9
Merge "Import translations. DO NOT MERGE"
2013-06-07 17:10:49 +00:00
fe95e7b1bf
Merge "Fix possible NPE"
2013-06-07 11:09:52 +00:00
77f63c8ac6
Don't use RichInputMethodManager in setup wizard
...
In setup wizard, InputMethodManager may not be able to be aware that
this IME is installed, especially just after the IME is installed via
GooglePlay app and hit the open button on the app to launch the setup
wizard.
Bug: 9299618
Change-Id: I00c8544178b41074253d49ae9481996ec56593d2
2013-06-07 19:09:44 +09:00
6c8136d157
Fix possible NPE
...
Bug: 9314901
Change-Id: Id80f59df38ae72766b097fd1c23326fedd302439
2013-06-07 19:08:58 +09:00
b0e0c5a844
Merge "Defer getting no language subtype"
2013-06-07 10:00:19 +00:00
d3c283d5db
Merge "Fix an illegal argument exception"
2013-06-07 09:38:17 +00:00
0ad1489625
Fix an illegal argument exception
...
This is a bit of a shot in the dark, as I really don't see how this
can happen, but this should fix it in the correct way no matter
how it's actually happening.
Bug: 9301836
Change-Id: I472865b7a78883942c9fd46773238c23788674f8
2013-06-07 18:23:00 +09:00
254b484e75
Defer getting no language subtype
...
Bug: 9318351
Change-Id: I55338c001070655a3f90df3dbe1351bd4180d520
2013-06-07 18:20:31 +09:00
c597da45ba
Add HTC One special edition (DO NOT MERGE)
...
This change also fixes a cosmetic regexp bug in Galaxy SIII.
Bug: 9109493
Change-Id: Ie93ae38d1ca1817d4019bb1483ab7f3740564b96
2013-06-06 15:22:13 -07:00
1665cc27f2
am 05ee43dc: (-s ours) am a009d2c9: Add HTC One special edition (DO NOT MERGE)
...
* commit '05ee43dc288553d418d906e3681b25dc55a2144d':
Add HTC One special edition (DO NOT MERGE)
2013-06-06 12:48:02 -07:00
05ee43dc28
am a009d2c9: Add HTC One special edition (DO NOT MERGE)
...
* commit 'a009d2c98da9749bf6ae4d92ef5fb3d3e945530f':
Add HTC One special edition (DO NOT MERGE)
2013-06-06 12:45:47 -07:00
091a453292
Merge "Add HTC One special edition"
2013-06-06 08:39:10 +00:00
a009d2c98d
Add HTC One special edition (DO NOT MERGE)
...
This change also fixes a cosmetic regexp bug in Galaxy SIII.
Bug: 9109493
Change-Id: Ie93ae38d1ca1817d4019bb1483ab7f3740564b96
2013-06-06 17:33:42 +09:00
eab37ec2e5
Add HTC One special edition
...
Bug: 9109493
Change-Id: I6eb060a93d7afbcc5aaa2aaece242044db255829
2013-06-06 17:33:23 +09:00
6910032972
Merge "Use an iterator to remove stuff from an ArrayList."
2013-06-06 08:19:41 +00:00
0dc422e0c7
Use an iterator to remove stuff from an ArrayList.
...
Silly me >.>
Bug: 9306154
Change-Id: Ic00e9d6a31cd1d7aacefe68b7be9c2199e297b0d
2013-06-06 17:03:16 +09:00
efd26bb319
Allow downloadable dictionaries in development builds
...
Bug: 9305379
Change-Id: Iab32753070a056d3861a45aa898911b7ab67dfb6
2013-06-05 22:14:54 -07:00
f6a1a76524
Merge "Fix a possible NPE"
2013-06-06 05:02:46 +00:00
6f9c6f2c64
Fix a possible NPE
...
Bug: 9301208
Change-Id: Id120c99ab9ef698d16cf7b8beea30c98c95d23a1
2013-06-06 12:01:22 +09:00
f93850f06f
Import translations. DO NOT MERGE
...
Change-Id: I79a9506c568d47a7304ff55b75676fe02bfb22a1
Auto-generated-cl: translation import
2013-06-05 15:07:26 -07:00
cbd219a761
Move Base64Reader to utils package
...
Change-Id: Id46898c5cae268f05850d79938929b7707f27320
2013-06-05 19:39:36 +09:00
9c440d1373
Merge "Remove unnecessary Drawable.setState"
2013-06-05 08:34:59 +00:00
9d4e251826
Merge "Add CsvUtils that conform to RFC 4180"
2013-06-05 06:28:06 +00:00
3201e98647
Remove unnecessary Drawable.setState
...
Change-Id: I362933ea4d5bcb1ccfebb5b22f6ccecf12337f4b
2013-06-05 14:30:16 +09:00
3ceeb6bcc6
Add CsvUtils that conform to RFC 4180
...
Bug: 9070153
Change-Id: I66e55dd2f30fddfeb849edb97bc1cbda6b126d92
2013-06-05 12:26:22 +09:00
0bfc2bc419
Merge "Add CODE_CAPSLOCK for long press shift key"
2013-06-05 02:19:02 +00:00
ad0c6d7b36
Cleanups in JNI related code
...
Removed the malloc version in binary dictionary support -- this has not
really been tested well so far, and the mmap version has been working pretty
well after all.
Several cosmetic fixes etc.
Change-Id: Iad0da58b300b769fb5946a3e73fc96f56215980e
2013-06-04 19:16:47 +09:00
9552badf3c
Add CODE_CAPSLOCK for long press shift key
...
This change utilizes the no panel auto more key feature to implement
long press shift key for shift lock.
Change-Id: I3995d25dc35aea3c67b5aa29299815462eff9cad
2013-06-04 18:20:06 +09:00
11dc3a371d
Clean up macro variables
...
Change-Id: I0d9983c1a766b97182953328fa45f488e110bc01
2013-06-04 15:40:30 +09:00
0dbae77496
Merge "Avoid an NPE"
2013-06-04 02:46:54 +00:00
5fc9d6cc04
Avoid an NPE
...
Change-Id: I174eb8e92820fe6e7f8d3b89afae12d94063ef5d
2013-06-03 19:30:57 -07:00
981a194499
Merge "Import translations. DO NOT MERGE"
2013-06-03 22:26:37 +00:00
174f1b222f
Import translations. DO NOT MERGE
...
Change-Id: I718dc281137ceca3015d7355238f91e16f4b9cbc
Auto-generated-cl: translation import
2013-06-03 15:18:17 -07:00
ea3027fec4
am 0532b398: (-s ours) Reconcile with jb-mr2-release - do not merge
...
* commit '0532b398ad3f817f9756bd671ebd2018d1a96291':
2013-06-03 14:07:22 -07:00
0532b398ad
Reconcile with jb-mr2-release - do not merge
...
Change-Id: I8e30c075ddfaf3712aacd89a2a90c30ea245193a
2013-06-03 14:04:13 -07:00
cbc7acb6f5
Merge "Expand suggestion strip when center suggestion is long"
2013-06-03 14:45:05 +00:00
763fd9d5e9
Merge "Fix revert of committed words"
2013-06-03 13:03:26 +00:00
156d39303e
Remove a bunch macros that are no longer used
...
bug: 8550444
Change-Id: Ib775c0bed27c499dc131c54dfaff34c5a8169276
2013-06-03 20:00:02 +09:00
db0aa747be
Merge "Purge WordsPriorityQueue"
2013-06-03 10:21:29 +00:00
4caf594198
Follow up to I907150be994c4f9ffc030c063de521eeb177d3e1
...
Change-Id: I8779d397b0ebe2abbf7c3fbc1a79a1a0939c04f0
2013-06-03 19:14:02 +09:00
04e37fb925
Purge WordsPriorityQueue
...
Change-Id: If14034c09d0dd335c84dd3a6ea2775655eefd38f
2013-06-03 19:04:37 +09:00
cbb1ee485c
Fix build
...
Change-Id: I907150be994c4f9ffc030c063de521eeb177d3e1
2013-06-03 18:59:45 +09:00
b4ae86f0de
Merge "Rename methods for readability"
2013-06-03 09:57:48 +00:00
dceebee4b8
Purge UnigramDictionary
...
Bug: 8550444
Change-Id: I899f3bdce977c521515e548ca0c4ee6d29d6450b
2013-06-03 18:54:03 +09:00
eb6a7c828b
Merge "Migrate used functions in UnigramDicitonary"
2013-06-03 09:46:59 +00:00
6c4ad527dc
Migrate used functions in UnigramDicitonary
...
Bug: 8550444
Change-Id: Ic1ed2d85537cd47cf18a8373203f331abb7508f6
2013-06-03 18:28:50 +09:00
2a529b85d0
Merge "Clear previous suggestions when gesture typing starts"
2013-06-03 09:27:55 +00:00
9ff7354d78
Clear previous suggestions when gesture typing starts
...
Bug: 8651076
Change-Id: Ic65ed3e3696409edea4e35080c11e4d1869a5a7e
2013-06-03 17:59:26 +09:00
The Android Open Source Project
The Android Automerger
Baligh Uddin
Satoshi Kataoka
Tadashi G. Takaoka
Jean Chalard
Kurt Partridge
Ken Wakasa