Commit Graph

15007 Commits (6360cef8dbb3d8a21d4232f157f3f696357bf2a3)

Author SHA1 Message Date
The Android Open Source Project 2f387da0ac Reconcile with jb-mr2-release jb-mr2-zeroday-release - do not merge
Change-Id: I974082d633cb4b996ec0fb718be4f487f42bf0fc
2013-06-10 08:14:13 -07:00
The Android Automerger a063ccb00e merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev 2013-06-09 05:55:55 -07:00
Baligh Uddin 64d0fa4071 am 8ea77542: (-s ours) Merge "Import translations. DO NOT MERGE"
* commit '8ea77542f9b0b1191abf868156dd1fd863935910':
  Import translations. DO NOT MERGE
2013-06-07 10:12:43 -07:00
Baligh Uddin 8ea77542f9 Merge "Import translations. DO NOT MERGE" 2013-06-07 17:10:49 +00:00
Satoshi Kataoka 28c7e63426 am fe95e7b1: Merge "Fix possible NPE"
* commit 'fe95e7b1bf06c26f71d3e2899fcdf63647d9f670':
  Fix possible NPE
2013-06-07 04:11:29 -07:00
Satoshi Kataoka fe95e7b1bf Merge "Fix possible NPE" 2013-06-07 11:09:52 +00:00
Tadashi G. Takaoka c68632af62 am 77f63c8a: Don\'t use RichInputMethodManager in setup wizard
* commit '77f63c8ac64c46de36002fd62c71f1eeebcaf2ac':
  Don't use RichInputMethodManager in setup wizard
2013-06-07 03:14:13 -07:00
Tadashi G. Takaoka 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
Satoshi Kataoka 6c8136d157 Fix possible NPE
Bug: 9314901
Change-Id: Id80f59df38ae72766b097fd1c23326fedd302439
2013-06-07 19:08:58 +09:00
Tadashi G. Takaoka 60261af55f am b0e0c5a8: Merge "Defer getting no language subtype"
* commit 'b0e0c5a8445afc814ed8865c4f4b9f61ada909a9':
  Defer getting no language subtype
2013-06-07 03:01:41 -07:00
Tadashi G. Takaoka b0e0c5a844 Merge "Defer getting no language subtype" 2013-06-07 10:00:19 +00:00
Jean Chalard f637bb3343 am d3c283d5: Merge "Fix an illegal argument exception"
* commit 'd3c283d5db9259df17674bbe8c8eede9093d1da9':
  Fix an illegal argument exception
2013-06-07 02:39:52 -07:00
Jean Chalard d3c283d5db Merge "Fix an illegal argument exception" 2013-06-07 09:38:17 +00:00
Jean Chalard 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
Tadashi G. Takaoka 254b484e75 Defer getting no language subtype
Bug: 9318351
Change-Id: I55338c001070655a3f90df3dbe1351bd4180d520
2013-06-07 18:20:31 +09:00
Tadashi G. Takaoka 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
Tadashi G. Takaoka 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
Tadashi G. Takaoka 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
Tadashi G. Takaoka 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
Tadashi G. Takaoka 48f20fb892 am 091a4532: Merge "Add HTC One special edition"
* commit '091a4532925ba9d35e83b60b834dcc88b1a4d2ea':
  Add HTC One special edition
2013-06-06 01:41:21 -07:00
Tadashi G. Takaoka 091a453292 Merge "Add HTC One special edition" 2013-06-06 08:39:10 +00:00
Tadashi G. Takaoka 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
Tadashi G. Takaoka eab37ec2e5 Add HTC One special edition
Bug: 9109493
Change-Id: I6eb060a93d7afbcc5aaa2aaece242044db255829
2013-06-06 17:33:23 +09:00
Jean Chalard 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
Jean Chalard 6910032972 Merge "Use an iterator to remove stuff from an ArrayList." 2013-06-06 08:19:41 +00:00
Jean Chalard 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
Kurt Partridge efd26bb319 Allow downloadable dictionaries in development builds
Bug: 9305379

Change-Id: Iab32753070a056d3861a45aa898911b7ab67dfb6
2013-06-05 22:14:54 -07:00
Satoshi Kataoka 2fa14bc54d am f6a1a765: Merge "Fix a possible NPE"
* commit 'f6a1a7652473778ff2e52754f29f7822a9b482db':
  Fix a possible NPE
2013-06-05 22:03:39 -07:00
Satoshi Kataoka f6a1a76524 Merge "Fix a possible NPE" 2013-06-06 05:02:46 +00:00
Satoshi Kataoka 6f9c6f2c64 Fix a possible NPE
Bug: 9301208
Change-Id: Id120c99ab9ef698d16cf7b8beea30c98c95d23a1
2013-06-06 12:01:22 +09:00
Baligh Uddin f93850f06f Import translations. DO NOT MERGE
Change-Id: I79a9506c568d47a7304ff55b75676fe02bfb22a1
Auto-generated-cl: translation import
2013-06-05 15:07:26 -07:00
Tadashi G. Takaoka 596652cc5e am cbd219a7: Move Base64Reader to utils package
* commit 'cbd219a761079007b297c7d0cc1ca5d93420b0c9':
  Move Base64Reader to utils package
2013-06-05 03:51:54 -07:00
Tadashi G. Takaoka cbd219a761 Move Base64Reader to utils package
Change-Id: Id46898c5cae268f05850d79938929b7707f27320
2013-06-05 19:39:36 +09:00
Tadashi G. Takaoka d8177b3aba am 9c440d13: Merge "Remove unnecessary Drawable.setState"
* commit '9c440d137300ddf72cca201cf08c9bb2e32d6836':
  Remove unnecessary Drawable.setState
2013-06-05 01:36:24 -07:00
Tadashi G. Takaoka 9c440d1373 Merge "Remove unnecessary Drawable.setState" 2013-06-05 08:34:59 +00:00
Tadashi G. Takaoka 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
Tadashi G. Takaoka 9d4e251826 Merge "Add CsvUtils that conform to RFC 4180" 2013-06-05 06:28:06 +00:00
Tadashi G. Takaoka 3201e98647 Remove unnecessary Drawable.setState
Change-Id: I362933ea4d5bcb1ccfebb5b22f6ccecf12337f4b
2013-06-05 14:30:16 +09:00
Tadashi G. Takaoka 3ceeb6bcc6 Add CsvUtils that conform to RFC 4180
Bug: 9070153
Change-Id: I66e55dd2f30fddfeb849edb97bc1cbda6b126d92
2013-06-05 12:26:22 +09:00
Tadashi G. Takaoka 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
Tadashi G. Takaoka 0bfc2bc419 Merge "Add CODE_CAPSLOCK for long press shift key" 2013-06-05 02:19:02 +00:00
Ken Wakasa 34a9e8bdfb am ad0c6d7b: Cleanups in JNI related code
* commit 'ad0c6d7b3635f0c1d92a3e4d895909234b7a2f0d':
  Cleanups in JNI related code
2013-06-04 05:34:13 -07:00
Ken Wakasa 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
Tadashi G. Takaoka 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
Ken Wakasa 496bb8af8b am 11dc3a37: Clean up macro variables
* commit '11dc3a371d3bc682f7307586761ae637170d3505':
  Clean up macro variables
2013-06-03 23:47:13 -07:00
Ken Wakasa 11dc3a371d Clean up macro variables
Change-Id: I0d9983c1a766b97182953328fa45f488e110bc01
2013-06-04 15:40:30 +09:00
Kurt Partridge 0486b377e7 am 0dbae774: Merge "Avoid an NPE"
* commit '0dbae774969c4f467b9d51f621eca4c3a58a2717':
  Avoid an NPE
2013-06-03 19:48:05 -07:00
Kurt Partridge 0dbae77496 Merge "Avoid an NPE" 2013-06-04 02:46:54 +00:00
Kurt Partridge 5fc9d6cc04 Avoid an NPE
Change-Id: I174eb8e92820fe6e7f8d3b89afae12d94063ef5d
2013-06-03 19:30:57 -07:00
Baligh Uddin 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