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
Bill Yi
d2688654cb
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 4061ed5736
-s ours
...
am: 751578eb61
-s ours
am skip reason: subject contains skip directive
Change-Id: If05fe8e1477e2f0a875daf090155a55ee12e795c
2019-06-25 18:24:44 -07:00
Bill Yi
253e96a6ef
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 4061ed5736
-s ours
...
am: 79209927d7
-s ours
am skip reason: subject contains skip directive
Change-Id: Iee460ee20e3b7883819b86b194d6752957406e17
2019-06-25 18:17:54 -07:00
Bill Yi
751578eb61
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev
...
am: 4061ed5736
-s ours
am skip reason: subject contains skip directive
Change-Id: I32a36bccba7d89c4b87599cf431f335a139256cd
2019-06-25 18:06:49 -07:00
Bill Yi
79209927d7
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev
...
am: 4061ed5736
-s ours
am skip reason: subject contains skip directive
Change-Id: I2bc82d808c258bdab168afa691d2a6415e597efb
2019-06-25 17:59:24 -07:00
Bill Yi
2a4aba0879
[automerger skipped] Import translations. DO NOT MERGE am: 9b767fcba3
-s ours
...
am: 840c5538d5
-s ours
am skip reason: subject contains skip directive
Change-Id: I8c144db8e7e390ed19ae1d05280323b974b8fb6d
2019-06-25 17:53:05 -07:00
Bill Yi
8563a2027a
[automerger skipped] Import translations. DO NOT MERGE am: 9b767fcba3
-s ours
...
am: f9c445788b
-s ours
am skip reason: subject contains skip directive
Change-Id: Ieaa7f260fdab2f969b7bf0807c04126c6bffed95
2019-06-25 17:48:41 -07:00
TreeHugger Robot
4061ed5736
Merge "Import translations. DO NOT MERGE" into qt-dev
2019-06-26 00:43:59 +00:00
Bill Yi
f9c445788b
[automerger skipped] Import translations. DO NOT MERGE
...
am: 9b767fcba3
-s ours
am skip reason: subject contains skip directive
Change-Id: I3b557b73a894482d524707d8db9522ab3d33aa64
2019-06-25 17:22:03 -07:00
Bill Yi
840c5538d5
[automerger skipped] Import translations. DO NOT MERGE
...
am: 9b767fcba3
-s ours
am skip reason: subject contains skip directive
Change-Id: Ia93571e75a307e18be9afe5898adc1dff1f25df7
2019-06-25 17:20:54 -07:00
Bill Yi
e08f778e3b
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: Idab5d09722e584c5ffcc5ff574c28bcbbf729aa5
2019-06-25 13:54:19 -07:00
Bill Yi
9b767fcba3
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: I352b26ea8bf0231df70390d717acd2d1d594b1c5
2019-06-25 13:48:59 -07:00
Bill Yi
f56dd28cc2
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: I38b91f6946820fcaa1f28323085f54676ce12615
2019-06-25 13:46:35 -07:00
Bill Yi
df13f0a381
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev
...
am: 946037ccaa
-s ours
am skip reason: subject contains skip directive
Change-Id: Iccfd98779dacb93191083c8cb50b8041899f30db
2019-06-18 20:44:42 -07:00
Bill Yi
6aecddb456
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev
...
am: 00f42c18e7
-s ours
am skip reason: subject contains skip directive
Change-Id: I6a6fe8eb2230651eca9ffb05064320739b424481
2019-06-18 20:41:02 -07:00
Bill Yi
03ce994eec
[automerger skipped] Import translations. DO NOT MERGE
...
am: 3c377f755c
-s ours
am skip reason: subject contains skip directive
Change-Id: I0768f2db2bc24836891acc9fa2f00dd2ca0bd873
2019-06-18 20:30:37 -07:00
TreeHugger Robot
946037ccaa
Merge "Import translations. DO NOT MERGE" into qt-r1-dev
2019-06-19 02:19:26 +00:00
TreeHugger Robot
00f42c18e7
Merge "Import translations. DO NOT MERGE" into qt-r1-dev
2019-06-19 01:56:54 +00:00
Bill Yi
3c377f755c
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: I32470cb45f56eb8bdc8f2b2e055e649d34c5e7f3
2019-06-18 15:46:46 -07:00
Bill Yi
0d2eb8b4db
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: I2d3706b2fa62b1f3b561db60763e895910b1cbbc
2019-06-18 15:46:01 -07:00
Bill Yi
890f13eb56
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: I714e7c7937c2377d86ee7f2a514117d0255f4761
2019-06-18 15:44:18 -07:00
Bill Yi
bbce6727cc
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 32bb8f9993
-s ours
...
am: 474b6518de
-s ours
am skip reason: subject contains skip directive
Change-Id: I5bf6291792086790a4e1179d35db194b737318cf
2019-06-18 08:13:01 -07:00
Android Build Merger (Role)
43a72fe360
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 32bb8f9993
-s ours am: 0159a56eb0
-s ours am skip reason: subject contains skip directive" into qt-r1-dev-plus-aosp
2019-06-18 15:12:29 +00:00
Bill Yi
f44e8d06b2
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 32bb8f9993
-s ours
...
am: 0159a56eb0
-s ours
am skip reason: subject contains skip directive
Change-Id: I6b2d10370d7102e02773b267a945d923c390e6a3
2019-06-18 08:12:19 -07:00
Bill Yi
bfe418d5ef
[automerger skipped] Import translations. DO NOT MERGE am: a9ee39f5cb
-s ours
...
am: 20b7d15ae5
-s ours
am skip reason: subject contains skip directive
Change-Id: I712e5cf4b4bfc28115f67148be5de233270676d8
2019-06-18 08:12:11 -07:00
Bill Yi
a6b2800ea9
[automerger skipped] Import translations. DO NOT MERGE am: a9ee39f5cb
-s ours
...
am: 785f8a21a6
-s ours
am skip reason: subject contains skip directive
Change-Id: Idcf2355955d334ebdb1e7de98540727b195122a9
2019-06-18 08:11:31 -07:00