Automerger Merge Worker
e590279e63
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: dcd3e8984e -s ours am: 0d22d8e6e7 -s ours am: a0b728a33e -s ours" into rvc-qpr-dev-plus-aosp
2020-06-18 16:19:37 +00:00
Automerger Merge Worker
7740905065
Merge "Merge "Increase notification channel limit" into rvc-dev am: 8d139f6a98 am: 336418d39e am: b247a0da83" into rvc-qpr-dev-plus-aosp
2020-06-18 16:19:30 +00:00
TreeHugger Robot
1c77120c9f
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: dcd3e8984e -s ours am: 0d22d8e6e7 -s ours am: a0b728a33e -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11908612
Change-Id: Ia394e8a345bea1f089ca99bed9f619de7464a6ec
2020-06-18 16:19:23 +00:00
TreeHugger Robot
a1b3f129a2
Merge "Inject PipAnimationController into PipTaskOrg" into rvc-dev am: 29b158150d am: 93aad134db am: b7bd5b1b76
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11887439
Change-Id: Iaa7d7952f484022f3d0acec674ccb1c35150d51b
2020-06-18 16:19:12 +00:00
TreeHugger Robot
e4351d1d5d
Merge "Increase notification channel limit" into rvc-dev am: 8d139f6a98 am: 336418d39e am: b247a0da83
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11908614
Change-Id: I6203d83143e0bdcf838ad5c4777b711cbaa8bd0c
2020-06-18 16:19:07 +00:00
Lyn Han
f00c2f2c4c
Merge "Ellipsize user edu title/desc; max 2 line title" into rvc-dev am: af0ddb78fd am: c2989e34f2 am: 1ff1e7a0fe
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11885867
Change-Id: Ie932ae213afc0e232b013f75f3561b253b5347bf
2020-06-18 16:18:57 +00:00
TreeHugger Robot
1a37593b0b
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: dcd3e8984e -s ours am: 0d22d8e6e7 -s ours am: 89233ecdf1 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11908612
Change-Id: If8fef05ce1c9350c3bf344793a62efd1ad12ff6e
2020-06-18 16:18:49 +00:00
Lorenzo Colitti
1e488831bd
Merge "Memory leak due to no stop for IpNeighborMonitor." am: 10b6226702
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1343440
Change-Id: I8723fa07bdbf067940d1fa0b27b13cd5e39289f6
2020-06-18 16:18:46 +00:00
TreeHugger Robot
d0b77cb281
Merge "Inject PipAnimationController into PipTaskOrg" into rvc-dev am: 29b158150d am: 93aad134db am: f462abddd5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11887439
Change-Id: I76a4ee96d166c972af74ea9f607f26f7ed7cccf2
2020-06-18 16:18:27 +00:00
Julia Reynolds
4c4664445f
Merge "Clean up temp AtomicFile files" into rvc-dev am: d97051473d am: 32774d472d am: 0a3568e4ac
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11884298
Change-Id: I6e332e546b2ddccd68e25e16c09e65b169257c87
2020-06-18 16:18:12 +00:00
Julia Reynolds
8bfdb2dff3
Merge "Clean up temp AtomicFile files" into rvc-dev am: d97051473d am: 32774d472d am: 34fe7cbafc
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11884298
Change-Id: I84b1dc4969dda389389f259d76e36f10e0e45d2b
2020-06-18 16:17:48 +00:00
Matt Pietal
2d0c7b02bc
Resolver/Chooser - Fix reuse of textview
...
Upon reuse of a view by the recyclerview, it was possible to show a
reused view's sublabel, as it was doing incorrect comparisons. Make
sure to always reset the textviews, and hide it if necessary.
Fixes: 150813955
Test: manual, but helpful to have many apps installed and launch the sharesheet
Change-Id: Idb0c03c0b0917104bd9f26cdd9ed33a0055fa6f2
2020-06-18 12:16:56 -04:00
TreeHugger Robot
dfa3298ad0
Merge "Track non-foreground service notifs for appOps" into rvc-dev
2020-06-18 16:15:15 +00:00
Michael Groover
67cb3a610d
Merge "Relax minimum signature scheme version for apps on system partition" into rvc-dev
2020-06-18 16:13:30 +00:00
TreeHugger Robot
9040427ff8
Merge "Import translations. DO NOT MERGE" into rvc-dev
2020-06-18 16:03:25 +00:00
TreeHugger Robot
e67a662923
Merge "Increase notification channel limit" into rvc-dev am: 8d139f6a98 am: 8c73900447
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11908614
Change-Id: I823bdd0fd41085a05366a3f920cab05967be1278
2020-06-18 16:01:32 +00:00
Lyn Han
9df24d4160
Merge "Ellipsize user edu title/desc; max 2 line title" into rvc-dev am: af0ddb78fd am: 0e6a737eb4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11885867
Change-Id: I5abbc10c1dcaa2af40230b71c60e5a9fbdaedb7f
2020-06-18 16:01:24 +00:00
TreeHugger Robot
1ea69e6968
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: dcd3e8984e -s ours am: b73ac9086b -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11908612
Change-Id: Ie677d7893d2847ba62f4d4c1f7afcdeba9d56153
2020-06-18 16:01:15 +00:00
TreeHugger Robot
b5d40cab3e
Merge "Inject PipAnimationController into PipTaskOrg" into rvc-dev am: 29b158150d am: 2e5dd0c4c9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11887439
Change-Id: I9711421894b1a86374d5b537ca53fd8b1c8760e2
2020-06-18 16:00:57 +00:00
Automerger Merge Worker
c58206dde0
Merge "Merge "Clean up temp AtomicFile files" into rvc-dev am: d97051473d am: 5b8bf3839b" into rvc-d1-dev-plus-aosp
2020-06-18 16:00:36 +00:00
TreeHugger Robot
3c1bc9a9e1
Merge "Increase notification channel limit" into rvc-dev am: 8d139f6a98 am: 336418d39e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11908614
Change-Id: Id938d68827d490b0ea5e2036e672a31433358927
2020-06-18 16:00:25 +00:00
Julia Reynolds
88600445d1
Merge "Clean up temp AtomicFile files" into rvc-dev am: d97051473d am: 5b8bf3839b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11884298
Change-Id: I58cbeac0acec0ca2cd1a7d6963b027baacee8e9b
2020-06-18 16:00:25 +00:00
TreeHugger Robot
b247a0da83
Merge "Increase notification channel limit" into rvc-dev am: 8d139f6a98 am: 336418d39e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11908614
Change-Id: If788388c487547c25de5d6b36151e3907e1f8935
2020-06-18 16:00:17 +00:00
Lyn Han
41ef23e5ea
Merge "Ellipsize user edu title/desc; max 2 line title" into rvc-dev am: af0ddb78fd am: c2989e34f2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11885867
Change-Id: Ie927b16a807d882d3fa04f047c588c97f99c3c06
2020-06-18 16:00:16 +00:00
Lyn Han
1ff1e7a0fe
Merge "Ellipsize user edu title/desc; max 2 line title" into rvc-dev am: af0ddb78fd am: c2989e34f2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11885867
Change-Id: I0313e636e5130523fc3ad0ce0f0d488c3c20d23e
2020-06-18 16:00:08 +00:00
TreeHugger Robot
a0b728a33e
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: dcd3e8984e -s ours am: 0d22d8e6e7 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11908612
Change-Id: Ie696979f36da248cadd3c53fda9715c98ca27f4f
2020-06-18 16:00:07 +00:00
TreeHugger Robot
b7bd5b1b76
Merge "Inject PipAnimationController into PipTaskOrg" into rvc-dev am: 29b158150d am: 93aad134db
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11887439
Change-Id: I93310954fb448bb04191cc243b3d0ab75aeef927
2020-06-18 15:59:59 +00:00
TreeHugger Robot
89233ecdf1
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: dcd3e8984e -s ours am: 0d22d8e6e7 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11908612
Change-Id: I8315acea89b237b431d59b58272c362ca5d23445
2020-06-18 15:59:56 +00:00
TreeHugger Robot
f462abddd5
Merge "Inject PipAnimationController into PipTaskOrg" into rvc-dev am: 29b158150d am: 93aad134db
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11887439
Change-Id: I37c68db5b2389c3167311a0d68523377323a3f08
2020-06-18 15:59:45 +00:00
Julia Reynolds
0a3568e4ac
Merge "Clean up temp AtomicFile files" into rvc-dev am: d97051473d am: 32774d472d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11884298
Change-Id: Ic3bf23fdb648dad2d188341f67fa1ddeb85fe11b
2020-06-18 15:59:38 +00:00
Julia Reynolds
34fe7cbafc
Merge "Clean up temp AtomicFile files" into rvc-dev am: d97051473d am: 32774d472d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11884298
Change-Id: Ie017140b82646dbdb2ec25451648c3c47ab94242
2020-06-18 15:59:30 +00:00
Lorenzo Colitti
10b6226702
Merge "Memory leak due to no stop for IpNeighborMonitor."
2020-06-18 15:57:01 +00:00
TreeHugger Robot
336418d39e
Merge "Increase notification channel limit" into rvc-dev am: 8d139f6a98
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11908614
Change-Id: Icc746d8581cea4c5724e6c8510aaba9fbd37a6b4
2020-06-18 15:49:29 +00:00
TreeHugger Robot
8c73900447
Merge "Increase notification channel limit" into rvc-dev am: 8d139f6a98
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11908614
Change-Id: Ic6146c69eea50a8d92cef8f3b9f8900c985ef09e
2020-06-18 15:48:52 +00:00
TreeHugger Robot
8d139f6a98
Merge "Increase notification channel limit" into rvc-dev
2020-06-18 15:47:01 +00:00
Lyn Han
c2989e34f2
Merge "Ellipsize user edu title/desc; max 2 line title" into rvc-dev am: af0ddb78fd
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11885867
Change-Id: Ie0b5b18a58bfe24c38e97ed52758abc4edd4d572
2020-06-18 15:45:36 +00:00
Lyn Han
0e6a737eb4
Merge "Ellipsize user edu title/desc; max 2 line title" into rvc-dev am: af0ddb78fd
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11885867
Change-Id: Iaa7adc0924e76cdd96235ba8dfccec42cbdc0447
2020-06-18 15:45:28 +00:00
TreeHugger Robot
0d22d8e6e7
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: dcd3e8984e -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11908612
Change-Id: I1eff5061de7eaf4dd4b0f21eedd99f6deae52169
2020-06-18 15:45:21 +00:00
TreeHugger Robot
93aad134db
Merge "Inject PipAnimationController into PipTaskOrg" into rvc-dev am: 29b158150d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11887439
Change-Id: I21456a84dc05dfa912958a78cc5d4c2bc531124d
2020-06-18 15:45:09 +00:00
TreeHugger Robot
b73ac9086b
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: dcd3e8984e -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11908612
Change-Id: Iff976324fe3dab666ef19867bd1eaaea55f806e5
2020-06-18 15:45:08 +00:00
TreeHugger Robot
2e5dd0c4c9
Merge "Inject PipAnimationController into PipTaskOrg" into rvc-dev am: 29b158150d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11887439
Change-Id: Ia574bdf832b1d8d3013ffe5c2da7cfbe4c2e4f31
2020-06-18 15:44:49 +00:00
Julia Reynolds
32774d472d
Merge "Clean up temp AtomicFile files" into rvc-dev am: d97051473d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11884298
Change-Id: I7cca38dcd04cd0403d696e54f17b741e97cdf63b
2020-06-18 15:44:36 +00:00
Julia Reynolds
5b8bf3839b
Merge "Clean up temp AtomicFile files" into rvc-dev am: d97051473d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11884298
Change-Id: I6069872025583279802be37087e3510ddba222fe
2020-06-18 15:44:30 +00:00
Lyn Han
af0ddb78fd
Merge "Ellipsize user edu title/desc; max 2 line title" into rvc-dev
2020-06-18 15:41:02 +00:00
TreeHugger Robot
dcd3e8984e
Merge "Import translations. DO NOT MERGE" into rvc-dev
2020-06-18 15:40:51 +00:00
Keun-young Park
842b6e94bf
Merge "Remove only selected messages for vold reset" into rvc-dev am: df13a6364b am: 95f2a9be7d am: b3fcdaa6fc
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11712800
Change-Id: Ida599754c95ae903dfec75bc02ae325242ff5ca4
2020-06-18 15:40:01 +00:00
TreeHugger Robot
c9aa519650
Merge "Controls UI - Fix challenge dialog default" into rvc-dev am: 35e288c6c6 am: be439fd52b am: b62dd81437
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11908611
Change-Id: I0f6b7ccb5753611116d76240a4a1d64b76dd1cf1
2020-06-18 15:39:50 +00:00
TreeHugger Robot
a5e6e2881e
Merge "Controls API - Update template docs" into rvc-dev am: e1ed6dcf57 am: a54af2ac7d am: e4bf4b36c8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11898402
Change-Id: I30c5687f63770bef11d63c8426e86483594f6d04
2020-06-18 15:39:38 +00:00
TreeHugger Robot
e5fea35c19
Merge "Ensure that velocity tracker is never null." into rvc-dev am: 05df6a589e am: c53ba4e800 am: b453641e9d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11796856
Change-Id: I3ad4c8671698f33f143226453555ade41c04294c
2020-06-18 15:39:17 +00:00
Jorge Gil
3f9651def0
Merge "Allow finish resize transaction to be overriden" into rvc-dev am: 62a69b9632 am: 4f949fa500 am: 93edb7d0bd
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11838962
Change-Id: Idea383680827d3f316ca0cd4f2d3b337bcf88586
2020-06-18 15:39:09 +00:00
