Janis Danisevskis
5cef487b4b
resolve merge conflicts of d42d9a41f6 to sc-dev
...
Change-Id: Ifa6a4af09d7cd45773a8c057416ab90fac23061e
2021-03-17 19:09:29 +00: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
Jeremy Goldman
9d87cd9126
SubscriptionsPreferenceController shows the unique sim description.
...
Bug: 148303118
Bug: 150370656
Test: atest -c SubscriptionsPreferenceControllerTest
Change-Id: I041536fe0148087a068c6000383b382b0ff4e17c
2021-01-22 07:02:52 +00:00
Weng Su
5e76c02d82
[Provider Model] Implement the carrner network selection settings
...
- Add WifiPickerTrackerHelper to reuse the library
- User taps on carrier network preference
- Calls MergedCarrierEntry#connect()
- User toggles mobile data On/Off
- Calls MergedCarrierEntry#setEnabled(true/false)
Bug: 175761096
Test:
- Manual Test
- atest NetworkMobileProviderControllerTest \
SubscriptionsPreferenceControllerTest \
WifiPickerTrackerHelperTest
Change-Id: Ia311b10ca7a44a536556c1889ee65743af379822
2021-01-05 15:05:24 +00:00
changbetty
1a5351c433
[Mainline] To use getActiveSubscriptionInfo() instead of get default subscription Info with data/sms/voice
...
- getDefaultDataSubscriptionInfo()
- getActiveSubscriptionInfo(getDefaultDataSubscriptionId());
- getDefaultSmsSubscriptionInfo()
- getActiveSubscriptionInfo(getDefaultSmsSubscriptionId());
- getDefaultVoiceSubscriptionInfo()
- getActiveSubscriptionInfo(getDefaultVoiceSubscriptionId());
Bug: 147206736
Test: make RunSettingsRoboTests ROBOTEST_FILTER=DataUsageUtilsTest
make RunSettingsRoboTests ROBOTEST_FILTER=MobileDataSliceTest
make RunSettingsRoboTests ROBOTEST_FILTER=MobileDataPreferenceControllerTest
make RunSettingsRoboTests ROBOTEST_FILTER=DefaultSubscriptionControllerTest
Change-Id: I7b5988b3c3068c12e242e123ebb54477093d37ad
Merged-Id: I7b5988b3c3068c12e242e123ebb54477093d37ad
2020-02-15 14:56:58 +08:00
changbetty
a8d56184c3
[Mainline] To use getActiveSubscriptionInfo() instead of get default subscription Info with data/sms/voice
...
- getDefaultDataSubscriptionInfo()
- getActiveSubscriptionInfo(getDefaultDataSubscriptionId());
- getDefaultSmsSubscriptionInfo()
- getActiveSubscriptionInfo(getDefaultSmsSubscriptionId());
- getDefaultVoiceSubscriptionInfo()
- getActiveSubscriptionInfo(getDefaultVoiceSubscriptionId());
Bug: 147206736
Test: make RunSettingsRoboTests ROBOTEST_FILTER=DataUsageUtilsTest
make RunSettingsRoboTests ROBOTEST_FILTER=MobileDataSliceTest
make RunSettingsRoboTests ROBOTEST_FILTER=MobileDataPreferenceControllerTest
make RunSettingsRoboTests ROBOTEST_FILTER=DefaultSubscriptionControllerTest
Change-Id: I7b5988b3c3068c12e242e123ebb54477093d37ad
2020-01-08 19:13:15 +08:00
Antony Sargent
fcc9440a52
String changes for some SIM switch confirmation dialogs
...
These are changes for strings used in two scenarios:
-When switching which SIM is used for mobile data. This is an update to
some existing strings.
-Enabling an eSIM when another one is already enabled (so the first one
will need to be disabled). These are new strings.
Bug: 129156640
Test: compile, plus manual (run a device in DSDS mode, go to details for
SIM that isn't currently used for mobile data, and tap on mobile data
switch)
Change-Id: Ie9dfe23c466cb454bbad916ba83b833967a0da0e
2019-03-22 16:47:33 -07:00
jackqdyulei
b5ce3cd9b0
Fix TODO for mobile network settings
...
1. Add intent filter to MobileNetworkActivity(new page)
2. Add metrics id
3. Remove obsolete TODOs
Bug: 114749736
Test: Manual
Change-Id: I36f41983dc8cc36ccdf548174fc494044ec1b241
2019-01-04 15:55:09 -08:00
jackqdyulei
8eec6ff917
Change packagename to telephony
...
Also move it under package network, so all of them belong to
com.android.settings.network.telephony.
Bug: 114749736
Test: RunSettingsRoboTests
Change-Id: I35dbdcd5cc9dab939b0a3efccc8897b9a92338d1
2018-10-11 11:46:38 -07:00