aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | [automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-devBill Yi2019-02-210-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 01900e65fc -s ours am skip reason: subject contains skip directive Change-Id: I01f062132b5b6b40de3f532a0b4c48da14ffa0c9
| | * | | | | Merge "Import translations. DO NOT MERGE" into pi-devTreeHugger Robot2019-02-212-1286/+1286
| | |\ \ \ \ \
| | | * | | | | Import translations. DO NOT MERGEBill Yi2019-02-212-1286/+1286
| | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Auto-generated-cl: translation import Bug: 64712476 Change-Id: I6e496165fde5ea66dda1559f39a0c02c949265b0
* | | | | | | [automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev ↵Bill Yi2019-02-210-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: e951835344 -s ours am: 1513b865a7 -s ours am skip reason: subject contains skip directive Change-Id: Ib9f2f8a6631c4eaf7cca7688379393216aa681c2
| * | | | | | [automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-devBill Yi2019-02-210-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: e951835344 -s ours am skip reason: subject contains skip directive Change-Id: I9b53ac21775b9611c5eb407f9619f51851b55aea
| | * | | | | Merge "Import translations. DO NOT MERGE" into pi-devTreeHugger Robot2019-02-211-1/+1
| | |\ \ \ \ \
| | | * | | | | Import translations. DO NOT MERGEBill Yi2019-02-211-1/+1
| | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Auto-generated-cl: translation import Bug: 64712476 Change-Id: Ied44fc2e6b9256a6744387ca511946b21fd44524
* | | | | | | [automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev ↵Bill Yi2019-02-210-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 35ac417ae0 -s ours am: 8c9163d180 -s ours am skip reason: subject contains skip directive Change-Id: I947826e9c2224d223d526c96c64dc4f5ca2c3251
| * | | | | | [automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-devBill Yi2019-02-210-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 35ac417ae0 -s ours am skip reason: subject contains skip directive Change-Id: Iddece47182ff08386f7bcaa402c74eeaca57a693
| | * | | | | Merge "Import translations. DO NOT MERGE" into pi-devTreeHugger Robot2019-02-211-8/+8
| | |\ \ \ \ \
| | | * | | | | Import translations. DO NOT MERGEBill Yi2019-02-211-8/+8
| | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Auto-generated-cl: translation import Bug: 64712476 Change-Id: I05cf27d7d1a197dde37d6dc69433c26e62c88458
* | | | | | | [automerger skipped] Import translations. DO NOT MERGE am: 9e73c487e4 -s oursBill Yi2019-02-210-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 1079e974a3 -s ours am skip reason: subject contains skip directive Change-Id: Icfb741e61c196da6ada12373682ed5ac16d045b2
| * | | | | | [automerger skipped] Import translations. DO NOT MERGEBill Yi2019-02-210-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 9e73c487e4 -s ours am skip reason: subject contains skip directive Change-Id: I36af548ea6984fda2645809575e5b9566b163308
| | * | | | | Import translations. DO NOT MERGEBill Yi2019-02-214-193/+193
| | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Auto-generated-cl: translation import Bug: 64712476 Change-Id: I2b984642494033f59d02cf4c640793b47e63c6b3
* | | | | | Merge "Import translations. DO NOT MERGE"TreeHugger Robot2019-02-212-2/+2
|\ \ \ \ \ \
| * | | | | | Import translations. DO NOT MERGEBill Yi2019-02-212-2/+2
| | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | Change-Id: I3962401c95664f199216b443e27bf07871b20d07 Auto-generated-cl: translation import
* | | | | | Merge "Import translations. DO NOT MERGE"TreeHugger Robot2019-02-212-6/+6
|\ \ \ \ \ \
| * | | | | | Import translations. DO NOT MERGEBill Yi2019-02-212-6/+6
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Iaaf42624b7933d8a479a9eea71aedbc3711de6cb Auto-generated-cl: translation import
* | | | | | Merge "Import translations. DO NOT MERGE"TreeHugger Robot2019-02-212-4/+4
|\ \ \ \ \ \
| * | | | | | Import translations. DO NOT MERGEBill Yi2019-02-212-4/+4
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Icdaeac3123fef5ca97a44cc155d4f428138ae985 Auto-generated-cl: translation import
* | | | | | [automerger skipped] Merge "DO NOT MERGE - Merge PPRL.190205.001 into ↵Xin Li2019-02-200-0/+0
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master" am: 7a26716635 -s ours am: 3131e40bd0 -s ours am: e4b43c4fbc -s ours am skip reason: subject contains skip directive Change-Id: I79afcd68f3c86d5ca5a883ac57f350022c829762
| * | | | | [automerger skipped] Merge "DO NOT MERGE - Merge PPRL.190205.001 into ↵Xin Li2019-02-200-0/+0
| |\ \ \ \ \ | | | |_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master" am: 7a26716635 -s ours am: 3131e40bd0 -s ours am skip reason: subject contains skip directive Change-Id: If88ba09f1f42f81715f1fc058056f30260a27f76
| | * | | | [automerger skipped] Merge "DO NOT MERGE - Merge PPRL.190205.001 into master"Xin Li2019-02-200-0/+0
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 7a26716635 -s ours am skip reason: subject contains skip directive Change-Id: I987ab9b831b98585ec81dfb09ef7c2a9e231050c
| | | * \ \ \ Merge "DO NOT MERGE - Merge PPRL.190205.001 into master"Xin Li2019-02-205-8/+8
| | | |\ \ \ \
* | | | | | | | [automerger skipped] DO NOT MERGE - Merge PPRL.190205.001 into master am: ↵Xin Li2019-02-200-0/+0
|\| | | | | | | | |_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 55f3303cbb -s ours am: 44fd4cee32 -s ours am: d89fe26246 -s ours am skip reason: subject contains skip directive Change-Id: Id282955f43ad4f89dcb9ed86a4d8d9bd319b400a
| * | | | | | [automerger skipped] DO NOT MERGE - Merge PPRL.190205.001 into master am: ↵Xin Li2019-02-200-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 55f3303cbb -s ours am: 44fd4cee32 -s ours am skip reason: subject contains skip directive Change-Id: I39de5a3e6d74ff3c40509fb86b20ed58a0fa2c00
| | * | | | | [automerger skipped] DO NOT MERGE - Merge PPRL.190205.001 into masterXin Li2019-02-200-0/+0
| | |\ \ \ \ \ | | | | |/ / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 55f3303cbb -s ours am skip reason: subject contains skip directive Change-Id: I6b4a32fb876ebb56043708b575cbf72b870617b8
| | | * | | | DO NOT MERGE - Merge PPRL.190205.001 into masterXin Li2019-02-185-8/+8
| | | |\ \ \ \ | | | |/ / / / | | |/| / / / | | | |/ / / | | | | | | Bug: 124234733 Change-Id: I7e1e95d48518ba22d651ac5301f59d0576eae5f3
* | | | | | [automerger skipped] DO NOT MERGE - Merge pi-platform-release ↵Xin Li2019-02-140-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (PPRL.190205.001) into stage-aosp-master am: edb32289f2 -s ours am: 69d7bc2bc2 -s ours am skip reason: subject contains skip directive Change-Id: I5167f411100785ed9a9e1355d5e2cfbea6878e13
| * | | | | [automerger skipped] DO NOT MERGE - Merge pi-platform-release ↵Xin Li2019-02-140-0/+0
| |\| | | | | | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (PPRL.190205.001) into stage-aosp-master am: edb32289f2 -s ours am skip reason: subject contains skip directive Change-Id: Ideb2a4ae6b8035057793c5b6a8f23fb823bc6930
| | * | | DO NOT MERGE - Merge pi-platform-release (PPRL.190205.001) into ↵Xin Li2019-02-125-8/+8
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | stage-aosp-master Bug: 124234733 Change-Id: I7cf7739a6a70d4caeb1c20a3c1c4f33a05568670
| | | * \ \ Snap for 5180536 from 556b091a754cadd239102086bbcfa77e5afe6ba4 to ↵android-build-team Robot2019-02-0917-27/+27
| | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | pi-platform-release Change-Id: I0d7de023eac68880bab0b670385e67b721a5abcf
| | | | * \ \ Snap for 5130385 from f1f7f05512d628cd45e67e8770fa73e673e1876e to ↵android-build-team Robot2018-11-142-3/+3
| | | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | pi-qpr2-release Change-Id: If2439f25f9e62fedb35c16dfcad0fe19861c288e
| | | | * \ \ \ Snap for 5115288 from 2a04a34ee723b0665fa5164ce03f197ff3326f6f to ↵android-build-team Robot2018-11-072-2/+2
| | | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | pi-qpr2-release Change-Id: I9dda63f33991c56765c7c1d5cc546af087f3e16c
| | | | * \ \ \ \ Snap for 5101444 from 98552375639133af1f25e7b4397078f734d1205a to ↵android-build-team Robot2018-10-311-3/+3
| | | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | pi-qpr2-release Change-Id: I231dc9c6d0c93dfd0cb3b0638728f9cba623628a
| | | | * \ \ \ \ \ Snap for 5073521 from 67efbc844c4b333e56213605779fe53aee35a499 to ↵android-build-team Robot2018-10-171-2/+2
| | | | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | pi-qpr2-release Change-Id: I027c4c4d21d645b6fd4120fbdd6f5b27487b6817
| | | | * \ \ \ \ \ \ Snap for 5044688 from 8353ab156f3fc64f5ea3c4aba07c00b0edee3433 to ↵android-build-team Robot2018-10-0211-17/+17
| | | | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | pi-qpr2-release Change-Id: I4719dd272fc2cb56f67e0da4cd75e8c15e9db95b
* | | | | | | | | | | | Import translations. DO NOT MERGEBill Yi2019-02-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: If684531601502dce2fa4c0fe36a1af2086226faa Auto-generated-cl: translation import
* | | | | | | | | | | | Support testing Direct Reply with EditTextVariations on API 24/25Yohei Yukawa2019-02-052-18/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a follow up CL to my previous CL [1], which enabled us to test Direct-Reply with EditTextVariations. What this CL does are: * Specyfing min_sdk_version to avoid INSTALL_FAILED_OLDER_SDK error when installing on older devices. * Avoiding NoSuchMethodError on pre-O devices where Notification.Builder does not have a constructor that takes notification channel. * Fixing a race condition where notification can be sent before notification channel is created. [1]: Iafffcc7d138b0f502116a5e557f0c3f17e9d0b73 da2486fd63d7d46e982d0e2fb2eba3dac07aff32 Bug: 122957841 Test: Made sure that we can install EditTextVariations on N devices and "Direct-Reply" on EditTextVariations works there. Change-Id: Ib4fbd447608b111e763fde4287226cf7e206e65e
* | | | | | | | | | | | Merge "Import translations. DO NOT MERGE"TreeHugger Robot2019-02-021-73/+73
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Import translations. DO NOT MERGEBill Yi2019-02-021-73/+73
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I09408d72060cc69d3734647abe7969528539c1cc Auto-generated-cl: translation import
* | | | | | | | | | | | | Merge "Import translations. DO NOT MERGE"TreeHugger Robot2019-02-021-4/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Import translations. DO NOT MERGEBill Yi2019-02-021-4/+4
| |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I782e5d547025d56f98fc6a972c205367fa9e7bca Auto-generated-cl: translation import
* | | | | | | | | | | | | Merge "Import translations. DO NOT MERGE"TreeHugger Robot2019-02-021-1281/+1281
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Import translations. DO NOT MERGEBill Yi2019-02-021-1281/+1281
| |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ie30d0bb36cd7157921f3745fe722f7c0c458e92f Auto-generated-cl: translation import
* | | | | | | | | | | | | Merge "Import translations. DO NOT MERGE"TreeHugger Robot2019-02-021-179/+179
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Import translations. DO NOT MERGEBill Yi2019-02-021-179/+179
| |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ide4b5b729b9a7b482cfbd2aff914c3064f5ec668 Auto-generated-cl: translation import
* | | | | | | | | | | | | Merge "Import translations. DO NOT MERGE"TreeHugger Robot2019-02-021-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Import translations. DO NOT MERGEBill Yi2019-02-021-1/+1
| |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Id25f8e0d7b2bb7c47e9f04e6355a10f2da9f9b25 Auto-generated-cl: translation import
* | | | | | | | | | | | | Merge "Import translations. DO NOT MERGE"TreeHugger Robot2019-02-021-8/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \