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
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
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
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
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
28866cde30
Merge "Merge "Improve BT slice card loading performance" into rvc-dev am: 85f03668a5 am: 42a725039a am: ee90fb4c29" into rvc-qpr-dev-plus-aosp am: 1d1430c936
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11833854
Change-Id: Ia1a8e0ac7aaa837beed3854a76f109ad929f0d6e
2020-06-14 18:09:03 +00:00
Jason Chiu
7e4702e04e
Merge "Improve BT slice card loading performance" into rvc-dev am: 85f03668a5 am: 47df625ffe am: e54c5f60e7 am: 0165eacbab
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11833854
Change-Id: I3ea6cc28f8aaab63e57320c8537658e3ce18b75c
2020-06-14 18:08:53 +00:00
Jason Chiu
2397eb37d9
Merge "Improve BT slice card loading performance" into rvc-dev am: 85f03668a5 am: 42a725039a am: 8bcaa4bc47 am: a266d188e8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11833854
Change-Id: I3ba56f44977161c17602a9a995fff581e2838d4e
2020-06-14 18:08:42 +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
TreeHugger Robot
cd7e0e7c31
Merge "[Wi-Fi] Fix exception when clicking About phone -> Wi-Fi MAC address"
2020-06-14 14:17:38 +00:00
TreeHugger Robot
030baada8b
Merge "NetworkRequestDialog: Exit the dialog on connect failure"
2020-06-14 14:05:56 +00:00
Arc Wang
3370cc5991
[Wi-Fi] Fix exception when clicking About phone -> Wi-Fi MAC address
...
From android R, SavedAccessPointsWifiSettings2 is added for WifiTrackerLib,
SavedAccessPointsWifiSettings is deprecated.
From android S, SavedAccessPointsWifiSettings is removed, About phone ->
Wi-Fi MAC address should open SavedAccessPointsWifiSettings2 instead of
SavedAccessPointsWifiSettings.
Bug: 158172263
Test: manual
Click About phone -> Wi-Fi MAC address and see SavedAccessPointsWifiSettings2 .
Change-Id: Ic51f0c4f955e7c7c4a26ddea57923b7c17e6d534
2020-06-14 20:48:21 +08:00
Automerger Merge Worker
92cd5c3214
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 am: 536f14837d -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: Ia5089964f272333573c3bbe2d922371e9528797b
2020-06-13 01:17:42 +00:00
TreeHugger Robot
801f26629f
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 4b25f3f159 -s ours am: 039a7b619e -s ours am: 8afac4a232 -s ours am: 9beea769f7 -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: I9672e72ee35efce370604559a5e683a6f7276b02
2020-06-13 01:17:33 +00:00
Automerger Merge Worker
ea87124ddc
Merge "Merge "Explicitly request focus after button pressed" into rvc-dev am: d9a246c49e am: 2f75ebed19 am: 3e96041f7b" into rvc-qpr-dev-plus-aosp am: 319f0b4d5b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11851989
Change-Id: Idad9f2741939a3aa22753417c53092eaa0eed08f
2020-06-13 01:17:27 +00:00