Commit Graph

757 Commits

Author SHA1 Message Date
Peter Wang
5eb94b4a00 Merge "Added an option in reset menu in Settings to enable resetting Euicc data only" 2020-12-16 20:03:25 +00:00
Jeremy Goldman
6efeeaafec Owners updates
Add goldmanj to tests/unit for junit migration and
utility library creation
Add connectivity settings eng to settings/datausage.

Test: N/A, just owners update
Change-Id: I182ad6093677dc151b171d9e5aaa15cdd353c474
2020-12-16 10:40:49 +00:00
Arc Wang
62c78ff3fa Migrate robolectric tests to junit tests
This change do the 2 things:

1. Add new junit tests files which replace robolectric
   RobolectricTestRunner & RuntimeEnvironment with
   AndroidX objects without problem.
2. Remove the robolectric test files which have it's new junit files.

This change migrate 103 files, there are still 1209
files to go.

Bug: 174728471
Test: atest
      make RunSettingsRoboTests
Change-Id: I15ed3f4745b85862f720aabbf710ce1475aced93
2020-12-16 11:17:57 +08:00
Peter Wang
ecd856eeeb Added an option in reset menu in Settings to enable resetting Euicc data
only

Bug: 159650638
Fix: 159650638
Test: Local
Change-Id: Ia260b47a4dd0ddf0363740891b5e1d818c8631b7
2020-12-15 18:27:34 -08:00
TreeHugger Robot
d05ee585dc Merge "[Provider Model] Refactor AirplaneSafeNetworksSliceTest" 2020-12-14 10:31:45 +00:00
Weng Su
732cdb42b2 [Provider Model] Refactor AirplaneSafeNetworksSliceTest
- The AirplaneSafeNetworksSliceTest should restore Airplane Mode state
after tear down

- Create AirplaneModeRule to backup/restore Airplane Mode state
automaticlly

- Plan to reuse the AirplaneModeRule for other test case

Bug: 173413889
Test: atest -c AirplaneSafeNetworksSliceTest
Change-Id: Id142cf6302a188e6d82b44fcf29a395dc21f6013
2020-12-14 07:20:32 +00:00
Jeremy Goldman
11f91e47ea Merge "Enhanced4gBasePreferenceControllerTest migrated to junit" 2020-12-14 02:58:24 +00:00
Jeremy Goldman
f36154fe6c Merge "ActiveSubsciptionsListenerTest converted to junit" 2020-12-14 02:52:33 +00:00
Jeremy Goldman
f36d82f5fe Merge "Settings JUnit test for PreferredNetworkModeContentObserverTest" 2020-12-14 02:52:16 +00:00
Bonian Chen
c3d818653a Merge "Add test case for CrossSimCallingPreferenceControllerTest" 2020-12-12 11:31:16 +00:00
Jeremy Goldman
4348c2c826 Enhanced4gBasePreferenceControllerTest migrated to junit
Bug: 175389659
Test: atest -c Enhanced4gBasePreferenceControllerTest
Change-Id: I7ebcb303eb74168b81dd650fe78f3988647aa64d
2020-12-12 01:11:13 +08:00
Jeremy Goldman
bb811a5aff ActiveSubsciptionsListenerTest converted to junit
note that this class contains a state machine of the subscription
information cache. The mock subscription manager must present
subscriptions in order for an update intent to result in a change
notifcation.

Bug: 175389659
Test: atest -c ActiveSubsciptionsListenerTest
Change-Id: I8cd2bd5d5b7b1539f421822ba77ed3d8e0ac493b
2020-12-11 16:23:40 +00:00
Jeremy Goldman
e18207b951 Settings JUnit test for PreferredNetworkModeContentObserverTest
Biggest difference here: the use of a MockContentProvider

Bug: 175389659
Test: atest -c PreferredNetworkModeContentObserverTest
Change-Id: I891620118f7e84aa1c7f9e0ccdaeb21a225dc31a
2020-12-11 16:23:33 +00:00
Jeremy Goldman
1e87a55215 Add test case for CrossSimCallingPreferenceControllerTest
Test is currently failing due to no methods present. Since we want
the controller to be unavailable for now, I chose to write a method
verifying that state.

Bug: 174566774
Test: atest -c CrossSimCallingPreferenceControllerTest
Change-Id: Iced0ac7bbd3482907312182a632dcf3215c55391
2020-12-12 00:22:45 +08:00
Zoey Chen
44559badaf [Provider Model] Should show "No SIM" if there is no SIM in the device.
Bug: 172053880
Test: atest NetworkProviderCallsSmsControllerTest#getSummary_noSim_returnNoSim
Change-Id: I31fd8b4b6928ef8aa7c45ac7651fa26e0b08446e
2020-12-11 20:29:13 +08:00
Jiashen Wang
ea5ef92219 Merge "[SIM Dialog Migration] Enable SIM operation dialog in Settings" 2020-12-07 18:31:02 +00:00
Weng Su
cdb843d932 Merge "[Provider Model] Add Airplane-safe networks slice" 2020-12-07 06:23:55 +00:00
Jiashen Wang
8271561a76 [SIM Dialog Migration] Enable SIM operation dialog in Settings
Change Settings to not call SubscriptionManager#setSubscriptionEnabled.
Instead, make Settings call EuiccManager APIs directly.
Design: https://docs.google.com/document/d/1wb5_hoBkZVbkXGNWHbx4Jf61swjfxsJzkytiTzJosYo/edit?usp=sharing
Bug: 160819390
Test: Manually tested eSIM profile enabling.

Change-Id: I56bbcbb9ccb886b0f9249e67c5a6a6444bb7dd45
2020-12-05 21:48:09 -08:00
Bonian Chen
eaabc5969e [Settings][Test] Fix Junit test failure - MobileNetworkSwitchControllerTest
android.test.UiThreadTest has been deprecated.

This is a change migrate it into androidx.test.annotation.UiThreadTest

Bug: 174832214
Change-Id: I38f35e7602a269a018510723c199a7259d704b4e
Test: atest -c MobileNetworkSwitchControllerTest
2020-12-04 12:51:10 +00:00
Weng Su
96af1674f8 [Provider Model] Add Airplane-safe networks slice
- Hide slice when Airplane Mode is off

- Show slice when Airplane Mode is on
  - Show "View airplane-safe networks" when Wi-Fi is disabled
  - Show "Turn off Airplane Mode" when Wi-Fi is enabled

- Tap "View airplane-safe networks" will set Wi-Fi enabled

- Tap "Turn off Airplane Mode" will set airplane Mode off

- Plan to update the slice to Button style in next cl

- Screenshot
  https://screenshot.googleplex.com/7wHoqvTjaScHXVm

Bug: 173413889
Test:
- atest -c AirplaneSafeNetworksSliceTest
- adb shell am start -a
android.settings.panel.action.INTERNET_CONNECTIVITY

Change-Id: Idcd70348728db2da91582697aaeb4bbf4da117c6
2020-12-03 13:29:56 +00:00
Tom Hsu
011aeced5b Merge "Internet Picker implementation." 2020-11-30 03:01:09 +00:00
Weng Su
b263d3a136 Merge "[Provider Model] Add Airplane-safe Networks preference" 2020-11-30 02:14:34 +00:00
Weng Su
845db3499d [Provider Model] Add Airplane-safe Networks preference
- Hide the preference when airplane mode is off.

- Reuse PrimarySwitchPreference for RestrictedSwitchPreference

- Screenshot
  https://screenshot.googleplex.com/8HiC5sc8xaqnhz5

Bug: 174022082
Test: atest -c AirplaneSafeNetworksPreferenceControllerTest
Change-Id: I06a56e8e815778cebf200c4a486c414e92f4cb87
2020-11-28 16:22:10 +00:00
tom hsu
95b1d7cbbd Internet Picker implementation.
This version is to resolve the Reverted CL, ag/13127781
and make NetworkProviderSettingsTest passed

 Show mobile network on internet page

 With mobile network
  - https://screenshot.googleplex.com/7HzGhnbpitErynY

 Without mobile network
  - https://screenshot.googleplex.com/8sNVggTpKEhKeRh

Class diff: https://diff.googleplex.com/#key=WosyTF0ANVMf

Doc: https://docs.google.com/presentation/d/1azrZVS54pxM2lt9LkZHtFh_6W3fyDw_kTTPVQ_mJCi4/edit#slide=id.g9c7123c172_0_448

Bug: 173105859
Test: atest NetworkMobileProviderControllerTest passed
Test: make RunSettingsRoboTests ROBOTEST_FILTER=SubscriptionsPreferenceControllerTest passed
Test: make RunSettingsRoboTests ROBOTEST_FILTER=NetworkProviderSettingsTest passed

Change-Id: Ib0bdd148424881353f18307cb83798b4217060fc
2020-11-27 14:20:03 +00:00
TreeHugger Robot
caec49117e Merge "Revert "[Provider Model] Internet Picker implementation."" 2020-11-26 09:41:09 +00:00
Jason Chiu
ec3d482884 Revert "[Provider Model] Internet Picker implementation."
This reverts commit 329d753a29.

Reason for revert: Broken tests on NetworkProviderSettingsTest

Bug: 174285440
Change-Id: I47e6a9479559cb424bd4b8ac0e967f013f2fba86
2020-11-26 07:05:00 +00:00
Tom Hsu
ffd1ed3e8b Merge "[Provider Model] Internet Picker implementation." 2020-11-26 02:38:33 +00:00
Bonian Chen
0bff334632 [Settings] init UI entry for Cross SIM calling
Create an empty UI entry for Cross SIM calling.

TODO: fill-in implementation based on UI within document.

Document:
https://docs.google.com/document/d/1INEwrq5_M62hJcRMshdO0OaFruVR0goYByxdpMdFr_o/edit?disco=AAAAHQo7ang&ts=5fadc9b4&usp_dm=true#heading=h.8gw4a7e503pz

Bug: 174012397
Test: manual
Change-Id: I344a18954924c4665295ef244bfee773f3f98d55
2020-11-25 15:51:08 +00:00
tom hsu
329d753a29 [Provider Model] Internet Picker implementation.
Show mobile network on internet page

 With mobile network
  - https://screenshot.googleplex.com/7HzGhnbpitErynY

 Without mobile network
  - https://screenshot.googleplex.com/8sNVggTpKEhKeRh

Class diff: https://diff.googleplex.com/#key=WosyTF0ANVMf

Doc: https://docs.google.com/presentation/d/1azrZVS54pxM2lt9LkZHtFh_6W3fyDw_kTTPVQ_mJCi4/edit#slide=id.g9c7123c172_0_448

Bug: 173105859
Test: atest NetworkMobileProviderControllerTest passed
Test: make RunSettingsRoboTests ROBOTEST_FILTER=SubscriptionsPreferenceControllerTest passed

Change-Id: I9671a0b85aad1dd2f53772539505b0ad96edbda3
2020-11-23 15:55:40 +08:00
Zoey Chen
61ea59ab30 [Provider Model] Implement Calls & SMS fragment test case
New test case: NetworkProviderCallsSmsFragmentTest
Modify the key of preference

Bug: 172053880
Test: manual & atest -c NetworkProviderCallsSmsFragmentTest
Change-Id: I218aaf1194898e70b2118428c1ea5a389d85d036
2020-11-21 00:06:47 +08:00
Zoey Chen
cda7efb94d [Provider Model] Implement Calls & SMS controller
Screenshot of Provider Model:
Single SIM:
https://screenshot.googleplex.com/4pGBU7XK55CwJ7o.png
Dual SIM:
https://screenshot.googleplex.com/bXaFjsfGkgyHoYF.png

Screenshot of current: https://screenshot.googleplex.com/BtCgYmnpvT97SQs.png

Doc: https://docs.google.com/presentation/d/1azrZVS54pxM2lt9LkZHtFh_6W3fyDw_kTTPVQ_mJCi4/edit#slide=id.g9c7123c172_0_448

New controller: NetworkProviderCallsSmsController

Bug: 172053880
Test: manual
Change-Id: I86e9fc71d2b8562d838c5b5c6bd9c443656e2624
2020-11-20 15:43:04 +08:00
Zoey Chen
006fc3486b Merge "[Provider Model] Implement Wi-Fi callings in Calls & SMS" 2020-11-20 06:54:42 +00:00
Zoey Chen
fa2417aaac [Provider Model] Implement Wi-Fi callings in Calls & SMS
NetworkProviderWifiCallingPreferenceController is a catrgory of WFC.

It will add NetworkProviderWifiCallingGroup for SIMs which is WFC enabled dynamically.

Implement the current WFC logic: WifiCallingPreferenceController, for Provider Model

Diff with WifiCallingPreferenceController
https://diff.googleplex.com/#key=nzCL6Ybrkr19

Screenshot of Provider Model:
https://screenshot.googleplex.com/BCXxdo4iNh6M3tH.png

Screenshot of current WifiCallingPreferenceController:
https://screenshot.googleplex.com/BsBE3A5YRs6arw9.png

Doc: https://docs.google.com/presentation/d/1azrZVS54pxM2lt9LkZHtFh_6W3fyDw_kTTPVQ_mJCi4/edit#slide=id.g9c7123c172_0_448

Bug: 172053880
Test: manual & atest -c NetworkProviderWifiCallingPreferenceControllerTest & atest -c NetworkProviderWifiCallingForSubTest
Change-Id: I6f4b4a257bc5e94be3090445ccabbcb261a03730
2020-11-20 12:54:40 +08:00
Weng Su
be9235c082 Merge "[Provider Model] Add Internet preference to replace Wi-Fi preference" 2020-11-20 03:11:06 +00:00
Weng Su
f0b9dc570b [Provider Model] Add Internet preference to replace Wi-Fi preference
- Change title from "Wi-Fi" to "Internet"
- Remove Wi-Fi switch
- Screenshot:
  https://screenshot.googleplex.com/9tmXYQXKSsuGwEY
  https://screenshot.googleplex.com/5uMCeruXsX3gP9j

Bug: 172295984
Test: manual test
  atest -c InternetPreferenceControllerTest
  make RunSettingsRoboTests ROBOTEST_FILTER=NetworkDashboardFragmentTest
Change-Id: Ie4a3c9aff45fbe7b28594afc9c603e6df57300bf
2020-11-19 14:51:56 +00:00
SongFerng Wang
401a4d582d Merge "[Testcase] To migration CarrierPreferenceControllerTest" 2020-11-19 05:05:54 +00:00
SongFerng Wang
aa76ca4beb Merge "[Testcase] To migration DeleteSimProfilePreferenceControllerTest" 2020-11-19 04:53:54 +00:00
SongFerngWang
9f3c6e7cb3 [Testcase] To migration MobileNetworkSwitchControllerTest
1. Use AndroidJunit4 instead of RobolectricTestRunner
2. Use ApplicationProvider instead of RuntimeEnvironment
   to get context
3. Change Copy Right

Bug: 173385220
Test: atest MobileNetworkSwitchControllerTest

Change-Id: I127ba4123dd8e144dbf7778865a08582657f7195
2020-11-17 12:33:35 +08:00
SongFerngWang
0995d71922 [Testcase] To migration DeleteSimProfilePreferenceControllerTest
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
5. onPreferenceClick_startsIntent test case was changed

Bug: 173332890
Test: atest DeleteSimProfilePreferenceControllerTest
Change-Id: Ia7cde5a1da23fd976d99432faa8526c7aa0bf97f
2020-11-16 07:07:08 +00:00
SongFerngWang
f21a4fb50c [Testcase] To migration CarrierPreferenceControllerTest
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: 173340087
Test: atest CarrierPreferenceControllerTest
Change-Id: Ia0dcc9db5e99626ce0f410d62d16089e0f75e123
2020-11-16 07:00:59 +00:00
Zoey Chen
baa56fac45 Merge "[Provider Model] Add new API to detect" 2020-11-15 16:04:13 +00:00
SongFerng Wang
b61853f468 Merge "[TeseCase] unify the getResourcesString" 2020-11-15 15:05:39 +00:00
Zoey Chen
7233f63139 Merge "[Provider Model] A mock of WifiCallingQueryImsState for unit test." 2020-11-13 11:49:30 +00:00
Zoey Chen
3abe48ef38 [Provider Model] Add new API to detect
1. current connection is mobile data
 - remove the SubscriptionsPreferenceController#activeNetworkIsCellular() and move into MobileNetworkUtils
2. isProviderModel API
 - Add it in Util for Provider Model
3. isWiFiCallingEnabled
 - remove WifiCallingPreferenceController#isWifiCallingEnabled() and move into MobileNetworkUtils
4. Add nes test case for MobileNetworkUtils

Bug: 171873895
Test: atest -c MobileNetworkUtilsTest
Change-Id: I4bfdf0537fe07d064d6c0ba4a2c44b4a4f158d91
2020-11-13 18:01:10 +08:00
Zoey Chen
80328dc307 [Provider Model] A mock of WifiCallingQueryImsState for unit test.
Copied it from MockWifiCallingQueryImsState which is existed in robotests

Diff: https://diff.googleplex.com/#key=DgvbruCHVQpt

Bug: 172053880
Test: manual
Change-Id: I8255db70fe7916e6ac18b56a646a6761bbda106b
2020-11-13 18:01:01 +08:00
SongFerngWang
ea6b1e2312 [TeseCase] unify the getResourcesString
Bug: 173099559
Test: atest PreferredNetworkModePreferenceControllerTest  (PASS)
atest OpenNetworkSelectPagePreferenceControllerTest (PASS)
atest MobilePlanPreferenceControllerTest            (PASS)
atest MobileDataPreferenceControllerTest            (PASS)
atest Enhanced4gLteSliceHelperTest                  (PASS)
atest AutoSelectPreferenceControllerTest            (PASS)

Change-Id: I9a2e3d69cbd933a1282d51b7d8869e6a1ec4cb14
2020-11-13 15:53:55 +08:00
SongFerng Wang
8096d70c58 Merge "[Testcase] To migration DisabledSubscriptionControllerTest" 2020-11-13 02:37:18 +00:00
SongFerng Wang
9489e8128d Merge "[Testing] To migration DefaultSubscriptionControllerTest" 2020-11-12 13:30:16 +00:00
SongFerngWang
aa941c91b7 [Testing] To migration DefaultSubscriptionControllerTest
1. Use AndroidJunit4 instead of RobolectricTestRunner
2. Use ApplicationProvider instead of RuntimeEnvironment to get context
3. Change Copy Right
4. Create new class and add a function which loads the Settings Resource.
5. remove getOnPreferenceChangeListener. Becasue the error:
java.lang.NoSuchMethodError: No virtual method getOnPreferenceChangeListener()

Bug: 173004787
Test: atest -c DefaultSubscriptionControllerTest
Change-Id: Iac9834f2a47bd8b50234646197a31058ffacaa4b
2020-11-12 16:02:17 +08:00
SongFerngWang
216b346438 [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
2020-11-12 11:10:20 +08:00