summaryrefslogtreecommitdiffstats
path: root/src/com/android/launcher3/Workspace.java
diff options
context:
space:
mode:
authorSunny Goyal <sunnygoyal@google.com>2014-07-18 23:57:03 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2014-07-18 18:24:25 +0000
commitebf50c93b0d1a4f12329c92a3873a8409c566c7e (patch)
tree40204b256848468ced177ab249144dbab9420280 /src/com/android/launcher3/Workspace.java
parentcc83d8dbfe2d99d95d9cf651c9559093d3c89c1e (diff)
parentc5c60ad3592f53549c9ffaa58e9a87b0480080e8 (diff)
downloadandroid_packages_apps_Trebuchet-ebf50c93b0d1a4f12329c92a3873a8409c566c7e.tar.gz
android_packages_apps_Trebuchet-ebf50c93b0d1a4f12329c92a3873a8409c566c7e.tar.bz2
android_packages_apps_Trebuchet-ebf50c93b0d1a4f12329c92a3873a8409c566c7e.zip
Merge "Merging Motorola's patch to disable apps when is safe mode." into ub-now-master
Diffstat (limited to 'src/com/android/launcher3/Workspace.java')
-rw-r--r--src/com/android/launcher3/Workspace.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java
index a8e7580c3..eb7fc365d 100644
--- a/src/com/android/launcher3/Workspace.java
+++ b/src/com/android/launcher3/Workspace.java
@@ -4790,7 +4790,7 @@ public class Workspace extends SmoothPagedView
shortcutInfo.updateIcon(mIconCache);
shortcutInfo.title = appInfo.title.toString();
shortcutInfo.contentDescription = appInfo.contentDescription;
- shortcut.applyFromShortcutInfo(shortcutInfo, mIconCache);
+ shortcut.applyFromShortcutInfo(shortcutInfo, mIconCache, true);
}
}
}