Commit Graph

72833 Commits

Author SHA1 Message Date
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
Bill Yi
451ae5441e Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Change-Id: I9d2dd999c963161e7283fc6a6bd7d76c7d44bafa
2020-06-15 00:45:36 +00:00
Automerger Merge Worker
a2f63d8965 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 am: 28866cde30
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11833854

Change-Id: Ic3bb63f1f9477a8db5c2eb569895feb206f0c6c4
2020-06-14 18:20:37 +00:00
Jason Chiu
793ec78b95 Merge "Improve BT slice card loading performance" into rvc-dev am: 85f03668a5 am: 47df625ffe am: e54c5f60e7 am: 0165eacbab am: 7e4702e04e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11833854

Change-Id: Id918a9a5b8e063ec54e9c90d59c4db77f89837b4
2020-06-14 18:20:30 +00:00
Jason Chiu
c2038d2375 Merge "Improve BT slice card loading performance" into rvc-dev am: 85f03668a5 am: 42a725039a am: 8bcaa4bc47 am: a266d188e8 am: 2397eb37d9
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11833854

Change-Id: I3dd081e27ee21cea8fd8d4495827d2ae19abde7b
2020-06-14 18:20:22 +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
edbaef567b Merge "[Wi-Fi] Fix exception when clicking About phone -> Wi-Fi MAC address" am: cd7e0e7c31
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11862078

Change-Id: I2fa2b5ef39c369fc1e4867c6951d1873dd6dcd13
2020-06-14 14:18:23 +00:00
TreeHugger Robot
142a5a922b Merge "NetworkRequestDialog: Exit the dialog on connect failure" am: 030baada8b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11852770

Change-Id: I7f1a98665356604a515a4aaee7e11a7db5f91a7e
2020-06-14 14:18:15 +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
Myles Watson
0d31c37df9 Bluetooth: Add pairing initiator extra
Bug: 150156492
Test: pair two devices, unpair on one device, try to reconnect
Change-Id: I96379d0afe5b624f09e2825dedaef8f9883a924c
2020-06-13 07:04:14 -07:00
Automerger Merge Worker
3ebdb41c97 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: 92cd5c3214 -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: I83116b17381de9029cb90b23b4903a303f5cc248
2020-06-13 01:28:16 +00:00
TreeHugger Robot
a057a9fa94 [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: 801f26629f -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: Iacf8fcbb4b68310750ae10dea9fdba61d31f9735
2020-06-13 01:28:09 +00:00
Automerger Merge Worker
7948b1b59a 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 am: ea87124ddc
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11851989

Change-Id: I81fbd73c2f886e6ba78978c4fd7fb144362e7a68
2020-06-13 01:28:03 +00:00
Automerger Merge Worker
2a071675a4 Merge "Merge "Explicitly request focus after button pressed" into rvc-dev am: d9a246c49e am: 5775784492" into rvc-d1-dev-plus-aosp am: edc887c7f3 am: d0d151c334 am: f8fec5b6fd
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11851989

Change-Id: Iff48d9568ce89c9ae5d7e2007dd33221be433489
2020-06-13 01:27:57 +00:00
TreeHugger Robot
c126a4ba34 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 4b25f3f159 -s ours am: 7f8fa44f44 -s ours am: 75b68e1055 -s ours am: a57dabb9ba -s ours am: a237151397 -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: I21ff5979bc9b270d24981796784000c973cf78f9
2020-06-13 01:27:51 +00:00
TreeHugger Robot
583d690d92 Merge "Explicitly request focus after button pressed" into rvc-dev am: d9a246c49e am: 2f75ebed19 am: b4e5ddbe05 am: 46e6fc9fbb am: 593e8f578f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11851989

Change-Id: Id3dc53c88a15d6c90dcc04254bf016ec97a802eb
2020-06-13 01:27:44 +00: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
Automerger Merge Worker
f8fec5b6fd Merge "Merge "Explicitly request focus after button pressed" into rvc-dev am: d9a246c49e am: 5775784492" into rvc-d1-dev-plus-aosp am: edc887c7f3 am: d0d151c334
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11851989

Change-Id: I982363f265f284200beba6a620e40e92e17eb175
2020-06-13 01:17:13 +00:00
TreeHugger Robot
a237151397 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 4b25f3f159 -s ours am: 7f8fa44f44 -s ours am: 75b68e1055 -s ours am: a57dabb9ba -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: Ib0ee1bd16ba2910d80eb247dcfe80aa7ffcdd063
2020-06-13 01:17:04 +00:00
TreeHugger Robot
593e8f578f Merge "Explicitly request focus after button pressed" into rvc-dev am: d9a246c49e am: 2f75ebed19 am: b4e5ddbe05 am: 46e6fc9fbb
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11851989

Change-Id: Idafec177c32350899490960d9e44bb990c1f1d57
2020-06-13 01:16:35 +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