diff options
| author | Fyodor Kupolov <fkupolov@google.com> | 2016-03-23 17:31:06 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2016-03-23 17:31:07 +0000 |
| commit | 5455eace1f2f841f5380533a508c3a1afeba3439 (patch) | |
| tree | 40c7dd6f23cf63a6e58c72b5801faa56c13d0a38 /res | |
| parent | 959c57cdbfa0618214bb447e9671727d862f0c0a (diff) | |
| parent | 10f852cba8be8b26c9f4f7c0aa57aab01f19c3c1 (diff) | |
| download | android_packages_apps_PackageInstaller-5455eace1f2f841f5380533a508c3a1afeba3439.tar.gz android_packages_apps_PackageInstaller-5455eace1f2f841f5380533a508c3a1afeba3439.tar.bz2 android_packages_apps_PackageInstaller-5455eace1f2f841f5380533a508c3a1afeba3439.zip | |
Merge "Added "Manage users" button" into nyc-dev
Diffstat (limited to 'res')
| -rw-r--r-- | res/layout/uninstall_progress.xml | 10 | ||||
| -rw-r--r-- | res/values/strings.xml | 8 |
2 files changed, 15 insertions, 3 deletions
diff --git a/res/layout/uninstall_progress.xml b/res/layout/uninstall_progress.xml index ff80fe11..1d63841f 100644 --- a/res/layout/uninstall_progress.xml +++ b/res/layout/uninstall_progress.xml @@ -104,7 +104,15 @@ android:visibility="gone" android:maxLines="2" android:text="@string/manage_device_administrators" /> - + + <Button android:id="@+id/users_button" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center_horizontal" + android:visibility="gone" + android:maxLines="2" + android:text="@string/manage_users" /> + </LinearLayout> </RelativeLayout> diff --git a/res/values/strings.xml b/res/values/strings.xml index 367f466b..8aed10da 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -126,8 +126,8 @@ active device administrator for the user <xliff:g id="username">%1$s</xliff:g>.</string> <!-- String presented to the user when uninstalling a package failed because a profile owner has marked the the target package as not able to be uninstalled [CHAR LIMIT=80] --> - <string name="uninstall_blocked_profile_owner">This app is needed for - your work profile and can\'t be uninstalled.</string> + <string name="uninstall_blocked_profile_owner">This app is required for some users or profiles + and was uninstalled for others</string> <!-- String presented to the user when uninstalling a package failed because a device owner has marked the the target package as not able to be uninstalled [CHAR LIMIT=80] --> <string name="uninstall_blocked_device_owner">This app is required @@ -136,6 +136,10 @@ user will be able to disable the device administrator in order to uninstall it. [CHAR LIMIT=50] --> <string name="manage_device_administrators">Manage device administrators</string> + <!-- String on a button that leads to the "Users" page in Settings where a + user will be able to remove the secondary user(s) in order to uninstall + the app. [CHAR LIMIT=50] --> + <string name="manage_users">Manage users</string> <string name="uninstall_failed_msg"><xliff:g id="app_name">%1$s</xliff:g> couldn\'t be uninstalled.</string> <!-- Dialog attributes to indicate parse errors --> |