PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Tsung-Mao Fang
2021-03-29 07:32:20 +00:00
committed by Android (Google) Code Review
parent dc96037cea 53bded37f2
commit 2a959d470a
2 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
AndroidManifest.xml
View File

@@ -1490,6 +1490,7 @@
<activity android:name=".applications.specialaccess.deviceadmin.DeviceAdminAdd" <activity android:name=".applications.specialaccess.deviceadmin.DeviceAdminAdd"
android:label="@string/device_admin_add_title" android:label="@string/device_admin_add_title"
android:exported="true" android:exported="true"
android:theme="@style/Theme.SubSettings"
android:clearTaskOnLaunch="true"> android:clearTaskOnLaunch="true">
<intent-filter> <intent-filter>
<action android:name="android.app.action.ADD_DEVICE_ADMIN" /> <action android:name="android.app.action.ADD_DEVICE_ADMIN" />

6
src/com/android/settings/applications/specialaccess/deviceadmin/DeviceAdminAdd.java
View File

@@ -71,6 +71,7 @@ import com.android.settings.users.UserDialogs;
import com.android.settingslib.RestrictedLockUtils; import com.android.settingslib.RestrictedLockUtils;
import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin; import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
import com.android.settingslib.RestrictedLockUtilsInternal; import com.android.settingslib.RestrictedLockUtilsInternal;
import com.android.settingslib.collapsingtoolbar.CollapsingToolbarBaseActivity;
import org.xmlpull.v1.XmlPullParserException; import org.xmlpull.v1.XmlPullParserException;
@@ -79,7 +80,10 @@ import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.Optional; 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 String TAG = "DeviceAdminAdd";
static final int DIALOG_WARNING = 1; static final int DIALOG_WARNING = 1;