aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev ↵Bill Yi2019-05-250-0/+0
|\ | | | | | | | | | | | | | | | | am: 0d6a3d5e45 -s ours am: 187fbe0b78 -s ours am: 0a5410d82b -s ours am skip reason: subject contains skip directive Change-Id: I56e3ad43252fa4bcad8f01a2b43597008aee47ff
| * [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev ↵Bill Yi2019-05-250-0/+0
| |\ | | | | | | | | | | | | | | | | | | | | | | | | am: 0d6a3d5e45 -s ours am: 187fbe0b78 -s ours am skip reason: subject contains skip directive Change-Id: I457059e186ce2593db3df0451a003db2013ab3b9
| | * [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-devBill Yi2019-05-250-0/+0
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | am: 0d6a3d5e45 -s ours am skip reason: subject contains skip directive Change-Id: I03bbddaced7e70dc51f32aad95b8b52318d454a3
| | | * Merge "Import translations. DO NOT MERGE" into qt-devTreeHugger Robot2019-05-254-6/+6
| | | |\
| | | | * Import translations. DO NOT MERGEBill Yi2019-05-254-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Auto-generated-cl: translation import Bug: 64712476 Change-Id: I27597dd25043d3dd0b14a7e3a359a2b15f35164d
* | | | | [automerger skipped] Import translations. DO NOT MERGE am: b9e9ce91af -s ↵Bill Yi2019-05-250-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ours am: cfcf95bd16 -s ours am: 9cb9d223ea -s ours am skip reason: subject contains skip directive Change-Id: Icfe77a9d9fdab4d667f5611615ab3557d9cb32b7
| * | | | [automerger skipped] Import translations. DO NOT MERGE am: b9e9ce91af -s oursBill Yi2019-05-250-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: cfcf95bd16 -s ours am skip reason: subject contains skip directive Change-Id: I5cbc6cef012c6ff1f651b1a968c3a5a2b8e7ace3
| | * | | [automerger skipped] Import translations. DO NOT MERGEBill Yi2019-05-250-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: b9e9ce91af -s ours am skip reason: subject contains skip directive Change-Id: Ie4c5f6f7a3ea5b028a895aa483833574470760ba
| | | * | Import translations. DO NOT MERGEBill Yi2019-05-256-8/+8
| | | |/ | | | | | | | | | | | | | | | | | | | | | | | | Auto-generated-cl: translation import Bug: 64712476 Change-Id: I70c1aad8f2ad45a20eb55fee33619a3f4e319939
* | | | [automerger skipped] Merge "DO NOT MERGE - Merge pie-platform-release ↵Xin Li2019-05-170-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (PPRL.190505.001) into master." am: cec8e18f43 -s ours am: e4c638b347 -s ours am: 45850f87d3 am: 3664117e54 -s ours am skip reason: subject contains skip directive Change-Id: I588c050bc9e965f4fb0ec6edc5bb765f57a20cb1
| * | | [automerger skipped] Merge "DO NOT MERGE - Merge pie-platform-release ↵Xin Li2019-05-160-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (PPRL.190505.001) into master." am: cec8e18f43 -s ours am: e4c638b347 -s ours am: 45850f87d3 Change-Id: Ic44a5b9a1f0f3a17cd6db3f1e7c0800b4e060718
| | * | [automerger skipped] Merge "DO NOT MERGE - Merge pie-platform-release ↵Xin Li2019-05-160-0/+0
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (PPRL.190505.001) into master." am: cec8e18f43 -s ours am: e4c638b347 -s ours am skip reason: subject contains skip directive Change-Id: I666228f850628ebccc47fa1202e2c346264045d2
| | | * \ [automerger skipped] Merge "DO NOT MERGE - Merge pie-platform-release ↵Xin Li2019-05-160-0/+0
| | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (PPRL.190505.001) into master." am: cec8e18f43 -s ours am skip reason: subject contains skip directive Change-Id: Iea1345ae20d8f2ff40dc612e402fa6982762d964
| | | | * \ Merge "DO NOT MERGE - Merge pie-platform-release (PPRL.190505.001) into master."Xin Li2019-05-1712-1745/+1745
| | | | |\ \
* | | | | | | [automerger skipped] DO NOT MERGE - Merge pie-platform-release ↵Xin Li2019-05-170-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (PPRL.190505.001) into master. am: d37d8eb393 -s ours am: c480d6b171 -s ours am: 731104e942 am: d26d1e4341 -s ours am skip reason: subject contains skip directive Change-Id: I94e527c0df09d2f49fdf4ed124e18427a5583e93
| * | | | | | [automerger skipped] DO NOT MERGE - Merge pie-platform-release ↵Xin Li2019-05-160-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (PPRL.190505.001) into master. am: d37d8eb393 -s ours am: c480d6b171 -s ours am: 731104e942 Change-Id: Ia3fbd73ad2b30b22ccc843360be12ab16d77bf37
| | * | | | | [automerger skipped] DO NOT MERGE - Merge pie-platform-release ↵Xin Li2019-05-160-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (PPRL.190505.001) into master. am: d37d8eb393 -s ours am: c480d6b171 -s ours am skip reason: subject contains skip directive Change-Id: I2f1f32251a2e1d882fbb14f0190c46cc65d75c4a
| | | * | | | [automerger skipped] DO NOT MERGE - Merge pie-platform-release ↵Xin Li2019-05-160-0/+0
| | | |\ \ \ \ | | | | | |/ / | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (PPRL.190505.001) into master. am: d37d8eb393 -s ours am skip reason: subject contains skip directive Change-Id: Ibac4638899787d2a9b4baa504b6f6dbaf8937a67
| | | | * | | DO NOT MERGE - Merge pie-platform-release (PPRL.190505.001) into master.Xin Li2019-05-1512-1745/+1745
| | | | |\ \ \ | | | | |/ / / | | | |/| / / | | | | |/ / | | | | | | Bug: 132622481 Change-Id: I9521ad8c3f1b9df8328e8ef32c4e5ff2033eed74
* | | | | | [automerger skipped] DO NOT MERGE - Merge pi-platform-release ↵Xin Li2019-05-160-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (PPRL.190505.001) into stage-aosp-master am: a9e018f52d -s ours am: 7c6bb3d242 am: 4ab5b60c89 -s ours am skip reason: subject contains skip directive Change-Id: Ic3f5920166d9421fde12377789c4ef2600bda620
| * | | | | [automerger skipped] DO NOT MERGE - Merge pi-platform-release ↵Xin Li2019-05-160-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (PPRL.190505.001) into stage-aosp-master am: a9e018f52d -s ours am: 7c6bb3d242 Change-Id: I57ce9f40bc405e3c7324e8697573752b2a9169f4
| | * | | | [automerger skipped] DO NOT MERGE - Merge pi-platform-release ↵Xin Li2019-05-150-0/+0
| |/| | | | | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (PPRL.190505.001) into stage-aosp-master am: a9e018f52d -s ours am skip reason: subject contains skip directive Change-Id: I9bfc1d01a6ce738e15c30cc50f7cb1739b6b58bc
| | * | | DO NOT MERGE - Merge pi-platform-release (PPRL.190505.001) into ↵Xin Li2019-05-1312-1745/+1745
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | stage-aosp-master Bug: 132622481 Change-Id: I64de94291e8fb8ac0e0b574594c3923aeb97d21d
| | | * \ \ Snap for 5450365 from b25378ea06605978ca8f30b75b500ba8f39014d0 to ↵android-build-team Robot2019-05-0726-1778/+1778
| | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | pi-platform-release Change-Id: I978424cd1dec645f193e8f2eb8692838370f3705
| | | | * \ \ Snap for 5339334 from 289a72634b06b499c6554f485158c0baacaa061d to ↵android-build-team Robot2019-02-2712-1745/+1745
| | | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | pi-qpr3-release Change-Id: I6bb8bf69da2791008d9cdda7a1138eaaacc3a8ed
* | | | | | | | Import translations. DO NOT MERGEBill Yi2019-05-101-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I7ec1c2054a3670d38f2631020421a0c6c574de25 Auto-generated-cl: translation import
* | | | | | | | [automerger skipped] Merge "DO NOT MERGE - Merge Pie Bonito/Sargo into ↵Xin Li2019-05-100-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master." am: c4da57fd0b -s ours am: 01aeedb800 -s ours am: 5d44bd7dc4 -s ours am skip reason: subject contains skip directive Change-Id: I8ec99fb6c3f88a1cdbca9c424662d76e556e8c2e
| * | | | | | | [automerger skipped] Merge "DO NOT MERGE - Merge Pie Bonito/Sargo into ↵Xin Li2019-05-090-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master." am: c4da57fd0b -s ours am: 01aeedb800 -s ours am skip reason: subject contains skip directive Change-Id: I8452805a7121ee1a991a5199e61942ccf08abd05
| | * | | | | | [automerger skipped] Merge "DO NOT MERGE - Merge Pie Bonito/Sargo into master."Xin Li2019-05-090-0/+0
| | |\ \ \ \ \ \ | | | | |_|_|/ / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: c4da57fd0b -s ours am skip reason: subject contains skip directive Change-Id: Ia13b45ecdcdf64cdbec21ca24508144026cc8401
| | | * | | | | Merge "DO NOT MERGE - Merge Pie Bonito/Sargo into master."Xin Li2019-05-09100-316/+316
| | | |\ \ \ \ \
* | | | | | | | | [automerger skipped] DO NOT MERGE - Merge Pie Bonito/Sargo into master. am: ↵Xin Li2019-05-090-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b4be6d6430 -s ours am: 9461d4e8c5 -s ours am: 45d851378d -s ours am skip reason: subject contains skip directive Change-Id: Ice048cdc7d0fa23761e86f61f698f20066968a18
| * | | | | | | | [automerger skipped] DO NOT MERGE - Merge Pie Bonito/Sargo into master. am: ↵Xin Li2019-05-090-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b4be6d6430 -s ours am: 9461d4e8c5 -s ours am skip reason: subject contains skip directive Change-Id: I39f1ddfb3062220724a8d527aeadc6fcab49b882
| | * | | | | | | [automerger skipped] DO NOT MERGE - Merge Pie Bonito/Sargo into master.Xin Li2019-05-090-0/+0
| | |\ \ \ \ \ \ \ | | | | |/ / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: b4be6d6430 -s ours am skip reason: subject contains skip directive Change-Id: Ibc75869dd909035714a59174ce287e32d3ccf9fe
| | | * | | | | | DO NOT MERGE - Merge Pie Bonito/Sargo into master.Xin Li2019-05-09100-316/+316
| | | |\ \ \ \ \ \ | | | |/ / / / / / | | |/| / / / / / | | | |/ / / / / | | | | | | | | Bug: 131756210 Change-Id: Ifc5dca915dcc06eb42e39f73010bef244dfbe26e
* | | | | | | | Merge "Import translations. DO NOT MERGE"TreeHugger Robot2019-05-099-12/+412
|\ \ \ \ \ \ \ \
| * | | | | | | | Import translations. DO NOT MERGEBill Yi2019-05-089-12/+412
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Idd5aa546321308fe3f3700ad3ba85c39ea1c6e54 Auto-generated-cl: translation import
* | | | | | | | | Merge "Import translations. DO NOT MERGE"TreeHugger Robot2019-05-091-1/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Import translations. DO NOT MERGEBill Yi2019-05-081-1/+1
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I4b1e2ad645e0da4b5da30f9f3f37a2328fe25ba2 Auto-generated-cl: translation import
* | | | | | | | | Merge "Import translations. DO NOT MERGE"TreeHugger Robot2019-05-091-1/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Import translations. DO NOT MERGEBill Yi2019-05-081-1/+1
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Iedb3a809a9814645adf004992c3808215554e6c8 Auto-generated-cl: translation import
* / / / / / / / / Import translations. DO NOT MERGEBill Yi2019-05-081-1/+1
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ib1badde2da2337eac0c7d3442792b10bd1d363c6 Auto-generated-cl: translation import
* | | | | | | | Launch AOSP Keyboard Settings on the same display am: d762841494Yohei Yukawa2019-05-061-2/+19
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: d6c56279b3 Change-Id: Iee16bafc93cd5550cdb8da83b1bf2b93f3b2a83e
| * | | | | | | Launch AOSP Keyboard Settings on the same displayYohei Yukawa2019-05-061-2/+19
| |\ \ \ \ \ \ \ | | | |_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: d762841494 Change-Id: Id06f29304f0f1e47ee546bacbee28f66d15e8baa
| | * | | | | | Launch AOSP Keyboard Settings on the same displayYohei Yukawa2019-05-041-2/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | | [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev ↵Bill Yi2019-05-040-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 35cca31844 -s ours am: 93fbdb44d4 -s ours am skip reason: subject contains skip directive Change-Id: I309bb668f7f4ca91102b866bc07415796ac3fbec
| * | | | | | | [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-devBill Yi2019-05-040-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 35cca31844 -s ours am skip reason: subject contains skip directive Change-Id: I84410eca38b39b52f377a6a050dea90ec613527d
| | * | | | | | Merge "Import translations. DO NOT MERGE" into qt-devTreeHugger Robot2019-05-046-9/+409
| | |\ \ \ \ \ \
| | | * | | | | | Import translations. DO NOT MERGEBill Yi2019-05-036-9/+409
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Auto-generated-cl: translation import Bug: 64712476 Change-Id: I5a1e14997b62527fe4b7c902855c999e06fee399
* | | | | | | | | [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev ↵Bill Yi2019-05-040-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: fed6dee6ce -s ours am: a7038935ba -s ours am skip reason: subject contains skip directive Change-Id: Ib31b020552c1df5a2790759cfd1ef46b0a1512bc
| * | | | | | | | [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-devBill Yi2019-05-040-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: fed6dee6ce -s ours am skip reason: subject contains skip directive Change-Id: I7505176ccb37b5f3a6654e5ff547f96f10891d27
generated by cgit v1.2.3-83-g751a (git 2.47.1) at 2025-06-10 04:49:57 +0000