aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | | | | | am 5a8d2fd1: Merge "Cache UserHistoryDictionary for each language" into jb-devSatoshi Kataoka2012-06-063-127/+216
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '5a8d2fd1d353b2039f0d340301f9dac779cb4e64': Cache UserHistoryDictionary for each language
| | * | | | | | | | | | Merge "Cache UserHistoryDictionary for each language" into jb-devSatoshi Kataoka2012-06-063-127/+216
| | |\ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | Cache UserHistoryDictionary for each languageSatoshi Kataoka2012-06-063-127/+216
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 6603257 Change-Id: I73b65e921cff8337a00594525f67f6aec2178881
* | | | | | | | | | | | | am 269792b3: am 052a8205: Microphone key on 10-inch tablet on the far right ↵Tadashi G. Takaoka2012-06-0611-145/+87
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | vs where it is on phones * commit '269792b384b356601f7b4bf08f487803f5710b68': Microphone key on 10-inch tablet on the far right vs where it is on phones
| * | | | | | | | | | | | am 052a8205: Microphone key on 10-inch tablet on the far right vs where it ↵Tadashi G. Takaoka2012-06-0611-145/+87
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | is on phones * commit '052a82057b0b54e2c40191098a368adcc1e37e74': Microphone key on 10-inch tablet on the far right vs where it is on phones
| | * | | | | | | | | | | Microphone key on 10-inch tablet on the far right vs where it is on phonesTadashi G. Takaoka2012-06-0611-145/+87
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change also re-introduces colored action key, that was disbaled by I1c7335c5. Bug: 6568834 Change-Id: I0c04b86049325c84492d90457cee0c16c57937f8
* | | | | | | | | | | | | am 960dce05: am 268a442d: Microphone key on 7-inch tablet on the far right ↵Tadashi G. Takaoka2012-06-0613-149/+186
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | vs where it is on phones * commit '960dce0579d4a113c2a2ebf8f8279f2a64e09581': Microphone key on 7-inch tablet on the far right vs where it is on phones
| * | | | | | | | | | | | am 268a442d: Microphone key on 7-inch tablet on the far right vs where it is ↵Tadashi G. Takaoka2012-06-0613-149/+186
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | on phones * commit '268a442dc4b68faa6ab9355ea634bd76892a4642': Microphone key on 7-inch tablet on the far right vs where it is on phones
| | * | | | | | | | | | | Microphone key on 7-inch tablet on the far right vs where it is on phonesTadashi G. Takaoka2012-06-0613-149/+186
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 6568834 Change-Id: If48635ead60dc119656f1b10c9b05a1918ebd668
* | | | | | | | | | | | | am 59dae7e1: am 907ba593: Can specify Key.backgroundType in <Row> and ↵Tadashi G. Takaoka2012-06-062-10/+29
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | <include> attribute * commit '59dae7e141b6d6a8bea287f6699e34137390c5f9': Can specify Key.backgroundType in <Row> and <include> attribute
| * | | | | | | | | | | | am 907ba593: Can specify Key.backgroundType in <Row> and <include> attributeTadashi G. Takaoka2012-06-062-10/+29
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '907ba593975d5761f5ba01e689ae2d978b63c2f3': Can specify Key.backgroundType in <Row> and <include> attribute
| | * | | | | | | | | | | Can specify Key.backgroundType in <Row> and <include> attributeTadashi G. Takaoka2012-06-062-10/+29
| | | |_|_|/ / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 6568834 Change-Id: I138464b5445e13eaf062ce84a1ba332dfd1afafa
* | | | | | | | | | | | Fix xml tag in commentTadashi G. Takaoka2012-06-061-41/+41
| |_|_|_|/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 6620122 Change-Id: I2852f77d78b242c1a96c53cdd1e4c0e299f8ea4f
* | | | | | | | | | | Merge "Cache bigram results in Android SpellChecker"Satoshi Kataoka2012-06-061-8/+24
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / |/| | | | | | | | | |
| * | | | | | | | | | Cache bigram results in Android SpellCheckerSatoshi Kataoka2012-06-061-8/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 6610579 Change-Id: I255c068f64f99ee80abda49153ed8ea009ca8ad3
* | | | | | | | | | | Merge "Change constants in ResearchLogger"Kurt Partridge2012-06-051-30/+30
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | / / / / / | | |_|_|_|/ / / / / | |/| | | | | | | |
| * | | | | | | | | Change constants in ResearchLoggerKurt Partridge2012-06-051-30/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 6188932 Change-Id: I3c6a3fb3e8fb139e16322e544f12bc3294cdaf1c
* | | | | | | | | | am 2eb5eb4d: am be2fef4d: Merge "Fix backing view height calculation in ↵Tadashi G. Takaoka2012-06-051-1/+3
|\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | landscape orientation" into jb-dev * commit '2eb5eb4d447cb326b4c10cff2cae64df4e431ffd': Fix backing view height calculation in landscape orientation
| * | | | | | | | | am be2fef4d: Merge "Fix backing view height calculation in landscape ↵Tadashi G. Takaoka2012-06-051-1/+3
| |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | orientation" into jb-dev * commit 'be2fef4d5e3630c676cbfecf97e1de2f98284eb7': Fix backing view height calculation in landscape orientation
| | * | | | | | | | Merge "Fix backing view height calculation in landscape orientation" into jb-devTadashi G. Takaoka2012-06-051-1/+3
| | |\ \ \ \ \ \ \ \
| | | * | | | | | | | Fix backing view height calculation in landscape orientationTadashi G. Takaoka2012-06-051-1/+3
| | | | |_|_|/ / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This logic has been dropped by Ib814c07f. Bug: 6610497 Change-Id: Id89ad3280b73a31d8c9c6826e9ee297791624db1
* | | | | | | | | | am 6b0d0fa3: am f8233ec3: Merge "Refresh Accessibility key mapping when ↵Charles Chen2012-06-053-1/+22
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | KeyboardView changes Keyboards." into jb-dev * commit '6b0d0fa3501247ccf3190c938dec580102fe0473': Refresh Accessibility key mapping when KeyboardView changes Keyboards.
| * | | | | | | | | am f8233ec3: Merge "Refresh Accessibility key mapping when KeyboardView ↵Charles Chen2012-06-053-1/+22
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | changes Keyboards." into jb-dev * commit 'f8233ec32d7ff4cf0874cfe68cef1a32f763184a': Refresh Accessibility key mapping when KeyboardView changes Keyboards.
| | * | | | | | | | Merge "Refresh Accessibility key mapping when KeyboardView changes ↵Charles Chen2012-06-053-1/+22
| | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Keyboards." into jb-dev
| | | * | | | | | | | Refresh Accessibility key mapping when KeyboardView changes Keyboards.alanv2012-06-053-1/+22
| | | | |_|_|_|/ / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 6609626 Change-Id: I93d764b46e96fe70b61c91a7dcb46945ac8853dd
* | | | | | | | | | am 79a97926: (-s ours) am 2493778f: Import translations. DO NOT MERGEEric Fischer2012-06-050-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '79a979266d4b64213705a90583bff8847b6ebe64': Import translations. DO NOT MERGE
| * | | | | | | | | am 2493778f: Import translations. DO NOT MERGEEric Fischer2012-06-0518-38/+21
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '2493778faf62b85e8e90947c20b7f066d7da9abe': Import translations. DO NOT MERGE
| | * | | | | | | | Import translations. DO NOT MERGEEric Fischer2012-06-0518-38/+21
| | | |/ / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I0b461b9a136cc170cd4e9bfdfa9df93e08ed5d0a
* | | | | | | | | Merge "Import translations. DO NOT MERGE"Eric Fischer2012-06-0518-38/+21
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Import translations. DO NOT MERGEEric Fischer2012-06-0518-38/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I851b9388ec7faa95ff762bcbf748f03cc2559b0c
* | | | | | | | | | am c750f9eb: am a6166d37: Fix a bug where Latin IME crashes on spell checker ↵Jean Chalard2012-06-052-6/+13
|\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | request * commit 'c750f9eb5398a30b207891e6858863f493875199': Fix a bug where Latin IME crashes on spell checker request
| * | | | | | | | | am a6166d37: Fix a bug where Latin IME crashes on spell checker requestJean Chalard2012-06-052-6/+13
| |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'a6166d3776c810e51789bfdc19e4823acd4a2f18': Fix a bug where Latin IME crashes on spell checker request
| | * | | | | | | | Fix a bug where Latin IME crashes on spell checker requestJean Chalard2012-06-052-6/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 6611183 Change-Id: I8a879feb598e1ac55d73f9cb27e54aa533d3a010
* | | | | | | | | | am 18c4137c: am 7f7739fe: Merge "Fix a bug where the spellcheck is using the ↵Tom Ouyang2012-06-051-1/+5
|\| | | | | | | | | | |_|/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | old non-binary contacts dictionary" into jb-dev * commit '18c4137c878c18de24a406b861ddb2a735e02f7d': Fix a bug where the spellcheck is using the old non-binary contacts dictionary
| * | | | | | | | am 7f7739fe: Merge "Fix a bug where the spellcheck is using the old ↵Tom Ouyang2012-06-041-1/+5
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | non-binary contacts dictionary" into jb-dev * commit '7f7739fee82d6f2c240d0ed44e8948d09158f13a': Fix a bug where the spellcheck is using the old non-binary contacts dictionary
| | * | | | | | | Merge "Fix a bug where the spellcheck is using the old non-binary contacts ↵Tom Ouyang2012-06-041-1/+5
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | dictionary" into jb-dev
| | | * | | | | | | Fix a bug where the spellcheck is using the old non-binary contacts dictionaryTom Ouyang2012-06-041-1/+5
| | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 6607023 Change-Id: I6dc120dea23052a0841e281c20706bfb21fd9876
* | | | | | | | | am 7394fc43: am 0e134e6b: Merge "Avoid redundant access to DB" into jb-devSatoshi Kataoka2012-06-052-52/+70
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '7394fc43028ef6e28579921c30915bd8a9c9c990': Avoid redundant access to DB
| * | | | | | | | am 0e134e6b: Merge "Avoid redundant access to DB" into jb-devSatoshi Kataoka2012-06-042-52/+70
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '0e134e6be83928a6c36df231c429f3d0766f1afa': Avoid redundant access to DB
| | * | | | | | | Merge "Avoid redundant access to DB" into jb-devSatoshi Kataoka2012-06-042-52/+70
| | |\ \ \ \ \ \ \ | | | | |_|/ / / / | | | |/| | | | |
| | | * | | | | | Avoid redundant access to DBSatoshi Kataoka2012-06-042-52/+70
| | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 6603257 Change-Id: I2e8017f9e2e222aeab0a80faa239ce83d3b212ad
* | | | | | | | am 9252fc1b: am dd487247: Merge "Read the script correctly" into jb-devJean Chalard2012-06-051-4/+6
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '9252fc1b88df0c8bd3870546d1c8ca7681e435d3': Read the script correctly
| * | | | | | | am dd487247: Merge "Read the script correctly" into jb-devJean Chalard2012-06-041-4/+6
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'dd4872474a8dacf410b9b4810a8d82adcd995dff': Read the script correctly
| | * | | | | | Merge "Read the script correctly" into jb-devJean Chalard2012-06-041-4/+6
| | |\ \ \ \ \ \
| | | * | | | | | Read the script correctlyJean Chalard2012-06-041-4/+6
| | | | |_|/ / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The script of a language presumably does not depend on the country variant. This was how it was made but it was later forgotten and the full locale was registered. Bug: 6542210 Change-Id: Iebc90c546f9c8caf89f8aa6c6a7c4733e5bcba48
* | | | | | | | am 89b5872a: (-s ours) am fe3358af: Import translations. DO NOT MERGEEric Fischer2012-06-050-0/+0
|\| | | | | | | | |_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | * commit '89b5872a88ed8e0623263957a0c4b25c5d4a5b69': Import translations. DO NOT MERGE
| * | | | | | am fe3358af: Import translations. DO NOT MERGEEric Fischer2012-06-043-6/+3
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'fe3358aff28fa93d2a660005b3a10653c65f89d2': Import translations. DO NOT MERGE
| | * | | | | Import translations. DO NOT MERGEEric Fischer2012-06-043-6/+3
| | | |/ / / | | |/| | | | | | | | | | | | | | | Change-Id: I939207fa1b57df23a612d62ea89e36ed6519ef64
* | | | | | Import translations. DO NOT MERGEEric Fischer2012-06-043-6/+3
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: If7a9ad8f6df0978783dc23b1812fb41d7acb6b92
* | | | | | am a6c88f10: am fe824948: Dismiss key preview immediately when Keyboard is ↵Tadashi G. Takaoka2012-06-041-0/+2
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | closing * commit 'a6c88f106a16fec2e81f87f170e97194c8fa7a3a': Dismiss key preview immediately when Keyboard is closing