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

Move DeviceAdmin APIs to android.app.admin.

Browse Source
This commit is contained in:
Dianne Hackborn
2010-02-26 17:26:55 -08:00
parent a15d03fccc
commit 4037c7f27c
4 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/android/settings/ChooseLockGeneric.java
View File

@@ -19,7 +19,7 @@ package com.android.settings;
import com.android.internal.widget.LockPatternUtils; import com.android.internal.widget.LockPatternUtils;
import android.app.Activity; import android.app.Activity;
import android.app.DevicePolicyManager; import android.app.admin.DevicePolicyManager;
import android.content.Context; import android.content.Context;
import android.content.Intent; import android.content.Intent;
import android.os.Bundle; import android.os.Bundle;

6
src/com/android/settings/DeviceAdminAdd.java
View File

@@ -20,10 +20,10 @@ import org.xmlpull.v1.XmlPullParserException;
import android.app.Activity; import android.app.Activity;
import android.app.AlertDialog; import android.app.AlertDialog;
import android.app.DeviceAdminReceiver;
import android.app.DeviceAdminInfo;
import android.app.DevicePolicyManager;
import android.app.Dialog; import android.app.Dialog;
import android.app.admin.DeviceAdminInfo;
import android.app.admin.DeviceAdminReceiver;
import android.app.admin.DevicePolicyManager;
import android.content.ComponentName; import android.content.ComponentName;
import android.content.Context; import android.content.Context;
import android.content.DialogInterface; import android.content.DialogInterface;

10
src/com/android/settings/DeviceAdminSettings.java
View File

@@ -20,11 +20,11 @@ import org.xmlpull.v1.XmlPullParserException;
import android.app.Activity; import android.app.Activity;
import android.app.AlertDialog; import android.app.AlertDialog;
import android.app.DeviceAdminReceiver;
import android.app.DeviceAdminInfo;
import android.app.DevicePolicyManager;
import android.app.Dialog; import android.app.Dialog;
import android.app.ListActivity; import android.app.ListActivity;
import android.app.admin.DeviceAdminInfo;
import android.app.admin.DeviceAdminReceiver;
import android.app.admin.DevicePolicyManager;
import android.content.ComponentName; import android.content.ComponentName;
import android.content.Context; import android.content.Context;
import android.content.DialogInterface; import android.content.DialogInterface;
@@ -92,7 +92,9 @@ public class DeviceAdminSettings extends ListActivity {
ResolveInfo ri = avail.get(i); ResolveInfo ri = avail.get(i);
try { try {
DeviceAdminInfo dpi = new DeviceAdminInfo(this, ri); DeviceAdminInfo dpi = new DeviceAdminInfo(this, ri);
mAvailableAdmins.add(dpi); if (dpi.isVisible() || mActiveAdmins.contains(dpi.getComponent())) {
mAvailableAdmins.add(dpi);
}
} catch (XmlPullParserException e) { } catch (XmlPullParserException e) {
Log.w(TAG, "Skipping " + ri.activityInfo, e); Log.w(TAG, "Skipping " + ri.activityInfo, e);
} catch (IOException e) { } catch (IOException e) {

2
src/com/android/settings/SecuritySettings.java
View File

@@ -22,8 +22,8 @@ import java.util.Observer;
import android.app.Activity; import android.app.Activity;
import android.app.AlertDialog; import android.app.AlertDialog;
import android.app.DevicePolicyManager;
import android.app.Dialog; import android.app.Dialog;
import android.app.admin.DevicePolicyManager;
import android.content.ContentQueryMap; import android.content.ContentQueryMap;
import android.content.ContentResolver; import android.content.ContentResolver;
import android.content.Context; import android.content.Context;