Automerger Merge Worker
06660830d0
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: af16425e89 -s ours am: 400e736767 -s ours am: c7e42eafb3 -s ours" into rvc-qpr-dev-plus-aosp am: d66bed9b9a -s ours am: 31b1f0211d -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12006109
Change-Id: I2ef600fd8bb988ae4f032f484bd16b8c4c109512
2020-06-26 06:35:27 +00:00
TreeHugger Robot
0b72949eb7
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: af16425e89 -s ours am: 400e736767 -s ours am: 22a0a6d621 -s ours am: 1b3549467f -s ours am: 3c0f9b2f23 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12006109
Change-Id: I3bfd49f7b9be63f8fe376ee419b1f0701749393e
2020-06-26 06:35:19 +00:00
Automerger Merge Worker
31b1f0211d
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: af16425e89 -s ours am: 400e736767 -s ours am: c7e42eafb3 -s ours" into rvc-qpr-dev-plus-aosp am: d66bed9b9a -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12006109
Change-Id: I672e1f34682c1df4a044a31e22c5e0647d747b20
2020-06-26 06:23:52 +00:00
TreeHugger Robot
3c0f9b2f23
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: af16425e89 -s ours am: 400e736767 -s ours am: 22a0a6d621 -s ours am: 1b3549467f -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12006109
Change-Id: I43a4702161d70bf3e10b7db4a0110c2315c57631
2020-06-26 06:23:39 +00:00
Automerger Merge Worker
d66bed9b9a
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: af16425e89 -s ours am: 400e736767 -s ours am: c7e42eafb3 -s ours" into rvc-qpr-dev-plus-aosp
2020-06-26 06:11:02 +00:00
TreeHugger Robot
0fec6e38a6
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: af16425e89 -s ours am: 400e736767 -s ours am: c7e42eafb3 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12006109
Change-Id: Ic308030ed0f9ffb34efbd7ca2587b921d7783bf6
2020-06-26 06:10:57 +00:00
TreeHugger Robot
1b3549467f
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: af16425e89 -s ours am: 400e736767 -s ours am: 22a0a6d621 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12006109
Change-Id: I45f2e70889828b0e40a5ba3e864073a8571b53c0
2020-06-26 06:10:49 +00:00
TreeHugger Robot
22a0a6d621
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: af16425e89 -s ours am: 400e736767 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12006109
Change-Id: I02e44d6ebaa71519aad091bd09215ff8883b1ee0
2020-06-26 05:58:42 +00:00
TreeHugger Robot
c7e42eafb3
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: af16425e89 -s ours am: 400e736767 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12006109
Change-Id: Ica03c10db7ae26e55c26480a82fb4141fa508582
2020-06-26 05:58:39 +00:00
TreeHugger Robot
400e736767
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: af16425e89 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12006109
Change-Id: I80d2186e05a139ddb8106c3539fbb44735b65159
2020-06-26 05:45:53 +00:00
TreeHugger Robot
af16425e89
Merge "Import translations. DO NOT MERGE" into rvc-dev
2020-06-26 05:30:20 +00:00
TreeHugger Robot
c788e04e2e
Merge "Add bottom padding in SliceView for output switcher panel" into rvc-dev am: 7a97493f94 am: c7683448f1 am: 33e7c35d2f am: ba3f023e68 am: 3b2ad550a6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11970206
Change-Id: I13d3621bfdb952e84b5acd8c454d1d0bf932aeab
2020-06-26 04:54:19 +00:00
TreeHugger Robot
e0636b193a
Merge "Add bottom padding in SliceView for output switcher panel" into rvc-dev am: 7a97493f94 am: 7d20757118 am: 97e21021f2 am: 433687f790 am: 7539ce815e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11970206
Change-Id: I8a1c3e29482e5d07cc4fb293970738e788a5a281
2020-06-26 04:54:01 +00:00
TreeHugger Robot
f98450da48
Merge "Add bottom padding in SliceView for output switcher panel" into rvc-dev am: 7a97493f94 am: 7d20757118 am: 90d1b94c90 am: 983db0546e am: 14b8a94a4b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11970206
Change-Id: I2509930467cdd55497078997507bd8d3803b49da
2020-06-26 04:53:49 +00:00
TreeHugger Robot
3b2ad550a6
Merge "Add bottom padding in SliceView for output switcher panel" into rvc-dev am: 7a97493f94 am: c7683448f1 am: 33e7c35d2f am: ba3f023e68
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11970206
Change-Id: I126bd83e332b70778c72459cca5176f125169f4c
2020-06-26 04:44:33 +00:00
TreeHugger Robot
7539ce815e
Merge "Add bottom padding in SliceView for output switcher panel" into rvc-dev am: 7a97493f94 am: 7d20757118 am: 97e21021f2 am: 433687f790
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11970206
Change-Id: I1ce53bb379bec09ec7c143d2a4528d4d037855cd
2020-06-26 04:44:17 +00:00
TreeHugger Robot
14b8a94a4b
Merge "Add bottom padding in SliceView for output switcher panel" into rvc-dev am: 7a97493f94 am: 7d20757118 am: 90d1b94c90 am: 983db0546e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11970206
Change-Id: I54c71ed9814d809ddf366460f935bc9d6cad0f81
2020-06-26 04:43:43 +00:00
TreeHugger Robot
ba3f023e68
Merge "Add bottom padding in SliceView for output switcher panel" into rvc-dev am: 7a97493f94 am: c7683448f1 am: 33e7c35d2f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11970206
Change-Id: I73815b8d8020fcf4df566b1aeb50035212e12427
2020-06-26 04:27:45 +00:00
TreeHugger Robot
433687f790
Merge "Add bottom padding in SliceView for output switcher panel" into rvc-dev am: 7a97493f94 am: 7d20757118 am: 97e21021f2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11970206
Change-Id: I65bba17f5db76f7397b002c7fe375ea8a3fde8ea
2020-06-26 04:27:20 +00:00
TreeHugger Robot
983db0546e
Merge "Add bottom padding in SliceView for output switcher panel" into rvc-dev am: 7a97493f94 am: 7d20757118 am: 90d1b94c90
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11970206
Change-Id: I20b7aefc9903871bfa29b7319fbe86fb8d580afe
2020-06-26 04:26:51 +00:00
TreeHugger Robot
33e7c35d2f
Merge "Add bottom padding in SliceView for output switcher panel" into rvc-dev am: 7a97493f94 am: c7683448f1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11970206
Change-Id: I120ea4e5a3815d4ef665a3d2686f6a61912bad60
2020-06-26 04:05:25 +00:00
TreeHugger Robot
90d1b94c90
Merge "Add bottom padding in SliceView for output switcher panel" into rvc-dev am: 7a97493f94 am: 7d20757118
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11970206
Change-Id: If0538a0f9b7fb4f1f561764de0293b3cb840f910
2020-06-26 04:04:29 +00:00
TreeHugger Robot
97e21021f2
Merge "Add bottom padding in SliceView for output switcher panel" into rvc-dev am: 7a97493f94 am: 7d20757118
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11970206
Change-Id: I9bf03b702ca44ca162fe758ea5ff166b7663930b
2020-06-26 04:04:16 +00:00
TreeHugger Robot
c7683448f1
Merge "Add bottom padding in SliceView for output switcher panel" into rvc-dev am: 7a97493f94
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11970206
Change-Id: I8da054d703c2e392c365a84763eb50c8179c3f82
2020-06-26 03:44:38 +00:00
TreeHugger Robot
7d20757118
Merge "Add bottom padding in SliceView for output switcher panel" into rvc-dev am: 7a97493f94
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11970206
Change-Id: I733e3271f14ccadea76736043af88c8be4e62298
2020-06-26 03:44:32 +00:00
TreeHugger Robot
7a97493f94
Merge "Add bottom padding in SliceView for output switcher panel" into rvc-dev
2020-06-26 03:25:46 +00:00
Bill Yi
fe9fb7b786
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Change-Id: I89c6ac21f9325fc08f84280ea09cac02641c9e33
2020-06-26 02:08:29 +00:00
TreeHugger Robot
dc62003440
Merge "Revert "Workaround of Slice not pinned bug when using SliceCallback"" into rvc-dev am: 77dcc34b26 am: 0d26f24dbf am: 88b88439a5 am: 2077575fc3 am: 093e22791b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11970208
Change-Id: I5e390b04dd9014ca7f3c6628c838537caf4edf28
2020-06-25 18:51:45 +00:00
Automerger Merge Worker
8f373c2bd3
Merge "Merge "Revert "Workaround of Slice not pinned bug when using SliceCallback"" into rvc-dev am: 77dcc34b26 am: 6983516124" into rvc-d1-dev-plus-aosp am: 3ae447fac8 am: bfed274495 am: 2793bd2e59
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11970208
Change-Id: Ibd5dafc9b18811bc8cbc8a07b844ec22faa7ef12
2020-06-25 18:50:48 +00:00
TreeHugger Robot
068e0af968
Merge "Revert "Workaround of Slice not pinned bug when using SliceCallback"" into rvc-dev am: 77dcc34b26 am: 0d26f24dbf am: 134254ee2b am: 61a2186e89 am: f0725a990c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11970208
Change-Id: I6ae9c1e10588462a18a96850a87e78096e6dcf67
2020-06-25 18:50:31 +00:00
TreeHugger Robot
093e22791b
Merge "Revert "Workaround of Slice not pinned bug when using SliceCallback"" into rvc-dev am: 77dcc34b26 am: 0d26f24dbf am: 88b88439a5 am: 2077575fc3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11970208
Change-Id: Id5848bb6fefe1a98916736d4255168dbb37a12cc
2020-06-25 18:40:04 +00:00
Automerger Merge Worker
2793bd2e59
Merge "Merge "Revert "Workaround of Slice not pinned bug when using SliceCallback"" into rvc-dev am: 77dcc34b26 am: 6983516124" into rvc-d1-dev-plus-aosp am: 3ae447fac8 am: bfed274495
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11970208
Change-Id: Ibf1f203ab844d87ebeb11c6bcbf13fc7694a7bab
2020-06-25 18:39:53 +00:00
TreeHugger Robot
f0725a990c
Merge "Revert "Workaround of Slice not pinned bug when using SliceCallback"" into rvc-dev am: 77dcc34b26 am: 0d26f24dbf am: 134254ee2b am: 61a2186e89
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11970208
Change-Id: Idc15ce9b22be74eb716b272b538474c2264287d7
2020-06-25 18:37:35 +00:00
TreeHugger Robot
2077575fc3
Merge "Revert "Workaround of Slice not pinned bug when using SliceCallback"" into rvc-dev am: 77dcc34b26 am: 0d26f24dbf am: 88b88439a5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11970208
Change-Id: I332416dc1746113e637e687ef0e0b3149573dac3
2020-06-25 18:26:05 +00:00
Automerger Merge Worker
bfed274495
Merge "Merge "Revert "Workaround of Slice not pinned bug when using SliceCallback"" into rvc-dev am: 77dcc34b26 am: 6983516124" into rvc-d1-dev-plus-aosp am: 3ae447fac8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11970208
Change-Id: I486fbac541d9f515f131fff5af7fb65e66416e60
2020-06-25 18:25:44 +00:00
TreeHugger Robot
61a2186e89
Merge "Revert "Workaround of Slice not pinned bug when using SliceCallback"" into rvc-dev am: 77dcc34b26 am: 0d26f24dbf am: 134254ee2b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11970208
Change-Id: I103593c76f3968ca9e5d77ee02cfdbb67819aa4a
2020-06-25 18:25:23 +00:00
Automerger Merge Worker
3ae447fac8
Merge "Merge "Revert "Workaround of Slice not pinned bug when using SliceCallback"" into rvc-dev am: 77dcc34b26 am: 6983516124" into rvc-d1-dev-plus-aosp
2020-06-25 18:14:22 +00:00
TreeHugger Robot
cb6694fceb
Merge "Revert "Workaround of Slice not pinned bug when using SliceCallback"" into rvc-dev am: 77dcc34b26 am: 6983516124
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11970208
Change-Id: I9e03c8066fb014c5d23e5f62245e58e8a09dcb09
2020-06-25 18:14:17 +00:00
TreeHugger Robot
134254ee2b
Merge "Revert "Workaround of Slice not pinned bug when using SliceCallback"" into rvc-dev am: 77dcc34b26 am: 0d26f24dbf
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11970208
Change-Id: I443d14c0bc5a2003719de13c230ba957795d263d
2020-06-25 18:14:14 +00:00
TreeHugger Robot
88b88439a5
Merge "Revert "Workaround of Slice not pinned bug when using SliceCallback"" into rvc-dev am: 77dcc34b26 am: 0d26f24dbf
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11970208
Change-Id: If0a64a5a2e31e18b735434d2ae7ae35dcfb75f79
2020-06-25 18:13:36 +00:00
TreeHugger Robot
0d26f24dbf
Merge "Revert "Workaround of Slice not pinned bug when using SliceCallback"" into rvc-dev am: 77dcc34b26
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11970208
Change-Id: Ibf305c1ffb9e687d0b5c02e2ffab90b7d9212743
2020-06-25 18:00:48 +00:00
TreeHugger Robot
6983516124
Merge "Revert "Workaround of Slice not pinned bug when using SliceCallback"" into rvc-dev am: 77dcc34b26
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11970208
Change-Id: I058262a8dc2df77c41f1a4621a16b12b3ac3b3d9
2020-06-25 18:00:36 +00:00
TreeHugger Robot
77dcc34b26
Merge "Revert "Workaround of Slice not pinned bug when using SliceCallback"" into rvc-dev
2020-06-25 17:19:44 +00:00
govenliu
67bb31fb8e
[Wi-Fi] Fix AddAppNetworksFragmentTest one unit test failed case am: d9644462fa
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11997024
Change-Id: I8ad42ac8e1dad3104fca5fd03a2707b50ff50337
2020-06-25 15:41:22 +00:00
govenliu
d9644462fa
[Wi-Fi] Fix AddAppNetworksFragmentTest one unit test failed case
...
onDestroy_quitWorkerThread in AddAppNetworksFragmentTest failed due to java.lang.IllegalStateException: no event down from INITIALIZED
Solution: Initialize fragment before calling the onDestroy API.
Bug: 151696220
Test: make RunSettingsRoboTests ROBOTEST_FILTER=AddAppNetworksFragmentTest
Change-Id: I80d28c6e7490a36a7ff26313d30d33b2f7d727c1
2020-06-25 19:37:12 +08:00
TreeHugger Robot
edb361e324
Merge "Increase char limit for translations" into rvc-dev am: 1b57d227bd am: 1230f90999 am: 1a499b0fe6 am: 239e85e5ba am: 602b8573f3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11987888
Change-Id: Ia4a1d3626394461efd4272af831d4e2b216aee7c
2020-06-24 19:01:50 +00:00
TreeHugger Robot
e5dc0c8ab7
Merge "Increase char limit for translations" into rvc-dev am: 1b57d227bd am: 1230f90999 am: 5b199b3e1b am: 2b836447a0 am: 1b9774f8b9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11987888
Change-Id: Ib4d38a04a9c6d09ccfd2baa19a279e2124bff261
2020-06-24 19:01:44 +00:00
TreeHugger Robot
f3aeb54c8b
Merge "Increase char limit for translations" into rvc-dev am: 1b57d227bd am: 1172dcd5be am: a7973d6b40 am: 24bae851a4 am: ce7b8288e7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11987888
Change-Id: I9c3b592958aedbdbf0de1b0611bfb280fd71c428
2020-06-24 19:01:31 +00:00
TreeHugger Robot
602b8573f3
Merge "Increase char limit for translations" into rvc-dev am: 1b57d227bd am: 1230f90999 am: 1a499b0fe6 am: 239e85e5ba
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11987888
Change-Id: Ieed559b6cc440d00c170d914452aa9c5ed7c5485
2020-06-24 18:46:32 +00:00
TreeHugger Robot
1b9774f8b9
Merge "Increase char limit for translations" into rvc-dev am: 1b57d227bd am: 1230f90999 am: 5b199b3e1b am: 2b836447a0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11987888
Change-Id: Idad23ec72e13904b0fb2cbe4ab871a97b39aa1bc
2020-06-24 18:46:24 +00:00