Commit Graph

72574 Commits

Author SHA1 Message Date
Mathew Inwood
a5c9c0458c Increase character limit.
20 is not enough for several languages.

Test: TH
Bug: 159628588
Change-Id: I9f7b47951ea5a4e0eb2022347ebd5ea0db7f0c9e
2020-06-23 14:09:52 +01:00
Arc Wang
cef7d97031 [Wi-Fi] Fix MAC address title information display bug
Use WifiTrackerLib, we can use WifiEntry.getPrivacy()
to get the value for a Passpoint network.

Bug: 159672621
Test: manual visual
      Switch Privacy setting in Wi-Fi detail page, observe
      MAC address title.
Change-Id: I5411e727c5f48dc0d65a05706194569ca3bbebdc
2020-06-23 18:27:51 +08:00
Sarah Chin
92bcf0f5b8 Merge "Remove NR NSA from voice network type" into rvc-dev am: 1d6acb4f8c am: b947a7f7bf am: b040b0daa7 am: f006e22732
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11959142

Change-Id: I3fa9016e465dec8aca84fb30bb004499cd0acf98
2020-06-23 08:05:29 +00:00
Automerger Merge Worker
5d6b2a2722 Merge "Merge "Remove NR NSA from voice network type" into rvc-dev am: 1d6acb4f8c am: 89cc02986e am: 5a2cb51b02" into rvc-qpr-dev-plus-aosp am: a426052c7c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11959142

Change-Id: I126561cc21a2349300a2a1536eee2c18758e1c44
2020-06-23 08:05:23 +00:00
Sarah Chin
ff837d4631 Merge "Remove NR NSA from voice network type" into rvc-dev am: 1d6acb4f8c am: b947a7f7bf am: 19a42896e2 am: 142ae30f14
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11959142

Change-Id: I63f41e76f436122040a17e43ee3b4e60e9899980
2020-06-23 08:05:11 +00:00
Sarah Chin
f006e22732 Merge "Remove NR NSA from voice network type" into rvc-dev am: 1d6acb4f8c am: b947a7f7bf am: b040b0daa7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11959142

Change-Id: I065f0e931dafb911cca820e9c25935e1297b3fa3
2020-06-23 07:48:19 +00:00
Automerger Merge Worker
a426052c7c Merge "Merge "Remove NR NSA from voice network type" into rvc-dev am: 1d6acb4f8c am: 89cc02986e am: 5a2cb51b02" into rvc-qpr-dev-plus-aosp 2020-06-23 07:47:37 +00:00
Sarah Chin
142ae30f14 Merge "Remove NR NSA from voice network type" into rvc-dev am: 1d6acb4f8c am: b947a7f7bf am: 19a42896e2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11959142

Change-Id: Idc6335aa0d076de523c3c67d33c84becd5248906
2020-06-23 07:47:30 +00:00
Sarah Chin
a6dd027c01 Merge "Remove NR NSA from voice network type" into rvc-dev am: 1d6acb4f8c am: 89cc02986e am: 5a2cb51b02
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11959142

Change-Id: Ia19670d882a15331db622d80dad2f457a9c8a2f1
2020-06-23 07:47:23 +00:00
Sarah Chin
b040b0daa7 Merge "Remove NR NSA from voice network type" into rvc-dev am: 1d6acb4f8c am: b947a7f7bf
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11959142

Change-Id: Ie614a2ad9005322eba3e8a1fa8ad1cee01789b42
2020-06-23 07:29:18 +00:00
Sarah Chin
19a42896e2 Merge "Remove NR NSA from voice network type" into rvc-dev am: 1d6acb4f8c am: b947a7f7bf
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11959142

Change-Id: Ib76704a907cc570df723825b4de2426b8a9d77d3
2020-06-23 07:29:11 +00:00
Sarah Chin
5a2cb51b02 Merge "Remove NR NSA from voice network type" into rvc-dev am: 1d6acb4f8c am: 89cc02986e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11959142

Change-Id: I552cc847d83cd4d5b9726ee07c37e409e07c11bd
2020-06-23 07:21:11 +00:00
Sarah Chin
b947a7f7bf Merge "Remove NR NSA from voice network type" into rvc-dev am: 1d6acb4f8c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11959142

Change-Id: Ia38afb3e20e41135bc5bbd700a9f5500e3df2fd1
2020-06-23 07:01:48 +00:00
Sarah Chin
89cc02986e Merge "Remove NR NSA from voice network type" into rvc-dev am: 1d6acb4f8c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11959142

Change-Id: I897c462e15c97a5b50c528121c77e2fb2b115a38
2020-06-23 07:01:22 +00:00
Sarah Chin
1d6acb4f8c Merge "Remove NR NSA from voice network type" into rvc-dev 2020-06-23 06:52:12 +00:00
Sarah Chin
4b5e95daa1 Remove NR NSA from voice network type
Since voice calls on NR NSA use LTE, the voice network type
should not be updated to be NR NSA.

Test: manual testing
Bug: 159382203
Change-Id: I77d92fab0020da356ae43293016237be7494c1e2
2020-06-23 06:51:44 +00:00
David Su
a9fcaa55d0 Merge "Stop expecting WifiConfig extra from CONFIGURED_NETWORKS_CHANGED_ACTION broadcast" into rvc-dev am: 15d4970c9d am: b426b12967 am: 18c98fbe79 am: 8b94987ff7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11923937

Change-Id: I244566bccf2a1c528a173ae6ecae321eeea6fcd2
2020-06-23 04:06:51 +00:00
Automerger Merge Worker
ed244fbfba Merge "Merge "Stop expecting WifiConfig extra from CONFIGURED_NETWORKS_CHANGED_ACTION broadcast" into rvc-dev am: 15d4970c9d am: 46a4938667 am: 9a23c980a5" into rvc-qpr-dev-plus-aosp am: a8d670b895
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11923937

Change-Id: Ifaadf8bea64e77d1599200c651481fb015f16ac5
2020-06-23 04:06:10 +00:00
David Su
a218f5791b Merge "Stop expecting WifiConfig extra from CONFIGURED_NETWORKS_CHANGED_ACTION broadcast" into rvc-dev am: 15d4970c9d am: 46a4938667 am: cebaf44767 am: 5f34b2e626
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11923937

Change-Id: I25ab81809581b72754f9d4ab7491a3fcce51738f
2020-06-23 04:03:13 +00:00
David Su
8b94987ff7 Merge "Stop expecting WifiConfig extra from CONFIGURED_NETWORKS_CHANGED_ACTION broadcast" into rvc-dev am: 15d4970c9d am: b426b12967 am: 18c98fbe79
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11923937

Change-Id: I6d07c7855ac126f18a8ab170690000279956beb0
2020-06-23 03:51:25 +00:00
Automerger Merge Worker
a8d670b895 Merge "Merge "Stop expecting WifiConfig extra from CONFIGURED_NETWORKS_CHANGED_ACTION broadcast" into rvc-dev am: 15d4970c9d am: 46a4938667 am: 9a23c980a5" into rvc-qpr-dev-plus-aosp 2020-06-23 03:51:13 +00:00
David Su
1abfc8ba7e Merge "Stop expecting WifiConfig extra from CONFIGURED_NETWORKS_CHANGED_ACTION broadcast" into rvc-dev am: 15d4970c9d am: 46a4938667 am: 9a23c980a5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11923937

Change-Id: Ie80a637e776298b87010b52bdb7b269c16513b07
2020-06-23 03:51:05 +00:00
David Su
5f34b2e626 Merge "Stop expecting WifiConfig extra from CONFIGURED_NETWORKS_CHANGED_ACTION broadcast" into rvc-dev am: 15d4970c9d am: 46a4938667 am: cebaf44767
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11923937

Change-Id: Ib0f108aec47666477aa022aa2f410f06d752511f
2020-06-23 03:50:54 +00:00
David Su
18c98fbe79 Merge "Stop expecting WifiConfig extra from CONFIGURED_NETWORKS_CHANGED_ACTION broadcast" into rvc-dev am: 15d4970c9d am: b426b12967
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11923937

Change-Id: Ief3ad2196eb07837cdae3716b95e58906bdde455
2020-06-23 03:37:38 +00:00
David Su
cebaf44767 Merge "Stop expecting WifiConfig extra from CONFIGURED_NETWORKS_CHANGED_ACTION broadcast" into rvc-dev am: 15d4970c9d am: 46a4938667
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11923937

Change-Id: Iedd9cd45cca183bec75b51050d1806a471f73fc5
2020-06-23 03:37:17 +00:00
David Su
9a23c980a5 Merge "Stop expecting WifiConfig extra from CONFIGURED_NETWORKS_CHANGED_ACTION broadcast" into rvc-dev am: 15d4970c9d am: 46a4938667
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11923937

Change-Id: Id0dfcd8a9eb4db30e977c2ab555599b2186cc595
2020-06-23 03:37:16 +00:00
David Su
b426b12967 Merge "Stop expecting WifiConfig extra from CONFIGURED_NETWORKS_CHANGED_ACTION broadcast" into rvc-dev am: 15d4970c9d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11923937

Change-Id: I7769481eb333964dfe71f88d5faf2b15e4d375b7
2020-06-23 03:20:26 +00:00
tim peng
d914658f86 Merge "In output switcher, the name of the device disappears for a brief period, which makes it seem like the devices are swapping positions." into rvc-dev am: 6e10387a38 am: 170179bbe3 am: e84006b0de am: 25473b2aab
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11931339

Change-Id: Iee01b8bf47795959864d9fb25140c8b1aebee2ac
2020-06-23 03:20:18 +00:00
David Su
46a4938667 Merge "Stop expecting WifiConfig extra from CONFIGURED_NETWORKS_CHANGED_ACTION broadcast" into rvc-dev am: 15d4970c9d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11923937

Change-Id: Ide91f1b4544712f71eb8c1bac843b80bdbdcee49
2020-06-23 03:20:16 +00:00
tim peng
f9dfb10bbb Merge "In output switcher, the name of the device disappears for a brief period, which makes it seem like the devices are swapping positions." into rvc-dev am: 6e10387a38 am: 0217b38b00 am: c43d97c9b5 am: 7d57ddf7eb
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11931339

Change-Id: I3e960ff2145182b28e9e757f70b6138250dfd5e8
2020-06-23 03:20:07 +00:00
tim peng
d29a2c0016 Merge "In output switcher, the name of the device disappears for a brief period, which makes it seem like the devices are swapping positions." into rvc-dev am: 6e10387a38 am: 170179bbe3 am: 3ebaa8f380 am: 8acdfaeff7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11931339

Change-Id: I4cbf956d562ea204a2445411e605a55a15a1464f
2020-06-23 03:19:48 +00:00
tim peng
25473b2aab Merge "In output switcher, the name of the device disappears for a brief period, which makes it seem like the devices are swapping positions." into rvc-dev am: 6e10387a38 am: 170179bbe3 am: e84006b0de
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11931339

Change-Id: Ia56154170d8724b163dbf971af334a626ee7993b
2020-06-23 03:06:57 +00:00
tim peng
7d57ddf7eb Merge "In output switcher, the name of the device disappears for a brief period, which makes it seem like the devices are swapping positions." into rvc-dev am: 6e10387a38 am: 0217b38b00 am: c43d97c9b5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11931339

Change-Id: I0b395be8d290c33202ac5887e9e526546d0ccdb6
2020-06-23 03:06:45 +00:00
David Su
15d4970c9d Merge "Stop expecting WifiConfig extra from CONFIGURED_NETWORKS_CHANGED_ACTION broadcast" into rvc-dev 2020-06-23 03:06:39 +00:00
tim peng
8acdfaeff7 Merge "In output switcher, the name of the device disappears for a brief period, which makes it seem like the devices are swapping positions." into rvc-dev am: 6e10387a38 am: 170179bbe3 am: 3ebaa8f380
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11931339

Change-Id: I2cf0ba6cd948e16e533fb884cc4225aaea579a7c
2020-06-23 03:06:39 +00:00
tim peng
e84006b0de Merge "In output switcher, the name of the device disappears for a brief period, which makes it seem like the devices are swapping positions." into rvc-dev am: 6e10387a38 am: 170179bbe3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11931339

Change-Id: I26eb6d76482746eac13e64253731fa7e14215568
2020-06-23 02:55:14 +00:00
tim peng
c43d97c9b5 Merge "In output switcher, the name of the device disappears for a brief period, which makes it seem like the devices are swapping positions." into rvc-dev am: 6e10387a38 am: 0217b38b00
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11931339

Change-Id: I57d28f2980c060c7b7d54120d626ba7e5a8d7443
2020-06-23 02:55:06 +00:00
tim peng
3ebaa8f380 Merge "In output switcher, the name of the device disappears for a brief period, which makes it seem like the devices are swapping positions." into rvc-dev am: 6e10387a38 am: 170179bbe3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11931339

Change-Id: I3859719fab57d94034c5a1c0ae193af8e47483a9
2020-06-23 02:54:45 +00:00
tim peng
0217b38b00 Merge "In output switcher, the name of the device disappears for a brief period, which makes it seem like the devices are swapping positions." into rvc-dev am: 6e10387a38
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11931339

Change-Id: Ie69913e09a49438c85e6266f0a7d948b9b459460
2020-06-23 02:37:25 +00:00
tim peng
170179bbe3 Merge "In output switcher, the name of the device disappears for a brief period, which makes it seem like the devices are swapping positions." into rvc-dev am: 6e10387a38
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11931339

Change-Id: I66017db7ec0e11c06d62628dbb312225b203059d
2020-06-23 02:37:06 +00:00
tim peng
6e10387a38 Merge "In output switcher, the name of the device disappears for a brief period, which makes it seem like the devices are swapping positions." into rvc-dev 2020-06-23 02:22:46 +00:00
Jakub Pawlowski
800f049278 [automerger skipped] Prevent overlay drawing on top of Bluetooth pairing dialog am: f3afef8419 am: 138dbb86cc -s ours am: 07d3a4de3d -s ours am: b5355ae3be -s ours am: c9310c3156 -s ours am: 431033f9ea -s ours am: 24d5585b28 -s ours am: 2eebd94c6c -s ours
am skip reason: Change-Id I99643ee9084f3a9bc1ad9a459ac27c587d832c91 with SHA-1 f3afef8419 is in history

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

Change-Id: Ic03c88bbbd7f67856fb0345cae14b42c8753d424
2020-06-22 20:49:32 +00:00
Jakub Pawlowski
622b04b36a [automerger skipped] Prevent overlay drawing on top of Bluetooth pairing dialog am: f3afef8419 am: 138dbb86cc -s ours am: 07d3a4de3d -s ours am: b5355ae3be -s ours am: c9310c3156 -s ours am: 0d8a2e0cfe -s ours am: ecee52a20f -s ours am: 0dda1d200f -s ours
am skip reason: Change-Id I99643ee9084f3a9bc1ad9a459ac27c587d832c91 with SHA-1 f3afef8419 is in history

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

Change-Id: Id376dc4360708f338e3c3b4434baca0319261b82
2020-06-22 20:49:17 +00:00
Jakub Pawlowski
28abf7b1df [automerger skipped] Prevent overlay drawing on top of Bluetooth pairing dialog am: f3afef8419 am: 138dbb86cc -s ours am: 07d3a4de3d -s ours am: b5355ae3be -s ours am: c9310c3156 -s ours am: 0d8a2e0cfe -s ours am: c09b390c8e -s ours am: ab87045675 -s ours
am skip reason: Change-Id I99643ee9084f3a9bc1ad9a459ac27c587d832c91 with SHA-1 88815d1456 is in history

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

Change-Id: I06d3f513c20111ccaf0c0d4ed4dbb2f9908e1a2c
2020-06-22 20:49:01 +00:00
Jakub Pawlowski
2eebd94c6c [automerger skipped] Prevent overlay drawing on top of Bluetooth pairing dialog am: f3afef8419 am: 138dbb86cc -s ours am: 07d3a4de3d -s ours am: b5355ae3be -s ours am: c9310c3156 -s ours am: 431033f9ea -s ours am: 24d5585b28 -s ours
am skip reason: Change-Id I99643ee9084f3a9bc1ad9a459ac27c587d832c91 with SHA-1 f3afef8419 is in history

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

Change-Id: Ib4491270b43ead915be2858b400cc2fa8e58438a
2020-06-22 20:36:48 +00:00
Jakub Pawlowski
0dda1d200f [automerger skipped] Prevent overlay drawing on top of Bluetooth pairing dialog am: f3afef8419 am: 138dbb86cc -s ours am: 07d3a4de3d -s ours am: b5355ae3be -s ours am: c9310c3156 -s ours am: 0d8a2e0cfe -s ours am: ecee52a20f -s ours
am skip reason: Change-Id I99643ee9084f3a9bc1ad9a459ac27c587d832c91 with SHA-1 88815d1456 is in history

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

Change-Id: I344debd355aa7d072e725d9e5bfa3daf2ae28e0a
2020-06-22 20:36:40 +00:00
Jakub Pawlowski
ab87045675 [automerger skipped] Prevent overlay drawing on top of Bluetooth pairing dialog am: f3afef8419 am: 138dbb86cc -s ours am: 07d3a4de3d -s ours am: b5355ae3be -s ours am: c9310c3156 -s ours am: 0d8a2e0cfe -s ours am: c09b390c8e -s ours
am skip reason: Change-Id I99643ee9084f3a9bc1ad9a459ac27c587d832c91 with SHA-1 88815d1456 is in history

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

Change-Id: Iaa5f17065ca835defcbe62f9c1bb316e9af7d354
2020-06-22 20:36:32 +00:00
Jakub Pawlowski
24d5585b28 [automerger skipped] Prevent overlay drawing on top of Bluetooth pairing dialog am: f3afef8419 am: 138dbb86cc -s ours am: 07d3a4de3d -s ours am: b5355ae3be -s ours am: c9310c3156 -s ours am: 431033f9ea -s ours
am skip reason: Change-Id I99643ee9084f3a9bc1ad9a459ac27c587d832c91 with SHA-1 88815d1456 is in history

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

Change-Id: I982b77254ee23362a16685b09f29cd073aa04058
2020-06-22 20:20:40 +00:00
Jakub Pawlowski
ecee52a20f [automerger skipped] Prevent overlay drawing on top of Bluetooth pairing dialog am: f3afef8419 am: 138dbb86cc -s ours am: 07d3a4de3d -s ours am: b5355ae3be -s ours am: c9310c3156 -s ours am: 0d8a2e0cfe -s ours
am skip reason: Change-Id I99643ee9084f3a9bc1ad9a459ac27c587d832c91 with SHA-1 88815d1456 is in history

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

Change-Id: If481d3e35a48ec83d05dfc554c5994df0e77a7f3
2020-06-22 20:20:27 +00:00
Jakub Pawlowski
c09b390c8e [automerger skipped] Prevent overlay drawing on top of Bluetooth pairing dialog am: f3afef8419 am: 138dbb86cc -s ours am: 07d3a4de3d -s ours am: b5355ae3be -s ours am: c9310c3156 -s ours am: 0d8a2e0cfe -s ours
am skip reason: Change-Id I99643ee9084f3a9bc1ad9a459ac27c587d832c91 with SHA-1 88815d1456 is in history

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

Change-Id: I07b20cf9b78ee0a64b8a3ad4ea0d594b7282eb5d
2020-06-22 20:20:26 +00:00