Bill Yi
ad205aa3d2
[automerger skipped] Import translations. DO NOT MERGE am: d7efca3250
-s ours
...
am: 071ff1cef4
-s ours
am skip reason: subject contains skip directive
Change-Id: I85ea1158105b7fa517bb90beadc0afc542a7d296
2019-09-25 07:47:40 -07:00
Bill Yi
1735eebfc9
[automerger skipped] Merge "Import translations. DO NOT MERGE" into stage-aosp-master
...
am: 6a40932ee2
-s ours
am skip reason: subject contains skip directive
Change-Id: I2f54cfa03da54267965fbaf6647f14d5d49cd8f4
2019-09-25 07:40:33 -07:00
Bill Yi
becdaa61d3
[automerger skipped] Merge "Import translations. DO NOT MERGE" into stage-aosp-master
...
am: 9cee1b60eb
-s ours
am skip reason: subject contains skip directive
Change-Id: I1ae16b36de94b61ac7a5bb060392597931094a72
2019-09-25 07:36:25 -07:00
Bill Yi
9e4d808cb0
[automerger skipped] Merge "Import translations. DO NOT MERGE" into stage-aosp-master
...
am: 54bcf4c593
-s ours
am skip reason: subject contains skip directive
Change-Id: I9d322853f778eed82196a2418605f1f1ebc74244
2019-09-25 07:35:55 -07:00
Bill Yi
776972a813
[automerger skipped] Merge "Import translations. DO NOT MERGE" into stage-aosp-master
...
am: 6e683f824a
-s ours
am skip reason: subject contains skip directive
Change-Id: Iab6a8618ec303432c48fff2cafd5eb37069513fb
2019-09-25 07:35:30 -07:00
Bill Yi
071424bf41
[automerger skipped] Merge "Import translations. DO NOT MERGE" into stage-aosp-master
...
am: 355dfa6850
-s ours
am skip reason: subject contains skip directive
Change-Id: Iafcb9add900447734297a8c79db3d55b48fd2584
2019-09-25 07:34:54 -07:00
Bill Yi
071ff1cef4
[automerger skipped] Import translations. DO NOT MERGE
...
am: d7efca3250
-s ours
am skip reason: subject contains skip directive
Change-Id: If860200f7e59fc1c29d45f5bb0c2848cff3fe4fd
2019-09-25 07:32:21 -07:00
TreeHugger Robot
6a40932ee2
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
2019-09-25 14:18:45 +00:00
TreeHugger Robot
9cee1b60eb
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
2019-09-25 14:11:15 +00:00
TreeHugger Robot
54bcf4c593
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
2019-09-25 14:11:13 +00:00
TreeHugger Robot
6e683f824a
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
2019-09-25 14:07:40 +00:00
TreeHugger Robot
355dfa6850
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
2019-09-25 13:58:13 +00:00
Bill Yi
71c0e9adab
Import translations. DO NOT MERGE
...
Change-Id: Ib5d118c530a2f1a8a7671dcd5e5c3b77526b2582
Auto-generated-cl: translation import
2019-09-24 22:10:45 -07:00
Bill Yi
d7efca3250
Import translations. DO NOT MERGE
...
Change-Id: Ic8c8b74c22d74c43897762200e7b0c925ce1e5c0
Auto-generated-cl: translation import
2019-09-24 22:10:05 -07:00
Bill Yi
5ac7c60248
Import translations. DO NOT MERGE
...
Change-Id: I35067db3dbae5228b51d48383eae67eba48a6717
Auto-generated-cl: translation import
2019-09-24 22:09:07 -07:00
Bill Yi
0cdbc7b3b9
Import translations. DO NOT MERGE
...
Change-Id: I8735b7149146b06e4f2df15c746c24ca83b97b94
Auto-generated-cl: translation import
2019-09-24 22:08:29 -07:00
Bill Yi
3f805692b0
Import translations. DO NOT MERGE
...
Change-Id: I25500c09630cd8037896424a30086207d489467b
Auto-generated-cl: translation import
2019-09-24 22:07:17 -07:00
Bill Yi
1cad92ede4
Import translations. DO NOT MERGE
...
Change-Id: I15b1a2d1ad1b939ef39ef2484f779668c54a1bf8
Auto-generated-cl: translation import
2019-09-24 22:06:40 -07:00
Bill Yi
b2d2dff9b6
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev
...
am: a47de0ea53
-s ours
am skip reason: subject contains skip directive
Change-Id: I2aefc157ff64e0e3b62d16909e0cf56ef1408b42
2019-09-15 15:15:46 -07:00
Bill Yi
1855c48f02
[automerger skipped] Import translations. DO NOT MERGE
...
am: 6d4054689c
-s ours
am skip reason: subject contains skip directive
Change-Id: I2a5e86721b5dd2b14421bb4c4490a94402ca5d75
2019-09-15 15:15:27 -07:00
TreeHugger Robot
a47de0ea53
Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev
2019-09-15 22:06:33 +00:00
Bill Yi
6d4054689c
Import translations. DO NOT MERGE
...
Change-Id: I4e461ef0ca123067d2e5dfe83bbf2e574c316aaf
Auto-generated-cl: translation import
2019-09-14 13:51:21 -07:00
Bill Yi
926f9a639f
Import translations. DO NOT MERGE
...
Change-Id: Ia6e012e9fc72e368d328f70a573229c9a19601b6
Auto-generated-cl: translation import
2019-09-14 13:49:08 -07:00
lumark
cd50381752
Merge "Create display context when switching IME to new display for AOSP IME" am: 9ab8c21cb8
am: a70b532462
...
am: 2c8b0d9a2e
Change-Id: Ibd031067e7dbc4fd327185f9040d0ab337ac5923
2019-09-10 19:40:32 -07:00
lumark
2c8b0d9a2e
Merge "Create display context when switching IME to new display for AOSP IME" am: 9ab8c21cb8
...
am: a70b532462
Change-Id: Ie9dc641bd908758d30ae9f0e83182ee4f6036c19
2019-09-10 19:33:31 -07:00
lumark
a70b532462
Merge "Create display context when switching IME to new display for AOSP IME"
...
am: 9ab8c21cb8
Change-Id: Iba1d43a5f1c264782f318986dcbb19235409d476
2019-09-10 19:26:29 -07:00
Treehugger Robot
9ab8c21cb8
Merge "Create display context when switching IME to new display for AOSP IME"
2019-09-11 02:04:13 +00:00
lumark
87f14f1e18
Create display context when switching IME to new display for AOSP IME
...
To address IME service context's Resources / DisplayMetrics update
when switching IME window to another display after onConfigurationChange.
We use Context#createDisplayContext to create display specific context when
display changed, to ensure soft keyboard can re-layout with correct resources.
Bug: 126930163
Test: manual with AOSP IME as below steps:
1) Settings > Developer options > enable "Simulated Display" & "Force desktop mode".
2) Reboot device
3) Launch app (i.e. Contacts) with bluetooth or usb mouse in Simulated display.
4) Tap EditText on app to see see if IME window layout correctly on simulated display.
5) Launch app (i.e Files) on primary display.
6) Tap EditText on app to see if IME window layout correctly on primary display.
Change-Id: I0ed6a079af1ed90c75fee1d36d5ce3ef3c41f8ed
Merged-In: I0ed6a079af1ed90c75fee1d36d5ce3ef3c41f8ed
2019-09-11 02:02:48 +00:00
Xin Li
7a2ab62102
[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master am: 309cb0811a
-s ours
...
am: dc59e8ef85
-s ours
am skip reason: change_id I67cbe34b4646ddfdb0868bf8eaca12100a4e7b16 with SHA1 66fb808791
is in history
Change-Id: I83da0052be33376ba93b76579b8572576f052e55
2019-09-08 15:28:34 -07:00
Xin Li
dc59e8ef85
[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master
...
am: 309cb0811a
-s ours
am skip reason: change_id I67cbe34b4646ddfdb0868bf8eaca12100a4e7b16 with SHA1 66fb808791
is in history
Change-Id: I6bf3b33ff71e45d1417b068e1220ca3a78767c63
2019-09-08 14:45:40 -07:00
Xin Li
309cb0811a
Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master
...
No content change.
Bug: 135460123
Change-Id: Id5c0fc0c6138cd09b46e5029dfeff1fc3f54753a
Merged-In: I67cbe34b4646ddfdb0868bf8eaca12100a4e7b16
2019-09-08 12:45:26 -07:00
Xin Li
d29ac85675
[automerger skipped] Merge "DO NOT MERGE - Merge Android 10 into master" am: ccb19fdda7
-s ours am: 78650efb26
...
am: e1b597cee6
Change-Id: If18b15bcec3dd48bd5ed166ec93498710c0f6954
2019-09-05 14:31:52 -07:00
Xin Li
e1b597cee6
[automerger skipped] Merge "DO NOT MERGE - Merge Android 10 into master" am: ccb19fdda7
-s ours
...
am: 78650efb26
Change-Id: Ib06b5ddd7c7c93a6befda77a946c8e878fa4ce1f
2019-09-05 14:07:44 -07:00
Xin Li
78650efb26
[automerger skipped] Merge "DO NOT MERGE - Merge Android 10 into master"
...
am: ccb19fdda7
-s ours
am skip reason: subject contains skip directive
Change-Id: Ia97dc4e010f0470b8eb37c1556e35774a67945c2
2019-09-05 13:35:32 -07:00
Xin Li
ccb19fdda7
Merge "DO NOT MERGE - Merge Android 10 into master"
2019-09-05 16:53:24 +00:00
Xin Li
66fb808791
DO NOT MERGE - Merge Android 10 into master
...
Bug: 139893257
Change-Id: I67cbe34b4646ddfdb0868bf8eaca12100a4e7b16
2019-09-04 13:34:53 -07:00
Bill Yi
7735923c52
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev
...
am: 7b9006e18c
-s ours
am skip reason: subject contains skip directive
Change-Id: I443f911c5060cde96ff18fbfcd591360e048a290
2019-09-03 12:56:43 -07:00
Bill Yi
b94964512a
[automerger skipped] Import translations. DO NOT MERGE
...
am: e0d1d88541
-s ours
am skip reason: subject contains skip directive
Change-Id: Ia80fec9dd11b52fbd91432b00c1110e16f9005b0
2019-09-03 12:53:38 -07:00
TreeHugger Robot
7b9006e18c
Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev
2019-09-03 19:22:38 +00:00
Bill Yi
19b7dc6cbb
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: I71e377a96cbf732af7d10ef6db7e964774114179
2019-09-03 08:19:20 -07:00
Bill Yi
e0d1d88541
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: I175a8daf0a75e10e0c00c41103c2a30722714fb9
2019-09-03 08:17:03 -07:00
android-build-team Robot
e0b5b0e556
Snap for 5817401 from 4492996f04
to qt-c2f2-release
...
Change-Id: If3b92847792b21c6038c484c8c918eb225a8a403
2019-08-21 02:25:51 +00:00
android-build-team Robot
da0d47e3c8
Merge cherrypicks of [9231374, 9231389, 9231390, 9231391, 9231375, 9231286, 9231355, 9231376, 9231420, 9231462, 9231356, 9231421, 9231422, 9231402, 9231537, 9231557, 9231440, 9231441, 9231287, 9231288, 9231463, 9231464, 9231465, 9231423, 9231289, 9231392, 9230416, 9231466] into qt-c2f2-release
...
Change-Id: Ide516e25c98341c3da3c554bbcea7d7f54e795cc
2019-08-20 02:43:55 +00:00
Bill Yi
614c5b4d88
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: Ie12258d268be80afd21cf01c8fb2c32d5d522ecb
(cherry picked from commit 1cca7afad6
)
2019-08-20 02:41:46 +00:00
Bill Yi
bb87bc5ee9
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: I576eae018336f225d9e6c9dce6eaba6742ce9581
(cherry picked from commit 72b1a8b722
)
2019-08-20 02:41:42 +00:00
Bill Yi
527eeca672
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev am: 4492996f04
-s ours
...
am: 3071857e03
-s ours
am skip reason: subject contains skip directive
Change-Id: Iff64d278eb7d1d18e0ef22f8ad65f22f3cf0d323
2019-08-19 14:04:51 -07:00
Bill Yi
7c1b66885c
[automerger skipped] Import translations. DO NOT MERGE am: 72b1a8b722
-s ours
...
am: 295bba0c03
-s ours
am skip reason: subject contains skip directive
Change-Id: Ibfa4422f4cf0a785b2e54c638d43ed5000551db2
2019-08-19 13:55:48 -07:00
Bill Yi
021da087d7
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev am: 4492996f04
-s ours
...
am: c3211cb040
-s ours
am skip reason: subject contains skip directive
Change-Id: Ided46a144d93daec61b04c5759889b27df26ab13
2019-08-19 13:33:52 -07:00
Bill Yi
9d13cc5de0
[automerger skipped] Import translations. DO NOT MERGE am: 72b1a8b722
-s ours
...
am: 66b32daac4
-s ours
am skip reason: subject contains skip directive
Change-Id: I94a2b591226caeb89e24a7c138c49b4b58aff45b
2019-08-19 13:32:13 -07:00
Bill Yi
c3211cb040
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev
...
am: 4492996f04
-s ours
am skip reason: subject contains skip directive
Change-Id: I427927441d7978317f0311239ec3357597603a11
2019-08-19 13:26:19 -07:00