Commit Graph

11667 Commits

Author SHA1 Message Date
Treehugger Robot
32129f14f5 Merge "Fix crash on "Connection preferences"" am: b75c952800 am: 3cda0e9872
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1485157

Change-Id: Ia27ac5edeca976fbc0e34d60596566f4432e8f5c
2020-11-04 08:56:00 +00:00
Treehugger Robot
b75c952800 Merge "Fix crash on "Connection preferences"" 2020-11-04 08:14:27 +00:00
Hugh Chen
eda6d60e05 Fix crash on "Connection preferences"
This CL adds a null check condition to avoid crash for
some device not support PrintManager.

Bug: 159848003
Test: make -j42 SettingsGoogle
Change-Id: Ic6c4c17bb563458f4f5a61dc0d93ae22b05f8763
2020-11-03 11:02:38 +08:00
Sarah Chin
d84135e91d Merge "Hide 'View plan' button in data usage settings" am: 07f2c27cbf am: 94cabf8a02
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1480638

Change-Id: I2026849d4e4b4d057ea1f1d399994faedf913e1c
2020-10-30 03:35:16 +00:00
Sarah Chin
07f2c27cbf Merge "Hide 'View plan' button in data usage settings" 2020-10-30 02:48:14 +00:00
SongFerngWang
78b33b3824 To fix bug, summary is wrong if nr_enabled_bool=false
The carrier config nr_enabled_bool is false, preferred network mode
should hide 5G UI. This bug is that the summary show 5G item when
nr_enabled_bool is false.
Solution: if nr_enabled_bool is false, it checks capability and then
removes 5G capability of network mode.

Bug: 170460943
Test: make RunSettingsRoboTests ROBOTEST_FILTER=\
EnabledNetworkModePreferenceControllerTest   (PASS)
Change-Id: I3f7d41c196569c0cb61e89cfc270b957e2f0add5
(cherry picked from commit 706036e5b3)
2020-10-30 01:45:55 +00:00
Sarah Chin
d6e4e9d8fe Hide 'View plan' button in data usage settings
There are currently no callers of the setSubscriptionPlan() API that
have a MDP app set up. Remove the button when SubscriptionPlans are
defined, since it does nothing and causes confusion for users.

Test: manually verify button does not exist when a plan is defined
Test: make RunSettingsRoboTests
Bug: 169806315
Change-Id: Ieda020bfa692e9465d6297e50cf338deff91a8a9
Merged-In: Ieda020bfa692e9465d6297e50cf338deff91a8a9
2020-10-29 16:36:28 -07:00
Weng Su
8f8348dc7b Fix the Wi-Fi detailed settings un-editable issue. am: f914e34d28
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12894947

Change-Id: I60460fb5f945eab4d70e28d47868d611b9c564da
2020-10-23 14:25:53 +00:00
Hall Liu
9146943bb5 Merge "Replace TelephonyManager methods for mobile data" am: c2a4d3ec70 am: 4af7d6a7d2 am: d51ee68578
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1470180

Change-Id: I9c1496152155d3db0bd4c29502e7d43f6335ee86
2020-10-22 22:22:47 +00:00
Hall Liu
d51ee68578 Merge "Replace TelephonyManager methods for mobile data" am: c2a4d3ec70 am: 4af7d6a7d2
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1470180

Change-Id: I6ad3c840463bcb070769e9d91b2671d09f359369
2020-10-22 21:49:15 +00:00
Hall Liu
17ba8166a3 Replace TelephonyManager methods for mobile data
TelephonyManager had a minor refactor of some of the methods revolving
around mobile data. Change code in Settings to use the new ones instead.

Exempt-From-Owner-Approval: Cherry-picked from internal
Bug: 169367013
Test: existing unit tests, manual
Change-Id: I7ebae37373d53fb2c59b6b546232dbddf77398d4
Merged-In: I7ebae37373d53fb2c59b6b546232dbddf77398d4
2020-10-21 23:38:20 +00:00
Weng Su
f914e34d28 Fix the Wi-Fi detailed settings un-editable issue.
- The WifiEntry info might not be ready in early stage. (ex:
WifiEntry#canSetPrivacy())

- The Wi-Fi detailed setting listens to the WifiEntry callback to
refresh the preferences, it should first update the preference status to
be editable or not, and then display preferences to the UI.

- The privicy preference should be able to set back to selectable when
WifiEntry#canSetPrivicy() change from false to true.

Bug: 170148009
Test:
make RunSettingsRoboTests
ROBOTEST_FILTER=WifiNetworkDetailsFragment2Test
make RunSettingsRoboTests
ROBOTEST_FILTER=WifiPrivacyPreferenceController2Test

Change-Id: I48ca060e6b468232f19c82e9de0ce4fce39cba7f
Merged-In: I567b2b80163631a01d165c0ac5c0aba392e014ef
2020-10-21 16:39:58 +00:00
SongFerng Wang
9493731935 Merge "To fix bug, summary is wrong if nr_enabled_bool=false" into rvc-qpr-dev am: 3e5defe561
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12875667

Change-Id: I2b69a34d035e70cbc1bea9a2482be876eeabda66
2020-10-21 08:19:13 +00:00
SongFerngWang
706036e5b3 To fix bug, summary is wrong if nr_enabled_bool=false
The carrier config nr_enabled_bool is false, preferred network mode
should hide 5G UI. This bug is that the summary show 5G item when
nr_enabled_bool is false.
Solution: if nr_enabled_bool is false, it checks capability and then
removes 5G capability of network mode.

Bug: 170460943
Test: make RunSettingsRoboTests ROBOTEST_FILTER=\
EnabledNetworkModePreferenceControllerTest   (PASS)
Change-Id: I3f7d41c196569c0cb61e89cfc270b957e2f0add5
2020-10-20 13:07:59 +00:00
Andrei-Valentin Onea
acfad23908 Merge "Add support for @EnabledSince compat changes" am: 2d57867aba am: 38747f76f3 am: 8e111e3de3
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1455019

Change-Id: Iec4b14d29945ae3088838428cc48b36ae71faeb2
2020-10-19 15:26:01 +00:00
Andrei-Valentin Onea
8e111e3de3 Merge "Add support for @EnabledSince compat changes" am: 2d57867aba am: 38747f76f3
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1455019

Change-Id: I60df429605c78749c0259f7efffab026210a4977
2020-10-19 14:56:40 +00:00
Andrei-Valentin Onea
38747f76f3 Merge "Add support for @EnabledSince compat changes" am: 2d57867aba
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1455019

Change-Id: I600c63a996b1684a2b801787d88974501062c073
2020-10-19 14:37:30 +00:00
Andrei-Valentin Onea
2d57867aba Merge "Add support for @EnabledSince compat changes" 2020-10-19 14:19:31 +00:00
TreeHugger Robot
09a906b972 Merge "Hide 'View plan' button in data usage settings" into rvc-qpr-dev am: 1a09d244d4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12755868

Change-Id: I0026c3fbb1bf26d68f203c36c49576deb6d79681
2020-10-16 22:42:07 +00:00
TreeHugger Robot
1a09d244d4 Merge "Hide 'View plan' button in data usage settings" into rvc-qpr-dev 2020-10-16 22:18:33 +00:00
Jeff DeCew
03ebcc2474 Merge "Update NotificationChannelSettings Preferences in place to prevent re-layout." into rvc-qpr-dev am: e9523b7636
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12792910

Change-Id: I55f6310b344baebfe6a4425d3644d22d8e479638
2020-10-14 14:41:46 +00:00
Hugh Chen
b3640019f6 Hide tethering option when in a guest account
- Before this CL, users can share their mobile data through enabling
  tethering in the USB menu when in a guest account.
  It will cause main users to spend their money unexpectedly.

  This CL will hide the tethering option on the USB menu when in the
  guest account.
- Add test cases.

Bug: 166125765
Test: 1. make -j42 RunSettingsRoboTests. 2. Switch to a guest account
to verify whether the tethering option is hiding.

Change-Id: I7523b3f3c3a1372bb128a58a6a7fac973d27cfbe
Merged-In: I7523b3f3c3a1372bb128a58a6a7fac973d27cfbe
(cherry picked from commit bde627b263)
(cherry picked from commit a50f020c85)
2020-10-13 01:08:17 +00:00
Jeff DeCew
5bfe1d3f9c Update NotificationChannelSettings Preferences in place to prevent re-layout.
(cherry picked from commit b409b64045)

Fixes: 110093185
Test: ChannelListPreferenceControllerTest
Change-Id: If6acf305c44085e502a3304ea57e409ce049b40f
Merged-In: If6acf305c44085e502a3304ea57e409ce049b40f
2020-10-12 20:06:48 -04:00
Xin Li
8656492241 Merge ab/6749736 in stage.
Bug: 167233921
Merged-In: I8e3eb6c072488fdc33fae1ebabd17980a67f5d7d
Change-Id: I0411c2f1dbc2fa47b23ff52cacca990f3141f52f
2020-10-08 23:40:50 -07:00
Sarah Chin
f3d7860c70 Hide 'View plan' button in data usage settings
There are currently no callers of the setSubscriptionPlan() API that
have a MDP app set up. Remove the button when SubscriptionPlans are
defined, since it does nothing and causes confusion for users.

Test: manually verify button does not exist when a plan is defined
Test: make RunSettingsRoboTests
Bug: 169806315
Change-Id: Ieda020bfa692e9465d6297e50cf338deff91a8a9
2020-10-08 21:03:39 -07:00
Andrei Onea
f21ba0c650 Add support for @EnabledSince compat changes
Bug: 49103556
Test: make RunSettingsRoboTests ROBOTEST_FILTER=PlatformCompatDashboardTest
Change-Id: Iaf83b1ef2f07a910a3590f59562c2f638b5a6089
2020-10-08 21:54:02 +01:00
Alexander Dorokhine
01236ed32f Merge "Migrate away from deprecated Truth APIs." am: c5a500bf07 am: 1b69ab26e9 am: 94fa8e0921
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1449661

Change-Id: I82dd6eb5510fd7e35bd2c0473725dc24780ce219
2020-10-06 11:17:56 +00:00
Alexander Dorokhine
94fa8e0921 Merge "Migrate away from deprecated Truth APIs." am: c5a500bf07 am: 1b69ab26e9
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1449661

Change-Id: I86b367dd8c072aeb8de4a610e7cf6c19fc5c8287
2020-10-06 11:05:22 +00:00
Alexander Dorokhine
6decca7890 Migrate away from deprecated Truth APIs.
This is a transitional step towards truth 1.0.1, where these APIs have
been completely removed.

Bug: 168765701
Test: m checkbuild
Merged-In: I76f9c37cb699ce6ab8715ffe35d11668ccbceea1
Change-Id: I76f9c37cb699ce6ab8715ffe35d11668ccbceea1
(cherry picked from commit 46e85a2fad)
2020-10-06 00:25:04 -07:00
TreeHugger Robot
fafe12056c Merge "Hide tethering option when in a guest account" into rvc-qpr-dev am: ab41be5607
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12723406

Change-Id: I4caa8937deae9bc104c9c6c3446b7f793cac1f80
2020-10-06 02:25:09 +00:00
Treehugger Robot
c0dbafc438 Merge "[Testing] Use AndroidJUnit4 instead in TelephonyBasePreferenceControllerTest" am: 93cec35cea am: b4093123de am: e13fa41a29 am: 722f9f4ea8
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1426565

Change-Id: I3f2fb62790ba30914d1b7a5555809954066e0455
2020-09-29 05:29:52 +00:00
Treehugger Robot
580963266b Merge "[Testing] use AndroidJUnit4 in new MobileDataPreferenceControllerTest" am: 27806fde5e am: e0890849cd am: 000159f6db am: 6513978872
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1426553

Change-Id: Ia6cbd95f410a4763b5a4a066b942e1fcd44b0fb1
2020-09-29 05:29:43 +00:00
Treehugger Robot
4d513437aa Merge "[Testing] use AndroidJUnit4 in new EuiccPreferenceControllerTest" am: 1cd8904fc5 am: 8c58bd4520 am: e570e80eb8 am: 24dc71f7e8
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1426562

Change-Id: I7ded23298875715dec1a48d9364a174639b7f92b
2020-09-29 05:29:33 +00:00
Treehugger Robot
6ace0ecdde Merge "[Testing] use AndroidJUnit4 in new MultiNetworkHeaderControllerTest" am: 3eeb8b44c2 am: 27978c5d47 am: 5f81bb9a07 am: bb98b793e5
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1426552

Change-Id: Ieb22f4b036c3a569acdf9ea4451fba7b5d7a9851
2020-09-29 05:29:21 +00:00
Treehugger Robot
7b7382fdf2 Merge "[Testing] Use AndroidJUnit4 instead in TelephonyTogglePreferenceControllerTest" am: 71c667322c am: 48c399c18a am: 7c9cc5621b am: 7f3bbcddf0
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1427808

Change-Id: Ia130edabc0cb44a787ef107641e39ead544d81af
2020-09-29 05:29:07 +00:00
Treehugger Robot
722f9f4ea8 Merge "[Testing] Use AndroidJUnit4 instead in TelephonyBasePreferenceControllerTest" am: 93cec35cea am: b4093123de am: e13fa41a29
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1426565

Change-Id: If21308e7f0e67eb39c791206f1e0ee05697b54e8
2020-09-29 05:14:28 +00:00
Treehugger Robot
6513978872 Merge "[Testing] use AndroidJUnit4 in new MobileDataPreferenceControllerTest" am: 27806fde5e am: e0890849cd am: 000159f6db
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1426553

Change-Id: I9e08c98c28e15bc5833d4c23e569a83840d40172
2020-09-29 05:14:19 +00:00
Treehugger Robot
24dc71f7e8 Merge "[Testing] use AndroidJUnit4 in new EuiccPreferenceControllerTest" am: 1cd8904fc5 am: 8c58bd4520 am: e570e80eb8
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1426562

Change-Id: I3bf65953a9751b8cfd9dab666f5b1ad400bbdd36
2020-09-29 05:14:11 +00:00
Treehugger Robot
bb98b793e5 Merge "[Testing] use AndroidJUnit4 in new MultiNetworkHeaderControllerTest" am: 3eeb8b44c2 am: 27978c5d47 am: 5f81bb9a07
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1426552

Change-Id: Ic774e63dd14139999e96210bc89476edc095e02b
2020-09-29 05:14:03 +00:00
Treehugger Robot
7f3bbcddf0 Merge "[Testing] Use AndroidJUnit4 instead in TelephonyTogglePreferenceControllerTest" am: 71c667322c am: 48c399c18a am: 7c9cc5621b
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1427808

Change-Id: I4397688b601c1a8bd53ce49b5ec6db16eff9db5a
2020-09-29 05:13:51 +00:00
Treehugger Robot
e13fa41a29 Merge "[Testing] Use AndroidJUnit4 instead in TelephonyBasePreferenceControllerTest" am: 93cec35cea am: b4093123de
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1426565

Change-Id: I9af0af7bbb19cfb1c7337960dc83fbc8e59eeab4
2020-09-29 05:00:53 +00:00
Treehugger Robot
000159f6db Merge "[Testing] use AndroidJUnit4 in new MobileDataPreferenceControllerTest" am: 27806fde5e am: e0890849cd
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1426553

Change-Id: I88eeb86872e17fa03385dad601ed5e11f9b176d7
2020-09-29 05:00:44 +00:00
Treehugger Robot
e570e80eb8 Merge "[Testing] use AndroidJUnit4 in new EuiccPreferenceControllerTest" am: 1cd8904fc5 am: 8c58bd4520
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1426562

Change-Id: Ieb5efa13b99875a9177016ec90faadd5e2d17f67
2020-09-29 05:00:35 +00:00
Treehugger Robot
5f81bb9a07 Merge "[Testing] use AndroidJUnit4 in new MultiNetworkHeaderControllerTest" am: 3eeb8b44c2 am: 27978c5d47
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1426552

Change-Id: If991989404484407853bd8ac42430761d1e37018
2020-09-29 05:00:26 +00:00
Treehugger Robot
7c9cc5621b Merge "[Testing] Use AndroidJUnit4 instead in TelephonyTogglePreferenceControllerTest" am: 71c667322c am: 48c399c18a
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1427808

Change-Id: I716f8a88d3d6a6022d679736bb278d3f9eb638bb
2020-09-29 05:00:12 +00:00
Treehugger Robot
93cec35cea Merge "[Testing] Use AndroidJUnit4 instead in TelephonyBasePreferenceControllerTest" 2020-09-29 04:33:23 +00:00
Treehugger Robot
27806fde5e Merge "[Testing] use AndroidJUnit4 in new MobileDataPreferenceControllerTest" 2020-09-29 04:30:56 +00:00
Treehugger Robot
1cd8904fc5 Merge "[Testing] use AndroidJUnit4 in new EuiccPreferenceControllerTest" 2020-09-29 04:29:55 +00:00
Treehugger Robot
3eeb8b44c2 Merge "[Testing] use AndroidJUnit4 in new MultiNetworkHeaderControllerTest" 2020-09-29 04:28:34 +00:00
Treehugger Robot
71c667322c Merge "[Testing] Use AndroidJUnit4 instead in TelephonyTogglePreferenceControllerTest" 2020-09-29 04:27:45 +00:00