Bug 1398326 Fix display of default extension icon in permission prompts
MozReview-Commit-ID: 9qaAVcAeJuf
--- a/mobile/android/base/java/org/mozilla/gecko/extensions/ExtensionPermissionsHelper.java
+++ b/mobile/android/base/java/org/mozilla/gecko/extensions/ExtensionPermissionsHelper.java
@@ -11,17 +11,16 @@ import org.mozilla.gecko.util.EventCallb
import org.mozilla.gecko.util.GeckoBundle;
import org.mozilla.gecko.util.ResourceDrawableUtils;
import org.mozilla.gecko.R;
import android.app.AlertDialog;
import android.content.DialogInterface;
import android.content.Context;
import android.graphics.drawable.Drawable;
-import android.util.Log;
import android.view.LayoutInflater;
import android.view.View;
import android.widget.ImageView;
import android.widget.TextView;
public class ExtensionPermissionsHelper implements BundleEventListener {
private final Context mContext;
@@ -63,17 +62,20 @@ public class ExtensionPermissionsHelper
@Override
public void onClick(DialogInterface dialog, int whichButton) {
callback.sendSuccess(false);
}
});
final String iconUrl = message.getString("icon");
if ("DEFAULT".equals(iconUrl)) {
- headerText.setCompoundDrawablesWithIntrinsicBounds(R.drawable.ic_extension, 0, 0, 0);
+ final Drawable d = ResourceDrawableUtils.getDrawable(mContext, R.drawable.ic_extension);
+ if (d != null) {
+ headerText.setCompoundDrawablesWithIntrinsicBounds(d, null, null, null);
+ }
} else {
ResourceDrawableUtils.getDrawable(mContext, iconUrl, new ResourceDrawableUtils.BitmapLoader() {
@Override
public void onBitmapFound(final Drawable d) {
headerText.setCompoundDrawablesWithIntrinsicBounds(d, null, null, null);
}
});
}