The Android Automerger
8c3f5587a9
am 1791ce07: (-s ours) am 01f042cc: merge in ub-latinimegoogle-fava-release history after reset to jb-ub-latinimegoogle
...
* commit '1791ce07522f938a349eedeb22223449abe6c380':
2015-08-27 11:28:17 +00:00
Jatin Matani
edc6e8cd38
am c96aef22: (-s ours) resolved conflicts for merge of d711426a
to mnc-dev-plus-aosp
...
* commit 'c96aef2283fb7c091c8b35071ab82d3f330c025d':
2015-08-27 11:28:14 +00:00
Jatin Matani
54fb507d51
am 5fd77e2c: (-s ours) am 8c2591ee: Bring back shortcuts and add to dictionary UI
...
* commit '5fd77e2ce94e555b06665f9ab636674669c6c6a9':
2015-08-27 11:28:10 +00:00
Russell Brenner
f52bae1805
Don't show download toast during SUW
...
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
2015-08-25 17:39:00 +00:00
Mohammadinamul Sheik
4009e4dede
am c1ebf8ee: am 81f9a0d8: am a289e139: am b0dd5cc7: Fix the ellipses image scaling of LatinIME
...
* commit 'c1ebf8ee23116fddeb2c6b3260fc7f691854b193':
Fix the ellipses image scaling of LatinIME
2015-08-12 20:53:55 +00:00
Mohammadinamul Sheik
c1ebf8ee23
am 81f9a0d8: am a289e139: am b0dd5cc7: Fix the ellipses image scaling of LatinIME
...
* commit '81f9a0d8f370500128d134d6e851220c20038758':
Fix the ellipses image scaling of LatinIME
2015-08-12 20:47:30 +00:00
Mohammadinamul Sheik
81f9a0d8f3
am a289e139: am b0dd5cc7: Fix the ellipses image scaling of LatinIME
...
* commit 'a289e13927e7cd2e3d16edb96f56ced777b4c920':
Fix the ellipses image scaling of LatinIME
2015-08-12 20:37:57 +00:00
Mohammadinamul Sheik
4df605df74
am b0dd5cc7: Fix the ellipses image scaling of LatinIME
...
* commit 'b0dd5cc7b235bf6e0aa59e83a58b1e902a2ff372':
Fix the ellipses image scaling of LatinIME
2015-08-12 20:28:44 +00:00
Mohammadinamul Sheik
a289e13927
am b0dd5cc7: Fix the ellipses image scaling of LatinIME
...
* commit 'b0dd5cc7b235bf6e0aa59e83a58b1e902a2ff372':
Fix the ellipses image scaling of LatinIME
2015-08-12 20:28:43 +00:00
Mohammadinamul Sheik
b0dd5cc7b2
Fix the ellipses image scaling of LatinIME
...
Bug: 23082844
Change-Id: I7baac5e5a0700280906fd0f5f9351fc8dfc4c2b3
(cherry picked from commit 990e9a75b6d88ba234131612f11eac6b69c1cf84)
2015-08-12 18:03:44 +00:00
Geoff Mendal
683b14d93e
am 5e5504bb: (-s ours) am 90eae721: (-s ours) am cc30f068: (-s ours) Import translations. DO NOT MERGE
...
* commit '5e5504bb69b83fb5faeeddd08e6a993ff376b969':
Import translations. DO NOT MERGE
2015-08-01 17:06:50 +00:00
Geoff Mendal
5e5504bb69
am 90eae721: (-s ours) am cc30f068: (-s ours) Import translations. DO NOT MERGE
...
* commit '90eae721fe81bf43966172aba60c20ff60467bad':
Import translations. DO NOT MERGE
2015-08-01 16:55:03 +00:00
Geoff Mendal
90eae721fe
am cc30f068: (-s ours) Import translations. DO NOT MERGE
...
* commit 'cc30f06888f4f46f16040cff821ca1e685551d12':
Import translations. DO NOT MERGE
2015-08-01 16:38:48 +00:00
Geoff Mendal
cc30f06888
Import translations. DO NOT MERGE
...
Change-Id: I9327dbfb97dc99e7c6b408d41ef97b620dc4b9a8
Auto-generated-cl: translation import
2015-07-31 20:05:51 -07:00
Geoff Mendal
49cf8b4e69
am 939a5a26: (-s ours) am da4cd376: (-s ours) am 0c44c231: (-s ours) am 0497f6d3: (-s ours) Import translations. DO NOT MERGE
...
* commit '939a5a265e77119ed824b83d72abe0d62fdcec32':
Import translations. DO NOT MERGE
2015-07-30 00:05:29 +00:00
Geoff Mendal
e7da8113de
am 1472a455: (-s ours) am 60148878: (-s ours) am af309ba0: (-s ours) Import translations. DO NOT MERGE
...
* commit '1472a4559e08487b7fe070a720b151163f16c1f9':
Import translations. DO NOT MERGE
2015-07-29 23:51:20 +00:00
Geoff Mendal
939a5a265e
am da4cd376: (-s ours) am 0c44c231: (-s ours) am 0497f6d3: (-s ours) Import translations. DO NOT MERGE
...
* commit 'da4cd376ff3f04f4ad1fd4dd057b813f1cdcd497':
Import translations. DO NOT MERGE
2015-07-29 23:51:00 +00:00
Geoff Mendal
1472a4559e
am 60148878: (-s ours) am af309ba0: (-s ours) Import translations. DO NOT MERGE
...
* commit '601488784571240aa2764adea74fa5a746c66513':
Import translations. DO NOT MERGE
2015-07-29 23:36:12 +00:00
Geoff Mendal
da4cd376ff
am 0c44c231: (-s ours) am 0497f6d3: (-s ours) Import translations. DO NOT MERGE
...
* commit '0c44c2313e5be55733999d61aac34114599d6bc8':
Import translations. DO NOT MERGE
2015-07-29 23:34:57 +00:00
Geoff Mendal
942137b3e8
am 0497f6d3: (-s ours) Import translations. DO NOT MERGE
...
* commit '0497f6d34dc4e0c868989343c0a29d703fb98a7c':
Import translations. DO NOT MERGE
2015-07-29 23:19:17 +00:00
Geoff Mendal
0c44c2313e
am 0497f6d3: (-s ours) Import translations. DO NOT MERGE
...
* commit '0497f6d34dc4e0c868989343c0a29d703fb98a7c':
Import translations. DO NOT MERGE
2015-07-29 23:18:58 +00:00
Geoff Mendal
6014887845
am af309ba0: (-s ours) Import translations. DO NOT MERGE
...
* commit 'af309ba046e2875a6f6b76fac1cef5dcaa9e9604':
Import translations. DO NOT MERGE
2015-07-29 23:17:04 +00:00
Geoff Mendal
af309ba046
Import translations. DO NOT MERGE
...
Change-Id: I27869e5a8e6238b2a9eb3948c6474f94d3817268
Auto-generated-cl: translation import
2015-07-29 16:05:32 -07:00
Geoff Mendal
0497f6d34d
Import translations. DO NOT MERGE
...
Change-Id: I5894bc3e87ed62aa351d7545df7d9901ea115877
Auto-generated-cl: translation import
2015-07-29 16:04:36 -07:00
Mohammadinamul Sheik
583954f609
am c8b49f7c: am e6ccd516: am 234fc825: am 464da87f: [LatinIME] bring back use_personliazed_dicts_summary resource.
...
* commit 'c8b49f7c7e9360f0732d70896508dc70474b3ea1':
[LatinIME] bring back use_personliazed_dicts_summary resource.
2015-07-29 18:21:12 +00:00
Mohammadinamul Sheik
c8b49f7c7e
am e6ccd516: am 234fc825: am 464da87f: [LatinIME] bring back use_personliazed_dicts_summary resource.
...
* commit 'e6ccd516c04bbe57aeb8439cc6fa05bd7db9069e':
[LatinIME] bring back use_personliazed_dicts_summary resource.
2015-07-29 18:02:53 +00:00
Mohammadinamul Sheik
e6ccd516c0
am 234fc825: am 464da87f: [LatinIME] bring back use_personliazed_dicts_summary resource.
...
* commit '234fc82508b5349f4f829892ad1447326d9d820b':
[LatinIME] bring back use_personliazed_dicts_summary resource.
2015-07-29 17:36:43 +00:00
Mohammadinamul Sheik
234fc82508
am 464da87f: [LatinIME] bring back use_personliazed_dicts_summary resource.
...
* commit '464da87f3746af38aed787602beb48841d3075ae':
[LatinIME] bring back use_personliazed_dicts_summary resource.
2015-07-29 16:31:08 +00:00
Mohammadinamul Sheik
f45342fec0
am 464da87f: [LatinIME] bring back use_personliazed_dicts_summary resource.
...
* commit '464da87f3746af38aed787602beb48841d3075ae':
[LatinIME] bring back use_personliazed_dicts_summary resource.
2015-07-29 16:27:12 +00:00
Mohammadinamul Sheik
464da87f37
[LatinIME] bring back use_personliazed_dicts_summary resource.
...
Bug: 22779653
Change-Id: Ia6af57e9a6ea59faf01c2587bab133136c5fc73a
(cherry picked from commit 6be49e8a9a26242cc9c49549c3a015662461fc48)
2015-07-28 23:06:10 +00:00
Mohammadinamul Sheik
a6bc0df83e
am 4e7ed10c: am c13c53c5: am ca8053d7: am 707ca769: Handle Cloud Sync and SpellChecker settings when permission changed
...
* commit '4e7ed10c3549ba17763841824af23fbb23be28d9':
Handle Cloud Sync and SpellChecker settings when permission changed
2015-07-24 16:07:13 +00:00
Mohammadinamul Sheik
4e7ed10c35
am c13c53c5: am ca8053d7: am 707ca769: Handle Cloud Sync and SpellChecker settings when permission changed
...
* commit 'c13c53c5d5f02881ba5914c6db6041a20514bcfc':
Handle Cloud Sync and SpellChecker settings when permission changed
2015-07-24 04:46:32 +00:00
Mohammadinamul Sheik
c13c53c5d5
am ca8053d7: am 707ca769: Handle Cloud Sync and SpellChecker settings when permission changed
...
* commit 'ca8053d7f3236b7d6df1ed6709172b2f887b477e':
Handle Cloud Sync and SpellChecker settings when permission changed
2015-07-24 04:37:09 +00:00
Mohammadinamul Sheik
ca8053d7f3
am 707ca769: Handle Cloud Sync and SpellChecker settings when permission changed
...
* commit '707ca7692a8666989b3fbe860bee28115103988e':
Handle Cloud Sync and SpellChecker settings when permission changed
2015-07-24 04:20:13 +00:00
Mohammadinamul Sheik
41f380a9d7
am 707ca769: Handle Cloud Sync and SpellChecker settings when permission changed
...
* commit '707ca7692a8666989b3fbe860bee28115103988e':
Handle Cloud Sync and SpellChecker settings when permission changed
2015-07-24 04:18:47 +00:00
Mohammadinamul Sheik
707ca7692a
Handle Cloud Sync and SpellChecker settings when permission changed
...
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)
2015-07-24 02:00:54 +00:00
Mohammadinamul Sheik
bdac27417c
am 641e2bd3: am 1c47b2d8: am 992144a8: am 60415866: [LatinIME] Support MNC permissions.
...
* commit '641e2bd3152be76b604ae24dcb6b736fd8853d16':
[LatinIME] Support MNC permissions.
2015-07-16 00:42:13 +00:00
Mohammadinamul Sheik
641e2bd315
am 1c47b2d8: am 992144a8: am 60415866: [LatinIME] Support MNC permissions.
...
* commit '1c47b2d83dc23fb56f4d7dbd7711d828850d8882':
[LatinIME] Support MNC permissions.
2015-07-16 00:30:54 +00:00
Mohammadinamul Sheik
1c47b2d83d
am 992144a8: am 60415866: [LatinIME] Support MNC permissions.
...
* commit '992144a8c2808c390678d57cc1163d24c63cdcb4':
[LatinIME] Support MNC permissions.
2015-07-16 00:21:56 +00:00
Mohammadinamul Sheik
992144a8c2
am 60415866: [LatinIME] Support MNC permissions.
...
* commit '604158669b407a40cd0f23538fad4dce5d738f24':
[LatinIME] Support MNC permissions.
2015-07-16 00:04:12 +00:00
Mohammadinamul Sheik
db0081f63c
am 60415866: [LatinIME] Support MNC permissions.
...
* commit '604158669b407a40cd0f23538fad4dce5d738f24':
[LatinIME] Support MNC permissions.
2015-07-16 00:03:56 +00:00
Mohammadinamul Sheik
604158669b
[LatinIME] Support MNC permissions.
...
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
2015-07-15 22:51:53 +00:00
Geoff Mendal
1fc9af7705
am 93193ccf: (-s ours) am 896e619e: (-s ours) am ef1cb855: (-s ours) am 7d5fb3a9: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
...
* commit '93193ccf436cb6592de1e9bca5476d6a5278ca48':
Import translations. DO NOT MERGE
2015-07-15 17:37:19 +00:00
Geoff Mendal
66940fb01e
am d534affc: (-s ours) am c9664084: (-s ours) am f72e1202: (-s ours) am 6aea6b9d: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
...
* commit 'd534affcdb2ebaf497111ccc8c86bdc4d4f67282':
Import translations. DO NOT MERGE
2015-07-15 17:37:16 +00:00
Geoff Mendal
0184642b72
am 95b0388a: (-s ours) am e45179a2: (-s ours) am a6d84257: (-s ours) am 1aceaa3c: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
...
* commit '95b0388afa5b2f9f89b29019316da1a9455fc6c9':
Import translations. DO NOT MERGE
2015-07-15 17:37:14 +00:00
Geoff Mendal
f81efca101
am 751f64df: (-s ours) am 4a44f433: (-s ours) am d6cba73e: (-s ours) am c8e261e9: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
...
* commit '751f64dfe244888f0ec3ef69a2c60df292b8fe64':
Import translations. DO NOT MERGE
2015-07-15 17:37:12 +00:00
Geoff Mendal
417f375851
am c73fabf6: (-s ours) am b8d881f2: (-s ours) am cce9728e: (-s ours) am cf849b40: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
...
* commit 'c73fabf6080518732c6662df8d227c23847d9831':
Import translations. DO NOT MERGE
2015-07-15 17:37:10 +00:00
Geoff Mendal
cf090fc76e
am 68c112b6: (-s ours) am 63917040: (-s ours) am 74d4fdc3: (-s ours) am 29217bcd: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
...
* commit '68c112b652194d97dd2b5c488cd2bd118758a0dd':
Import translations. DO NOT MERGE
2015-07-15 17:37:08 +00:00
Geoff Mendal
a7effd1d40
am 983dcbd1: (-s ours) am cc34158a: (-s ours) am 16ad0293: (-s ours) am 285c9d82: (-s ours) Import translations. DO NOT MERGE
...
* commit '983dcbd1f858f9bbb5a9781bc9780ece834d70e3':
Import translations. DO NOT MERGE
2015-07-15 17:37:07 +00:00
Qiwen Zhao
8e3fa5c1c4
am 16b9a0ba: (-s ours) am 247aef75: (-s ours) am 490701a3: (-s ours) DO NOT MERGE ANYWHERE. reset to mnc-dev at 9cd60fe
.
...
* commit '16b9a0ba09380f2c176068005cb28eb1e1d5dbac':
2015-07-15 17:37:05 +00:00