diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 56ada59a03a..cb53a02865e 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -1490,6 +1490,7 @@ diff --git a/src/com/android/settings/applications/specialaccess/deviceadmin/DeviceAdminAdd.java b/src/com/android/settings/applications/specialaccess/deviceadmin/DeviceAdminAdd.java index 1fe3f177b69..0625bbbfc39 100644 --- a/src/com/android/settings/applications/specialaccess/deviceadmin/DeviceAdminAdd.java +++ b/src/com/android/settings/applications/specialaccess/deviceadmin/DeviceAdminAdd.java @@ -71,6 +71,7 @@ import com.android.settings.users.UserDialogs; import com.android.settingslib.RestrictedLockUtils; import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin; import com.android.settingslib.RestrictedLockUtilsInternal; +import com.android.settingslib.collapsingtoolbar.CollapsingToolbarBaseActivity; import org.xmlpull.v1.XmlPullParserException; @@ -79,7 +80,10 @@ import java.util.ArrayList; import java.util.List; import java.util.Optional; -public class DeviceAdminAdd extends Activity { +/** + * A confirmation screen for enabling administractor. + */ +public class DeviceAdminAdd extends CollapsingToolbarBaseActivity { static final String TAG = "DeviceAdminAdd"; static final int DIALOG_WARNING = 1;