From c2bd8101b8e26b9ebb2c079ae6867229dad3f196 Mon Sep 17 00:00:00 2001
From: Kenny Guy <kennyguy@google.com>
Date: Mon, 30 Jun 2014 12:30:31 +0100
Subject: 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/Workspace.java | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src/com/android/launcher3/Workspace.java')

diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java
index 74ef1d46b..550b20368 100644
--- a/src/com/android/launcher3/Workspace.java
+++ b/src/com/android/launcher3/Workspace.java
@@ -4781,6 +4781,7 @@ public class Workspace extends SmoothPagedView
                 shortcutInfo.restore();
                 shortcutInfo.updateIcon(mIconCache);
                 shortcutInfo.title = appInfo.title.toString();
+                shortcutInfo.contentDescription = appInfo.contentDescription;
                 shortcut.applyFromShortcutInfo(shortcutInfo, mIconCache);
             }
         }
-- 
cgit v1.2.3