aixan/lawnchair
1
0
Fork 0
mirror of https://github.com/LawnchairLauncher/lawnchair.git synced 2026-02-19 02:38:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

resolved conflicts for merge of 9fc953b9 to ub-launcher3-master

Browse Source 
Change-Id: Ia3e845a2e336c846cceefdc2d1e8c6786753f1b1
This commit is contained in:
Sunny Goyal
2015-08-17 14:43:41 -07:00
parent 017a5c1e65 9fc953b94d
commit c268148f06
29 changed files with 86 additions and 111 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/android/launcher3/UninstallDropTarget.java
View File

@@ -38,7 +38,7 @@ public class UninstallDropTarget extends ButtonDropTarget {
@TargetApi(Build.VERSION_CODES.JELLY_BEAN_MR2)
public static boolean supportsDrop(Context context, Object info) {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR2) {
if (Utilities.ATLEAST_JB_MR2) {
UserManager userManager = (UserManager) context.getSystemService(Context.USER_SERVICE);
Bundle restrictions = userManager.getUserRestrictions();
if (restrictions.getBoolean(UserManager.DISALLOW_APPS_CONTROL, false)