Commit Graph

72695 Commits

Author SHA1 Message Date
TreeHugger Robot
d810bee5f7 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 9ebeb21c36 -s ours am: 3be94f3a54 -s ours am: c7f5577653 -s ours am: 372a107c7a -s ours am: 9b534412a7 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11862718

Change-Id: If655a155915a38f81af3424c9f1a58815d5b2e55
2020-06-15 07:11:21 +00:00
TreeHugger Robot
15d99af8bb [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 9ebeb21c36 -s ours am: 3be94f3a54 -s ours am: 9c8a411aaf -s ours am: 539bf774ad -s ours am: 893949d6f7 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11862718

Change-Id: I31807d3ac11024d10ed650cc5968c0d922c09bf8
2020-06-15 07:10:46 +00:00
TreeHugger Robot
b2f62e1495 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 9ebeb21c36 -s ours am: 4ee27b4813 -s ours am: 32a8567521 -s ours am: ae898c5924 -s ours am: ea1f1c364e -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11862718

Change-Id: I782fda0d9cc4d20628123807e028008347a9cf60
2020-06-15 07:09:55 +00:00
TreeHugger Robot
9b534412a7 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 9ebeb21c36 -s ours am: 3be94f3a54 -s ours am: c7f5577653 -s ours am: 372a107c7a -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11862718

Change-Id: I80991660735bbc47e17f56cbe9ede12162b9c53d
2020-06-15 06:58:10 +00:00
TreeHugger Robot
893949d6f7 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 9ebeb21c36 -s ours am: 3be94f3a54 -s ours am: 9c8a411aaf -s ours am: 539bf774ad -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11862718

Change-Id: Iedfdb3afc7b86f7954dd1f928b65ae87f9d9ec94
2020-06-15 06:57:04 +00:00
TreeHugger Robot
ea1f1c364e [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 9ebeb21c36 -s ours am: 4ee27b4813 -s ours am: 32a8567521 -s ours am: ae898c5924 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11862718

Change-Id: I77cac1a73a635d305b69153b06137d35fd9f6b76
2020-06-15 06:55:57 +00:00
TreeHugger Robot
372a107c7a [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 9ebeb21c36 -s ours am: 3be94f3a54 -s ours am: c7f5577653 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11862718

Change-Id: I3c8a803f5c4f802e714797a31752f6c58be36cf8
2020-06-15 06:42:07 +00:00
TreeHugger Robot
539bf774ad [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 9ebeb21c36 -s ours am: 3be94f3a54 -s ours am: 9c8a411aaf -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11862718

Change-Id: I44407330d410b690ec29fefcad7b1d401946d9ad
2020-06-15 06:41:24 +00:00
TreeHugger Robot
ae898c5924 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 9ebeb21c36 -s ours am: 4ee27b4813 -s ours am: 32a8567521 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11862718

Change-Id: I6b2457e62a080a91822620ffcae9b9b38b138517
2020-06-15 06:40:57 +00:00
TreeHugger Robot
c7f5577653 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 9ebeb21c36 -s ours am: 3be94f3a54 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11862718

Change-Id: I17b8352e4aa0a8654da55e33cd0f812760d1ec7a
2020-06-15 06:18:28 +00:00
TreeHugger Robot
32a8567521 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 9ebeb21c36 -s ours am: 4ee27b4813 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11862718

Change-Id: I9f868011bcb3ff3bac9680be3f12b88e6115ccde
2020-06-15 06:18:22 +00:00
TreeHugger Robot
9c8a411aaf [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 9ebeb21c36 -s ours am: 3be94f3a54 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11862718

Change-Id: Ib339d96c3ca23fe77255166e99ca8ebb5a25ebae
2020-06-15 06:18:11 +00:00
TreeHugger Robot
4ee27b4813 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 9ebeb21c36 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11862718

Change-Id: Ied987a5fa2dd11c2e7a0188a9efcceb8a7f4d2a6
2020-06-15 06:07:33 +00:00
TreeHugger Robot
3be94f3a54 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 9ebeb21c36 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11862718

Change-Id: Icc77ebd01ad7d0eb7f1813a26b88b35b2cb017ee
2020-06-15 06:06:35 +00:00
TreeHugger Robot
9ebeb21c36 Merge "Import translations. DO NOT MERGE" into rvc-dev 2020-06-15 05:49:54 +00:00
SongFerng Wang
e6234add1e Merge "Revert "Mainline: removed legacy UI for network selection mode."" into rvc-dev am: 518ffd7c76 am: 58d36c2d48 am: fcd0677370 am: 859d08c7d9 am: e406cb7ffb
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11837795

Change-Id: I4d74b839e57450087b7f7616e99a2509a6d020f8
2020-06-15 04:09:04 +00:00
Automerger Merge Worker
d51a0ebc05 Merge "Merge "Update App info behavior for mainline module" into rvc-dev am: 8357871465 am: af13156dea" into rvc-d1-dev-plus-aosp am: 348ff2c535 am: ed1c8128b8 am: 30b251d7e4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11822585

Change-Id: I87eaa9e5c0eb83959b32d9e719c848dd93588840
2020-06-15 04:08:56 +00:00
SongFerng Wang
8464951808 Merge "Revert "Mainline: removed legacy UI for network selection mode."" into rvc-dev am: 518ffd7c76 am: d32cb38e45 am: 24d6bb3ed0 am: d554356135 am: 3fe393138f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11837795

Change-Id: I75eea9135b84f0ed00f49f99cbeaa5c00847093f
2020-06-15 04:08:45 +00:00
Automerger Merge Worker
fe6e30eb50 Merge "Merge "Merge "Update App info behavior for mainline module" into rvc-dev am: 8357871465 am: 14da7dd1fa" into rvc-d1-dev-plus-aosp am: f9cf45fa07" into rvc-qpr-dev-plus-aosp am: b9dfbcddd4 am: 3a6566f80f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11822585

Change-Id: Ic534156e2e1750bceb477a54bdb4df69647b91ed
2020-06-15 04:08:37 +00:00
SongFerng Wang
aea2356985 Merge "Revert "Mainline: removed legacy UI for network selection mode."" into rvc-dev am: 518ffd7c76 am: d32cb38e45 am: c2f0ab12d8 am: 86aa01ea4f am: 832a6e54af
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11837795

Change-Id: I8ad6504a3496bc1fc0c5b2303848f524e10c1169
2020-06-15 04:07:23 +00:00
Yanting Yang
0318567d86 Merge "Update App info behavior for mainline module" into rvc-dev am: 8357871465 am: 14da7dd1fa am: c75c3ce3b3 am: be4dbdbea4 am: 3fc7639cee
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11822585

Change-Id: I0a95fbb5b42048e4705da1a85a591ec2e8747843
2020-06-15 04:07:07 +00:00
Automerger Merge Worker
9921972a51 Merge "[automerger skipped] Merge "NetworkRequestDialog: Exit the dialog on connect failure" into rvc-dev am: eac45c6a89 am: d452bfdfdc -s ours am: c051e4830c -s ours" into rvc-qpr-dev-plus-aosp am: 09aa46b15d -s ours am: 051fcd443b -s ours
am skip reason: Change-Id I625ca76298ed549dbed76d398aea0c957c9102fc with SHA-1 924e9e39c1 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11852224

Change-Id: I143bc5d71a99e0f19086f6748e5846905be943d8
2020-06-15 04:06:58 +00:00
TreeHugger Robot
daa9d017fa [automerger skipped] Merge "NetworkRequestDialog: Exit the dialog on connect failure" into rvc-dev am: eac45c6a89 am: 051df5910e am: b35f7f2cc1 -s ours am: 8cfd34c9a0 -s ours am: 7ea97de70c -s ours
am skip reason: Change-Id I625ca76298ed549dbed76d398aea0c957c9102fc with SHA-1 924e9e39c1 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11852224

Change-Id: I9bbab506295ca3f22537bda133b35f985bab0b83
2020-06-15 04:06:51 +00:00
TreeHugger Robot
68a4d192d0 [automerger skipped] Merge "NetworkRequestDialog: Exit the dialog on connect failure" into rvc-dev am: eac45c6a89 am: 051df5910e am: 9cc918849c am: ba8ec34b45 -s ours am: c13014a050 -s ours
am skip reason: Change-Id I625ca76298ed549dbed76d398aea0c957c9102fc with SHA-1 81f9391105 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11852224

Change-Id: I57e29635824e274bc885b388eb2837e14ddee269
2020-06-15 04:06:45 +00:00
SongFerng Wang
e406cb7ffb Merge "Revert "Mainline: removed legacy UI for network selection mode."" into rvc-dev am: 518ffd7c76 am: 58d36c2d48 am: fcd0677370 am: 859d08c7d9
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11837795

Change-Id: I6c81b7744bc55e6f1e4ac0350c15f6036c7dac12
2020-06-15 03:45:31 +00:00
Automerger Merge Worker
30b251d7e4 Merge "Merge "Update App info behavior for mainline module" into rvc-dev am: 8357871465 am: af13156dea" into rvc-d1-dev-plus-aosp am: 348ff2c535 am: ed1c8128b8
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11822585

Change-Id: Id9ad1392f66b1efffddb0cb0bcd1152b42303d55
2020-06-15 03:45:08 +00:00
SongFerng Wang
3fe393138f Merge "Revert "Mainline: removed legacy UI for network selection mode."" into rvc-dev am: 518ffd7c76 am: d32cb38e45 am: 24d6bb3ed0 am: d554356135
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11837795

Change-Id: Iadae0648c7ed118de8fe398450a4dd60c879561f
2020-06-15 03:44:59 +00:00
Automerger Merge Worker
3a6566f80f Merge "Merge "Merge "Update App info behavior for mainline module" into rvc-dev am: 8357871465 am: 14da7dd1fa" into rvc-d1-dev-plus-aosp am: f9cf45fa07" into rvc-qpr-dev-plus-aosp am: b9dfbcddd4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11822585

Change-Id: I0cee878336f86c7d491869374b8c1015d4f27641
2020-06-15 03:44:35 +00:00
SongFerng Wang
832a6e54af Merge "Revert "Mainline: removed legacy UI for network selection mode."" into rvc-dev am: 518ffd7c76 am: d32cb38e45 am: c2f0ab12d8 am: 86aa01ea4f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11837795

Change-Id: Iefd7c8b53d1b57ecaafde5d9c4756d4f5338cfd4
2020-06-15 03:44:07 +00:00
Yanting Yang
3fc7639cee Merge "Update App info behavior for mainline module" into rvc-dev am: 8357871465 am: 14da7dd1fa am: c75c3ce3b3 am: be4dbdbea4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11822585

Change-Id: Id7f84e04a85a1c00c5fd172d451d140769008b8c
2020-06-15 03:43:43 +00:00
Automerger Merge Worker
051fcd443b Merge "[automerger skipped] Merge "NetworkRequestDialog: Exit the dialog on connect failure" into rvc-dev am: eac45c6a89 am: d452bfdfdc -s ours am: c051e4830c -s ours" into rvc-qpr-dev-plus-aosp am: 09aa46b15d -s ours
am skip reason: Change-Id I625ca76298ed549dbed76d398aea0c957c9102fc with SHA-1 924e9e39c1 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11852224

Change-Id: I35f95d6d419ec53dc487e5ad9453960cfbbabe85
2020-06-15 03:43:30 +00:00
TreeHugger Robot
7ea97de70c [automerger skipped] Merge "NetworkRequestDialog: Exit the dialog on connect failure" into rvc-dev am: eac45c6a89 am: 051df5910e am: b35f7f2cc1 -s ours am: 8cfd34c9a0 -s ours
am skip reason: Change-Id I625ca76298ed549dbed76d398aea0c957c9102fc with SHA-1 924e9e39c1 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11852224

Change-Id: Idf6bea10837f8b8df00d73554707458a74dfcbbb
2020-06-15 03:43:18 +00:00
TreeHugger Robot
c13014a050 [automerger skipped] Merge "NetworkRequestDialog: Exit the dialog on connect failure" into rvc-dev am: eac45c6a89 am: 051df5910e am: 9cc918849c am: ba8ec34b45 -s ours
am skip reason: Change-Id I625ca76298ed549dbed76d398aea0c957c9102fc with SHA-1 81f9391105 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11852224

Change-Id: I12cc026e84bc842112df7ba1a028dd811ae6ad84
2020-06-15 03:43:08 +00:00
SongFerng Wang
859d08c7d9 Merge "Revert "Mainline: removed legacy UI for network selection mode."" into rvc-dev am: 518ffd7c76 am: 58d36c2d48 am: fcd0677370
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11837795

Change-Id: I095cbb68d08941692161aa653c189c81eb9a957e
2020-06-15 03:32:42 +00:00
Automerger Merge Worker
ed1c8128b8 Merge "Merge "Update App info behavior for mainline module" into rvc-dev am: 8357871465 am: af13156dea" into rvc-d1-dev-plus-aosp am: 348ff2c535
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11822585

Change-Id: I21a0e8816a91715ff5f45272d03f48d2c35aa243
2020-06-15 03:32:25 +00:00
SongFerng Wang
d554356135 Merge "Revert "Mainline: removed legacy UI for network selection mode."" into rvc-dev am: 518ffd7c76 am: d32cb38e45 am: 24d6bb3ed0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11837795

Change-Id: I5778a175058243d78ef793c2476ed7ea5fc4efa9
2020-06-15 03:32:05 +00:00
Automerger Merge Worker
b9dfbcddd4 Merge "Merge "Merge "Update App info behavior for mainline module" into rvc-dev am: 8357871465 am: 14da7dd1fa" into rvc-d1-dev-plus-aosp am: f9cf45fa07" into rvc-qpr-dev-plus-aosp 2020-06-15 03:31:25 +00:00
Automerger Merge Worker
4b6242777a Merge "Merge "Update App info behavior for mainline module" into rvc-dev am: 8357871465 am: 14da7dd1fa" into rvc-d1-dev-plus-aosp am: f9cf45fa07
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11822585

Change-Id: I77d24b536813650f11738e4c78c8fcd759b93f2a
2020-06-15 03:31:19 +00:00
SongFerng Wang
86aa01ea4f Merge "Revert "Mainline: removed legacy UI for network selection mode."" into rvc-dev am: 518ffd7c76 am: d32cb38e45 am: c2f0ab12d8
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11837795

Change-Id: Ibd93f92445af453f6e01aafcb9a7d5531b0cdf5d
2020-06-15 03:31:15 +00:00
Yanting Yang
be4dbdbea4 Merge "Update App info behavior for mainline module" into rvc-dev am: 8357871465 am: 14da7dd1fa am: c75c3ce3b3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11822585

Change-Id: Id210b618f8febff7f3be3dc85681adfde580087a
2020-06-15 03:30:59 +00:00
Automerger Merge Worker
09aa46b15d Merge "[automerger skipped] Merge "NetworkRequestDialog: Exit the dialog on connect failure" into rvc-dev am: eac45c6a89 am: d452bfdfdc -s ours am: c051e4830c -s ours" into rvc-qpr-dev-plus-aosp 2020-06-15 03:30:56 +00:00
TreeHugger Robot
8e65985448 [automerger skipped] Merge "NetworkRequestDialog: Exit the dialog on connect failure" into rvc-dev am: eac45c6a89 am: d452bfdfdc -s ours am: c051e4830c -s ours
am skip reason: Change-Id I625ca76298ed549dbed76d398aea0c957c9102fc with SHA-1 924e9e39c1 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11852224

Change-Id: I393d5a20a8f927b0c333d68dfa780948e48a98a6
2020-06-15 03:30:52 +00:00
TreeHugger Robot
8cfd34c9a0 [automerger skipped] Merge "NetworkRequestDialog: Exit the dialog on connect failure" into rvc-dev am: eac45c6a89 am: 051df5910e am: b35f7f2cc1 -s ours
am skip reason: Change-Id I625ca76298ed549dbed76d398aea0c957c9102fc with SHA-1 924e9e39c1 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11852224

Change-Id: I85e26bdb213648bc5b99399dd3bf969b2606535e
2020-06-15 03:30:47 +00:00
TreeHugger Robot
ba8ec34b45 Merge "NetworkRequestDialog: Exit the dialog on connect failure" into rvc-dev am: eac45c6a89 am: 051df5910e am: 9cc918849c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11852224

Change-Id: I89a0e0d59f04761210aaaa9f13c3bc468dde684b
2020-06-15 03:30:35 +00:00
SongFerng Wang
fcd0677370 Merge "Revert "Mainline: removed legacy UI for network selection mode."" into rvc-dev am: 518ffd7c76 am: 58d36c2d48
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11837795

Change-Id: Ic51904ec93d5ed3417bb81b3d67c8f7b1ddb1dab
2020-06-15 03:18:55 +00:00
Automerger Merge Worker
348ff2c535 Merge "Merge "Update App info behavior for mainline module" into rvc-dev am: 8357871465 am: af13156dea" into rvc-d1-dev-plus-aosp 2020-06-15 03:18:50 +00:00
SongFerng Wang
24d6bb3ed0 Merge "Revert "Mainline: removed legacy UI for network selection mode."" into rvc-dev am: 518ffd7c76 am: d32cb38e45
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11837795

Change-Id: Ie3b090330bc2114a67e9229060ba5c6e23b74347
2020-06-15 03:18:41 +00:00
SongFerng Wang
c2f0ab12d8 Merge "Revert "Mainline: removed legacy UI for network selection mode."" into rvc-dev am: 518ffd7c76 am: d32cb38e45
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11837795

Change-Id: I1a9be5b499758f9269e7e70e2b96b08e8b06849b
2020-06-15 03:18:40 +00:00
Automerger Merge Worker
f9cf45fa07 Merge "Merge "Update App info behavior for mainline module" into rvc-dev am: 8357871465 am: 14da7dd1fa" into rvc-d1-dev-plus-aosp 2020-06-15 03:18:38 +00:00
Yanting Yang
7cd514eb49 Merge "Update App info behavior for mainline module" into rvc-dev am: 8357871465 am: af13156dea
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11822585

Change-Id: I29b79a9e4ca14dd1d77b4c039afffc44d4ff40e4
2020-06-15 03:18:35 +00:00