aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| | | * [LatinIME] bring back use_personliazed_dicts_summary resource.Mohammadinamul Sheik2015-07-281-0/+24
| | | | | | | | | | | | | | | | | | | | | | | | Bug: 22779653 Change-Id: Ia6af57e9a6ea59faf01c2587bab133136c5fc73a (cherry picked from commit 6be49e8a9a26242cc9c49549c3a015662461fc48)
* | | | am c13c53c5: am ca8053d7: am 707ca769: Handle Cloud Sync and SpellChecker ↵Mohammadinamul Sheik2015-07-244-18/+92
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | settings when permission changed * commit 'c13c53c5d5f02881ba5914c6db6041a20514bcfc': Handle Cloud Sync and SpellChecker settings when permission changed
| * | | am ca8053d7: am 707ca769: Handle Cloud Sync and SpellChecker settings when ↵Mohammadinamul Sheik2015-07-244-18/+92
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | permission changed * commit 'ca8053d7f3236b7d6df1ed6709172b2f887b477e': Handle Cloud Sync and SpellChecker settings when permission changed
| | * | 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
| | | * Handle Cloud Sync and SpellChecker settings when permission changedMohammadinamul Sheik2015-07-244-18/+92
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This build has been compiled against API 23 This build is approved to go out with the M OTA, but may NOT be released to the public until the Play Store has enabled API level 23 apps Version: 4.1.2300x.build_id 1. Disable the settings. 2. Disable the feature. 3. Force reload the facilitator. Bug: 22564048 Change-Id: Ic09742786c3e4efc034bceee836ae6a1e07307a1 (cherry picked from commit 031d04192080f0368f21c3371d1ec6af87375357)
* | | | am 1c47b2d8: am 992144a8: am 60415866: [LatinIME] Support MNC permissions.Mohammadinamul Sheik2015-07-1617-359/+464
|\| | | | | | | | | | | | | | | | | | | * commit '1c47b2d83dc23fb56f4d7dbd7711d828850d8882': [LatinIME] Support MNC permissions.
| * | | am 992144a8: am 60415866: [LatinIME] Support MNC permissions.Mohammadinamul Sheik2015-07-1617-359/+464
| |\| | | | | | | | | | | | | | | | | | * commit '992144a8c2808c390678d57cc1163d24c63cdcb4': [LatinIME] Support MNC permissions.
| | * | am 60415866: [LatinIME] Support MNC permissions.Mohammadinamul Sheik2015-07-1617-359/+464
| | |\| | | | | | | | | | | | | | | | | * commit '604158669b407a40cd0f23538fad4dce5d738f24': [LatinIME] Support MNC permissions.
| | | * [LatinIME] Support MNC permissions.Mohammadinamul Sheik2015-07-1517-359/+464
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This build has been compiled against API 23 This build is approved to go out with the M OTA, but may NOT be released to the public until the Play Store has enabled API level 23 apps Version: 4.1.2300x.build_id 1. Replaces the personalization is on information with the suggest contacts. 2. Enables "Use Contacts" only if the app has permission to read contacts. 3. Disables the contacts dictionary in the Facilitator. 4. Do not register/read the contacts in the contact observer. Bug: 22236416 Change-Id: I9674e13d0d0f4a2014c5024fde0178de684c07e7
* | | | am 896e619e: (-s ours) am ef1cb855: (-s ours) am 7d5fb3a9: (-s ours) Merge ↵Geoff Mendal2015-07-150-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | "Import translations. DO NOT MERGE" into mnc-dev * commit '896e619e52c8d01317d56f458f3bc7a9c5317e0b': Import translations. DO NOT MERGE
| * | | am ef1cb855: (-s ours) am 7d5fb3a9: (-s ours) Merge "Import translations. DO ↵Geoff Mendal2015-07-150-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | NOT MERGE" into mnc-dev * commit 'ef1cb855a84173417089715a595ecba6c6cde4ca': Import translations. DO NOT MERGE
| | * | 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
| | | * Merge "Import translations. DO NOT MERGE" into mnc-devGeoff Mendal2015-07-1539-149/+784
| | | |\
| | | | * Import translations. DO NOT MERGEGeoff Mendal2015-07-1539-149/+784
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Iebd6e5f51a121cae7913e6ac21c4140b9c4de6f9 Auto-generated-cl: translation import
* | | | | am c9664084: (-s ours) am f72e1202: (-s ours) am 6aea6b9d: (-s ours) Merge ↵Geoff Mendal2015-07-150-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "Import translations. DO NOT MERGE" into mnc-dev * commit 'c9664084c71c97d9ace82ff5184f02e743273a41': Import translations. DO NOT MERGE
| * | | | am f72e1202: (-s ours) am 6aea6b9d: (-s ours) Merge "Import translations. DO ↵Geoff Mendal2015-07-150-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | NOT MERGE" into mnc-dev * commit 'f72e120216d591f6ed1a9aa69d34009d69848108': Import translations. DO NOT MERGE
| | * | | 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
| | | * | Merge "Import translations. DO NOT MERGE" into mnc-devGeoff Mendal2015-07-159-8/+278
| | | |\ \
| | | | * | Import translations. DO NOT MERGEGeoff Mendal2015-07-159-8/+278
| | | | |/ | | | | | | | | | | | | | | | | | | | | Change-Id: I922b3fb60a57db87c8bf1da3d3cd7fa976d9f5f9 Auto-generated-cl: translation import
* | | | | am e45179a2: (-s ours) am a6d84257: (-s ours) am 1aceaa3c: (-s ours) Merge ↵Geoff Mendal2015-07-150-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "Import translations. DO NOT MERGE" into mnc-dev * commit 'e45179a2afad7c9b679e5242a0606ec342538c82': Import translations. DO NOT MERGE
| * | | | am a6d84257: (-s ours) am 1aceaa3c: (-s ours) Merge "Import translations. DO ↵Geoff Mendal2015-07-150-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | NOT MERGE" into mnc-dev * commit 'a6d8425760ff3e10f3351545ac7e01e8626fdd8c': Import translations. DO NOT MERGE
| | * | | 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
| | | * | Merge "Import translations. DO NOT MERGE" into mnc-devGeoff Mendal2015-07-156-32/+864
| | | |\ \
| | | | * | Import translations. DO NOT MERGEGeoff Mendal2015-07-156-32/+864
| | | | |/ | | | | | | | | | | | | | | | | | | | | Change-Id: I1ce33d32d058d27eae565c1e982b491372878d25 Auto-generated-cl: translation import
* | | | | am 4a44f433: (-s ours) am d6cba73e: (-s ours) am c8e261e9: (-s ours) Merge ↵Geoff Mendal2015-07-150-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "Import translations. DO NOT MERGE" into mnc-dev * commit '4a44f43348b593c2e49d6c7c38aa987ba4cc5d6b': Import translations. DO NOT MERGE
| * | | | am d6cba73e: (-s ours) am c8e261e9: (-s ours) Merge "Import translations. DO ↵Geoff Mendal2015-07-150-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | NOT MERGE" into mnc-dev * commit 'd6cba73e4c0ec4c4f2f47957873f0983620ff9c4': Import translations. DO NOT MERGE
| | * | | 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
| | | * | Merge "Import translations. DO NOT MERGE" into mnc-devGeoff Mendal2015-07-1512-46/+3450
| | | |\ \
| | | | * | Import translations. DO NOT MERGEGeoff Mendal2015-07-1512-46/+3450
| | | | |/ | | | | | | | | | | | | | | | | | | | | Change-Id: Id1d45fb3ba0b84c8574bd8e326c62f2417660ce3 Auto-generated-cl: translation import
* | | | | am b8d881f2: (-s ours) am cce9728e: (-s ours) am cf849b40: (-s ours) Merge ↵Geoff Mendal2015-07-150-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "Import translations. DO NOT MERGE" into mnc-dev * commit 'b8d881f2505be5511f21ec2de86bc3e8523c3643': Import translations. DO NOT MERGE
| * | | | am cce9728e: (-s ours) am cf849b40: (-s ours) Merge "Import translations. DO ↵Geoff Mendal2015-07-150-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | NOT MERGE" into mnc-dev * commit 'cce9728e2b838642c85e30978854793b481954d2': Import translations. DO NOT MERGE
| | * | | 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
| | | * | Merge "Import translations. DO NOT MERGE" into mnc-devGeoff Mendal2015-07-156-2/+98
| | | |\ \
| | | | * | Import translations. DO NOT MERGEGeoff Mendal2015-07-156-2/+98
| | | | |/ | | | | | | | | | | | | | | | | | | | | Change-Id: Id4a9a90498ece00ba399074bef4010ecd315aeb7 Auto-generated-cl: translation import
* | | | | am 63917040: (-s ours) am 74d4fdc3: (-s ours) am 29217bcd: (-s ours) Merge ↵Geoff Mendal2015-07-150-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "Import translations. DO NOT MERGE" into mnc-dev * commit '63917040f1143c036ff480cee3e26790eaddb263': Import translations. DO NOT MERGE
| * | | | am 74d4fdc3: (-s ours) am 29217bcd: (-s ours) Merge "Import translations. DO ↵Geoff Mendal2015-07-150-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | NOT MERGE" into mnc-dev * commit '74d4fdc31c8b3893c498c26e833eabe86f03fb57': Import translations. DO NOT MERGE
| | * | | 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
| | | * | Merge "Import translations. DO NOT MERGE" into mnc-devGeoff Mendal2015-07-156-3/+111
| | | |\ \
| | | | * | Import translations. DO NOT MERGEGeoff Mendal2015-07-156-3/+111
| | | | |/ | | | | | | | | | | | | | | | | | | | | Change-Id: I41b452436ee558b42b104387eb3431d8164ab766 Auto-generated-cl: translation import
* | | | | am cc34158a: (-s ours) am 16ad0293: (-s ours) am 285c9d82: (-s ours) Import ↵Geoff Mendal2015-07-150-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | translations. DO NOT MERGE * commit 'cc34158af0bf5318a33d74fed3e01de32a62149a': Import translations. DO NOT MERGE
| * | | | am 16ad0293: (-s ours) am 285c9d82: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-07-150-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | * commit '16ad0293117e18b90d4140a4e3241cd84a1f28a9': Import translations. DO NOT MERGE
| | * | | am 285c9d82: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-07-150-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | * commit '285c9d825d53a76548079ad527c4c79fda69ada1': Import translations. DO NOT MERGE
| | | * | Import translations. DO NOT MERGEGeoff Mendal2015-07-156-2/+126
| | | |/ | | | | | | | | | | | | | | | | Change-Id: I7b33db63242fec09f647c250e66f9eef75c7b6fa Auto-generated-cl: translation import
* | | | am 247aef75: (-s ours) am 490701a3: (-s ours) DO NOT MERGE ANYWHERE. reset ↵Qiwen Zhao2015-07-150-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | to mnc-dev at 9cd60fe. * commit '247aef7564be66179a988e74bd695c324e36f6dd':
| * | | am 490701a3: (-s ours) DO NOT MERGE ANYWHERE. reset to mnc-dev at 9cd60fe.Qiwen Zhao2015-07-150-0/+0
| |\| | | | | | | | | | | | | | * commit '490701a3feb84f73e5af9a2c4740f4d4be8455b7':
| | * | DO NOT MERGE ANYWHERE. reset to mnc-dev at 9cd60fe.Qiwen Zhao2015-07-130-0/+0
| | |\ \ | | | |/ | | |/|
| | | * resolved conflicts for merge of 9cd60fe1 to mnc-dr-devJatin Matani2015-07-13144-5910/+761
| | | |\ | | | |/ | | |/| | | | | Change-Id: I8c7e0f48dad8eff174df4ffdebeeb9467fd799a0
* | | | am e8622174: (-s ours) DO NOT MERGE ANYWHERE. reset to mnc-dev at 9cd60feQiwen Zhao2015-07-150-0/+0
|\| | | | | | | | | | | | | | | * commit 'e862217461bdf0d460b71d80b800a86be1eb61fc':
| * | | DO NOT MERGE ANYWHERE. reset to mnc-dev at 9cd60feQiwen Zhao2015-07-130-0/+0
| |\ \ \ | | |/ / | |/| |
* | | | DO NOT MERGE ANYWHERE. reset to mnc-dev at 9cd60feQiwen Zhao2015-07-130-0/+0
|\ \ \ \ | |/ / / |/| | |