Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
79,187 Commits 1 Branch 0 Tags
65bab8d5f89c89e5a54d2a78136d47ffefdb6782
Commit Graph

1445 Commits

Author SHA1 Message Date
Weng Su
65bab8d5f8 Merge "[Provider Model] Fix Internet preference crash" into sc-dev am: 548569e3eb am: 52394b4245 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13425304

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic1ebca917ca4657bf72a0e3698723d8bae1d9610
 2021-02-01 07:29:50 +00:00
Weng Su
548569e3eb Merge "[Provider Model] Fix Internet preference crash" into sc-dev 2021-02-01 06:12:11 +00:00
Jeremy Goldman
b3fc7e5b10 Merge "SubscriptionUtil checks that SubscriptionInfo is null before accessing." 2021-02-01 05:03:30 +00:00
Jeremy Goldman
daf7550a86 SubscriptionUtil checks that SubscriptionInfo is null before accessing. 
Test: atest -c SubscriptionUtilTest
Bug: 178707680
Change-Id: I03938405929c3307460107671bbe695ee5e0f6e9
 2021-02-01 10:45:18 +08:00
TreeHugger Robot
cd0dc43bc6 Merge "[Provider Model] Dynamically update the Internet Panel title" into sc-dev am: 097361797a am: 395203a5e3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13425388

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3743842bc7f068a1028cb5a6fbd529a5c7a11212
 2021-01-29 21:10:23 +00:00
TreeHugger Robot
e7515466ea Merge "The UI is not immediately updated" into sc-dev 2021-01-29 07:56:42 +00:00
SongFerngWang
c0b8f62b57 The UI is not immediately updated 
Solution: Add Data Connection State listener by PhoneStateListener.

Bug: 178350321
Test: atest NetworkProviderWorkerTest
Change-Id: I692209035332bfd463537988f4e3ce166414031e
(cherry picked from commit 59958e663d)
Merged-In: I692209035332bfd463537988f4e3ce166414031e
 2021-01-29 06:52:11 +00:00
Weng Su
fc3a51ed3f [Provider Model] Fix Internet preference crash 
- Post on main thread for UI update

- Add NPE checking

Bug: 178670562
Test: manual test
- atest InternetPreferenceControllerTest

Change-Id: I6c37f7dc19f9f9bbc75b36415a47aa1366dc5f5e
 2021-01-29 12:57:36 +08:00
Weng Su
28172b61c8 [Provider Model] Dynamically update the Internet Panel title 
- Change from "Internet" to "Airplane mode networks"

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

Bug: 176803442
Test: manual test
- atest InternetConnectivityPanelTest
- make RunSettingsRoboTests ROBOTEST_FILTER=PanelFragmentTest

Change-Id: Ifb2c24434e480861fc7c3eaece683d49eb99013e
 2021-01-28 11:00:08 +00:00
TreeHugger Robot
cb2c604789 Merge "The UI is not immediately updated" 2021-01-27 15:42:30 +00:00
SongFerngWang
59958e663d The UI is not immediately updated 
Solution: Add Data Connection State listener by PhoneStateListener.

Bug: 178350321
Test: atest NetworkProviderWorkerTest
Change-Id: I692209035332bfd463537988f4e3ce166414031e
 2021-01-27 22:22:29 +08:00
Weng Su
7c041874ce [Provider Model] Pass null to the reason parameter to avoid unnecessary 
bugreports

- The reason parameter may be used to generate bugreport

- Pass null to the reason parameter under normal situation

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

Merged-In: I469a8c72fc7a6ab057acef476296285bb8a62713
Change-Id: I469a8c72fc7a6ab057acef476296285bb8a62713
(cherry picked from commit 3c02095c90)
 2021-01-27 09:48:16 +00:00
Weng Su
3c02095c90 [Provider Model] Pass null to the reason parameter to avoid unnecessary 
bugreports

- The reason parameter may be used to generate bugreport

- Pass null to the reason parameter under normal situation

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

Change-Id: I469a8c72fc7a6ab057acef476296285bb8a62713
 2021-01-27 10:55:54 +08:00
Weng Su
ca8a3d7e64 [Provider Model] Add connected ethernet network to internet panel 
- Show the connected ethernet network to first item of internet panel

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

Bug: 176796623
Test: manual test
- atest NetworkProviderWorkerTest \
        ProviderModelSliceTest

Change-Id: I423a7951f403bf86c288da52fc342520fd24f466
 2021-01-25 14:46:37 +00:00
Weng Su
e9d44254c7 Merge "[Provider Model] Add connected ethernet network preference" 2021-01-25 14:46:05 +00:00
Jeremy Goldman
09f43be1c6 Merge "SubscriptionsPreferenceController shows the unique sim description." 2021-01-25 09:03:40 +00:00
Weng Su
c7003e95a3 [Provider Model] Add connected ethernet network preference 
- Show the preference if connected to ethernet network

- Hide the preference if not connected to ethernet network

- Screenshot:
  https://screenshot.googleplex.com/5ZkZXnTr9Hcfsyt

Bug: 176796623
Test: manual test
- atest ConnectedEthernetNetworkControllerTest
- make RunSettingsRoboTests ROBOTEST_FILTER=NetworkProviderSettingsTest

Change-Id: I0f062eb2ee4898976f5e7a1c3f2c4061b60a3126
 2021-01-25 07:31:52 +00:00
SongFerng Wang
11501a0bc2 Merge "Replace allowedNetworkTypes with allowedNetworkTypesForReason" 2021-01-23 07:41:11 +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
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