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
- For managed devices, "Learn more" takes the user to a support
page
- Put back the "If you have questions, contact your IT admin"
dialog content text
- Update header to 'Blocked by your IT admin' for managed devices
Fixes: 184107103
Test: manual
Test: atest ActionDisabledByAdminDialogHelperTest
Test: atest ActionDisabledLearnMoreButtonLauncherImplTest
Change-Id: Ie5b8a21b9ba295435d5709f9b0374035141d319a
Bug: 182839352
Test: Used a test device that is registered via ZT
Test: m RunSettingsRoboTests ROBOTEST_FILTER=ActionDisabledByAdminDialogHelperTest
Change-Id: I42bb9ce9a624fa20cd755af2d323b4c4f94048f7
Bug: 173826319
Bug: 158157476
Test: Used a test device that is registered via ZT
Test: m RunSettingsRoboTests ROBOTEST_FILTER=ActionDisabledByAdminDialogHelperTest
Change-Id: Iefeb0b653764952e409dfd862d9cc54c4f5e7fc9
Only if no app-icon is used a tint should be applied to the ic_info
icon.
Change-Id: I92332110f99d14e86dc01700fa00b189c1d7d8ad
Fixes: 118879012
Test: Looked at dialog with default icon and with app-icon
Remove dependency on libcore internal annotation -
the standard Android one should do.
Bug: 113148576
Test: build only
Change-Id: I067679b042d0698a4cc4afddc469dbcf68fce143
- Revert user handling in setAdminSupportDetails to before my changes.
- Implement getUserProfiles in Settings-shadows as the the
Settings-shadows do not forwarded to profiles the robolectric-default
shadows
Test: make RunSettingsRoboTests
Change-Id: Idfd4722fe55a17c57d336db943904eb1aeb6e7ce
This is made necessary by changes to the SystemAPI the lib relies on.
Test: RunSettingsRoboTests
Bug: 116798569
Change-Id: I2812ce9e58e3fb15a5579ddc10cd0edf33d0ed44
This means that in some cases RestrictedLockUtils has to be used and in
some RestrictedLockUtilsInternal.
This causes a lot of trivial code changes.
I also updated the ordering of the imports in all affected files.
Bug: 110953302
Test: Built
make -j RunSettingsRoboTests
Change-Id: I9bdf8b89134f853bae4f38c81af436715c73e924
Having consistent import order will reduce chance of merge
conflict between internal and external master
Test: rebuild
Change-Id: I0b1a170967ddcce7f388603fd521f6ed1eeba30b
This CL only changed AlertDialog imports.
So, reviewer can review it easily.
Change-Id: I097bc44394195b14287f4f920c570ac8653f356a
Fixes: 111413092
Test: This CL can't pass Robo test.
Following the pattern used within the Settings app to badge the icon.
For location setting, the dialog is shown in work profile user.
Thus ai.loadIcon badged the icon for the first time and
getUserBadgedIcon baged the second time.
Fixes: 77844928
Test: adb shell wm density 560 -> suspend an app -> launch the app ->
observe the dialog. Repeat the test with original density.
Change-Id: Ie79c3d9aa7b1a155edc74816850b1349fbd2d606