Commit Graph

161 Commits

Author SHA1 Message Date
Hani Kazmi
8e28132ba2 Revert "Revert "[AAPM] Add advanced protection dialog according ..."
Revert submission 31078830-revert-30767017-aapm-dialog-api-feedback-TBLFTCNTUN

Reason for revert: Addressed failing test

Reverted changes: /q/submissionid:31078830-revert-30767017-aapm-dialog-api-feedback-TBLFTCNTUN

Change-Id: I3321b4f5baaca9dd270350b9201998ffe0d40473
2025-01-02 05:07:50 -08:00
Priyanka Advani (xWF)
2574343b43 Revert "[AAPM] Add advanced protection dialog according to API f..."
Revert submission 30767017-aapm-dialog-api-feedback

Reason for revert: Droidmonitor created revert due to b/384828570. Will be verifying through ABTD before submission.

Reverted changes: /q/submissionid:30767017-aapm-dialog-api-feedback

Change-Id: Ibf26aca2453f2007370974290f5c16d6b091341e
2024-12-23 13:41:43 -08:00
Azhara Assanova
e2248f1c4f [AAPM] Add advanced protection dialog according to API feedback
This change also updates ActionDisabledByAdminDialog because the
AdvancedProtectionManager#createSupportIntent method is now static.

Bug: 378968840
Bug: 352420507
Test: ActionDisabledByAdminDialogTest
Test: WepNetworksPreferenceControllerTest
Test: manual
Flag: android.security.aapm_api
Change-Id: I8443742aadead45091fee757cbdf715d28eee495
2024-12-13 13:25:38 +00:00
Azhara Assanova
47e665802b [AAPM] Update ActionDisabledByAdminDialog and ExternalSourcesDetails strings
The new advanced protection support intent will be launched by the
existing ActionDisabledByAdminDialog if the enforcing admin of a certain
restriction is advanced protection. To determine that, Change-Id
If931dcddad508f88aac1280b587da4767b937875 introduces an API to query the
enforcing admin.

In addition, this change updates ExternalSourcesDetails to display
a disabled by advanced protection string in the preference summary.

Tests will be written in a follow up change.

Bug: 358229113
Bug: 369361373
Test: manual
Test: atest ActionDisabledByAdminDialogTest
Test: atest ExternalSourcesDetailsTest
Test: atest LocationInjectedServicesPreferenceControllerTest
Flag: android.security.aapm_api
Flag: android.security.aapm_feature_disable_install_unknown_sources
Change-Id: Icedef421d65f7ccde6562734e39a87d4458567ff
2024-11-26 10:20:18 +00:00
Jason Chiu
0bd014c497 [Safer intents] Settings misc
To avoid implicit intents, make intents launch explicitly.

Test: build
Bug: 323061508
Change-Id: Ie19cbceb89842a75a180898abcce81b63c18d46c
2024-03-29 04:22:45 +00:00
Olivier Nshimiye
0f3799cbad Add an additional flag guard for Private Space implementation
This a layer of flag guarding only for the implementation of Private Space features excluding the APIs. The MVP flag allow_private_profile still guards all the features including the APIs.

Bug: 326060689
Test: Manual - a few verifications that some feeatures are unavailable when this flag is disabled
Test: Run presubmits and verify that nothing breaks
Change-Id: I05f7e2f20c6132b33484bb133ce03a933ece485f
2024-03-04 15:43:24 +00:00
josephpv
62df3efdd7 Handle listing of PS apps in Apps > Special App Access > Device Admin Apps
Currently Device Admin Apps page shows apps from Private space even
when PS is locked.  This change takes care to hide PS apps from the list
when private profile is in quiet mode and on disabling quiet mode PS
apps are shown in the list.
Also takes care to update the active apps summary count to not include
PS apps when private profile is in quiet mode.

Recording link : b/324311892#comment2

Bug: 324311892
Test: Manual
Change-Id: If4199ecad0a228c8e491778fb62c09c8b3f20604
2024-02-19 23:00:19 +00:00
Sunny Shao
076ed573eb Revert^2 "Nullability Annotations replacement"
This reverts commit 19d1d3d15d.

Reason for revert: revert it because this is not the root cause.

bug: 316867690
Change-Id: I0f168dbb64044aa720202af7b1040afd4f028c9c
2024-01-10 07:34:01 +00:00
Sunny Shao
19d1d3d15d Revert "Nullability Annotations replacement"
This reverts commit cf0501e4d7.

Reason for revert: b/317462033, it seems a flaky but revert it first.

Change-Id: Ie1d5e279cca6477fc17d8c27c1ecda8d7a6b2553
2023-12-29 02:28:24 +00:00
sunnyshao
cf0501e4d7 Nullability Annotations replacement
-- Replace the android.annotation.Nullable / android.annotation.NonNull
   with androidx.annotation.Nullable / androidx.annotation.NonNull

Bug: 316867690
Test: build pass
Change-Id: I0c1da55dfb09ece855151c47e0492d6f46538621
2023-12-20 08:50:09 +08:00
Chaohui Wang
2541381259 Fix references to resources for Settings
Bug: 293810334
Test: m Settings
Change-Id: Ie140278f492ef7e1c062ec1ecae2866c521a86aa
2023-08-08 01:56:05 +00:00
Chaohui Wang
3cdf5b9be9 Remove context from enterprisePrivacyFeatureProvider
EnterprisePrivacyFeatureProvider is created by using application
context, no need pass context in when get.

Bug: 286764889
Test: m Settings
Change-Id: I346f2b0ccbb0590f26954603ab630132cd8be63f
2023-08-02 19:10:31 +08:00
Chaohui Wang
515c0b8e3a Remove context from userFeatureProvider
UserFeatureProviderImpl is created by using application context,
no need pass context in when get.

Bug: 286764889
Test: m Settings
Change-Id: I80ac7124c3278399e562d4d7d49d1847847b92af
2023-08-02 17:25:41 +08:00
Jason Parks
bd6af1a484 Fix positive button when the click listener is not null.
Fixes changes made in ag/20171885:
https://screenshot.googleplex.com/4WeHHjy75A96wgf
https://screenshot.googleplex.com/3oQcLiY6AgYurB9

Bug: 252967902
Test: manual
Change-Id: I07985d540347c7b56982a90d386a5f93721344ea
2023-08-01 14:28:35 +00:00
Chaohui Wang
778c2dc3d5 Remove context from applicationFeatureProvider
ApplicationFeatureProvider is created by using application context,
no need pass context in when get.

Bug: 286764889
Test: m Settings
Change-Id: I7f8dfe5716b7b55e0ff984f7603875d7896e2313
2023-07-03 13:54:26 +08:00
xinghailu
897fd74731 Cleanup some plurals in Settings
Change <one> to <1> in string res file, and update related java files.
Test: Update, existing test still pass.
bug: 199230342

Change-Id: Idd0ba3c6adc060da21574d98f8ed765fae00cef8
2022-12-22 16:05:13 +08:00
Roman Kalukiewicz
009945a337 Merge "Change the "Blocked by IT admin" to use family related dialog for children." 2022-10-24 15:23:51 +00:00
Edgar Wang
0b7944d38e Update the strings of Admin-Support Dialog
Bug: 252967902
Test: manual
Change-Id: I1c196aef3bea0771e99487b583c7d29fe9264a98
2022-10-12 13:08:24 +08:00
Roman Kalukiewicz
c18bb1a0cd Change the "Blocked by IT admin" to use family related dialog for children.
Test: manual
Change-Id: Ic610d0d0247346c97a80a794916284969022defc
2022-08-19 17:07:00 -07:00
Salud Lemus
d94e7fa411 Merge "Fix title used for financed device info in Settings" into tm-dev am: bb149294dd am: 86b967bcb8
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18934542

Change-Id: I630067e486b9924b1ade9226bb1537249ec6378e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-22 23:07:20 +00:00
Salud Lemus
a1df448703 Fix title used for financed device info in Settings
The title for the financed device info page in Settings changes to
"Managed device info" instead of "Financed device info"

Bug: 236259020
Test: Manual test

Change-Id: Ica6d990e8dada28b643a5523ec284c18d4af89d2
2022-06-16 19:32:14 +00:00
TreeHugger Robot
b3130cd857 Merge "Add missing settings strings." into tm-dev am: af5a015198
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17692465

Change-Id: Ib407602d7bdba7e7b60fada3ce53e3418b47efda
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-05 13:42:38 +00:00
Jonathan Scott
b7f4f56cad Add missing settings strings.
Also re-enable and fix tests.

Test: manual
Fixes: 226183482
Fixes: 218799125
Fixes: 219375624

Change-Id: I9605f1f4e2e834baf63e015e96639567c5481b5f
2022-05-05 09:12:59 +00:00
Prabal Singh
7642301f28 Merge "Remove extra argument WorkPolicyUtil constructor" into tm-dev am: 9a8f44227e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17981601

Change-Id: I0e90fc35f7916ae920ce08a2da996d69e01cf80f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-28 20:51:44 +00:00
Prabal Singh
3e2d7f4581 Remove extra argument WorkPolicyUtil constructor
Only constructor is required for WorkPolicyInfo constructor. The other
dependencies can be derives

Test: make ROBOTEST_FILTER=EnterprisePrivacyFeatureProviderImplTest RunSettingsRoboTests -j40
Change-Id: I7f35e5ed344d452190b333aad7fa823a010d17b3
2022-04-28 15:21:18 +01:00
Prabal Singh
a3bb653569 Merge "Use settingslib util methods for work policy info" into tm-dev am: 591c2c3b38
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17915088

Change-Id: I00659bd11958275081e038dbe67c8fb8481df96b
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-25 07:48:19 +00:00
Treehugger Robot
7191d7d09d Merge "Update OWNERS file for enterprise modules in Settings" am: 0edc7fb3cb am: 08f97c9bc0
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2064127

Change-Id: I016b3fa9032e278a9d88b842b0e72f460b71d6c6
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-23 19:56:36 +00:00
Prabal Singh
67007e5933 Use settingslib util methods for work policy info
Bug: b/229889270
Test: make ROBOTEST_FILTER=EnterprisePrivacyFeatureProviderImplTest RunSettingsRoboTests -j40
Change-Id: I0d968732a4dd601955e18b2ebb2af365638b450f
2022-04-23 20:35:41 +01:00
arangelov
e4d544ad40 Update OWNERS file for enterprise modules in Settings
Bug: 229101349
Test: none
Change-Id: I4f10d85e0a49c96a1c2fec8199aadfb60b3e19af
2022-04-13 17:08:07 +01:00
kholoud mohamed
de78149c16 RESTRICT AUTOMERGE Refactor device policy resource APIs to a separate class
Bug: 217388602
Bug: 218875965
Test: atest EnterpriseResourcesTests
Test: manual
Change-Id: I4775d7741c7819fd811c3fc4eda1636b1e04b398
2022-03-17 17:37:45 +00:00
Jonathan Scott
a2781721e2 Merge "Allow overriding of strings referenced in XML files." 2022-02-09 10:48:09 +00:00
Yanli Wan
2dd111b3c3 Update financed device info screen
Bug: 217375582
Test: manual
Test: m RunSettingsRoboTests ROBOTEST_FILTER=EnterprisePrivacySettingsTest
Test: m RunSettingsRoboTests ROBOTEST_FILTER=PrivacySettingsEnterprisePreferenceTest
Test: m RunSettingsRoboTests ROBOTEST_FILTER=PrivacySettingsFinancedPreferenceTest
Change-Id: Ie0045c7f97a331640209efd1118d841eb0ab1b6f
2022-02-07 16:58:26 -08:00
Jonathan Scott
269f97d960 Allow overriding of strings referenced in XML files.
Test: manual
Bug: 188414370
Change-Id: Ice45b1808530c14c4efff16795cac7b2cb81516e
2022-02-07 21:00:05 +00:00
Jonathan Scott
c3dbc3ffbd Merge "Allow Device Management Role Holder to update Settings strings." 2022-01-31 19:10:30 +00:00
Ricky Wai
c76a11f0c1 Add restricted settings UI in Settings accessibility screeen
If OP_ACCESS_RESTRICTED_SETTINGS is rejected, it means accessibility page
for that app is gray out and app info won't show "unlock restricted settings menu"

If OP_ACCESS_RESTRICTED_SETTINGS is ignored, it means accessibility page
for that app is gray out, but app info shows "unlock restricted settings menu"

If OP_ACCESS_RESTRICTED_SETTINGS is allowed(default), it means users can
access accessibility page for that app.

OP_ACCESS_RESTRICTED_SETTINGS will be changed to ignored if user visited
the restricted settings dialog.

OP_ACCESS_RESTRICTED_SETTINGS will be changed to allowed if user passes
the confirmation screen.

Bug: 202130031
Test: Tested the UI and it works correctly
Change-Id: I3dfb94cee440658b4726a1c3f7265f93cd19ed3e
2022-01-27 09:50:40 +00:00
Jonathan Scott
e0d439472f Allow Device Management Role Holder to update Settings strings.
Test: manual
Bug: 188414370
Change-Id: I6e1a06619799a9e99382d791e72e2e4518f93cac
2022-01-25 19:03:24 +00:00
Yuri Ufimtsev
cdc2677cd1 Refactor some Preference Controllers to use BasePreferenceController
Test: atest SettingsUnitTests
Change-Id: Ic93f29d6c35cb1a43937fa7bf2f1e2d489cdd09f
2022-01-10 13:25:13 +00:00
Antoan Angelov
3bc6b32b51 Merge "Don't start DPC with the FLAG_ACTIVITY_NEW_TASK flag" into sc-v2-dev 2021-10-08 18:23:50 +00:00
arangelov
c5346baaa2 Don't start DPC with the FLAG_ACTIVITY_NEW_TASK flag
The flag prevents the DPC screen from showing with the in-app
transition.

Fixes: 198422800
Test: manual
Change-Id: Ie6debb55396eb5ce48a21b1ef52c89612b1c7ffd
2021-10-07 19:27:38 +01:00
Ayush Sharma
49d20fa68e Fetch admin details if not present in Intent.
Get admin package/user details if this info is not present in the
intent(ACTION_SHOW_ADMIN_SUPPORT_DETAILS) received

Bug: 192245204
Test: atest MixedDeviceOwnerTest#testCreateAdminSupportIntent
      atest MixedProfileOwnerTest#testCreateAdminSupportIntent
      atest MixedManagedProfileOwnerTest#testCreateAdminSupportIntent

Change-Id: Idda6078a64c03588f0b786ebc79079198ab722fe
Merged-In: Idda6078a64c03588f0b786ebc79079198ab722fe
2021-09-16 12:13:21 +00:00
TreeHugger Robot
b36bbc55d1 Merge "[Settings] Pass the system user to launch the web help page" into sc-dev 2021-06-29 18:55:24 +00:00
arangelov
8fca8dc092 [Settings] Pass the system user to launch the web help page
Fixes: 191727929
Test: manually observed the policy transparency dialog
with launching the admin policies screen
Test: manually observed the policy transparency dialog
with launching the web help page

Change-Id: If0d10b30a5e5f2a1bade168f049c8613055289e7
2021-06-28 20:14:16 +01:00
Jan Tomljanovic
c6667337ca Enable controllers to use a custom key.
Test: atest SettingsUnitTests
Test: m -j45 RunSettingsRoboTests
Bug: 191763369
Change-Id: I48eea95613600580c80c8850f0a3fd543a7e0a43
2021-06-25 15:35:53 +01:00
Kevin Chyn
5a8476a709 Merge "Pass context and enforcedAdmin to onClickListener" into sc-dev 2021-06-17 01:28:17 +00:00
Kevin Chyn
678a57b0df Merge changes from topic "kchyn-unicorn4a" into sc-dev
* changes:
  Show biometric-specific dialog when appropriate
  Add biometric strings to DeviceAdminStringProviderImpl
2021-06-17 01:27:00 +00:00
Kevin Chyn
35aa93d8d2 Pass context and enforcedAdmin to onClickListener
These are apparently not available / not initialized in the
constructor. So, let's just pass it in from known entry points.

Bug: 188847063
Test: Builds
Change-Id: I5467f341ccf017ddfb31ef9fc4ef1756ebb65939
2021-06-15 20:57:30 -07:00
Kevin Chyn
0c34d259a0 Show biometric-specific dialog when appropriate
1) We need to pass a "restriction" string from settings to the dialog,
   otherwise the biometric dialog could be shown in non-biometric
   flows
2) Updates ActionDisabledByAdminDialogHelper to pass the restrition
   to be taken into consideration when creating the controller
3) Sets an optional onClickListener on the positive button.

Bug: 5788943
Test: atest ParentalControlsUtilsTest
Change-Id: Iedff7fef50e186b2779f061f37d3080c910d2179
2021-06-15 20:57:26 -07:00
Kevin Chyn
fc19953d28 Add biometric strings to DeviceAdminStringProviderImpl
Bug: 190067596
Test: manual
Change-Id: I3a8f94fd6b2730164dff263f068543abd8d4d18b
2021-06-15 19:58:53 -07:00
Sunny Shao
a6eb37b215 Fix Learn more link placement is wrong problem
- Use the new style of the FooterPreference.

Fixes: 189389674
Test: Robo test
Change-Id: I1529952181cca0eccd18f911eaa265b19dbb97f7
2021-06-10 20:14:56 +08:00
TreeHugger Robot
9e1e5ddb72 Merge "Further refactoring on ActionDisabledByAdminDialog classes." into sc-dev 2021-06-01 20:13:24 +00:00