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
1e4d00401d
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev am: cd95311674
-s ours
...
am: 1080d669ab
-s ours
am skip reason: subject contains skip directive
Change-Id: Ibec5e92190b0151678c401d7ee8dc9417c63194b
2019-07-24 17:39:35 -07:00
Bill Yi
ab260ffa84
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev am: cd95311674
-s ours
...
am: c83cc88f9b
-s ours
am skip reason: subject contains skip directive
Change-Id: I179b15a6ffc24831696d28e86ffba7d145c8f0e8
2019-07-24 17:38:53 -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
Bill Yi
c83cc88f9b
[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: I78c9b535c5596c089be47a8a06e2e7b309d244f6
2019-07-24 17:26:07 -07:00
Bill Yi
80fa2bdcf9
[automerger skipped] Import translations. DO NOT MERGE am: ce1f65074a
-s ours
...
am: 33dec1203c
-s ours
am skip reason: subject contains skip directive
Change-Id: Ie122c64d041547d05d605b0422b54a44ff5cf943
2019-07-24 17:19:20 -07:00
Bill Yi
f65b7bbaf9
[automerger skipped] Import translations. DO NOT MERGE am: ce1f65074a
-s ours
...
am: 2792b8483c
-s ours
am skip reason: subject contains skip directive
Change-Id: I1d600d83f85e13fbbc7c924a7efc546f768c79b7
2019-07-24 17:14:05 -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
2792b8483c
[automerger skipped] Import translations. DO NOT MERGE
...
am: ce1f65074a
-s ours
am skip reason: subject contains skip directive
Change-Id: I00d3f746e191d382557fabc0e68be9bbfc3c7a8c
2019-07-24 16:59:46 -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
Xin Li
1480718d54
[automerger skipped] DO NOT MERGE - Merge pie-platform-release (PPRL.190705.004) into master am: f295ade970
-s ours am: 8a19d504f8
-s ours
...
am: b8cf9cdefd
Change-Id: I8d4cb649a39dd7d009c8ebf4de02960823b9b483
2019-07-10 22:51:59 -07:00
Xin Li
b8cf9cdefd
[automerger skipped] DO NOT MERGE - Merge pie-platform-release (PPRL.190705.004) into master am: f295ade970
-s ours
...
am: 8a19d504f8
-s ours
am skip reason: subject contains skip directive
Change-Id: I1be78889f96ef5ecbf2a61d4092b766ce8683d0f
2019-07-10 22:15:53 -07:00
Xin Li
8a19d504f8
[automerger skipped] DO NOT MERGE - Merge pie-platform-release (PPRL.190705.004) into master
...
am: f295ade970
-s ours
am skip reason: subject contains skip directive
Change-Id: I557b9217cdb47f9a7633af1561f418341288f0bc
2019-07-10 21:22:18 -07:00
Treehugger Robot
c8db60faa5
Merge "DO NOT MERGE - Merge pie-platform-release (PPRL.190705.004) into master"
2019-07-11 03:52:58 +00:00
Xin Li
f295ade970
DO NOT MERGE - Merge pie-platform-release (PPRL.190705.004) into master
...
Bug: 136196576
Change-Id: I31b019b595c8dec9874140f575fdeb61c5866a7d
2019-07-09 11:24:32 -07:00
android-build-team Robot
8c6c1e2be6
Snap for 5622519 from e035e3c319
to pi-platform-release
...
Change-Id: I3d90a4c3861c2ac74bd10bc6b531b00959272d3c
2019-07-08 23:24:29 +00:00
lumark
075f86ba3b
Merge "Remove extend touchable region for AOSP keyboard" am: ff1db79a18
am: b1dec95c37
...
am: 61722df601
Change-Id: Id85f0a065268605297ed4e25c84d74745f533d36
2019-07-05 08:57:33 -07:00
lumark
61722df601
Merge "Remove extend touchable region for AOSP keyboard" am: ff1db79a18
...
am: b1dec95c37
Change-Id: Ice2b8be7e19453c68e1432088887365b5085f617
2019-07-05 08:17:17 -07:00
lumark
b1dec95c37
Merge "Remove extend touchable region for AOSP keyboard"
...
am: ff1db79a18
Change-Id: Ic162b5e20213a3f1b2aeaf77250bf1d7edc198c5
2019-07-05 07:45:50 -07:00
Treehugger Robot
ff1db79a18
Merge "Remove extend touchable region for AOSP keyboard"
2019-07-05 06:30:35 +00:00
lumark
b4360e65ca
Remove extend touchable region for AOSP keyboard
...
Remove EXTENDED_TOUCHABLE_REGION_HEIGHT from LatinIME#onComputeInsets
to prevent keyboard touch region covered navigation bar
when in split-window mode with display density < 240 case.
Fix: 134893742
Test: manual as below steps:
1) Set window density as 240 with "adb shell wm density 240"
2) Launch a app (i.e. Messages) from recents activity, set as split-screen mode.
3) Tap Search bar to show IME keyboard.
4) Press home / back / recents key if it works, expect it works.
Change-Id: I596b7276041fecc50d2bc095c7e51664f632368d
2019-07-05 03:30:10 +00:00
Xin Li
aefd756095
DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5699924) into stage-aosp-master
...
am: 7c33185b41
Change-Id: I5663f9b3676017b6ed860b7b26328bc4be06e3fa
2019-07-02 13:38:14 -07:00
Xin Li
7c33185b41
DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5699924) into stage-aosp-master
...
Bug: 134405016
Change-Id: If86628b9fc81ba5a599ae42e2901066c6bccf173
2019-07-01 21:00:09 +00:00
Bill Yi
6e86fcac8a
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev
...
am: ac121a2820
-s ours
am skip reason: subject contains skip directive
Change-Id: I42accbb5e491294137bc50981ff128f07372c6c4
2019-06-25 22:22:49 -07:00
TreeHugger Robot
ac121a2820
Merge "Import translations. DO NOT MERGE" into qt-r1-dev
2019-06-26 04:15:33 +00:00