diff options
| author | Winson Chung <winsonc@google.com> | 2012-06-11 11:54:38 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-06-11 11:54:38 -0700 |
| commit | db2bfa05062b492664eff85c87dc6b725a9c983c (patch) | |
| tree | 891c9fa58478933ef162438be3e9077f1e83458d /src/com/android | |
| parent | 12dd20d59bb8c2dbc957d171f091b78998f2015b (diff) | |
| parent | 1b8840936f90ed48d6c8edcd87fbc4466dc4e5ba (diff) | |
| download | packages_apps_trebuchet-db2bfa05062b492664eff85c87dc6b725a9c983c.zip packages_apps_trebuchet-db2bfa05062b492664eff85c87dc6b725a9c983c.tar.gz packages_apps_trebuchet-db2bfa05062b492664eff85c87dc6b725a9c983c.tar.bz2 | |
Merge "Fixing issue where play icon disappears after hitting home (Bug 6636269)" into jb-dev
Diffstat (limited to 'src/com/android')
| -rw-r--r-- | src/com/android/launcher2/Launcher.java | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/src/com/android/launcher2/Launcher.java b/src/com/android/launcher2/Launcher.java index 28dfd65..0c0fdad 100644 --- a/src/com/android/launcher2/Launcher.java +++ b/src/com/android/launcher2/Launcher.java @@ -2923,9 +2923,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) { @@ -3077,7 +3077,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 |