diff options
| author | Vadim Tryshev <vadimt@google.com> | 2018-10-17 13:45:25 -0700 |
|---|---|---|
| committer | Vadim Tryshev <vadimt@google.com> | 2018-10-17 13:45:25 -0700 |
| commit | 9acafc228b3147086a3008c6e478ef3872ba089a (patch) | |
| tree | 2ef7b980f5ad83c13e03b49a87bdf2911ad382a8 /src/com/android/launcher3/popup/PopupContainerWithArrow.java | |
| parent | dbccb545b56c5acc4535e6ecbe66c59c36b28ded (diff) | |
| download | packages_apps_Trebuchet-9acafc228b3147086a3008c6e478ef3872ba089a.tar.gz packages_apps_Trebuchet-9acafc228b3147086a3008c6e478ef3872ba089a.tar.bz2 packages_apps_Trebuchet-9acafc228b3147086a3008c6e478ef3872ba089a.zip | |
Modifying SystemShortcut to enable support for RemoteAction
See the bug, comment #1 for details
Bug: 117888000
Test: manual test with a prototype
Change-Id: I0422df6006e2cfc7344fc3bee531341b11b1050e
Diffstat (limited to 'src/com/android/launcher3/popup/PopupContainerWithArrow.java')
| -rw-r--r-- | src/com/android/launcher3/popup/PopupContainerWithArrow.java | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/com/android/launcher3/popup/PopupContainerWithArrow.java b/src/com/android/launcher3/popup/PopupContainerWithArrow.java index 6877cc4ad..b9e6a98b4 100644 --- a/src/com/android/launcher3/popup/PopupContainerWithArrow.java +++ b/src/com/android/launcher3/popup/PopupContainerWithArrow.java @@ -391,13 +391,10 @@ public class PopupContainerWithArrow extends ArrowPopup implements DragSource, if (view instanceof DeepShortcutView) { // Expanded system shortcut, with both icon and text shown on white background. final DeepShortcutView shortcutView = (DeepShortcutView) view; - shortcutView.getIconView().setBackgroundResource(info.iconResId); - shortcutView.getBubbleText().setText(info.labelResId); + info.setIconAndLabelFor(shortcutView.getIconView(), shortcutView.getBubbleText()); } else if (view instanceof ImageView) { // Only the system shortcut icon shows on a gray background header. - final ImageView shortcutIcon = (ImageView) view; - shortcutIcon.setImageResource(info.iconResId); - shortcutIcon.setContentDescription(getContext().getText(info.labelResId)); + info.setIconAndContentDescriptionFor((ImageView) view); } view.setTag(info); view.setOnClickListener(info.getOnClickListener(mLauncher, |