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

am 6b32fc9b: Merge "DO NOT MERGE temp fix for NPE" into honeycomb-mr2

Browse Source 
* commit '6b32fc9bd096a2cff3ae0f89ef8491e7b2e11f76':
  DO NOT MERGE temp fix for NPE
This commit is contained in:
Michael Jurka
2011-06-08 16:53:56 -07:00
committed by Android Git Automerger
parent d94557758e 6b32fc9bd0
commit f44abc8e1b
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/com/android/launcher2/Launcher.java
+4
View File
@@ -3102,6 +3102,7 @@ public final class Launcher extends Activity
private Drawable.ConstantState updateTextButtonWithIconFromExternalActivity(
int buttonId, ComponentName activityName, int fallbackDrawableId) {
TextView button = (TextView) findViewById(buttonId);
if (button == null) return null;
Drawable toolbarIcon = getExternalPackageToolbarIcon(activityName);
// If we were unable to find the icon via the meta-data, use a generic one
@@ -3118,6 +3119,7 @@ public final class Launcher extends Activity
private Drawable.ConstantState updateButtonWithIconFromExternalActivity(
int buttonId, ComponentName activityName, int fallbackDrawableId) {
ImageView button = (ImageView) findViewById(buttonId);
if (button == null) return null;
Drawable toolbarIcon = getExternalPackageToolbarIcon(activityName);
// If we were unable to find the icon via the meta-data, use a generic one
@@ -3132,11 +3134,13 @@ public final class Launcher extends Activity
private void updateTextButtonWithDrawable(int buttonId, Drawable.ConstantState d) {
TextView button = (TextView) findViewById(buttonId);
if (button == null) return;
button.setCompoundDrawables(d.newDrawable(getResources()), null, null, null);
}
private void updateButtonWithDrawable(int buttonId, Drawable.ConstantState d) {
ImageView button = (ImageView) findViewById(buttonId);
if (button == null) return;
button.setImageDrawable(d.newDrawable(getResources()));
}