Commit Graph

275 Commits

Author SHA1 Message Date
TreeHugger Robot
a8fcc6a678 Merge "[Provider Model] Remove Wi-Fi disconnect action" into sc-dev am: ab04f86066 am: 91d1b6640a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14964828

Change-Id: Ic3e3f1c1364e529c57a01d332e2244d0615ec566
2021-06-15 13:01:36 +00:00
TreeHugger Robot
ab04f86066 Merge "[Provider Model] Remove Wi-Fi disconnect action" into sc-dev 2021-06-15 12:36:38 +00:00
TreeHugger Robot
ac44f3569a Merge "[Provider Model] Hide W+ network if it's inactive" into sc-dev am: 1ce0d1117e am: 479c1a1c5d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14934760

Change-Id: I7f9cf20b6aab539555df3e9644f2d499252f3467
2021-06-15 09:48:18 +00:00
Weng Su
58a651566f [Provider Model] Remove Wi-Fi disconnect action
Bug: 189912933
Test: manual test
atest -c ProviderModelSliceTest

Change-Id: I964bf8de4f5eee1523943876567bf565ccb7f995
2021-06-15 17:43:31 +08:00
TreeHugger Robot
bc895fd254 Merge "Revert "[Provider Model] Add WiFi toggle in internet panel"" into sc-dev am: 68079c7bd2 am: d441988494
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14964819

Change-Id: I7bd0881b5314b0a7a82da64875aab5a990382871
2021-06-15 08:25:25 +00:00
Weng Su
28e5f4c2fc Revert "[Provider Model] Add WiFi toggle in internet panel"
This reverts commit 04a4060225.

Reason for revert: Need to split the functions for cherry picking to different branches

Bug: 189912933
Change-Id: I8c30a87c83e23b3df88ce2689d500626e1dd28d2
2021-06-15 04:10:13 +00:00
TreeHugger Robot
5b4f9e63dc Merge "[Provider Model] Add WiFi toggle in internet panel" into sc-dev am: 38df9ce8bb am: 2ba6886bce
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14880638

Change-Id: I577afae3fa5b5c952a265951f66fccb183d45fcc
2021-06-12 11:07:24 +00:00
Weng Su
c4eb3b1320 [Provider Model] Hide W+ network if it's inactive
Bug: 187854575
Test: manual test
atest -c CarrierWifiTogglePreferenceControllerTest \
         SubscriptionsPreferenceControllerTest

Change-Id: Ib99bc7fef38a99c1da1e365c2002ad30c617d445
2021-06-12 00:55:10 +00:00
Weng Su
04a4060225 [Provider Model] Add WiFi toggle in internet panel
- Move Wi-Fi toggle from menu button to slice row

- Remove Wi-Fi disconnect action

- Show scanning sub-title once only

Bug: 189912933
Test: manual test
atest -c InternetConnectivityPanelTest \
         ProviderModelSliceTest

Change-Id: I2baf05362f5cd0a8ce94c7b3b2b112a7e9fe6894
2021-06-12 00:53:52 +00:00
Tom Hsu
b52f7484be Merge "[Settings] Disable gear button if user is not admin." into sc-dev am: a2a570f60b am: 979e486314
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14819346

Change-Id: I65fe0a09a754637ece40a57eacc8b1c05741bf19
2021-06-10 04:29:08 +00:00
Tom Hsu
a2a570f60b Merge "[Settings] Disable gear button if user is not admin." into sc-dev 2021-06-10 04:00:12 +00:00
Weng Su
e3d6d635bd Merge "[Provider Model] Fix the panel non responsive issue" into sc-dev am: 635e57bd4e am: c390be0a48
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14891919

Change-Id: I71c205542f369b7870dcfce4c7b6960cdb8d7a13
2021-06-09 10:47:34 +00:00
Weng Su
8c29ff0a27 [Provider Model] Fix the panel non responsive issue
Bug: 187340277
Test: manual test
atest -c ProviderModelSliceTest

Change-Id: Ie27a5049b2cab05b7c7936395d0db85c3c594d96
2021-06-09 00:35:53 +08:00
tom hsu
f7811dfd09 [Settings] Disable gear button if user is not admin.
- Mobile settings include many settings which second user shall not
  modify, so make gear button disabled to avoid second user want to try.

Bug: 184303943
Test: Maunal test passeded
Test: atest passed.
Change-Id: Ic04fa71772df4ac424965ad2ca95733b1e15d6a7
2021-06-08 15:03:00 +08:00
Zoey Chen
511be24bbf Merge "[ProviderModel] Use category to separate physical SIM and e-SIM" into sc-dev am: c968a80ff6 am: 67551e8dd2 am: fe8f6a1c99
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14732243

Change-Id: If6761df2973935dde4080c29899314bdbccc92d6
2021-06-01 03:21:17 +00:00
Zoey Chen
71fada3af8 [ProviderModel] Use category to separate physical SIM and e-SIM
Mock from UX: https://screenshot.googleplex.com/4kscwJvoQE7vwF3.png

Implementation UI: https://screenshot.googleplex.com/AEeVzLi364KiPGa.png

Bug: 187071119
Test: atest NetworkProviderSimListControllerTest
Test: atest NetworkProviderSimsCategoryControllerTest
Test: atest NetworkProviderDownloadedSimListControllerTest
Test: atest NetworkProviderDownloadedSimsCategoryControllerTest

Change-Id: Ia84bebe6ea431cdbae19f3e4b840f7cd56dc2d6f
2021-05-31 23:59:37 +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
Weng Su
9512d53697 Merge "[Provider model] Add "See all" text link to Internet Panel" into sc-dev 2021-05-26 11:45:00 +00:00
Weng Su
a2084a63c6 [Provider model] Add "See all" text link to Internet Panel
- Add "See all" text link at the bottom of the network providers list
  - Don't show "See all" text link if the Wi-Fi network is empty

Bug: 188710392
Test: manual test
atest -c ProviderModelSliceTest

Change-Id: If99c1e6597b4d2ef6a916fbdab3df9cfad8b464e
2021-05-26 11:44:09 +00:00
Weng Su
59f7b677fe Merge "[Provider model] Add "Turn off/on Wi-Fi" link to Internet Panel" into sc-dev 2021-05-26 11:43:49 +00:00
Weng Su
7b8c367d4f [Provider model] Add "Turn off/on Wi-Fi" link to Internet Panel
- Replace the left menu button with "Turn off/on Wi-Fi"
  - Remove the TurnOnWifiSlice

- Show "Wi-Fi is off" sub-title when Wi-Fi is disabled
  - Remove the "Wi\u-Fi is turned on" sub-title when APM is on.

Bug: 188710392
Test: manual test
atest -c InternetConnectivityPanelTest
make RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.panel

Change-Id: I53e200f6cadf8b712bf794bcbd5ff79f0f239cc0
2021-05-26 17:22:38 +08:00
Betty Chang
4246049c7c Merge "Remove the Network rating provider item" into sc-dev 2021-05-24 06:42:10 +00: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
Jack Yu
3616520985 Merge "API Review: Rename CAPABILITY_ALLOWED_NETWORK_TYPES_USED" into sc-dev 2021-05-19 16:26:18 +00:00
Weng Su
3d2950c8af Introduce new Disconnect functionality for Wifi networks in Internet
Panel only

- Display the close icon on the Wi-Fi network connected to the Internet,
and performs the same action as tapping on the carrier network when
tapped it.

- Display the cog icon on the Wi-Fi network if it has no the Internet
access.

- Screenshot:
  https://screenshot.googleplex.com/YBQ8onG2dFJ8Q2a

Bug: 187995278
Test: manual test
atest -c ProviderModelSliceTest

Change-Id: Id54a94c1fdfc37aff5cc37d6fb9f5478c0dccb00
2021-05-19 01:52:05 +08:00
SongFerngWang
d7969369de API Review: Rename CAPABILITY_ALLOWED_NETWORK_TYPES_USED
CAPABILITY_ALLOWED_NETWORK_TYPES_USED is renamed CAPABILITY_USES_ALLOWED_NETWORK_TYPES_BITMASK
Bug: 182198501
Test: atest packages/apps/Settings/tests/unit/src/com/android/settings/network/telephony/Enable2gPreferenceControllerTest.java
atest frameworks/opt/telephony/tests/telephonytests/src/com/android/internal/telephony/RadioConfigResponseTest.java

Change-Id: Id9a27ad972ba7b27311e1b8c6b245f42b94fc7be
2021-05-17 17:20:54 +08:00
Tom Hsu
fa024d6fc8 Merge "Show W+ when connected to Carrier Wi-Fi Network" into sc-dev 2021-05-10 08:35:36 +00:00
tom hsu
2519077d97 Show W+ when connected to Carrier Wi-Fi Network
Internet picker
  - https://screenshot.googleplex.com/7k4ojF65a8Bis5R
 Internet panel
  - https://hsv.googleplex.com/6749112168873984
Bug: 185431894
Test: atest passed

Change-Id: Ic79686b47f033870ad8e7741f9baf3230dde7b7c
2021-05-10 14:08:05 +08:00
Weng Su
88cafbaa24 [Provider Model] Fix settings crash issue
- The GlobalSettingsChangeListener needs to be closed after the life
cycle is destroyed

Bug: 185756174
Bug: 186404332
Bug: 186591527
Test: manual test
atest -c InternetUpdaterTest

Change-Id: I9fbad3b303055c6c7a61ccad8efe69cefef56c58
2021-05-06 05:53:41 +08:00
SongFerng Wang
03fbae7fc5 Merge "Ui show "No connection" when WiFi is turned on and no available network" into sc-dev 2021-04-28 07:18:01 +00:00
Tom Hsu
463805b142 Merge "[Provider model] Show no connection during out of service." into sc-dev 2021-04-28 06:32:33 +00:00
SongFerngWang
8e0349a67b Ui show "No connection" when WiFi is turned on and no available network
Follow this table to display the UI.
https://docs.google.com/spreadsheets/d/1w7R7Q3EXkep7iO4VcgioNp00DWas3Xve5i1rWexAkz8/edit#gid=954295315
Bug: 183593681
Test: atest ProviderModelSliceTest
atest ProviderModelSliceHelperTest
atest InternetConnectivityPanelTest
make RunSettingsRoboTests -j

Change-Id: I103f9b2fafe4fc543452a74b7ee7b2e537f879b5
2021-04-28 12:35:37 +08:00
Yomna Nasser
7299387774 Merge "Handle invalid subIds in Enable2gPreferenceController." into sc-dev 2021-04-22 16:00:02 +00:00
tom hsu
f482c28423 [Provider model] Show no connection during out of service.
- When device out of service, show "No connection" on preference summary.
 - Modify the logic of icon and summary.

Bug: 183944316
Test: atest SubscriptionsPreferenceControllerTest passed
Change-Id: I179632918a9145f27cec7d9c08e1c0b675fd1ef6
2021-04-22 21:56:42 +08:00
Yomna Nasser
e43f26294d Handle invalid subIds in Enable2gPreferenceController.
Implements improved handling of invalid subIds in the
"Allow 2G" controller + unit tests.

Bug: 185264531
Test: m & atest -c Enable2gPreferenceControllerTest
Change-Id: I7587f1a2a8150bbc6cc0864c9a13d0d910a26682
2021-04-22 00:14:29 +00:00
TreeHugger Robot
b8f0a8e2dc Merge "[Provider Model] Carrie Wi-Fi offload toggle request (panel)" into sc-dev 2021-04-21 08:19:23 +00:00
TreeHugger Robot
d4a4fead67 Merge "[Provider Model] Carrie Wi-Fi offload toggle request" into sc-dev 2021-04-21 08:19:13 +00:00
Weng Su
a320fb12a1 [Provider Model] Carrie Wi-Fi offload toggle request (panel)
- Do not set Carrier Network together when setting Mobile Data, if
carrner network provision enabled.

Bug: 182324921
Test: manual test
atest -c ProviderModelSliceTest
make RunSettingsRoboTests ROBOTEST_FILTER=WifiScanWorkerTest

Change-Id: Ic8b77fd7b43372f077ba1c8be8fd9a7c3bcff197
2021-04-20 22:36:04 +08:00
Weng Su
aeb6200bfe [Provider Model] Carrie Wi-Fi offload toggle request
- Remove the Advanced expandable list pattern and expose the items

- Add Carrie Wi-Fi offload toggle preference

- Add Carrier Wi-Fi network preference

- Do not set Carrier Network together when setting Mobile Data, if
carrner network provision enabled.

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

Bug: 182324921
Test: manual test
atest -c CarrierWifiTogglePreferenceControllerTest \
         MobileDataPreferenceControllerTest \
	 WifiPickerTrackerHelperTest

Change-Id: I5a7f4cc6850fe76c0efee392c0c0c23cb41f5e1e
2021-04-20 07:58:20 +08: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
SongFerng Wang
c7d2169120 Merge "The Network Select shows wrong operator name" into sc-dev 2021-04-12 02:45:52 +00:00
SongFerngWang
5c2b140483 The Network Select shows wrong operator name
It get the empty subscriptionInfoList from
 SubscriptionManager#getAccessibleSubscriptionInfoList, so the UI
 shows default subId's operator.
 Since this item appears, when sim is active, using
 getActiveSubscriptionInfoList is enough.

 - https://screenshot.googleplex.com/9aHtDVpnYQBsiQr

Bug: 182020952
Test: atest MobileNetworkUtilsTest
atest OpenNetworkSelectPagePreferenceControllerTest

Change-Id: I0d86ec41236a0d1be657ccd57fd0cf90f96b8b89
2021-04-09 12:07:00 +00:00
Jeremy Goldman
a51780f35d Subscription name has whitespace trimmed to determine uniqueness
For example, if a subscription has the name "subsc" and another has
"subsc    " the extra unique information will be added to the
subscriptions.

Test: atest -c SubscriptionUtilTest
Bug: 183664625
Change-Id: Ia137169f6cdd9804ab04126e5045c9fb61556d54
2021-04-07 16:26:52 +08:00
Weng Su
4e341b780a Merge "[Provider Model] Move the Internet unavailable Wi-Fi down" into sc-dev 2021-03-30 11:32:57 +00: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
439cc64b1c [Provider Model] Move the Internet unavailable Wi-Fi down
- Check the Wifi network have both INTERNET and VALIDATED capabilities
to achieve effective network access

- Move the Internet unavailable Wi-Fi down to the top of Wi-Fi list

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

- Screenshot:
  https://screenshot.googleplex.com/w82kbALssdTZmg4

Bug: 178457619
Bug: 178926547
Bug: 178978070
Test: manual test on device
atest -c InternetUpdaterTest \
         NetworkProviderWorkerTest \
         ProviderModelSliceTest

Change-Id: Idf04e556ab5a87abc5bc96d1934f5e8fd91fbfaa
2021-03-26 23:24:14 +08:00
Peter Wang
fe042ac08e Merge "Removed unused import" am: 3fbb8612f5 am: 3cac950712 am: 204f35dc58
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1652770

Change-Id: Ib9676c28c112cc712f91f9e8c40b1e1e9aa61fa4
2021-03-25 05:09:59 +00:00
Peter Wang
f8f7876c01 Removed unused import
Test: Build
Bug: N/A
Change-Id: Idd87913a67486deaf125b5b5aed89600bfac1982
2021-03-24 11:26:16 -07:00