summaryrefslogtreecommitdiffstats
path: root/src/com/android/launcher2/Launcher.java
diff options
context:
space:
mode:
Diffstat (limited to 'src/com/android/launcher2/Launcher.java')
-rw-r--r--src/com/android/launcher2/Launcher.java10
1 files changed, 8 insertions, 2 deletions
diff --git a/src/com/android/launcher2/Launcher.java b/src/com/android/launcher2/Launcher.java
index c9c690a36..15b272fea 100644
--- a/src/com/android/launcher2/Launcher.java
+++ b/src/com/android/launcher2/Launcher.java
@@ -2457,13 +2457,19 @@ public final class Launcher extends Activity
int buttonId, ComponentName activityName, int fallbackDrawableId) {
TextView button = (TextView) findViewById(buttonId);
Drawable toolbarIcon = getExternalPackageToolbarIcon(activityName);
+ Resources r = getResources();
+ int w = r.getDimensionPixelSize(R.dimen.toolbar_external_icon_width);
+ int h = r.getDimensionPixelSize(R.dimen.toolbar_external_icon_height);
// If we were unable to find the icon via the meta-data, use a generic one
if (toolbarIcon == null) {
- button.setCompoundDrawablesWithIntrinsicBounds(fallbackDrawableId, 0, 0, 0);
+ toolbarIcon = r.getDrawable(fallbackDrawableId);
+ toolbarIcon.setBounds(0, 0, w, h);
+ button.setCompoundDrawables(toolbarIcon, null, null, null);
return null;
} else {
- button.setCompoundDrawablesWithIntrinsicBounds(toolbarIcon, null, null, null);
+ toolbarIcon.setBounds(0, 0, w, h);
+ button.setCompoundDrawables(toolbarIcon, null, null, null);
return toolbarIcon.getConstantState();
}
}