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
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
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
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
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
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
Bill Yi
66b32daac4
[automerger skipped] Import translations. DO NOT MERGE
...
am: 72b1a8b722
-s ours
am skip reason: subject contains skip directive
Change-Id: I3146a2b640d9fd6e5c12886d0a8bf7c725200d72
2019-08-19 13:23:47 -07:00
TreeHugger Robot
4492996f04
Merge "Import translations. DO NOT MERGE" into qt-r1-dev
2019-08-19 19:17:46 +00:00
Bill Yi
72b1a8b722
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: I576eae018336f225d9e6c9dce6eaba6742ce9581
2019-08-18 07:20:54 -07:00
Bill Yi
1cca7afad6
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: Ie12258d268be80afd21cf01c8fb2c32d5d522ecb
2019-08-18 07:18:27 -07:00
Xin Li
e548aec3fe
[automerger skipped] DO NOT MERGE - Skip qt-dev-plus-aosp-without-vendor (5713463) in stage-aosp-master am: 7748102af1
-s ours
...
am: b88a8516f3
Change-Id: I08f2b2c10621f4322ce59bea7c30a336707de79d
2019-08-14 14:07:59 -07:00
Xin Li
b88a8516f3
[automerger skipped] DO NOT MERGE - Skip qt-dev-plus-aosp-without-vendor (5713463) in stage-aosp-master
...
am: 7748102af1
-s ours
am skip reason: subject contains skip directive
Change-Id: I1229451d40fb142f3f46e591e1dadc652b232685
2019-08-14 13:39:14 -07:00
Xin Li
7748102af1
DO NOT MERGE - Skip qt-dev-plus-aosp-without-vendor (5713463) in stage-aosp-master
...
Bug: 134405016
Change-Id: I85024313e36aa6450602dd17cd9bcd7220780ecd
2019-08-14 11:35:21 -07:00
Bill Yi
1080d669ab
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev
...
am: cd95311674
-s ours
am skip reason: subject contains skip directive
Change-Id: Ieef0e13f6154015f45f2f5dfa1204eaf40f116a1
2019-07-24 17:26:10 -07:00
TreeHugger Robot
cd95311674
Merge "Import translations. DO NOT MERGE" into qt-r1-dev
2019-07-25 00:09:22 +00:00
Bill Yi
33dec1203c
[automerger skipped] Import translations. DO NOT MERGE
...
am: ce1f65074a
-s ours
am skip reason: subject contains skip directive
Change-Id: Ie99440bbe2c1cb64b9f4e3e714a5178b95e25b3e
2019-07-24 16:59:47 -07:00
Bill Yi
ce1f65074a
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: I3dd765cbdc830f4e9d4f3dd8495f56a28d8938ba
2019-07-24 12:43:16 -07:00
Bill Yi
0a5d01f5b1
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: Iae08b9b0a5055f1c29a678764af6d2f3c849d5ec
2019-07-24 12:40:37 -07:00
Bill Yi
b403889818
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev
...
am: 64302ec808
-s ours
am skip reason: subject contains skip directive
Change-Id: Iff76b4aa4eea5461a0aabffcaef3ecd5ec180db4
2019-07-14 15:46:14 -07:00
TreeHugger Robot
64302ec808
Merge "Import translations. DO NOT MERGE" into qt-r1-dev
2019-07-14 22:23:41 +00:00
Bill Yi
51eaf198ef
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev
...
am: c5999bd8d7
-s ours
am skip reason: subject contains skip directive
Change-Id: Ia07d690ca858b4d3558e0fba9e57fa291d53e3fc
2019-07-14 08:03:10 -07:00
TreeHugger Robot
c5999bd8d7
Merge "Import translations. DO NOT MERGE" into qt-r1-dev
2019-07-14 14:44:18 +00:00
Bill Yi
dac2017376
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: Ib15edbefa78b413711bc9a114c035e4f042029d8
2019-07-14 02:56:47 -07:00
Bill Yi
0e8ed52d25
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: I5d3e002b9c8b5b9163674ee55b0a78c86d7a4367
2019-07-14 02:54:47 -07:00
Android Build Merger (Role)
0c9c6226ed
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: ab46c2ff33
-s ours am: d61e6b5090
-s ours am skip reason: subject contains skip directive" into qt-r1-dev-plus-aosp
2019-07-14 07:28:02 +00:00
Bill Yi
603754f293
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: ab46c2ff33
-s ours
...
am: 362501b8f6
-s ours
am skip reason: subject contains skip directive
Change-Id: Ia5de6bb421696cf6cea9165469e0d46f272cde25
2019-07-14 00:27:52 -07:00
Bill Yi
0834de5040
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: ab46c2ff33
-s ours
...
am: d61e6b5090
-s ours
am skip reason: subject contains skip directive
Change-Id: Ic5196482d572ad09a5918b6c63b8dd2bc9e76be1
2019-07-14 00:27:52 -07:00
Bill Yi
362501b8f6
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev
...
am: ab46c2ff33
-s ours
am skip reason: subject contains skip directive
Change-Id: Iae288cd40fb18689cac622310b84e7ef2488888c
2019-07-14 00:18:52 -07:00
Bill Yi
d61e6b5090
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev
...
am: ab46c2ff33
-s ours
am skip reason: subject contains skip directive
Change-Id: I82565b5a973742014900769bd382fb17a001ab52
2019-07-14 00:18:52 -07:00
TreeHugger Robot
ab46c2ff33
Merge "Import translations. DO NOT MERGE" into qt-dev
2019-07-14 07:08:55 +00:00
Android Build Merger (Role)
24d4024df1
Merge "[automerger skipped] Import translations. DO NOT MERGE am: cdd65daaa1
-s ours am: e3d501996e
-s ours am skip reason: subject contains skip directive" into qt-r1-dev-plus-aosp
2019-07-14 05:40:13 +00:00
Bill Yi
204c916181
[automerger skipped] Import translations. DO NOT MERGE am: cdd65daaa1
-s ours
...
am: 7b644d7f78
-s ours
am skip reason: subject contains skip directive
Change-Id: I70000681294a9ae5cc8b014003f272a807e1371b
2019-07-13 22:40:01 -07:00
Bill Yi
09d638fa75
[automerger skipped] Import translations. DO NOT MERGE am: cdd65daaa1
-s ours
...
am: e3d501996e
-s ours
am skip reason: subject contains skip directive
Change-Id: Id126adca02db4531eed9de1ff28b90875d3c3571
2019-07-13 22:40:01 -07:00
Bill Yi
e3d501996e
[automerger skipped] Import translations. DO NOT MERGE
...
am: cdd65daaa1
-s ours
am skip reason: subject contains skip directive
Change-Id: I6f594a3b08adc6905b702fb304d94cd3ae316eaa
2019-07-13 22:31:00 -07:00
Bill Yi
7b644d7f78
[automerger skipped] Import translations. DO NOT MERGE
...
am: cdd65daaa1
-s ours
am skip reason: subject contains skip directive
Change-Id: I3c025e87a94deadfdbd7754a9ad94d18942d7326
2019-07-13 22:31:00 -07:00
Bill Yi
26fe6d79b6
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: I613207e83ccb3a460ea770af79796d4addc01839
2019-07-13 17:17:48 -07:00
Bill Yi
cdd65daaa1
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: I4a08d8777d4cd8f487a7dfd197e5722b6931232c
2019-07-13 17:15:22 -07:00
Xin Li
6b754e48db
[automerger skipped] Merge "DO NOT MERGE - Merge pie-platform-release (PPRL.190705.004) into master" am: c8db60faa5
-s ours am: 3e93e89ac3
-s ours
...
am: 3776f0c3d3
Change-Id: Id530c2e1b02aa2ff3da98a9d66610938a3454c48
2019-07-11 00:02:03 -07:00
Xin Li
3776f0c3d3
[automerger skipped] Merge "DO NOT MERGE - Merge pie-platform-release (PPRL.190705.004) into master" am: c8db60faa5
-s ours
...
am: 3e93e89ac3
-s ours
am skip reason: subject contains skip directive
Change-Id: I8f2c8a0418e9a26157fc7c52d9c489bf3329a0fd
2019-07-10 23:51:57 -07:00
Xin Li
3e93e89ac3
[automerger skipped] Merge "DO NOT MERGE - Merge pie-platform-release (PPRL.190705.004) into master"
...
am: c8db60faa5
-s ours
am skip reason: subject contains skip directive
Change-Id: Icc42f8f2edb97f51c61b439c4b8c0f78ea2e2577
2019-07-10 23:37:17 -07:00