b0e0c5a844
Merge "Defer getting no language subtype"
2013-06-07 10:00:19 +00:00
f637bb3343
am d3c283d5: Merge "Fix an illegal argument exception"
...
* commit 'd3c283d5db9259df17674bbe8c8eede9093d1da9':
Fix an illegal argument exception
2013-06-07 02:39:52 -07: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
bd21edc977
am 1665cc27: (-s ours) am 05ee43dc: (-s ours) am a009d2c9: Add HTC One special edition (DO NOT MERGE)
...
* commit '1665cc27f2a2f2e1c9b5a80c622aceed85a25283':
Add HTC One special edition (DO NOT MERGE)
2013-06-06 12:50:24 -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
48f20fb892
am 091a4532: Merge "Add HTC One special edition"
...
* commit '091a4532925ba9d35e83b60b834dcc88b1a4d2ea':
Add HTC One special edition
2013-06-06 01:41:21 -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
323dd492f0
am 69100329: Merge "Use an iterator to remove stuff from an ArrayList."
...
* commit '6910032972524541314249fb2a6c2202ac813845':
Use an iterator to remove stuff from an ArrayList.
2013-06-06 01:24:35 -07: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
2fa14bc54d
am f6a1a765: Merge "Fix a possible NPE"
...
* commit 'f6a1a7652473778ff2e52754f29f7822a9b482db':
Fix a possible NPE
2013-06-05 22:03:39 -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
596652cc5e
am cbd219a7: Move Base64Reader to utils package
...
* commit 'cbd219a761079007b297c7d0cc1ca5d93420b0c9':
Move Base64Reader to utils package
2013-06-05 03:51:54 -07:00
cbd219a761
Move Base64Reader to utils package
...
Change-Id: Id46898c5cae268f05850d79938929b7707f27320
2013-06-05 19:39:36 +09:00
d8177b3aba
am 9c440d13: Merge "Remove unnecessary Drawable.setState"
...
* commit '9c440d137300ddf72cca201cf08c9bb2e32d6836':
Remove unnecessary Drawable.setState
2013-06-05 01:36:24 -07:00
9c440d1373
Merge "Remove unnecessary Drawable.setState"
2013-06-05 08:34:59 +00:00
8235d940c4
am 9d4e2518: Merge "Add CsvUtils that conform to RFC 4180"
...
* commit '9d4e25182699f383e38f37fbff69bc2a7c9304bf':
Add CsvUtils that conform to RFC 4180
2013-06-04 23:30:24 -07: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
e10f4b6b77
am 0bfc2bc4: Merge "Add CODE_CAPSLOCK for long press shift key"
...
* commit '0bfc2bc419e7e758c6ce17b5fb959687f583551a':
Add CODE_CAPSLOCK for long press shift key
2013-06-04 19:23:31 -07:00
0bfc2bc419
Merge "Add CODE_CAPSLOCK for long press shift key"
2013-06-05 02:19:02 +00:00
34a9e8bdfb
am ad0c6d7b: Cleanups in JNI related code
...
* commit 'ad0c6d7b3635f0c1d92a3e4d895909234b7a2f0d':
Cleanups in JNI related code
2013-06-04 05:34:13 -07: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
496bb8af8b
am 11dc3a37: Clean up macro variables
...
* commit '11dc3a371d3bc682f7307586761ae637170d3505':
Clean up macro variables
2013-06-03 23:47:13 -07:00
11dc3a371d
Clean up macro variables
...
Change-Id: I0d9983c1a766b97182953328fa45f488e110bc01
2013-06-04 15:40:30 +09:00
0486b377e7
am 0dbae774: Merge "Avoid an NPE"
...
* commit '0dbae774969c4f467b9d51f621eca4c3a58a2717':
Avoid an NPE
2013-06-03 19:48:05 -07: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
267928c976
am 981a1944: (-s ours) Merge "Import translations. DO NOT MERGE"
...
* commit '981a194499b4ab50339f7b1c5444321cceb5f136':
Import translations. DO NOT MERGE
2013-06-03 15:28:19 -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
61adf61981
am ea3027fe: (-s ours) am 0532b398: (-s ours) Reconcile with jb-mr2-release - do not merge
...
* commit 'ea3027fec4bafc94a0404b117d051c3a821ca263':
2013-06-03 14:09:25 -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
15aab5b1fe
am cbc7acb6: Merge "Expand suggestion strip when center suggestion is long"
...
* commit 'cbc7acb6f521fb680564a4fc6132c1913491de77':
Expand suggestion strip when center suggestion is long
2013-06-03 07:46:42 -07:00
cbc7acb6f5
Merge "Expand suggestion strip when center suggestion is long"
2013-06-03 14:45:05 +00:00
afbaac36a8
am 763fd9d5: Merge "Fix revert of committed words"
...
* commit '763fd9d5e9a3136a4a7300219b8094df089fe5b6':
Fix revert of committed words
2013-06-03 06:05:01 -07:00
763fd9d5e9
Merge "Fix revert of committed words"
2013-06-03 13:03:26 +00:00
3888cc243d
am 156d3930: Remove a bunch macros that are no longer used
...
* commit '156d39303ed565ed64f62d9963cdbba1b0096130':
Remove a bunch macros that are no longer used
2013-06-03 04:08:22 -07:00
Tadashi G. Takaoka
Jean Chalard
Kurt Partridge
Satoshi Kataoka
Baligh Uddin
Ken Wakasa
The Android Open Source Project