aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev•••am: 8d5ac64187 -s ours am skip reason: subject contains skip directive Change-Id: I401482cc39014a17de76717dd54065f703ac4a07 Bill Yi2019-10-120-0/+0
|\
| * Merge "Import translations. DO NOT MERGE" into qt-r1-devTreeHugger Robot2019-10-1283-83/+83
| |\
| | * Import translations. DO NOT MERGE•••Change-Id: I9b10a94aff23f6ea9158bc5a62ac044c99002777 Auto-generated-cl: translation import Bill Yi2019-10-1283-83/+83
* | | [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev•••am: ea59105148 -s ours am skip reason: subject contains skip directive Change-Id: I0bcf3e37a5be8383140bfb2ec6733bd429f50beb Bill Yi2019-10-120-0/+0
|\| |
| * | Merge "Import translations. DO NOT MERGE" into qt-r1-devTreeHugger Robot2019-10-1282-14678/+14678
| |\ \
| | * | Import translations. DO NOT MERGE•••Change-Id: I52324e9458f9b928e2827ea70097b0eb93054467 Auto-generated-cl: translation import Bill Yi2019-10-1282-14678/+14678
| | |/
* | | [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev•••am: 6f4ed8f123 -s ours am skip reason: subject contains skip directive Change-Id: I92cb2ff59c49906807f350a7896bd5bffbb3c9ff Bill Yi2019-10-120-0/+0
|\| |
| * | Merge "Import translations. DO NOT MERGE" into qt-r1-devTreeHugger Robot2019-10-1284-15876/+15876
| |\ \
| | * | Import translations. DO NOT MERGE•••Change-Id: Ib628adda1816a2f5a326b5af8d62b62eb5ca220b Auto-generated-cl: translation import Bill Yi2019-10-1284-15876/+15876
| | |/
* | | [automerger skipped] Import translations. DO NOT MERGE•••am: 0572da0269 -s ours am skip reason: subject contains skip directive Change-Id: I050f5d3f28156dd888571a7ed31893897997959e Bill Yi2019-10-120-0/+0
|\| |
| * | Import translations. DO NOT MERGE•••Change-Id: Ic2f680a72dc473a3ea9e63ba2781519c0bb0d189 Auto-generated-cl: translation import Bill Yi2019-10-1283-6074/+6074
| |/
* | [automerger skipped] Merge "Import translations. DO NOT MERGE" into stage-aos...•••am: 6a40932ee2 -s ours am skip reason: subject contains skip directive Change-Id: I2f54cfa03da54267965fbaf6647f14d5d49cd8f4 Bill Yi2019-09-250-0/+0
|\ \
| * \ Merge "Import translations. DO NOT MERGE" into stage-aosp-masterTreeHugger Robot2019-09-252-4/+4
| |\ \
| | * | Import translations. DO NOT MERGE•••Change-Id: I25500c09630cd8037896424a30086207d489467b Auto-generated-cl: translation import Bill Yi2019-09-242-4/+4
* | | | [automerger skipped] Merge "Import translations. DO NOT MERGE" into stage-aos...•••am: 9cee1b60eb -s ours am skip reason: subject contains skip directive Change-Id: I1ae16b36de94b61ac7a5bb060392597931094a72 Bill Yi2019-09-250-0/+0
|\| | |
| * | | Merge "Import translations. DO NOT MERGE" into stage-aosp-masterTreeHugger Robot2019-09-2517-48/+48
| |\ \ \
| | * | | Import translations. DO NOT MERGE•••Change-Id: I8735b7149146b06e4f2df15c746c24ca83b97b94 Auto-generated-cl: translation import Bill Yi2019-09-2417-48/+48
| | |/ /
* | | | [automerger skipped] Merge "Import translations. DO NOT MERGE" into stage-aos...•••am: 54bcf4c593 -s ours am skip reason: subject contains skip directive Change-Id: I9d322853f778eed82196a2418605f1f1ebc74244 Bill Yi2019-09-250-0/+0
|\| | |
| * | | Merge "Import translations. DO NOT MERGE" into stage-aosp-masterTreeHugger Robot2019-09-252-4/+4
| |\ \ \
| | * | | Import translations. DO NOT MERGE•••Change-Id: I35067db3dbae5228b51d48383eae67eba48a6717 Auto-generated-cl: translation import Bill Yi2019-09-242-4/+4
| | |/ /
* | | | [automerger skipped] Merge "Import translations. DO NOT MERGE" into stage-aos...•••am: 6e683f824a -s ours am skip reason: subject contains skip directive Change-Id: Iab6a8618ec303432c48fff2cafd5eb37069513fb Bill Yi2019-09-250-0/+0
|\| | |
| * | | Merge "Import translations. DO NOT MERGE" into stage-aosp-masterTreeHugger Robot2019-09-251-1/+1
| |\ \ \
| | * | | Import translations. DO NOT MERGE•••Change-Id: I15b1a2d1ad1b939ef39ef2484f779668c54a1bf8 Auto-generated-cl: translation import Bill Yi2019-09-241-1/+1
| | |/ /
* | | | [automerger skipped] Merge "Import translations. DO NOT MERGE" into stage-aos...•••am: 355dfa6850 -s ours am skip reason: subject contains skip directive Change-Id: Iafcb9add900447734297a8c79db3d55b48fd2584 Bill Yi2019-09-250-0/+0
|\| | |
| * | | Merge "Import translations. DO NOT MERGE" into stage-aosp-masterTreeHugger Robot2019-09-2544-164/+562
| |\ \ \
| | * | | Import translations. DO NOT MERGE•••Change-Id: Ib5d118c530a2f1a8a7671dcd5e5c3b77526b2582 Auto-generated-cl: translation import Bill Yi2019-09-2444-164/+562
| | |/ /
* | | | [automerger skipped] Import translations. DO NOT MERGE•••am: d7efca3250 -s ours am skip reason: subject contains skip directive Change-Id: If860200f7e59fc1c29d45f5bb0c2848cff3fe4fd Bill Yi2019-09-250-0/+0
|\| | |
| * | | Import translations. DO NOT MERGE•••Change-Id: Ic8c8b74c22d74c43897762200e7b0c925ce1e5c0 Auto-generated-cl: translation import Bill Yi2019-09-247-10/+10
| |/ /
* | | Merge "Create display context when switching IME to new display for AOSP IME"...•••am: a70b532462 Change-Id: Ie9dc641bd908758d30ae9f0e83182ee4f6036c19 lumark2019-09-102-9/+42
|\| |
| * | Merge "Create display context when switching IME to new display for AOSP IME"•••am: 9ab8c21cb8 Change-Id: Iba1d43a5f1c264782f318986dcbb19235409d476 lumark2019-09-102-9/+42
| |\ \
| | * \ Merge "Create display context when switching IME to new display for AOSP IME"Treehugger Robot2019-09-112-9/+42
| | |\ \
| | | * | 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 lumark2019-09-112-9/+42
| | |/ /
* | | | [automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into ...•••am: 309cb0811a -s ours am skip reason: change_id I67cbe34b4646ddfdb0868bf8eaca12100a4e7b16 with SHA1 66fb808791 is in history Change-Id: I6bf3b33ff71e45d1417b068e1220ca3a78767c63 Xin Li2019-09-080-0/+0
|\| | |
| * | | Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master•••No content change. Bug: 135460123 Change-Id: Id5c0fc0c6138cd09b46e5029dfeff1fc3f54753a Merged-In: I67cbe34b4646ddfdb0868bf8eaca12100a4e7b16 Xin Li2019-09-080-0/+0
| |\ \ \ | | |/ / | |/| |
* | | | [automerger skipped] Merge "DO NOT MERGE - Merge Android 10 into master" am: ...•••am: 78650efb26 Change-Id: Ib06b5ddd7c7c93a6befda77a946c8e878fa4ce1f Xin Li2019-09-050-0/+0
|\ \ \ \ | |_|/ / |/| | |
| * | | [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 Xin Li2019-09-050-0/+0
| |\| |
| | * | Merge "DO NOT MERGE - Merge Android 10 into master"Xin Li2019-09-05236-1906/+7182
| | |\ \
| | | * | DO NOT MERGE - Merge Android 10 into master•••Bug: 139893257 Change-Id: I67cbe34b4646ddfdb0868bf8eaca12100a4e7b16 Xin Li2019-09-04236-1906/+7182
| | |/| |
* | | | | [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 Bill Yi2019-08-190-0/+0
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | Merge "Import translations. DO NOT MERGE" into qt-r1-devTreeHugger Robot2019-08-192-2/+2
| |\ \ \ \
| | * | | | Import translations. DO NOT MERGE•••Auto-generated-cl: translation import Bug: 64712476 Change-Id: Ie12258d268be80afd21cf01c8fb2c32d5d522ecb Bill Yi2019-08-182-2/+2
* | | | | | [automerger skipped] Import translations. DO NOT MERGE•••am: 72b1a8b722 -s ours am skip reason: subject contains skip directive Change-Id: I3146a2b640d9fd6e5c12886d0a8bf7c725200d72 Bill Yi2019-08-190-0/+0
|\| | | | |
| * | | | | Import translations. DO NOT MERGE•••Auto-generated-cl: translation import Bug: 64712476 Change-Id: I576eae018336f225d9e6c9dce6eaba6742ce9581 Bill Yi2019-08-181-1/+1
| |/ / / /
* | | | | [automerger skipped] DO NOT MERGE - Skip qt-dev-plus-aosp-without-vendor (571...•••am: b88a8516f3 Change-Id: I08f2b2c10621f4322ce59bea7c30a336707de79d Xin Li2019-08-140-0/+0
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | [automerger skipped] DO NOT MERGE - Skip qt-dev-plus-aosp-without-vendor (571...•••am: 7748102af1 -s ours am skip reason: subject contains skip directive Change-Id: I1229451d40fb142f3f46e591e1dadc652b232685 Xin Li2019-08-140-0/+0
| |\ \ \ \ | | | |_|/ | | |/| |
| | * | | DO NOT MERGE - Skip qt-dev-plus-aosp-without-vendor (5713463) in stage-aosp-m...•••Bug: 134405016 Change-Id: I85024313e36aa6450602dd17cd9bcd7220780ecd Xin Li2019-08-140-0/+0
| | |\ \ \
* | | \ \ \ [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 Bill Yi2019-07-240-0/+0
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | |
| * | | | | Merge "Import translations. DO NOT MERGE" into qt-r1-devTreeHugger Robot2019-07-252-2/+2
| |\ \ \ \ \
| | * | | | | Import translations. DO NOT MERGE•••Auto-generated-cl: translation import Bug: 64712476 Change-Id: Iae08b9b0a5055f1c29a678764af6d2f3c849d5ec Bill Yi2019-07-242-2/+2
* | | | | | | [automerger skipped] Import translations. DO NOT MERGE•••am: ce1f65074a -s ours am skip reason: subject contains skip directive Change-Id: Ie99440bbe2c1cb64b9f4e3e714a5178b95e25b3e Bill Yi2019-07-240-0/+0
|\| | | | | |