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
Bill Yi
dec7e77280
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: I582cc100421d415defcd817a96191f6608eea8ad
2019-04-24 21:42:13 -07:00
Bill Yi
fc38a8b073
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev
...
am: e73e47f83f
-s ours
am skip reason: subject contains skip directive
Change-Id: I62333549fab9f82ab35a94993b769e5369677657
2019-04-17 15:58:21 -07:00
Bill Yi
ffeda6dcef
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev
...
am: 7630c6c549
-s ours
am skip reason: subject contains skip directive
Change-Id: I007c4656a5931249aa353f0b5b54e88189f052e6
2019-04-17 15:52:14 -07:00
Bill Yi
2735c8e21e
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev
...
am: 1999854ad9
-s ours
am skip reason: subject contains skip directive
Change-Id: I2eb23c17d2bb610792ff6b6bd848b9086573de9f
2019-04-17 15:45:32 -07:00
Bill Yi
67f5074f2b
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev
...
am: c96234e71c
-s ours
am skip reason: subject contains skip directive
Change-Id: I2e5538041b7746240da20c7c740f242a4869cc80
2019-04-17 15:43:52 -07:00
Bill Yi
6490697a64
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev
...
am: b22d5f3fe7
-s ours
am skip reason: subject contains skip directive
Change-Id: I43f4b560c39258982bef2f0b4bb178dc8315ef7c
2019-04-17 15:36:39 -07:00
Bill Yi
b08d015352
[automerger skipped] Import translations. DO NOT MERGE
...
am: 86df8fb903
-s ours
am skip reason: subject contains skip directive
Change-Id: I75ad49d522172d6591663a4c38e69d622f7ffb31
2019-04-17 15:27:06 -07:00
TreeHugger Robot
e73e47f83f
Merge "Import translations. DO NOT MERGE" into qt-dev
2019-04-17 21:45:24 +00:00
TreeHugger Robot
7630c6c549
Merge "Import translations. DO NOT MERGE" into qt-dev
2019-04-17 21:32:27 +00:00
TreeHugger Robot
1999854ad9
Merge "Import translations. DO NOT MERGE" into qt-dev
2019-04-17 21:31:44 +00:00
TreeHugger Robot
c96234e71c
Merge "Import translations. DO NOT MERGE" into qt-dev
2019-04-17 21:27:32 +00:00
TreeHugger Robot
b22d5f3fe7
Merge "Import translations. DO NOT MERGE" into qt-dev
2019-04-17 21:27:12 +00:00
Bill Yi
86df8fb903
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: Ibd1ea3ad66df1032a70a90f0f38df532b1f8e7a2
2019-04-16 19:28:34 -07:00
Bill Yi
ceded9ebcb
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: Ia43a2ac5c29cef680fb4e44ef12da74176726b3b
2019-04-16 19:27:49 -07:00
Bill Yi
56198b8702
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: I3dee70ec398ce7e6f4bfb4b677a97153906a9b19
2019-04-16 19:26:44 -07:00
Bill Yi
2c79d22ccd
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: I4a2e1950cd5eff7f1a64b023a15ec591f43b13c0
2019-04-16 19:26:01 -07:00
Bill Yi
9f3ef50e34
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: I3ffc9f82edaa14bc34372a9107e71e834a494c57
2019-04-16 19:24:27 -07:00
Bill Yi
dea379f4ba
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: Id5f69f9696d57630083976b6e0b438409fc8b59e
2019-04-16 19:23:48 -07:00
Bill Yi
d8abffbb2c
[automerger skipped] Merge "Import translations. DO NOT MERGE" am: f45e8bad27
-s ours
...
am: e8bbcdbf9e
-s ours
am skip reason: subject contains skip directive
Change-Id: I0db03f49037daa4fc88690ca5601f6960be64b59
2019-04-12 16:17:26 -07:00
Bill Yi
d4c91430d2
[automerger skipped] Merge "Import translations. DO NOT MERGE" am: 25324a9dc4
-s ours
...
am: 56b43fff1f
-s ours
am skip reason: subject contains skip directive
Change-Id: I2e1161dbb9381c3f3239afe35d871570ef5e3e6d
2019-04-12 16:17:03 -07:00
Bill Yi
4558922bfb
[automerger skipped] Merge "Import translations. DO NOT MERGE" am: 97949e8822
-s ours
...
am: 120986cc45
-s ours
am skip reason: subject contains skip directive
Change-Id: I833a72023e9803e676a8079263fd467585739155
2019-04-12 16:16:43 -07:00
Bill Yi
2140113050
[automerger skipped] Merge "Import translations. DO NOT MERGE" am: fa3c3e2e24
-s ours
...
am: 3687c29f0b
-s ours
am skip reason: subject contains skip directive
Change-Id: Ie0e8bda4d0bd958ea72d640050fbac65cfd3a1fb
2019-04-12 16:16:15 -07:00
Bill Yi
8263d35532
[automerger skipped] Merge "Import translations. DO NOT MERGE" am: 6ca3f2666f
-s ours
...
am: 64ab24d687
-s ours
am skip reason: subject contains skip directive
Change-Id: I69254b69eb4bcfc7a15cc0deab041850aaf20616
2019-04-12 16:15:07 -07:00
Bill Yi
e8bbcdbf9e
[automerger skipped] Merge "Import translations. DO NOT MERGE"
...
am: f45e8bad27
-s ours
am skip reason: subject contains skip directive
Change-Id: Ic923497feebd8662e3a9c44140f696e76247d235
2019-04-12 15:54:48 -07:00
Bill Yi
56b43fff1f
[automerger skipped] Merge "Import translations. DO NOT MERGE"
...
am: 25324a9dc4
-s ours
am skip reason: subject contains skip directive
Change-Id: Ib192b5ef047ed576087be8f4d7c28c42b336db3b
2019-04-12 15:54:29 -07:00
Bill Yi
120986cc45
[automerger skipped] Merge "Import translations. DO NOT MERGE"
...
am: 97949e8822
-s ours
am skip reason: subject contains skip directive
Change-Id: I2ab9374888ff6cf49416f6264a434774d1cdaa18
2019-04-12 15:54:09 -07:00
Bill Yi
3687c29f0b
[automerger skipped] Merge "Import translations. DO NOT MERGE"
...
am: fa3c3e2e24
-s ours
am skip reason: subject contains skip directive
Change-Id: I207783ca8cb6b06c015d4ef774e9f9478e2beb75
2019-04-12 15:53:30 -07:00
Bill Yi
64ab24d687
[automerger skipped] Merge "Import translations. DO NOT MERGE"
...
am: 6ca3f2666f
-s ours
am skip reason: subject contains skip directive
Change-Id: I28d7d66c347ddd73cc199cd10037fd5a130c20aa
2019-04-12 15:51:11 -07:00