diff options
| author | Sunny Goyal <sunnygoyal@google.com> | 2014-07-14 12:02:01 -0700 |
|---|---|---|
| committer | Sunny Goyal <sunnygoyal@google.com> | 2014-07-18 16:10:34 -0700 |
| commit | c5c60ad3592f53549c9ffaa58e9a87b0480080e8 (patch) | |
| tree | a4c01c55af65ca0262f9dfeade896fef263c7b0a /src/com/android/launcher3/Folder.java | |
| parent | e8a30577f7451ed0f50ce7cd86e0d3f0c0e0d0bc (diff) | |
| download | android_packages_apps_Trebuchet-c5c60ad3592f53549c9ffaa58e9a87b0480080e8.tar.gz android_packages_apps_Trebuchet-c5c60ad3592f53549c9ffaa58e9a87b0480080e8.tar.bz2 android_packages_apps_Trebuchet-c5c60ad3592f53549c9ffaa58e9a87b0480080e8.zip | |
Merging Motorola's patch to disable apps when is safe mode.
issue: 16044192
Change-Id: I10069dcdf459ecc71361271e883eabb743d77822
Diffstat (limited to 'src/com/android/launcher3/Folder.java')
| -rw-r--r-- | src/com/android/launcher3/Folder.java | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/src/com/android/launcher3/Folder.java b/src/com/android/launcher3/Folder.java index 47c8a4a0f..655e5c368 100644 --- a/src/com/android/launcher3/Folder.java +++ b/src/com/android/launcher3/Folder.java @@ -566,15 +566,10 @@ public class Folder extends LinearLayout implements DragSource, View.OnClickList } protected View createAndAddShortcut(ShortcutInfo item) { - final TextView textView = - (TextView) mInflater.inflate(R.layout.folder_application, this, false); - textView.setCompoundDrawables(null, - Utilities.createIconDrawable(item.getIcon(mIconCache)), null, null); - textView.setText(item.title); - if (item.contentDescription != null) { - textView.setContentDescription(item.contentDescription); - } - textView.setTag(item); + final BubbleTextView textView = + (BubbleTextView) mInflater.inflate(R.layout.folder_application, this, false); + textView.applyFromShortcutInfo(item, mIconCache, false); + textView.setOnClickListener(this); textView.setOnLongClickListener(this); |