Revert "Revert Cls stopping now-master running on googlefood"

This reverts commit 7bc272a11b.

Conflicts:
	src/com/android/launcher3/BubbleTextView.java

Change-Id: Id1fb2e1249e72658ce5477165c9bcacba9de2b04
This commit is contained in:
Kenny Guy
2014-06-30 12:30:31 +01:00
parent 40c5ed3039
commit c2bd8101b8
22 changed files with 174 additions and 398 deletions

View File

@@ -122,6 +122,9 @@ public class BubbleTextView extends TextView {
Drawable iconDrawable = Utilities.createIconDrawable(b);
setCompoundDrawables(null, iconDrawable, null, null);
setCompoundDrawablePadding(grid.iconDrawablePaddingPx);
if (info.contentDescription != null) {
setContentDescription(info.contentDescription);
}
setTag(info);
if (info.isPromise()) {
applyState();