Commit Graph

1771 Commits

Author SHA1 Message Date
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
Sarah Chin
111a371005 Merge "Update setCdmaRoaming/SubscriptionMode APIs" am: b26cf2d260 am: 04b9046ec6 am: caa76d8261
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1506517

Change-Id: I3305ed2659027a109672c10a06b70300c66ba80e
2020-11-20 04:43:00 +00:00
Sarah Chin
caa76d8261 Merge "Update setCdmaRoaming/SubscriptionMode APIs" am: b26cf2d260 am: 04b9046ec6
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1506517

Change-Id: I8780119041580b96c823b76ba944599484ac317f
2020-11-20 04:08:18 +00:00
Sarah Chin
ce9fda5a60 Update setCdmaRoaming/SubscriptionMode APIs
Test: atest TelephonyManagerTest
Test: make RunSettingsRoboTests
Bug: 171884158
Bug: 171883908
Change-Id: Ib78149c41612d56a46974621eb71b5e0cfe97c5a
Merged-In: Ib78149c41612d56a46974621eb71b5e0cfe97c5a
2020-11-19 14:46:37 -08: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
Zoey Chen
87a5961243 [Provider Model] Show all carrier's name on MobileNetworkSummaryController's summary
Screenshot of Provider Model: https://screenshot.googleplex.com/6mKLeMWGWZJh86u.png

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

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

Bug: 172229551
Test: manual and make RunSettingsRoboTests ROBOTEST_FILTER=MobileNetworkSummaryControllerTest

Change-Id: I0f2a23659ef80b6a76b34af9503ad8d746967859
2020-11-17 08:33:54 +00:00
TreeHugger Robot
d58a9cdd05 Merge "[Provider Model] Preferences Settings UI change" 2020-11-16 06:35:07 +00:00
Weng Su
6bf7b1a72f [Provider Model] Preferences Settings UI change
- Change the title from “Wi-Fi preference” to “Preferences”
- Change the summary from “Wi-Fi turns back on automatically” to
“Connect to public networks”
- Remove “Turn on Wi-Fi automatically” preference
- Screenshot:
  https://screenshot.googleplex.com/Areywyb46deK9VQ
  https://screenshot.googleplex.com/6H5Z4PxA5tWXZ6S

Bug: 172788645
Test: manual test
Change-Id: Ibce21f1d740a139b407a0a9a41f2cb4c4e34776c
2020-11-15 20:14:25 +00:00
Zoey Chen
baa56fac45 Merge "[Provider Model] Add new API to detect" 2020-11-15 16:04:13 +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
Weng Su
6ec5cdf06a Merge "[Provider Model] Non-carrier data usage settings UI change" 2020-11-13 02:50:06 +00:00
Weng Su
d9d9224c0f Merge "[Provider Model] Remove “Use Wi-Fi” switch" 2020-11-12 12:38:35 +00:00
Weng Su
890d3e039b [Provider Model] Non-carrier data usage settings UI change
- Change the title from “Wi-Fi data usage” to “Non-carrier data usage”
- Change the warning message from “Carrier data accounting may differ
from device accounting” to “Excludes data that is used by carrier
networks”
- Screenshot:
  https://screenshot.googleplex.com/3bicWHu7g5StH8R
  https://screenshot.googleplex.com/AqceQBtY4AqnuGH

Bug: 172788855
Test: manual test
Change-Id: Ic4d6e5dbb0b7d1d851f6cf033d400a7f780261ac
2020-11-12 08:04:35 +00:00
Bonian Chen
d2e22f4cee [Settings] Reduce the operation of VoLTE config redraw
There're 3 VoLTE configuration UIs sharing the same configuration,
but only 1 of them will be displayed.

The 3 classes extending Enhanced4gBasePreferenceController are:
1. Enhanced4gAdvancedCallingPreferenceController
2. Enhanced4gCallingPreferenceController
3. Enhanced4gLtePreferenceController
They're different in the value of getMode().

The design within Enhanced4gBasePreferenceController only allows to show one of them.
Which means, the other two don't need to register for PhoneStateListener and should ignore actions in response to it when receiving callback from PhoneStateListener.

Through detecting the VoLTE configuration mode, some operations could be
avoided.
This fix is targeting to avoid these operations from happening.

Bug: 172987488
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=Enhanced4gBasePreferenceControllerTest
Change-Id: I56d4900b5bcb189693c99e870b013da97ed283db
2020-11-11 09:43:50 +00:00
Bonian Chen
296a4bc62e Merge "[Settings] Add voice call status and VoLTE mode detection into VoLTE UI test case" 2020-11-11 07:12:27 +00:00
Weng Su
597158ce90 [Provider Model] Remove “Use Wi-Fi” switch
- Screenshot
  https://screenshot.googleplex.com/3Kv7JUqJkDuvGGr

Bug: 172788136
Test: manual test
Change-Id: Ie5c522d479b2dedde46ec61b73a41b716e2e119d
2020-11-11 07:03:30 +00:00
Sarah Chin
666c7fb539 Merge "Update setCdmaRoaming/SubscriptionMode APIs" 2020-11-10 08:52:55 +00:00
SongFerngWang
d4a25fd13a 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
2020-11-10 03:25:36 +00:00
Bonian Chen
227329b2f7 [Settings] Add voice call status and VoLTE mode detection into VoLTE UI test case
1. VoLTE UI should gray out during voice call.
2. UI should be invisible when VoLTE mode mismatch.

Bug: 172781455
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=Enhanced4gBasePreferenceControllerTest
Change-Id: I8b6a212dc727f1ab78f4dd280cb41966b7054180
2020-11-09 12:49:35 +08:00
Jiashen Wang
491d214644 Merge "[SIM Dialog Migration] Migrate SIM enable dialog from LPA to Settings" 2020-11-06 00:07:14 +00:00
Jiashen Wang
7840ae7569 [SIM Dialog Migration] Migrate SIM enable dialog from LPA to Settings
Migrates SIM enabling and DSDS dialog from LPA to Settings.
Design: https://docs.google.com/document/d/1wb5_hoBkZVbkXGNWHbx4Jf61swjfxsJzkytiTzJosYo/edit?usp=sharing
Bug: 160819390
Test: Manually tested eSIM profile enabling.

Change-Id: I9ce690a1594adfc90b62840819237acd54418469
2020-11-05 14:58:15 -08:00
Sarah Chin
7f2a6040ef Update setCdmaRoaming/SubscriptionMode APIs
Test: atest TelephonyManagerTest
Test: make RunSettingsRoboTests
Bug: 171884158
Bug: 171883908
Change-Id: Ib78149c41612d56a46974621eb71b5e0cfe97c5a
2020-11-02 14:39:55 -08:00
Zoey Chen
14602e302a [Provider Model] Use new entry xml of Network & Internet
Bug: 171874190
Test: manual
Change-Id: I542ba08c122cb50de37dafd06cfa08dead8e2e0f
2020-11-02 22:28:47 +08: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
Jeremy Goldman
a14d7504bb Merge "Fix flaky JUnit test" 2020-10-28 08:34:51 +00:00
Jeremy Goldman
125301d590 Fix flaky JUnit test
This test sometimes fails in PostSubmits because the background
thread which calls the verified class does not have time to execute
before the class is verified.

This creates a helper function to monitor background thread completion.

Test: atest -c AutoSelectPreferenceControllerTest
Change-Id: I6c320abd70fcb5fe823ec122fb0dac67174ecb4a
2020-10-28 05:15:52 +00:00
Jeremy Goldman
1d068385c6 Mock SystemProperties in CDMA JUnit test
Bug: 170608563
Test: atest -c CdmaSubscriptionPreferenceControllerTest
Change-Id: Ibeca5e508d8277a9b84e26829e085c43ce7c26cc
2020-10-27 09:50:42 +00:00
Jeremy Goldman
ad045f62ca Merge "Only display options to save and cancel edits to the displayed APN if the APN is editable." 2020-10-26 02:06:16 +00:00
Jeremy Goldman
77f5ae6dc7 Only display options to save and cancel edits to the displayed APN if the APN is editable.
Test: mp settingsg and look at the UI. This class does not yet have
tests.

Current design:
 - https://screenshot.googleplex.com/BgrLPsz3ebxBnMa
 - https://screenshot.googleplex.com/AeRQe6Rh8SxjjMw

Updated design: https://screenshot.googleplex.com/3bhmWwMjhEXh2Eu

Change-Id: Ic9794ca14534adde92a641560a00b1bd876d52cb
2020-10-23 13:04:18 +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
Bonian Chen
d682b2cc57 Merge "[Settings] Only display 1 SIM UI when multiple with same group UUID" 2020-10-21 08:37:37 +00:00
SongFerng Wang
c023d49669 Merge "To fix bug, summary is wrong if nr_enabled_bool=false" into rvc-qpr-dev am: 3e5defe561 am: 9493731935
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12875667

Change-Id: I3b06b785b0ae6d907f7cd6f09d7830c5b8cdb0c3
2020-10-21 08:36:22 +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
Bonian Chen
a6b249d625 [Settings] Only display 1 SIM UI when multiple with same group UUID
Some carrier(s) expand their service through providing eSIM in companion
with pSIM. Group UUID is designed to group them together as an single
SIM.

Bug: 165363542
Test: make RunSettingsRoboTests ROBOTEST_FILTER=SubscriptionsPreferenceControllerTest
Change-Id: I0934a45a2917ab106627c733162efbee9a13f216
2020-10-21 13:31:04 +08:00
Treehugger Robot
ce272a0bb0 Merge "Highlight the MMS messages preference for ACTION_MMS_MESSAGE_SETTING" am: 21846b228b am: 0a2c406023 am: d719de84c1 am: e3dd9644b6
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1405190

Change-Id: Ie12fb48d3d17f6299ecc8be2000bc8e9142275aa
2020-10-21 04:02:19 +00:00
Treehugger Robot
e3dd9644b6 Merge "Highlight the MMS messages preference for ACTION_MMS_MESSAGE_SETTING" am: 21846b228b am: 0a2c406023 am: d719de84c1
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1405190

Change-Id: I3005a83ba8d27238d2fbd883d77b4a20432cabc6
2020-10-21 03:53:00 +00:00
Treehugger Robot
d719de84c1 Merge "Highlight the MMS messages preference for ACTION_MMS_MESSAGE_SETTING" am: 21846b228b am: 0a2c406023
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1405190

Change-Id: I91608590cc7b0255706d0ea4bdc896a778e72b8b
2020-10-21 03:21:48 +00:00
Treehugger Robot
21846b228b Merge "Highlight the MMS messages preference for ACTION_MMS_MESSAGE_SETTING" 2020-10-21 02:40:55 +00:00
Yanting Yang
9aa4a5463f Remove subtitles for the homepage IA
Remove the summary of the homepage IA if silky home enabled.

Fixes: 170933968
Test: robotest & visual with turning on/off silky home
Change-Id: I502b6590cece9b80e9923109fe0582cc4d9a1c56
2020-10-20 23:54:03 +08: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
Amit Mahajan
45435fdb1d Merge "Add the extra "Ask every time" if supported only" am: 7b9edcde47 am: b09f09b02d am: 0e5fdb184d am: 0f36371e3e
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1455946

Change-Id: I8f902653e404ad89c09189b29469c9b599efcf05
2020-10-16 08:04:11 +00:00
Amit Mahajan
0f36371e3e Merge "Add the extra "Ask every time" if supported only" am: 7b9edcde47 am: b09f09b02d am: 0e5fdb184d
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1455946

Change-Id: I282af7cad68106b706d6b6fa477d720797b74ad1
2020-10-16 07:48:10 +00:00
Amit Mahajan
0e5fdb184d Merge "Add the extra "Ask every time" if supported only" am: 7b9edcde47 am: b09f09b02d
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1455946

Change-Id: If8cd3e5f3aec33840fc5a7477e2895dc6f2a158c
2020-10-16 07:35:48 +00:00
Amit Mahajan
b09f09b02d Merge "Add the extra "Ask every time" if supported only" am: 7b9edcde47
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1455946

Change-Id: Ib2b9864613071c7a6819f03d5c1803b81b9a6575
2020-10-16 06:39:15 +00:00
Taesu Lee
50ef14540d Add the extra "Ask every time" if supported only
Test: manual

Change-Id: Ie4bb150db41f1e654ea427a605050afbb57114cf
Signed-off-by: Taesu Lee <taesu82.lee@samsung.com>
2020-10-13 10:13:50 +09:00
Hall Liu
9d39cc3d63 Merge "Replace TelephonyManager methods for mobile data" 2020-10-09 17:03:16 +00:00
Jiashen Wang
6265cf8e6c Merge "[SIM Dialog Migration] Migrate eSIM erase dialog" 2020-10-09 16:38:58 +00:00