aboutsummaryrefslogtreecommitdiffstats
path: root/java/res (follow)
Commit message (Collapse)AuthorAgeFilesLines
...
* | Merge "Import translations. DO NOT MERGE" into jb-ub-latinimegoogleGeoff Mendal2015-03-0973-174/+28
|\ \
| * | Import translations. DO NOT MERGEGeoff Mendal2015-03-0973-174/+28
| | | | | | | | | | | | | | | Change-Id: Ifd0e7f67f2c4607557a295e9cbbdb35d77a53f91 Auto-generated-cl: translation import
* | | Import translations. DO NOT MERGEGeoff Mendal2015-03-0912-23/+12
|/ / | | | | | | | | Change-Id: I0506166a097cc0388afd38c77419d83abf5f85d7 Auto-generated-cl: translation import
* | am 1ae16dc3: Next-word suggestion bit in keyboard settings.Dan Zivkovic2015-03-043-14/+0
|\| | | | | | | | | * commit '1ae16dc3db170802d1b38273f477125a2a969d32': Next-word suggestion bit in keyboard settings.
| * Next-word suggestion bit in keyboard settings.Dan Zivkovic2015-03-043-14/+0
| | | | | | | | | | | | | | | | | | This feature works in supported languages. We don't need a user setting. Bug 19596067. Change-Id: Icdded772745f9816da47f8a5e3b87b733083b121
| * Merge "Import translations. DO NOT MERGE"Geoff Mendal2015-03-044-26/+16
| |\
| | * Import translations. DO NOT MERGEGeoff Mendal2015-03-044-26/+16
| | | | | | | | | | | | | | | Change-Id: I934e85a5a7cef5a490e62033a37e4c8969c36d43 Auto-generated-cl: translation import
| * | Import translations. DO NOT MERGEGeoff Mendal2015-03-0455-110/+55
| |/ | | | | | | | | Change-Id: I3b6d9386687e987a6ca84a194a26b90a669c2562 Auto-generated-cl: translation import
| * Merge "Import translations. DO NOT MERGE"Geoff Mendal2015-03-0373-365/+740
| |\
| | * Import translations. DO NOT MERGEGeoff Mendal2015-03-0273-365/+740
| | | | | | | | | | | | | | | Change-Id: I95888bc0f4841f69b8c5cba881f92311c607347f Auto-generated-cl: translation import
* | | Merge "Import translations. DO NOT MERGE" into jb-ub-latinimegoogleGeoff Mendal2015-03-044-26/+16
|\ \ \
| * | | Import translations. DO NOT MERGEGeoff Mendal2015-03-044-26/+16
| | | | | | | | | | | | | | | | | | | | Change-Id: Ia6ea2cbd9e914d60bdf9220d40991fd60cf8fc43 Auto-generated-cl: translation import
* | | | Import translations. DO NOT MERGEGeoff Mendal2015-03-0455-110/+55
|/ / / | | | | | | | | | | | | Change-Id: I23cfe9a6401ca62eeb9f6b42a8f979e9d97345b0 Auto-generated-cl: translation import
* | | Merge "Import translations. DO NOT MERGE" into jb-ub-latinimegoogleGeoff Mendal2015-03-0373-365/+740
|\ \ \
| * | | Import translations. DO NOT MERGEGeoff Mendal2015-03-0273-365/+740
| | | | | | | | | | | | | | | | | | | | Change-Id: I13b83c06aeb29a65f2eeea28415b041b654e48b6 Auto-generated-cl: translation import
* | | | am 55d96519: Merge "Turn off cloud sync if we have managed profiles"Jatin Matani2015-03-022-6/+7
|\ \ \ \ | | |/ / | |/| | | | | | | | | | * commit '55d9651929729548c16270de0a83e3a01c7f2a9b': Turn off cloud sync if we have managed profiles
| * | | Merge "Turn off cloud sync if we have managed profiles"Jatin Matani2015-03-022-6/+7
| |\ \ \
| | * | | Turn off cloud sync if we have managed profilesJatin Matani2015-03-022-6/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | UserManager#getUserProfiles > 1 implies managed profile. Workflow: - Disable sync prefs - Execute an async task to check for managed profile; if managed profile is found, remove the sync prefs. If not, enable the preference; - Move the logging pref from Advanced to Account & Privacy. Bug:19230544 Change-Id: I4dbd1fe8433b3263ccc74c35dc0ee0bb371122b3
| * | | | Merge "Revert "Import translations. DO NOT MERGE""Geoff Mendal2015-03-0273-1010/+365
| |\ \ \ \
| | * | | | Revert "Import translations. DO NOT MERGE"Geoff Mendal2015-03-0273-1010/+365
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 7989b888338ea39a3329022c22c694e0234ad581. Change-Id: Ie0fb3fef89938938da661c030808b1d8110816c9
| * | | | | Merge "Import translations. DO NOT MERGE"Geoff Mendal2015-03-0273-365/+1010
| |\| | | |
| | * | | | Import translations. DO NOT MERGEGeoff Mendal2015-03-0273-365/+1010
| | | |_|/ | | |/| | | | | | | | | | | | | | | | | Change-Id: I891a5bfa2cfebb4852ba0a1277cf7ae1aec912ae Auto-generated-cl: translation import
| * / | | Import translations. DO NOT MERGEGeoff Mendal2015-03-0273-0/+139
| |/ / / | | | | | | | | | | | | | | | | Change-Id: I4cab7c63e46cfef30b344658d8af54e9e0247752 Auto-generated-cl: translation import
* | | | Merge "Revert "Import translations. DO NOT MERGE"" into jb-ub-latinimegoogleGeoff Mendal2015-03-0273-1010/+365
|\ \ \ \
| * | | | Revert "Import translations. DO NOT MERGE"Geoff Mendal2015-03-0273-1010/+365
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 2f0fcc1e306c0cc48715211abda4fc0229a3ba26. Change-Id: I2d96e769a55a6f95888cb6cd86a185c86555ad83
* | | | | Merge "Import translations. DO NOT MERGE" into jb-ub-latinimegoogleGeoff Mendal2015-03-0273-365/+1010
|\| | | |
| * | | | Import translations. DO NOT MERGEGeoff Mendal2015-03-0273-365/+1010
| | |_|/ | |/| | | | | | | | | | | | | | Change-Id: I0cc15dd7b0ad8c710df0c33325a37899d1bd6810 Auto-generated-cl: translation import
* / | | Import translations. DO NOT MERGEGeoff Mendal2015-03-0273-3/+142
|/ / / | | | | | | | | | | | | Change-Id: I675c2cc5bdc246498b5b96058bc528f96ceee071 Auto-generated-cl: translation import
* | | am 9770336a: Merge "Label empty suggestions."Dan Zivkovic2015-02-271-0/+3
|\| | | | | | | | | | | | | | * commit '9770336a9b9b65fc62bde6f361e90909d4259769': Label empty suggestions.
| * | Label empty suggestions.Dan Zivkovic2015-02-271-0/+3
| |/ | | | | | | | | | | | | | | When talkback is enabled, empty strings will have a content description. Bug 19479836. Change-Id: I25679a2bdeff238a5330ba406d5bc7e6e2868ba1
* | am c83352d5: Merge "Refresh pref settings for cloud sync"Jatin Matani2015-02-262-24/+29
|\| | | | | | | | | * commit 'c83352d527bbae430f52b6494ad3e391d950520a': Refresh pref settings for cloud sync
| * Refresh pref settings for cloud syncJatin Matani2015-02-262-24/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Show the opt-in text - Show the account picker if user presses 'enable sync'. Previously we disabled the sync pref which was confusing. - Remove the debug tags from some prefs; and improve messaging overall General rules; - sync is turned ON : user checks 'enable sync' pref AND accepts the opt-in AND chooses an account - sync is turned OFF: when user signs out Demo link https://drive.google.com/a/google.com/file/d/0B9tNQOWdRuiWSUdVVE5rVDJudlk/view?usp=sharing Change-Id: I2e7933796b15e47005ba9970a8c1294416ef31a0
* | am 12d80ebe: Remove shortcut support from LatinIME.Dan Zivkovic2015-02-111-20/+0
|\| | | | | | | | | * commit '12d80ebead6a1d7f704a5a3af3b6fe3313ceab05': Remove shortcut support from LatinIME.
| * Remove shortcut support from LatinIME.Dan Zivkovic2015-02-111-20/+0
| | | | | | | | | | | | Note this change does not affect the native decoder interface. Change-Id: I73b7dc008a5acaf75a31a36a2d332b5afabd82d0
| * Import translations. DO NOT MERGEGeoff Mendal2015-02-041-1/+1
| | | | | | | | | | Change-Id: I3e9a864efab46895ffc21f73f5d78b7937d701fc Auto-generated-cl: translation import
* | Import translations. DO NOT MERGEGeoff Mendal2015-02-041-1/+1
| | | | | | | | | | Change-Id: Id30c21f9e5818cd2a5dbfc95c634ec8904db5932 Auto-generated-cl: translation import
* | am 23574d12: LatinIME portion of "green plus" feature.Dan Zivkovic2015-02-042-100/+0
|\| | | | | | | | | * commit '23574d1231296e090e6efb41a50c7885a116ddb4': LatinIME portion of "green plus" feature.
| * LatinIME portion of "green plus" feature.Dan Zivkovic2015-02-032-100/+0
| | | | | | | | | | | | | | | | | | Removes the feature that adds strings to the user dictionary, aka the "green highlight with a plus sign". Bug 19237189. Change-Id: I2387129a3add2d69d625f2ff16ed8cab3f10a735
| * Import translations. DO NOT MERGEGeoff Mendal2015-02-021-1/+1
| | | | | | | | | | Change-Id: I2785f4af2bee0b126e71b1fa22925e478611857f Auto-generated-cl: translation import
* | Import translations. DO NOT MERGEGeoff Mendal2015-02-021-1/+1
| | | | | | | | | | Change-Id: I08819308fb1507f051be558d2774a9570a81db62 Auto-generated-cl: translation import
* | am 77e0fa1d: LatinIME portion of multi-lang option removal.Dan Zivkovic2015-01-302-38/+0
|\| | | | | | | | | * commit '77e0fa1d6708fa53549d80fcd2035da5a30e4140': LatinIME portion of multi-lang option removal.
| * LatinIME portion of multi-lang option removal.Dan Zivkovic2015-01-292-38/+0
| | | | | | | | | | | | Bug 19188067. Change-Id: Ic9a3637f59dda30c699141222b9dcac3cd624b99
* | am 174da5c3: Merge "Disable the Burmese keyboard."Dan Zivkovic2015-01-2910-590/+1
|\| | | | | | | | | * commit '174da5c39541dab78a9d82904f90c28a4c4be436': Disable the Burmese keyboard.
| * Disable the Burmese keyboard.Dan Zivkovic2015-01-2910-590/+1
| | | | | | | | | | | | | | | | We'll resurrect this effort in the new code base. Bug 16900511. Change-Id: Iae4cd27cb29cb8f991e97cffd88ed59c30d66628
* | am bd254ca7: Merge "Re-enable new keyboard layouts in Fava."Dan Zivkovic2015-01-231-23/+7
|\| | | | | | | | | * commit 'bd254ca776ac25a311a3aeae96e00cf543dc18f9': Re-enable new keyboard layouts in Fava.
| * Merge "Re-enable new keyboard layouts in Fava."Dan Zivkovic2015-01-211-23/+7
| |\
| | * Re-enable new keyboard layouts in Fava.Dan Zivkovic2015-01-201-23/+7
| | | | | | | | | | | | | | | | | | This reverts commit da27faeb87dc47656f82ba90ee590872a3993985. Change-Id: I08e2b2510efcafd20743679de4a1ef7f09d9949a
| * | Import translations. DO NOT MERGEGeoff Mendal2015-01-211-1/+1
| | | | | | | | | | | | | | | Change-Id: Ifd6ac19adb46ebd6aefb94814bc2f5fba14a61e8 Auto-generated-cl: translation import
| * | Merge "Import translations. DO NOT MERGE"Geoff Mendal2015-01-192-2/+2
| |\ \
| | * | Import translations. DO NOT MERGEGeoff Mendal2015-01-192-2/+2
| | | | | | | | | | | | | | | | | | | | Change-Id: Iac5b20265c265d76c26833b36321702c34d1f50b Auto-generated-cl: translation import