Commit Graph

1698 Commits

Author SHA1 Message Date
Lucas Lin
159f261889 Merge "Use getPrivateDnsMode() to get the value of private DNS" 2021-03-16 07:39:35 +00:00
Treehugger Robot
e0c081b02e Merge "Add OWNER to network/datausage/wifi path" am: 56834d2ce3 am: c38b502c4a am: f21b7ac120
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1635179

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I422c40567fc90176cea5242494028d621c1656a5
2021-03-15 12:54:33 +00:00
Treehugger Robot
f21b7ac120 Merge "Add OWNER to network/datausage/wifi path" am: 56834d2ce3 am: c38b502c4a
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1635179

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If2ab0c8c81b6ba25a32bd41437c6a37cda9fc0e9
2021-03-15 12:12:13 +00:00
Betty Chang
ebea5200cb Add OWNER to network/datausage/wifi path
Change-Id: I30ca24ea0823378d18b39a2eae937378662f6c14
2021-03-15 06:39:14 +00:00
Lucas Lin
be164d0a55 Merge "Use getPrivateDnsMode() to get the value of private DNS" into sc-dev 2021-03-15 01:00:25 +00:00
SongFerng Wang
516042b160 Merge "Change the behavior of notifyAllowedNetworkTypesChanged." into sc-dev 2021-03-12 18:49:49 +00:00
TreeHugger Robot
8d73578b5f Merge "[Provider Model] Show Off if WFC is disabled by user" into sc-dev 2021-03-12 12:32:38 +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
TreeHugger Robot
cba72ddc2e Merge "[Provider Model] Adjust slice title and subtitle" into sc-dev 2021-03-12 10:19:26 +00:00
Zoey Chen
dc1ec2d092 [Provider Model] Show Off if WFC is disabled by user
Bug: 182232693
Test: make and atest
Change-Id: I0ef0a09adb1c9636ec14e0ab71116fd2834f1f97
2021-03-12 15:30:07 +08:00
Weng Su
d0e98010c4 Merge "[Provider Model] Update Airplane mode message" into sc-dev 2021-03-12 07:04:52 +00: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
Sooraj Sasindran
14a2fd6bc1 Merge "update isCrossSimCallingEnabledByUser name" into sc-dev 2021-03-11 23:55:50 +00:00
Sooraj Sasindran
1ce8eb765a update isCrossSimCallingEnabledByUser name
update isCrossSimCallingEnabledByUser name to
isCrossSimCallingEnabled

Bug: 179143945
Test: build
Change-Id: I8bb0196cc04dc437ed709548ecd569c4dd7828a1
2021-03-10 16:43:49 -08:00
Weng Su
6a0ef56917 [Provider Model] Adjust slice title and subtitle
- Show "Airplane mode" title when airplane mode is enabled

- Remove "Airplane mode is on" subtitle

- Show "Wi-Fi is turned on" subtitle when both airplane mode and Wi-Fi
is enabled

- Remove the function related to isApmNetworksAvailable()

- Screenshot:
  https://screenshot.googleplex.com/6X9nzmXRCUfw4Lp
  https://screenshot.googleplex.com/6jQryMjU2yDDpmM

Bug: 181858434
Test: manual test
atest -c InternetConnectivityPanelTest \
         InternetPreferenceControllerTest \
         InternetUpdaterTest

Change-Id: I84e5d4c60ed91d58443b27c35286a84bf72ac173
2021-03-10 22:34:35 +08:00
TreeHugger Robot
38e19abdf7 Merge "[Provider Model] Add Wi-Fi toggle slice" into sc-dev 2021-03-10 01:44:42 +00:00
Zoey Chen
9988792138 Merge "[Telephony] Use TelephonyCallback instead of PhoneStateListener part5" am: 9abf2bff3b am: 6003cb977f
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1620520

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib339b36768196e6e5f676944754d5736937b16cd
2021-03-09 11:51:04 +00:00
SongFerngWang
4ccbe5d785 Change the behavior of notifyAllowedNetworkTypesChanged.
Bug: 180903931
Test: atest AllowedNetworkTypesListenerTest.java
Change-Id: Ic94816415920bf25896ef2b198e228f369039c94
2021-03-09 18:36:01 +08:00
Paul Hu
e5e60115db Merge "Update Utils#getTetheringLabel usage on Settings" into sc-dev 2021-03-09 03:33:01 +00:00
Weng Su
036deee00e [Provider Model] Add Wi-Fi toggle slice
- Reuse “Turn on networks” slice

- Add "Turn on Wi-Fi" slice
  - Show Wi-Fi end icon

- Screenshot:
  https://screenshot.googleplex.com/63pdow7dJh3tTw7

Bug: 181858434
Test: manual test
atest -c TurnOnWifiSliceTest \
         InternetConnectivityPanelTest

Change-Id: I82de79fd45e99d2fe82554437bde50068dc1ae00
2021-03-08 16:47:19 +08:00
lucaslin
b07054ca9c Use getPrivateDnsMode() to get the value of private DNS
PRIVATE_DNS_DEFAULT_MODE_FALLBACK has removed, use
ConnectivityManager#getPrivateDnsMode() to get the value of
private DNS instead of querying settings and implementing logic
by itself.

Bug: 172183305
Test: make RunSettingsRoboTests \
      ROBOTEST_FILTER=PrivateDnsPreferenceControllerTest
Test: make RunSettingsRoboTests \
      ROBOTEST_FILTER=PrivateDnsModeDialogPreferenceTest
Change-Id: I024c3ddfb85f4c3d177e2e99294c998d81d4e08d
2021-03-08 08:19:50 +00:00
lucaslin
f2e03475b3 Use getPrivateDnsMode() to get the value of private DNS
PRIVATE_DNS_DEFAULT_MODE_FALLBACK has removed, use
ConnectivityManager#getPrivateDnsMode() to get the value of
private DNS instead of querying settings and implementing logic
by itself.

Bug: 172183305
Test: make RunSettingsRoboTests \
      ROBOTEST_FILTER=PrivateDnsPreferenceControllerTest
Test: make RunSettingsRoboTests \
      ROBOTEST_FILTER=PrivateDnsModeDialogPreferenceTest
Change-Id: I024c3ddfb85f4c3d177e2e99294c998d81d4e08d
Merged-In: I024c3ddfb85f4c3d177e2e99294c998d81d4e08d
2021-03-08 08:19:28 +00:00
Weng Su
5c82ddf075 Merge "[Provider Model] Add Wi-Fi toggle" into sc-dev 2021-03-08 05:57:06 +00:00
paulhu
81854ca397 Update Utils#getTetheringLabel usage on Settings
Utils#getTetheringLabel() is using TetheringManger to get
tetherable interface. So update the usage on Settings.

Bug: 180693313
Test: atest SettingsRoboTests
Change-Id: I4e1a983195a0fe91b98a497b6377f2ff554a3ffd
2021-03-08 10:58:39 +08:00
Yomna Nasser
b6042cec85 Merge "Add metrics to Enable2gPreferenceController." into sc-dev 2021-03-05 22:26:49 +00:00
Zoey Chen
d841a36c6f Merge "[Telephony] Use TelephonyCallback instead of PhoneStateListener part5" into sc-dev 2021-03-05 14:43:52 +00:00
Weng Su
edebd02b0a [Provider Model] Add Wi-Fi toggle
- Network & internet Settings
  - Remove “Show airplane mode networks"

- Internet Settings
  - Add “Wi-Fi” switch preference
    - Show “Find and connect to Wi-Fi networks” in summary

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

Bug: 181858434
Test: manual test
atest -c NetworkDashboardFragmentTest \
         WifiSwitchPreferenceControllerTest
make RunSettingsRoboTests ROBOTEST_FILTER=NetworkProviderSettingsTest

Change-Id: Ic420ff40cfdfb3ae29ee6f754ce139cb54651bda
2021-03-05 16:32:06 +08:00
SongFerng Wang
cc1715e2c0 Merge "Replace allowedNetworkTypes with allowedNetworkTypesForReason" am: 6775f40664 am: 29594edb70
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1614990

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8cde83c4699a3859c3a0748688ab0c0dc0fd5a04
2021-03-05 05:17:42 +00:00
Zoey Chen
bf1857e4a5 [Telephony] Use TelephonyCallback instead of PhoneStateListener part5
Since the redesign of PhoneStateListener, use TelephonyCallback to get the callback of EVENT_*

Bug: 167684594
Test: make and atest NetworkProviderWorkerTest
Change-Id: I52af54045872bbf13e64d5d94c8b027ec702abb9
Merged-In: I52af54045872bbf13e64d5d94c8b027ec702abb9
2021-03-05 11:46:46 +08:00
Tom Hsu
1db2d1a25b Merge "[Provider Model] Fix preference summary not update." into sc-dev 2021-03-05 03:25:59 +00:00
Yomna Nasser
6adc5ab334 Add metrics to Enable2gPreferenceController.
Test: m & atest -c Enable2gPreferenceControllerTest & statsd_testdrive 97
Bug: b/181699391
Change-Id: I1ad860937cec7594c482706cadd853b115436594
2021-03-05 01:18:40 +00:00
TreeHugger Robot
74d540f8f0 Merge "[Provider Model] Ethernet default network with APM enabled on Panel" into sc-dev 2021-03-04 22:46:37 +00:00
SongFerngWang
959454f32a Use SubscriptionManager.getResourcesForSubId to get Resources am: 766f78e8ed am: 18c15a2545
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1618688

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2de84a9f2ee32569f71fd46fc87a448237147d02
2021-03-04 13:45:18 +00:00
tom hsu
edaeb41ff7 [Provider Model] Fix preference summary not update.
- When activity enter onPause, the status will not update, then
 sub id of TelephonyManager keep same value after activity go back.

 - Solution: Everytime update the UI, and always get new
 TelephonyManager with the latest sub id.

Bug: 181196545
Test: atest passed.
Test: Manual test passed.
Change-Id: I1d65bbc06af66b97b6c85f40bed394da03213d06
2021-03-04 21:26:57 +08:00
Calvin Pan
41a7293038 Merge "Show VoLTE UI when VoIMS opt-in enabled" into sc-dev 2021-03-04 11:33:47 +00: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
Weng Su
698b4b3ca0 [Provider Model] Ethernet default network with APM enabled on Panel
- Move the connected Wi-Fi network into Wi-Fi list

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

Bug: 178926547
Bug: 179106406
Test: manual test
atest -c ProviderModelSliceTest

Change-Id: Idd0e0ab52d6fc88633d5b2eddabb00036e077c88
2021-03-04 18:27:54 +08: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
Xin Li
6b94f5ac81 Merge "Merge RQ2A.210305.007" 2021-03-03 21:41:36 +00:00
Adrian Roos
d99faa25c0 Revert "Merge "Update Utils#getTetheringLabel usage on Settings" am: 2b1e3a971f am: ddf3efb070 am: 8c38e9543e"
This reverts commit 0df55e1eb4.

Reason for revert: Other CLs in topic were skipped, but this one wasn't, which broke sc-dev.

Change-Id: Icf61dae071416381ea11cbe74cd92ae934c3047e
2021-03-03 14:51:42 +00:00
Paul Hu
0df55e1eb4 Merge "Update Utils#getTetheringLabel usage on Settings" am: 2b1e3a971f am: ddf3efb070 am: 8c38e9543e
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1601653

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4332292590088a0453cd7cfa2dc66f775e2d79dd
2021-03-03 13:27:16 +00:00
Zoey Chen
ea29704e40 [Telephony] Use TelephonyCallback instead of PhoneStateListener part5
Since the redesign of PhoneStateListener, use TelephonyCallback to get the callback of EVENT_*

Bug: 167684594
Test: make and atest NetworkProviderWorkerTest
Change-Id: I52af54045872bbf13e64d5d94c8b027ec702abb9
2021-03-03 16:23:52 +08:00
Paul Hu
8c38e9543e Merge "Update Utils#getTetheringLabel usage on Settings" am: 2b1e3a971f am: ddf3efb070
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1601653

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iccd3b694b9e9f4ac1658093923c923a98d83ccfb
2021-03-03 08:07:19 +00:00
Paul Hu
ddf3efb070 Merge "Update Utils#getTetheringLabel usage on Settings" am: 2b1e3a971f
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1601653

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I51b526d575a540cfb7ab6cef8be5d096f3660728
2021-03-03 02:59:37 +00:00
Bonian Chen
3f211d4c64 Merge "[Settings] Only display backup calling when more than 1 SIM" into sc-dev 2021-03-02 23:19:24 +00:00
Bonian Chen
a9a411e3df [Settings] Only display backup calling when more than 1 SIM
Backup calling only available when more than 1 SIM available.

Bug: 179802059
Test: on device
Change-Id: I24e5eb9e1a7064c3ea65389fbb00c0ff2a5852ed
2021-03-02 21:14:53 +08:00
paulhu
2a5051e4fd Update Utils#getTetheringLabel usage on Settings
Utils#getTetheringLabel() is using TetheringManger to get
tetherable interface. So update the usage on Settings.

Bug: 180693313
Test: atest SettingsRoboTests
Change-Id: I1907743ed13c333ecbafd25b6dd9276fe692f2ea
2021-03-02 03:57:34 +00:00
TreeHugger Robot
9531fb8ffb Merge "[Provider Model] Show connected networks in APM/APM networks" into sc-dev 2021-03-02 01:53:04 +00:00
Weng Su
f1489b51a3 [Provider Model] Show connected networks in APM/APM networks
- Separate APM and APM network types from other Internet types because
they can coexist at the same time.

- Show no internet icon in airplane-mode networks.

- Show connected non-carrier(Wi-Fi) network in airplane-mode networks.

- Show connected Ethernet network when airplane mode on.

- Screenshot:
  https://screenshot.googleplex.com/cr3eWNLMEuJ8zvP
  https://screenshot.googleplex.com/6DiMqKBBnBoxxhN

Bug: 180778141
Bug: 180778839
Bug: 179106406
Test: manual test
atest -c ConnectedEthernetNetworkControllerTest \
         InternetConnectivityPanelTest \
         InternetPreferenceControllerTest \
         InternetUpdaterTest

Change-Id: I861d5ce879facbb61dfdc5b7be943662d55bdcca
2021-03-02 02:59:11 +08:00
Yomna Nasser
7c7977efae Include 1xRTT when updating set of RATs via "Allow 2G" toggle.
Update BITMASK_2G to include 1xRTT when disabling/enabling 2G
via toggle in Enable2gPreferenceController. This is to align
with TelephonyManager's NETWORK_CLASS_BITMASK_2G.

Bug: b/163168917
Test: m & atest -c Enable2gPreferenceControllerTest
Change-Id: Ia0e099b63a9089be8cd8bfd4211db9eb3c506fc3
2021-02-27 00:11:01 +00:00