4 Commits

Author	SHA1	Message	Date
Alex Johnston	05c0ab0324	Check if FRP policy is supported in Settings ... * Check if FRP policy is supported before erasing a device via settings. * Call DPM TestAPI isFactoryResetProtectionPolicySupported * If FRP policy is not supported, then do not erase the device. Bug: 155057616 Test: atest com.android.settings.MasterClearConfirmTest Change-Id: I56e4a6566457f31932658188646abe21701637fc	2020-04-28 13:48:01 +01:00
Alex Johnston	74260a733f	Retain FRP data when FR is invoked in Settings ... * If the device is an organization-owned managed profile device and a FRP policy is set, the factory reset protection data is no longer erased from factory reset in Settings. Bug: 148847767 Test: manual testing Change-Id: Iebaf2446f23626b24db37f5173dc77f9dee25ba9	2020-03-26 10:29:52 +00:00
pastychang	fa68ec4f56	Set suw description textview to fixed id ... Heavy theme supports to costomize description text style. Modify it to fixed id that can be customized by partner resource. Heavy theme screenshot: https://screenshot.googleplex.com/TL4M7wmTaPg Set fixed id screenshot: https://screenshot.googleplex.com/CA6QHoNTQBZ Test: atest Bug: 121988926 Change-Id: I8882acd49e7d57f24afa9dd6f3e9abfd06556053	2019-04-12 09:20:12 +00:00
Andrew Sapperstein	88930e373e	Update eSIM deletion strings. ... Adds some conditional behavior for the confirmation screens. When the erase eSIM option is visible and checked, shows alternate string. Fixes: 126262481 Fixes: 118751918 Test: visual inspection & make -j RunSettingsRoboTests Change-Id: I40f983b03ad470d785bf104e645dbc92e7897d2d	2019-03-22 13:03:25 -07:00