diff options
author | Jason Monk <jmonk@google.com> | 2014-07-15 09:22:36 -0400 |
---|---|---|
committer | Jason Monk <jmonk@google.com> | 2014-07-25 08:54:27 -0400 |
commit | 950a467b180c78d3ce3bbe7b4a227a13d28b2536 (patch) | |
tree | 93ca66a7d5fb05316086d7d2cb90e680b791f1d3 | |
parent | 9f0386fbcc6a8773bdf0b960e741b33054edf7fa (diff) | |
download | android_packages_apps_Trebuchet-950a467b180c78d3ce3bbe7b4a227a13d28b2536.tar.gz android_packages_apps_Trebuchet-950a467b180c78d3ce3bbe7b4a227a13d28b2536.tar.bz2 android_packages_apps_Trebuchet-950a467b180c78d3ce3bbe7b4a227a13d28b2536.zip |
Don't show uninstall icon when user restricted
When the user can't uninstall apps from settings, also don't show
the icon to let them do it from here.
Change-Id: I3b203711630a4ff0ba4a5928667c9f09f9479aeb
-rw-r--r-- | src/com/android/launcher3/DeleteDropTarget.java | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/src/com/android/launcher3/DeleteDropTarget.java b/src/com/android/launcher3/DeleteDropTarget.java index 4c3388e05..22c10935f 100644 --- a/src/com/android/launcher3/DeleteDropTarget.java +++ b/src/com/android/launcher3/DeleteDropTarget.java @@ -30,6 +30,7 @@ import android.graphics.PointF; import android.graphics.Rect; import android.graphics.drawable.TransitionDrawable; import android.os.AsyncTask; +import android.os.UserManager; import android.util.AttributeSet; import android.view.View; import android.view.ViewConfiguration; @@ -187,6 +188,14 @@ public class DeleteDropTarget extends ButtonDropTarget { if (!willAcceptDrop(info) || isAllAppsWidget(source, info)) { isVisible = false; } + if (useUninstallLabel) { + UserManager userManager = (UserManager) + getContext().getSystemService(Context.USER_SERVICE); + if (userManager.hasUserRestriction(UserManager.DISALLOW_APPS_CONTROL) + || userManager.hasUserRestriction(UserManager.DISALLOW_UNINSTALL_APPS)) { + isVisible = false; + } + } if (useUninstallLabel) { setCompoundDrawablesRelativeWithIntrinsicBounds(mUninstallDrawable, null, null, null); |