Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2a959d47 authored by Tsung-Mao Fang's avatar Tsung-Mao Fang Committed by Android (Google) Code Review
Browse files

Merge "Add collapsing toolbar to Device Admin Add page" into sc-dev

parents dc96037c 53bded37

AndroidManifest.xml

+1 −0
Original line number Diff line number Diff line
@@ -1490,6 +1490,7 @@ 
        <activity android:name=".applications.specialaccess.deviceadmin.DeviceAdminAdd"

                  android:label="@string/device_admin_add_title"

                  android:exported="true"

                  android:theme="@style/Theme.SubSettings"

                  android:clearTaskOnLaunch="true">

            <intent-filter>

                <action android:name="android.app.action.ADD_DEVICE_ADMIN" />

src/com/android/settings/applications/specialaccess/deviceadmin/DeviceAdminAdd.java

+5 −1
Original line number Diff line number Diff line
@@ -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;