Commit Graph

647 Commits

Author SHA1 Message Date
Bonian Chen
eba09d414c [Settings] Ignore failed test case
Ignore failed test case.

Bug: 201021218
Test: build pass
Change-Id: Iadde3d66008e765699a5c205067d72fee18953b3
2021-09-24 12:48:10 +08:00
Wilson Wu
395e839b10 Merge "Update settings PrimarySwitchPreference reference" 2021-09-07 02:51:20 +00:00
Wilson Wu
9edf79741d Update settings PrimarySwitchPreference reference
To make InputMethodPreference support 2 target
reference, CL[1] move the PrimarySwitchPreference
into SettingsLib.

Change all PrimarySwitchPreference reference to
Settingslib one and remove the original one.

[1]: Idea3935d95b8d22b00ca89313e9eb3e979e4aa74

Bug: 197705032
Test: Presubmit
Change-Id: I95d111522344bb7cbdd380382e48fe60a5ebc9a2
2021-09-02 13:10:19 +08:00
changbetty
bea12d4bbe Change the SIM color for passing the GAR
Bug: 195710292
Test: Manual test
Test: make RunSettingsRoboTests ROBOTEST_FILTER=RenameMobileNetworkDialogFragmentTest
Change-Id: I7b7a3e1b6d72709acbae0a0433af897a28d73afc
2021-08-31 06:13:55 +00:00
TreeHugger Robot
c540823948 Merge "Fix the NPE issue in the Internet Settings" into sc-dev am: 381bbbda8d am: c80050cede
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15269083

Change-Id: I94a8a696d50d1c052361c501b33e13a47832cf89
2021-07-15 09:27:59 +00:00
Weng Su
5a916eaaf9 Fix the NPE issue in the Internet Settings
- Missing to remove the mRemoveLoadingRunnable in the onStop() function, which will cause the callback to run after the fragment is destroyed and encounter this NPE issue.

Bug: 193405782
Test: manual test
make RunSettingsRoboTests ROBOTEST_FILTER=NetworkProviderSettingsTest

Change-Id: I48b85173db1e6689dd056ba71f2fac776ffabbc9
2021-07-14 14:27:39 +00:00
SongFerng Wang
2950401a1c Merge "Network selection add NGRAN when device support SA" into sc-dev am: a73d199d5e am: 0309aad720
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15210394

Change-Id: I48de91db9d09c743421339c3ccaeafbacd742e71
2021-07-08 09:07:56 +00:00
SongFerng Wang
a73d199d5e Merge "Network selection add NGRAN when device support SA" into sc-dev 2021-07-08 08:17:19 +00:00
SongFerngWang
193f97c7ba Network selection add NGRAN when device support SA
Bug: 187148937
Test: build pass.
atest NetworkScanHelperTest (pass)

Change-Id: I1ed3eae3bda39eb702bc135b0c698f8df7c280d7
2021-07-07 15:36:42 +08:00
TreeHugger Robot
1d69f1c0e1 Merge "[Provider Model] Hide Connectivity Subsystems when recovering" into sc-dev am: 80fd8a7cce am: 2a56929f62
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15124033

Change-Id: I4e76656f5cfefe4dca6a432929e9c8ac756c34db
2021-06-29 13:39:21 +00:00
Weng Su
7a45b33c42 [Provider Model] Hide Connectivity Subsystems when recovering
- Hide Carrier Network

- Hide Wi-Fi toggle

- Hide all of Wi-Fi Networks

Bug: 186590805
Test: manual test
atest InternetResetHelperTest
atest NetworkMobileProviderControllerTest
make RunSettingsRoboTests ROBOTEST_FILTER=NetworkProviderSettingsTest

Change-Id: Ib8462f890847d14bfc6ef533d1147822fd797a13
2021-06-28 17:19:13 +08:00
TreeHugger Robot
1777344309 Merge "Fix the NPE issue" into sc-dev am: 74babf6e91 am: a4b5ecc5f9
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15056869

Change-Id: Ic674efa0599fb80487d1af4bfcd0c8030092365a
2021-06-23 10:47:33 +00:00
Weng Su
ebcfa17353 Fix the NPE issue
Bug: 190938633
Test: manual test
make RunSettingsRoboTests ROBOTEST_FILTER=NetworkProviderSettingsTest

Change-Id: I249d701abfa79872a331c071116d2db0bfdcced6
2021-06-22 18:20:55 +08:00
Quang Luong
91dcd42319 Add WifiTrackerLib as separate dependency from SettingsLib
WifiTrackerLib should be removed from SettingsLib to avoid tying it to
SettingsLib's min_sdk_version. Modules that need WifiTrackerLib should
now explicitly add it as a static_lib.

Bug: 187099809
Test: build, make RunSettingsRoboTests
ROBOTEST_FILTER=WifiEntryPreferenceTest

Change-Id: I09b7cad0b3b17ba1a24c1200b7ea3255ca4e227f
2021-06-10 14:33:05 -07:00
Yanting Yang
154e9a0b31 Merge "Update homepage summaries" into sc-dev am: 8b3f0e8d52 am: 8cb77c6609
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14847059

Change-Id: I513c48904601cb376de0ee50277a21a0c452821b
2021-06-07 11:21:28 +00:00
Yanting Yang
3e2313e958 Update homepage summaries
- Network & internet
- Connected devices
- Display
- Wallpaper & style
- Accessibility
- Tips & support
- Also clear the redundant codes and tests.

Fixes: 183642373
Fixes: 189981034
Fixes: 190011428
Fixes: 190015037
Test: robotests & visual
Change-Id: Ide19fa5aff67e093d86b259c5e7a307b9ad37550
2021-06-06 12:28:03 +08:00
Bonian Chen
ca83d9e631 Merge "[Settings] Code refactor - NetworkSelectSettingsTest" 2021-05-31 13:45:07 +00:00
Bonian Chen
e96b889d5b [Settings] Code refactor - NetworkSelectSettingsTest
Move NetworkSelectSettingsTest.java from robolectric into JUnit.

Bug: 189742455
Test: local, JUnit
Change-Id: I72066cc04ea6bdc8f7c68351e649926350fe41c9
2021-05-31 11:14:17 +00:00
Yanting Yang
259b678865 Merge "Update subtext for "Network & internet"" into sc-dev 2021-05-25 07:36:38 +00:00
Betty Chang
cd5722f8a1 Merge "[GAR] Set Fix connectivity icon invisible when airplane mode is on" into sc-dev 2021-05-25 05:46:07 +00:00
Yanting Yang
8b95b7a6e9 Update subtext for "Network & internet"
Remove "and" to align with the other menu items.

Fixes: 183642373
Test: robotests & visual
Change-Id: I4d48b9c5a867d7afa04b7c3f0d6495b455df6621
2021-05-25 01:09:38 +08:00
changbetty
f7f015e2ee [GAR] Set Fix connectivity icon invisible when airplane mode is on
Bug: 179117999
Test: manual test
      make RunSettingsRoboTests
      ROBOTEST_FILTER=NetworkProviderSettingsTest
Change-Id: I2c37f22c936c3409f5db819b7c945bc81c07ae60
2021-05-21 18:37:44 +08:00
changbetty
8267a2757f Remove the Network rating provider item
Bug: 187119482
Test: manual test
      make RunSettingsRoboTests ROBOTEST_FILTER=ConfigureWifiSettingsTest
Change-Id: Iff4a7663c0bca8f0553fcd16673a9aa766050ff4
2021-05-21 17:08:44 +08:00
Yanting Yang
d1312e8e6e Add summary back to the homepage
Also update some summaries with new strings.

Bug: 183586663
Test: robotests & atest & visual

Change-Id: I692be9b34e8867501aaa8c8e40428870b99644f8
2021-05-06 00:27:37 +08:00
lucaslin
188d66a709 Use [set|get]PrivateDnsMode directly
The value of PRIVATE_DNS_MODE_* has changed from String to int and
ConnectivityManager provides 2 new APIs to set and get private
DNS mode, the caller can use them directly and doesn't need to update
Settings by itself.

Bug: 185311744
Test: 1. make RunSettingsRoboTests ROBOTEST_FILTER=PrivateDnsModeDialogPreferenceTest
      2. make RunSettingsRoboTests ROBOTEST_FILTER=PrivateDnsPreferenceControllerTest
Change-Id: I47706efe9c53a00438fdec97fda244638cecb3dc
2021-04-22 01:46:05 +08:00
TreeHugger Robot
5467d0f7aa Merge "Replace the hidden API to public API or other alternatives" into sc-dev 2021-04-14 17:47:41 +00:00
lucaslin
09bbb51d29 Replace the hidden API to public API or other alternatives
Some of connectivity related files are going to be a part of
mainline module, so the external callers cannot call its hidden
API.
Replace the hidden API to public API or other alternatives from
the callers side.

Bug: 182859030
Test: 1. Remove "framework-connectivity.impl"
      2. atest SettingsUnitTests:InternetUpdaterTest
      3. atest SettingsUnitTests:ProviderModelSliceHelperTest
      4. atest SettingsUnitTests:MobileNetworkUtilsTest
      5. make RunSettingsRoboTests \
         ROBOTEST_FILTER=AppDataUsagePreferenceControllerTest
      6. make RunSettingsRoboTests \
         ROBOTEST_FILTER=TetherPreferenceControllerTest
      7. make RunSettingsRoboTests \
         ROBOTEST_FILTER=WifiDetailPreferenceController2Test
      8. make RunSettingsRoboTests \
         ROBOTEST_FILTER=ContextualWifiSliceTest
Change-Id: Idd1ca57d8f2790070e9c401936c5af2a05bcfe9d
2021-04-14 11:36:54 +00:00
Weng Su
6884d63824 [Provider Model] Move down the Internet unavailable Wi-Fi
- Move down the Internet unavailable Wi-Fi to the top of the available
Wi-Fi networks

- Don't paint color for the Internet unavailable Wi-Fi

- Screenshot:
  https://screenshot.googleplex.com/94NotfJLKXSbBW9

Bug: 178457619
Bug: 178926547
Bug: 178978070
Test: manual test
make RunSettingsRoboTests ROBOTEST_FILTER=NetworkProviderSettingsTest

Change-Id: I1c98e2a8793ce9dc2fb886c0fa66f4297a34ab01
2021-04-13 10:04:33 +08:00
Bonian Chen
fecfb7f5e4 Merge "Revert "[Settings] Support getSystemService(Class<T>)"" into sc-dev 2021-03-30 05:31:52 +00:00
Bonian Chen
234b698fb2 Revert "[Settings] Support getSystemService(Class<T>)"
This reverts commit d5ccde31a8.

Reason for revert: failure on test cases

Change-Id: I0a179a6ebb5ef1dec566ce6e8facd5f3b82d7c8a
2021-03-30 00:51:15 +00:00
Weng Su
f5b4e49073 Fix the broken test on NetworkProviderSettingsTest
- Set the Provider Model feature flag to false

Bug: 183919739
Test: manual test
make RunSettingsRoboTests ROBOTEST_FILTER=NetworkProviderSettingsTest

Change-Id: I44cfbe314ce82d67f10fe717054129ee849870a1
2021-03-30 01:58:07 +08:00
Jeremy Goldman
dcbde1138b VpnPreferenceControllerTest converted to JUnit
global settings string set to guarantee pre-test environment.
PreferenceManager and PreferenceScreen instantiated instead of mocks,
and mock preference inserted with getKey function overridden.

Bug: 176821216
Test: atest -c VpnPreferenceControllerTest
Change-Id: I94a881df13d1b35126de10f561d657136e4fed7f
Merged-In: I94a881df13d1b35126de10f561d657136e4fed7f
(cherry picked from commit 7361f8557c)
2021-03-24 05:33:13 +00:00
Bonian Chen
d5ccde31a8 [Settings] Support getSystemService(Class<T>)
Add getSystemService(Class<T>) to align the capability with framework
part.

This is a back port from aosp/1639943, aosp/1645152 and aosp/1648047

Bug: 179640862
Test: local
Change-Id: I035db55a71f94000ca35f8d71f03c19208423c73
2021-03-24 00:59:46 +08:00
Chiachang Wang
04f43b188d Merge "Update mocking to correct target methods" am: efa884758b am: b64bf233a3 am: 7dce573e9d
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1644306

Change-Id: I99179fe4a754849f50f6b06ce9b7424a88478184
2021-03-18 15:14:07 +00:00
Chiachang Wang
6290ad9509 Update mocking to correct target methods
The correct target context should use the mActivity in
MobileNetworkSettingsTest, so that the mocking for
telephony service could correctly applied.

Both AutoTimeZonePreferenceControllerTest and
BasebandVersionPreferenceControllerTest refer to the lib
implemented shadow Connectivitymanager but that does not
the correct reference after utils class being updated.
Update the test logic inside to refer to correct method.
The reference to ShadowConnectivityManager does not needed
anymore so remove it from the test.

Fix: 183068151
Fix: 183067742
Fix: 183068139
Test: make RunSettingsRoboTests ROBOTEST_FILTER=\
com.android.settings.network.telephony.MobileNetworkSettingsTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=\
com.android.settings.datetime.AutoTimeZonePreferenceControllerTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings\
.deviceinfo.firmwareversion.BasebandVersionPreferenceControllerTest

Change-Id: I15ecc6aab7d530d20cd23b06267cc184a2c62b40
2021-03-18 14:53:07 +08:00
Janis Danisevskis
5cef487b4b resolve merge conflicts of d42d9a41f6 to sc-dev
Change-Id: Ifa6a4af09d7cd45773a8c057416ab90fac23061e
2021-03-17 19:09:29 +00:00
Chiachang Wang
d507dc19b1 Replace hidden CM#isNetworkSupported() usage
It's a refactor work for connectivity mainline module. The
hidden methods access is no longer allowed, so the usage for
isNetworkSupported() should be replaced. Settings use it to
check if device support telephony, wifi or ethernet service.
There are alternative methods to check if device supports such
features. Replace as it is.

Bug: 172183305
Test: m ; make RunSettingsRoboTests
Change-Id: I8f1d11558b1be575a0777ed195abe027e838cb74
Merged-In: I8f1d11558b1be575a0777ed195abe027e838cb74
2021-03-17 15:22:40 +00:00
Chiachang Wang
6f41bb5722 Merge "Replace hidden CM#isNetworkSupported() usage" into sc-dev 2021-03-17 15:21:17 +00:00
TreeHugger Robot
c7d3c5f1be Merge "[Settings] Use TelephonyManasger.registerTelephonyCallback instead of TelephonyManager.listen" into sc-dev 2021-03-17 10:30:48 +00:00
Chiachang Wang
ffbe4e9b1e Replace hidden CM#isNetworkSupported() usage
It's a refactor work for connectivity mainline module. The
hidden methods access is no longer allowed, so the usage for
isNetworkSupported() should be replaced. Settings use it to
check if device support telephony, wifi or ethernet service.
There are alternative methods to check if device supports such
features. Replace as it is.

Bug: 172183305
Test: m ; make RunSettingsRoboTests
Change-Id: I8f1d11558b1be575a0777ed195abe027e838cb74
2021-03-17 15:21:43 +08:00
Bonian Chen
203f0fe89d [Settings] Code refactor - remove unused import lines
Remove some unused import lines within source code based on
https://source.android.com/setup/contribute/code-style

Bug: 182867979
Test: build pass
Change-Id: I76dbcfa9e5b435b2838401dfee15b12f472d07d0
2021-03-16 10:24:24 +00:00
Zoey Chen
b8a639f8fd [Settings] Use TelephonyManasger.registerTelephonyCallback instead of TelephonyManager.listen
Bug: 175270951
Test: make and atest
Change-Id: I15e1a199e6a34914db97055bfea9392c5bbdc9c6
2021-03-12 19:27:05 +08:00
Weng Su
8ce423cdd2 [Provider Model] Update Airplane mode message
- Show Airplane mode message when Airplane mode is enabled

- Show the same message whether Wi-Fi is enabled or disabled

- Screenshot:
  https://screenshot.googleplex.com/9FgqG7WWskRLZxo
  https://screenshot.googleplex.com/4g4kvnAT6aYN57s

Bug: 181858434
Test: manual test
make RunSettingsRoboTests ROBOTEST_FILTER=NetworkProviderSettingsTest

Change-Id: I3cb5a8bc7cb4d1e8678eb6d75116effd00ac9432
2021-03-12 11:49:46 +08:00
Weng Su
78a5522879 Fix the broken test on NetworkProviderSettingsTest
- Mock the UserManager for restricted component

Bug: 182147117
Test: manual test
make RunSettingsRoboTests ROBOTEST_FILTER=NetworkProviderSettingsTest

Change-Id: Ica5bfc8ecd0a7a786ec6fec439998696eed04266
2021-03-09 17:38:40 +08:00
SongFerngWang
fc435e3736 Replace allowedNetworkTypes with allowedNetworkTypesForReason
- Replace getAllowedNetworkTypes with
getallowedNetworkTypesForReason(ALLOWED_NETWORK_TYPES_REASON_CARRIER)
- Replace "Settings.Global.PREFERRED_NETWORK_MODE" with
"getAllowedNetworkTypesForReason(USER)"
- Move EnabledNetworkModePreferenceControllerTest from robotests to unit
- Replace KEY_NR_ENABLED_BOOL with KEY_CARRIER_NR_AVAILABILITY_INT
- Rename PreferredNetworkModeContentObserver to AllowedNetworkTypesListener
Bug: 161434786
Test: build pass.
(PASS)atest CdmaSystemSelectPreferenceControllerTest
(PASS)atest PreferredNetworkModePreferenceControllerTest
(PASS)atest AllowedNetworkTypesListenerTest
(PASS)atest EnabledNetworkModePreferenceControllerTest
(PASS)atest MobileNetworkUtilsTest

Change-Id: I2b981569ad11cf70a558c1952cc2e077464328d8
Merged-In: I2b981569ad11cf70a558c1952cc2e077464328d8
2021-03-04 19:20:04 +08:00
SongFerngWang
1ffba4af4e [Testcase] To migration DisabledSubscriptionControllerTest
1. Use AndroidJunit4 instead of RobolectricTestRunner
2. Use ApplicationProvider instead of RuntimeEnvironment
   to get context
3. Change Copy Right
4. remove the mock of PreferenceScreen

Bug: 173003522
Test: atest DisabledSubscriptionControllerTest.java
Change-Id: Ia99a4cf4618fcb32162485e7da5e48e3b313ce67
Merged-In: Ia99a4cf4618fcb32162485e7da5e48e3b313ce67
2021-03-04 09:41:56 +00:00
SongFerngWang
766f78e8ed Use SubscriptionManager.getResourcesForSubId to get Resources
To support multi-SIM card case. The code uses the
SubscriptionManager.getResourcesForSubId to get Resources.

Bug: 171843666
Test: make RunSettingsRoboTests ROBOTEST_FILTER=\
EnabledNetworkModePreferenceControllerTest

Change-Id: Ib31e23b81bdbd3b5336b45fc73994f40d021718b
Merged-In: Ib31e23b81bdbd3b5336b45fc73994f40d021718b
2021-03-04 09:41:31 +00:00
SongFerng Wang
cbc2c4f102 Merge changes I89162011,I110727b6,I1778832b
* changes:
  Settings JUnit test for PreferredNetworkModeContentObserverTest
  [Testing] Use AndroidJUnit4 instead in telephony/cdma/ test files
  [Testing] Use AndroidJUnit4 instead in MobileNetworkUtilsTest
2021-03-04 06:17:31 +00:00
Jeremy Goldman
3611c3e22f Settings JUnit test for PreferredNetworkModeContentObserverTest
Biggest difference here: the use of a MockContentProvider

Bug: 175389659
Test: atest -c PreferredNetworkModeContentObserverTest
Change-Id: I891620118f7e84aa1c7f9e0ccdaeb21a225dc31a
Merged-In: I891620118f7e84aa1c7f9e0ccdaeb21a225dc31a
2021-03-03 23:39:07 +08:00
Paul Hu
995581e856 Merge "Replace ConnectivityManager hidden symbols on Settings" am: cbcea32087
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1597453

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5fe3e26c5bdda32edf656b4d7e94d2dc17c14e06
2021-02-25 08:19:44 +00:00