Commit graph

41911 commits

Author SHA1 Message Date
Xin Li
c65e16db60 Merge "Merge Android R" 2020-09-10 17:22:04 +00:00
Xin Li
60be45ecb2 Merge Android R
Bug: 168057903
Merged-In: Ia56c511912ee213555b170faf292f1640d90cb75
Change-Id: Id2ed98b896c8f23246df31fead70c94e764aab97
2020-09-08 16:56:16 -07:00
Xin Li
98755ccae9 Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709)
Bug: 166295507
Merged-In: Ic072c06935a52c466d43fe4787cee7c7da73756c
Change-Id: Ia56c511912ee213555b170faf292f1640d90cb75
2020-08-27 10:16:59 -07:00
Adrian Roos
dcf1ecf794 Merge "Update LatinIME to comply with Android's inclusive language guidance" am: 33fa7e7126
Original change: https://android-review.googlesource.com/c/platform/packages/inputmethods/LatinIME/+/1398188

Change-Id: I1f6a3172d69957c82840635c68820b3aff98f8bf
2020-08-13 10:20:19 +00:00
Adrian Roos
33fa7e7126 Merge "Update LatinIME to comply with Android's inclusive language guidance" 2020-08-13 10:03:51 +00:00
Adrian Roos
444da56414 Update LatinIME to comply with Android's inclusive language guidance
See https://source.android.com/setup/contribute/respectful-code for reference

Bug: 162536543
Change-Id: I5df9e60ec6caa2e1e3253532c2b59b74adfc1749
2020-08-12 13:07:02 +02:00
Treehugger Robot
6fc67acb39 Merge "Update language to comply with Android’s inclusive language guidance" am: b01f678ca8
Original change: https://android-review.googlesource.com/c/platform/packages/inputmethods/LatinIME/+/1371237

Change-Id: I5a54bf19ea1ba28abfc4e4451f23bc008749b344
2020-07-31 21:00:45 +00:00
Treehugger Robot
b01f678ca8 Merge "Update language to comply with Android’s inclusive language guidance" 2020-07-31 20:40:28 +00:00
Seigo Nonaka
0c549e7424 Update language to comply with Android’s inclusive language guidance
See https://source.android.com/setup/contribute/respectful-code for reference

Bug: 161896447
Test: tapas LatinIME && m
Change-Id: Ic06f948c023a091e1532db826a78dd01031d7205
2020-07-31 11:28:59 -07:00
Treehugger Robot
892eabe4c5 Merge "Update language to comply with Android's inclusive language guidance" am: 9490b1b92f
Original change: https://android-review.googlesource.com/c/platform/packages/inputmethods/LatinIME/+/1382602

Change-Id: Ie77533b68469bf4018bffdecda72792fe89aba71
2020-07-31 17:21:34 +00:00
Treehugger Robot
9490b1b92f Merge "Update language to comply with Android's inclusive language guidance" 2020-07-31 17:05:33 +00:00
Jeff Sharkey
1d9bf42009 Update language to comply with Android's inclusive language guidance
See https://source.android.com/setup/contribute/respectful-code for reference

Bug: 161896447
Change-Id: I171bc299e660f96f20041a67a3052bd8a2ed781c
2020-07-31 09:33:35 -06:00
Treehugger Robot
a2695d0ca6 Merge "Update language to comply with Android’s inclusive language guidance" am: 4eb192212f
Original change: https://android-review.googlesource.com/c/platform/packages/inputmethods/LatinIME/+/1371236

Change-Id: Ie132872cad36f2fa2b28eec2be7b4bb148e55d7f
2020-07-23 04:29:32 +00:00
Treehugger Robot
4eb192212f Merge "Update language to comply with Android’s inclusive language guidance" 2020-07-23 04:05:45 +00:00
Seigo Nonaka
f53e034a17 Update language to comply with Android’s inclusive language guidance
See https://source.android.com/setup/contribute/respectful-code for reference

Bug: 161896447
Test: tapas LatinIME && m
Change-Id: I2ffb39ff70f61e579b62761d3da526a545dead1f
2020-07-22 14:08:35 -07:00
Treehugger Robot
67bb31cfa3 Merge "Remove MODULE_LICENSE_APACHE2 from LatinIME" am: fa1093e38c am: daadf71015
Change-Id: Ic072c06935a52c466d43fe4787cee7c7da73756c
2020-04-28 21:20:10 +00:00
Treehugger Robot
daadf71015 Merge "Remove MODULE_LICENSE_APACHE2 from LatinIME" am: fa1093e38c
Change-Id: I4d86ad8ff2bdaf690c74fff1141542cf9e44a510
2020-04-28 21:00:51 +00:00
Treehugger Robot
fa1093e38c Merge "Remove MODULE_LICENSE_APACHE2 from LatinIME" 2020-04-28 20:46:01 +00:00
Bob Badour
349a1ce422 Remove MODULE_LICENSE_APACHE2 from LatinIME
Repositories containing third-party code need a METADATA and a
license_type. Repositories containing only first-party code no longer
need a MODULE_LICENSE_* file.

Bug: 68860345
Bug: 69058154
Bug: 151953481

Test: no code changes
Change-Id: I1ace00753e03c6c09d63b8c509fde95d44b98739
2020-04-27 19:56:53 -07:00
Treehugger Robot
e04cfb092e Merge "Add explicit dependencies on jni_headers" am: d3af5a28ea am: aab67ba15e
Change-Id: I6d376cc2492ed2969c85a72f4456d3711db2f72a
2020-04-15 17:28:09 +00:00
Treehugger Robot
aab67ba15e Merge "Add explicit dependencies on jni_headers" am: d3af5a28ea
Change-Id: Ibc27e9196b7bc9328e465a90c685b9c05460718e
2020-04-15 17:04:32 +00:00
Treehugger Robot
d3af5a28ea Merge "Add explicit dependencies on jni_headers" 2020-04-15 07:16:51 +00:00
Orion Hodson
54c4f2afb5 Add explicit dependencies on jni_headers
Preparation for removing implicit include paths for jni.h from soong.

Bug: 152482542
Test: lunch aosp_x86_64 && m checkbuild
Change-Id: Ib36e679819a3309ccbf12fd592309b16c8bbd6c8
2020-04-13 17:15:59 +01:00
Xin Li
f5345e8d04 [automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into stag-aosp-master am: 2474a95a37 -s ours
am skip reason: subject contains skip directive

Change-Id: I7bb35d14fbd3e03bfa2b268d69bb63394644994a
2020-04-10 03:28:53 +00:00
Xin Li
2474a95a37 DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into stag-aosp-master
Bug: 151763422
Change-Id: I75ad17500f91c05f799d8d60cd235eaddec994df
2020-04-09 17:51:18 -07:00
Treehugger Robot
03592944f6 Merge "Add an exported flag in manifest" am: 2e60c56ea9 am: 6f1b6d7a94
Change-Id: I7fbeebe78d5160bd6cb9af13bfe76272bf3c7133
2020-03-31 21:51:55 +00:00
Treehugger Robot
0428fa5453 Merge "Add an exported flag in manifest" am: 2e60c56ea9 am: 6f1b6d7a94
Change-Id: Ia32701aa3b3b6b6eb0f87df614ed68ba75d1d385
2020-03-31 21:51:48 +00:00
Treehugger Robot
6f1b6d7a94 Merge "Add an exported flag in manifest" am: 2e60c56ea9
Change-Id: I3fbd69e4f9e5b38c108335bdfc8b83d7a998fd65
2020-03-31 21:31:52 +00:00
Treehugger Robot
2e60c56ea9 Merge "Add an exported flag in manifest" 2020-03-31 21:10:45 +00:00
Ashwini Oruganti
7c1b5497f2 Add an exported flag in manifest
With b/150232615, we will need an explicit value set for the exported
flag when intent filters are present, as the default behavior is
changing for S+. This change adds the value reflecting the previous
default to the manifest.

These changes were made using an automated tool, the xml file may be
reformatted slightly creating a larger diff. The only "real" change is
the addition of "android:exported" to activities, services, and
receivers that have one or more intent-filters.

Bug: 150232615
Test: TH
Exempt-From-Owner-Approval: mechanical refactoring
Change-Id: Idc43e262fd2911e19f0bcd20add29e4c3392d3da
2020-03-23 16:23:26 -07:00
Automerger Merge Worker
f82d822b42 Merge "Implement text entry key API for accessibility services in AOSP Keyboard" am: c3eafcb756 am: fc2bc10530
Change-Id: Ie3e94bbd0401ddabb489b0bcf6e7f6fc6be8f0c0
2019-12-04 17:12:21 +00:00
Ryan Lin
fc2bc10530 Merge "Implement text entry key API for accessibility services in AOSP Keyboard" am: c3eafcb756
am: 3721623175

Change-Id: If0a82009caced6174e86eeb0d4bdf1a5080d9779
2019-12-04 09:08:50 -08:00
Automerger Merge Worker
c1ae6aa1aa Merge "Merge Android10 QPR1 into AOSP master" am: e5aad47755 am: ddcf093505
Change-Id: If73065e6effd5fc16c213d3dca4b97ff7f143edb
2019-12-04 16:58:03 +00:00
Xin Li
ddcf093505 Merge "Merge Android10 QPR1 into AOSP master" am: e5aad47755
am: e8d02cca96

Change-Id: I21c4221a0672c53ad5df2320e32dec6b3b0bc8af
2019-12-04 08:14:38 -08:00
Ryan Lin
3721623175 Merge "Implement text entry key API for accessibility services in AOSP Keyboard"
am: c3eafcb756

Change-Id: Ib5e707d2fa6a6ea23e1d8ca1aae13b9c296efbb5
2019-12-04 00:45:51 -08:00
Ryan Lin
c3eafcb756 Merge "Implement text entry key API for accessibility services in AOSP Keyboard" 2019-12-04 08:41:04 +00:00
Xin Li
e8d02cca96 Merge "Merge Android10 QPR1 into AOSP master"
am: e5aad47755

Change-Id: Ib528c98b6785319391f70e7de23d260edaefcff6
2019-12-03 16:14:43 -08:00
Treehugger Robot
e5aad47755 Merge "Merge Android10 QPR1 into AOSP master" 2019-12-03 23:15:02 +00:00
Xin Li
54e703cc10 Merge Android10 QPR1 into AOSP master
Bug: 145570283
Change-Id: I02ff250b4fb612a4b88e91a4bb0ef469adf30bc4
2019-12-02 21:25:22 -08:00
Alex Henrie
b012dd4284 Merge "Support polytonic Greek diacritics in the Greek keyboard" am: f64e2769b7 am: fa276af7df
am: 9b45f98e23

Change-Id: I9e2f744204ceae36d092d2b95526e5c956f7c14f
2019-11-25 19:00:33 -08:00
Alex Henrie
9b45f98e23 Merge "Support polytonic Greek diacritics in the Greek keyboard" am: f64e2769b7
am: fa276af7df

Change-Id: Ib3fbb58c4cdf59f6d0373d662bbd8f5ddf36f105
2019-11-25 18:58:08 -08:00
Alex Henrie
fa276af7df Merge "Support polytonic Greek diacritics in the Greek keyboard"
am: f64e2769b7

Change-Id: I1a18716ff46f0d9aae119941d426ea1d778a5407
2019-11-25 18:55:11 -08:00
Treehugger Robot
f64e2769b7 Merge "Support polytonic Greek diacritics in the Greek keyboard" 2019-11-26 02:42:31 +00:00
TreeHugger Robot
0ef462a0d3 Merge "Import translations. DO NOT MERGE" 2019-11-10 15:37:44 +00:00
TreeHugger Robot
b8b6774841 Merge "Import translations. DO NOT MERGE" 2019-11-10 15:37:32 +00:00
TreeHugger Robot
3e9889e0bf Merge "Import translations. DO NOT MERGE" 2019-11-10 15:33:31 +00:00
Bill Yi
3f9169604b Import translations. DO NOT MERGE
Change-Id: I2688babc5d396ae65481a97b186e52c7c3dafbc9
Auto-generated-cl: translation import
2019-11-10 03:00:17 -08:00
Bill Yi
8027df8ddb Import translations. DO NOT MERGE
Change-Id: I237d2997fb1314302be85530c6b6bc710426b36b
Auto-generated-cl: translation import
2019-11-10 02:59:09 -08:00
Bill Yi
c7d75c69d8 Import translations. DO NOT MERGE
Change-Id: Iee2e651ebfd028b235b428939964b1b532427e78
Auto-generated-cl: translation import
2019-11-10 02:57:21 -08:00
Bill Yi
edb5207e2b Import translations. DO NOT MERGE
Change-Id: I5f46ed0024412fbf2b1e5d549ac4f5747ba10ead
Auto-generated-cl: translation import
2019-11-10 02:56:17 -08:00