Bill Yi
e1b0efcdc5
[automerger skipped] Import translations. DO NOT MERGE am: fef85b3c7b
-s ours
...
am: 29f347eef3
-s ours
am skip reason: subject contains skip directive
Change-Id: I21b976b20b3c65f753f5ff2694c413bd7764eba9
2019-06-04 19:08:23 -07:00
Bill Yi
29c40ed017
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 6562981448
-s ours
...
am: adb2e7a485
-s ours
am skip reason: subject contains skip directive
Change-Id: I36b41078a2c26a9968789143df182ed1c57cd30a
2019-06-04 19:04:15 -07:00
Bill Yi
a8956caa99
[automerger skipped] Import translations. DO NOT MERGE am: fef85b3c7b
-s ours
...
am: abc504f98b
-s ours
am skip reason: subject contains skip directive
Change-Id: Ied7cd172a0c100fbefd113a5cb78f31346f50d4c
2019-06-04 19:00:26 -07:00
Bill Yi
786dd43b9e
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev
...
am: 6562981448
-s ours
am skip reason: subject contains skip directive
Change-Id: Id88e74f86f38baf9132d4b64723e710b261e6906
2019-06-04 18:26:38 -07:00
Bill Yi
29f347eef3
[automerger skipped] Import translations. DO NOT MERGE
...
am: fef85b3c7b
-s ours
am skip reason: subject contains skip directive
Change-Id: I1ce5a4c80d46736758d5502359de508d1253daa6
2019-06-04 18:16:46 -07:00
Bill Yi
adb2e7a485
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev
...
am: 6562981448
-s ours
am skip reason: subject contains skip directive
Change-Id: Ib17c23265e511bd7d81bea27ead2731cce5c6c81
2019-06-04 18:09:47 -07:00
Bill Yi
abc504f98b
[automerger skipped] Import translations. DO NOT MERGE
...
am: fef85b3c7b
-s ours
am skip reason: subject contains skip directive
Change-Id: I0a9653dd8ccbd77ee0d5cb05aca79d89b20f629c
2019-06-04 18:01:35 -07:00
TreeHugger Robot
6562981448
Merge "Import translations. DO NOT MERGE" into qt-dev
2019-06-04 23:03:36 +00:00
Bill Yi
fef85b3c7b
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: I8cc15dd237c6e8313d997b37829b7924e2bb9c6a
2019-06-04 10:27:11 -07:00
Bill Yi
31a7793e28
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: I5de46104c83a4d2efc933d473ec29e19c18684c4
2019-06-04 10:24:31 -07:00
Bill Yi
bd154e9399
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 0d6a3d5e45
-s ours
...
am: da256d6977
-s ours
am skip reason: subject contains skip directive
Change-Id: I40a06b408128805145bb3e15a201f7b0a7520351
2019-05-25 13:29:18 -07:00
Bill Yi
15872a6866
[automerger skipped] Import translations. DO NOT MERGE am: b9e9ce91af
-s ours
...
am: 77ce29cdba
-s ours
am skip reason: subject contains skip directive
Change-Id: I68f8dd78e7dd52ecf989178a90068b1a52278263
2019-05-25 13:28:44 -07:00
Bill Yi
0a5410d82b
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 0d6a3d5e45
-s ours
...
am: 187fbe0b78
-s ours
am skip reason: subject contains skip directive
Change-Id: I457059e186ce2593db3df0451a003db2013ab3b9
2019-05-25 13:27:46 -07:00
Bill Yi
9cb9d223ea
[automerger skipped] Import translations. DO NOT MERGE am: b9e9ce91af
-s ours
...
am: cfcf95bd16
-s ours
am skip reason: subject contains skip directive
Change-Id: I5cbc6cef012c6ff1f651b1a968c3a5a2b8e7ace3
2019-05-25 13:27:08 -07:00
Bill Yi
da256d6977
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev
...
am: 0d6a3d5e45
-s ours
am skip reason: subject contains skip directive
Change-Id: I9e82c8b059209bf0a732330a55a53a7066629591
2019-05-25 13:23:16 -07:00
Bill Yi
77ce29cdba
[automerger skipped] Import translations. DO NOT MERGE
...
am: b9e9ce91af
-s ours
am skip reason: subject contains skip directive
Change-Id: Ie0c8884ff9ac362621cc70f6cc266096cbe0f25e
2019-05-25 13:22:40 -07:00
Bill Yi
187fbe0b78
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev
...
am: 0d6a3d5e45
-s ours
am skip reason: subject contains skip directive
Change-Id: I03bbddaced7e70dc51f32aad95b8b52318d454a3
2019-05-25 13:20:44 -07:00
Bill Yi
cfcf95bd16
[automerger skipped] Import translations. DO NOT MERGE
...
am: b9e9ce91af
-s ours
am skip reason: subject contains skip directive
Change-Id: Ie4c5f6f7a3ea5b028a895aa483833574470760ba
2019-05-25 13:20:05 -07:00
TreeHugger Robot
0d6a3d5e45
Merge "Import translations. DO NOT MERGE" into qt-dev
2019-05-25 20:07:51 +00:00
Bill Yi
b9e9ce91af
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: I70c1aad8f2ad45a20eb55fee33619a3f4e319939
2019-05-25 04:30:24 -07:00
Bill Yi
36cad42156
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: I27597dd25043d3dd0b14a7e3a359a2b15f35164d
2019-05-25 04:28:20 -07:00
Xin Li
3664117e54
[automerger skipped] Merge "DO NOT MERGE - Merge pie-platform-release (PPRL.190505.001) into master." am: cec8e18f43
-s ours am: e4c638b347
-s ours
...
am: 45850f87d3
Change-Id: Ic44a5b9a1f0f3a17cd6db3f1e7c0800b4e060718
2019-05-16 23:51:28 -07:00
Xin Li
d26d1e4341
[automerger skipped] DO NOT MERGE - Merge pie-platform-release (PPRL.190505.001) into master. am: d37d8eb393
-s ours am: c480d6b171
-s ours
...
am: 731104e942
Change-Id: Ia3fbd73ad2b30b22ccc843360be12ab16d77bf37
2019-05-16 23:00:26 -07:00
Xin Li
45850f87d3
[automerger skipped] Merge "DO NOT MERGE - Merge pie-platform-release (PPRL.190505.001) into master." am: cec8e18f43
-s ours
...
am: e4c638b347
-s ours
am skip reason: subject contains skip directive
Change-Id: I666228f850628ebccc47fa1202e2c346264045d2
2019-05-16 21:53:41 -07:00
Xin Li
731104e942
[automerger skipped] DO NOT MERGE - Merge pie-platform-release (PPRL.190505.001) into master. am: d37d8eb393
-s ours
...
am: c480d6b171
-s ours
am skip reason: subject contains skip directive
Change-Id: I2f1f32251a2e1d882fbb14f0190c46cc65d75c4a
2019-05-16 21:27:12 -07:00
Xin Li
e4c638b347
[automerger skipped] Merge "DO NOT MERGE - Merge pie-platform-release (PPRL.190505.001) into master."
...
am: cec8e18f43
-s ours
am skip reason: subject contains skip directive
Change-Id: Iea1345ae20d8f2ff40dc612e402fa6982762d964
2019-05-16 20:52:06 -07:00
Xin Li
c480d6b171
[automerger skipped] DO NOT MERGE - Merge pie-platform-release (PPRL.190505.001) into master.
...
am: d37d8eb393
-s ours
am skip reason: subject contains skip directive
Change-Id: Ibac4638899787d2a9b4baa504b6f6dbaf8937a67
2019-05-16 19:23:55 -07:00
Xin Li
cec8e18f43
Merge "DO NOT MERGE - Merge pie-platform-release (PPRL.190505.001) into master."
2019-05-17 00:58:08 +00:00
Xin Li
4ab5b60c89
[automerger skipped] DO NOT MERGE - Merge pi-platform-release (PPRL.190505.001) into stage-aosp-master am: a9e018f52d
-s ours
...
am: 7c6bb3d242
Change-Id: I57ce9f40bc405e3c7324e8697573752b2a9169f4
2019-05-16 02:49:47 -07:00
Xin Li
7c6bb3d242
[automerger skipped] DO NOT MERGE - Merge pi-platform-release (PPRL.190505.001) into stage-aosp-master
...
am: a9e018f52d
-s ours
am skip reason: subject contains skip directive
Change-Id: I9bfc1d01a6ce738e15c30cc50f7cb1739b6b58bc
2019-05-15 17:40:27 -07:00
Xin Li
d37d8eb393
DO NOT MERGE - Merge pie-platform-release (PPRL.190505.001) into master.
...
Bug: 132622481
Change-Id: I9521ad8c3f1b9df8328e8ef32c4e5ff2033eed74
2019-05-15 16:55:40 -07:00
Xin Li
a9e018f52d
DO NOT MERGE - Merge pi-platform-release (PPRL.190505.001) into stage-aosp-master
...
Bug: 132622481
Change-Id: I64de94291e8fb8ac0e0b574594c3923aeb97d21d
2019-05-13 15:39:17 -07:00
Xin Li
5d44bd7dc4
[automerger skipped] Merge "DO NOT MERGE - Merge Pie Bonito/Sargo into master." am: c4da57fd0b
-s ours
...
am: 01aeedb800
-s ours
am skip reason: subject contains skip directive
Change-Id: I8452805a7121ee1a991a5199e61942ccf08abd05
2019-05-09 21:50:17 -07:00
Xin Li
01aeedb800
[automerger skipped] Merge "DO NOT MERGE - Merge Pie Bonito/Sargo into master."
...
am: c4da57fd0b
-s ours
am skip reason: subject contains skip directive
Change-Id: Ia13b45ecdcdf64cdbec21ca24508144026cc8401
2019-05-09 19:14:39 -07:00
Xin Li
45d851378d
[automerger skipped] DO NOT MERGE - Merge Pie Bonito/Sargo into master. am: b4be6d6430
-s ours
...
am: 9461d4e8c5
-s ours
am skip reason: subject contains skip directive
Change-Id: I39f1ddfb3062220724a8d527aeadc6fcab49b882
2019-05-09 17:26:36 -07:00
Xin Li
9461d4e8c5
[automerger skipped] DO NOT MERGE - Merge Pie Bonito/Sargo into master.
...
am: b4be6d6430
-s ours
am skip reason: subject contains skip directive
Change-Id: Ibc75869dd909035714a59174ce287e32d3ccf9fe
2019-05-09 16:10:25 -07:00
Xin Li
c4da57fd0b
Merge "DO NOT MERGE - Merge Pie Bonito/Sargo into master."
2019-05-09 22:05:46 +00:00
Xin Li
b4be6d6430
DO NOT MERGE - Merge Pie Bonito/Sargo into master.
...
Bug: 131756210
Change-Id: Ifc5dca915dcc06eb42e39f73010bef244dfbe26e
2019-05-09 09:27:06 -07:00
android-build-team Robot
39f2d9a3bd
Snap for 5450365 from b25378ea06
to pi-platform-release
...
Change-Id: I978424cd1dec645f193e8f2eb8692838370f3705
2019-05-07 21:46:43 +00:00
Yohei Yukawa
d6c56279b3
Launch AOSP Keyboard Settings on the same display
...
am: d762841494
Change-Id: Id06f29304f0f1e47ee546bacbee28f66d15e8baa
2019-05-06 08:25:05 -07:00
Yohei Yukawa
d762841494
Launch AOSP Keyboard Settings on the same display
...
This CL demonstrates how an IME can show an Activity on the display
where the IME is shown. The key points are:
* The current display ID can be obtained as follows.
final int curentDisplayId = inputMethodService
.getSystemService(WindowManager.class)
.getDefaultDisplay()
.getDisplayId();
* When launching an Activity, specify the target display ID as
follows.
inputMethodService.startActivity(intent, ActivityOptions
.makeBasic()
.setLaunchDisplayId(curentDisplayId)
.toBundle());
Fix: 131718879
Test: Manually verified as follows.
1. Build aosp_blueline-userdebug and flash it.
2. adb shell settings put global force_desktop_mode_on_external_displays 1
3. adb shell settings put global overlay_display_devices 1920x1080/320
4. adb reboot
5. With a mouse, launch any application that has input field
in the secondary display.
6. Click that input field to bring up AOSP Keyboard.
7. Long click the comma key then select the gear icon.
8. Select "Android Keyboard Settings (AOSP)"
9. Make sure that the AOSP Keyboard Settings is launched in
the secondary display, not in the default display.
10. Go back to the step 7.
11. Select "Languages"
12. Subtype Enabler for AOSP Keyboard is shown in the secondary
display, not in the default display.
Change-Id: I9f89f371c38d9a7b5a06d018d4b41aa09815ea24
2019-05-04 09:52:07 -07:00
Bill Yi
93fbdb44d4
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev
...
am: 35cca31844
-s ours
am skip reason: subject contains skip directive
Change-Id: I84410eca38b39b52f377a6a050dea90ec613527d
2019-05-04 01:21:39 -07:00
Bill Yi
a7038935ba
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev
...
am: fed6dee6ce
-s ours
am skip reason: subject contains skip directive
Change-Id: I7505176ccb37b5f3a6654e5ff547f96f10891d27
2019-05-04 01:20:32 -07:00
Bill Yi
535fd22071
[automerger skipped] Import translations. DO NOT MERGE
...
am: c21dbf355f
-s ours
am skip reason: subject contains skip directive
Change-Id: I7be69de44c793478c71fc5e123373b43001abc1c
2019-05-04 01:15:34 -07:00
TreeHugger Robot
35cca31844
Merge "Import translations. DO NOT MERGE" into qt-dev
2019-05-04 07:01:44 +00:00
TreeHugger Robot
fed6dee6ce
Merge "Import translations. DO NOT MERGE" into qt-dev
2019-05-04 06:59:34 +00:00
Bill Yi
ac9ff315d9
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: I5a1e14997b62527fe4b7c902855c999e06fee399
2019-05-03 19:49:02 -07:00
Bill Yi
fa95428cd0
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: I28ede254065c4491af0c8f82f724e1f83d5a8c69
2019-05-03 19:47:52 -07:00
Bill Yi
c21dbf355f
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: Icf4d8be7d9322b87d1d2eebe55c6b7d270f47a2b
2019-05-03 19:43:12 -07:00
Bill Yi
3f5ab93ca1
[automerger skipped] Import translations. DO NOT MERGE
...
am: dec7e77280
-s ours
am skip reason: subject contains skip directive
Change-Id: If7e483912de6c931a6ee3f555784039ea17c5927
2019-04-26 17:07:42 -07:00