aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge "Import translations. DO NOT MERGE"Baligh Uddin2015-09-111-1/+1
|\
| * Import translations. DO NOT MERGEBaligh Uddin2015-09-101-1/+1
| | | | | | | | | | Change-Id: I215000680ea9d4e3d88897cef72d4d04effa209b Auto-generated-cl: translation import
* | Import translations. DO NOT MERGEBaligh Uddin2015-09-101-11/+11
|/ | | | | Change-Id: I2b56a3f8e94e79e37d2d93330aff108c5de4dc5b Auto-generated-cl: translation import
* Merge "Import translations. DO NOT MERGE"Geoff Mendal2015-09-071-1/+1
|\
| * Import translations. DO NOT MERGEGeoff Mendal2015-09-071-1/+1
| | | | | | | | | | Change-Id: I932f254d3014243d9c3fc92be8a706d739e13ebe Auto-generated-cl: translation import
* | Import translations. DO NOT MERGEGeoff Mendal2015-09-071-1/+1
|/ | | | | Change-Id: Ic6cfd1be9da6b177b91bbb19c35daa80328cd242 Auto-generated-cl: translation import
* am 04be0e3a: am a6783987: am c3cc203e: am f52bae18: Don\'t show download ↵Russell Brenner2015-09-031-6/+16
|\ | | | | | | | | | | | | toast during SUW * commit '04be0e3a2f741f893d3b640e1d873c379ea19333': Don't show download toast during SUW
| * am a6783987: am c3cc203e: am f52bae18: Don\'t show download toast during SUWRussell Brenner2015-09-031-6/+16
| |\ | | | | | | | | | | | | * commit 'a6783987ff6e9b9a97e68c0b0e2d7af5c88d8080': Don't show download toast during SUW
| | * am c3cc203e: am f52bae18: Don\'t show download toast during SUWRussell Brenner2015-09-011-6/+16
| | |\ | | | | | | | | | | | | | | | | * commit 'c3cc203e4ac9702e40d3e8ebad94b973f4271a3a': Don't show download toast during SUW
| | | * am f52bae18: Don\'t show download toast during SUWRussell Brenner2015-09-011-6/+16
| | | |\ | | | | | | | | | | | | | | | | | | | | * commit 'f52bae18050b8955b8afeb1cb573d42ac6e260c0': Don't show download toast during SUW
| | | | * Don't show download toast during SUWRussell Brenner2015-08-251-6/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Check to see if setup wizard is running before showing toast to inform user that a download was started. Note that this will only affect the device owner; when adding new users later, the toast will still appear. (The USER_SETUP_COMPLETE flag is hidden from the SDK, while DEVICE_PROVISIONED remains available.) Bug: 22594336 Change-Id: I57c42d6f821714b71cbb066e82bba2a1dbab4951
* | | | | am b0ffda93: am 4df605df: (-s ours) am b0dd5cc7: Fix the ellipses image ↵Mohammadinamul Sheik2015-08-270-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | scaling of LatinIME * commit 'b0ffda93a56f910682682e32f562bdf7019b5b9c':
| * | | | am 4df605df: (-s ours) am b0dd5cc7: Fix the ellipses image scaling of LatinIMEMohammadinamul Sheik2015-08-270-0/+0
| |\ \ \ \ | | | | | | | | | | | | | | | | | | * commit '4df605df74c055ee699332dc878a5430ad8c4bff':
| | * \ \ \ am b0dd5cc7: Fix the ellipses image scaling of LatinIMEMohammadinamul Sheik2015-08-121-1/+3
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'b0dd5cc7b235bf6e0aa59e83a58b1e902a2ff372': Fix the ellipses image scaling of LatinIME
* | | | | | | am be1dc744: (-s ours) am 942137b3: (-s ours) am 0497f6d3: (-s ours) Import ↵Geoff Mendal2015-08-270-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | translations. DO NOT MERGE * commit 'be1dc7440b3f03e795d4cacdf217b576f5a50bfe':
| * | | | | | am 942137b3: (-s ours) am 0497f6d3: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-08-270-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | * commit '942137b3e81da1e9b98e7fdf00ba7c62dbb8c922':
| | * | | | | am 0497f6d3: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-07-290-0/+0
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '0497f6d34dc4e0c868989343c0a29d703fb98a7c': Import translations. DO NOT MERGE
* | | | | | | | am 627765c8: am f45342fe: (-s ours) am 464da87f: [LatinIME] bring back ↵Mohammadinamul Sheik2015-08-270-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | use_personliazed_dicts_summary resource. * commit '627765c825b07ed6c6e769ae46f065cc8db935e8':
| * | | | | | | am f45342fe: (-s ours) am 464da87f: [LatinIME] bring back ↵Mohammadinamul Sheik2015-08-270-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | use_personliazed_dicts_summary resource. * commit 'f45342fec00b99daee5ab1c2cff427fc6d2f4012':
| | * | | | | | am 464da87f: [LatinIME] bring back use_personliazed_dicts_summary resource.Mohammadinamul Sheik2015-07-291-0/+24
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '464da87f3746af38aed787602beb48841d3075ae': [LatinIME] bring back use_personliazed_dicts_summary resource.
* | | | | | | | | am f90b662f: am 41f380a9: (-s ours) am 707ca769: Handle Cloud Sync and ↵Mohammadinamul Sheik2015-08-270-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | SpellChecker settings when permission changed * commit 'f90b662f3b597fc49208d3406953b2186be55768':
| * | | | | | | | am 41f380a9: (-s ours) am 707ca769: Handle Cloud Sync and SpellChecker ↵Mohammadinamul Sheik2015-08-270-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | settings when permission changed * commit '41f380a9d730fad886cca218e5abd0e286f3b244':
| | * | | | | | | am 707ca769: Handle Cloud Sync and SpellChecker settings when permission changedMohammadinamul Sheik2015-07-244-18/+92
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '707ca7692a8666989b3fbe860bee28115103988e': Handle Cloud Sync and SpellChecker settings when permission changed
* | | | | | | | | | am 396b726e: am db0081f6: (-s ours) am 60415866: [LatinIME] Support MNC ↵Mohammadinamul Sheik2015-08-270-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | permissions. * commit '396b726eb175cb7287270b6f797331b2f77acfb4':
| * | | | | | | | | am db0081f6: (-s ours) am 60415866: [LatinIME] Support MNC permissions.Mohammadinamul Sheik2015-08-270-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'db0081f63c5d92ea66e9b0ed92f1d0eaf1130f42':
| | * | | | | | | | am 60415866: [LatinIME] Support MNC permissions.Mohammadinamul Sheik2015-07-1617-359/+464
| | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '604158669b407a40cd0f23538fad4dce5d738f24': [LatinIME] Support MNC permissions.
* | | | | | | | | | | am e9cc771d: (-s ours) am 96d0e019: (-s ours) am 7d5fb3a9: (-s ours) Merge ↵Geoff Mendal2015-08-270-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "Import translations. DO NOT MERGE" into mnc-dev * commit 'e9cc771dee56c57566a3efaaa39aa3a4a708fec2':
| * | | | | | | | | | am 96d0e019: (-s ours) am 7d5fb3a9: (-s ours) Merge "Import translations. DO ↵Geoff Mendal2015-08-270-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | NOT MERGE" into mnc-dev * commit '96d0e0194d43d3cdf04f39d5791160a91e0734bd':
| | * | | | | | | | | am 7d5fb3a9: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-devGeoff Mendal2015-07-150-0/+0
| | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '7d5fb3a9430550a3ccf1ed5afd70dbf8cc81574a': Import translations. DO NOT MERGE
* | | | | | | | | | | | am a7449673: (-s ours) am 6b6db80c: (-s ours) am 6aea6b9d: (-s ours) Merge ↵Geoff Mendal2015-08-270-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "Import translations. DO NOT MERGE" into mnc-dev * commit 'a74496734bf2a2761c198d75c986dd3fd4d8920b':
| * | | | | | | | | | | am 6b6db80c: (-s ours) am 6aea6b9d: (-s ours) Merge "Import translations. DO ↵Geoff Mendal2015-08-270-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | NOT MERGE" into mnc-dev * commit '6b6db80ca0eb058c8af0ff98c6b89022829d5cc4':
| | * | | | | | | | | | am 6aea6b9d: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-devGeoff Mendal2015-07-150-0/+0
| | |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '6aea6b9da7b779ff5f08da631f30bc5f177a3423': Import translations. DO NOT MERGE
* | | | | | | | | | | | | am 2cef65fb: (-s ours) am e42bad45: (-s ours) am 1aceaa3c: (-s ours) Merge ↵Geoff Mendal2015-08-270-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "Import translations. DO NOT MERGE" into mnc-dev * commit '2cef65fb15974f2b0a7cf0be7bef2e9200e0312d':
| * | | | | | | | | | | | am e42bad45: (-s ours) am 1aceaa3c: (-s ours) Merge "Import translations. DO ↵Geoff Mendal2015-08-270-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | NOT MERGE" into mnc-dev * commit 'e42bad45aad096abed85ed0a0cb92e07f906820f':
| | * | | | | | | | | | | am 1aceaa3c: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-devGeoff Mendal2015-07-150-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '1aceaa3c2b19e352cf9f16c73fd03dab881a4434': Import translations. DO NOT MERGE
* | | | | | | | | | | | | | am 87734fa8: (-s ours) am 0283bd91: (-s ours) am c8e261e9: (-s ours) Merge ↵Geoff Mendal2015-08-270-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "Import translations. DO NOT MERGE" into mnc-dev * commit '87734fa8c3ba05b7c16aa05be06006a6cb1e8e49':
| * | | | | | | | | | | | | am 0283bd91: (-s ours) am c8e261e9: (-s ours) Merge "Import translations. DO ↵Geoff Mendal2015-08-270-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | NOT MERGE" into mnc-dev * commit '0283bd910268fec571b6e918778d352f92e06e7e':
| | * | | | | | | | | | | | am c8e261e9: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-devGeoff Mendal2015-07-150-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'c8e261e95bd78ab2a3926d030c0525eba0fd8ca7': Import translations. DO NOT MERGE
* | | | | | | | | | | | | | | am dcf1904b: (-s ours) am 95199141: (-s ours) am cf849b40: (-s ours) Merge ↵Geoff Mendal2015-08-270-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "Import translations. DO NOT MERGE" into mnc-dev * commit 'dcf1904b2e5716063e5b890ce94f0358ec761f07':
| * | | | | | | | | | | | | | am 95199141: (-s ours) am cf849b40: (-s ours) Merge "Import translations. DO ↵Geoff Mendal2015-08-270-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | NOT MERGE" into mnc-dev * commit '9519914150fddfbb9f5024ff84102fc6ce074f93':
| | * | | | | | | | | | | | | am cf849b40: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-devGeoff Mendal2015-07-150-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'cf849b40df13546046d3d7c89dc63c3e8b354976': Import translations. DO NOT MERGE
* | | | | | | | | | | | | | | | am d1a615e9: (-s ours) am dbba2217: (-s ours) am 29217bcd: (-s ours) Merge ↵Geoff Mendal2015-08-270-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "Import translations. DO NOT MERGE" into mnc-dev * commit 'd1a615e9a2ab2cd18277064091c243b9b7e61d82':
| * | | | | | | | | | | | | | | am dbba2217: (-s ours) am 29217bcd: (-s ours) Merge "Import translations. DO ↵Geoff Mendal2015-08-270-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | NOT MERGE" into mnc-dev * commit 'dbba221709b04925c3e84ccfaef4fee01684f065':
| | * | | | | | | | | | | | | | am 29217bcd: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-devGeoff Mendal2015-07-150-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '29217bcd651d1ab968d01744533aec009fe252da': Import translations. DO NOT MERGE
* | | | | | | | | | | | | | | | | am 0d619da9: (-s ours) am 3a7194e9: (-s ours) am 285c9d82: (-s ours) Import ↵Geoff Mendal2015-08-270-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | translations. DO NOT MERGE * commit '0d619da9332cc2ca440ae3dd22b43335a6b5d358':
| * | | | | | | | | | | | | | | | am 3a7194e9: (-s ours) am 285c9d82: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-08-270-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '3a7194e98e7dd84f49fe3bd1e25807d5599008f2':
| | * | | | | | | | | | | | | | | am 285c9d82: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-07-150-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '285c9d825d53a76548079ad527c4c79fda69ada1': Import translations. DO NOT MERGE
* | | | | | | | | | | | | | | | | | am d70d63fa: am 5abefbb8: (-s ours) resolved conflicts for merge of 9cd60fe1 ↵Jatin Matani2015-08-270-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | to mnc-dev-plus-aosp * commit 'd70d63fa435e87878766311676cb6e87135c4f99':
| * | | | | | | | | | | | | | | | | am 5abefbb8: (-s ours) resolved conflicts for merge of 9cd60fe1 to ↵Jatin Matani2015-08-270-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mnc-dev-plus-aosp * commit '5abefbb8d6e2a4bfe824d9c2d8904600d41f9387':
| | * | | | | | | | | | | | | | | | resolved conflicts for merge of 9cd60fe1 to mnc-dev-plus-aospJatin Matani2015-07-11141-6072/+924
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I1aad861d711170ab3dab0019d8e4ff02f058c423