commit c2bd8101b8e26b9ebb2c079ae6867229dad3f196
author Kenny Guy <kennyguy@google.com> Mon Jun 30 12:30:31 2014 +0100
committer Kenny Guy <kennyguy@google.com> Mon Jun 30 12:30:31 2014 +0100
tree a959a1cb19ea9b5b1f2b606a0b4a70cff9f8ed8f
parent 40c5ed303909c4df71037be3429aa1423e59585f

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

This reverts commit 7bc272a11b701a32d2ed91277341c382cbd84aeb.

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

Change-Id: Id1fb2e1249e72658ce5477165c9bcacba9de2b04

src/com/android/launcher3/BubbleTextView.java

diff --git a/src/com/android/launcher3/BubbleTextView.java b/src/com/android/launcher3/BubbleTextView.java
index 992ac58..160a5eb 100644
--- a/src/com/android/launcher3/BubbleTextView.java
+++ b/src/com/android/launcher3/BubbleTextView.java
@@ -122,6 +122,9 @@
         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();