Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
80,628 Commits 1 Branch 0 Tags
bdaee1431f4329f297665b623406ebcfde9492f1
Commit Graph

1584 Commits

Author SHA1 Message Date
Jeremy Goldman
b71cb56c05 Merge "Subscription name has whitespace trimmed to determine uniqueness" into sc-dev 2021-04-08 01:16:14 +00:00
Bonian Chen
998554d68f [Settings] More log to help analysis 
Add log for supporting issue analysis.

Bug: 184602966
Test: local
Change-Id: I739ac827e0da1caca045e88599fafb293e25b65c
 2021-04-07 16:12:38 +00:00
Jeremy Goldman
a51780f35d Subscription name has whitespace trimmed to determine uniqueness 
For example, if a subscription has the name "subsc" and another has
"subsc    " the extra unique information will be added to the
subscriptions.

Test: atest -c SubscriptionUtilTest
Bug: 183664625
Change-Id: Ia137169f6cdd9804ab04126e5045c9fb61556d54
 2021-04-07 16:26:52 +08:00
Weng Su
4e341b780a Merge "[Provider Model] Move the Internet unavailable Wi-Fi down" into sc-dev 2021-03-30 11:32:57 +00:00
Bonian Chen
fecfb7f5e4 Merge "Revert "[Settings] Support getSystemService(Class<T>)"" into sc-dev 2021-03-30 05:31:52 +00:00
Bonian Chen
234b698fb2 Revert "[Settings] Support getSystemService(Class<T>)" 
This reverts commit d5ccde31a8.

Reason for revert: failure on test cases

Change-Id: I0a179a6ebb5ef1dec566ce6e8facd5f3b82d7c8a
 2021-03-30 00:51:15 +00:00
Weng Su
439cc64b1c [Provider Model] Move the Internet unavailable Wi-Fi down 
- Check the Wifi network have both INTERNET and VALIDATED capabilities
to achieve effective network access

- Move the Internet unavailable Wi-Fi down to the top of Wi-Fi list

- Don't paint color for the Internet unavailable Wi-Fi

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

Bug: 178457619
Bug: 178926547
Bug: 178978070
Test: manual test on device
atest -c InternetUpdaterTest \
         NetworkProviderWorkerTest \
         ProviderModelSliceTest

Change-Id: Idf04e556ab5a87abc5bc96d1934f5e8fd91fbfaa
 2021-03-26 23:24:14 +08:00
Jeremy Goldman
417d5bdc7c Merge "Update strings in main VpnPreference." into sc-dev 2021-03-25 03:36:26 +00:00
Jeremy Goldman
de9d641349 Update strings in main VpnPreference. 
If there is an insecure VPN, don't display the name of the vpn in the
summary. Instead, display "Not secure" if there is only 1 total vpn
available, and display the number of insecure VPNs + " not secure."

Screenshot: https://screenshot.googleplex.com/9Bxn7frDm7aVHtG
Test: manual test (because the junit test for the controller has not yet
been cherrypicked into sc-dev)
Bug: 176821216
Change-Id: Ie454d9605effd5208457e8c91b08cc382d4992af
 2021-03-25 03:23:36 +00:00
SongFerng Wang
419d5438f1 Merge "Set setNetworkSelectionModeManual with AccessNetworkType into RIL/Modem" into sc-dev 2021-03-24 13:53:52 +00:00
SongFerngWang
b471e2c38c Set setNetworkSelectionModeManual with AccessNetworkType into RIL/Modem 
To new the OperatorInfo with the AccessNetworkType parameter.

Bug: 179636444
Bug: 182336960
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=NetworkSelectSettingsTest
Change-Id: If78fde9a22e91ee8b77e2063762166b2137ebbc1
 2021-03-24 20:46:04 +08:00
Weng Su
95744749e5 Merge "[Provider Model] Update fix connectivity icon" into sc-dev 2021-03-24 09:22:06 +00:00
Weng Su
6800ef3832 [Provider Model] Update fix connectivity icon 
- Screenshot:
  https://screenshot.googleplex.com/8ENoGQxANiAH9uj

Bug: 183576628
Test: manual test
make RunSettingsRoboTests ROBOTEST_FILTER=NetworkProviderSettingsTest

Change-Id: I4da1ca8c474e4c2d88c4bc79aceeac6c69f213ad
 2021-03-24 14:58:07 +08:00
Jeremy Goldman
025301da1f Merge "Connect VPN warning help icon with the network & internet page." into sc-dev 2021-03-24 05:18:46 +00:00
Jeremy Goldman
76de845f3d Connect VPN warning help icon with the network & internet page. 
New VpnInfoPreference created to control the presence or absence
of the warning icon based on the vpn type.

The VpnPreferenceController type casts the preference based on
whether the provider model is enabled. It also detects legacy vpns
by using the LegacyVpnProfileStore, and comparing VPN profile
usernames with the active VPN config's user.

Screenshot: https://screenshot.googleplex.com/AfGrH8wRusTvbf4
Test: atest -c SettingsUnitTests
Bug: Bug: 176821216
Change-Id: I1aa93be5b90b404d9d9cb9bf47ea76fdc9aad401
Merged-In: I1aa93be5b90b404d9d9cb9bf47ea76fdc9aad401
(cherry picked from commit 7a68eb3b5e)
 2021-03-24 01:07:28 +00:00
Bonian Chen
d5ccde31a8 [Settings] Support getSystemService(Class<T>) 
Add getSystemService(Class<T>) to align the capability with framework
part.

This is a back port from aosp/1639943, aosp/1645152 and aosp/1648047

Bug: 179640862
Test: local
Change-Id: I035db55a71f94000ca35f8d71f03c19208423c73
 2021-03-24 00:59:46 +08:00
Weng Su
5ac8414834 Merge "[Provider Model] Update Internet preference summary" into sc-dev 2021-03-23 03:21:08 +00:00
Weng Su
784eb94a14 [Provider Model] Update Internet preference summary 
- Show "Networks available" summary instead of "Not connected" when no
network connected

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

Bug: 182244261
Test: manual test
atest -c InternetPreferenceControllerTest

Change-Id: If32f656d7d89a8b19c4da4876ccc0d1cf92262a0
 2021-03-22 22:01:55 +08:00
SongFerng Wang
826a146c20 Merge "Provider model CarrierItem's subtitle show no connection" into sc-dev 2021-03-22 07:45:20 +00:00
SongFerngWang
fb2a1d9db9 Provider model CarrierItem's subtitle show no connection 
CarrierItem's subtitle show no connection when Wi-Fi
off + no service

Bug: 182433548
Test: atest ProviderModelSliceTest
atest ProviderModelSliceHelperTest
atest NetworkProviderWorkerTest
atest InternetConnectivityPanelTest
make RunSettingsRoboTests -j

Change-Id: I04778cf2b184c0a75dc6999ffde011a9ad5e0690
 2021-03-22 14:21:55 +08:00
Chiachang Wang
3157509885 Remove hidden @Transport usage 
NetworkCapabilities is moving to connectivity mainline module.
The hidden methods and constants accesses are not allowed
anymore for Settings, so remove the usage.

Bug: 172183305
Test: make RunSettingsRoboTests ROBOTEST_FILTER=\
      com.android.settings.network.InternetUpdaterTest
Change-Id: I3adec99748451f32698ac19bfeaeb9db43282e3e
 2021-03-19 21:03:25 +08:00
SongFerng Wang
993b820a76 Merge "KEY_CARRIER_NR_AVAILABILITIES_INT_ARRAY change type as IntArray" into sc-dev 2021-03-19 01:28:31 +00:00
SongFerng Wang
45726b937b Merge "Moving the error messages from slice to panel's subtitle" into sc-dev 2021-03-18 04:58:50 +00:00
Peter Wang
3f7d415e2d Merge "Fix coding styles for erase euicc only options" into sc-dev 2021-03-17 22:09:04 +00:00
Janis Danisevskis
5cef487b4b resolve merge conflicts of d42d9a41f6 to sc-dev 
Change-Id: Ifa6a4af09d7cd45773a8c057416ab90fac23061e
 2021-03-17 19:09:29 +00:00
SongFerngWang
1dcc788177 KEY_CARRIER_NR_AVAILABILITIES_INT_ARRAY change type as IntArray 
Bug: 179814490
Test: build pass
Change-Id: I9d2abe1abe3082267ed64b71602d8ada21c95c6c
 2021-03-17 23:18:33 +08:00
SongFerngWang
0c86903ec6 Moving the error messages from slice to panel's subtitle 
Bug: 180888831
Test: atest ProviderModelSliceTest
atest ProviderModelSliceHelperTest
atest NetworkProviderWorkerTest
atest InternetConnectivityPanelTest
make RunSettingsRoboTests -j

Change-Id: I4572c8ad15effab0c95feaeac6a99f5aaabf6f90
 2021-03-17 22:49:31 +08:00
TreeHugger Robot
c7d3c5f1be Merge "[Settings] Use TelephonyManasger.registerTelephonyCallback instead of TelephonyManager.listen" into sc-dev 2021-03-17 10:30:48 +00:00
TreeHugger Robot
c35e0bfa58 Merge "[Provider Model] Update airplane mode icon" into sc-dev 2021-03-17 06:16:20 +00:00
Lucas Lin
78a02d76c4 Merge "Change the parameter type from ContentResolver to Context" into sc-dev 2021-03-17 03:27:28 +00:00
Peter Wang
2404806afb Fix coding styles for erase euicc only options 
Bug: 159650638
Test: Build
Change-Id: I08bb8d9f73dbe6b9f18f36c45ae7652b36d422b2
 2021-03-16 18:09:49 -07:00
Weng Su
a15019ce88 [Provider Model] Update airplane mode icon 
- Screenshot:
  https://screenshot.googleplex.com/ULE5bL6sxXKzdN6

Bug: 182438540
Test: manual test
Change-Id: I2ef2cfa40d6fbc6bc164d57ca981bc216dacede4
 2021-03-16 22:57:41 +08:00
Bonian Chen
d42d9a41f6 Merge "[Settings] Code refactor - remove unused import lines" am: d248042a02 am: c27980c1a9 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1639941

Change-Id: I8efdc871c29a6c56aacf7a1b553a20c9cafc765d
 2021-03-16 14:45:42 +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
lucaslin
8ffc3908ff Change the parameter type from ContentResolver to Context 
Context is more useful than ContentResolver, it can provide more
information if we want to change the behavior in the future.

Bug: 172183305
Test: make RunSettingsRoboTests \
      ROBOTEST_FILTER=PrivateDnsPreferenceControllerTest
Test: make RunSettingsRoboTests \
      ROBOTEST_FILTER=PrivateDnsModeDialogPreferenceTest
Change-Id: I6c06460b67f81112db311f0739457d5f1e2e4554
 2021-03-16 17:41:37 +08:00
Lucas Lin
e30a49423b Merge "Use getPrivateDnsMode() to get the value of private DNS" am: 159f261889 am: 73c971a5af 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1620600

Change-Id: I6ae6e3f272c275ee3590328aa6039e2b995859c4
 2021-03-16 08:46:30 +00:00
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