SongFerng Wang
8722e00b4a
Merge "KEY_CARRIER_NR_AVAILABILITIES_INT_ARRAY change type as IntArray" am: 5292baf810
am: d1278a3d3d
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1645427
Change-Id: I2618da0e75674e7c3c878f5aee50278ac0c0e76a
2021-03-22 19:34:15 +00:00
Sally Yuen
b35c405705
Merge "Reduce RBC test flakiness" into sc-dev am: 1908c5357c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13919447
Change-Id: I6db7640c76e6a9f86674e685b229e9f926115b42
2021-03-22 19:24:25 +00:00
SongFerng Wang
d1278a3d3d
Merge "KEY_CARRIER_NR_AVAILABILITIES_INT_ARRAY change type as IntArray" am: 5292baf810
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1645427
Change-Id: I9acfb31454bc8d63480adc64311717c07715d6f0
2021-03-22 19:22:27 +00:00
SongFerng Wang
5292baf810
Merge "KEY_CARRIER_NR_AVAILABILITIES_INT_ARRAY change type as IntArray"
2021-03-22 19:06:48 +00:00
Bonian Chen
0880675414
[Settings] Fix divide by zero in data usage UI
...
Data usage UI got divide by zero exception when zero data usage.
Bug: 182822862
Test: local
Change-Id: Ibe57034e7d441e94c0529cb76f1a16665aaacff6
2021-03-22 17:10:00 +00:00
Sally Yuen
1908c5357c
Merge "Reduce RBC test flakiness" into sc-dev
2021-03-22 16:27:49 +00:00
Weng Su
bec3144c11
[Provider Model] Bring back the "turn on Wi-Fi automatically" option
...
- Screenshot:
https://screenshot.googleplex.com/92uXX6KQCqWxvub
Bug: 182620666
Test: manual test
make RunSettingsRoboTests
ROBOTEST_FILTER=WifiWakeupPreferenceControllerTest
Change-Id: Ic0ce47a6d9a374fce9752d67a9c2d083486b9083
2021-03-22 22:28:55 +08: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
6274dd765b
[automerger skipped] Merge "Change the behavior of notifyAllowedNetworkTypesChanged." am: 3ac3cce15b
am: b3f2e9090a
am: 34c8d35cd3
-s ours am: 2160d5fc4c
-s ours
...
am skip reason: skip tag Change-Id Ic94816415920bf25896ef2b198e228f369039c94 with SHA-1 4ccbe5d785
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1641828
Change-Id: I0bcc53c2eb2194521e64eff5148b1d2966424538
2021-03-22 13:53:03 +00:00
Bonian Chen
1f5c043b0c
Merge "[Settings] Rollback design for getSystemService(String)" am: 7a8463dbf8
am: de520dd11a
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1648047
Change-Id: I88dff2ed3675305469015351c54272ea6a0d1854
2021-03-22 13:01:19 +00:00
Bonian Chen
de520dd11a
Merge "[Settings] Rollback design for getSystemService(String)" am: 7a8463dbf8
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1648047
Change-Id: Ib628d337f511f67b88f34f6ef426d21a6176d817
2021-03-22 12:40:43 +00:00
SongFerng Wang
2160d5fc4c
[automerger skipped] Merge "Change the behavior of notifyAllowedNetworkTypesChanged." am: 3ac3cce15b
am: b3f2e9090a
am: 34c8d35cd3
-s ours
...
am skip reason: skip tag Change-Id Ic94816415920bf25896ef2b198e228f369039c94 with SHA-1 4ccbe5d785
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1641828
Change-Id: I7cd5fd91bf1fe1d784df2d2082274adb32b5e754
2021-03-22 12:29:12 +00:00
Bonian Chen
7a8463dbf8
Merge "[Settings] Rollback design for getSystemService(String)"
2021-03-22 11:57:51 +00:00
Arc Wang
86940142ad
Merge "Only show storage category stats preferences for private volumes" into sc-dev am: e98a5a9932
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13922070
Change-Id: I260581ae4f06bb976f8a9b2b90a25a3c34687998
2021-03-22 11:41:32 +00:00
Arc Wang
e98a5a9932
Merge "Only show storage category stats preferences for private volumes" into sc-dev
2021-03-22 11:06:47 +00:00
Jeremy Goldman
5d92ad5232
Legacy VPN Configuration Dialog includes error message if VPN is an
...
insecure type.
Screenshot: https://screenshot.googleplex.com/53pAJuhTDLJW4Em
Bug: 176821216
Test: atest SettingsUnitTests
Change-Id: I528d46654a39df04b647d6d0137aaf80e7adb05c
2021-03-22 18:14:26 +08:00
Jeremy Goldman
3216c16fe4
Merge "Connect VPN warning help icon with the network & internet page."
2021-03-22 10:13:44 +00:00
Alex Johnston
beff3ecba9
Merge "Allow enabled IMEs to be disabled in Settings" into sc-dev am: caf50d1203
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13676765
Change-Id: I2ccba2a65579c22293f626bba670e1d573ce936b
2021-03-22 09:54:54 +00:00
Bonian Chen
0fd51cc9ea
[Settings] Rollback design for getSystemService(String)
...
Some of the design are intented for getSystemService(String).
Rollback those items.
Bug: 179640862
Test: local
Change-Id: I581070afb380a86c6352322f927c269b4527aee9
2021-03-22 09:44:22 +00:00
Weng Su
020af77825
Hide edit menu if network is uneditable
...
- Screenshot:
https://screenshot.googleplex.com/3BhZRBrmQXjeaGL
Bug: 161896161
Test: manual test
make RunSettingsRoboTests ROBOTEST_FILTER=WifiNetworkDetailsFragment2Test
Merged-In: I47ea2cf19e178eff48f23e56903d0daa4ef8fa28
Change-Id: I47ea2cf19e178eff48f23e56903d0daa4ef8fa28
(cherry picked from commit b7dbd3a911
)
2021-03-22 09:43:57 +00:00
Bonian Chen
f9f2fe3f84
Merge "[Settings] Convert to getSystemService(Class<T>)" am: 13fb77c652
am: 70f887af52
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1645152
Change-Id: I89fa2de521bb07911f0c7ee0122ba3b2cb062fab
2021-03-22 09:36:16 +00:00
Bonian Chen
8cd695efea
Merge "[Settings] Support getSystemService(Class<T>)" am: 513da92357
am: 5734490d23
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1639943
Change-Id: I2630ee28b766890d36bbc4c360eeb19d07ef73d7
2021-03-22 09:36:14 +00:00
Alex Johnston
caf50d1203
Merge "Allow enabled IMEs to be disabled in Settings" into sc-dev
2021-03-22 09:26:27 +00:00
Bonian Chen
70f887af52
Merge "[Settings] Convert to getSystemService(Class<T>)" am: 13fb77c652
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1645152
Change-Id: I3c76b1bf371a7bd8ecaea8b8c23a4a908e8b2c06
2021-03-22 08:56:33 +00:00
Bonian Chen
5734490d23
Merge "[Settings] Support getSystemService(Class<T>)" am: 513da92357
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1639943
Change-Id: Id7a6f8c0c21d2bf5112a91554f608974586588c1
2021-03-22 08:56:21 +00:00
Arc Wang
40396d532f
Only show storage category stats preferences for private volumes
...
Hide it because there is no framework API to get storage
category stats of public volumes.
Bug: 174964885
Test: manual
Observe storage settings UI of a USB flash drive.
Change-Id: I7272cd18c186793f86548a87b5cb88bb957ff8d5
2021-03-22 16:28:59 +08:00
Jeremy Goldman
1e461619ab
Unit tests for the VpnInfoPreference.
...
Test: atest -c VpnPreferenceController
Bug: 176821216
Change-Id: Ia9754023ac392b64fe1755aabcb399d9dd9ace6e
2021-03-22 16:26:32 +08:00
Jeremy Goldman
7a68eb3b5e
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.
note: because of the junit test migration, I will add test
files in a separate CL
Screenshot: https://screenshot.googleplex.com/AfGrH8wRusTvbf4
Test: atest -c SettingsUnitTests
Bug: Bug: 176821216
Change-Id: I1aa93be5b90b404d9d9cb9bf47ea76fdc9aad401
2021-03-22 16:26:24 +08:00
Bonian Chen
13fb77c652
Merge "[Settings] Convert to getSystemService(Class<T>)"
2021-03-22 08:18:59 +00:00
Bonian Chen
513da92357
Merge "[Settings] Support getSystemService(Class<T>)"
2021-03-22 08:18:59 +00:00
SongFerng Wang
552639ac25
Merge "Provider model CarrierItem's subtitle show no connection" into sc-dev am: 826a146c20
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13922069
Change-Id: I26dca0c67486767ad996fe29869e06848f5d8bbe
2021-03-22 08:14:49 +00: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
e88740eae2
KEY_CARRIER_NR_AVAILABILITIES_INT_ARRAY change type as IntArray
...
Bug: 179814490
Test: build pass
Change-Id: I9d2abe1abe3082267ed64b71602d8ada21c95c6c
Merged-In: I9d2abe1abe3082267ed64b71602d8ada21c95c6c
2021-03-22 07:17:22 +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
Bonian Chen
db6c47756d
[Settings] Convert to getSystemService(Class<T>)
...
Change to getSystemService(Class<T>) to align the capability with framework
part.
Bug: 179640862
Test: local
Change-Id: I1b4812044fc4876bec6645570049a60f9470dbbd
2021-03-22 06:20:19 +00:00
Tiffany Nguyen
f5ce0c371f
Add new battery settings feature provider. am: 34fb874647
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13915239
Change-Id: Ica2285c297ddc740793bd3a0f0bca08b4f8ecd50
2021-03-22 05:45:46 +00:00
Tiffany Nguyen
34fb874647
Add new battery settings feature provider.
...
Test: No-op class
Bug: 181827863
Change-Id: Iafd4c6128ba63d3c794c076edaaa7638e3de3a42
2021-03-22 05:22:38 +00:00
SongFerng Wang
34c8d35cd3
Merge "Change the behavior of notifyAllowedNetworkTypesChanged." am: 3ac3cce15b
am: b3f2e9090a
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1641828
Change-Id: I5ba679ca3d2a6f6411dae1ffdc441527508d4763
2021-03-22 03:56:36 +00:00
SongFerng Wang
b3f2e9090a
Merge "Change the behavior of notifyAllowedNetworkTypesChanged." am: 3ac3cce15b
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1641828
Change-Id: I74750b2abd69c47b753cd3ee6e69e4ec1bbd7339
2021-03-22 03:12:24 +00:00
Chiachang Wang
9c918200e3
Merge "Remove hidden @Transport usage" into sc-dev am: b2eb0317a4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13922079
Change-Id: I3592c4b292dbaf8930438d0f2f2c1d92514035d3
2021-03-22 03:10:16 +00:00
Chiachang Wang
b2eb0317a4
Merge "Remove hidden @Transport usage" into sc-dev
2021-03-22 02:43:59 +00:00
TreeHugger Robot
40cc4f0d4c
Merge "Hide edit menu if network is uneditable" into sc-dev am: 8bdbdf4b91
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13916847
Change-Id: I0f5cb8d9de98a43a027bc1c46994285acf309103
2021-03-22 02:29:47 +00:00
TreeHugger Robot
8bdbdf4b91
Merge "Hide edit menu if network is uneditable" into sc-dev
2021-03-22 01:53:59 +00:00
sallyyuen
b75902f0ba
Reduce RBC test flakiness
...
Read the setting directly, which is successfully being set by the
display manager
Bug: 182099323
Test: forrest
Change-Id: Ia68c8206187995fc5a615d6815f04b8ad01f9312
2021-03-21 18:03:35 +00:00
SongFerng Wang
3ac3cce15b
Merge "Change the behavior of notifyAllowedNetworkTypesChanged."
2021-03-21 16:45:59 +00:00
TreeHugger Robot
9c912b76c6
[automerger skipped] Merge changes from topic "revamp storage settings header" into sc-dev am: d7fff5790a
-s ours
...
am skip reason: skip tag Change-Id I85fa117ff0a49ec7a53ba36580591c7ce7f5a8dc with SHA-1 ba79fe6676
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13715539
Change-Id: Iec1d57d81fc875cfda6b940da4c717ca63ba4311
2021-03-20 16:48:58 +00:00
TreeHugger Robot
d7fff5790a
Merge changes from topic "revamp storage settings header" into sc-dev
...
* changes:
Add option menu in StorageDashboardFragment
Revamp Storage Settings header part
2021-03-20 16:06:50 +00:00
Arc Wang
5fa38bbba2
Merge changes from topic "revamp storage settings header - master"
...
* changes:
Add option menu in StorageDashboardFragment
Revamp Storage Settings header part
2021-03-20 15:31:21 +00:00
Oli Lan
dd091f8bae
Merge "Add a setting to turn clipboard access notifications on/off." into sc-dev am: 228cc886ae
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13872509
Change-Id: I4f84bdbba6ca340ed140c7033247737c53bd2c76
2021-03-20 12:43:15 +00:00
Oli Lan
228cc886ae
Merge "Add a setting to turn clipboard access notifications on/off." into sc-dev
2021-03-20 12:07:41 +00:00