diff options
| author | Dianne Hackborn <hackbod@google.com> | 2010-01-25 18:56:17 -0800 |
|---|---|---|
| committer | Dianne Hackborn <hackbod@google.com> | 2010-01-26 11:09:32 -0800 |
| commit | 28429033375c3876af56528bfc9ea6b541052fcb (patch) | |
| tree | 72130241ccf264388efec1c5b485b27b2a5fa260 /res/values | |
| parent | e67c8810906285513d7d41113e362ea12415a735 (diff) | |
| download | packages_apps_settings-28429033375c3876af56528bfc9ea6b541052fcb.zip packages_apps_settings-28429033375c3876af56528bfc9ea6b541052fcb.tar.gz packages_apps_settings-28429033375c3876af56528bfc9ea6b541052fcb.tar.bz2 | |
Work on the device admin settings UI.
Improve the look of the UI, and add the confirmation screen
for enabling an administrator. This uses the new framework APIs
to show its description and policies it will control.
Diffstat (limited to 'res/values')
| -rw-r--r-- | res/values/strings.xml | 13 | ||||
| -rw-r--r-- | res/values/styles.xml | 4 |
2 files changed, 16 insertions, 1 deletions
diff --git a/res/values/strings.xml b/res/values/strings.xml index 73b216f..af53547 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -2349,10 +2349,21 @@ found in the list of installed applications.</string> <!-- Label for screen showing the active device policy --> <string name="active_device_admin_msg">Active device administrator</string> <!-- Label for button to remove the active device admin --> - <string name="remove_device_admin">Remove</string> + <string name="remove_device_admin">Deactivate</string> <!-- Label for screen showing to select device policy --> <string name="select_device_admin_msg">Select device administrator</string> + <!-- Label for screen showing to add device policy --> + <string name="add_device_admin_msg">Activate device administrator</string> + <!-- Label for button to set the active device admin --> + <string name="add_device_admin">Activate</string> + <!-- Device admin add activity title --> + <string name="device_admin_add_title">Activate device administrator</string> + <!-- Device admin warning message about policies an admin can use --> + <string name="device_admin_warning">Activating this administrator will allow + the application <xliff:g id="app_name">%1$s</xliff:g> to perform the + following operations:</string> + <!-- Name to assign to a Network Access Point that was saved without a name --> <string name="untitled_apn">Untitled</string> </resources> diff --git a/res/values/styles.xml b/res/values/styles.xml index 7c77f49..a1422e1 100644 --- a/res/values/styles.xml +++ b/res/values/styles.xml @@ -78,4 +78,8 @@ <item name="android:textStyle">normal</item> </style> + <style name="TallTitleBarTheme" parent="android:Theme.NoTitleBar"> + <item name="android:windowContentOverlay">@null</item> + </style> + </resources> |