aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| | * | | | | [automerger skipped] Merge "DO NOT MERGE - Merge pie-platform-release ↵Xin Li2019-07-100-0/+0
| | |\ \ \ \ \ | | | | |_|_|/ | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (PPRL.190705.004) into master" am: c8db60faa5 -s ours am skip reason: subject contains skip directive Change-Id: Icc42f8f2edb97f51c61b439c4b8c0f78ea2e2577
| | | * | | | Merge "DO NOT MERGE - Merge pie-platform-release (PPRL.190705.004) into master"Treehugger Robot2019-07-1110-19/+19
| | | |\ \ \ \
* | | | | | | | [automerger skipped] DO NOT MERGE - Merge pie-platform-release ↵Xin Li2019-07-100-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (PPRL.190705.004) into master am: f295ade970 -s ours am: 8a19d504f8 -s ours am: b8cf9cdefd Change-Id: I8d4cb649a39dd7d009c8ebf4de02960823b9b483
| * | | | | | | [automerger skipped] DO NOT MERGE - Merge pie-platform-release ↵Xin Li2019-07-100-0/+0
| |\| | | | | | | | |_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (PPRL.190705.004) into master am: f295ade970 -s ours am: 8a19d504f8 -s ours am skip reason: subject contains skip directive Change-Id: I1be78889f96ef5ecbf2a61d4092b766ce8683d0f
| | * | | | | [automerger skipped] DO NOT MERGE - Merge pie-platform-release ↵Xin Li2019-07-100-0/+0
| | |\ \ \ \ \ | | | | |/ / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (PPRL.190705.004) into master am: f295ade970 -s ours am skip reason: subject contains skip directive Change-Id: I557b9217cdb47f9a7633af1561f418341288f0bc
| | | * | | | DO NOT MERGE - Merge pie-platform-release (PPRL.190705.004) into masterXin Li2019-07-0910-19/+19
| | | |\ \ \ \ | | | | |/ / / | | | |/| | | | | | | | | | | | | | | | | Bug: 136196576 Change-Id: I31b019b595c8dec9874140f575fdeb61c5866a7d
| | | | * | | Snap for 5622519 from e035e3c31904c790e5c3d88a78b98d5566038af3 to ↵android-build-team Robot2019-07-0810-19/+19
| | | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | pi-platform-release Change-Id: I3d90a4c3861c2ac74bd10bc6b531b00959272d3c
| | | | | * \ \ Snap for 5443865 from 7209c0f07494c20b22ac5fca22ff33108411425d to ↵android-build-team Robot2019-04-079-17/+17
| | | | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | pi-qpr3-b-release Change-Id: I201510163b8090610945f3f431126da8be21b245
| | | | | * \ \ \ Snap for 5422807 from 145808acade246bd8f2e66b2f2d8ed2b0b4484d4 to ↵android-build-team Robot2019-03-311-2/+2
| | | | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | pi-qpr3-b-release Change-Id: Idb0b17a7fd055fa1c17503430849a0c7586b7ec8
| | | | | * \ \ \ \ Snap for 5335558 from 289a72634b06b499c6554f485158c0baacaa061d to ↵android-build-team Robot2019-02-2612-1745/+1745
| | | | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | pi-qpr3-b-release Change-Id: I1fa37dd05d61114d768ad840311ecfea3e974220
* | | | | | | | | | | Merge "Remove extend touchable region for AOSP keyboard" am: ff1db79a18 am: ↵lumark2019-07-051-4/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b1dec95c37 am: 61722df601 Change-Id: Id85f0a065268605297ed4e25c84d74745f533d36
| * | | | | | | | | | Merge "Remove extend touchable region for AOSP keyboard" am: ff1db79a18lumark2019-07-051-4/+1
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: b1dec95c37 Change-Id: Ice2b8be7e19453c68e1432088887365b5085f617
| | * | | | | | | | | Merge "Remove extend touchable region for AOSP keyboard"lumark2019-07-051-4/+1
| |/| | | | | | | | | | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: ff1db79a18 Change-Id: Ic162b5e20213a3f1b2aeaf77250bf1d7edc198c5
| | * | | | | | | | Merge "Remove extend touchable region for AOSP keyboard"Treehugger Robot2019-07-051-4/+1
| | |\ \ \ \ \ \ \ \
| | | * | | | | | | | Remove extend touchable region for AOSP keyboardlumark2019-07-051-4/+1
| | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | | | | DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5699924) into ↵Xin Li2019-07-020-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | stage-aosp-master am: 7c33185b41 Change-Id: I5663f9b3676017b6ed860b7b26328bc4be06e3fa
| * | | | | | | | | DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5699924) into ↵Xin Li2019-07-01230-1891/+7167
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | stage-aosp-master Bug: 134405016 Change-Id: If86628b9fc81ba5a599ae42e2901066c6bccf173
* | \ \ \ \ \ \ \ \ \ [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-devBill Yi2019-06-250-0/+0
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: ac121a2820 -s ours am skip reason: subject contains skip directive Change-Id: I42accbb5e491294137bc50981ff128f07372c6c4
| * | | | | | | | | | Merge "Import translations. DO NOT MERGE" into qt-r1-devTreeHugger Robot2019-06-261-1/+1
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Import translations. DO NOT MERGEBill Yi2019-06-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Auto-generated-cl: translation import Bug: 64712476 Change-Id: Idab5d09722e584c5ffcc5ff574c28bcbbf729aa5
* | | | | | | | | | | | [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev ↵Bill Yi2019-06-250-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 4061ed5736 -s ours am: 751578eb61 -s ours am skip reason: subject contains skip directive Change-Id: If05fe8e1477e2f0a875daf090155a55ee12e795c
| * | | | | | | | | | | [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-devBill Yi2019-06-250-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 4061ed5736 -s ours am skip reason: subject contains skip directive Change-Id: I32a36bccba7d89c4b87599cf431f335a139256cd
* | | | | | | | | | | | [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev ↵Bill Yi2019-06-250-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 4061ed5736 -s ours am: 79209927d7 -s ours am skip reason: subject contains skip directive Change-Id: Iee460ee20e3b7883819b86b194d6752957406e17
| * | | | | | | | | | | [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-devBill Yi2019-06-250-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 4061ed5736 -s ours am skip reason: subject contains skip directive Change-Id: I2bc82d808c258bdab168afa691d2a6415e597efb
| | * | | | | | | | | | Merge "Import translations. DO NOT MERGE" into qt-devTreeHugger Robot2019-06-261-1/+1
| | |\ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | Import translations. DO NOT MERGEBill Yi2019-06-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Auto-generated-cl: translation import Bug: 64712476 Change-Id: I38b91f6946820fcaa1f28323085f54676ce12615
* | | | | | | | | | | | | [automerger skipped] Import translations. DO NOT MERGE am: 9b767fcba3 -s oursBill Yi2019-06-250-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 840c5538d5 -s ours am skip reason: subject contains skip directive Change-Id: I8c144db8e7e390ed19ae1d05280323b974b8fb6d
| * | | | | | | | | | | | [automerger skipped] Import translations. DO NOT MERGEBill Yi2019-06-250-0/+0
| |\| | | | | | | | | | | | | |_|_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 9b767fcba3 -s ours am skip reason: subject contains skip directive Change-Id: Ia93571e75a307e18be9afe5898adc1dff1f25df7
* | | | | | | | | | | | [automerger skipped] Import translations. DO NOT MERGE am: 9b767fcba3 -s oursBill Yi2019-06-250-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: f9c445788b -s ours am skip reason: subject contains skip directive Change-Id: Ieaa7f260fdab2f969b7bf0807c04126c6bffed95
| * | | | | | | | | | | [automerger skipped] Import translations. DO NOT MERGEBill Yi2019-06-250-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 9b767fcba3 -s ours am skip reason: subject contains skip directive Change-Id: I3b557b73a894482d524707d8db9522ab3d33aa64
| | * | | | | | | | | | Import translations. DO NOT MERGEBill Yi2019-06-251-1/+1
| | | |/ / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Auto-generated-cl: translation import Bug: 64712476 Change-Id: I352b26ea8bf0231df70390d717acd2d1d594b1c5
* | | | | | | | | | | [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-devBill Yi2019-06-180-0/+0
|\ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 946037ccaa -s ours am skip reason: subject contains skip directive Change-Id: Iccfd98779dacb93191083c8cb50b8041899f30db
| * | | | | | | | | | Merge "Import translations. DO NOT MERGE" into qt-r1-devTreeHugger Robot2019-06-192-3/+3
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Import translations. DO NOT MERGEBill Yi2019-06-182-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Auto-generated-cl: translation import Bug: 64712476 Change-Id: I2d3706b2fa62b1f3b561db60763e895910b1cbbc
* | | | | | | | | | | | [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-devBill Yi2019-06-180-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 00f42c18e7 -s ours am skip reason: subject contains skip directive Change-Id: I6a6fe8eb2230651eca9ffb05064320739b424481
| * | | | | | | | | | | Merge "Import translations. DO NOT MERGE" into qt-r1-devTreeHugger Robot2019-06-196-21/+21
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | Import translations. DO NOT MERGEBill Yi2019-06-186-21/+21
| | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Auto-generated-cl: translation import Bug: 64712476 Change-Id: I714e7c7937c2377d86ee7f2a514117d0255f4761
* | | | | | | | | | | | [automerger skipped] Import translations. DO NOT MERGEBill Yi2019-06-180-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 3c377f755c -s ours am skip reason: subject contains skip directive Change-Id: I0768f2db2bc24836891acc9fa2f00dd2ca0bd873
| * | | | | | | | | | | Import translations. DO NOT MERGEBill Yi2019-06-1821-42/+40
| |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Auto-generated-cl: translation import Bug: 64712476 Change-Id: I32470cb45f56eb8bdc8f2b2e055e649d34c5e7f3
* | | | | | | | | | | [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev ↵Bill Yi2019-06-180-0/+0
|\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 32bb8f9993 -s ours am: 474b6518de -s ours am skip reason: subject contains skip directive Change-Id: I5bf6291792086790a4e1179d35db194b737318cf
| * | | | | | | | | | [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-devBill Yi2019-06-180-0/+0
| |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 32bb8f9993 -s ours am skip reason: subject contains skip directive Change-Id: I7715753ef974b79b2e62c4d14f6ec769284b095c
* | | | | | | | | | | Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into ↵Android Build Merger (Role)2019-06-180-0/+0
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | qt-dev am: 32bb8f9993 -s ours am: 0159a56eb0 -s ours am skip reason: subject contains skip directive" into qt-r1-dev-plus-aosp
| * \ \ \ \ \ \ \ \ \ \ [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev ↵Bill Yi2019-06-180-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 32bb8f9993 -s ours am: 0159a56eb0 -s ours am skip reason: subject contains skip directive Change-Id: I6b2d10370d7102e02773b267a945d923c390e6a3
| | * | | | | | | | | | [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-devBill Yi2019-06-180-0/+0
| | |\ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 32bb8f9993 -s ours am skip reason: subject contains skip directive Change-Id: Ifd17be5a20f5a1c9787d3f082238c7326ad9b88c
| | | * | | | | | | | | Merge "Import translations. DO NOT MERGE" into qt-devTreeHugger Robot2019-06-182-3/+3
| | | |\ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | Import translations. DO NOT MERGEBill Yi2019-06-182-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Auto-generated-cl: translation import Bug: 64712476 Change-Id: I096be536dd6bf947ea5c2d2adb37a905a790027f
* | | | | | | | | | | | | [automerger skipped] Import translations. DO NOT MERGE am: a9ee39f5cb -s oursBill Yi2019-06-180-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / |/| | | | / / / / / / / / | | |_|_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 20b7d15ae5 -s ours am skip reason: subject contains skip directive Change-Id: I712e5cf4b4bfc28115f67148be5de233270676d8
| * | | | | | | | | | | [automerger skipped] Import translations. DO NOT MERGEBill Yi2019-06-180-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: a9ee39f5cb -s ours am skip reason: subject contains skip directive Change-Id: I338ac5ff44723d97eda21fc992b2c20499ed84cc
* | | | | | | | | | | | [automerger skipped] Import translations. DO NOT MERGE am: a9ee39f5cb -s oursBill Yi2019-06-180-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 785f8a21a6 -s ours am skip reason: subject contains skip directive Change-Id: Idcf2355955d334ebdb1e7de98540727b195122a9
| * | | | | | | | | | | [automerger skipped] Import translations. DO NOT MERGEBill Yi2019-06-180-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: a9ee39f5cb -s ours am skip reason: subject contains skip directive Change-Id: I2da24758f685408817dbe59a3af79c1930c6d19a