summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorWinson Chung <winsonc@google.com>2012-06-08 17:13:02 -0700
committerWinson Chung <winsonc@google.com>2012-06-08 17:13:23 -0700
commit1b8840936f90ed48d6c8edcd87fbc4466dc4e5ba (patch)
treeaa7ac7e5f52c835e66144925bd45309a5548282f /src
parent478244409e15594ceaa7426a6a23cc805db0b1fc (diff)
downloadandroid_packages_apps_Trebuchet-1b8840936f90ed48d6c8edcd87fbc4466dc4e5ba.tar.gz
android_packages_apps_Trebuchet-1b8840936f90ed48d6c8edcd87fbc4466dc4e5ba.tar.bz2
android_packages_apps_Trebuchet-1b8840936f90ed48d6c8edcd87fbc4466dc4e5ba.zip
Fixing issue where play icon disappears after hitting home (Bug 6636269)
Change-Id: I1d1df992495413b3e8962dca8995602ae0aa2ca7
Diffstat (limited to 'src')
-rw-r--r--src/com/android/launcher2/Launcher.java13
1 files changed, 10 insertions, 3 deletions
diff --git a/src/com/android/launcher2/Launcher.java b/src/com/android/launcher2/Launcher.java
index 659077f71..9d118e702 100644
--- a/src/com/android/launcher2/Launcher.java
+++ b/src/com/android/launcher2/Launcher.java
@@ -2867,9 +2867,9 @@ public final class Launcher extends Activity
}
- private void updateTextButtonWithDrawable(int buttonId, Drawable.ConstantState d) {
+ private void updateTextButtonWithDrawable(int buttonId, Drawable d) {
TextView button = (TextView) findViewById(buttonId);
- button.setCompoundDrawables(d.newDrawable(getResources()), null, null, null);
+ button.setCompoundDrawables(d, null, null, null);
}
private void updateButtonWithDrawable(int buttonId, Drawable.ConstantState d) {
@@ -3021,7 +3021,14 @@ public final class Launcher extends Activity
}
private void updateAppMarketIcon(Drawable.ConstantState d) {
- updateTextButtonWithDrawable(R.id.market_button, d);
+ // Ensure that the new drawable we are creating has the approprate toolbar icon bounds
+ Resources r = getResources();
+ Drawable marketIconDrawable = d.newDrawable(r);
+ int w = r.getDimensionPixelSize(R.dimen.toolbar_external_icon_width);
+ int h = r.getDimensionPixelSize(R.dimen.toolbar_external_icon_height);
+ marketIconDrawable.setBounds(0, 0, w, h);
+
+ updateTextButtonWithDrawable(R.id.market_button, marketIconDrawable);
}
@Override