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
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
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
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
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
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
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
tim peng
bdd31f4508
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: I107a836766ab9aef4f2e8cc5fc953c35f414f5f0
2020-06-15 01:28:58 +00:00
tim peng
7874c0fdc4
Merge "Refine layout for output switcher panel" into rvc-dev
2020-06-15 01:14:57 +00:00
Automerger Merge Worker
1d1430c936
Merge "Merge "Improve BT slice card loading performance" into rvc-dev am: 85f03668a5
am: 42a725039a
am: ee90fb4c29" into rvc-qpr-dev-plus-aosp
2020-06-14 17:54:09 +00:00
Jason Chiu
514e3fbc7e
Merge "Improve BT slice card loading performance" into rvc-dev am: 85f03668a5
am: 42a725039a
am: ee90fb4c29
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11833854
Change-Id: If032c2e2a52a97e2ac451fbd22b91557c877b4b7
2020-06-14 17:54:00 +00:00
Jason Chiu
0165eacbab
Merge "Improve BT slice card loading performance" into rvc-dev am: 85f03668a5
am: 47df625ffe
am: e54c5f60e7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11833854
Change-Id: I7fd6b76eb8703aee0d22eeb003014166e3794b6e
2020-06-14 17:53:55 +00:00
Jason Chiu
a266d188e8
Merge "Improve BT slice card loading performance" into rvc-dev am: 85f03668a5
am: 42a725039a
am: 8bcaa4bc47
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11833854
Change-Id: I2c5d511a91b9c619f1841b1ffd63fc1692e762f2
2020-06-14 17:53:47 +00:00
Jason Chiu
e54c5f60e7
Merge "Improve BT slice card loading performance" into rvc-dev am: 85f03668a5
am: 47df625ffe
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11833854
Change-Id: I90a858bba72e29f301eee64a541b7c6e498c5f5f
2020-06-14 17:42:26 +00:00
Jason Chiu
ee90fb4c29
Merge "Improve BT slice card loading performance" into rvc-dev am: 85f03668a5
am: 42a725039a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11833854
Change-Id: I008fe40409d0d8d9b05b02184c739a9d5bbafa6c
2020-06-14 17:42:25 +00:00
Jason Chiu
8bcaa4bc47
Merge "Improve BT slice card loading performance" into rvc-dev am: 85f03668a5
am: 42a725039a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11833854
Change-Id: If95d439f1767415ac1c23d5c62eb6731529c6f34
2020-06-14 17:42:03 +00:00
Jason Chiu
47df625ffe
Merge "Improve BT slice card loading performance" into rvc-dev am: 85f03668a5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11833854
Change-Id: Id2cfccbafd268452178ea68845286daa480924b2
2020-06-14 17:30:12 +00:00
Jason Chiu
42a725039a
Merge "Improve BT slice card loading performance" into rvc-dev am: 85f03668a5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11833854
Change-Id: Ifbefcfcc4e5a1481ea432262a82c1aef3ed0de4b
2020-06-14 17:29:58 +00:00
Jason Chiu
85f03668a5
Merge "Improve BT slice card loading performance" into rvc-dev
2020-06-14 17:14:11 +00:00
Roshan Pius
924e9e39c1
NetworkRequestDialog: Exit the dialog on connect failure
...
Connection failure (similar to connection success) is the end of the
processng of a request. We should dismiss the dialog on connection
failure.
Bug: 158844146
Bug: 158616070
Test: Manual tests - Simulate connection failure and ensure that the
dialog vanishes with a toast.
Change-Id: I625ca76298ed549dbed76d398aea0c957c9102fc
Merged-In: I625ca76298ed549dbed76d398aea0c957c9102fc
2020-06-14 15:19:30 +00:00
Automerger Merge Worker
536f14837d
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 4b25f3f159
-s ours am: 7f8fa44f44
-s ours am: f518191f3c
-s ours" into rvc-qpr-dev-plus-aosp
2020-06-13 01:00:55 +00:00
TreeHugger Robot
7ff7fc6ed5
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 4b25f3f159
-s ours am: 7f8fa44f44
-s ours am: f518191f3c
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11854964
Change-Id: I05f4695d6bc9bf51babc54a1d2b2b899b7c6e42b
2020-06-13 01:00:51 +00:00
TreeHugger Robot
9beea769f7
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 4b25f3f159
-s ours am: 039a7b619e
-s ours am: 8afac4a232
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11854964
Change-Id: I6f4c7637216aafdb4b8b294ed12b45029b08a23f
2020-06-13 01:00:49 +00:00
Automerger Merge Worker
319f0b4d5b
Merge "Merge "Explicitly request focus after button pressed" into rvc-dev am: d9a246c49e
am: 2f75ebed19
am: 3e96041f7b" into rvc-qpr-dev-plus-aosp
2020-06-13 01:00:47 +00:00
Automerger Merge Worker
d0d151c334
Merge "Merge "Explicitly request focus after button pressed" into rvc-dev am: d9a246c49e
am: 5775784492" into rvc-d1-dev-plus-aosp am: edc887c7f3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11851989
Change-Id: Iac7f99f85b4bea509a3d015be984eb7f2464bffe
2020-06-13 01:00:43 +00:00
TreeHugger Robot
6836db5bc9
Merge "Explicitly request focus after button pressed" into rvc-dev am: d9a246c49e
am: 2f75ebed19
am: 3e96041f7b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11851989
Change-Id: I3164791e6a8cd56faf22f9a378260aff8ace7405
2020-06-13 01:00:41 +00:00
TreeHugger Robot
a57dabb9ba
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 4b25f3f159
-s ours am: 7f8fa44f44
-s ours am: 75b68e1055
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11854964
Change-Id: Ie4976df869347d98d3f1e5e171eafe0485639956
2020-06-13 01:00:31 +00:00
TreeHugger Robot
46e6fc9fbb
Merge "Explicitly request focus after button pressed" into rvc-dev am: d9a246c49e
am: 2f75ebed19
am: b4e5ddbe05
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11851989
Change-Id: I7a688f0d25f11fffb148a15341e33f1c3c8e0727
2020-06-13 01:00:19 +00:00
TreeHugger Robot
8afac4a232
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 4b25f3f159
-s ours am: 039a7b619e
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11854964
Change-Id: Id7f9103d9f353e87e5e44d1012f4feda5139a90a
2020-06-13 00:49:43 +00:00
Automerger Merge Worker
edc887c7f3
Merge "Merge "Explicitly request focus after button pressed" into rvc-dev am: d9a246c49e
am: 5775784492" into rvc-d1-dev-plus-aosp
2020-06-13 00:49:23 +00:00
TreeHugger Robot
f518191f3c
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 4b25f3f159
-s ours am: 7f8fa44f44
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11854964
Change-Id: Idc538b075e037b20c3155a9123fd7e226afec344
2020-06-13 00:49:21 +00:00
TreeHugger Robot
75b68e1055
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 4b25f3f159
-s ours am: 7f8fa44f44
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11854964
Change-Id: I6825449dbde20639c440bb73f6f9391ca54b5e94
2020-06-13 00:49:19 +00:00