Alex Johnston
74d2ec5c2d
Merge "Settings: Disable USB preferences if USB signaling is off" into sc-dev
2021-03-24 10:13:47 +00:00
YUKAI HUNG
00222cb467
Merge "Export methods from BatteryEntry and controller for battery usage" into sc-dev
2021-03-24 09:27:32 +00:00
Weng Su
95744749e5
Merge "[Provider Model] Update fix connectivity icon" into sc-dev
2021-03-24 09:22:06 +00:00
Wesley.CW Wang
3da3bf7a21
Remove Battery Settings page battery saver tips
...
- Not present Battery saver tips when it's enabled
- Not redirect Low battery tips to saver tips when saver is enabled
Screenshots:
https://screenshot.googleplex.com/4ehKSRs8gM64wfm.png
https://screenshot.googleplex.com/92pd3q9jnTEXd8o.png
https://screenshot.googleplex.com/BzLYwTjdi3kH4RF.png
https://screenshot.googleplex.com/4w9ubmHaajNxB9b.png
Bug: 183079415
Test: make RunSettingsRoboTests -j40
Change-Id: Ib9783a95df88753342ff217b1a402f2dbb99079d
2021-03-24 08:42:21 +00:00
ykhung
b4b302f936
Export methods from BatteryEntry and controller for battery usage
...
Export a method to fetch BatteryEntry for battery usage new design, and
we have to fetch the label name each time when the new UI is shown to
avoid locale is changed from database records.
Bug: 180607705
Test: make RunSettingsRoboTests
Test: make RunSettingsGoogleRoboTests
Change-Id: Iae8f0b4812beb760b690e622f707fb67388221a2
2021-03-24 07:55:08 +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
Zhen Zhang
59aa4f9cb1
Merge "Update summary based on hibernated apps number" into sc-dev
2021-03-24 06:42:56 +00: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
Bonian Chen
8debbfa8a4
Merge "[Settings] Support getSystemService(Class<T>)" into sc-dev
2021-03-24 04:13:35 +00:00
tim peng
80f803c337
Merge "Get low battery level through metadata" into sc-dev
2021-03-24 03:27:30 +00:00
Tim Peng
7e6762de8a
Get low battery level through metadata
...
Bug: 183469297
Test: make -j50 RunSettingsRoboTests ROBOTEST_FILTER=AdvancedBluetoothDetailsHeaderControllerTest
Change-Id: Iae8971a5c1f183fe141d4246e23d8feb6d68d0ff
2021-03-24 09:32:26 +08: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
Jeremy Goldman
bd9a65cca6
Merge "Gear Preference on VPN page includes subtitle if the vpn is an insecure type" into sc-dev
2021-03-24 01:01:07 +00:00
Jeremy Goldman
37a7b7df48
Merge "Legacy VPN Configuration Dialog includes error message if VPN is an insecure type." into sc-dev
2021-03-24 01:00:17 +00:00
Rajeev Kumar
cafc769a51
Merge "Update Managed Device Info text for a financed device" into sc-dev
2021-03-23 20:55:27 +00:00
Rajeev Kumar
d85317e4e5
Merge "Update Privacy Settings text for a financed device" into sc-dev
2021-03-23 20:55:27 +00:00
Zhen Zhang
1f99d6a4b5
Update summary based on hibernated apps number
...
Update the summary of "unused apps" based on how many apps are
hibernated or auto revoked.
Test: HibernatedAppsPreferenceControllerTest
Bug: 181172051
Change-Id: I274eb3c0ada3d063937368232f31e52c20287552
2021-03-23 11:10:43 -07:00
Dmitri Plotnikov
5cc7c7c1de
Merge "Change getStatsStartRealtime to getStatsStartTimestamp" into sc-dev
2021-03-23 17:29:35 +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
Salud Lemus
a9a24372fd
Update Managed Device Info text for a financed device
...
Bug: 183448705
Test: Used a test device that is registered via ZT
Test: m RunSettingsRoboTests ROBOTEST_FILTER=EnterprisePrivacyPreferenceControllerTest
Change-Id: Iea2567e7943b122c6c6d2772380f8ddd57066a3f
2021-03-23 16:39:56 +00:00
Salud Lemus
930df91e66
Update Privacy Settings text for a financed device
...
Bug: 182802692
Test: Used a test device that is registered via ZT
Test: m RunSettingsRoboTests ROBOTEST_FILTER=EnterprisePrivacySettingsTest
Test: m RunSettingsRoboTests ROBOTEST_FILTER=PrivacySettingsEnterprisePreferenceTest
Test: m RunSettingsRoboTests ROBOTEST_FILTER=PrivacySettingsFinancedPreferenceTest
Change-Id: Icc131252430cd147e2a06ba2aa260f6ea26734bb
2021-03-23 16:06:01 +00:00
Janis Danisevskis
48e5f318db
Merge "Keystore 2.0: Remove references to Keystore 1.0" am: 7aa99fe966 am: c90b511239 am: a308ea1915
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1624590
Change-Id: I49cad17eab31b7531cb710915cbc57accd894598
2021-03-23 14:10:20 +00:00
Bonian Chen
6a4d7b65d0
Merge "[Settings] Support getSystemService(Class<T>)" am: 513da92357 am: 5734490d23 am: 8cd695efea
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1639943
Change-Id: I905f9d1646a9d9ea70e42c4b5368ff983611bee3
2021-03-23 13:52:46 +00:00
Alex Johnston
46c72f3cac
Settings: Disable USB preferences if USB signaling is off
...
* When developer options is turned
off and on again, 'Default USB
configuration' and 'Disable USB
audio routing' should not be enabled
if USB data signaling is disabled.
Manual testing:
* Disable USB data signaling
* Verify preferences are disabled
* Turn developer options off and on
* Verify preferences remain disabled
Bug: 180711035
Test: manual testing
make RunSettingsRoboTests -j ROBOTEST_FILTER=UsbAudioRoutingPreferenceControllerTest
make RunSettingsRoboTests -j ROBOTEST_FILTER=DefaultUsbConfigurationPreferenceControllerTest
Change-Id: Id08228da812b7534e2217b0c3f30a7ac989f7553
2021-03-23 11:43:28 +00:00
Wesley.CW Wang
3a52e335be
Remove Battery Settings page default tips
...
- Remove SummaryTips from default tips
- Clean up test file import
Screenshot: https://screenshot.googleplex.com/6rYrnMvoTbeCS7m.png
Bug: 183079415
Test: make RunSettingsRoboTests -j40
Change-Id: I1001d75235a6d8d5947b974939884103eb0834da
2021-03-23 08:44:42 +00:00
Jeremy Goldman
ab8eeca966
Gear Preference on VPN page includes subtitle if the vpn is an insecure
...
type
Test: atest SettingsUnitTests
Screenshot: https://screenshot.googleplex.com/BWfUf6hcHNnbLvH
Bug: 176821216
Change-Id: I2bee3ba100bfe636221264492a2ce98b6a664cd5
Merged-In: I2bee3ba100bfe636221264492a2ce98b6a664cd5
(cherry picked from commit 3922249709 )
2021-03-23 08:38:12 +00:00
Jeremy Goldman
222dd91102
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
Merged-In: I528d46654a39df04b647d6d0137aaf80e7adb05c
(cherry picked from commit 5d92ad5232 )
2021-03-23 08:37:11 +00:00
Bonian Chen
238ad87750
Merge "[Settings] Fix divide by zero in data usage UI" into sc-dev
2021-03-23 04:50:54 +00:00
Janis Danisevskis
a308ea1915
Merge "Keystore 2.0: Remove references to Keystore 1.0" am: 7aa99fe966 am: c90b511239
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1624590
Change-Id: I590f53d3a4c1b6ad9c4bdb27f04103ccfba7e7af
2021-03-23 04:09:47 +00:00
Weng Su
b30db25d8c
Merge "[Provider Model] Bring back the "turn on Wi-Fi automatically" option" into sc-dev
2021-03-23 03:24:18 +00:00
Weng Su
5ac8414834
Merge "[Provider Model] Update Internet preference summary" into sc-dev
2021-03-23 03:21:08 +00:00
Janis Danisevskis
7aa99fe966
Merge "Keystore 2.0: Remove references to Keystore 1.0"
2021-03-23 03:14:28 +00:00
Bill Lin
9f046e55b6
Merge "2/ Set Swipe bottom for notification OFF by default" into sc-dev
2021-03-23 01:22:38 +00:00
Dmitri Plotnikov
3b5c5f0d7c
Change getStatsStartRealtime to getStatsStartTimestamp
...
Bug: 183434301
Test: make RunSettingsRoboTests
Test: make RunSettingsGoogleRoboTests
Change-Id: Ic86a04a91d910c863706a0f799c757dcd7c5262d
2021-03-22 15:51:21 -07:00
Janis Danisevskis
75a91836e7
Keystore 2.0: Remove references to Keystore 1.0
...
Test: N/A
Bug: 171305684
Change-Id: I8b50c024e919d5b98348b792e0769c510ff1a33d
2021-03-22 13:35:53 -07:00
Peter Kalauskas
01f77d8e00
Merge "Introduce guest user metrics" into sc-dev
2021-03-22 20:17:20 +00:00
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
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
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
Arc Wang
e98a5a9932
Merge "Only show storage category stats preferences for private volumes" into sc-dev
2021-03-22 11:06:47 +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
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
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
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