diff options
| -rw-r--r-- | build.gradle | 31 | ||||
| -rw-r--r--[-rwxr-xr-x] | src/com/android/volley/toolbox/ImageLoader.java | 0 | ||||
| -rw-r--r-- | src/com/android/volley/toolbox/NetworkImageView.java | 5 |
3 files changed, 22 insertions, 14 deletions
diff --git a/build.gradle b/build.gradle index 5bfb394..d28959d 100644 --- a/build.gradle +++ b/build.gradle @@ -5,19 +5,26 @@ android { buildToolsVersion = 17 sourceSets { - main { - manifest { - srcFile 'AndroidManifest.xml' - } + defaultConfig { + testPackageName 'com.android.volley.tests' + } - java { - srcDirs = ['src'] - } - resources.srcDirs = ['src'] - aidl.srcDirs = ['src'] + main { + assets.srcDirs = ['assets'] + res.srcDirs = ['res'] + aidl.srcDirs = ['src'] + resources.srcDirs = ['src'] renderscript.srcDirs = ['src'] - res.srcDirs = ['res'] - assets.srcDirs = ['assets'] + java.srcDirs = ['src'] + manifest.srcFile 'AndroidManifest.xml' + + } + + instrumentTest { + assets.srcDirs = ["tests/assets"] + res.srcDirs = ["tests/res"] + resources.srcDirs = ["tests/src"] + java.srcDirs = ["tests/src"] } } -}
\ No newline at end of file +} diff --git a/src/com/android/volley/toolbox/ImageLoader.java b/src/com/android/volley/toolbox/ImageLoader.java index c5f52a0..c5f52a0 100755..100644 --- a/src/com/android/volley/toolbox/ImageLoader.java +++ b/src/com/android/volley/toolbox/ImageLoader.java diff --git a/src/com/android/volley/toolbox/NetworkImageView.java b/src/com/android/volley/toolbox/NetworkImageView.java index d4f14e9..74c9159 100644 --- a/src/com/android/volley/toolbox/NetworkImageView.java +++ b/src/com/android/volley/toolbox/NetworkImageView.java @@ -18,8 +18,8 @@ package com.android.volley.toolbox; import android.content.Context; import android.text.TextUtils; import android.util.AttributeSet; +import android.view.ViewGroup.LayoutParams; import android.widget.ImageView; -import android.widget.LinearLayout.LayoutParams; import com.android.volley.VolleyError; import com.android.volley.toolbox.ImageLoader.ImageContainer; @@ -104,7 +104,8 @@ public class NetworkImageView extends ImageView { int width = getWidth(); int height = getHeight(); - boolean isFullyWrapContent = getLayoutParams().height == LayoutParams.WRAP_CONTENT + boolean isFullyWrapContent = getLayoutParams() != null + && getLayoutParams().height == LayoutParams.WRAP_CONTENT && getLayoutParams().width == LayoutParams.WRAP_CONTENT; // if the view's bounds aren't known yet, and this is not a wrap-content/wrap-content // view, hold off on loading the image. |