PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
87,631 Commits 1 Branch 0 Tags
ade4bfef45c2b4e331db0bc2ccddcf9d1e18f74b
Commit Graph

1677 Commits

Author SHA1 Message Date
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
46837dc4d5 [Provider Model] Update internet preference icon and summary 
- Airplane mode icon/summary

- Airplane mode networks icon/summary

- Wi-Fi network connected icon/SSID

- Cellular network connected icon/carrier-name

- Ethernet network connected icon/summary

- Screenshot:
  https://screenshot.googleplex.com/AzhCEX2HjwYUMtJ
  https://screenshot.googleplex.com/9BRfQLMW4UvHqqq
  https://screenshot.googleplex.com/5jdi8oEjMPUURdT

Bug: 176796623
Test: manual test
- atest -c InternetUpdaterTest \
           InternetPreferenceControllerTest

Change-Id: Icc8944dabdac597f12b67cffa72cb0be02d9671d
 2021-01-21 17:24:10 +08:00
SongFerngWang
60c4163244 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
 2021-01-20 08:23:08 +00:00
Jeremy Goldman
67c75ac102 Helper function to return the unique name for subscription info 
Many classes within Settings have access to the subscription info, rather
than only having access to the subscription id. For these classes, it is
more convenient to have a helper method where the whole subscription
info can be passed in, rather than having to call the
getSubscriptionId() helper method in so many locations within the
telephony settings codebase.

Bug: 150370656
Bug: 148303118
Test: atest -c SubscriptionUtilTest
Change-Id: I181960933ab8610d5572b7a7d6671fab8c1dbd22
 2021-01-19 09:30:14 +00:00
TreeHugger Robot
119bbbd308 Merge "[Provider Model] Add Fix connectivity toggle to Internet Settings" 2021-01-19 07:28:18 +00:00
Weng Su
598934d645 [Provider Model] Add Fix connectivity toggle to Internet Settings 
- Add Fix connectivity toggle in menu item

- Show "Resetting your internet..." when recovering

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

Bug: 172297799
Test: manual test
- make RunSettingsRoboTests ROBOTEST_FILTER=NetworkProviderSettingsTest

Change-Id: I27594d24659ca281e224f86accc20d49514d5001
 2021-01-19 06:08:53 +00:00
SongFerng Wang
8ee28c1baa Merge changes I79b4c3d4,Icc8a7793 
* changes:
  [Provider mode] Carrier item display network type on slice.
  The provider model slice carrier toggle is broke.
 2021-01-19 05:55:17 +00:00
SongFerngWang
c14eefb125 [Provider mode] Carrier item display network type on slice. 
Bug: 176871752
Test: (PASS)atest NetworkProviderWorkerTest
(PASS)atest ProviderModelSliceTest
(PASS)atest ProviderModelSliceHelperTest

Change-Id: I79b4c3d45a52f0be0c058044f1d79a7056386193
 2021-01-19 12:23:22 +08:00
SongFerngWang
f3b25cc7cb The provider model slice carrier toggle is broke. 
The slice doesn't upload subId for TelephonyManager and
the listeners.

Bug: 177385874
Test: (PASS)atest NetworkProviderWorkerTest
(PASS)atest ProviderModelSliceTest
(PASS)atest ProviderModelSliceHelperTest

Change-Id: Icc8a7793204de2e2eadd0454edf50e466821b8f9
 2021-01-19 11:58:58 +08:00
Bonian Chen
23ee815ef5 Merge "[Settings] Remaining part of Cross SIM calling (backup calling)" 2021-01-18 14:13:14 +00:00
Bonian Chen
26552500f6 [Settings] Remaining part of Cross SIM calling (backup calling) 
1. Change the wording
2. Add a list of summary within Calls and SMSs UI

Bug: 174012397
Test: manual
Change-Id: I6dde0cea9c1386029377b3ea2682ed8b977f9427
 2021-01-18 20:41:39 +08:00
Weng Su
1ab70837d2 Merge "[Provider Model] Connect carrier network issue fix" 2021-01-18 12:09:47 +00:00
Bonian Chen
7c22644825 Merge "[Settings] Initial config UI support for cross sim calling" 2021-01-18 09:49:04 +00:00
Weng Su
99dbb43f0c [Provider Model] Connect carrier network issue fix 
- Need to check if the data is enabled on the second SIM in the case of
dual SIM.

Bug: 177411771
Test: manual test
Change-Id: Ieead7a4550628d5380b8d0150cfd7a67c47980ca
 2021-01-18 07:59:50 +00:00
Bonian Chen
5e12677d00 [Settings] Initial config UI support for cross sim calling 
This is the initial configuration UI support for cross SIM calling.

Mock UI: https://docs.google.com/presentation/d/1u9eO9Fs2_kr1mqkzyVe-_iNldM6OBv4ucmhUTr3Z-0w/edit?resourcekey=0-siV3RVBkI_fjH8mMWHbtHg#slide=id.gb4a3581a82_0_0
Screenshot: https://screenshot.googleplex.com/3QX3Y6vAhBYv7LC

Bug: 174012397
Test: manual
Change-Id: Id96b72054bee9b3359e5336cc90acbff7e6d78ea
 2021-01-18 15:36:27 +08:00
Tom Hsu
7c8e8eb6c2 Merge "[Provider mode] Display network type on mobile data preference." 2021-01-15 19:47:17 +00:00
tom hsu
b392d43fff [Provider mode] Display network type on mobile data preference. 
Connect to 5G mobile network
  - https://screenshot.googleplex.com/8RziSbSjstMaFiK
 Connect to Wi-Fi
  - https://screenshot.googleplex.com/6ND3DFFsnLKSQRd

Bug: 176141828
Test: Manual test passed.
Test: Atest passed

Change-Id: I69b8ce0c1f5a16f0ff492be0b4ab26166a51bdc3
 2021-01-16 01:56:39 +08:00
TreeHugger Robot
0cb063c9e4 Merge "Remove redundant toolbar from CollapsingToolbarLayout" 2021-01-15 10:21:38 +00:00
Weng Su
7686bf26dc Merge "[Provider Model] View airplane mode networks button" 2021-01-15 08:32:59 +00:00
Weng Su
ee414fdc81 [Provider Model] View airplane mode networks button 
- Airplane mode message
  - WiFi Disable: “Airplane mode is on”
  - WiFi Enabled: “Viewing airplane mode networks”

- “View airplane mode networks” button
  - WiFi Disable: “View airplane mode networks”
  - WiFi Enabled: hide button

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

Bug: 177155647
Test: manual test
- atest ViewAirplaneModeNetworksLayoutPreferenceControllerTest
- make RunSettingsRoboTests ROBOTEST_FILTER=NetworkProviderSettingsTest

Change-Id: I3222cb04a66d07681709cc95b729b5ecdf999298
 2021-01-15 07:10:57 +00:00
Mill Chen
7b163e2566 Remove redundant toolbar from CollapsingToolbarLayout 
The new material library has been updated to be able to support
android.widget.Toolbar, so the redundant toolbar has to be removed.

Bug: 176882938
Test: visual verified
Change-Id: Ibada6b9d315c14d79e9f9f8015cbb5e00fbeea38
 2021-01-15 14:43:30 +08:00
TreeHugger Robot
fd401c0167 Merge "Provider model slice: The icon of mobile data's color is too light" 2021-01-15 02:29:31 +00:00
Jeremy Goldman
5a75bf7828 Merge "Utility to compute a single subscription's unique display name." 2021-01-15 02:27:53 +00:00
SongFerng Wang
985bb16057 Merge "Provider model: add string for airplane mode" 2021-01-15 02:15:49 +00:00
Stanley Wang
b87ddba6cd Use SettingsLib's MainSwitchBar to replace SwitchBar in Settings. 
To log Settings metrics, the MainSwitch extends MainSwitchBar and
replace the SwitchBar in SettingsActivity.

Bug: 175181773
Test: Run robotest and apply the widget in Settings and see the ui

Change-Id: I3add3702e9058ad9192b5172c7cf0e2ccfb55a70
 2021-01-14 22:48:31 +08:00
SongFerngWang
25690691b2 Provider model slice: The icon of mobile data's color is too light 
Bug: 17752644
Test: (PASS)atest NetworkProviderWorkerTest
(PASS)atest ProviderModelSliceTest
(PASS)atest ProviderModelSliceHelperTest

Change-Id: I5474396b0a6464f513c76f0984917af083dcf54c
 2021-01-14 14:24:28 +00:00
SongFerngWang
b114e490d5 Provider model: add string for airplane mode 
Bug: 177399563
Test: build PASS and verify the slice's airplane screen.
(PASS)atest NetworkProviderWorkerTest
(PASS)atest ProviderModelSliceTest
(PASS)atest ProviderModelSliceHelperTest

Change-Id: I9f212b8c2c66bf8af32936fca92c46fe86a9b3ef
 2021-01-14 12:47:26 +00:00
Jeremy Goldman
3c334cc47f Utility to compute a single subscription's unique display name. 
Bug: 150370656
Bug: 148303118
Test: atest -c SubscriptionUtilTest
Change-Id: Id4600dbf038117129c62331f9e00b7035af1c0fd
 2021-01-13 22:03:03 +08:00
Jeremy Goldman
3c3ce5ea66 Merge "Return mapping of subscription id to unique display name." 2021-01-13 12:04:54 +00:00
Jeremy Goldman
2fb7e1bbc4 Return mapping of subscription id to unique display name. 
Fallback 1: if display names are the same, use the last 4 digits of a
phone number
Fallback 2: if the phone number cannot be displayed or the last 4 digits
are identical, fallback to use the subscription id

This function depends on DeviceInfoUtils for the phone number
formatting. Because DeviceInfoUtils is within SettingsLib, this function
(at least for now) is located within the Settings codebase itself.

go/unique-sub-display-names

Bug: 148303118
Bug: 150370656
Test: atest -c SubscriptionUtilTest
Change-Id: Id3e26254d4b193c13506df52fb59e97643df7a32
 2021-01-13 16:18:00 +08:00
Jeremy Goldman
4efd9e6477 Merge "EuiccOperationSidecar PendingIntent includes Immutable flag." 2021-01-12 12:16:13 +00:00
Jeremy Goldman
ad83060bd9 MobileDataSlice PendingIntents include an immutable flag 
Bug: 172209293
Test: atest SettingsUnitTests
Change-Id: Ie71e104ca9ff3dff1d347178381656046d6068d7
 2021-01-12 16:52:24 +08:00
Jeremy Goldman
af60e537f4 EuiccOperationSidecar PendingIntent includes Immutable flag. 
Bug: 172206956
Test: atest SettingsUnitTests
Change-Id: I8378746660777082d714ace21d9a459775fefc95
 2021-01-12 16:45:26 +08:00
TreeHugger Robot
b63f537238 Merge changes from topic "settings_collapsing_toolbar" 
* changes:
  Disable the title of mobile network
  Add CollapsingToolbarLayout for sub settings
 2021-01-12 02:14:38 +00:00
Mill Chen
82df7e60a1 Disable the title of mobile network 
After the collapsing toolbar layout is applied to subsetting pages, the
mobile network page has two title shown currently. One is the activity
title while the other is the collapsing toolbar title To make sure
there will be only one title shown on this page, the activity title will
be removed and we will keep the collapsing toolbar title.

Bug: 176899590
Test: manual test and visual verified
1) Navigate to Settings -> Network & internet -> Mobile network
2) Check if there's only one title in this page

Change-Id: I50e57468c640f1d176fd99dcaafc06ed3fc601dc
 2021-01-11 18:31:26 +08:00
Ashwini Oruganti
2f349da025 Bulk apply PendingIntent.FLAG_MUTABLE_UNAUDITED. 
We've been working hard to require PendingIntents explicitly declare
if they allow their contents to be mutated or not, and to finish
landing that work this change applies the new FLAG_MUTABLE_UNAUDITED
flag to all remaining code locations until they can be manually
inspected.

Bug: 160794467
Test: manual
Change-Id: I7b9ef5dcd35187facef1ec424589b81f834f23c0
 2021-01-08 13:14:05 -08:00
TreeHugger Robot
b7076d5d5e Merge "[Provider Model] Implement the carrner network selection settings" 2021-01-06 14:25:46 +00:00
TreeHugger Robot
e0f2957e49 Merge "[Provider Model] Internet Panel UI update" 2021-01-06 06:55:24 +00:00
Weng Su
e9f4928ef1 [Provider Model] Internet Panel UI update 
- Add gear icon to connected non-carrier network

- Update "View airplane mode networks" wording

- Update "Turn off airplane mode" wording

- Check WiFi disable to show airplane mode message

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

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

Change-Id: Icf7b77e514cffa68cf103dbc9e7df93d58f9f762
 2021-01-06 02:11:46 +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
SongFerngWang
114b6c496e Change provider model slice's wording 
Bug: 176457592
Test: Build pass and manual test(review UI wording)
Change-Id: I66361cc6830aea96c55cdef737a9c5c3b8bd1b47
 2021-01-05 12:25:45 +08:00
Tom Hsu
36ecdd496c Merge "[Provider model] Internet picker Part II" 2020-12-29 14:23:14 +00:00
Weng Su
8b1989cdcc Merge "[Provider Model] Implement the carrner network selection" 2020-12-29 13:13:16 +00:00
tom hsu
65f8aa2f7b [Provider model] Internet picker Part II 
- Add mobile internet preference with default data subscription.
 - Make prefrence to show dynamically when data subscription changed.

Video exhibition
 - http://rcll/gcmsphfhJ1UzfPSvjWOuXK/c1B2CtaFz27rlIQ2LSTJmo

Code difference
 - SubscriptionsPreferenceControllerTest.java between robolectric and junit.
  - https://diff.googleplex.com/#key=1Zm7JGPhoZwY

Bug: 172229552
Test: atest SubscriptionsPreferenceControllerTest

Change-Id: Ib50c2c51159f60f19631d1a02081eafde3436e94
 2020-12-29 19:48:21 +08:00
Chiachang Wang
283136fb24 Merge "Update getMobileProvisioningUrl to telephony surface" am: 6aef579198 am: 85b853725d am: e3b7c01f9a 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1532063

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2430c5b1fb40bdf89461c535a0fef85eb911b7ea
 2020-12-29 01:23:41 +00:00
Chiachang Wang
e3b7c01f9a Merge "Update getMobileProvisioningUrl to telephony surface" am: 6aef579198 am: 85b853725d 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1532063

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I530eff9d77629af47e4f8da2ad660aab7f3431f3
 2020-12-29 01:01:04 +00:00
Chiachang Wang
6aef579198 Merge "Update getMobileProvisioningUrl to telephony surface" 2020-12-29 00:24:12 +00:00
Weng Su
74b18587fb [Provider Model] Implement the carrner network selection 
- Add primaryAction for connecting carrier network

- User toggles carrier network On/Off
  - Calls MergedCarrierEntry#setEnabled(true/false)

- User taps on carrier network
  - Calls MergedCarrierEntry#connect()

Bug: 175761096
Test:
- Manual Test
- atest ProviderModelSliceTest
- atest ProviderModelSliceHelperTest
- make RunSettingsRoboTests ROBOTEST_FILTER=WifiScanWorkerTest

Change-Id: I07cb6c142a2f4e9cbdbab1f77afdc367728b4e3f
 2020-12-28 13:23:24 +00:00
SongFerng Wang
a12003a9ac Merge changes from topic "Slice of Provider Model" 
* changes:
  Slice of Provider Model: add slice structure
  The helper for slice of carrier and non-Carrier, used by ProviderModelSlice.
 2020-12-23 18:47:15 +00:00
SongFerngWang
8cad0197bd Slice of Provider Model: add slice structure 
Implement a slice which can show/update carrier networks.
Before and after: go/b173971144screenshot

Bug: 173971144
Test: atest NetworkProviderWorkerTest  (PASS)
atest ProviderModelSliceTest  (PASS)

Change-Id: I3f0dab364c88723ef3185a2ff040b1fbd1b099f4
 2020-12-23 17:47:45 +08:00