Merging Motorola's patch to disable apps when is safe mode.
issue: 16044192
Change-Id: I10069dcdf459ecc71361271e883eabb743d77822
diff --git a/src/com/android/launcher3/Folder.java b/src/com/android/launcher3/Folder.java
index 47c8a4a..655e5c3 100644
--- a/src/com/android/launcher3/Folder.java
+++ b/src/com/android/launcher3/Folder.java
@@ -566,15 +566,10 @@
}
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);