Commit Graph

71295 Commits

Author SHA1 Message Date
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
Yanting Yang
c75c3ce3b3 Merge "Update App info behavior for mainline module" into rvc-dev am: 8357871465 am: 14da7dd1fa
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11822585

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

Change-Id: I9e15289b31778b138f1668bcf556e650635c621e
2020-06-15 03:18:31 +00:00
TreeHugger Robot
c051e4830c [automerger skipped] Merge "NetworkRequestDialog: Exit the dialog on connect failure" into rvc-dev am: eac45c6a89 am: d452bfdfdc -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: I1a500b7b916db88e158d9eb1fc2256b10f7367f5
2020-06-15 03:18:27 +00:00
TreeHugger Robot
b35f7f2cc1 Merge "NetworkRequestDialog: Exit the dialog on connect failure" into rvc-dev am: eac45c6a89 am: 051df5910e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11852224

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

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

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

Change-Id: I8de7097200c087bac8cf74001000b96712f370d7
2020-06-15 03:11:50 +00:00
SongFerng Wang
518ffd7c76 Merge "Revert "Mainline: removed legacy UI for network selection mode."" into rvc-dev 2020-06-15 03:09:21 +00:00
Yanting Yang
af13156dea Merge "Update App info behavior for mainline module" into rvc-dev am: 8357871465
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11822585

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

Change-Id: Ia4f89a44ef37dc53ac32e25a2ee7757e652d3c1f
2020-06-15 03:07:05 +00:00
TreeHugger Robot
d452bfdfdc Merge "NetworkRequestDialog: Exit the dialog on connect failure" into rvc-dev am: eac45c6a89
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11852224

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

Change-Id: Ibe7a5bfe717c511c585eb651c3ba7cc0a412a3a9
2020-06-15 03:06:16 +00:00
Yanting Yang
8357871465 Merge "Update App info behavior for mainline module" into rvc-dev 2020-06-15 02:59:13 +00:00
TreeHugger Robot
eac45c6a89 Merge "NetworkRequestDialog: Exit the dialog on connect failure" into rvc-dev 2020-06-15 02:52:27 +00:00
tim peng
7dbf516ac2 Merge "Refine layout for output switcher panel" into rvc-dev am: 7874c0fdc4 am: bdd31f4508 am: 98021887ea am: 01daf4b508
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11596546

Change-Id: Iec19660743fc32a041d6243245d1ff52c34d0b0f
2020-06-15 02:11:47 +00:00
tim peng
9086138950 Merge "Refine layout for output switcher panel" into rvc-dev am: 7874c0fdc4 am: b1b26c8b70 am: ccaa2ea466 am: 9ada206a54
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11596546

Change-Id: I6236e81e24ac06b013678e2d1eb33234afebad16
2020-06-15 02:11:40 +00:00
tim peng
41005c130f Merge "Refine layout for output switcher panel" into rvc-dev am: 7874c0fdc4 am: bdd31f4508 am: 79b4ddeb4c am: 5196c32bd9
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11596546

Change-Id: Ie26049036817e28fde992969c8c7dfd243634185
2020-06-15 02:11:31 +00:00
tim peng
01daf4b508 Merge "Refine layout for output switcher panel" into rvc-dev am: 7874c0fdc4 am: bdd31f4508 am: 98021887ea
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11596546

Change-Id: I1fd353197bf91a01540601f2886ead1894ff7c85
2020-06-15 02:00:08 +00:00
tim peng
9ada206a54 Merge "Refine layout for output switcher panel" into rvc-dev am: 7874c0fdc4 am: b1b26c8b70 am: ccaa2ea466
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11596546

Change-Id: If4ef508e4779c907f23cbc5f4820d1a75e5d4d7b
2020-06-15 01:59:55 +00:00
tim peng
5196c32bd9 Merge "Refine layout for output switcher panel" into rvc-dev am: 7874c0fdc4 am: bdd31f4508 am: 79b4ddeb4c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11596546

Change-Id: I5cedda5ff33826f90185ccd8da339ad523db5995
2020-06-15 01:59:47 +00:00
tim peng
98021887ea Merge "Refine layout for output switcher panel" into rvc-dev am: 7874c0fdc4 am: bdd31f4508
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11596546

Change-Id: Iacf8daabeb314e0912ff5884c5cb555718767726
2020-06-15 01:42:59 +00:00
tim peng
ccaa2ea466 Merge "Refine layout for output switcher panel" into rvc-dev am: 7874c0fdc4 am: b1b26c8b70
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11596546

Change-Id: I8e7e4e0ee9cb0b79b8822acfe42b98a6102d2a73
2020-06-15 01:42:59 +00:00
tim peng
79b4ddeb4c Merge "Refine layout for output switcher panel" into rvc-dev am: 7874c0fdc4 am: bdd31f4508
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11596546

Change-Id: Iec1e3cc7e53a2a2062dd7fdfdb4fdd17a3bfbb68
2020-06-15 01:42:40 +00:00
tim peng
b1b26c8b70 Merge "Refine layout for output switcher panel" into rvc-dev am: 7874c0fdc4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11596546

Change-Id: I9dfcf15cd5654b4cdbfa286c9e75c6c18514ffa7
2020-06-15 01:29:10 +00:00