diff options
author | Kenny Guy <kennyguy@google.com> | 2014-06-30 12:30:31 +0100 |
---|---|---|
committer | Kenny Guy <kennyguy@google.com> | 2014-06-30 12:30:31 +0100 |
commit | c2bd8101b8e26b9ebb2c079ae6867229dad3f196 (patch) | |
tree | a959a1cb19ea9b5b1f2b606a0b4a70cff9f8ed8f /src/com/android/launcher3/ShortcutInfo.java | |
parent | 40c5ed303909c4df71037be3429aa1423e59585f (diff) | |
download | android_packages_apps_Trebuchet-c2bd8101b8e26b9ebb2c079ae6867229dad3f196.tar.gz android_packages_apps_Trebuchet-c2bd8101b8e26b9ebb2c079ae6867229dad3f196.tar.bz2 android_packages_apps_Trebuchet-c2bd8101b8e26b9ebb2c079ae6867229dad3f196.zip |
Revert "Revert Cls stopping now-master running on googlefood"
This reverts commit 7bc272a11b701a32d2ed91277341c382cbd84aeb.
Conflicts:
src/com/android/launcher3/BubbleTextView.java
Change-Id: Id1fb2e1249e72658ce5477165c9bcacba9de2b04
Diffstat (limited to 'src/com/android/launcher3/ShortcutInfo.java')
-rw-r--r-- | src/com/android/launcher3/ShortcutInfo.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/com/android/launcher3/ShortcutInfo.java b/src/com/android/launcher3/ShortcutInfo.java index a84a90354..d2573a4a1 100644 --- a/src/com/android/launcher3/ShortcutInfo.java +++ b/src/com/android/launcher3/ShortcutInfo.java @@ -119,10 +119,12 @@ public class ShortcutInfo extends ItemInfo { } } - ShortcutInfo(Intent intent, CharSequence title, Bitmap icon, UserHandleCompat user) { + ShortcutInfo(Intent intent, CharSequence title, String contentDescrition, + Bitmap icon, UserHandleCompat user) { this(); this.intent = intent; this.title = title; + this.contentDescription = contentDescription; mIcon = icon; this.user = user; } |