aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | am 0e39e820: (-s ours) Merge "Fix referring wrong TypedArray (DO NOT MERGE)" ↵Tadashi G. Takaoka2011-11-080-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into ics-mr1 * commit '0e39e820ce49b5fc2f8a309c3f64e5b0fefbea48': Fix referring wrong TypedArray (DO NOT MERGE)
| * | | | Merge "Fix referring wrong TypedArray (DO NOT MERGE)" into ics-mr1Tadashi G. Takaoka2011-11-071-1/+1
| |\ \ \ \
| | * | | | Fix referring wrong TypedArray (DO NOT MERGE)Tadashi G. Takaoka2011-11-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is the cherry-pick of Change I2a8f00ed from Master. Change-Id: I2a8f00edb579e24e612e839498ece097e9d3d7f6
* | | | | | am 0a75373f: Merge "Fix a bug where the UserDictionary may not be released" ↵Ken Wakasa2011-11-071-1/+5
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into ics-mr1 * commit '0a75373f4187d2db036757c2c2bcaba42301fd22': Fix a bug where the UserDictionary may not be released
| * | | | | Merge "Fix a bug where the UserDictionary may not be released" into ics-mr1Ken Wakasa2011-11-071-1/+5
| |\ \ \ \ \
| | * | | | | Fix a bug where the UserDictionary may not be releasedJean Chalard2011-11-071-1/+5
| | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | Bug: 5547357 Change-Id: I521afeaa349c86fb0087cedb70127de6acebec78
* | | | | | am f47e014e: (-s ours) Import revised translations. DO NOT MERGEEric Fischer2011-11-070-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'f47e014eb251ed83c9672b928b45d7340b83c464': Import revised translations. DO NOT MERGE
| * | | | | Import revised translations. DO NOT MERGEEric Fischer2011-11-072-2/+2
| |/ / / / | | | | | | | | | | | | | | | Change-Id: I3650b8f5925e9f71927312acf310f7a165bd4ce3
* | | | | Reconcile with ics-mr1-releaseThe Android Open Source Project2011-11-040-0/+0
|\ \ \ \ \ | | |_|_|/ | |/| | | | | | | | Change-Id: I709943028122c8f3a72594ccaef4e3a650375749
| * | | | merge in ics-mr1-release history after reset to ics-mr1The Android Automerger2011-11-020-0/+0
| |\ \ \ \
* | \ \ \ \ Merge "Fix referring wrong TypedArray"Tadashi G. Takaoka2011-11-041-1/+1
|\ \ \ \ \ \
| * | | | | | Fix referring wrong TypedArrayTadashi G. Takaoka2011-11-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I2a8f00edb579e24e612e839498ece097e9d3d7f6
* | | | | | | Remember shift locked state when switching between Main keyboard and SymbolsTadashi G. Takaoka2011-11-041-0/+5
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | Bug: 5553660 Change-Id: Icb15a9f8a58243bd113c2d4897fee623ac48b66d
* | | | | | Skip loading keyboard when SoftInputWindow hasn't shown yet.Tadashi G. Takaoka2011-11-041-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 5541192 Change-Id: I003101b2a3fdeb5bb554d249634ec5ab50aea09e
* | | | | | Merge "Do not clip the popup key preview even if there is no left/right ↵Tadashi G. Takaoka2011-11-031-4/+8
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | preview icons"
| * | | | | | Do not clip the popup key preview even if there is no left/right preview iconsTadashi G. Takaoka2011-11-041-4/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ie51f56c64ba4c69400fe6472b2397ba19ee74911
* | | | | | | am f8b9e7eb: (-s ours) am 01c335df: (-s ours) Import revised translations. ↵Eric Fischer2011-11-030-0/+0
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | DO NOT MERGE * commit 'f8b9e7ebeba8e6f42f4af4addf3cea7e962beb1c': Import revised translations. DO NOT MERGE
| * | | | | | am 01c335df: (-s ours) Import revised translations. DO NOT MERGEEric Fischer2011-11-030-0/+0
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | / / | | | |_|/ / | | |/| | | * commit '01c335df7178e8126617e4e29d5ed6602ff25c4a': Import revised translations. DO NOT MERGE
| | * | | | Import revised translations. DO NOT MERGEEric Fischer2011-11-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ib73d7c6594aef7eb5d2c97fb675dbe5574dd5d12
* | | | | | Merge "Import revised translations."Eric Fischer2011-11-025-4/+310
|\ \ \ \ \ \
| * | | | | | Import revised translations.Eric Fischer2011-11-025-4/+310
| | |_|/ / / | |/| | | | | | | | | | | | | | | | Change-Id: I3633f1b16fc5f5282e9e60cab104835767ddfb63
* | | | | | am db1fc8f5: (-s ours) Import revised translations. DO NOT MERGEEric Fischer2011-11-020-0/+0
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | * commit 'db1fc8f59c520990dd1925aa8f2c4042e84c9dcc': Import revised translations. DO NOT MERGE
| * | | | | Import revised translations. DO NOT MERGEEric Fischer2011-11-015-4/+310
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I63a6dd39a4af314afdb782ea090171c7bc959749
* | | | | | Remove trailing spaces when appropriateJean Chalard2011-11-021-1/+5
| |/ / / / |/| | | | | | | | | | | | | | | | | | | Bug: 5509651 Change-Id: I99cfb5a6fc2873e2c11ed16967cd82a7f504a263
* | | | | Reconcile with ics-mr1-releaseThe Android Open Source Project2011-10-310-0/+0
|\ \ \ \ \ | | |_|/ / | |/| | | | | | | | Change-Id: I4ad3da51622d4d250e96cb19c63ad2da723d9e82
| * | | | merge in ics-mr1-release history after reset to ics-mr1The Android Automerger2011-10-300-0/+0
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | merge in ics-mr1-release history after reset to ics-mr1The Android Automerger2011-10-270-0/+0
| | |\ \ \
| | | * \ \ merge in ics-mr1-release history after reset to ics-mr1The Android Automerger2011-10-260-0/+0
| | | |\ \ \
| | | | * \ \ merge in ics-release history after reset to masterThe Android Automerger2011-10-240-0/+0
| | | | |\ \ \
| | | | | * \ \ merge in ics-release history after reset to masterThe Android Automerger2011-10-230-0/+0
| | | | | |\ \ \
| | | | | | * \ \ merge in ics-release history after reset to masterThe Android Automerger2011-10-200-0/+0
| | | | | | |\ \ \
| | | | | | | * \ \ merge in ics-release history after reset to masterThe Android Automerger2011-10-190-0/+0
| | | | | | | |\ \ \
| | | | | | | | * \ \ merge in ics-release history after reset to masterThe Android Automerger2011-10-180-0/+0
| | | | | | | | |\ \ \
| | | | | | | | | * \ \ merge in ics-release history after reset to masterThe Android Automerger2011-10-160-0/+0
| | | | | | | | | |\ \ \
| | | | | | | | | | * \ \ merge in ics-release history after reset to masterThe Android Automerger2011-10-130-0/+0
| | | | | | | | | | |\ \ \
| | | | | | | | | | | * \ \ merge in ics-release history after reset to masterThe Android Automerger2011-10-120-0/+0
| | | | | | | | | | | |\ \ \
| | | | | | | | | | | | * \ \ merge in ics-release history after reset to masterThe Android Automerger2011-10-110-0/+0
| | | | | | | | | | | | |\ \ \
| | | | | | | | | | | | | * \ \ merge in ics-release history after reset to masterThe Android Automerger2011-10-100-0/+0
| | | | | | | | | | | | | |\ \ \
| | | | | | | | | | | | | | * \ \ merge in ics-release history after reset to masterThe Android Automerger2011-10-090-0/+0
| | | | | | | | | | | | | | |\ \ \
| | | | | | | | | | | | | | | * \ \ merge in ics-release history after reset to masterThe Android Automerger2011-10-060-0/+0
| | | | | | | | | | | | | | | |\ \ \
| | | | | | | | | | | | | | | | * \ \ merge in ics-release history after reset to masterThe Android Automerger2011-10-050-0/+0
| | | | | | | | | | | | | | | | |\ \ \
| | | | | | | | | | | | | | | | | * \ \ merge in ics-release history after reset to masterThe Android Automerger2011-10-040-0/+0
| | | | | | | | | | | | | | | | | |\ \ \
| | | | | | | | | | | | | | | | | | * \ \ merge in ics-release history after reset to masterThe Android Automerger2011-10-030-0/+0
| | | | | | | | | | | | | | | | | | |\ \ \
| | | | | | | | | | | | | | | | | | | * \ \ merge in ics-release history after reset to masterThe Android Automerger2011-09-300-0/+0
| | | | | | | | | | | | | | | | | | | |\ \ \
| | | | | | | | | | | | | | | | | | | | * \ \ merge in ics-release history after reset to masterThe Android Automerger2011-09-290-0/+0
| | | | | | | | | | | | | | | | | | | | |\ \ \
| | | | | | | | | | | | | | | | | | | | | * \ \ merge in ics-release history after reset to masterThe Android Automerger2011-09-280-0/+0
| | | | | | | | | | | | | | | | | | | | | |\ \ \
| | | | | | | | | | | | | | | | | | | | | | * \ \ merge in ics-release history after reset to masterThe Android Automerger2011-09-270-0/+0
| | | | | | | | | | | | | | | | | | | | | | |\ \ \
| | | | | | | | | | | | | | | | | | | | | | | * \ \ merge in ics-release history after reset to masterThe Android Automerger2011-09-260-0/+0
| | | | | | | | | | | | | | | | | | | | | | | |\ \ \
| | | | | | | | | | | | | | | | | | | | | | | | * \ \ merge in ics-release history after reset to masterThe Android Automerger2011-09-250-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | |\ \ \
| | | | | | | | | | | | | | | | | | | | | | | | | * \ \ merge in ics-release history after reset to masterThe Android Automerger2011-09-220-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | |\ \ \