Pavel Grafov
16d588c11a
Prevent disconnecting admin-configured VPN
...
First, if the VPN is configured by an admin, the preference is
disabled and tapping on it will results in a policy disclouser
dialog.
In addition restriction checks in the dialog also check if the
VPN is admin-configured.
Bug: 179975048
Test: Manual, setting VPN in profile and primary user and via DPM API.
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=com.android.settings.vpn2
Change-Id: Id59d2ac2782e83601bc3093d3a092faea36ff5d9
2021-03-31 15:20:11 +00:00
Bonian Chen
194af56330
Merge changes from topic "revert-1645152-getSystemService(Class<T>)-KMFSZZGDPU"
...
* changes:
Revert "[Settings] Support getSystemService(Class<T>)"
Revert "[Settings] Convert to getSystemService(Class<T>)"
2021-03-31 14:30:40 +00:00
Arc Wang
9d5b4688e2
Merge "Fix com.android.settings.deviceinfo.storage.StorageEntryTest" into sc-dev am: aed1bba60a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14029456
Change-Id: I3a382089a60bc5c036d7e5d2fee85ddff03de68f
2021-03-31 12:53:38 +00:00
Arc Wang
aed1bba60a
Merge "Fix com.android.settings.deviceinfo.storage.StorageEntryTest" into sc-dev
2021-03-31 12:36:46 +00:00
Alex Johnston
90119bca81
Merge "Remove hardcoded URL string" into sc-dev am: a05759cb7d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14033950
Change-Id: I033baaa50a01bdc0090beade4a51e285f9451477
2021-03-31 11:04:01 +00:00
Alex Johnston
a05759cb7d
Merge "Remove hardcoded URL string" into sc-dev
2021-03-31 10:35:51 +00:00
Yanting Yang
acbd60285f
Add positive button into regulatory info dialog
...
Based on UX decision to add the positive button into regulatory info
dialog to exit.
Bug: 180558322
Test: visual
Change-Id: I0939ec11d140b5df6d4104042cc376b5c07f12e4
2021-03-31 18:00:29 +08:00
Bill Lin
49ba85dc8a
2/ Make One handed mode support multiple user switch
...
Previously OHM did not support for multile user switch.
We get current user id in settings and get/put settings value
with currentUserId.
Test: manual switch user and check Settings > System > Gesture > One-Handed
Test: make RunSettingsRoboTests -j40
Bug: 182278800
Change-Id: I12dcc7b634ae19375358733357dc95197e81067c
2021-03-31 17:48:23 +08:00
Bonian Chen
2b195b4335
Revert "[Settings] Support getSystemService(Class<T>)"
...
Revert submission 1645152-getSystemService(Class<T>)
Reason for revert: Fix JUnit test failure
Reverted Changes:
I1b4812044:[Settings] Convert to getSystemService(Class<T>)
I278951c24:[Settings] Support getSystemService(Class<T>)
Change-Id: I5ca453c30c39d52e772033820f36ad448aeabe9e
2021-03-31 09:37:03 +00:00
Bonian Chen
d6f54ed90b
Revert "[Settings] Convert to getSystemService(Class<T>)"
...
Revert submission 1645152-getSystemService(Class<T>)
Reason for revert: Fix JUnit test failure
Reverted Changes:
I1b4812044:[Settings] Convert to getSystemService(Class<T>)
I278951c24:[Settings] Support getSystemService(Class<T>)
Change-Id: I864a40f82ba9cb4170900ac0c1d77f781b17341f
2021-03-31 09:37:03 +00:00
Alex Johnston
56519258ef
Remove hardcoded URL string
...
* Details on URLs in the credential management
app preference should be translatable.
* Remove hardcoded text and introduce strings.
Manual testing
* Download TestDPC and select 'Request to
manage credentials'.
* Select allow.
* Go to Settings Credential management app
preference and verify URL strings are displayed
correctly.
Bug: 170627997
Test: manual testing
Change-Id: Iadff0c136064dabc3f77e30b46356126d657397f
2021-03-31 10:17:36 +01:00
Yanting Yang
9916f07f3e
Merge "Make work profile sounds section as its own entry" into sc-dev am: 6ef0b34a32
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13887089
Change-Id: I819769ce85ccdb316600df7da4c55552a2be6982
2021-03-31 08:37:28 +00:00
Yanting Yang
6ef0b34a32
Merge "Make work profile sounds section as its own entry" into sc-dev
2021-03-31 08:08:41 +00:00
Mill Chen
a1490d26c4
Merge "Add an error dialog in FingerprintEnrollFindSensor" into sc-dev am: 3525843554
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14029861
Change-Id: Ib399d432aa4cf8c18aad79a0779e5026c262865f
2021-03-31 03:39:50 +00:00
Ahaan Ugale
318f7cc512
Fix passwords settings crash due to null lifecycle owner.
...
A change related to lifecycles was reverted some time ago
(I7e6d2e9e6fd363a3afdd3dbab24e7c3b36e9ed29), which caused this to break.
The crash is only seen if an autofill service sets the new Passwords
Activity attr; currently no services do.
Fix: 184077486
Test: manual - check settings page and see no crash
Test: manual - same with work profile added
Test: make RunSettingsRoboTests
Change-Id: Ie439f37c9e884f9de2b112b348e1bef03adcd077
2021-03-31 03:31:33 +00:00
Mill Chen
3525843554
Merge "Add an error dialog in FingerprintEnrollFindSensor" into sc-dev
2021-03-31 03:11:10 +00:00
Arc Wang
a1fb47beb8
Fix com.android.settings.deviceinfo.storage.StorageEntryTest
...
StorageEntry#isStub() is unused and not built in apk.
Remove the method to fix test fail.
Bug: 184045592
Test: atest com.android.settings.deviceinfo.storage
Change-Id: I89d73c45111918c2ff01174d6fbb47f8c59f6968
2021-03-31 10:05:09 +08:00
Jay Aliomer
d83e663013
Merge "Notification history UI buff" into sc-dev am: 91b4a58111
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14037274
Change-Id: If2bd8f413961c6c43fcdd3fe6f64ffe0569704ec
2021-03-30 20:32:30 +00:00
Jay Aliomer
91b4a58111
Merge "Notification history UI buff" into sc-dev
2021-03-30 20:29:33 +00:00
Jay Aliomer
5d10dbc732
Notification history UI buff
...
Fixes: 182155974
Test: visual test
Change-Id: I028381407504b3cf390987a6fa11c041fddf6198
2021-03-30 14:49:57 -04:00
Yu-Han Yang
6b7ae6b75e
Merge "Untab Location Settings and tab Location Services" into sc-dev am: 60ddf8d7d4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13985188
Change-Id: Icd9ff01202d4fd4135b79f03eb5df5a9c1cc04b1
2021-03-30 17:10:11 +00:00
Yu-Han Yang
d822c05cdf
Merge "Update links to Scanning Settings" into sc-dev am: 8d07eeb590
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13991364
Change-Id: I00757cd497f322a174468f10edae756d9840ba6a
2021-03-30 17:10:04 +00:00
Yu-Han Yang
60ddf8d7d4
Merge "Untab Location Settings and tab Location Services" into sc-dev
2021-03-30 16:48:38 +00:00
Yu-Han Yang
8d07eeb590
Merge "Update links to Scanning Settings" into sc-dev
2021-03-30 16:47:18 +00:00
Alex Johnston
2f8d178435
Merge "RequestManageCredentials support RTL languages" into sc-dev am: 099a144869
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14018678
Change-Id: Id19b8324a3d5154697d90599a0d56def215b9448
2021-03-30 15:18:07 +00:00
Alex Johnston
099a144869
Merge "RequestManageCredentials support RTL languages" into sc-dev
2021-03-30 14:52:49 +00:00
Yanting Yang
e14a3a3022
Make work profile sounds section as its own entry
...
Also rephrase the strings by request.
Bug: 174964721
Test: manual
Change-Id: I760249cd48832f2739ab7ca33706cd11dd34a6b5
2021-03-30 22:37:01 +08:00
Julia Reynolds
b3b92c996c
Merge "Fix some 'clear recent issues'" into sc-dev am: 05c30a3f53
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14019938
Change-Id: Id5244f754140fdd68097407798363a62caec3087
2021-03-30 14:21:49 +00:00
Mill Chen
4606a292ac
Add an error dialog in FingerprintEnrollFindSensor
...
When a device stands for a while during the fingerprint enrollment, the
fingerprint icon will disappear without any warning message. This
change is trying to show a dialog to inform users.
Fixes: 180633056
Test: visual verified
1) Settings -> Security -> Fingerprint
2) Navigate to "Touch & hold the fingerprint icon" page
3) Let device stand for a while and see if there's a dialog shown
Change-Id: I69c8fb73f2a7406e4a379396e2624fb523e162a8
2021-03-30 21:49:11 +08:00
Julia Reynolds
05c30a3f53
Merge "Fix some 'clear recent issues'" into sc-dev
2021-03-30 13:41:58 +00:00
Almaz Mingaleev
edd4dea232
resolve merge conflicts of 7d9233302f to sc-dev am: dea929aa06
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14032726
Change-Id: I3ce506516ee7e9f6ff4581705e4c150d10faa26b
2021-03-30 11:58:28 +00:00
Sunny Shao
9798dc06fe
Merge "Fix the "Add link" permanent disabled problem" into sc-dev am: 9bd9d299f0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14008226
Change-Id: Ifde95d1793692e83cfff5cef45d20047d5d1a149
2021-03-30 11:58:24 +00:00
Weng Su
2c8e759692
Merge "Fix the WifiTether test case failed" into sc-dev am: 9b86942fec
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14029853
Change-Id: I312a83e3f07dd28658b744a73d51675d2486c115
2021-03-30 11:58:19 +00:00
Weng Su
045b3eba93
Merge "[Provider Model] Move the Internet unavailable Wi-Fi down" into sc-dev am: 4e341b780a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13990616
Change-Id: I5845d9691397f86ade3e69279d8e9c33a6f53b99
2021-03-30 11:57:01 +00:00
Almaz Mingaleev
dea929aa06
resolve merge conflicts of 7d9233302f to sc-dev
...
Change-Id: I7f6b7b035cc9c37a168e97ddeac5c8de9d5910de
2021-03-30 11:43:33 +00:00
Sunny Shao
9bd9d299f0
Merge "Fix the "Add link" permanent disabled problem" into sc-dev
2021-03-30 11:41:29 +00:00
Weng Su
9b86942fec
Merge "Fix the WifiTether test case failed" into sc-dev
2021-03-30 11:34:13 +00: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
Arc Wang
5db8f5ae05
Merge "Check config to decide if Smart Storage toggle should exist" into sc-dev am: 21cf6c04db
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13994999
Change-Id: Ib25fad04992539fb95bc32870a0ea28ab562a8c0
2021-03-30 11:18:35 +00:00
Arc Wang
71ec654fcc
Merge "Show "Files" category for public storage in Storage Settings" into sc-dev am: dd2f2f51e0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13975110
Change-Id: Iea8ea56dfa32eca83adeb75b5fc98668af017b80
2021-03-30 11:18:15 +00:00
Arc Wang
21cf6c04db
Merge "Check config to decide if Smart Storage toggle should exist" into sc-dev
2021-03-30 09:49:48 +00:00
Arc Wang
dd2f2f51e0
Merge "Show "Files" category for public storage in Storage Settings" into sc-dev
2021-03-30 09:48:04 +00:00
Almaz Mingaleev
7d9233302f
Merge "Allow alternative time zone ID to be set device's zone." am: 2cd0b0aadf am: 87273aab56
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1652336
Change-Id: I8cce932794d13dd8f9424883b9521a823583f335
2021-03-30 09:39:21 +00:00
Weng Su
b63e672fa8
Fix the WifiTether test case failed
...
- Use the same service name(WifiManager.class) to mock
WifiManager.class
- Use the same service name(TetheringManager.class) to mock
TetheringManager.class
Bug: 184018452
Test: manual test
make RunSettingsRoboTests ROBOTEST_FILTER=WifiTether
Change-Id: I64741818d3455154866097f83e3a96c1c510e23b
2021-03-30 17:13:58 +08:00
Arc Wang
78bafc988a
Check config to decide if Smart Storage toggle should exist
...
Bug: 174964885
Test: AutomaticStorageManagementSwitchPreferenceControllerTest
Change-Id: I3090e3d1b01b18b3d0f68396671c8791321cc480
2021-03-30 07:58:37 +00:00
Mill Chen
dc67195a45
Merge "Update lock pattern for landscape" into sc-dev am: ad8a4029c3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14025285
Change-Id: Idca74002b472c842e403d8b269b693a6aea67476
2021-03-30 07:55:57 +00:00
Arc Wang
c626380689
Show "Files" category for public storage in Storage Settings
...
Users can click this preference to see public storage files
in external file browsers.
Bug: 170918505
Test: make RunSettingsRoboTests ROBOTEST_FILTER=StorageItemPreferenceControllerTest
manual
Select private storage and public storage and observe UI
Change-Id: If3f0d59b2ebf941d70e81e60c4c2015b80e7cf33
2021-03-30 15:51:49 +08:00
Sunny Shao
ace3cb8122
Fix the "Add link" permanent disabled problem
...
- Update setEnabled of the "Add link" while UI change.
Fixes: 183797700
Test: manual test
Change-Id: Ia6dad313ab752ccbe7313f6a4cdf759b02dff728
2021-03-30 15:51:43 +08:00
Mill Chen
ad8a4029c3
Merge "Update lock pattern for landscape" into sc-dev
2021-03-30 07:24:17 +00:00
Wesley Wang
9d58d7455e
Merge "Reset smart battery page switch component" into sc-dev am: 4559d22e51
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14017668
Change-Id: I723254c68196c75607d21d89a400164fee908abf
2021-03-30 06:48:44 +00:00