Jatin Matani
d70d63fa43
am 5abefbb8: (-s ours) resolved conflicts for merge of 9cd60fe1 to mnc-dev-plus-aosp
...
* commit '5abefbb8d6e2a4bfe824d9c2d8904600d41f9387':
2015-08-27 11:28:22 +00:00
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
Geoff Mendal
3dd9e2cae7
Import translations. DO NOT MERGE
...
Change-Id: I91c46c5021d7c583e43211346d9b290209ea94ca
Auto-generated-cl: translation import
2015-08-26 05:29:22 -07: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
Geoff Mendal
c36e8bf58e
Import translations. DO NOT MERGE
...
Change-Id: Ic4e38928384e43b39f41d33a461645aed396f063
Auto-generated-cl: translation import
2015-08-24 06:33:59 -07:00
Mohammadinamul Sheik
ecc0969ba0
am 4009e4de: am c1ebf8ee: am 81f9a0d8: am a289e139: am b0dd5cc7: Fix the ellipses image scaling of LatinIME
...
* commit '4009e4dede2be5f12bedffb9139a4eb7d6b88978':
Fix the ellipses image scaling of LatinIME
2015-08-12 21:01:43 +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
0d21507dc4
Import translations. DO NOT MERGE
...
Change-Id: If363a8e5c3c1fcc4f6a22dcc4f3b7d29e7b065af
Auto-generated-cl: translation import
2015-08-08 06:46:43 -07:00
Geoff Mendal
01e1299976
Merge "Import translations. DO NOT MERGE"
2015-08-05 13:26:06 +00:00
Geoff Mendal
36aef7021f
Import translations. DO NOT MERGE
...
Change-Id: I8b507cec49c21d1e52ca8047373615a8f7566410
Auto-generated-cl: translation import
2015-08-05 06:18:18 -07:00
Geoff Mendal
b84b41a490
Import translations. DO NOT MERGE
...
Change-Id: Ia2602a34714db8d4d266e1a33f10ec2882cd7e98
Auto-generated-cl: translation import
2015-08-05 06:16:16 -07:00
Geoff Mendal
d5a4686c72
am 683b14d9: (-s ours) am 5e5504bb: (-s ours) am 90eae721: (-s ours) am cc30f068: (-s ours) Import translations. DO NOT MERGE
...
* commit '683b14d93eb93a4ea33578acf2b744e639f43414':
Import translations. DO NOT MERGE
2015-08-01 17:55:47 +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
56a9bb89f6
Import translations. DO NOT MERGE
...
Change-Id: I38c4dcdf891c1f2e883a07359cfea7c8ef7b97f4
Auto-generated-cl: translation import
2015-07-31 20:01:54 -07:00
Geoff Mendal
c8e870e60d
am 49cf8b4e: (-s ours) am 939a5a26: (-s ours) am da4cd376: (-s ours) am 0c44c231: (-s ours) am 0497f6d3: (-s ours) Import translations. DO NOT MERGE
...
* commit '49cf8b4e69ff66e7a7bf174ab2915a3663ffd394':
Import translations. DO NOT MERGE
2015-07-30 00:20:33 +00: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
43f0036509
am e7da8113: (-s ours) am 1472a455: (-s ours) am 60148878: (-s ours) am af309ba0: (-s ours) Import translations. DO NOT MERGE
...
* commit 'e7da8113de6f76fb82d2fa2cda92e3c433a835a2':
Import translations. DO NOT MERGE
2015-07-30 00:05:10 +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
Geoff Mendal
e343460d1c
Import translations. DO NOT MERGE
...
Change-Id: I2172c473d8bbad5224e9551921789d68db9d5244
Auto-generated-cl: translation import
2015-07-29 15:52:21 -07:00
Mohammadinamul Sheik
0c6b903327
am 583954f6: am c8b49f7c: am e6ccd516: am 234fc825: am 464da87f: [LatinIME] bring back use_personliazed_dicts_summary resource.
...
* commit '583954f609488449a423ff2ba5c6dbec109eaa12':
[LatinIME] bring back use_personliazed_dicts_summary resource.
2015-07-29 18:43:04 +00: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
Geoff Mendal
365e0d2ab7
Merge "Import translations. DO NOT MERGE"
2015-07-29 12:52:21 +00:00
Geoff Mendal
1be22de172
Import translations. DO NOT MERGE
...
Change-Id: I31e281306ce916fbfc5a2495a42525f2531729c0
Auto-generated-cl: translation import
2015-07-29 05:49:46 -07:00
Geoff Mendal
12864c6f44
Import translations. DO NOT MERGE
...
Change-Id: I4f22b867c9b8089dc16d23555ed3c747325d1a37
Auto-generated-cl: translation import
2015-07-29 05:46:51 -07: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
Geoff Mendal
b346ad5e48
Import translations. DO NOT MERGE
...
Change-Id: Id207c14251b9a366677e2888b3c1089d58cf540b
Auto-generated-cl: translation import
2015-07-25 00:17:11 -07:00
Mohammadinamul Sheik
570b9bbd09
am a6bc0df8: am 4e7ed10c: am c13c53c5: am ca8053d7: am 707ca769: Handle Cloud Sync and SpellChecker settings when permission changed
...
* commit 'a6bc0df83e0189b0a5d922078b6abd874aa23ce4':
Handle Cloud Sync and SpellChecker settings when permission changed
2015-07-24 17:21:17 +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
