summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Jurka <mikejurka@google.com>2011-06-08 16:51:11 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2011-06-08 16:51:11 -0700
commit6b32fc9bd096a2cff3ae0f89ef8491e7b2e11f76 (patch)
tree43e936c874ee9be69a48072502e9cb61561feb44
parent20b7ca91b277e9668b6d4b4b3c9116b6778d22a5 (diff)
parent7affb23aa8e09555251971dbe2f07f7e095e405b (diff)
downloadandroid_packages_apps_Trebuchet-6b32fc9bd096a2cff3ae0f89ef8491e7b2e11f76.tar.gz
android_packages_apps_Trebuchet-6b32fc9bd096a2cff3ae0f89ef8491e7b2e11f76.tar.bz2
android_packages_apps_Trebuchet-6b32fc9bd096a2cff3ae0f89ef8491e7b2e11f76.zip
Merge "DO NOT MERGE temp fix for NPE" into honeycomb-mr2
-rw-r--r--src/com/android/launcher2/Launcher.java4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/com/android/launcher2/Launcher.java b/src/com/android/launcher2/Launcher.java
index 1d4840772..5c5542aa8 100644
--- a/src/com/android/launcher2/Launcher.java
+++ b/src/com/android/launcher2/Launcher.java
@@ -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()));
}