aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* am fe95e7b1: Merge "Fix possible NPE"Satoshi Kataoka2013-06-071-1/+10
|\ | | | | | | | | * commit 'fe95e7b1bf06c26f71d3e2899fcdf63647d9f670': Fix possible NPE
| * Merge "Fix possible NPE"Satoshi Kataoka2013-06-071-1/+10
| |\
| | * Fix possible NPESatoshi Kataoka2013-06-071-1/+10
| | | | | | | | | | | | | | | Bug: 9314901 Change-Id: Id80f59df38ae72766b097fd1c23326fedd302439
* | | am 77f63c8a: Don\'t use RichInputMethodManager in setup wizardTadashi G. Takaoka2013-06-074-44/+69
|\| | | | | | | | | | | | | | * commit '77f63c8ac64c46de36002fd62c71f1eeebcaf2ac': Don't use RichInputMethodManager in setup wizard
| * | Don't use RichInputMethodManager in setup wizardTadashi G. Takaoka2013-06-074-44/+69
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | am b0e0c5a8: Merge "Defer getting no language subtype"Tadashi G. Takaoka2013-06-071-12/+20
|\| | | | | | | | | | | | | | * commit 'b0e0c5a8445afc814ed8865c4f4b9f61ada909a9': Defer getting no language subtype
| * | Merge "Defer getting no language subtype"Tadashi G. Takaoka2013-06-071-12/+20
| |\ \
| | * | Defer getting no language subtypeTadashi G. Takaoka2013-06-071-12/+20
| | | | | | | | | | | | | | | | | | | | Bug: 9318351 Change-Id: I55338c001070655a3f90df3dbe1351bd4180d520
* | | | am d3c283d5: Merge "Fix an illegal argument exception"Jean Chalard2013-06-071-15/+13
|\| | | | | | | | | | | | | | | | | | | * commit 'd3c283d5db9259df17674bbe8c8eede9093d1da9': Fix an illegal argument exception
| * | | Merge "Fix an illegal argument exception"Jean Chalard2013-06-071-15/+13
| |\ \ \ | | |/ / | |/| |
| | * | Fix an illegal argument exceptionJean Chalard2013-06-071-15/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | am 1665cc27: (-s ours) am 05ee43dc: (-s ours) am a009d2c9: Add HTC One ↵Tadashi G. Takaoka2013-06-060-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | special edition (DO NOT MERGE) * commit '1665cc27f2a2f2e1c9b5a80c622aceed85a25283': Add HTC One special edition (DO NOT MERGE)
| * | | am 05ee43dc: (-s ours) am a009d2c9: Add HTC One special edition (DO NOT MERGE)Tadashi G. Takaoka2013-06-060-0/+0
| |\ \ \ | | |/ / | |/| | | | | | | | | | * commit '05ee43dc288553d418d906e3681b25dc55a2144d': Add HTC One special edition (DO NOT MERGE)
| | * | am a009d2c9: Add HTC One special edition (DO NOT MERGE)Tadashi G. Takaoka2013-06-061-2/+2
| | |\ \ | | | | | | | | | | | | | | | | | | | | * commit 'a009d2c98da9749bf6ae4d92ef5fb3d3e945530f': Add HTC One special edition (DO NOT MERGE)
| | | * | Add HTC One special edition (DO NOT MERGE)Tadashi G. Takaoka2013-06-061-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change also fixes a cosmetic regexp bug in Galaxy SIII. Bug: 9109493 Change-Id: Ie93ae38d1ca1817d4019bb1483ab7f3740564b96
* | | | | am 091a4532: Merge "Add HTC One special edition"Tadashi G. Takaoka2013-06-061-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | * commit '091a4532925ba9d35e83b60b834dcc88b1a4d2ea': Add HTC One special edition
| * | | | Merge "Add HTC One special edition"Tadashi G. Takaoka2013-06-061-1/+1
| |\ \ \ \
| | * | | | Add HTC One special editionTadashi G. Takaoka2013-06-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 9109493 Change-Id: I6eb060a93d7afbcc5aaa2aaece242044db255829
* | | | | | am 69100329: Merge "Use an iterator to remove stuff from an ArrayList."Jean Chalard2013-06-061-4/+7
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '6910032972524541314249fb2a6c2202ac813845': Use an iterator to remove stuff from an ArrayList.
| * | | | | Merge "Use an iterator to remove stuff from an ArrayList."Jean Chalard2013-06-061-4/+7
| |\ \ \ \ \
| | * | | | | Use an iterator to remove stuff from an ArrayList.Jean Chalard2013-06-061-4/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Silly me >.> Bug: 9306154 Change-Id: Ic00e9d6a31cd1d7aacefe68b7be9c2199e297b0d
* | | | | | | am f6a1a765: Merge "Fix a possible NPE"Satoshi Kataoka2013-06-051-0/+8
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'f6a1a7652473778ff2e52754f29f7822a9b482db': Fix a possible NPE
| * | | | | | Merge "Fix a possible NPE"Satoshi Kataoka2013-06-061-0/+8
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | / | | | |_|_|/ | | |/| | |
| | * | | | Fix a possible NPESatoshi Kataoka2013-06-061-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 9301208 Change-Id: Id120c99ab9ef698d16cf7b8beea30c98c95d23a1
* | | | | | am cbd219a7: Move Base64Reader to utils packageTadashi G. Takaoka2013-06-052-0/+342
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'cbd219a761079007b297c7d0cc1ca5d93420b0c9': Move Base64Reader to utils package
| * | | | | Move Base64Reader to utils packageTadashi G. Takaoka2013-06-052-0/+342
| |/ / / / | | | | | | | | | | | | | | | Change-Id: Id46898c5cae268f05850d79938929b7707f27320
* | | | | am 9c440d13: Merge "Remove unnecessary Drawable.setState"Tadashi G. Takaoka2013-06-051-4/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | * commit '9c440d137300ddf72cca201cf08c9bb2e32d6836': Remove unnecessary Drawable.setState
| * | | | Merge "Remove unnecessary Drawable.setState"Tadashi G. Takaoka2013-06-051-4/+1
| |\ \ \ \
| | * | | | Remove unnecessary Drawable.setStateTadashi G. Takaoka2013-06-051-4/+1
| | |/ / / | | | | | | | | | | | | | | | Change-Id: I362933ea4d5bcb1ccfebb5b22f6ccecf12337f4b
* | | | | am 9d4e2518: Merge "Add CsvUtils that conform to RFC 4180"Tadashi G. Takaoka2013-06-042-0/+743
|\| | | | | | | | | | | | | | | | | | | | | | | | * commit '9d4e25182699f383e38f37fbff69bc2a7c9304bf': Add CsvUtils that conform to RFC 4180
| * | | | Merge "Add CsvUtils that conform to RFC 4180"Tadashi G. Takaoka2013-06-052-0/+743
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Add CsvUtils that conform to RFC 4180Tadashi G. Takaoka2013-06-052-0/+743
| | | | | | | | | | | | | | | | | | | | | | | | | Bug: 9070153 Change-Id: I66e55dd2f30fddfeb849edb97bc1cbda6b126d92
* | | | | am 0bfc2bc4: Merge "Add CODE_CAPSLOCK for long press shift key"Tadashi G. Takaoka2013-06-0415-143/+99
|\| | | | | | | | | | | | | | | | | | | | | | | | * commit '0bfc2bc419e7e758c6ce17b5fb959687f583551a': Add CODE_CAPSLOCK for long press shift key
| * | | | Merge "Add CODE_CAPSLOCK for long press shift key"Tadashi G. Takaoka2013-06-0515-143/+99
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Add CODE_CAPSLOCK for long press shift keyTadashi G. Takaoka2013-06-0415-143/+99
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change utilizes the no panel auto more key feature to implement long press shift key for shift lock. Change-Id: I3995d25dc35aea3c67b5aa29299815462eff9cad
* | | | | am ad0c6d7b: Cleanups in JNI related codeKen Wakasa2013-06-046-101/+70
|\| | | | | | | | | | | | | | | | | | | | | | | | * commit 'ad0c6d7b3635f0c1d92a3e4d895909234b7a2f0d': Cleanups in JNI related code
| * | | | Cleanups in JNI related codeKen Wakasa2013-06-046-101/+70
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | am 11dc3a37: Clean up macro variablesKen Wakasa2013-06-034-34/+58
|\| | | | | | | | | | | | | | | | | | | | | | | | * commit '11dc3a371d3bc682f7307586761ae637170d3505': Clean up macro variables
| * | | | Clean up macro variablesKen Wakasa2013-06-044-34/+58
| | | | | | | | | | | | | | | | | | | | Change-Id: I0d9983c1a766b97182953328fa45f488e110bc01
* | | | | am 0dbae774: Merge "Avoid an NPE"Kurt Partridge2013-06-031-10/+10
|\| | | | | | | | | | | | | | | | | | | | | | | | * commit '0dbae774969c4f467b9d51f621eca4c3a58a2717': Avoid an NPE
| * | | | Merge "Avoid an NPE"Kurt Partridge2013-06-041-10/+10
| |\ \ \ \
| | * | | | Avoid an NPEKurt Partridge2013-06-031-10/+10
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I174eb8e92820fe6e7f8d3b89afae12d94063ef5d
* | | | | | am 981a1944: (-s ours) Merge "Import translations. DO NOT MERGE"Baligh Uddin2013-06-030-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '981a194499b4ab50339f7b1c5444321cceb5f136': Import translations. DO NOT MERGE
| * | | | | Merge "Import translations. DO NOT MERGE"Baligh Uddin2013-06-031-0/+27
| |\ \ \ \ \
| | * | | | | Import translations. DO NOT MERGEBaligh Uddin2013-06-031-0/+27
| | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I718dc281137ceca3015d7355238f91e16f4b9cbc Auto-generated-cl: translation import
* | | | | | am ea3027fe: (-s ours) am 0532b398: (-s ours) Reconcile with jb-mr2-release ↵The Android Open Source Project2013-06-030-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - do not merge * commit 'ea3027fec4bafc94a0404b117d051c3a821ca263':
| * | | | | am 0532b398: (-s ours) Reconcile with jb-mr2-release - do not mergeThe Android Open Source Project2013-06-030-0/+0
| |\ \ \ \ \ | | |/ / / / | |/| | / / | | | |/ / | | |/| | * commit '0532b398ad3f817f9756bd671ebd2018d1a96291':
| | * | | Reconcile with jb-mr2-release - do not mergeThe Android Open Source Project2013-06-030-0/+0
| | |\ \ \ | | | | | | | | | | | | | | | | | | Change-Id: I8e30c075ddfaf3712aacd89a2a90c30ea245193a
| | | * \ \ merge in jb-mr2-release history after reset to jb-mr2-devThe Android Automerger2013-06-020-0/+0
| | | |\ \ \ | | | | |_|/ | | | |/| |
| | | | * | merge in jb-mr2-release history after reset to jb-mr2-devThe Android Automerger2013-05-300-0/+0
| | | | |\ \