Commit Graph

65312 Commits

Author SHA1 Message Date
Treehugger Robot
f9b99dcc03 [automerger skipped] Merge "Add logic for 5G icon to SIM status dialog" am: 5733d3a31a am: 980a6b8d30 -s ours
am skip reason: Change-Id I764f4ade8032511b44098e7eccb19b909fccc717 with SHA-1 f71eed162d is in history

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

Change-Id: I0debb7eb292f2138016f891d973bd7a0435adcff
2020-06-24 07:50:23 +00:00
tim peng
b6ed02fa26 Merge "Apply round corner to the album icon in output switcher panel" into rvc-dev 2020-06-24 07:45:36 +00:00
Sarah Chin
1017caf120 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
Merged-In: I77d92fab0020da356ae43293016237be7494c1e2
2020-06-24 00:40:40 -07:00
Treehugger Robot
980a6b8d30 Merge "Add logic for 5G icon to SIM status dialog" am: 5733d3a31a
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1347925

Change-Id: Ice4cd34368434361af8220d5af85024708fee2a1
2020-06-24 07:35:30 +00:00
Treehugger Robot
5733d3a31a Merge "Add logic for 5G icon to SIM status dialog" 2020-06-24 07:18:41 +00:00
TreeHugger Robot
3261d992cc Merge "Fix failed test cases" into rvc-dev am: 1676454b3b am: 2309e1c188
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11970207

Change-Id: I1f7b099cc9750618988284b32663de4c236d172f
2020-06-24 06:09:10 +00:00
TreeHugger Robot
0b04a19565 Merge "Fix failed test cases" into rvc-dev am: 1676454b3b am: eadd54e1d9
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11970207

Change-Id: I40704bac526083ac5bf5c4fe8255f232e5b842f2
2020-06-24 06:08:49 +00:00
TreeHugger Robot
2309e1c188 Merge "Fix failed test cases" into rvc-dev am: 1676454b3b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11970207

Change-Id: I6d889efedeeea69aea2ca8cca5f2f0a9b4c61639
2020-06-24 05:52:51 +00:00
TreeHugger Robot
eadd54e1d9 Merge "Fix failed test cases" into rvc-dev am: 1676454b3b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11970207

Change-Id: I20545916f5ca886d67e10adf9c68a4656988f27d
2020-06-24 05:52:43 +00:00
TreeHugger Robot
1676454b3b Merge "Fix failed test cases" into rvc-dev 2020-06-24 05:41:14 +00:00
TreeHugger Robot
5a439174e6 Merge "Fix com.android.settings.media test case fail" into rvc-dev am: 334985feab am: 3882212b26
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11970205

Change-Id: I2c708d38674d08ed45410a931ca598cb4bd244ec
2020-06-24 05:27:11 +00:00
TreeHugger Robot
1388e13655 Merge "Fix com.android.settings.media test case fail" into rvc-dev am: 334985feab am: 1431d7647a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11970205

Change-Id: Ida02e2c58f68842444371a30c777d7742b6522ad
2020-06-24 05:26:57 +00:00
Tim Peng
df46788a5d Apply round corner to the album icon in output switcher panel
Bug: 159766582
Test: manual test
Change-Id: I1535a13c137e9550920cf890c259a4075a2dfc05
2020-06-24 13:17:06 +08:00
TreeHugger Robot
1431d7647a Merge "Fix com.android.settings.media test case fail" into rvc-dev am: 334985feab
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11970205

Change-Id: I71f3394e1c44c881a5bc346a59c39a1968d0d29d
2020-06-24 05:10:36 +00:00
TreeHugger Robot
3882212b26 Merge "Fix com.android.settings.media test case fail" into rvc-dev am: 334985feab
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11970205

Change-Id: I48656a2ca05350bec1d304a05fbb00ff99b137d7
2020-06-24 05:10:32 +00:00
TreeHugger Robot
334985feab Merge "Fix com.android.settings.media test case fail" into rvc-dev 2020-06-24 05:01:33 +00:00
Mathew Inwood
e6a67d8b7f Increase character limit. am: a5c9c0458c am: 93c232993e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11971198

Change-Id: Ib66ae07194a7a6d9cb78b6e1b556cff2be81051f
2020-06-24 04:53:20 +00:00
Mathew Inwood
c0b9bdda25 Increase character limit. am: a5c9c0458c am: b9d8b08512
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11971198

Change-Id: Icf6cf75f5d4268139128399354d5adf2b93013a2
2020-06-24 04:53:14 +00:00
Mathew Inwood
b9d8b08512 Increase character limit. am: a5c9c0458c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11971198

Change-Id: If8a2bd69135aa967a87cffc3db19e6d5a25b0be5
2020-06-24 04:41:23 +00:00
Mathew Inwood
93c232993e Increase character limit. am: a5c9c0458c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11971198

Change-Id: Ifc81b836b436ebd7b4b6bcf498085ecd9a3c603e
2020-06-24 04:40:52 +00:00
Jason Chiu
1b514c3f37 Revert "Workaround of Slice not pinned bug when using SliceCallback"
This reverts commit 73afb042dc.

Reason for revert: Publish the fix in Slice lib and revert the workaround.

Bug: 157387583
Change-Id: Icb150b4f69bffe8af4c3fcb26501020c8fe8432b
2020-06-24 03:53:47 +00:00
Jason Chiu
98a8640de2 Fix failed test cases
Test: robotest
Fixes: 159688624
Change-Id: I28d53e38000d2dfb00bde900647eb38eda279c9a
2020-06-24 10:55:31 +08:00
Hugh Chen
336ff700a2 Fix com.android.settings.media test case fail
Bug: 159760643
Test: make -j42 RunSettingsRoboTests
Change-Id: I17246088ade1b5e17974ccf24a5e40b915146574
2020-06-24 10:54:43 +08:00
Sarah Chin
de62ae7ff4 Add logic for 5G icon to SIM status dialog
Test: manual test with fake 5G data network type
Bug: 156815536
Change-Id: I764f4ade8032511b44098e7eccb19b909fccc717
Merged-In: I764f4ade8032511b44098e7eccb19b909fccc717
2020-06-23 15:32:07 -07:00
Bonian Chen
5faf771722 [Settings] Learn more link should be removed when not supported.
Learn more wording with link only help people when configured.
When no link available, these wording had better removed to avoid from
confusing people.

Bug: 159510116
Test: manual
Change-Id: I36b74b2b4586546090fb88562e8f4f052a877709
2020-06-23 21:19:15 +08:00
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
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
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
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
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
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
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
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
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
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
Jakub Pawlowski
431033f9ea [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 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: I2b646bd53af7b3d8506260495439988b77cbd87d
2020-06-22 20:06:25 +00:00
Jakub Pawlowski
0d8a2e0cfe [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 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: I9f2aec3f6305f65843a84718decd5dfc7fcc6fe7
2020-06-22 20:06:14 +00:00
Jakub Pawlowski
c9310c3156 [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 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: I205f4af442741edeb0295bd713bef68f5ddccaa5
2020-06-22 19:54:45 +00:00
Jakub Pawlowski
b5355ae3be [automerger skipped] Prevent overlay drawing on top of Bluetooth pairing dialog am: f3afef8419 am: 138dbb86cc -s ours am: 07d3a4de3d -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: I99e7d95f10f5f3d76ef18ab198464fe0b8289a8c
2020-06-22 19:38:34 +00:00
Jakub Pawlowski
07d3a4de3d [automerger skipped] Prevent overlay drawing on top of Bluetooth pairing dialog am: f3afef8419 am: 138dbb86cc -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: I19f322dfbc23f34fcf736215f46fd41f2dd0b570
2020-06-22 19:19:47 +00:00