diff options
| author | Dianne Hackborn <hackbod@google.com> | 2010-01-12 18:18:05 -0800 |
|---|---|---|
| committer | Dianne Hackborn <hackbod@google.com> | 2010-01-16 18:30:05 -0800 |
| commit | feff65213231ba6a0f6185f98e660042b5b14595 (patch) | |
| tree | 023516c9ba4684f9a5d755104601ba0073899f5a /AndroidManifest.xml | |
| parent | feeb75613241556ee2a6504a55a2f3849fb4ce4c (diff) | |
| download | packages_apps_Settings-feff65213231ba6a0f6185f98e660042b5b14595.tar.gz packages_apps_Settings-feff65213231ba6a0f6185f98e660042b5b14595.tar.bz2 packages_apps_Settings-feff65213231ba6a0f6185f98e660042b5b14595.zip | |
Initial UI for managing device policies.
More to come... what is here now is very ugly, and completely missing the
confirmation screen for setting a device administrator.
Diffstat (limited to 'AndroidManifest.xml')
| -rw-r--r-- | AndroidManifest.xml | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 2cb777233..5b7fdd1d1 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -374,6 +374,19 @@ </intent-filter> </activity> + <activity android:name="DeviceAdminSettings" + android:label="@string/device_admin_settings_title" + android:clearTaskOnLaunch="true" + > + <intent-filter> + <action android:name="android.intent.action.MAIN" /> + <action android:name="android.app.action.ADD_DEVICE_ADMIN" /> + <category android:name="android.intent.category.DEFAULT" /> + <category android:name="android.intent.category.VOICE_LAUNCH" /> + <category android:name="com.android.settings.SHORTCUT" /> + </intent-filter> + </activity> + <activity android:name="IccLockSettings" android:label="@string/sim_lock_settings" android:process="com.android.phone"> <intent-filter> |