aboutsummaryrefslogtreecommitdiffstats
path: root/java (follow)
Commit message (Collapse)AuthorAgeFilesLines
...
* | | am e4da18e2: am 6348c54f: Merge "Initializing member variable before it is ↵Tadashi G. Takaoka2012-06-071-1/+1
|\ \ \ | | |/ | |/| | | | | | | | | | | | | referenced" into jb-dev * commit 'e4da18e27916f770fcd704032d30534d287d67c6': Initializing member variable before it is referenced
| * | Merge "Initializing member variable before it is referenced" into jb-devTadashi G. Takaoka2012-06-071-1/+1
| |\ \
| | * | Initializing member variable before it is referencedTadashi G. Takaoka2012-06-071-1/+1
| | | | | | | | | | | | | | | | | | | | Bug: 6584882 Change-Id: I1f76388fa8cc16171bc3fc60c935ddcf0a7c4e92
* | | | am 674c51a0: am ec2981a4: Fix a bug on upgrading user history schemesatok2012-06-072-1/+9
|\| | | | | | | | | | | | | | | | | | | * commit '674c51a01117b73dd25473195f92fb0c0158da26': Fix a bug on upgrading user history scheme
| * | | Fix a bug on upgrading user history schemesatok2012-06-082-1/+9
| |/ / | | | | | | | | | | | | Bug: 6626700 Change-Id: I3190d7404e45e704be79ee2031e79b18475feb8c
* | | am 733b3c5f: am 65b72435: Fix Dvorak 4th-row color scheme of 7-inch tabletTadashi G. Takaoka2012-06-071-1/+1
|\| | | | | | | | | | | | | | * commit '733b3c5fa86953b36d2242becb991b2891d8ffc0': Fix Dvorak 4th-row color scheme of 7-inch tablet
| * | Fix Dvorak 4th-row color scheme of 7-inch tabletTadashi G. Takaoka2012-06-071-1/+1
| | | | | | | | | | | | | | | Bug: 6625029 Change-Id: I6ea02e8e46d2bae29080cf9b4ad852a1b6fdd6f5
* | | Merge "Contacts binary dictionary updates with change in keyboard locale."Tom Ouyang2012-06-072-16/+33
|\ \ \
| * | | Contacts binary dictionary updates with change in keyboard locale.Tom Ouyang2012-06-072-16/+33
| | | | | | | | | | | | | | | | | | | | Bug: 6616436 Change-Id: I8d66a37f295134c5b9875b2a305a9be7442bd75d
* | | | am eead5492: am 769cecf7: Close spell-checking dictionaries in a background ↵Jean Chalard2012-06-061-20/+25
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | thread * commit 'eead5492615f0b05ef85ca1f88d3a41ce3f8d496': Close spell-checking dictionaries in a background thread
| * | | Close spell-checking dictionaries in a background threadJean Chalard2012-06-071-20/+25
| | | | | | | | | | | | | | | | | | | | Bug: 6584677 Change-Id: Ifd9b0f995f4e0cf4d35a7ecde767826ab976f0b8
| * | | Merge "Import translations. DO NOT MERGE" into jb-devEric Fischer2012-06-0626-53/+27
| |\ \ \
| | * | | Import translations. DO NOT MERGEEric Fischer2012-06-0626-53/+27
| | | | | | | | | | | | | | | | | | | | Change-Id: I6c285a7484375ce4aa4569af6249027f84711d60
* | | | | Merge "add research log ui control"Kurt Partridge2012-06-067-33/+177
|\ \ \ \ \
| * | | | | add research log ui controlKurt Partridge2012-06-067-33/+177
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - lets users flag a particular time in the research log - lets users delete the log for this session also makes the UsabilityLog setting control whether the ResearchLog logs or not. multi-project commit with I89067e7d3b8daca7179333f1dbe82224c26920fe Bug: 6188932 Change-Id: I89864ef3ab53b0efe1ea8d75247be08712f0c399
* | | | | | Merge "Import translations. DO NOT MERGE"Eric Fischer2012-06-0626-53/+27
|\ \ \ \ \ \
| * | | | | | Import translations. DO NOT MERGEEric Fischer2012-06-0626-53/+27
| | |_|_|_|/ | |/| | | | | | | | | | | | | | | | Change-Id: I7718b03a6f995edfb3cce07f761a4f56d573aa1b
* | | | | | am 55628748: am 95ab6fff: Merge "Change spacebar and language switch key ↵Tadashi G. Takaoka2012-06-062-9/+5
|\ \ \ \ \ \ | | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | background color of phone" into jb-dev * commit '5562874831219d5622b5d194fd3ee3e15251202d': Change spacebar and language switch key background color of phone
| * | | | | Merge "Change spacebar and language switch key background color of phone" ↵Tadashi G. Takaoka2012-06-062-9/+5
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | into jb-dev
| | * | | | | Change spacebar and language switch key background color of phoneTadashi G. Takaoka2012-06-042-9/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 6568834 Change-Id: I815af444eb953e665a09a075b2d3e5875898cb52
* | | | | | | am e08cfda1: am 5a8d2fd1: Merge "Cache UserHistoryDictionary for each ↵Satoshi Kataoka2012-06-063-127/+216
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | language" into jb-dev * commit 'e08cfda1ebea693c56681816076c419f23c51076': 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
| * | | | | | | 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
| * | | | | | | 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
| * | | | | | | 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
| * | | | 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.
| * | | | | 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
| * | | | | | 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
| * | | | | | 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
| * | | | | 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
| * | | | | Merge "Avoid redundant access to DB" into jb-devSatoshi Kataoka2012-06-042-52/+70
| |\ \ \ \ \ | | | |_|/ / | | |/| | |