Commit Graph

41664 Commits (ddcf0935053138d42df0da5c69324e85ae6f4aa1)

Author SHA1 Message Date
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
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 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
Bill Yi c98755cd39 [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev
am: 891e9bad07 -s ours
am skip reason: subject contains skip directive

Change-Id: Ic764fd53fed12834d6e0291f17fc72e66fb5dc3d
2019-11-09 08:04:10 -08:00
TreeHugger Robot 891e9bad07 Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev 2019-11-09 15:43:04 +00:00
Bill Yi fb337911b8 [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev
am: a047102265 -s ours
am skip reason: subject contains skip directive

Change-Id: Idb22f32cb15c1ba9f4917ea2886ac16b127353a5
2019-11-09 07:41:23 -08:00
Bill Yi ed4461afd4 [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev
am: a9761dd09f -s ours
am skip reason: subject contains skip directive

Change-Id: I9914a4fe4a5f7bfc909bf97f60d9c36f3fbed4f4
2019-11-09 07:39:01 -08:00
Bill Yi 79be37cee6 [automerger skipped] Import translations. DO NOT MERGE
am: 0d0e8bf980 -s ours
am skip reason: subject contains skip directive

Change-Id: Id1fe14eccc7ee8f1a4c7b70358d607d0108ab331
2019-11-09 07:38:00 -08:00
TreeHugger Robot a047102265 Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev 2019-11-09 15:34:29 +00:00
TreeHugger Robot a9761dd09f Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev 2019-11-09 15:31:27 +00:00
Bill Yi a921c2d34a Import translations. DO NOT MERGE
Change-Id: I81bb93f802d6207d6a635ef20d3cf14b8fe63736
Auto-generated-cl: translation import
2019-11-09 01:16:47 -08:00
Bill Yi 0d0e8bf980 Import translations. DO NOT MERGE
Change-Id: I5b95f6ad5e3e70baa6ac48af90d371436cbdc4db
Auto-generated-cl: translation import
2019-11-09 01:15:41 -08:00
Bill Yi 90c454f964 Import translations. DO NOT MERGE
Change-Id: I05c0b930c3ad4874427948f3c7edced4c8d0a838
Auto-generated-cl: translation import
2019-11-09 01:13:53 -08:00
Bill Yi c9332c48cd Import translations. DO NOT MERGE
Change-Id: Ie07900be31c3c8d19e858a8abbb1193bc431da0f
Auto-generated-cl: translation import
2019-11-09 01:12:46 -08:00
Xin Li 17e68a31e5 DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-master
am: 5de808a6d0

Change-Id: Icac694e26b1b14ff2c461bda7b5bea71527a6c96
2019-10-31 13:22:04 -07:00
Xin Li 5de808a6d0 DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-master
Bug: 142003500
Change-Id: I7c7e27c71119341c8cafeb315788cf44b467c31b
2019-10-30 11:50:06 -07:00
Xin Li 28dec7e440 [automerger skipped] Merge Coral/Flame into AOSP master am: edd21ffb49 -s ours am: 2b7ba7e4af -s ours
am: 229f77abff -s ours
am skip reason: change_id I4af5f825051fb85e4c6d58f310d9209036c63ea8 with SHA1 c8782e216f is in history

Change-Id: I98e315748dabd08af795d588ad4bc7fbea2bd8bd
2019-10-26 22:46:13 -07:00
Xin Li 229f77abff [automerger skipped] Merge Coral/Flame into AOSP master am: edd21ffb49 -s ours
am: 2b7ba7e4af -s ours
am skip reason: change_id I4af5f825051fb85e4c6d58f310d9209036c63ea8 with SHA1 c8782e216f is in history

Change-Id: I7fa7159bb18295b7de072d4769118df186e8b2e8
2019-10-26 22:37:35 -07:00
Xin Li 2b7ba7e4af [automerger skipped] Merge Coral/Flame into AOSP master
am: edd21ffb49 -s ours
am skip reason: change_id I4af5f825051fb85e4c6d58f310d9209036c63ea8 with SHA1 c8782e216f is in history

Change-Id: I50ae1a452471407dd779e039f192d4ec95c12a1c
2019-10-26 22:21:11 -07:00
Xin Li edd21ffb49 Merge Coral/Flame into AOSP master
Bug: 141248619
Change-Id: I66aa50b606f3284d1a431f50cd6cae7574aab4a5
Merged-In: I4af5f825051fb85e4c6d58f310d9209036c63ea8
2019-10-25 10:28:07 -07:00
Xin Li 65537e4758 Skip QD1A.190821.011 in stage-aosp-master am: c8782e216f
am: 0de2363a6f

Change-Id: Icbb4e2aaaa006902e5d0107803e39b7b83d18184
2019-10-23 15:41:15 -07:00
Xin Li 0de2363a6f Skip QD1A.190821.011 in stage-aosp-master
am: c8782e216f

Change-Id: I4b98af1ff11fbc56e4fe2c5511f4db341ad28b07
2019-10-23 15:22:01 -07:00
Xin Li c8782e216f Skip QD1A.190821.011 in stage-aosp-master
Bug: 141248619
Change-Id: I4af5f825051fb85e4c6d58f310d9209036c63ea8
2019-10-16 15:19:27 -07:00
Alex Henrie 0cf4376826 Support polytonic Greek diacritics in the Greek keyboard
Although modern Greek is typically written with only acute accent marks,
polytonic diacritics are still used by the Greek orthodox church, the
Greek newspaper Estia, and students of classical Greek texts. Supporting
these special characters is helpful to all of those groups.

Note that for the short vowels (epsilon, upsilon, iota, and omicron) all
of the diacritics permitted on lowercase letters are also permitted on
their uppercase forms. However, for the long vowels (alpha, eta, and
omega) the diacritics permitted on uppercase letters are a subset of the
diacritics permitted on lowercase letters. That's just how Greek is.

Test: Manually turned on the Greek (Greece) keyboard in the aosp_x86-eng
emulator and tried out all the new characters with Shift, with Shift
Lock, and without any modifiers.

Bug: 142007431
Change-Id: Iec4a82cab02aea5176721e8447f7dfdba46bacb3
2019-10-13 17:36:45 -06:00
Android Build Merger (Role) bc508606fc Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 7604e64ecc -s ours am: 48fd3d016a -s ours am: a68bdf59af -s ours am skip reason: subject contains skip directive" into qt-qpr1-dev-plus-aosp 2019-10-12 20:20:02 +00:00
Bill Yi dc754ce791 [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 7604e64ecc -s ours am: 48fd3d016a -s ours
am: 4a9f2bce9a -s ours
am skip reason: subject contains skip directive

Change-Id: I90f21d2c572ef03980a622ee9c92decc47269d7a
2019-10-12 13:19:50 -07:00
Bill Yi 746d832a1e [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 7604e64ecc -s ours am: 48fd3d016a -s ours
am: a68bdf59af -s ours
am skip reason: subject contains skip directive

Change-Id: I6ab9b421954696e364952f43246e6e2c9fc51d60
2019-10-12 13:19:50 -07:00
Bill Yi 4a9f2bce9a [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 7604e64ecc -s ours
am: 48fd3d016a -s ours
am skip reason: subject contains skip directive

Change-Id: I61f5482e934631476aedef0e3dece656489da873
2019-10-12 13:13:49 -07:00
Bill Yi a68bdf59af [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 7604e64ecc -s ours
am: 48fd3d016a -s ours
am skip reason: subject contains skip directive

Change-Id: I787484f47dcbf7227ffce7a7d7d3f39acbd01001
2019-10-12 13:13:49 -07:00
Android Build Merger (Role) 06a6bf5ecc Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 6b7a42ebf2 -s ours am: 62880febef -s ours am: 2a33dbf0fa -s ours am skip reason: subject contains skip directive" into qt-qpr1-dev-plus-aosp 2019-10-12 20:08:27 +00:00
Bill Yi 2713c24d7c [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 6b7a42ebf2 -s ours am: 62880febef -s ours
am: 2a33dbf0fa -s ours
am skip reason: subject contains skip directive

Change-Id: I9d8b692cf5613a3d566527275c326c114818f553
2019-10-12 13:08:17 -07:00
Bill Yi ccf58a9aaf [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 6b7a42ebf2 -s ours am: 62880febef -s ours
am: 101d12062e -s ours
am skip reason: subject contains skip directive

Change-Id: If17949a38494bdaae0b599a41c2ae9beeb848a4f
2019-10-12 13:08:11 -07:00
Android Build Merger (Role) cda0449dd9 Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: abff0ad0e3 -s ours am: 7c609c0cc4 -s ours am: fb2d095a03 -s ours am skip reason: subject contains skip directive" into qt-qpr1-dev-plus-aosp 2019-10-12 20:08:04 +00:00
Bill Yi 48fd3d016a [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev
am: 7604e64ecc -s ours
am skip reason: subject contains skip directive

Change-Id: Iaf05b347b2b5d48857c449a4eecba8d917aa54da
2019-10-12 13:07:48 -07:00
Bill Yi 134778e573 [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: abff0ad0e3 -s ours am: 7c609c0cc4 -s ours
am: 08d02150b8 -s ours
am skip reason: subject contains skip directive

Change-Id: I1edca3959658ca296a4acc1261f0b1447b70fc7e
2019-10-12 13:07:48 -07:00
Bill Yi 87a09a190c [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: abff0ad0e3 -s ours am: 7c609c0cc4 -s ours
am: fb2d095a03 -s ours
am skip reason: subject contains skip directive

Change-Id: Ifbf7a39926061a9f87cc65a70ced6f5f553dd2bd
2019-10-12 13:07:48 -07:00
Bill Yi 2a33dbf0fa [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 6b7a42ebf2 -s ours
am: 62880febef -s ours
am skip reason: subject contains skip directive

Change-Id: I022a0f63e2f73f42acba9ef1976eda5223bb0972
2019-10-12 12:54:52 -07:00
Bill Yi 101d12062e [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 6b7a42ebf2 -s ours
am: 62880febef -s ours
am skip reason: subject contains skip directive

Change-Id: I854f9600e4806cb82cd4a324836e88e05e258cf9
2019-10-12 12:54:52 -07:00
Bill Yi 08d02150b8 [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: abff0ad0e3 -s ours
am: 7c609c0cc4 -s ours
am skip reason: subject contains skip directive

Change-Id: Ie402c6a14b1c86ad2ba41d0af728aa4fb31c55cf
2019-10-12 12:54:33 -07:00
Bill Yi fb2d095a03 [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: abff0ad0e3 -s ours
am: 7c609c0cc4 -s ours
am skip reason: subject contains skip directive

Change-Id: I836b594b3870dfdac403f7b7194e0af5045f2d30
2019-10-12 12:54:33 -07:00
TreeHugger Robot 7604e64ecc Merge "Import translations. DO NOT MERGE" into qt-dev 2019-10-12 19:54:25 +00:00
Bill Yi 62880febef [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev
am: 6b7a42ebf2 -s ours
am skip reason: subject contains skip directive

Change-Id: I2c38e94cb07c35d148e7dfaca94b6a7e5ec4d09d
2019-10-12 12:48:24 -07:00
Bill Yi 7c609c0cc4 [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev
am: abff0ad0e3 -s ours
am skip reason: subject contains skip directive

Change-Id: I82d7a41da78f4ee69f786cfa7a7681ea21438af1
2019-10-12 12:48:01 -07:00
Android Build Merger (Role) 0b32d74e30 Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: e9fa91113e -s ours am: c70c3a3236 -s ours am: fde82958ce -s ours am skip reason: subject contains skip directive" into qt-qpr1-dev-plus-aosp 2019-10-12 19:42:13 +00:00
Bill Yi 01e4ed3f3b [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: e9fa91113e -s ours am: c70c3a3236 -s ours
am: fde82958ce -s ours
am skip reason: subject contains skip directive

Change-Id: Icf0547daa5197fec922282a7765d73d0a5012ea7
2019-10-12 12:42:04 -07:00
Bill Yi f5eab04303 [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: e9fa91113e -s ours am: c70c3a3236 -s ours
am: 8095dc0335 -s ours
am skip reason: subject contains skip directive

Change-Id: I434fbb316d2a10f3b68045de8500fed5625b53db
2019-10-12 12:42:02 -07:00