PawletOS/Lawnchair
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

am db2bfa05: Merge "Fixing issue where play icon disappears after hitting home (Bug 6636269)" into jb-dev

Browse Source 
* commit 'db2bfa05062b492664eff85c87dc6b725a9c983c':
  Fixing issue where play icon disappears after hitting home (Bug 6636269)
This commit is contained in:
Winson Chung
2012-06-12 12:41:17 -07:00
committed by Android Git Automerger
parent 307f0b4d4d db2bfa0506
commit fab8e5506d
1 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/com/android/launcher2/Launcher.java
+10 -3
View File
@@ -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